Added a patch so that services don't fail if they list a missing module as

  "optional" or "sufficient".
Package-Manager: portage-2.1.2-r8

5 files changed, 110 insertions, 16 deletions

diff --git a/sys-auth/openpam/ChangeLog b/sys-auth/openpam/ChangeLog
index a42e9c369260..5d3c86cd6d56 100644
--- a/sys-auth/openpam/ChangeLog
+++ b/sys-auth/openpam/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-auth/openpam
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/openpam/ChangeLog,v 1.7 2006/10/30 09:54:57 flameeyes Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/openpam/ChangeLog,v 1.8 2007/02/06 15:05:19 uberlord Exp $
+
+*openpam-20050616-r1 (06 Feb 2007)
+
+  06 Feb 2007; Roy Marples <uberlord@gentoo.org>
+  +files/openpam-20050616-optional.patch, +openpam-20050616-r1.ebuild:
+  Added a patch so that services don't fail if they list a missing module as
+  "optional" or "sufficient".
 
   30 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
   openpam-20050616.ebuild:
diff --git a/sys-auth/openpam/Manifest b/sys-auth/openpam/Manifest
index 1969bd919b38..52073cd7693b 100644
--- a/sys-auth/openpam/Manifest
+++ b/sys-auth/openpam/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX openpam-20050201-gentoo.patch 6783 RMD160 82b333084feef282c6b20df224961d658ccaba5c SHA1 b14ec7025e9146623962ac14c7a162903f468f14 SHA256 9d360bca2635d4d30ae66cd62be032bc09df5cfae2ced3e602ebfff9dade0612
 MD5 1f429087f685185c153a880dc6124743 files/openpam-20050201-gentoo.patch 6783
 RMD160 82b333084feef282c6b20df224961d658ccaba5c files/openpam-20050201-gentoo.patch 6783
@@ -9,19 +6,27 @@ AUX openpam-20050201-nbsd.patch 449 RMD160 f9d7a48fa48af267bda9766b359314bda884e
 MD5 56d3140397d4d682547d53200fcd9884 files/openpam-20050201-nbsd.patch 449
 RMD160 f9d7a48fa48af267bda9766b359314bda884e2af files/openpam-20050201-nbsd.patch 449
 SHA256 5ca47d57dc688dfddb24107026f049f70e520d62acde34b6a395b99b8be90d02 files/openpam-20050201-nbsd.patch 449
+AUX openpam-20050616-optional.patch 744 RMD160 d542e6ea3f5268e7020481a6d8b14cd723625402 SHA1 fe2495811266971bb257985c9c2bc15c46b6fda5 SHA256 aa360df90347ee520a063ede6befdf7b4e56360243ed319708f2852587e8dfdb
+MD5 005b0fc9158544f7b0943a2c437278d1 files/openpam-20050616-optional.patch 744
+RMD160 d542e6ea3f5268e7020481a6d8b14cd723625402 files/openpam-20050616-optional.patch 744
+SHA256 aa360df90347ee520a063ede6befdf7b4e56360243ed319708f2852587e8dfdb files/openpam-20050616-optional.patch 744
 AUX openpam-20050616-redef.patch 423 RMD160 2aa4219c7731f4c6dd0187653f39ceab1813ac68 SHA1 e422f20bd29e37b255e77de1139d7f4cb76b4588 SHA256 b5db305b4d80fe538b3d6b46dabc8975c50c3937eca73e6ca480a8f48327786c
 MD5 d0166fb69acb567bd949f392275f37f7 files/openpam-20050616-redef.patch 423
 RMD160 2aa4219c7731f4c6dd0187653f39ceab1813ac68 files/openpam-20050616-redef.patch 423
 SHA256 b5db305b4d80fe538b3d6b46dabc8975c50c3937eca73e6ca480a8f48327786c files/openpam-20050616-redef.patch 423
 DIST openpam-20050616.tar.gz 375459 RMD160 4506364a65ea1bf8f7aa80254f593c1cad64ebbd SHA1 1334b9507b8ec288c7c95399b9338b3781b29ebb SHA256 2d8b552e9354c107dbbb49b61f6718911d031e8276a18a457039f29cc223deca
