Add new version for Gnome 2.30

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

7 files changed, 248 insertions, 12 deletions

diff --git a/gnome-base/gnome-keyring/ChangeLog b/gnome-base/gnome-keyring/ChangeLog
index 95126d3e5d46..6d0e9f0b87ea 100644
--- a/gnome-base/gnome-keyring/ChangeLog
+++ b/gnome-base/gnome-keyring/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gnome-base/gnome-keyring
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.170 2010/06/04 20:06:50 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.171 2010/06/13 18:43:22 pacho Exp $
+
+*gnome-keyring-2.30.1-r1 (13 Jun 2010)
+
+  13 Jun 2010; Pacho Ramos <pacho@gentoo.org> -gnome-keyring-2.28.1.ebuild,
+  +gnome-keyring-2.30.1-r1.ebuild,
+  +files/gnome-keyring-2.30.1-dbus-activation.patch,
+  +files/gnome-keyring-2.30.1-password-less-login.patch,
+  +files/gnome-keyring-2.30.1-service-creation.patch,
+  +files/gnome-keyring-2.30.1-uninitialized-value.patch:
+  Add new version for Gnome 2.30, clean old version.
 
   04 Jun 2010; Markus Meier <maekke@gentoo.org> gnome-keyring-2.28.2.ebuild:
   x86 stable, bug #314899
diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
index 51550c801502..4adccf5b5184 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -8,21 +8,25 @@ AUX gnome-keyring-2.26.1-dlopen.patch 1273 RMD160 a0e181e8d2ccfd9c32a163dfb0c188
 AUX gnome-keyring-2.26.3-assert.patch 799 RMD160 0874e630288c95e0153ddaf95c57180d0e120bd9 SHA1 4aee0e3ea8ce2d5f32210756ebe050e4b784dc49 SHA256 9ad0a97aaff9587f01aee89192e0f75934ceb1da270a6ed2970d4a392c87dee8
 AUX gnome-keyring-2.26.3-parallel-tests.patch 1228 RMD160 11fd8c3ec61406d441490cc57da22767792ae483 SHA1 29f314bbf1d96d7c778d60ee134349d287bfecc4 SHA256 97462b84dffa6f117cfe7aea55345a60dc48fc25bcf985ada96d8314b4811e73
 AUX gnome-keyring-2.27.92-as-needed.patch 489 RMD160 372c2dad351e66d313ed7d0b93fef81e1f0aa9d0 SHA1 b1b42381834cf90a144988611cacdf70a94b206c SHA256 e504fb546d02c1b1c23709a8768b3dc500f57dc4e42fd650f7c288582a2da5b4
+AUX gnome-keyring-2.30.1-dbus-activation.patch 1318 RMD160 189a51f5033825e43ac14aca88db47dbd231c6ca SHA1 7dd88dee4e6def992ca023c56f81599be59ac146 SHA256 4172736975e9b3edb7e7aeaff11effea2a6bd9165059d977111083ad7624ad51
+AUX gnome-keyring-2.30.1-password-less-login.patch 3426 RMD160 a0c46edabf3ec260d28ec6a835faee5f45bbe0dd SHA1 767f51e6690b78cc064f422e4e3ce8b0606c267d SHA256 c1d02bcdb7525c3778271814abfc248cf8207e9caecd4fd5b3cb4fb7eece2c6b
+AUX gnome-keyring-2.30.1-service-creation.patch 707 RMD160 9a702afe5d90273f5375a80c5c3a63bfd1140ebe SHA1 0163186490905553da64d0c54164c85d096beca9 SHA256 4afad6d8e84731a85162f82c995128cc0b36b3db239ef7dce1a2f742a7fe9b68
+AUX gnome-keyring-2.30.1-uninitialized-value.patch 788 RMD160 f49f219c95179af59ca5a9c7ea5d6c88b89d4649 SHA1 53cada6f271f7fd332dc2948e09d9c08f90e9c9c SHA256 e7ff1353a4e4ecb6d3e3265533c989e7ad7b5acc0b595ce7b95de2bb3db5985c
 DIST gnome-keyring-2.22.3.tar.bz2 894308 RMD160 551f4a4d734e0196522be9276ae7e76110a96556 SHA1 0f52095590a684920cc683d1985ac66263702114 SHA256 1e14eed00d386763352896e540929760264885e1296ac11cfb8ca1c08dcea7f6
 DIST gnome-keyring-2.26.3.tar.bz2 2692915 RMD160 323cf0fe5f11260573e0d20998c879380f4c2122 SHA1 c07136f0757937a7fe6989cbdf3bf8103da55364 SHA256 319eef68f9c82225dcce06d2f6cfda9196da66a799459b8a00da9bb490529539
