Version bump, and solve a few issues like the ignored cflags and the pre-stripped binary.

Package-Manager: portage-2.1.3_rc7

6 files changed, 97 insertions, 28 deletions

diff --git a/sys-auth/pam_passwdqc/ChangeLog b/sys-auth/pam_passwdqc/ChangeLog
index 7c45dcbe2a99..cacc6a5b358c 100644
--- a/sys-auth/pam_passwdqc/ChangeLog
+++ b/sys-auth/pam_passwdqc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-auth/pam_passwdqc
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_passwdqc/ChangeLog,v 1.6 2007/02/22 01:01:52 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_passwdqc/ChangeLog,v 1.7 2007/07/11 12:37:52 flameeyes Exp $
+
+*pam_passwdqc-1.0.4 (11 Jul 2007)
+
+  11 Jul 2007; Diego Pettenò <flameeyes@gentoo.org>
+  +files/pam_passwdqc-1.0.4-makefile.patch, -pam_passwdqc-1.0.2.ebuild,
+  +pam_passwdqc-1.0.4.ebuild:
+  Version bump, and solve a few issues like the ignored cflags and the
+  pre-stripped binary.
 
   22 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/sys-auth/pam_passwdqc/Manifest b/sys-auth/pam_passwdqc/Manifest
index b9fdcb6f00ef..3146bab3d13e 100644
--- a/sys-auth/pam_passwdqc/Manifest
+++ b/sys-auth/pam_passwdqc/Manifest
@@ -1,20 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX pam_passwdqc-1.0.4-makefile.patch 1505 RMD160 fe5089edde5b1baa056cc8486cf02a1f79a188e9 SHA1 af0d20cdaf4499e39892791da07edda046c373f7 SHA256 8736d920f457f8192302c77a8bf344c53b5f91605eaebc14bb044e30f28abe99
+MD5 5fe157c17da8c9f1ae3d3b2bef6119a8 files/pam_passwdqc-1.0.4-makefile.patch 1505
+RMD160 fe5089edde5b1baa056cc8486cf02a1f79a188e9 files/pam_passwdqc-1.0.4-makefile.patch 1505
+SHA256 8736d920f457f8192302c77a8bf344c53b5f91605eaebc14bb044e30f28abe99 files/pam_passwdqc-1.0.4-makefile.patch 1505
 DIST pam_passwdqc-0.7.5.tar.gz 29975 RMD160 831dd0ceac6836a673c040c9bc5dd5f879fe42f3 SHA1 e603fce61ccefc47ba38926b3745ddf324c27d1e SHA256 254314598108650e97479c8ff97c2cf6f37dac8f6ec76bb345ac2c48df9dacf1
-DIST pam_passwdqc-1.0.2.tar.gz 30383 RMD160 e51070807e7cb64fe8646f5de05eae06ea976ab1 SHA1 f433f8c954474be240b04526b70cedf0e64b21b7 SHA256 c0163e6e6f89519b7ec2eb7ccf353661f4885e6c0ce4a976d905433e79b0efaf
+DIST pam_passwdqc-1.0.4.tar.gz 30572 RMD160 9fab553995076726cf6d566962180c07319bfdbf SHA1 8115a0afab2ba30d3730ab38a879b5b2bba609a4 SHA256 192d0eb131f203fd809c371751aa1a670df044190b56444b1e6576d8c8672cb6
 EBUILD pam_passwdqc-0.7.5.ebuild 894 RMD160 02f269cff83ffe9a8672f4ab815d8017c2939872 SHA1 00eaacff93d8da9493c5782a2378d507ba9fe7d2 SHA256 4b93e11a1091f89461ece7e970341f7f8ea808be82f119069aaa11c5f2b78210
 MD5 31112b2364b4fd67f10948f48bf1b06e pam_passwdqc-0.7.5.ebuild 894
 RMD160 02f269cff83ffe9a8672f4ab815d8017c2939872 pam_passwdqc-0.7.5.ebuild 894
 SHA256 4b93e11a1091f89461ece7e970341f7f8ea808be82f119069aaa11c5f2b78210 pam_passwdqc-0.7.5.ebuild 894