+EBUILD openpam-20050616-r1.ebuild 1291 RMD160 30939eea93ddbba35ff2b1eb71ed04698fa7e607 SHA1 a189f10923c2044b76da036467a644063ef3f6f5 SHA256 c7bf5c7a9faa4471f4bc34183ffc31c48c4e9cafa4f22dbb1b005016a1a2c4e6
+MD5 6945eb9ce970795af0421747b8accecc openpam-20050616-r1.ebuild 1291
+RMD160 30939eea93ddbba35ff2b1eb71ed04698fa7e607 openpam-20050616-r1.ebuild 1291
+SHA256 c7bf5c7a9faa4471f4bc34183ffc31c48c4e9cafa4f22dbb1b005016a1a2c4e6 openpam-20050616-r1.ebuild 1291
 EBUILD openpam-20050616.ebuild 1247 RMD160 c2e72b814cf6e6c64de02ed1cf6056762b72b229 SHA1 cf20204155c19ffea08c394c2d8527717c62a5b9 SHA256 997292760f704571e59bcea5618267c675bfb66b2908a71cc5abb7e7c045b0bf
 MD5 46a888f15c1d538dd169ca917fca5b3a openpam-20050616.ebuild 1247
 RMD160 c2e72b814cf6e6c64de02ed1cf6056762b72b229 openpam-20050616.ebuild 1247
 SHA256 997292760f704571e59bcea5618267c675bfb66b2908a71cc5abb7e7c045b0bf openpam-20050616.ebuild 1247