-DIST gnome-keyring-2.28.1.tar.bz2 2759424 RMD160 ec4a4e8b1bed8823595dccabdf83c8f2e2fddd8f SHA1 22335bca6da19f9aa7cef56698ef3a6507a3268b SHA256 549a85092d4bbd08cbae4becd9be0a9f40f371498303eda1aa9aa3a27458aa91
 DIST gnome-keyring-2.28.2.tar.bz2 3009480 RMD160 0e09c7274c4c4ea037bc7eb4ff8edaaca53f04f0 SHA1 099146a0cb3c03683cfc3fe3caaddf5dff00acf8 SHA256 d2d686fb2528ee045bbcd9f18d0d452e0eb88c2265a1947f639152b61a5987f6
+DIST gnome-keyring-2.30.1.tar.bz2 1593050 RMD160 70ec1c3e033fbd6ab71bd411750c136ee2e701d1 SHA1 bf7623d8a2bc9013a8109e1e433d0a45e9dd759b SHA256 a76e7e06c3daa44340f8a3a0f3ef4b784973cdddff2d854cb30a3e7950796e5a
 EBUILD gnome-keyring-2.22.3-r1.ebuild 1424 RMD160 7d90a3169597875d794be8ca88c6484f77937563 SHA1 c974e49b6acc76feb73488ecf85483a229c75620 SHA256 be8918229399ac8783576131b19a922dcf206b934bc879dcd0540e755b92ec2a
 EBUILD gnome-keyring-2.22.3-r2.ebuild 1569 RMD160 e665115c65fb04c99e84580e068a2c9c2895629b SHA1 4660676bb83e02806c13b21e3d9e801119661d0f SHA256 28e783db5b47ccb05eff9764b7c263020eb98bd356744ff7333a4fbcbb78040c
 EBUILD gnome-keyring-2.26.3.ebuild 2030 RMD160 efa8c3bcdec33e2d618565854f2d60ca9162b0ce SHA1 e55c3cb59d444e1dd37625e310590f645ed0e0f5 SHA256 2e5f674414416ea8ac66242029efeb3beb055e0e14c609bb7edd310072ec23f4
-EBUILD gnome-keyring-2.28.1.ebuild 1463 RMD160 e3544f72912d87f75c854055b0882b09a8af67ce SHA1 7435999dc5702f960a292c3ed88b23bd529c0bf4 SHA256 c416e440cb1d228f84aae8c9aea9e1c9bff4c712510d3db77967a8edfa3fa1a8
 EBUILD gnome-keyring-2.28.2.ebuild 1464 RMD160 f5b8b5f4a91aa88c8313c19eb5c14eebba50cc28 SHA1 c78b81cec9abb1312e18ebec7dda1237256c23a1 SHA256 937c8269b00f4627d5c693e6bc737090e01d9d9227987526ab22d44250b9953b
