bump to 2.22.3-r1, fix invalid read, bug #238098.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64

4 files changed, 56 insertions, 5 deletions

diff --git a/gnome-base/gnome-keyring/ChangeLog b/gnome-base/gnome-keyring/ChangeLog
index db8becf94e9b..7573b554ec8a 100644
--- a/gnome-base/gnome-keyring/ChangeLog
+++ b/gnome-base/gnome-keyring/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gnome-keyring
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.130 2008/09/25 14:15:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.131 2008/10/05 22:28:00 eva Exp $
+
+*gnome-keyring-2.22.3-r1 (05 Oct 2008)
+
+  05 Oct 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/gnome-keyring-2.22.3-warnings.patch, -gnome-keyring-2.22.1.ebuild,
+  +gnome-keyring-2.22.3-r1.ebuild:
+  bump to 2.22.3-r1, fix invalid read, bug #238098.
 
   25 Sep 2008; Jeroen Roovers <jer@gentoo.org> gnome-keyring-2.22.3.ebuild:
   Stable for HPPA (bug #236971).
diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
index f391a3ac65ce..32d95bce9b57 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -1,10 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX gnome-keyring-2.22.3-warnings.patch 780 RMD160 3f3e04754189b67720f2f1e7eebb5e24b9612cd2 SHA1 95077ed5efcc493e35b64b943548c569eef1cfff SHA256 03206a46f86675ed1d2773740a23b02eaa1221c8dbbd3caea0a30a42c82a7d82
 DIST gnome-keyring-2.20.3.tar.bz2 541431 RMD160 8e85220492cd87b15bb3f1fadbb6673cea3a684c SHA1 e6518a9521bc240ac4fb55185747c80ac41739e1 SHA256 5bfb69897c9042968637c33beca098a4bbabcb4b9863f3f49504bc82089fa970
-DIST gnome-keyring-2.22.1.tar.bz2 960392 RMD160 83dddadb1c133931151de302e8f33ff1d99ed496 SHA1 59956194b110a4e4576db0791e2d2371b39ff49c SHA256 83983786ac5273fa7341f2b43db8759534d2516704ab1165682c9afcd0f8b4d0
 DIST gnome-keyring-2.22.2.tar.bz2 904890 RMD160 9fcf9bee654050ca7f762b5d50e98ef690e8409e SHA1 b3276e2c349b761d167df9bdbb9c19268af2bd4b SHA256 750d49e7ded79a8685704a732d284973150df1c02e6ff12d003a6486966d5b5c
 DIST gnome-keyring-2.22.3.tar.bz2 894308 RMD160 551f4a4d734e0196522be9276ae7e76110a96556 SHA1 0f52095590a684920cc683d1985ac66263702114 SHA256 1e14eed00d386763352896e540929760264885e1296ac11cfb8ca1c08dcea7f6
 EBUILD gnome-keyring-2.20.3.ebuild 942 RMD160 3a23a066f3604fc36cc3536c411601be5d33b547 SHA1 f03afbdc8f2d7ce0e8b02cb5079904cb617ad749 SHA256 42b463b36673021bde2389aad8cadca8588663ae2308ad1156d3e8fb7d2e7de2
-EBUILD gnome-keyring-2.22.1.ebuild 1077 RMD160 b6b9f4fdf8a1578d5009096a4b34f9b7a31bae10 SHA1 f253f5eb9562ff71427568eff59acfbae55dc2b6 SHA256 355b9c02b68b284d3b22c16f0d958ca18523f2a59936cdd773b6f1448f383933
 EBUILD gnome-keyring-2.22.2.ebuild 1075 RMD160 e79129abb8725654e127c48e256f0c746f0887fa SHA1 0f88d49c8e3b58213af64a3df97ccba2051ffac9 SHA256 3ac3194c961d809f0a012b2313cebd1c4b1171980d799a6c5ffac535f226f224
+EBUILD gnome-keyring-2.22.3-r1.ebuild 1228 RMD160 6dcf901d9a4ef56b1992ada5bb9da7b532751cb3 SHA1 6afb9284b7b7118947c05b46cf1fc65bbd1c7adf SHA256 548d6e126a1b010cc6e9ca625b8ee24cfad4427a3026a5a9c824270457952fb4
 EBUILD gnome-keyring-2.22.3.ebuild 1071 RMD160 f249447e67ede02dc0a14822a3b4ac97c3231f08 SHA1 c436dfe3dd413040371462cdeda054dea2718794 SHA256 318d4d4281a0361c3a954d7c02f6c6f4279e4276d991f23669883521acb9ecae
-MISC ChangeLog 16245 RMD160 10291d690a5d8c1820be01ce3385300976e25127 SHA1 c24322a60556b9af4c469c745900faf5dca244e6 SHA256 4d3a6f6309160f9974d58525fa4e7fa79d533179382add0afff6162eab1c6e91
+MISC ChangeLog 16503 RMD160 391a2b6271121c53a76e0ae95d237b1085f1889a SHA1 4989051598dbefcbf94c0155d2d30f9651dea15b SHA256 8e66d8b989f60ae47ea4aafda5ab9037bb4e3d18229475c9c12cd688dd25f52d
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkjpP3UACgkQ1fmVwcYIWAZbMgCfdysptvGIvK5LCs79q6Kh9BCZ
+CRoAnj/UM+c9NUjD9g5jzUWF6DUeg5wO
+=ggej
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-2.22.3-warnings.patch b/gnome-base/gnome-keyring/files/gnome-keyring-2.22.3-warnings.patch
new file mode 100644
index 000000000000..97b2b7ff4555
--- /dev/null
+++ b/gnome-base/gnome-keyring/files/gnome-keyring-2.22.3-warnings.patch
@@ -0,0 +1,27 @@
+--- trunk/common/gkr-unix-credentials.c	2008/06/29 13:24:49	1155
++++ trunk/common/gkr-unix-credentials.c	2008/07/02 16:08:26	1166
+@@ -90,6 +90,10 @@
+ 		if (errno == EINTR)
+ 			goto again;
+ 		return -1;
++		
++	} else if (ret == 0) {
++		/* Disconnected */
++		return -1;
+ 	}
+ 	
+ 	if (buf != '\0') {
+--- trunk/library/tests/unit-test-other.c	2008/02/14 17:22:27	1058
++++ trunk/library/tests/unit-test-other.c	2008/07/02 16:08:26	1166
+@@ -86,3 +86,11 @@
+ 	msg = gnome_keyring_result_to_message (GNOME_KEYRING_RESULT_KEYRING_ALREADY_EXISTS); 	
+ 	CuAssert (cu, "should return a valid message", msg && msg[0]);
+ }
++
++void unit_test_is_available (CuTest* cu)
++{
++	gboolean ret;
++	
++	ret = gnome_keyring_is_available ();
++	CuAssert (cu, "gnome_is_available returned false", ret == TRUE);
++}
diff --git a/gnome-base/gnome-keyring/gnome-keyring-2.22.1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-2.22.3-r1.ebuild
index 7a9eceb67940..b309c4908fca 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-2.22.1.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-2.22.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.22.1.ebuild,v 1.1 2008/04/07 20:34:10 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.22.3-r1.ebuild,v 1.1 2008/10/05 22:28:00 eva Exp $
 
 inherit gnome2 eutils pam
 
@@ -37,3 +37,10 @@ pkg_setup() {
 		$(use_with pam pam-dir $(getpam_mod_dir))
 		--with-root-certs=/usr/share/ca-certificates/"
 }
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Backport from trunk for fixing upstream bug #511285, bug #238098
+	epatch "${FILESDIR}/${P}-warnings.patch"
+}