clean up hardened flag filtering for gcc41 compatability bug #137146

Package-Manager: portage-2.1.1_pre1-r5

4 files changed, 47 insertions, 15 deletions

diff --git a/app-crypt/bestcrypt/ChangeLog b/app-crypt/bestcrypt/ChangeLog
index eac8c82a31c9..ed01b96e74c1 100644
--- a/app-crypt/bestcrypt/ChangeLog
+++ b/app-crypt/bestcrypt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/bestcrypt
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/ChangeLog,v 1.43 2006/05/29 09:07:20 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/ChangeLog,v 1.44 2006/06/29 12:56:17 dragonheart Exp $
+
+  29 Jun 2006; Daniel Black <dragonheart@gentoo.org>
+  +files/bestcrypt-1.6_p5-gcc41.patch, bestcrypt-1.6_p5.ebuild:
+  clean up hardened flag filtering for gcc41 compatability bug #137146 thanks
+  to Craig
 
   29 May 2006; Daniel Black <dragonheart@gentoo.org>
   -files/bestcrypt-1.5_p10-makefile_fix.patch,
diff --git a/app-crypt/bestcrypt/Manifest b/app-crypt/bestcrypt/Manifest
index af6baa3529cf..430eff359800 100644
--- a/app-crypt/bestcrypt/Manifest
+++ b/app-crypt/bestcrypt/Manifest
@@ -9,6 +9,10 @@ AUX bestcrypt-1.6_p2-path.patch 342 RMD160 370f284b02a4cda0a474fe9be4ae9ae25f71c
 MD5 eee5b50e92787e0f9266bc2a5f8a3aed files/bestcrypt-1.6_p2-path.patch 342
 RMD160 370f284b02a4cda0a474fe9be4ae9ae25f71ccff files/bestcrypt-1.6_p2-path.patch 342
 SHA256 25e708b174433ad84f33500404799df2b470384345d6f3c005bd28fd6658d30b files/bestcrypt-1.6_p2-path.patch 342
+AUX bestcrypt-1.6_p5-gcc41.patch 759 RMD160 d146ec09598562527d92d6dbeae152bc4f35e96d SHA1 19b579a37833481266d212a5daf5b5acd91905fa SHA256 da0b1383004dad8ab2ad1cd93d2d474625284c6eab9bc0aa6dc4a685cea86c8a
+MD5 d89e87d4c74173ae7b795c47f4e6c330 files/bestcrypt-1.6_p5-gcc41.patch 759
+RMD160 d146ec09598562527d92d6dbeae152bc4f35e96d files/bestcrypt-1.6_p5-gcc41.patch 759
+SHA256 da0b1383004dad8ab2ad1cd93d2d474625284c6eab9bc0aa6dc4a685cea86c8a files/bestcrypt-1.6_p5-gcc41.patch 759
 AUX bestcrypt-1.6_p5-makefile_fix.patch 2229 RMD160 f6bbdc9dc392fc2ca784ce3b6fafa05fe94b31d1 SHA1 5076660cd5d587989ab8940530f0ea3a6792d94d SHA256 f73b2e78dea62960aec05c5cd6bfaaf830aaf36f4a21d257fed48d26c7995b7b
 MD5 7363de908c43373f6ccfc37fcc32989a files/bestcrypt-1.6_p5-makefile_fix.patch 2229
 RMD160 f6bbdc9dc392fc2ca784ce3b6fafa05fe94b31d1 files/bestcrypt-1.6_p5-makefile_fix.patch 2229
@@ -16,14 +20,14 @@ SHA256 f73b2e78dea62960aec05c5cd6bfaaf830aaf36f4a21d257fed48d26c7995b7b files/be
 DIST BestCrypt-1.6-5.tar.gz 194939 RMD160 969f67ac374282ef32d6a37ba1079bef220cc543 SHA1 527cc86e82b65326f6b9fa37ce44ced970b19ae8 SHA256 066b8ba630a234a0bd92987020665bfad07675fa0db563744c02af28c00444bd
 DIST bcrypt-rc6-serpent-c.diff.gz 6034 RMD160 127d0f2d562f1fdbfa6a8db5d83e92703a90ccc4 SHA1 ed23242a81d7681b887951be67019a24780c978a SHA256 6161a5bb5711307351eab95e53174bb7f181f870a4755e59ea1ad3eff9427bf5
 DIST bcrypt-rc6-serpent.diff.gz 5718 RMD160 f388894ea0f3d1055dffaf118083baefa5822000 SHA1 f82278c22678e7dedb74bf6bbc202702fbe3f988 SHA256 1407b27e6a8390f62b66985d25f91ca1b68ff89ca5d9c211f0e83868214bdde8