-MISC ChangeLog 22194 RMD160 32c4d5f1260e8c27acb722c4d3447a405bcac9f3 SHA1 3ffa0203d29a236493d4681007642767a233b45c SHA256 5cdb27d483e47e173384c57c750740b1684c084a3e4dd713147dd43b661fa6c9
+EBUILD gnome-keyring-2.30.1-r1.ebuild 2081 RMD160 f05bbc45bffb1fc7f6998cc0feaab1c2ab112a7a SHA1 8dfd46aa8a4cfc1e2020b05103f3c993104398df SHA256 cf37f1db44bd33a5adbe7e7932f3150298a79a5b38b9ef0f982adc74c0e0d1cf
+MISC ChangeLog 22619 RMD160 934448725804cc24f3e33bf8768d48590703bc68 SHA1 838203ed0a9d7126c843d2186604d794fafe7ea7 SHA256 b94e66789ef101855e8158fdc6d4eaae4c5a443447a75d512eb77c9e88ad2b2f
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwJXHcACgkQkKaRLQcq0GLNaQCfQaBg2WhnZI2PjCNY1tmSiMS9
-uxcAoIqwWk6lGCnlah0XCul7+MKxXEH6
-=hPrR
+iEYEARECAAYFAkwVJtAACgkQCaWpQKGI+9Rc3gCfXOL3YUA9YJn6Z55IPXlrMl6z
+G8oAniHz5dxTsYVFP5y7glH9HnQnTsmI
+=+GAv
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-2.30.1-dbus-activation.patch b/gnome-base/gnome-keyring/files/gnome-keyring-2.30.1-dbus-activation.patch
new file mode 100644
index 000000000000..a4feee987662
--- /dev/null
+++ b/gnome-base/gnome-keyring/files/gnome-keyring-2.30.1-dbus-activation.patch
@@ -0,0 +1,40 @@
+From b36d6beeb2fa430210c8a2aa19f772bd75325e42 Mon Sep 17 00:00:00 2001
+From: Rob Bradford <rob@linux.intel.com>
+Date: Wed, 14 Apr 2010 18:12:41 +0000
+Subject: Add dbus activation service file for org.freedesktop.secrets
+
+Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=611002
+---
+diff --git a/daemon/Makefile.am b/daemon/Makefile.am
+index be96523..4c95b5a 100644
+--- a/daemon/Makefile.am
++++ b/daemon/Makefile.am
+@@ -54,14 +54,16 @@ gnome_keyring_daemon_LDADD = \
+ 
+ EXTRA_DIST = \
+ 	org.gnome.keyring.service.in \
++	org.freedesktop.secrets.service.in \
+ 	$(desktop_in_files)
+ 
+ CLEANFILES = \
+ 	org.gnome.keyring.service \
++	org.freedesktop.service \
+ 	$(desktop_DATA)
+ 
+ servicedir       = $(DBUS_SERVICES_DIR)
+-service_in_files = org.gnome.keyring.service.in
++service_in_files = org.gnome.keyring.service.in org.freedesktop.secrets.service.in
+ service_DATA     = $(service_in_files:.service.in=.service)
+ service_PATH     = $(VALGRIND_RUN)$(bindir)
+ 
+diff --git a/daemon/org.freedesktop.secrets.service.in b/daemon/org.freedesktop.secrets.service.in
+new file mode 100644
+index 0000000..d4db713
+--- a/dev/null
++++ b/daemon/org.freedesktop.secrets.service.in
+@@ -0,0 +1,3 @@
++[D-BUS Service]
++Name=org.freedesktop.secrets
++Exec=@PATH@/gnome-keyring-daemon --start --foreground --components=secrets
+--
+cgit v0.8.3.1
diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-2.30.1-password-less-login.patch b/gnome-base/gnome-keyring/files/gnome-keyring-2.30.1-password-less-login.patch
new file mode 100644
index 000000000000..d4e770f5e067
--- /dev/null
+++ b/gnome-base/gnome-keyring/files/gnome-keyring-2.30.1-password-less-login.patch
@@ -0,0 +1,120 @@
+From 28f19c9b4cdc2fa3cfc0aa25f34760aee3c3c802 Mon Sep 17 00:00:00 2001
+From: Stef Walter <stef@memberwebs.com>
+Date: Sun, 23 May 2010 16:19:39 +0000
+Subject: Fix broken startup when used with gdm and password-less login.
+
+Fixes bug #611002
+---
+diff --git a/daemon/gkd-main.c b/daemon/gkd-main.c
+index 6ac0b65..55790eb 100644
+--- a/daemon/gkd-main.c
++++ b/daemon/gkd-main.c
+@@ -396,7 +396,7 @@ read_login_password (int fd)
+ 	/*
+ 	 * When --login is specified then the login password is passed
+ 	 * in on stdin. All data (including newlines) are part of the
+-	 * password.
++	 * password. A zero length password is no password.
+ 	 */
+ 
+ 	gchar *buf = egg_secure_alloc (MAX_BLOCK);
+@@ -412,17 +412,15 @@ read_login_password (int fd)
+ 			egg_secure_free (buf);
+ 			return NULL;
+ 
+-		} else  {
+-			char *n = egg_secure_realloc (ret, len + r + 1);
+-			memset(n + len, 0, r + 1);
+-			ret = n;
+-			len = len + r;
++		} else if (r == 0 || len > MAX_LENGTH) {
++			break;
+ 
++		} else {
++			ret = egg_secure_realloc (ret, len + r + 1);
++			memset (ret + len, 0, r + 1);
++			len = len + r;
+ 			strncat (ret, buf, r);
+ 		}
+-
+-		if (r == 0 || len > MAX_LENGTH)
+-			break;
+ 	}
+ 
+ 	egg_secure_free (buf);
+diff --git a/pam/gkr-pam-module.c b/pam/gkr-pam-module.c
+index bf3c844..d6fc17d 100644
+--- a/pam/gkr-pam-module.c
++++ b/pam/gkr-pam-module.c
+@@ -318,14 +318,11 @@ cleanup_free_password (pam_handle_t *ph, void *data, int pam_end_status)
+ }
+ 
+ static void
+-setup_child (int inp[2], int outp[2], int errp[2], 
+-             pam_handle_t *ph, struct passwd *pwd, const char *password)
++setup_child (int inp[2], int outp[2], int errp[2], pam_handle_t *ph, struct passwd *pwd)
+ {
+ 	const char* display;
+ 	int i, ret;
+ 
+-	/* The --login argument comes last, because of code below */
+-	
+ #ifdef VALGRIND 	
+ 	char *args[] = { VALGRIND, VALGRIND_ARG, GNOME_KEYRING_DAEMON, "--daemonize", "--login", NULL};
+ #else
+@@ -335,14 +332,6 @@ setup_child (int inp[2], int outp[2], int errp[2],
+ 	assert (pwd);
+ 	assert (pwd->pw_dir);
+ 
+-	/* If no password, don't pass in --login */
+-	if (password == NULL) {
+-		for (i = 0; args[i]; ++i) {
+-			if (strcmp ("--login", args[i]) == 0)
+-				args[i] = NULL;
+-		}
+-	}
+-
+ 	/* Fix up our end of the pipes */
+ 	if (dup2 (inp[READ_END], STDIN) < 0 ||
+ 	    dup2 (outp[WRITE_END], STDOUT) < 0 || 
+@@ -499,7 +488,7 @@ start_daemon (pam_handle_t *ph, struct passwd *pwd, const char *password)
+ 		
+ 	/* This is the child */
+ 	case 0:
+-		setup_child (inp, outp, errp, ph, pwd, password);
++		setup_child (inp, outp, errp, ph, pwd);
+ 		/* Should never be reached */
+ 		break;
+ 		
+@@ -507,19 +496,23 @@ start_daemon (pam_handle_t *ph, struct passwd *pwd, const char *password)
+ 	default:
+ 		break;
+ 	};
+-	
++
+ 	/* Close our unneeded ends of the pipes */
+ 	close (inp[READ_END]);
+ 	close (outp[WRITE_END]);
+ 	close (errp[WRITE_END]);
+ 	inp[READ_END] = outp[WRITE_END] = errp[WRITE_END] = -1; 
+ 
+-	if (password) {
+-		/* Write the login keyring password */
++	/*
++	 * We always pass in a --login argument, even when we have a NULL password
++	 * since this controls the startup behavior. When using --login daemon waits
++	 * for a password. Closing input signifies password is done.
++	 */
++
++	if (password)
+ 		write_string (inp[WRITE_END], password);
+-		close (inp[WRITE_END]);
+-	}
+-	
++	close (inp[WRITE_END]);
++
+ 	/* 
+ 	 * Note that we're not using select() or any such. We know how the 
+ 	 * daemon sends its data.
+--
+cgit v0.8.3.1
diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-2.30.1-service-creation.patch b/gnome-base/gnome-keyring/files/gnome-keyring-2.30.1-service-creation.patch
new file mode 100644
index 000000000000..0991c306ac34
--- /dev/null
+++ b/gnome-base/gnome-keyring/files/gnome-keyring-2.30.1-service-creation.patch
@@ -0,0 +1,21 @@
+From d6bb94e9c05072fc791fb5045f5b1ab22d11d916 Mon Sep 17 00:00:00 2001
+From: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
+Date: Mon, 19 Apr 2010 13:47:26 +0000
+Subject: Make sure the service files are created correctly
+
+---
+diff --git a/daemon/Makefile.am b/daemon/Makefile.am
+index 4c95b5a..9edb13f 100644
+--- a/daemon/Makefile.am
++++ b/daemon/Makefile.am
+@@ -68,7 +68,7 @@ service_DATA     = $(service_in_files:.service.in=.service)
+ service_PATH     = $(VALGRIND_RUN)$(bindir)
+ 
+ # Rule to make the service file with bindir expanded
+-$(service_DATA): $(service_in_files) Makefile
++%.service: %.service.in Makefile
+ 	@sed -e "s|\@PATH\@|$(service_PATH)|" $< > $@
+ 
+ desktop_in_files = \
+--
+cgit v0.8.3.1
diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-2.30.1-uninitialized-value.patch b/gnome-base/gnome-keyring/files/gnome-keyring-2.30.1-uninitialized-value.patch
new file mode 100644
index 000000000000..7f91d1a5a533
--- /dev/null
+++ b/gnome-base/gnome-keyring/files/gnome-keyring-2.30.1-uninitialized-value.patch
@@ -0,0 +1,23 @@
+From 453c143338895bdd094c9398e8ef336d0f8cba8e Mon Sep 17 00:00:00 2001
+From: Nshepperd <nshepperd@gmail.com>
+Date: Wed, 05 May 2010 14:30:01 +0000
+Subject: Fix checking of uninitialized value in prompting code.
+
+Fixes problem repeatedly asking for password to unlock. See
+bug #616071
+---
+diff --git a/daemon/prompt/gkd-prompt.c b/daemon/prompt/gkd-prompt.c
+index a4ea7fc..645255a 100644
+--- a/daemon/prompt/gkd-prompt.c
++++ b/daemon/prompt/gkd-prompt.c
+@@ -796,7 +796,7 @@ gkd_prompt_get_transport_param (GkdPrompt *self, const gchar *name, gsize *n_val
+ {
+ 	g_return_val_if_fail (GKD_IS_PROMPT (self), NULL);
+ 	g_return_val_if_fail (name, NULL);
+-	g_return_val_if_fail (*n_value, NULL);
++	g_return_val_if_fail (n_value, NULL);
+ 
+ 	if (self->pv->failure)
+ 		return NULL;
+--
+cgit v0.8.3.1
diff --git a/gnome-base/gnome-keyring/gnome-keyring-2.28.1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-2.30.1-r1.ebuild
index 834deaecdbdb..171c2f8d5301 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-2.28.1.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-2.30.1-r1.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.28.1.ebuild,v 1.2 2009/10/30 00:34:45 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.30.1-r1.ebuild,v 1.1 2010/06/13 18:43:22 pacho Exp $
 
 EAPI="2"
 
-inherit gnome2 pam virtualx
+inherit eutils gnome2 pam virtualx autotools
 
 DESCRIPTION="Password and keyring managing daemon"
 HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="debug doc pam test"
 # USE=valgrind is probably not a good idea for the tree
 
@@ -28,8 +28,9 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35
 	>=dev-util/pkgconfig-0.9
 	doc? ( >=dev-util/gtk-doc-1.9 )"
+PDEPEND="gnome-base/libgnome-keyring"
 
-DOCS="AUTHORS ChangeLog NEWS README TODO keyring-intro.txt"
+DOCS="AUTHORS ChangeLog NEWS README"
 
 pkg_setup() {
 	G2CONF="${G2CONF}
@@ -46,9 +47,26 @@ pkg_setup() {
 src_prepare() {
 	gnome2_src_prepare
 
+	# Add dbus activation service file for org.freedesktop.secrets, bgo#611002
+	epatch "${FILESDIR}/${P}-dbus-activation.patch"
+
+	# Make sure the service files are created correctly
+	epatch "${FILESDIR}/${P}-service-creation.patch"
+
+	# Fix checking of uninitialized value in prompting code, bgo#616071
+	epatch "${FILESDIR}/${P}-uninitialized-value.patch"
+
+	# Fix broken startup when used with gdm and password-less login, bgo#611002
+	epatch "${FILESDIR}/${P}-password-less-login.patch"
+
 	# Remove silly CFLAGS
 	sed 's:CFLAGS="$CFLAGS -Werror:CFLAGS="$CFLAGS:' \
 		-i configure.in configure || die "sed failed"
+
+	# Fix intltoolize broken file, see upstream #577133
+	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
+		|| die "sed failed"
+	eautoreconf
 }
 
 src_test() {