-MISC ChangeLog 1494 RMD160 acea16d311ce2f9c18cf97dcdfc4e01571020c29 SHA1 5dc78bf0665f3bec9e3666c55fda28bccca8d2e8 SHA256 62b18b67987cb0e831fcf96133cd5573acb77e6bf54e2785c94ed302871ba053
-MD5 34a29b38de6d32886ef69ed3d39a4afe ChangeLog 1494
-RMD160 acea16d311ce2f9c18cf97dcdfc4e01571020c29 ChangeLog 1494
-SHA256 62b18b67987cb0e831fcf96133cd5573acb77e6bf54e2785c94ed302871ba053 ChangeLog 1494
+MISC ChangeLog 1757 RMD160 8515c8f4eac6c3813ffcecf1bbe5bfbc0b54bcad SHA1 ddc85f7dea55e06d6969273062628cfd7cc9937a SHA256 f931a6f198883b2d1e07cca3f224c9b2e80d5fe2f167073c291e8ed8ff1cf451
+MD5 03fe8f6e35f395eeeed266e98ef70ada ChangeLog 1757
+RMD160 8515c8f4eac6c3813ffcecf1bbe5bfbc0b54bcad ChangeLog 1757
+SHA256 f931a6f198883b2d1e07cca3f224c9b2e80d5fe2f167073c291e8ed8ff1cf451 ChangeLog 1757
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -29,10 +34,6 @@ SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata
 MD5 ba3902a64b6594b988412b4201363f21 files/digest-openpam-20050616 250
 RMD160 1c20edd4fc95d38a80e5522d61103ff82fdb193d files/digest-openpam-20050616 250
 SHA256 f09e644035e5b54cd2eb008a96a5c589190724b3de99fe6597fc2a3ecd993ba3 files/digest-openpam-20050616 250
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFRcv3AiZjviIA2XgRArmUAKDBEfViWToXOCQP+8EQZvA0zCrh6wCfcvbq
-9gBGOVOoQRbmkSsMSwdH3oc=
-=U7TX
------END PGP SIGNATURE-----
+MD5 ba3902a64b6594b988412b4201363f21 files/digest-openpam-20050616-r1 250
+RMD160 1c20edd4fc95d38a80e5522d61103ff82fdb193d files/digest-openpam-20050616-r1 250
+SHA256 f09e644035e5b54cd2eb008a96a5c589190724b3de99fe6597fc2a3ecd993ba3 files/digest-openpam-20050616-r1 250
diff --git a/sys-auth/openpam/files/digest-openpam-20050616-r1 b/sys-auth/openpam/files/digest-openpam-20050616-r1
new file mode 100644
index 000000000000..e2691009c523
--- /dev/null
+++ b/sys-auth/openpam/files/digest-openpam-20050616-r1
@@ -0,0 +1,3 @@
+MD5 e82a48944d7080e7a3fb343afd5d8b0a openpam-20050616.tar.gz 375459
+RMD160 4506364a65ea1bf8f7aa80254f593c1cad64ebbd openpam-20050616.tar.gz 375459
+SHA256 2d8b552e9354c107dbbb49b61f6718911d031e8276a18a457039f29cc223deca openpam-20050616.tar.gz 375459
diff --git a/sys-auth/openpam/files/openpam-20050616-optional.patch b/sys-auth/openpam/files/openpam-20050616-optional.patch
new file mode 100644
index 000000000000..8610cdf0efe6
--- /dev/null
+++ b/sys-auth/openpam/files/openpam-20050616-optional.patch
@@ -0,0 +1,28 @@
+diff -ur openpam-20050616.orig/lib/openpam_configure.c openpam-20050616/lib/openpam_configure.c
+--- openpam-20050616.orig/lib/openpam_configure.c	2005-06-15 23:00:00 +0100
++++ openpam-20050616/lib/openpam_configure.c	2007-02-06 14:55:20 +0000
+@@ -220,8 +220,14 @@
+ 			goto syserr;
+ 		this->module = openpam_load_module(name);
+ 		FREE(name);
+-		if (this->module == NULL)
++		if (this->module == NULL) {
++			if (this->flag == PAM_OPTIONAL ||
++			    this->flag == PAM_SUFFICIENT) {
++				free(this);
++				continue;
++			}
+ 			goto fail;
++		}
+ 
+ 		/* module options */
+ 		p = q = next_word(p);
+@@ -249,7 +255,7 @@
+ 		/* next please... */
+ 		FREE(line);
+ 	}
+-	if (!feof(f))
++	if (!feof(f) || count == 0)
+ 		goto syserr;
+ 	fclose(f);
+ 	return (count);
diff --git a/sys-auth/openpam/openpam-20050616-r1.ebuild b/sys-auth/openpam/openpam-20050616-r1.ebuild
new file mode 100644
index 000000000000..822417b9b4e8
--- /dev/null
+++ b/sys-auth/openpam/openpam-20050616-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/openpam/openpam-20050616-r1.ebuild,v 1.1 2007/02/06 15:05:19 uberlord Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+inherit multilib flag-o-matic autotools
+
+DESCRIPTION="Open source PAM library."
+HOMEPAGE="http://www.openpam.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~sparc-fbsd ~x86-fbsd"
+IUSE="debug vim-syntax"
+
+RDEPEND="!virtual/pam"
+DEPEND="sys-devel/make
+	dev-lang/perl"
+PDEPEND="|| ( sys-freebsd/freebsd-pam-modules sys-netbsd/netbsd-pam-modules )
+	vim-syntax? ( app-vim/pam-syntax )"
+
+PROVIDE="virtual/pam"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-20050201-gentoo.patch"
+	epatch "${FILESDIR}/${PN}-20050201-nbsd.patch"
+	epatch "${FILESDIR}/${P}-redef.patch"
+	epatch "${FILESDIR}/${P}-optional.patch"
+
+	sed -i -e 's:-Werror::' "${S}/configure.ac"
+
+	eautoreconf
+	elibtoolize
+}
+
+src_compile() {
+	econf \
+		--disable-dependency-tracking \
+		--with-modules-dir=/$(get_libdir)/security \
+		${myconf} || die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install
+
+	dodoc CREDITS HISTORY MANIFEST RELNOTES README
+}