-EBUILD bestcrypt-1.6_p5.ebuild 3215 RMD160 c8e4670b2d38f374e4a0b2da7b566187705b09c9 SHA1 507098335e9ae4b10965abc6989f532be63e052c SHA256 214411959146a7ad053592c895c0ae249fe27c61886dc277fe0555a7ad54b7a6
-MD5 479c212327cd8851936019586e414cd3 bestcrypt-1.6_p5.ebuild 3215
-RMD160 c8e4670b2d38f374e4a0b2da7b566187705b09c9 bestcrypt-1.6_p5.ebuild 3215
-SHA256 214411959146a7ad053592c895c0ae249fe27c61886dc277fe0555a7ad54b7a6 bestcrypt-1.6_p5.ebuild 3215
-MISC ChangeLog 8948 RMD160 5316bb6dcac069a3ac451a7bac49ef8295932c47 SHA1 bfd0ee67993770e260482a6fd938c21804b77614 SHA256 aee5d90d3c1e2044da3d7322c5ab971a39e377b882550d5141cbf3bdd3208146
-MD5 f0625490d4e997469b24d9e18de7c24f ChangeLog 8948
-RMD160 5316bb6dcac069a3ac451a7bac49ef8295932c47 ChangeLog 8948
-SHA256 aee5d90d3c1e2044da3d7322c5ab971a39e377b882550d5141cbf3bdd3208146 ChangeLog 8948
+EBUILD bestcrypt-1.6_p5.ebuild 3256 RMD160 e2a931a87a4d2a53a4308b5be0d6240f2fa50fdb SHA1 af173b7e71f8540fb17c9d25ae392b54e419737d SHA256 2876ac6f23f2490db71681421479fe8e31e3b79d0f9d47b0f4287cd4e517dbce
+MD5 b80fe88bab489cbc9e0b333c11fcdf58 bestcrypt-1.6_p5.ebuild 3256
+RMD160 e2a931a87a4d2a53a4308b5be0d6240f2fa50fdb bestcrypt-1.6_p5.ebuild 3256
+SHA256 2876ac6f23f2490db71681421479fe8e31e3b79d0f9d47b0f4287cd4e517dbce bestcrypt-1.6_p5.ebuild 3256
+MISC ChangeLog 9155 RMD160 1c3d0c138717fec7262a22e21afc86204334cc67 SHA1 31ad6cf37d880f01fb0fd9d7a963fbb4fe3cb455 SHA256 3a13357f4b48545f6ee8b78b1bf3252df5ef522ba009358268a20357292c5508
+MD5 21d7e27a5ae61228e7e1b288e7cc5e22 ChangeLog 9155
+RMD160 1c3d0c138717fec7262a22e21afc86204334cc67 ChangeLog 9155
+SHA256 3a13357f4b48545f6ee8b78b1bf3252df5ef522ba009358268a20357292c5508 ChangeLog 9155
 MISC metadata.xml 224 RMD160 74db96ad8aa1d285d83ae93a9f4a767335f55c15 SHA1 d86a171d981b45e7ed0c0b3b5059d2a63c811001 SHA256 9e9ce661a9fdb45a535ad875a247b700a70745359b27533ec29a6a46fa708e86
 MD5 566cf4f89e44670d0aba4a745913d748 metadata.xml 224
 RMD160 74db96ad8aa1d285d83ae93a9f4a767335f55c15 metadata.xml 224
