Applied patch (with small fix) from flameeyes to use the new pam eclass. Closes bug 93201.

Package-Manager: portage-2.0.51.22-r1

4 files changed, 22 insertions, 14 deletions

diff --git a/net-mail/poppassd_ceti/ChangeLog b/net-mail/poppassd_ceti/ChangeLog
index 182a51d27a6a..a53677f9daee 100644
--- a/net-mail/poppassd_ceti/ChangeLog
+++ b/net-mail/poppassd_ceti/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/poppassd_ceti
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/poppassd_ceti/ChangeLog,v 1.4 2005/05/17 14:16:19 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/poppassd_ceti/ChangeLog,v 1.5 2005/05/24 16:56:50 cryos Exp $
+
+*poppassd_ceti-1.8.5-r1 (24 May 2005)
+
+  24 May 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  -poppassd_ceti-1.8.5.ebuild, +poppassd_ceti-1.8.5-r1.ebuild:
+  Applied patch (with small fix) from flameeyes to use the new pam eclass.
+  Closes bug 93201.
 
 *poppassd_ceti-1.8.5 (17 May 2005)
 
diff --git a/net-mail/poppassd_ceti/Manifest b/net-mail/poppassd_ceti/Manifest
index 1dc8f4fb470b..431174e9a58b 100644
--- a/net-mail/poppassd_ceti/Manifest
+++ b/net-mail/poppassd_ceti/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 06c3c911f9918e25ec4e17f20077b2bb poppassd_ceti-1.8.5.ebuild 1143
 MD5 9d4b2a75461d556a576c30026c7d520d poppassd_ceti-1.8.4.ebuild 1229
-MD5 037612159fc5c05ec7973deaded3cdfc ChangeLog 836
+MD5 6224fe09a030ed87d985d3c8c8aa7cd9 poppassd_ceti-1.8.5-r1.ebuild 1153
+MD5 40b9f2ad0f263175cd28f3c129e0e002 ChangeLog 1086
 MD5 fe827b79b11c155518347e67d1b1af8a metadata.xml 762
 MD5 397ccdd516d577d12da910571053d732 files/digest-poppassd_ceti-1.8.4 64
-MD5 76b89dba95c6cc1a368e5e09b1cd5d38 files/digest-poppassd_ceti-1.8.5 64
 MD5 4254be91fe5aa08165875c23ec84af59 files/poppassd_ceti-gcc-3.4.patch 616
 MD5 3c5bb8c91acf9e91343716da1f3c244d files/poppassd.pam 249
+MD5 76b89dba95c6cc1a368e5e09b1cd5d38 files/digest-poppassd_ceti-1.8.5-r1 64
 MD5 3527c23e84a922b8615f073ee22b400a files/poppassd.xinetd 245
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCifzPntT9W3vfTuoRAlCjAJ9qo/f/X/wpF00L6/uCMJIt2dvDJQCfYJ8n
-bOzCzlSxl6SHqweQwAqlDOo=
-=oiOW
+iD8DBQFCk1z3ntT9W3vfTuoRAm0KAKCdYTeMmVYTQSVWiRsC1/hNN62s2gCfWiPs
+n7BpwSb6yYFa8REdeBRvn1A=
+=JJ9z
 -----END PGP SIGNATURE-----
diff --git a/net-mail/poppassd_ceti/files/digest-poppassd_ceti-1.8.5 b/net-mail/poppassd_ceti/files/digest-poppassd_ceti-1.8.5-r1
index 9775f54d8249..9775f54d8249 100644
--- a/net-mail/poppassd_ceti/files/digest-poppassd_ceti-1.8.5
+++ b/net-mail/poppassd_ceti/files/digest-poppassd_ceti-1.8.5-r1
diff --git a/net-mail/poppassd_ceti/poppassd_ceti-1.8.5.ebuild b/net-mail/poppassd_ceti/poppassd_ceti-1.8.5-r1.ebuild
index 63a481d6c1dd..2369af278ed1 100644
--- a/net-mail/poppassd_ceti/poppassd_ceti-1.8.5.ebuild
+++ b/net-mail/poppassd_ceti/poppassd_ceti-1.8.5-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/poppassd_ceti/poppassd_ceti-1.8.5.ebuild,v 1.1 2005/05/17 14:16:19 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/poppassd_ceti/poppassd_ceti-1.8.5-r1.ebuild,v 1.1 2005/05/24 16:56:50 cryos Exp $
 
-inherit eutils toolchain-funcs
+inherit eutils toolchain-funcs pam
 
 MY_PN="poppassd"
 MY_P="${MY_PN}-${PV}"
@@ -17,8 +17,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="cracklib"
 
-DEPEND="virtual/libc
-	>=sys-libs/pam-0.75-r8"
+DEPEND="virtual/pam"
 
 RDEPEND="${DEPEND}
 	sys-apps/xinetd
@@ -32,9 +31,11 @@ src_compile() {
 src_install() {
 	dodoc README
 
-	insinto /etc/pam.d
-	newins ${FILESDIR}/poppassd.pam poppassd
-	use cracklib && sed -i -e 's|#password|password|' ${D}/etc/pam.d/poppassd
+	pamd_mimic_system poppassd auth account password
+	if use cracklib; then
+		echo -e "password\trequired\tpam_cracklib.so retry=3" >> \
+			${D}/etc/pam.d/poppassd
+	fi
 
 	insinto /etc/xinetd.d
 	newins ${FILESDIR}/poppassd.xinetd poppassd