QA: Fixed compilation with forced --as-needed (bug 246871)

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28 x86_64

4 files changed, 39 insertions, 14 deletions

diff --git a/app-crypt/rainbowcrack/ChangeLog b/app-crypt/rainbowcrack/ChangeLog
index cb906bdc605b..af9ced6480e3 100644
--- a/app-crypt/rainbowcrack/ChangeLog
+++ b/app-crypt/rainbowcrack/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/rainbowcrack
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/rainbowcrack/ChangeLog,v 1.12 2008/12/14 00:09:21 flameeyes Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/rainbowcrack/ChangeLog,v 1.13 2009/01/03 14:52:02 angelos Exp $
+
+  03 Jan 2009; Christoph Mende <angelos@gentoo.org>
+  +files/rainbowcrack-1.2-asneeded.patch, rainbowcrack-1.2-r1.ebuild:
+  QA: Fixed compilation with forced --as-needed (bug 246871)
 
   14 Dec 2008; Diego E. Pettenò <flameeyes@gentoo.org>
   +files/rainbowcrack-1.2+gcc-4.3.patch, rainbowcrack-1.2-r1.ebuild:
diff --git a/app-crypt/rainbowcrack/Manifest b/app-crypt/rainbowcrack/Manifest
index 5ec0b568f897..6d907c6e3825 100644
--- a/app-crypt/rainbowcrack/Manifest
+++ b/app-crypt/rainbowcrack/Manifest
@@ -2,18 +2,19 @@
 Hash: SHA1
 
 AUX rainbowcrack-1.2+gcc-4.3.patch 2614 RMD160 85f1a03f1a949d73a201dd5c8e950024092332be SHA1 9679029c5a8fe1a7e3ad51d8a8d1aaaab70ea173 SHA256 6746563b8c89e3e09d9e303f39c6d2f7dbe84c2c91422b7d0add3753a0c92fa0
+AUX rainbowcrack-1.2-asneeded.patch 1211 RMD160 4e54024bd065ed65fca7f713528327bd9826ca59 SHA1 a7307793f63127dc715e0f911237314b63694b2b SHA256 20124049250cffcabb6760be6eced24f1fd19fb05b402fc872224ce3192e9c7e
 AUX rainbowcrack-1.2-makefile.patch 1134 RMD160 d485f338a7d420ceb3e4d7fceb3c61c78621c011 SHA1 f34e13a62791609de36be670362aecc8fae2ef01 SHA256 ba9f6240c37b48d2dc1d9bd8c705590818766f8b69355394d690c7be15b61f5c
 AUX rainbowcrack-1.2-share.patch 579 RMD160 5831f6872c8fa2affca87741ef03de8e05376e27 SHA1 2b38810045004c9732e93dcb30ddc13fb6e4aa26 SHA256 63d2da05ca27c79e758c87cef42c877a1bf57daa0ae81493b6693cfaf02574e8
 AUX rainbowcrack-1.2-types.patch 299 RMD160 bd0d5e48244c55741398da3b63241515c6e68730 SHA1 54535cd8fc91c6eae4275515bc6aa0010b67200d SHA256 56a99d1593c55484aefe253ed3014a2c3eaca9d62cb6fbc2a550171dc36f0ef2
 DIST rainbowcrack-1.2-src-algorithmpatch.zip 3029 RMD160 3293cfcf69677ca6812333dd97952f0e354ce96a SHA1 22697cc8bbeeded21a1863329a2666e9a6fb1268 SHA256 ccc646087692da1e02b1921f97d6c9d2784534153f4570b62de0f122c4c3b322
 DIST rainbowcrack-1.2-src.zip 44742 RMD160 51fdcf84ebfbe8ebb9e5bc6c3d4452f9d158eb79 SHA1 b077a654133cd108a3c619d66482e1796d56b0dc SHA256 238485eeede5140cfc66b88761ec976b7af8b5557ec5bd4eddbcd98830a34dac