@@ -32,9 +36,9 @@ MD5 dd170d28f62e65e70cd3cf160e0d9861 files/digest-bestcrypt-1.6_p5 759
 RMD160 acebddcb31cb47ea345067db1e487d10f5068496 files/digest-bestcrypt-1.6_p5 759
 SHA256 a3d6af6139630204aa7a115bdb7e889a0d75751948b27461b66f610b6db7d60d files/digest-bestcrypt-1.6_p5 759
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.4-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFEerrLmdTrptrqvGERAlf8AJ9RNJ8l+iRsHQproifXkutuRSSkhgCcDkzK
-Zg74tgXUF6BXFnsMgLL91LA=
-=tYpc
+iD8DBQFEo87BmdTrptrqvGERAtEtAJ4yeE0jJm1WbNnxlv7fEOE58LLd+gCghLvi
+duRrs9u+8cU1a40faiOIy9I=
+=7ilX
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/bestcrypt/bestcrypt-1.6_p5.ebuild b/app-crypt/bestcrypt/bestcrypt-1.6_p5.ebuild
index b74622aac49c..6489bd3d30e2 100644
--- a/app-crypt/bestcrypt/bestcrypt-1.6_p5.ebuild
+++ b/app-crypt/bestcrypt/bestcrypt-1.6_p5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/bestcrypt-1.6_p5.ebuild,v 1.2 2006/05/29 00:30:09 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/bestcrypt-1.6_p5.ebuild,v 1.3 2006/06/29 12:56:17 dragonheart Exp $
 
 inherit flag-o-matic eutils linux-mod toolchain-funcs
 
@@ -38,6 +38,7 @@ MODULE_NAMES="bc(block:"${S}"/mod)
 src_unpack() {
 	unpack ${A}
 	epatch "${FILESDIR}"/${P}-makefile_fix.patch
+	epatch "${FILESDIR}"/${P}-gcc41.patch
 	epatch "${FILESDIR}"/${PN}-1.6_p2-path.patch
 
 	if use x86;
@@ -56,7 +57,7 @@ src_compile() {
 	emake -C src CC="$(tc-getCC)"  EXTRA_CFLAGS="${CFLAGS} -I../kgsha256" || die "bctool compile failed"
 
 	# Don't put stack protection in the kernel - it just is bad
-	append-flags -fno-stack-protector-all -fno-stack-protector
+	_filter-hardened -fstack-protector-all -fstack-protector
 
 	emake  -C mod SYMSRC=bc_dev${KV_MAJOR}${KV_MINOR}.c bc_dev.ver EXTRA_CFLAGS="${CFLAGS}" \
 		|| die "compile failed"
diff --git a/app-crypt/bestcrypt/files/bestcrypt-1.6_p5-gcc41.patch b/app-crypt/bestcrypt/files/bestcrypt-1.6_p5-gcc41.patch
new file mode 100644
index 000000000000..7ea35e0aa205
--- /dev/null
+++ b/app-crypt/bestcrypt/files/bestcrypt-1.6_p5-gcc41.patch
@@ -0,0 +1,22 @@
+--- bcrypt/kgsha/Makefile	2006-06-29 22:51:13.000000000 +1000
++++ /tmp/bcrypt-nowarnerror/kgsha/Makefile	2006-06-29 22:40:16.000000000 +1000
+@@ -19,7 +19,7 @@
+ LD = ld -d -shared
+ 
+ CPP=g++
+-CPPFLAGS = -fPIC -Wall -Werror -fno-strength-reduce -I../include -g
++CPPFLAGS = -fPIC -Wall -fno-strength-reduce -I../include -g
+ CPPFLAGS += $(EXTRA_CXXFLAGS)
+ 
+ TARGET = libkgsha.so
+--- bcrypt/kgsha256/Makefile	2006-06-29 22:51:13.000000000 +1000
++++ /tmp/bcrypt-nowarnerror/kgsha256/Makefile	2006-06-29 22:40:30.000000000 +1000
+@@ -19,7 +19,7 @@
+ LD = ld -d -shared
+ 
+ CPP=g++
+-CPPFLAGS = -fPIC -Wall -Werror -fno-strength-reduce -I../include -g
++CPPFLAGS = -fPIC -Wall -fno-strength-reduce -I../include -g
+ CPPFLAGS += $(EXTRA_CXXFLAGS)
+ 
+ TARGET = libkgsha256.so