summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSaleem Abdulrasool <compnerd@gentoo.org>2006-03-01 18:42:03 +0000
committerSaleem Abdulrasool <compnerd@gentoo.org>2006-03-01 18:42:03 +0000
commitf7a9d0ddbd49edf11f28bfa9dabde5dfbcfb0701 (patch)
tree6c7cd4c0373a55bd3404c727f8f7c2e74bf7ff07 /gnome-base/gconf/files
parentMask bmpx USE. (diff)
downloadhistorical-f7a9d0ddbd49edf11f28bfa9dabde5dfbcfb0701.tar.gz
historical-f7a9d0ddbd49edf11f28bfa9dabde5dfbcfb0701.tar.bz2
historical-f7a9d0ddbd49edf11f28bfa9dabde5dfbcfb0701.zip
Adding patch to prevent clobbering of the last character (bug #120398)
Package-Manager: portage-2.1_pre5-r1
Diffstat (limited to 'gnome-base/gconf/files')
-rw-r--r--gnome-base/gconf/files/digest-gconf-2.12.1-r13
-rw-r--r--gnome-base/gconf/files/gconf-2.12.1-gconf_unescape_key.patch21
2 files changed, 24 insertions, 0 deletions
diff --git a/gnome-base/gconf/files/digest-gconf-2.12.1-r1 b/gnome-base/gconf/files/digest-gconf-2.12.1-r1
new file mode 100644
index 000000000000..1e57a90a685b
--- /dev/null
+++ b/gnome-base/gconf/files/digest-gconf-2.12.1-r1
@@ -0,0 +1,3 @@
+MD5 247110de013ed24b17cf4191eb6daec5 GConf-2.12.1.tar.bz2 1945241
+RMD160 f5c664c619ca069801dc8b1147454a1544c14b74 GConf-2.12.1.tar.bz2 1945241
+SHA256 2e3c72ecc66348be6edecfbb2e424adc8d4e5a4afb92443e98cd2e50de7cf68e GConf-2.12.1.tar.bz2 1945241
diff --git a/gnome-base/gconf/files/gconf-2.12.1-gconf_unescape_key.patch b/gnome-base/gconf/files/gconf-2.12.1-gconf_unescape_key.patch
new file mode 100644
index 000000000000..a138f1b1d205
--- /dev/null
+++ b/gnome-base/gconf/files/gconf-2.12.1-gconf_unescape_key.patch
@@ -0,0 +1,21 @@
+===================================================================
+RCS file: /cvs/gnome/gconf/gconf/gconf.c,v
+retrieving revision 1.150
+retrieving revision 1.151
+diff -u -r1.150 -r1.151
+--- gconf.c 2005/11/11 13:33:01 1.150
++++ gconf.c 2005/12/08 13:00:58 1.151
+@@ -2749,10 +2749,11 @@
+ if (*p == '@')
+ {
+ /* *p is the @ that ends a seq */
++ char *end_seq;
+ guchar val;
+
+- val = strtoul (start_seq, &end, 10);
+- if (start_seq != end)
++ val = strtoul (start_seq, &end_seq, 10);
++ if (start_seq != end_seq)
+ g_string_append_c (retval, val);
+
+ start_seq = NULL;