Bump, drop old. Notable changes: no longer autostarts in xfce and lxde (they don't support the new gnome-keyring dbus API), various bugfixes. Restrict tests since there seems to be no good way to reliably run them from portage.

(Portage version: 2.2.0_alpha74/cvs/Linux x86_64)

5 files changed, 126 insertions, 206 deletions

diff --git a/gnome-base/gnome-keyring/ChangeLog b/gnome-base/gnome-keyring/ChangeLog
index bd8ae0ee372f..7724e9ef332f 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.214 2011/10/30 15:58:01 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.215 2011/11/17 06:09:12 tetromino Exp $
+
+*gnome-keyring-3.2.2 (17 Nov 2011)
+
+  17 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -files/gnome-keyring-3.0.2-automagic-libcap.patch,
+  -gnome-keyring-3.0.3-r200.ebuild, -gnome-keyring-3.0.3-r300.ebuild,
+  +gnome-keyring-3.2.2.ebuild:
+  Bump, drop old. Notable changes: no longer autostarts in xfce and lxde (they
+  don't support the new gnome-keyring dbus API), various bugfixes. Restrict
+  tests since there seems to be no good way to reliably run them from portage.
 
   30 Oct 2011; Raúl Porcel <armin76@gentoo.org>
   gnome-keyring-2.32.1-r1.ebuild:
diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-3.0.2-automagic-libcap.patch b/gnome-base/gnome-keyring/files/gnome-keyring-3.0.2-automagic-libcap.patch
deleted file mode 100644
index 2947af310827..000000000000
--- a/gnome-base/gnome-keyring/files/gnome-keyring-3.0.2-automagic-libcap.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From b75b9d5aa7f6207eca190b9d8e08059872c99365 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Fri, 20 May 2011 17:53:43 -0400
-Subject: [PATCH] Fix automagic libcap dependency (GNOME bug #649936)
-
-Backport of the patch by Saleem Abdulrasool <compnerd@compnerd.org>
-to gnome-keyring-3.0.x
-
-Signed-off-by: Alexandre Rostovtsev <tetromino@gmail.com>
----
- configure.in |   29 +++++++++++++++++++++--------
- 1 files changed, 21 insertions(+), 8 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index b2d07a7..88f7e66 100644
---- a/configure.in
-+++ b/configure.in
-@@ -445,16 +445,29 @@ fi
- # libcap2
- #
-
--AC_CHECK_LIB([cap], [cap_get_proc], have_libcap="yes", have_libcap="no")
--
--if test $have_libcap = yes; then
--   AC_DEFINE(HAVE_LIBCAP, 1, [Have libcap2 package, libcap library])
--   DAEMON_LIBS="$DAEMON_LIBS -lcap"
--else
--   AC_MSG_WARN([libcap2 (or development headers) is not installed])
-+AC_ARG_WITH([libcap],
-+            [AC_HELP_STRING([--without-libcap],
-+                            [build without libcap2 (disables Linux capabilities support)])],,
-+            [with_libcap=auto])
-+
-+if test x"$with_libcap" != x"no" ; then
-+    AC_CHECK_LIB([cap], [cap_get_proc],
-+                 [
-+                   with_libcap="yes"
-+                   AC_DEFINE([HAVE_LIBCAP], [1], [Have libcap2 package, libcap library])
-+                   DAEMON_LIBS="$DAEMON_LIBS -lcap"
-+                 ],
-+                 [
-+                   if test x"$with_libcap" = x"yes" ; then
-+                     AC_MSG_ERROR([libcap2 support requested, but package not found])
-+                   else
-+                     AC_MSG_WARN([libcap2 (or development headers) is not installed])
-+                   fi
-+                   with_libcap="no"
-+                 ])
- fi
-
--libcap_status=$have_libcap
-+libcap_status=$with_libcap
-
- # --------------------------------------------------------------------
- # Debug mode
---
-1.7.5.rc3
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.0.3-r200.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.0.3-r200.ebuild
deleted file mode 100644
index b0cbc48eb204..000000000000
--- a/gnome-base/gnome-keyring/gnome-keyring-3.0.3-r200.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.0.3-r200.ebuild,v 1.1 2011/08/14 15:13:25 nirbheek Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 multilib pam virtualx
-
-DESCRIPTION="Password and keyring managing daemon"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-IUSE="+caps debug doc pam test"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
-~amd64-linux ~sparc-solaris ~x86-linux ~x86-solaris"
-
-# USE=valgrind is probably not a good idea for the tree
-
-RDEPEND=">=dev-libs/glib-2.25:2
-	>=x11-libs/gtk+-2.20:2
-	gnome-base/gconf:2
-	>=sys-apps/dbus-1.0
-	>=dev-libs/libgcrypt-1.2.2
-	>=dev-libs/libtasn1-1
-	caps? ( sys-libs/libcap )
-	pam? ( virtual/pam )
-"
-#	valgrind? ( dev-util/valgrind )
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/gtk-doc-am-1.9
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.9
-	doc? ( >=dev-util/gtk-doc-1.9 )"
-PDEPEND="gnome-base/libgnome-keyring"
-# eautoreconf needs:
-#	>=dev-util/gtk-doc-am-1.9
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-	G2CONF="${G2CONF}
-		$(use_enable debug)
-		$(use_enable test tests)
-		$(use_with caps libcap)
-		$(use_enable pam)
-		$(use_with pam pam-dir $(getpam_mod_dir))
-		--with-root-certs=${EPREFIX}/etc/ssl/certs/
-		--enable-ssh-agent
-		--enable-gpg-agent
-		--with-gtk=2.0"
-#		$(use_enable valgrind)
-}
-
-src_prepare() {
-	# Disable gcr tests due to weirdness with opensc
-	# ** WARNING **: couldn't load PKCS#11 module: /usr/lib64/pkcs11/gnome-keyring-pkcs11.so: Couldn't initialize module: The device was removed or unplugged
-	sed -e 's/^\(SUBDIRS = \.\)\(.*\)/\1/' \
-		-i gcr/Makefile.* || die "sed failed"
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=649936
-	epatch "${FILESDIR}"/${PN}-3.0.2-automagic-libcap.patch
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_test() {
-	# FIXME: /gkm/transaction/ tests fail
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check || die "emake check failed!"
-}
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.0.3-r300.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.0.3-r300.ebuild
deleted file mode 100644
index 64041bd6c45c..000000000000
--- a/gnome-base/gnome-keyring/gnome-keyring-3.0.3-r300.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.0.3-r300.ebuild,v 1.1 2011/08/14 15:13:25 nirbheek Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 multilib pam virtualx
-
-DESCRIPTION="Password and keyring managing daemon"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-IUSE="+caps debug doc pam test"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
-~amd64-linux ~sparc-solaris ~x86-linux ~x86-solaris"
-
-# USE=valgrind is probably not a good idea for the tree
-#
-# XXX: ARGH: libgcr is slotted, but libgck is not.
-# Hence, gtk2/3 versions are not parallel installable.
-RDEPEND=">=dev-libs/glib-2.25:2
-	>=x11-libs/gtk+-2.90.0:3
-	gnome-base/gconf:2
-	>=sys-apps/dbus-1.0
-	>=dev-libs/libgcrypt-1.2.2
-	>=dev-libs/libtasn1-1
-	caps? ( sys-libs/libcap )
-	pam? ( virtual/pam )
-"
-#	valgrind? ( dev-util/valgrind )
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/gtk-doc-am-1.9
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.9
-	doc? ( >=dev-util/gtk-doc-1.9 )"
-PDEPEND="gnome-base/libgnome-keyring"
-# eautoreconf needs:
-#	>=dev-util/gtk-doc-am-1.9
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-	G2CONF="${G2CONF}
-		$(use_enable debug)
-		$(use_enable test tests)
-		$(use_with caps libcap)
-		$(use_enable pam)
-		$(use_with pam pam-dir $(getpam_mod_dir))
-		--with-root-certs=${EPREFIX}/etc/ssl/certs/
-		--enable-ssh-agent
-		--enable-gpg-agent
-		--with-gtk=3.0"
-#		$(use_enable valgrind)
-}
-
-src_prepare() {
-	# Disable gcr tests due to weirdness with opensc
-	# ** WARNING **: couldn't load PKCS#11 module: /usr/lib64/pkcs11/gnome-keyring-pkcs11.so: Couldn't initialize module: The device was removed or unplugged
-	sed -e 's/^\(SUBDIRS = \.\)\(.*\)/\1/' \
-		-i gcr/Makefile.* || die "sed failed"
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=649936
-	epatch "${FILESDIR}"/${PN}-3.0.2-automagic-libcap.patch
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_test() {
-	# FIXME: /gkm/transaction/ tests fail
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check || die "emake check failed!"
-}
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild
new file mode 100644
index 000000000000..70d49ea4de08
--- /dev/null
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild,v 1.1 2011/11/17 06:09:12 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 multilib pam virtualx
+
+DESCRIPTION="Password and keyring managing daemon"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+IUSE="+caps debug doc pam test"
+KEYWORDS="~amd64 ~mips ~sh ~x86 ~x86-fbsd ~amd64-linux ~sparc-solaris ~x86-linux ~x86-solaris"
+
+# USE=valgrind is probably not a good idea for the tree
+RDEPEND=">=dev-libs/glib-2.25:2
+	>=x11-libs/gtk+-2.90.0:3
+	>=app-crypt/p11-kit-0.6
+	app-misc/ca-certificates
+	>=dev-libs/libgcrypt-1.2.2
+	>=dev-libs/libtasn1-1
+	>=sys-apps/dbus-1.0
+	caps? ( sys-libs/libcap-ng )
+	pam? ( virtual/pam )
+"
+#	valgrind? ( dev-util/valgrind )
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/gtk-doc-am-1.9
+	>=dev-util/intltool-0.35
+	>=dev-util/pkgconfig-0.9
+	doc? ( >=dev-util/gtk-doc-1.9 )"
+PDEPEND=">=gnome-base/libgnome-keyring-3.1.92"
+# eautoreconf needs:
+#	>=dev-util/gtk-doc-am-1.9
+
+# FIXME: tests are flaky and write to /tmp (instead of TMPDIR)
+RESTRICT="test"
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README"
+	G2CONF="${G2CONF}
+		$(use_enable debug)
+		$(use_enable test tests)
+		$(use_with caps libcap-ng)
+		$(use_enable pam)
+		$(use_with pam pam-dir $(getpam_mod_dir))
+		--with-root-certs=${EPREFIX}/etc/ssl/certs/
+		--enable-ssh-agent
+		--enable-gpg-agent
+		--disable-update-mime"
+#		$(use_enable valgrind)
+}
+
+src_prepare() {
+	# Disable gcr tests due to weirdness with opensc
+	# ** WARNING **: couldn't load PKCS#11 module: /usr/lib64/pkcs11/gnome-keyring-pkcs11.so: Couldn't initialize module: The device was removed or unplugged
+	sed -e 's/^\(SUBDIRS = \.\)\(.*\)/\1/' \
+		-i gcr/Makefile.* || die "sed failed"
+
+	gnome2_src_prepare
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check
+}
+
+pkg_postinst() {
+	use caps && fcaps 0:0 755 cap_ipc_lock "${ROOT}"/usr/bin/gnome-keyring-daemon
+
+	gnome2_pkg_postinst
+}
+
+# borrowed from GSoC2010_Gentoo_Capabilities by constanze and Flameeyes
+# @FUNCTION: fcaps
+# @USAGE: fcaps {uid:gid} {file-mode} {cap1[,cap2,...]} {file}
+# @RETURN: 0 if all okay; non-zero if failure and fallback
+# @DESCRIPTION:
+# fcaps sets the specified capabilities in the effective and permitted set of
+# the given file. In case of failure fcaps sets the given file-mode.
+fcaps() {
+	local uid_gid=$1
+	local perms=$2
+	local capset=$3
+	local path=$4
+	local res
+
+	chmod $perms $path && \
+	chown $uid_gid $path
+	res=$?
+
+	use caps || return $res
+
+	#set the capability
+	setcap "$capset=ep" "$path" &> /dev/null
+	#check if the capabilitiy got set correctly
+	setcap -v "$capset=ep" "$path" &> /dev/null
+	res=$?
+
+	if [ $res -ne 0 ]; then
+		ewarn "Failed to set capabilities. Probable reason is missed kernel support."
+		ewarn "Kernel must have SECURITY_FILE_CAPABILITIES, and <FS>_FS_SECURITY"
+		ewarn "enabled (e.g. EXT3_FS_SECURITY) where <FS> is the filesystem to store"
+		ewarn "${path}"
+		ewarn
+		ewarn "Falling back to suid now..."
+		chmod u+s ${path}
+	fi
+	return $res
+}