-EBUILD pam_passwdqc-1.0.2.ebuild 889 RMD160 aea690c623b0e8f80b2508ab5dc995ed76869558 SHA1 71f0746a7d71c4b0c4c8c5556fd2d9876b56fecf SHA256 d82f323ec80a791d0e5bee48048b82881acac94ae98df0c98c99df515782905c
-MD5 1eb0cb51b36449eda2a41c2457f191d4 pam_passwdqc-1.0.2.ebuild 889
-RMD160 aea690c623b0e8f80b2508ab5dc995ed76869558 pam_passwdqc-1.0.2.ebuild 889
-SHA256 d82f323ec80a791d0e5bee48048b82881acac94ae98df0c98c99df515782905c pam_passwdqc-1.0.2.ebuild 889
-MISC ChangeLog 1813 RMD160 bac0edc9e012cbbbc1a43d0edacd4660cabcf527 SHA1 e94de266e62098f300661ce58d63eb48476f3185 SHA256 b729d9f8339fb6b5d2ca302868460d2fb193e4430a25467a9990423af15c3b03
-MD5 1bf4275ecb4bf8443bbf9a0fbf6dc64f ChangeLog 1813
-RMD160 bac0edc9e012cbbbc1a43d0edacd4660cabcf527 ChangeLog 1813
-SHA256 b729d9f8339fb6b5d2ca302868460d2fb193e4430a25467a9990423af15c3b03 ChangeLog 1813
+EBUILD pam_passwdqc-1.0.4.ebuild 1136 RMD160 926ee6ec1d50c497333fd2d17fd245fe44dae388 SHA1 c61fca05a2d72f133518d9fb19f147cda1b97c01 SHA256 b39381ba29c634c4ca08db32e889417f626db0f0db7a6cbd70f5b0cf3dc94e88
+MD5 bcf3e93cf08fa49b781b98e2a1e48e03 pam_passwdqc-1.0.4.ebuild 1136
+RMD160 926ee6ec1d50c497333fd2d17fd245fe44dae388 pam_passwdqc-1.0.4.ebuild 1136
+SHA256 b39381ba29c634c4ca08db32e889417f626db0f0db7a6cbd70f5b0cf3dc94e88 pam_passwdqc-1.0.4.ebuild 1136
+MISC ChangeLog 2102 RMD160 d8174d1003d143ca0b6cb750dfed48889cd5e5cd SHA1 7f5624669401fe57711af097456d3859b86131e5 SHA256 1fcedb8f751a65ea899996a87e3f59505d37f8cbf4761632868c4f0f4047db2f
+MD5 210ec0508cb6ca4c6eaf09e28b51f5ba ChangeLog 2102
+RMD160 d8174d1003d143ca0b6cb750dfed48889cd5e5cd ChangeLog 2102
+SHA256 1fcedb8f751a65ea899996a87e3f59505d37f8cbf4761632868c4f0f4047db2f ChangeLog 2102
 MISC metadata.xml 580 RMD160 c7c2b710fece22247e6555676bd3ccc08f6914e8 SHA1 b07d44725b73fc01dedffc2f934f74760e65e0df SHA256 3439e8a595d2c399ee1b288c03ecc1f7287b79d3b009a5230da4e4f723fc70c0
 MD5 4d91d9e8162fa3f836a62ff3cf188352 metadata.xml 580
 RMD160 c7c2b710fece22247e6555676bd3ccc08f6914e8 metadata.xml 580
@@ -22,13 +26,13 @@ SHA256 3439e8a595d2c399ee1b288c03ecc1f7287b79d3b009a5230da4e4f723fc70c0 metadata
 MD5 123b9e4daf81b22bc13d04bafda04dd1 files/digest-pam_passwdqc-0.7.5 253
 RMD160 c614ea30edf9b155b7b410e690685d88664dd967 files/digest-pam_passwdqc-0.7.5 253
 SHA256 b25a096c030ee3bc625fa91270632ecda7cc011bf5a55b59c83bdf8c08f32f42 files/digest-pam_passwdqc-0.7.5 253
