summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRemi Cardona <remi@gentoo.org>2007-10-03 09:11:21 +0000
committerRemi Cardona <remi@gentoo.org>2007-10-03 09:11:21 +0000
commit10b042ce24d8fd8dc9efcc2fca181e25c9d39637 (patch)
tree31c56e6f56f8351eb295a9f0d10756a0100039c1 /gnome-base
parentversion bump wrt bug #193664 (diff)
downloadhistorical-10b042ce24d8fd8dc9efcc2fca181e25c9d39637.tar.gz
historical-10b042ce24d8fd8dc9efcc2fca181e25c9d39637.tar.bz2
historical-10b042ce24d8fd8dc9efcc2fca181e25c9d39637.zip
gnome-base/gnome-keyring: sanitize gnome-keyring's pam module installation
Package-Manager: portage-2.1.3.11
Diffstat (limited to 'gnome-base')
-rw-r--r--gnome-base/gnome-keyring/ChangeLog9
-rw-r--r--gnome-base/gnome-keyring/Manifest29
-rw-r--r--gnome-base/gnome-keyring/files/digest-gnome-keyring-2.20.0-r13
-rw-r--r--gnome-base/gnome-keyring/files/gnome-keyring-2.20.0-fix_pam.patch43
-rw-r--r--gnome-base/gnome-keyring/gnome-keyring-2.20.0-r1.ebuild43
5 files changed, 112 insertions, 15 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/Manifest b/gnome-base/gnome-keyring/Manifest
index 6f6bec1b160b..8ac231f9ce4f 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -1,10 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX gnome-keyring-0.6.0-fbsd.patch 1268 RMD160 55a9f7eef3f95e59ee5235587b9c32b4681e85c6 SHA1 5ddd51a7929d52c408fc415e3824bf8b776deec3 SHA256 b20766b51197376bb22eae4a03aea84226e4b4147ea9297ab6cd3e2a3ab19acd
MD5 87200f5a1af8eb556a5271a1113e8b7f files/gnome-keyring-0.6.0-fbsd.patch 1268
RMD160 55a9f7eef3f95e59ee5235587b9c32b4681e85c6 files/gnome-keyring-0.6.0-fbsd.patch 1268
SHA256 b20766b51197376bb22eae4a03aea84226e4b4147ea9297ab6cd3e2a3ab19acd files/gnome-keyring-0.6.0-fbsd.patch 1268
+AUX gnome-keyring-2.20.0-fix_pam.patch 1557 RMD160 0ec77a38340fae6b4b2882cdf5eee9017bdd9722 SHA1 cc258b7c313d0566b9a28b27ad3fcef3f6acc90c SHA256 9009f89dafba1ab9719350e9238e6d9a659e196dbc10584f2cfd8920b9a321ff
+MD5 c9df4e9c107c2bb0cafb064732ed064b files/gnome-keyring-2.20.0-fix_pam.patch 1557
+RMD160 0ec77a38340fae6b4b2882cdf5eee9017bdd9722 files/gnome-keyring-2.20.0-fix_pam.patch 1557
+SHA256 9009f89dafba1ab9719350e9238e6d9a659e196dbc10584f2cfd8920b9a321ff files/gnome-keyring-2.20.0-fix_pam.patch 1557
DIST gnome-keyring-0.4.9.tar.bz2 396162 RMD160 9deca60a67cba29b978974007c59e6963fec900e SHA1 56a9f2b634fd0f1b9bd73bab3824d02a77ad34c3 SHA256 6e287d88c3a4ce8c64bb6b0de151c210ecb20e487d5e1c757ef0ad941a37d393
DIST gnome-keyring-0.6.0.tar.bz2 476280 RMD160 9114a0457871b7a4f9cfe6b3e979ab11881c9145 SHA1 53c5df57c068f3904a296e37ca743666eb42c7bb SHA256 649f2a0d5298b896781d0ac563b8ea1be7f3fe07fd17ea43b0ec0562be47769f
DIST gnome-keyring-0.8.1.tar.bz2 448558 RMD160 7f9b100aa59b26fee7b761d2705ad9725b87a031 SHA1 6473106b3621c5e6b7cbc16f5955ec704a1a39c2 SHA256 ad28558e2c0e5496cdfec3f8badf84d64af3aebc3fc9f5632066591e20ce3943
@@ -21,14 +22,18 @@ EBUILD gnome-keyring-0.8.1.ebuild 669 RMD160 e3c6a29aaa43379e9bf957f2192273d15f0
MD5 def1b954068ff19137b2b7a21a439e9a gnome-keyring-0.8.1.ebuild 669
RMD160 e3c6a29aaa43379e9bf957f2192273d15f0ead56 gnome-keyring-0.8.1.ebuild 669
SHA256 7b295a365439abbc0fd17ea54c8aa46f3440009e96e9b308ea17ab3ad984bdee gnome-keyring-0.8.1.ebuild 669
+EBUILD gnome-keyring-2.20.0-r1.ebuild 1087 RMD160 bb4029e6714b1aa0b3c734a6fde047c3e6050838 SHA1 7ef9d7c0f5940bd98e533faefc5769b84016ee0f SHA256 f8ba96019ad306436e08a5586ab9167d11594f83d134162aa3999d9fa2a5e2a6
+MD5 b0acbee9797207951628ea0d42f07b67 gnome-keyring-2.20.0-r1.ebuild 1087
+RMD160 bb4029e6714b1aa0b3c734a6fde047c3e6050838 gnome-keyring-2.20.0-r1.ebuild 1087
+SHA256 f8ba96019ad306436e08a5586ab9167d11594f83d134162aa3999d9fa2a5e2a6 gnome-keyring-2.20.0-r1.ebuild 1087
EBUILD gnome-keyring-2.20.0.ebuild 961 RMD160 1a94c40272f6caa55d0618f426cce9189d0e1b5d SHA1 e01a425e76e98a5546bb58cdcac10df87974b454 SHA256 0d2acf4850b90f278fd8ac3a80ccf027e3fdddd4f446f3ee59f93c50a0d24b00
MD5 fb87758151d7a4cb17bfd6fb174341ea gnome-keyring-2.20.0.ebuild 961
RMD160 1a94c40272f6caa55d0618f426cce9189d0e1b5d gnome-keyring-2.20.0.ebuild 961
SHA256 0d2acf4850b90f278fd8ac3a80ccf027e3fdddd4f446f3ee59f93c50a0d24b00 gnome-keyring-2.20.0.ebuild 961
-MISC ChangeLog 11394 RMD160 383e9d42926d3cc9f922570f0b79f7fb15666209 SHA1 526670b0933de95b45547867a25a763215efd2b2 SHA256 d0221d7c670ab0b81dc03b0f5fe128f58b6f18119b51e1cff7c8e120952d3616
-MD5 efd779d4a9e636b53f242d8b82a16db3 ChangeLog 11394
-RMD160 383e9d42926d3cc9f922570f0b79f7fb15666209 ChangeLog 11394
-SHA256 d0221d7c670ab0b81dc03b0f5fe128f58b6f18119b51e1cff7c8e120952d3616 ChangeLog 11394
+MISC ChangeLog 11627 RMD160 15136a09c50d713bd98454043e408c562d24c70e SHA1 34cd80ffc71742c7166613746959c701d6608658 SHA256 c709e65d23b6a3afb9d9dcbae59a897c3f646432235864b0df10c4870271219b
+MD5 c95d91e3fbc6084a6492c9a6ba07c813 ChangeLog 11627
+RMD160 15136a09c50d713bd98454043e408c562d24c70e ChangeLog 11627
+SHA256 c709e65d23b6a3afb9d9dcbae59a897c3f646432235864b0df10c4870271219b ChangeLog 11627
MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -45,10 +50,6 @@ SHA256 76e112c978f80806f7b2c9766275a7751d9a0979fb482232a2e47de4186c55fe files/di
MD5 6c2b356738e60100666ea02b1ef7d705 files/digest-gnome-keyring-2.20.0 265
RMD160 4350876a0bd58b442f62c3e33fc2b370c4076362 files/digest-gnome-keyring-2.20.0 265
SHA256 a95192a627a301e482f5e027f7f366812a06ca00b941fff0bdaa5e34f6bed7c9 files/digest-gnome-keyring-2.20.0 265
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHALmhkeYb6olFHJcRApHWAJ9TKtDFDFTPMhbh9++Ab+9V2d7fdgCgzZUa
-o8paX4XDjbFDo1+tSJBHxEY=
-=xm8R
------END PGP SIGNATURE-----
+MD5 6c2b356738e60100666ea02b1ef7d705 files/digest-gnome-keyring-2.20.0-r1 265
+RMD160 4350876a0bd58b442f62c3e33fc2b370c4076362 files/digest-gnome-keyring-2.20.0-r1 265
+SHA256 a95192a627a301e482f5e027f7f366812a06ca00b941fff0bdaa5e34f6bed7c9 files/digest-gnome-keyring-2.20.0-r1 265
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))"
+}