diff options
| -rw-r--r-- | net-analyzer/sslsniff/files/sslsniff-0.8-error-redefinition.patch | 50 | ||||
| -rw-r--r-- | net-analyzer/sslsniff/sslsniff-0.8-r2.ebuild (renamed from net-analyzer/sslsniff/sslsniff-0.8-r1.ebuild) | 29 |
2 files changed, 66 insertions, 13 deletions
diff --git a/net-analyzer/sslsniff/files/sslsniff-0.8-error-redefinition.patch b/net-analyzer/sslsniff/files/sslsniff-0.8-error-redefinition.patch new file mode 100644 index 000000000000..f3c2fd08da0f --- /dev/null +++ b/net-analyzer/sslsniff/files/sslsniff-0.8-error-redefinition.patch @@ -0,0 +1,50 @@ +--- SSLConnectionManager.cpp.orig 2014-09-01 23:09:35.916376510 +0200 ++++ SSLConnectionManager.cpp 2014-09-01 23:10:32.492515988 +0200 +@@ -95,13 +95,13 @@ + } catch (SSLConnectionError &error) { + std::stringstream errorStream; + errorStream << "Got exception: " << error.what(); +- std::string error = errorStream.str(); +- Logger::logError(error); ++ std::string errorStr = errorStream.str(); ++ Logger::logError(errorStr); + } catch (FirefoxUpdateException &error) { + std::stringstream errorStream; + errorStream << "Got exception: " << error.what(); +- std::string error = errorStream.str(); +- Logger::logError(error); ++ std::string errorStr = errorStream.str(); ++ Logger::logError(errorStr); + } + } + +@@ -120,13 +120,13 @@ + } catch (SSLConnectionError &error) { + std::stringstream errorStream; + errorStream << "Got exception: " << error.what(); +- std::string error = errorStream.str(); +- Logger::logError(error); ++ std::string errorStr = errorStream.str(); ++ Logger::logError(errorStr); + } catch (FirefoxUpdateException &error) { + std::stringstream errorStream; + errorStream << "Got exception: " << error.what(); +- std::string error = errorStream.str(); +- Logger::logError(error); ++ std::string errorStr = errorStream.str(); ++ Logger::logError(errorStr); + } + } + +@@ -151,9 +151,9 @@ + } catch (SSLConnectionError &error) { + std::stringstream errorStream; + errorStream << "Got exception: " << error.what(); +- std::string error = errorStream.str(); ++ std::string errorStr = errorStream.str(); + +- Logger::logError(error); ++ Logger::logError(errorStr); + } + } + } diff --git a/net-analyzer/sslsniff/sslsniff-0.8-r1.ebuild b/net-analyzer/sslsniff/sslsniff-0.8-r2.ebuild index 90d7c8a83fa6..998780d7849d 100644 --- a/net-analyzer/sslsniff/sslsniff-0.8-r1.ebuild +++ b/net-analyzer/sslsniff/sslsniff-0.8-r2.ebuild @@ -1,9 +1,8 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -PYTHON_DEPEND="2" inherit autotools eutils @@ -14,27 +13,31 @@ SRC_URI="http://thoughtcrime.org/software/sslsniff/${P}.tar.gz" LICENSE="GPL-3" # plus OpenSSL exception SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" DEPEND="dev-libs/boost:= - dev-libs/log4cpp - dev-libs/openssl" + dev-libs/log4cpp:= + dev-libs/openssl:0" RDEPEND="${DEPEND}" -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.6-asneeded.patch +DOCS=( AUTHORS README ) + +# last two patches are taken from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=652756 +PATCHES=( + "${FILESDIR}"/${PN}-0.6-asneeded.patch + "${FILESDIR}"/${P}-error-redefinition.patch + "${FILESDIR}"/${P}-fix-compatibility-with-boost-1.47-and-higher.patch + "${FILESDIR}"/${P}-underlinking.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 \ - "${FILESDIR}"/${P}-underlinking.patch +src_prepare() { + epatch ${PATCHES[@]} + epatch_user eautoreconf } src_install() { - emake DESTDIR="${D}" install || die - dodoc AUTHORS README + default insinto /usr/share/sslsniff doins leafcert.pem IPSCACLASEA1.crt |