Fix building with -Wl,--as-needed wrt #294885 by Kacper Kowalik.

Package-Manager: portage-2.2_rc59/cvs/Linux x86_64

4 files changed, 33 insertions, 9 deletions

diff --git a/net-analyzer/sslsniff/ChangeLog b/net-analyzer/sslsniff/ChangeLog
index ea9349d6ef97..7ce4eaa87d79 100644
--- a/net-analyzer/sslsniff/ChangeLog
+++ b/net-analyzer/sslsniff/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/sslsniff
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sslsniff/ChangeLog,v 1.1 2009/10/01 00:51:39 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sslsniff/ChangeLog,v 1.2 2009/12/21 13:20:56 ssuominen Exp $
+
+  21 Dec 2009; Samuli Suominen <ssuominen@gentoo.org> sslsniff-0.6.ebuild,
+  +files/sslsniff-0.6-asneeded.patch:
+  Fix building with -Wl,--as-needed wrt #294885 by Kacper Kowalik.
 
 *sslsniff-0.6 (01 Oct 2009)
 
diff --git a/net-analyzer/sslsniff/Manifest b/net-analyzer/sslsniff/Manifest
index 43cb62d2d30d..8b097e3aaa3e 100644
--- a/net-analyzer/sslsniff/Manifest
+++ b/net-analyzer/sslsniff/Manifest
@@ -1,4 +1,5 @@
+AUX sslsniff-0.6-asneeded.patch 1358 RMD160 c08e9e218cc4195e3cfe698bb531df49073d28c2 SHA1 66396c1a83d8adbbf231cefdd2b29cfebf71cfcf SHA256 c6721d7f784c4e8ef1f7bf4ad9566ff168c7497ad6f292c87ad7ee595f3cc968
 DIST sslsniff-0.6.tar.gz 118554 RMD160 fc85bdacb5df11be506cf0194bdabf4784d03396 SHA1 85de7f59391bc2429faa82d49b794d0647fe7272 SHA256 291861cfb7ae7b163f0a6a90df26bc68f67afc30ead271232db2e3534ffed933
-EBUILD sslsniff-0.6.ebuild 863 RMD160 7560e9105a9dd6b1c6d77d635c0a5903d0ae7822 SHA1 1207a4551ed6b0bb28d4deae3eebd8d7a3d0e240 SHA256 0e327f56d3c51bb37479844abd82c0a05e916ea3f86e0c75e3c8629980447d60
-MISC ChangeLog 430 RMD160 1dffaac969b133201237f8848f7e08be24fbb379 SHA1 463d99dbd5e6825097d816c4030c7390699a69f7 SHA256 56ae88b6c42d52e90cbc732730d2849a365f219986623c45ae57449bdfe373a8
+EBUILD sslsniff-0.6.ebuild 929 RMD160 5d02836eeb26d5868c4571e24d1a29544f3a4a3c SHA1 8b6975a0d40338d11c4bc1fee8f42662c416097f SHA256 d2d7f46059e3de6dfb975df6a5c5f686bc40704b4b75ff451df94f1f387b891f
+MISC ChangeLog 613 RMD160 f34972e24ba4f9a9aa790c53562fc4418aa14a3f SHA1 841c3d8dce968ca2d4ff1d13d5c9f11400ca244e SHA256 63d0274f0375053cd64b9538863a8e1cb7dc97a0708cc727a90c999563b24514
 MISC metadata.xml 223 RMD160 ffa99612cf27469c417944deed0e0c9155e64331 SHA1 607c637402dd253406aa6ee684471a702c5d1a99 SHA256 d6bb9ba68629616062b4433ab3b8fb01dfcafae5bb47804d9e06cdd6c66daa44
diff --git a/net-analyzer/sslsniff/files/sslsniff-0.6-asneeded.patch b/net-analyzer/sslsniff/files/sslsniff-0.6-asneeded.patch
new file mode 100644
index 000000000000..db629b3c4a25
--- /dev/null
+++ b/net-analyzer/sslsniff/files/sslsniff-0.6-asneeded.patch
@@ -0,0 +1,10 @@
+--- sslsniff-0.6.orig/Makefile.am	2009-08-04 03:48:58.000000000 +0200
++++ sslsniff-0.6/Makefile.am	2009-12-06 20:39:02.066902985 +0100
+@@ -4,6 +4,6 @@
+ 
+ sslsniff_SOURCES = Bridge.hpp SSLConnectionManager.cpp FingerprintManager.hpp FirefoxAddonUpdater.hpp FirefoxUpdater.hpp HTTPSBridge.hpp Logger.hpp RawBridge.hpp SessionCache.hpp SSLBridge.hpp SSLConnectionManager.hpp sslsniff.hpp UpdateManager.hpp certificate/AuthorityCertificateManager.hpp certificate/Certificate.hpp certificate/CertificateManager.hpp certificate/TargetedCertificateManager.hpp http/HttpBridge.hpp http/HttpConnectionManager.hpp http/HttpHeaders.hpp http/OCSPDenier.hpp util/Destination.hpp util/Util.hpp FirefoxUpdater.cpp Logger.cpp SessionCache.cpp SSLBridge.cpp HTTPSBridge.cpp sslsniff.cpp FingerprintManager.cpp certificate/AuthorityCertificateManager.cpp certificate/TargetedCertificateManager.cpp certificate/CertificateManager.cpp http/HttpBridge.cpp http/HttpConnectionManager.cpp http/HttpHeaders.cpp UpdateManager.cpp http/OCSPDenier.cpp FirefoxAddonUpdater.cpp
+ 
+-sslsniff_LDFLAGS = -lssl -lboost_filesystem -lpthread -lboost_thread -llog4cpp
++sslsniff_LDADD = -lssl -lboost_filesystem -lpthread -lboost_thread -llog4cpp
+ 
+ EXTRA_DIST = certs/wildcard IPSCACLASEA1.crt leafcert.pem updates/Darwin_Universal-gcc3.xml updates/Linux_x86-gcc3.xml updates/WINNT_x86-msvc.xml
diff --git a/net-analyzer/sslsniff/sslsniff-0.6.ebuild b/net-analyzer/sslsniff/sslsniff-0.6.ebuild
index d1b067e49de9..2588f5cada58 100644
--- a/net-analyzer/sslsniff/sslsniff-0.6.ebuild
+++ b/net-analyzer/sslsniff/sslsniff-0.6.ebuild
@@ -1,21 +1,30 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sslsniff/sslsniff-0.6.ebuild,v 1.1 2009/10/01 00:51:39 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sslsniff/sslsniff-0.6.ebuild,v 1.2 2009/12/21 13:20:56 ssuominen Exp $
+
+EAPI=2
+inherit autotools eutils
 
 DESCRIPTION="MITM all SSL connections on a LAN and dynamically generates certs"
 HOMEPAGE="http://thoughtcrime.org/software/sslsniff/"
 SRC_URI="http://thoughtcrime.org/software/sslsniff/${P}.tar.gz"
+
 LICENSE="GPL-3" # plus OpenSSL exception
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
+
 DEPEND="dev-libs/boost
-		dev-libs/log4cpp
-		dev-libs/openssl"
-RDEPEND="${DEPEND}"
+	dev-libs/log4cpp
+	dev-libs/openssl"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+	eautoreconf
+}
 
 src_install() {
-	emake DESTDIR="${D}" install || die "Failed emake install"
+	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS README
 
 	insinto /usr/share/sslsniff