gnome-base/gnome-keyring: sanitize gnome-keyring's pam module installation

(Portage version: 2.1.3.11)

4 files changed, 97 insertions, 1 deletions

diff --git a/gnome-base/gnome-keyring/ChangeLog b/gnome-base/gnome-keyring/ChangeLog
index fe7e5b050138..fb4ef4c26d0e 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.98 2007/10/01 09:13:05 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.99 2007/10/03 09:11:21 remi Exp $
+
+*gnome-keyring-2.20.0-r1 (03 Oct 2007)
+
+  03 Oct 2007; Rémi Cardona <remi@gentoo.org>
+  +files/gnome-keyring-2.20.0-fix_pam.patch,
+  +gnome-keyring-2.20.0-r1.ebuild:
+  patch to put gnome-keyring's pam module in the right directory
 
 *gnome-keyring-2.20.0 (01 Oct 2007)
 
diff --git a/gnome-base/gnome-keyring/files/digest-gnome-keyring-2.20.0-r1 b/gnome-base/gnome-keyring/files/digest-gnome-keyring-2.20.0-r1
new file mode 100644
index 000000000000..441b928e628d
--- /dev/null
+++ b/gnome-base/gnome-keyring/files/digest-gnome-keyring-2.20.0-r1
@@ -0,0 +1,3 @@
+MD5 effc946bf3fa05d70b1251801383efd2 gnome-keyring-2.20.0.tar.bz2 572938
+RMD160 e6af5c03eef1a972f5b6d42da8360f2faade253f gnome-keyring-2.20.0.tar.bz2 572938
+SHA256 6fadcd85a16672381857de0e1cf2b6fe16ec3393931f92427deb13153eeabe1c gnome-keyring-2.20.0.tar.bz2 572938
diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-2.20.0-fix_pam.patch b/gnome-base/gnome-keyring/files/gnome-keyring-2.20.0-fix_pam.patch
new file mode 100644
index 000000000000..3e970060e031
--- /dev/null
+++ b/gnome-base/gnome-keyring/files/gnome-keyring-2.20.0-fix_pam.patch
@@ -0,0 +1,43 @@
+Index: configure.in
+===================================================================
+--- configure.in	(revision 841)
++++ configure.in	(working copy)
+@@ -249,7 +249,7 @@
+ AC_ARG_WITH([pam-dir],
+             [AC_HELP_STRING([--with-pam-dir=DIR],
+                              [directory to install pam modules in])],
+-             [], [with_pam_dir="/usr/lib"])
++             [], [with_pam_dir="/lib/security"])
+ PAM_DEST_DIR="$with_pam_dir"
+ AC_SUBST(PAM_DEST_DIR)
+ 	
+Index: pam/Makefile.am
+===================================================================
+--- pam/Makefile.am	(revision 841)
++++ pam/Makefile.am	(working copy)
+@@ -3,7 +3,8 @@
+ 	-I$(top_srcdir) \
+ 	-DGNOME_KEYRING_DAEMON=\""$(bindir)/gnome-keyring-daemon"\" 
+ 
+-lib_LTLIBRARIES = pam_gnome_keyring.la
++pamlibdir = $(PAM_DEST_DIR)
++pamlib_LTLIBRARIES = pam_gnome_keyring.la
+ 
+ pam_gnome_keyring_la_SOURCES = \
+ 	gkr-pam.h \
+@@ -17,15 +18,3 @@
+ pam_gnome_keyring_la_LDFLAGS = \
+ 	-module -avoid-version \
+ 	-export-symbols-regex 'pam_sm_'
+-
+-install-pam: install
+-	$(mkinstalldirs) "$(DESTDIR)$(PAM_DEST_DIR)"
+-	cp "$(DESTDIR)$(libdir)/pam_gnome_keyring.so" "$(DESTDIR)$(PAM_DEST_DIR)"
+-	( cd "$(DESTDIR)$(PAM_DEST_DIR)"; $(LN_S) -f pam_gnome_keyring.so pam_gnome_keyring_auth.so )
+-	( cd "$(DESTDIR)$(PAM_DEST_DIR)"; $(LN_S) -f pam_gnome_keyring.so pam_gnome_keyring_session.so )
+-	
+-uninstall-pam: 
+-	rm -f "$(DESTDIR)$(PAM_DEST_DIR)/pam_gnome_keyring.so"
+-	rm -f "$(DESTDIR)$(PAM_DEST_DIR)/pam_gnome_keyring_auth.so"
+-	rm -f "$(DESTDIR)$(PAM_DEST_DIR)/pam_gnome_keyring_session.so"
+-	
diff --git a/gnome-base/gnome-keyring/gnome-keyring-2.20.0-r1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-2.20.0-r1.ebuild
new file mode 100644
index 000000000000..6d9cfbefb9f9
--- /dev/null
+++ b/gnome-base/gnome-keyring/gnome-keyring-2.20.0-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2007 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.20.0-r1.ebuild,v 1.1 2007/10/03 09:11:21 remi Exp $
+
+inherit gnome2 eutils autotools pam
+
+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"
+IUSE="hal pam test"
+
+RDEPEND=">=dev-libs/glib-2.6
+		>=x11-libs/gtk+-2.6
+		>=sys-apps/dbus-1.0
+		hal? ( >=sys-apps/hal-0.5.7 )
+		pam? ( sys-libs/pam )
+		>=dev-libs/libgcrypt-1.2.2"
+DEPEND="${RDEPEND}
+		sys-devel/gettext
+		>=dev-util/intltool-0.35
+		>=dev-util/pkgconfig-0.9"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Fix tests
+	echo "gkr-ask-tool.c" >> ${S}/po/POTFILES.in
+
+	epatch "${FILESDIR}/${P}-fix_pam.patch"
+	eautoreconf
+}
+
+pkg_setup() {
+	G2CONF="$(use_enable hal) \
+		$(use_enable test tests) \
+		$(use_enable pam) \
+		$(use_with pam pam-dir $(getpam_mod_dir))"
+}