cracklib apparently works with new SSP, removing hardened-gcc logic and filter-flags fstackprot

5 files changed, 16 insertions, 32 deletions

diff --git a/sys-libs/cracklib/ChangeLog b/sys-libs/cracklib/ChangeLog
index 5cdcd000b83f..37ff2834e7a6 100644
--- a/sys-libs/cracklib/ChangeLog
+++ b/sys-libs/cracklib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/cracklib
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/ChangeLog,v 1.42 2004/04/27 02:48:21 randy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/ChangeLog,v 1.43 2004/05/12 13:18:31 pappy Exp $
+
+  12 May 2004; Alexander Gabert <pappy@gentoo.org> cracklib-2.7-r7.ebuild,
+  cracklib-2.7-r8.ebuild:
+  cracklib apparently works with new SSP, removing hardened-gcc logic and
+  filter-flags fstackprot
 
   26 Apr 2004; Michael McCabe <randy@gentoo.org> cracklib-2.7-r9.ebuild:
   Stable on s390
diff --git a/sys-libs/cracklib/Manifest b/sys-libs/cracklib/Manifest
index c0c70cf4ab6c..43afb1b5a8c2 100644
--- a/sys-libs/cracklib/Manifest
+++ b/sys-libs/cracklib/Manifest
@@ -1,8 +1,8 @@
-MD5 ed9b64b9aa3d7ef82e81d0328dc28cd3 ChangeLog 5673
-MD5 bdbe6cfb56a7908877579725e7c98064 cracklib-2.7-r7.ebuild 1704
-MD5 5c53a1f454189f0cecc276e30901bb0b cracklib-2.7-r8.ebuild 1978
+MD5 d00759e5f806498cc9f7c1dfc013ece8 ChangeLog 5875
+MD5 6c165a996405cc4392cdb163b579c813 cracklib-2.7-r7.ebuild 1429
+MD5 f998b3c7724b4b96e90e3c16b4a76a38 cracklib-2.7-r8.ebuild 1703
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 3abbd765bd9a40eeb387044b011f47e0 cracklib-2.7-r9.ebuild 2109
+MD5 8eae68ee1702facb806fb7b9d7283c96 cracklib-2.7-r9.ebuild 1834
 MD5 85783b83e5bfa51190033895cfaf803e files/cracklib-2.7-dec-alpha-compiler.diff 333
 MD5 9c566d6a249f8d02ad419aac76fffd66 files/cracklib-2.7-gentoo-new.diff 4244
 MD5 954e8e0d53c6f878366e472a90917356 files/cracklib-2.7-redhat.patch 1224
diff --git a/sys-libs/cracklib/cracklib-2.7-r7.ebuild b/sys-libs/cracklib/cracklib-2.7-r7.ebuild
index 2cd783e54a25..98588928e9b8 100644
--- a/sys-libs/cracklib/cracklib-2.7-r7.ebuild
+++ b/sys-libs/cracklib/cracklib-2.7-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.7-r7.ebuild,v 1.22 2004/02/22 23:07:48 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.7-r7.ebuild,v 1.23 2004/05/12 13:18:31 pappy Exp $
 
 inherit flag-o-matic eutils
 
@@ -26,17 +26,10 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-gentoo-new.diff
 	[ "$ARCH" == "alpha" -a "${CC}" == "ccc" ] && \
 		epatch ${FILESDIR}/cracklib-${PV}-dec-alpha-compiler.diff
-
-	# this is only needed for the transparent hgcc
-	if has_version 'sys-devel/hardened-gcc' && [ ${CC} == "gcc" ]
-	then
-		einfo "hardened-gcc: adding libgcc for propolice __guard symbol to cracklib"
-		sed -i "s:= ld:= ld $(gcc-config -L)/libgcc_s.so:" ${S}/cracklib/Makefile
-	fi
 }
 
 src_compile() {
-	filter-flags -fstack-protector
+	# filter-flags -fstack-protector
 	# Parallel make does not work for 2.7
 	make all || die
 }
diff --git a/sys-libs/cracklib/cracklib-2.7-r8.ebuild b/sys-libs/cracklib/cracklib-2.7-r8.ebuild
index b8c02697ca00..4d0197773c0d 100644
--- a/sys-libs/cracklib/cracklib-2.7-r8.ebuild
+++ b/sys-libs/cracklib/cracklib-2.7-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.7-r8.ebuild,v 1.13 2004/03/09 23:40:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.7-r8.ebuild,v 1.14 2004/05/12 13:18:31 pappy Exp $
 
 inherit flag-o-matic eutils
 
@@ -29,17 +29,10 @@ src_unpack() {
 
 	[ "${ARCH}" = "alpha" -a "${CC}" = "ccc" ] && \
 		sed -i -e 's:CFLAGS += -g :CFLAGS += -g3 :' ${S}/cracklib/Makefile
-
-	# this is only needed for the transparent hgcc
-	if has_version 'sys-devel/hardened-gcc' && [ ${CC} == "gcc" ]
-	then
-		einfo "hardened-gcc: adding libgcc for propolice __guard symbol to cracklib"
-		sed -i "s:= ld:= ld $(gcc-config -L)/libgcc_s.so:" ${S}/cracklib/Makefile
-	fi
 }
 
 src_compile() {
-	filter-flags -fstack-protector
+	# filter-flags -fstack-protector
 	# Parallel make does not work for 2.7
 	make all || die
 }
diff --git a/sys-libs/cracklib/cracklib-2.7-r9.ebuild b/sys-libs/cracklib/cracklib-2.7-r9.ebuild
index 4bd865000d6b..7800aba4b1b0 100644
--- a/sys-libs/cracklib/cracklib-2.7-r9.ebuild
+++ b/sys-libs/cracklib/cracklib-2.7-r9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.7-r9.ebuild,v 1.3 2004/04/27 02:48:21 randy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.7-r9.ebuild,v 1.4 2004/05/12 13:18:31 pappy Exp $
 
 inherit flag-o-matic eutils
 
@@ -30,17 +30,10 @@ src_unpack() {
 
 	[ "${ARCH}" = "alpha" -a "${CC}" = "ccc" ] && \
 		sed -i -e 's:CFLAGS += -g :CFLAGS += -g3 :' ${S}/cracklib/Makefile
-
-	# this is only needed for the transparent hgcc
-	if has_version 'sys-devel/hardened-gcc' && [ ${CC} == "gcc" ]
-	then
-		einfo "hardened-gcc: adding libgcc for propolice __guard symbol to cracklib"
-		sed -i "s:= ld:= ld $(gcc-config -L)/libgcc_s.so:" ${S}/cracklib/Makefile
-	fi
 }
 
 src_compile() {
-	filter-flags -fstack-protector
+	# filter-flags -fstack-protector
 	# Parallel make does not work for 2.7
 	make all || die
 }