Adding patch to prevent clobbering of the last character (bug #120398)

Package-Manager: portage-2.1_pre5-r1

5 files changed, 170 insertions, 12 deletions

diff --git a/gnome-base/gconf/ChangeLog b/gnome-base/gconf/ChangeLog
index 7e065ae21594..0f8b95c31295 100644
--- a/gnome-base/gconf/ChangeLog
+++ b/gnome-base/gconf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gconf
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.137 2006/02/27 15:23:03 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.138 2006/03/01 18:42:02 compnerd Exp $
+
+*gconf-2.12.1-r1 (01 Mar 2006)
+
+  01 Mar 2006; Saleem Abdulrasool <compnerd@gentoo.org>
+  +files/gconf-2.12.1-gconf_unescape_key.patch, +gconf-2.12.1-r1.ebuild:
+  Adding patch to prevent clobbering of the last character (bug #120398)
 
   27 Feb 2006; Gustavo Zacarias <gustavoz@gentoo.org> gconf-1.0.9.ebuild:
   Stable on sparc wrt #124016
diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index 1b6167db23bf..0007a366ad63 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -1,26 +1,57 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 9aaceb2ec9343be569ecd23165e9e8ae ChangeLog 17934
+MD5 8cb5668df06ae5391fff607d82c73bf2 ChangeLog 18169
+RMD160 e2a4b97f9cc81dd5a0b2fdcb4467dbad17904898 ChangeLog 18169
+SHA256 c10882ef9497c42d416cd69b80e2f6bedc3e5ed4e38e10a1aafb42f103dc04c0 ChangeLog 18169
 MD5 e36bf98a90603eebfcc4d3dacd5fa785 files/digest-gconf-1.0.8-r3 64
+RMD160 ebc699448e24dc5d252346644c502aba30a0271d files/digest-gconf-1.0.8-r3 64
+SHA256 d249e722900e836ce4b4c2d8d7e2e508a5e5694f7f377f1a84d5a7c339d60f5d files/digest-gconf-1.0.8-r3 64
 MD5 e36bf98a90603eebfcc4d3dacd5fa785 files/digest-gconf-1.0.8-r5 64
+RMD160 ebc699448e24dc5d252346644c502aba30a0271d files/digest-gconf-1.0.8-r5 64
+SHA256 d249e722900e836ce4b4c2d8d7e2e508a5e5694f7f377f1a84d5a7c339d60f5d files/digest-gconf-1.0.8-r5 64
 MD5 b7e93a52522be76daa1603400d61ba52 files/digest-gconf-1.0.9 238
+RMD160 e9beb9df147ffd6f8d50649b4ee4cc6228a38c0a files/digest-gconf-1.0.9 238
+SHA256 65e197a6a7288d97cdbb02678e21562fff201c70d528bdfe2074641896acf45f files/digest-gconf-1.0.9 238
 MD5 117bfac59f5e93e340fe707b61bc5b53 files/digest-gconf-2.10.1-r1 66
+RMD160 fefad893f7cb361931a732ba93eade512183a8d0 files/digest-gconf-2.10.1-r1 66
+SHA256 7199365e31c7d4f443c407dc3ec7481dbfcaac147e49948115a89efee5163e2e files/digest-gconf-2.10.1-r1 66
 MD5 32bee061b8d5bc7a5a41e3587f60f6ad files/digest-gconf-2.12.1 66
+RMD160 14b85da0b347b6b0d03864f75a6d401d57540d61 files/digest-gconf-2.12.1 66
+SHA256 97c7aab32b1dc3c13bec384d1795f84e47fcff9c62589a21d73a6d848e7a0ce1 files/digest-gconf-2.12.1 66
+MD5 c0206532a622fd40ced4bed0815de00e files/digest-gconf-2.12.1-r1 244
+RMD160 978091a0bb1ef985a6d5bfb16d57578f7562a38b files/digest-gconf-2.12.1-r1 244
+SHA256 37c882259f034501e14219e40aadf285f30511cefb90b772ea80031854892229 files/digest-gconf-2.12.1-r1 244
 MD5 a00775eca77339f117c1edd3ae41ed32 files/gconf-1.0.9-gcc4.patch 581
+RMD160 ee224b9ece8c06d41437eff7c86b799823aefe95 files/gconf-1.0.9-gcc4.patch 581
+SHA256 4e0a6cbc44d96c8a1dbd870b936f2beebc385856f8afd91cfb8084cd70d1320f files/gconf-1.0.9-gcc4.patch 581
 MD5 ea0fe5ad2e87dd94d776ce17c94e54c8 files/gconf-1.0.9-linguas.patch 591
+RMD160 682f64046fc5a72719315b8217aa21f5e8f05c74 files/gconf-1.0.9-linguas.patch 591
+SHA256 7179fe757fc47ca4022b4e6d6e411c28d4828b5749c13e4c18b04d63414a867d files/gconf-1.0.9-linguas.patch 591
 MD5 aaa79f3ad5c910cfa6f813112e66f79e files/gconf-1.0.9-locallock_mdk.patch 1202
+RMD160 5b9129acba9fbaef871830d0ff5378398d02393c files/gconf-1.0.9-locallock_mdk.patch 1202
+SHA256 98021a78c16f3f21a33c8705907cdfb485a11df1a4acddbd5dfbf40b0738ce23 files/gconf-1.0.9-locallock_mdk.patch 1202
+MD5 3c6ceb73a00c4af6a170dffc2c743132 files/gconf-2.12.1-gconf_unescape_key.patch 737
+RMD160 110f42111ace37570a00fb73c1b9b7966119ba7b files/gconf-2.12.1-gconf_unescape_key.patch 737
+SHA256 64ac29fa083ff96f29fb404de80fdcd8a456b0dd7450cc6cdf802148ed2d4505 files/gconf-2.12.1-gconf_unescape_key.patch 737
 MD5 8485bd44122f283d1549e1f1cdddd03f files/gconfd-2-fix.patch 1820
+RMD160 126c30484309dc60a72b843697ab0feb352cde67 files/gconfd-2-fix.patch 1820
+SHA256 d311a969cfcfda29a1350c47b8a60068d4da37651a4485521b6889400ad584c4 files/gconfd-2-fix.patch 1820
 MD5 8ff887a8458160ea1e01fb3fcdacffdd gconf-1.0.8-r3.ebuild 1720
+RMD160 da4f2c5a2c84f7337337ec2ad7835744e34cd5bd gconf-1.0.8-r3.ebuild 1720
+SHA256 d39dbfe16e5c7da155140d46e2e2abf3448740785d70f18c9b48a5945a8d1660 gconf-1.0.8-r3.ebuild 1720
 MD5 a983fda22a67fd0c92297741fc44cfea gconf-1.0.8-r5.ebuild 1886
+RMD160 622c3cd60a90a727a968b326d37cba688e957749 gconf-1.0.8-r5.ebuild 1886
+SHA256 c768f288836bccb0195d82312c4772073ac5db119f574c5bcdeb065f2da703d9 gconf-1.0.8-r5.ebuild 1886
 MD5 705b45cda12578b379b7952f09b8206d gconf-1.0.9.ebuild 1896
+RMD160 1ce368b26e55e087c2025d8d17f47c1ed49bd0ad gconf-1.0.9.ebuild 1896
+SHA256 7a8afb64a0d465e14d2a73f29d62b4713534001b5236e6e6df1d40907d46607b gconf-1.0.9.ebuild 1896
 MD5 e9577b3216e9a2ab22f87bf5b234ca27 gconf-2.10.1-r1.ebuild 2015
+RMD160 79b07adb0ef584e8e95f822c4adae39e23b69d93 gconf-2.10.1-r1.ebuild 2015
+SHA256 e21d998847720e4cf15704461a404d9a6c23efd702496efe60bef9f1a2ad38ab gconf-2.10.1-r1.ebuild 2015
+MD5 e3ca295d93916029f70fab953f75dcee gconf-2.12.1-r1.ebuild 2141
+RMD160 477d3eedc3886ea653dfa819d82e1503a7b6f307 gconf-2.12.1-r1.ebuild 2141
+SHA256 8dba0cd35b5696d238836d9acba3e814168d5cfbfe9126a3921f18d6dcbc83ce gconf-2.12.1-r1.ebuild 2141
 MD5 9053b30e0012779041c2157506b5cbbd gconf-2.12.1.ebuild 1970
+RMD160 13fd02954581488ed7ffe94b4c94d72bd936120e gconf-2.12.1.ebuild 1970
+SHA256 e83cdfe75cc53f0b8862b1e689c85c9f46f675fa1e156413ce2e2b0b36fe84dd gconf-2.12.1.ebuild 1970
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFEAxlnKRy60XGEcJIRAh/XAKCSi1WbBEMhGAWhuMFpYsN4t4VK6wCgtETP
-gljHkkO2RfYc3tzPKkaNppQ=
-=KwV3
------END PGP SIGNATURE-----
+RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
+SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata.xml 158
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;
diff --git a/gnome-base/gconf/gconf-2.12.1-r1.ebuild b/gnome-base/gconf/gconf-2.12.1-r1.ebuild
new file mode 100644
index 000000000000..614c21dac47a
--- /dev/null
+++ b/gnome-base/gconf/gconf-2.12.1-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.12.1-r1.ebuild,v 1.1 2006/03/01 18:42:03 compnerd Exp $
+
+inherit gnome2
+
+MY_PN=GConf
+MY_P=${MY_PN}-${PV}
+PVP=(${PV//[-\._]/ })
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Gnome Configuration System and Daemon"
+HOMEPAGE="http://www.gnome.org/"
+SRC_URI="mirror://gnome/sources/${MY_PN}/${PVP[0]}.${PVP[1]}/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-libs/glib-2.7
+	>=gnome-base/orbit-2.4
+	>=dev-libs/libxml2-2
+	dev-libs/popt
+	>=x11-libs/gtk+-2"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+# FIXME : consider merging the tree (?)
+
+DOCS="ABOUT-NLS AUTHORS ChangeLog NEWS README TODO"
+USE_DESTDIR="1"
+MAKEOPTS="${MAKEOPTS} -j1"
+
+
+pkg_setup() {
+	G2CONF="--enable-gtk"
+	kill_gconf
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Patch to prevent stomping of the last character (bug #120398)
+	epatch ${FILESIDR}/gconf-2.12.1-gconf_unescape_key.patch
+}
+
+src_install() {
+	gnome2_src_install
+
+	# hack hack
+	dodir /etc/gconf/gconf.xml.mandatory
+	dodir /etc/gconf/gconf.xml.defaults
+	touch ${D}/etc/gconf/gconf.xml.mandatory/.keep${SLOT}
+	touch ${D}/etc/gconf/gconf.xml.defaults/.keep${SLOT}
+
+	dodir /etc/env.d
+	dodir /root/.gconfd
+}
+
+kill_gconf() {
+	# this function will kill all running gconfd that could be causing troubles
+	if [ -x /usr/bin/gconftool ]
+	then
+		/usr/bin/gconftool --shutdown
+	fi
+	if [ -x /usr/bin/gconftool-1 ]
+	then
+		/usr/bin/gconftool-1 --shutdown
+	fi
+
+	# and for gconf 2
+	if [ -x /usr/bin/gconftool-2 ]
+	then
+		/usr/bin/gconftool-2 --shutdown
+	fi
+	return 0
+}
+
+pkg_preinst() {
+	kill_gconf
+
+	echo 'CONFIG_PROTECT_MASK="/etc/gconf"' > ${IMAGE}/etc/env.d/50gconf
+}
+
+pkg_postinst() {
+	kill_gconf
+
+	#change the permissions to avoid some gconf bugs
+	einfo "changing permissions for gconf dirs"
+	find  /etc/gconf/ -type d -exec chmod ugo+rx "{}" \;
+	einfo "changing permissions for gconf files"
+	find  /etc/gconf/ -type f -exec chmod ugo+r "{}" \;
+}