-EBUILD rainbowcrack-1.2-r1.ebuild 1812 RMD160 3ced1ececd6c95fec95f88402c979cd09222e242 SHA1 a57090e102fe65d7d3e02ac27c9db753caee5ecc SHA256 52364423412c40509dac3fbf7cbc53445f9e149ecc14ecc5077a8ef989367de2
-MISC ChangeLog 1914 RMD160 ce9bbf6ef6feaaa469c5666e8094b08a678f8b9e SHA1 f9cab317120ac92cfca444ef6fe08683dba8b8a7 SHA256 e642a5412412b3372622e8ea283671b3e3126c74ea31c9f4b5cd71505fd072f3
+EBUILD rainbowcrack-1.2-r1.ebuild 1858 RMD160 d60d435310d28f207130f7fbcf1696b276e28018 SHA1 c3fc3fb7f141dc5c475f4d7bc389d38d3005aa45 SHA256 05ee444a06c36bcb2fd528a873394c11a3b219b1eec077ce7fd614c7f5a27427
+MISC ChangeLog 2096 RMD160 d9848e03839dcbd3c1106cd6e895ef7b03f23341 SHA1 b259735a97223fd5d2a13c85d99305783b8538f8 SHA256 b3aae94bc9f1a2e0fd4a3c691d242d6d6353a44f0f71581560524e203262f35b
 MISC metadata.xml 988 RMD160 183293dd3ff7a2a9fa4e6d4bf96992a65373a3c6 SHA1 07dc36220f7b4bdd6f6ebbdff3c9c89f358f1de5 SHA256 3a19812834671dc4d343f678fe3c609acd169519d511d01eca82c56e9b0ba041
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklETrYACgkQAiZjviIA2XiXRwCfY9kzowEZA9taoWm8KzinGGap
-u6cAoMGtEyYtwLiUww10XNR2wvpdiSVG
-=s0Rb
+iEYEARECAAYFAklfe5gACgkQKhnDs22gwa+oewCfQ6nYhmjREVm2cy3yU8rWZBbV
+YsMAnAt32REWLVIFdcmYAMoEnwHR9fBW
+=xT7J
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/rainbowcrack/files/rainbowcrack-1.2-asneeded.patch b/app-crypt/rainbowcrack/files/rainbowcrack-1.2-asneeded.patch
new file mode 100644
index 000000000000..e88ef99650b1
--- /dev/null
+++ b/app-crypt/rainbowcrack/files/rainbowcrack-1.2-asneeded.patch
@@ -0,0 +1,19 @@
+--- rainbowcrack-1.2-src/src/makefile.linux.orig	2009-01-03 15:46:11.220007191 +0100
++++ rainbowcrack-1.2-src/src/makefile.linux	2009-01-03 15:45:56.786005299 +0100
+@@ -2,13 +2,13 @@
+ all: rtgen rtdump rtsort rcrack
+ 
+ rtgen:
+-	$(CXX) Public.cpp ChainWalkContext.cpp HashAlgorithm.cpp HashRoutine.cpp RainbowTableGenerate.cpp -lssl ${CXXFLAGS} -o rtgen
++	$(CXX) Public.cpp ChainWalkContext.cpp HashAlgorithm.cpp HashRoutine.cpp RainbowTableGenerate.cpp -lssl -lcrypto ${CXXFLAGS} -o rtgen
+ 
+ rtdump:
+-	$(CXX) Public.cpp ChainWalkContext.cpp HashAlgorithm.cpp HashRoutine.cpp RainbowTableDump.cpp -lssl ${CXXFLAGS} -o rtdump
++	$(CXX) Public.cpp ChainWalkContext.cpp HashAlgorithm.cpp HashRoutine.cpp RainbowTableDump.cpp -lssl -lcrypto ${CXXFLAGS} -o rtdump
+ 
+ rtsort:
+ 	$(CXX) Public.cpp RainbowTableSort.cpp ${CXXFLAGS} -o rtsort
+ 
+ rcrack:
+-	$(CXX) Public.cpp ChainWalkContext.cpp HashAlgorithm.cpp HashRoutine.cpp HashSet.cpp MemoryPool.cpp ChainWalkSet.cpp CrackEngine.cpp RainbowCrack.cpp -lssl ${CXXFLAGS} -o rcrack
++	$(CXX) Public.cpp ChainWalkContext.cpp HashAlgorithm.cpp HashRoutine.cpp HashSet.cpp MemoryPool.cpp ChainWalkSet.cpp CrackEngine.cpp RainbowCrack.cpp -lssl -lcrypto ${CXXFLAGS} -o rcrack
diff --git a/app-crypt/rainbowcrack/rainbowcrack-1.2-r1.ebuild b/app-crypt/rainbowcrack/rainbowcrack-1.2-r1.ebuild
index 185d3d233076..b1f9db7762f5 100644
--- a/app-crypt/rainbowcrack/rainbowcrack-1.2-r1.ebuild
+++ b/app-crypt/rainbowcrack/rainbowcrack-1.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/rainbowcrack/rainbowcrack-1.2-r1.ebuild,v 1.6 2008/12/14 00:09:21 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/rainbowcrack/rainbowcrack-1.2-r1.ebuild,v 1.7 2009/01/03 14:52:02 angelos Exp $
 
 inherit eutils toolchain-funcs
 
@@ -26,10 +26,11 @@ src_unpack() {
 	unpack ${A} || die "unpack failed"
 	cd "${S}"
 	mv "${WORKDIR}/${P}"-src-algorithmpatch/Hash* "${S}"
-	epatch "${FILESDIR}/${P}-makefile.patch"
-	epatch "${FILESDIR}/${P}-share.patch"
-	epatch "${FILESDIR}/${P}-types.patch"
-	epatch "${FILESDIR}/${P}+gcc-4.3.patch"
+	epatch "${FILESDIR}/${P}-makefile.patch" \
+		"${FILESDIR}/${P}-share.patch" \
+		"${FILESDIR}/${P}-types.patch" \
+		"${FILESDIR}/${P}+gcc-4.3.patch" \
+		"${FILESDIR}/${P}-asneeded.patch"
 	sed -i "s#@@SHARE@@#/usr/share/${P}#g" ChainWalkContext.cpp || die
 }
 
@@ -48,7 +49,7 @@ src_test() {
 }
 
 src_install() {
-	dobin rtgen rtdump rtsort rcrack
+	dobin rtgen rtdump rtsort rcrack || die "dobin failed"
 	insinto "/usr/share/${P}"
 	doins charset.txt