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

(Portage version: 2.1.3_rc7)

5 files changed, 77 insertions, 12 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/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
 }