-MD5 c12d9b46735b925ee97d2357af3c6816 files/digest-pam_passwdqc-1.0.2 253
-RMD160 d386db0a03af616662fd6ee9caddcf5629a660af files/digest-pam_passwdqc-1.0.2 253
-SHA256 8771b4f7237e4d5e8c77eb9ac6cbfe2e313196ccfadabad005094c140ba50cac files/digest-pam_passwdqc-1.0.2 253
+MD5 796e3072e29736ae108564186d038d52 files/digest-pam_passwdqc-1.0.4 253
+RMD160 adea3c78fef2db83415f3872cdf9443d6c894251 files/digest-pam_passwdqc-1.0.4 253
+SHA256 92ad461dfaeb17f066113f1160eaf924684ce4c06b9cb0dc26d66cd8fb64b67b files/digest-pam_passwdqc-1.0.4 253
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFF3OsYz974XjDVpbkRAppBAJ9/Al94NjvhOQkRnUZZn4rfG7kmUACg07Qw
-VK8cCiKAuq/XbwqmV/pza70=
-=2dco
+iD8DBQFGlM9FAiZjviIA2XgRAlcOAKCN120nFQL1AtEqsmx16b9VcF990QCfSo6T
+s/HPhg3+/L4rg5KgJYpwRA0=
+=YWmT
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/pam_passwdqc/files/digest-pam_passwdqc-1.0.2 b/sys-auth/pam_passwdqc/files/digest-pam_passwdqc-1.0.2
deleted file mode 100644
index 1eefaee65ef4..000000000000
--- a/sys-auth/pam_passwdqc/files/digest-pam_passwdqc-1.0.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 24d5a1b42987479aa91622d841f82298 pam_passwdqc-1.0.2.tar.gz 30383
-RMD160 e51070807e7cb64fe8646f5de05eae06ea976ab1 pam_passwdqc-1.0.2.tar.gz 30383
-SHA256 c0163e6e6f89519b7ec2eb7ccf353661f4885e6c0ce4a976d905433e79b0efaf pam_passwdqc-1.0.2.tar.gz 30383
diff --git a/sys-auth/pam_passwdqc/files/digest-pam_passwdqc-1.0.4 b/sys-auth/pam_passwdqc/files/digest-pam_passwdqc-1.0.4
new file mode 100644
index 000000000000..f7fe8c5db720
--- /dev/null
+++ b/sys-auth/pam_passwdqc/files/digest-pam_passwdqc-1.0.4
@@ -0,0 +1,3 @@
+MD5 44dcb7e94b75272fed3d9cedeaf0c45c pam_passwdqc-1.0.4.tar.gz 30572
+RMD160 9fab553995076726cf6d566962180c07319bfdbf pam_passwdqc-1.0.4.tar.gz 30572
+SHA256 192d0eb131f203fd809c371751aa1a670df044190b56444b1e6576d8c8672cb6 pam_passwdqc-1.0.4.tar.gz 30572
diff --git a/sys-auth/pam_passwdqc/files/pam_passwdqc-1.0.4-makefile.patch b/sys-auth/pam_passwdqc/files/pam_passwdqc-1.0.4-makefile.patch
new file mode 100644
index 000000000000..13f8bd435ddf
--- /dev/null
+++ b/sys-auth/pam_passwdqc/files/pam_passwdqc-1.0.4-makefile.patch
@@ -0,0 +1,44 @@
+Index: pam_passwdqc-1.0.4/Makefile
+===================================================================
+--- pam_passwdqc-1.0.4.orig/Makefile
++++ pam_passwdqc-1.0.4/Makefile
+@@ -7,11 +7,11 @@ LD = $(CC)
+ RM = rm -f
+ MKDIR = mkdir -p
+ INSTALL = install -c
+-CFLAGS = -Wall -fPIC -O2
+-LDFLAGS = -s --shared
+-LDFLAGS_LINUX = -s --shared -Wl,--version-script,$(MAP)
+-LDFLAGS_SUN = -s -G
+-LDFLAGS_HP = -s -b
++CFLAGS = -Wall -fPIC $(OPTCFLAGS)
++LDFLAGS_GENERIC = --shared
++LDFLAGS_LINUX = --shared -Wl,--version-script,$(MAP)
++LDFLAGS_SUN = -G
++LDFLAGS_HP = -b
+ LDLIBS = -lpam -lcrypt
+ LDLIBS_LINUX = -lpam -lcrypt
+ LDLIBS_SUN = -lpam -lcrypt
+@@ -41,18 +41,18 @@ MAP = pam_passwdqc.map
+ all:
+ 	if [ "`uname -s`" = "Linux" ]; then \
+ 		$(MAKE) CFLAGS="$(CFLAGS) -DHAVE_SHADOW" \
+-			LDFLAGS="$(LDFLAGS_LINUX)" LDLIBS="$(LDLIBS_LINUX)" \
++			LDFLAGS="$(LDFLAGS) $(LDFLAGS_LINUX)" LDLIBS="$(LDLIBS_LINUX)" \
+ 			$(PROJ); \
+ 	elif [ "`uname -s`" = "SunOS" ]; then \
+ 		$(MAKE) CFLAGS="$(CFLAGS) -DHAVE_SHADOW" \
+-			LD=ld LDFLAGS="$(LDFLAGS_SUN)" LDLIBS="$(LDLIBS_SUN)" \
++			LD=ld LDFLAGS="$(LDFLAGS) $(LDFLAGS_SUN)" LDLIBS="$(LDLIBS_SUN)" \
+ 			$(PROJ); \
+ 	elif [ "`uname -s`" = "HP-UX" ]; then \
+ 		$(MAKE) CFLAGS="$(CFLAGS) -DHAVE_SHADOW" \
+-			LD=ld LDFLAGS="$(LDFLAGS_HP)" LDLIBS="$(LDLIBS_HP)" \
++			LD=ld LDFLAGS="$(LDFLAGS) $(LDFLAGS_HP)" LDLIBS="$(LDLIBS_HP)" \
+ 			$(PROJ); \
+ 	else \
+-		$(MAKE) $(PROJ); \
++		$(MAKE) LDFLAGS="$(LDFLAGS) $(LDFLAGS_GENERIC)" $(PROJ); \
+ 	fi
+ 
+ $(LIBSHARED): $(OBJS) $(MAP)
diff --git a/sys-auth/pam_passwdqc/pam_passwdqc-1.0.2.ebuild b/sys-auth/pam_passwdqc/pam_passwdqc-1.0.4.ebuild
index 84deae156cf7..afadb165d01b 100644
--- a/sys-auth/pam_passwdqc/pam_passwdqc-1.0.2.ebuild
+++ b/sys-auth/pam_passwdqc/pam_passwdqc-1.0.4.ebuild
@@ -1,33 +1,46 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_passwdqc/pam_passwdqc-1.0.2.ebuild,v 1.2 2007/01/05 20:49:18 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_passwdqc/pam_passwdqc-1.0.4.ebuild,v 1.1 2007/07/11 12:37:52 flameeyes Exp $
 
-inherit pam
+inherit pam eutils toolchain-funcs
 
 DESCRIPTION="Password strength checking for PAM aware password changing programs"
 HOMEPAGE="http://www.openwall.com/passwdqc/"
 SRC_URI="http://www.openwall.com/pam/modules/pam_passwdqc/${P}.tar.gz"
 
-LICENSE="as-is"
+LICENSE="BSD as-is"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
 
 DEPEND="virtual/pam"
 
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-makefile.patch"
+}
+
 src_compile() {
-	emake || die "emake failed"
+	emake \
+		OPTCFLAGS="${CFLAGS}" \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getCC)" \
+		|| die "emake failed"
 }
 
 src_install() {
 	dopammod pam_passwdqc.so
 
 	doman pam_passwdqc.8
-	dodoc README
+	dodoc README PLATFORMS INTERNALS LICENSE
+}
 
-	echo
+pkg_postinst() {
+	elog
 	elog "To activate pam_passwdqc use pam_passwdqc.so instead"
 	elog "of pam_cracklib.so in /etc/pam.d/system-auth."
 	elog "Also, if you want to change the parameters, read up"
-	elog "on the man page."
-	echo
+	elog "on the pam_passwdqc(8) man page."
+	elog
 }