diff options
author | Jeroen Roovers <jer@gentoo.org> | 2012-12-07 16:01:19 +0000 |
---|---|---|
committer | Jeroen Roovers <jer@gentoo.org> | 2012-12-07 16:01:19 +0000 |
commit | ea1f17c2b2540e6e7cb51e1fbbc23db10167603d (patch) | |
tree | b878e358592c401713492121e0724b306fe03e96 /net-analyzer | |
parent | QA: add missing inherit user eclass (diff) | |
download | gentoo-2-ea1f17c2b2540e6e7cb51e1fbbc23db10167603d.tar.gz gentoo-2-ea1f17c2b2540e6e7cb51e1fbbc23db10167603d.tar.bz2 gentoo-2-ea1f17c2b2540e6e7cb51e1fbbc23db10167603d.zip |
Fix underlinking against openssl/boost (bug #370105).
(Portage version: 2.2.0_alpha144/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'net-analyzer')
-rw-r--r-- | net-analyzer/sslsniff/ChangeLog | 6 | ||||
-rw-r--r-- | net-analyzer/sslsniff/files/sslsniff-0.8-underlinking.patch | 21 | ||||
-rw-r--r-- | net-analyzer/sslsniff/sslsniff-0.8-r1.ebuild | 6 |
3 files changed, 30 insertions, 3 deletions
diff --git a/net-analyzer/sslsniff/ChangeLog b/net-analyzer/sslsniff/ChangeLog index 8540c248b589..91fb1b46c214 100644 --- a/net-analyzer/sslsniff/ChangeLog +++ b/net-analyzer/sslsniff/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-analyzer/sslsniff # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sslsniff/ChangeLog,v 1.6 2012/12/07 15:32:35 zerochaos Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sslsniff/ChangeLog,v 1.7 2012/12/07 16:01:19 jer Exp $ + + 07 Dec 2012; Jeroen Roovers <jer@gentoo.org> sslsniff-0.8-r1.ebuild, + +files/sslsniff-0.8-underlinking.patch: + Fix underlinking against openssl/boost (bug #370105). 07 Dec 2012; Rick Farina <zerochaos@gentoo.org> sslsniff-0.6.ebuild, sslsniff-0.8-r1.ebuild: diff --git a/net-analyzer/sslsniff/files/sslsniff-0.8-underlinking.patch b/net-analyzer/sslsniff/files/sslsniff-0.8-underlinking.patch new file mode 100644 index 000000000000..049ee5f293a0 --- /dev/null +++ b/net-analyzer/sslsniff/files/sslsniff-0.8-underlinking.patch @@ -0,0 +1,21 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -16,7 +16,7 @@ + AC_CHECK_HEADER([boost/thread.hpp], + [], + AC_MSG_ERROR([libboost-thread1.35-dev library is not installed.])) +-AC_CHECK_HEADER([openssl/ssl.h], ++PKG_CHECK_MODULES(openssl,openssl, + [], + AC_MSG_ERROR([openssl (libssl-dev) library not installed.])) + AC_OUTPUT(Makefile) +--- a/Makefile.am ++++ b/Makefile.am +@@ -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.cpp 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_LDADD = -lssl -lboost_filesystem -lpthread -lboost_thread -llog4cpp ++sslsniff_LDADD = $(openssl_LIBS) -lboost_system -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.8-r1.ebuild b/net-analyzer/sslsniff/sslsniff-0.8-r1.ebuild index 8f41f9078872..fdc8b1c5ec11 100644 --- a/net-analyzer/sslsniff/sslsniff-0.8-r1.ebuild +++ b/net-analyzer/sslsniff/sslsniff-0.8-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sslsniff/sslsniff-0.8-r1.ebuild,v 1.2 2012/12/07 15:32:35 zerochaos Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sslsniff/sslsniff-0.8-r1.ebuild,v 1.3 2012/12/07 16:01:19 jer Exp $ EAPI=4 PYTHON_DEPEND="2" @@ -25,7 +25,9 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-0.6-asneeded.patch #stolen from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=652756 - epatch "${FILESDIR}"/${P}-fix-compatibility-with-boost-1.47-and-higher.patch + epatch \ + "${FILESDIR}"/${P}-fix-compatibility-with-boost-1.47-and-higher.patch \ + "${FILESDIR}"/${P}-underlinking.patch eautoreconf } |