From 121ed4eec41fbf03e1998d09eede1bf449da63b9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 19 Jul 2019 22:05:27 +0100 Subject: gentoo resync : 19.07.2019 --- net-analyzer/sslsniff/Manifest | 7 --- .../sslsniff/files/sslsniff-0.6-asneeded.patch | 10 ---- .../files/sslsniff-0.8-error-redefinition.patch | 50 -------------------- ...-compatibility-with-boost-1.47-and-higher.patch | 53 ---------------------- .../sslsniff/files/sslsniff-0.8-underlinking.patch | 21 --------- net-analyzer/sslsniff/metadata.xml | 14 ------ net-analyzer/sslsniff/sslsniff-0.8-r2.ebuild | 49 -------------------- 7 files changed, 204 deletions(-) delete mode 100644 net-analyzer/sslsniff/Manifest delete mode 100644 net-analyzer/sslsniff/files/sslsniff-0.6-asneeded.patch delete mode 100644 net-analyzer/sslsniff/files/sslsniff-0.8-error-redefinition.patch delete mode 100644 net-analyzer/sslsniff/files/sslsniff-0.8-fix-compatibility-with-boost-1.47-and-higher.patch delete mode 100644 net-analyzer/sslsniff/files/sslsniff-0.8-underlinking.patch delete mode 100644 net-analyzer/sslsniff/metadata.xml delete mode 100644 net-analyzer/sslsniff/sslsniff-0.8-r2.ebuild (limited to 'net-analyzer/sslsniff') diff --git a/net-analyzer/sslsniff/Manifest b/net-analyzer/sslsniff/Manifest deleted file mode 100644 index 5761079659ba..000000000000 --- a/net-analyzer/sslsniff/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX sslsniff-0.6-asneeded.patch 1358 BLAKE2B f74d1484d2e3ed665d4eb8b21a52ce7d43456c1c5a8c5c597e199449f32be3e3169bc286e4f89cdaac9a9eae0462058da00ae071742de87d91e08fa2605bd58c SHA512 2b692eee8154457b6b7a7c12042e017defb94157341885ceadb3970ba40c5a878bb1d1effc5f5b71e7a3161dfadfda27e9f5d5c47fd642007c11f47b1f243904 -AUX sslsniff-0.8-error-redefinition.patch 1718 BLAKE2B 8ef6a00b3cb3e378884eeb10ae787e31c1502ef277d75624a7094fc89d92a8a09034c7f5b8c785d93e75804a7afa739b20fbe3f5512275f48548c6d080c8c8a3 SHA512 ff9424f59844dc74ac2044dab3541186608bd4063e4b54a2fbb337cb4cf6beb76aa3e2e39d64a5d7817a4a14d4976f361f6e5472c41c7073dd106cf9cb74f9a0 -AUX sslsniff-0.8-fix-compatibility-with-boost-1.47-and-higher.patch 2316 BLAKE2B 45f604bd82eeb954cd4d6aefc473ac47e1d37e3cfc39ea5d8027545a424224fbe821c1eef67f78a8043f8ad1e4c3ac50813425c98b2a62198f097b6332be0918 SHA512 7606d8c466063c9c903a2eadd0a584c1ae759abb62e5a289c0748d4a18329b90aa9a1d89ebcc5e7b145ee2d98c48f7af8f37641d7a32c67208ccabab9a9da876 -AUX sslsniff-0.8-underlinking.patch 1631 BLAKE2B 606e6cdfb4d5d0467d3fa30130c40abfd3dadcef5281f3965838f13e44760c8dfd2af9ed7069958f45dfeef2112131f5a538ebed5bafb7466d637c9f515c557e SHA512 8ffbb67f9fbec85179769c0ace64e62f8a3d27e403f33bdd761195339cdcffe37cb473621cb20a739b2b2ce26c6b2335a4d5ea7c6cb697c4328ac7f7047b5e01 -DIST sslsniff-0.8.tar.gz 207858 BLAKE2B bb53f5bee6528bd27e07a529ca3c908df4eb13c0b7164b34566faa1d6b36b55d118bbac2311fbfda9ae7a8d908a253ac7cfebc261b554ff56c930eb4a0cdf4a5 SHA512 4ac1bcff8f396d868b2381bc73bb0307022e9a7d5228c83722abde8d4d01e4c6273042763c1e003c8e60f606d60923a573122d33680f5d892b4ef7b62f02009f -EBUILD sslsniff-0.8-r2.ebuild 1098 BLAKE2B c131524f896278a702e46268fd8f45efb297ca0f84643a0d306ef1735970c9a64038b2681de2b1d6cae291a10d661368c146f40c7045532dcc9e6c6e0cc10ce0 SHA512 b30839b74cdc741b6363aa5b8e360b9f86ca78466f91d5d0db45c7109a43330333feae7722a2b8e3b4d11ba6162b419752e4f2ef0c902fbcb78aa6c6f543c438 -MISC metadata.xml 406 BLAKE2B 827749fa0fb08eefd7613363c7c812d206605c9acd42e9060bab8a961f5297055e762f76d755e7de5449bfe38876ae50cdd9eee5084ad40750e7b60114b75dc9 SHA512 60f83f56f139edcdd6e6d74fd76faaa92e2e288ba1d19f5bcfb8dfcddcd9db54b4f23dad09c5e6cb18bbcc8620e0a7415f45ded24cffb2b02d42a6bffebd66f3 diff --git a/net-analyzer/sslsniff/files/sslsniff-0.6-asneeded.patch b/net-analyzer/sslsniff/files/sslsniff-0.6-asneeded.patch deleted file mode 100644 index db629b3c4a25..000000000000 --- a/net-analyzer/sslsniff/files/sslsniff-0.6-asneeded.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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/files/sslsniff-0.8-error-redefinition.patch b/net-analyzer/sslsniff/files/sslsniff-0.8-error-redefinition.patch deleted file mode 100644 index f3c2fd08da0f..000000000000 --- a/net-analyzer/sslsniff/files/sslsniff-0.8-error-redefinition.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- 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/files/sslsniff-0.8-fix-compatibility-with-boost-1.47-and-higher.patch b/net-analyzer/sslsniff/files/sslsniff-0.8-fix-compatibility-with-boost-1.47-and-higher.patch deleted file mode 100644 index eb0a052c7988..000000000000 --- a/net-analyzer/sslsniff/files/sslsniff-0.8-fix-compatibility-with-boost-1.47-and-higher.patch +++ /dev/null @@ -1,53 +0,0 @@ -Index: sslsniff/SSLConnectionManager.cpp -=================================================================== ---- sslsniff.orig/SSLConnectionManager.cpp 2011-12-31 09:25:04.000000000 +0100 -+++ sslsniff/SSLConnectionManager.cpp 2011-12-31 09:26:14.394534948 +0100 -@@ -44,7 +44,7 @@ - } - - void SSLConnectionManager::acceptIncomingConnection() { -- boost::shared_ptr socket(new ip::tcp::socket(acceptor.io_service())); -+ boost::shared_ptr socket(new ip::tcp::socket(acceptor.get_io_service())); - - acceptor.async_accept(*socket, boost::bind(&SSLConnectionManager::handleClientConnection, - this, socket, placeholders::error)); -@@ -76,7 +76,7 @@ - ip::tcp::endpoint &destination) - - { -- Bridge::ptr bridge = RawBridge::create(clientSocket, destination, acceptor.io_service()); -+ Bridge::ptr bridge = RawBridge::create(clientSocket, destination, acceptor.get_io_service()); - bridge->shuttle(); - } - -@@ -134,7 +134,7 @@ - ip::tcp::endpoint &destination, - bool wildcardOK) - { -- ip::tcp::socket serverSocket(acceptor.io_service()); -+ ip::tcp::socket serverSocket(acceptor.get_io_service()); - boost::system::error_code error; - serverSocket.connect(destination, error); - -Index: sslsniff/http/HttpConnectionManager.cpp -=================================================================== ---- sslsniff.orig/http/HttpConnectionManager.cpp 2011-05-14 11:37:52.000000000 +0200 -+++ sslsniff/http/HttpConnectionManager.cpp 2011-12-31 09:26:28.442534999 +0100 -@@ -53,7 +53,7 @@ - } - - void HttpConnectionManager::acceptIncomingConnection() { -- boost::shared_ptr socket(new ip::tcp::socket(acceptor_.io_service())); -+ boost::shared_ptr socket(new ip::tcp::socket(acceptor_.get_io_service())); - - acceptor_.async_accept(*socket, boost::bind(&HttpConnectionManager::handleClientConnection, - this, socket, placeholders::error)); -@@ -63,7 +63,7 @@ - void HttpConnectionManager::bridgeHttpRequest(boost::shared_ptr socket, - ip::tcp::endpoint destination) - { -- Bridge::ptr bridge = HttpBridge::create(socket, acceptor_.io_service(), -+ Bridge::ptr bridge = HttpBridge::create(socket, acceptor_.get_io_service(), - FingerprintManager::getInstance()); - - bridge->getServerSocket(). diff --git a/net-analyzer/sslsniff/files/sslsniff-0.8-underlinking.patch b/net-analyzer/sslsniff/files/sslsniff-0.8-underlinking.patch deleted file mode 100644 index 049ee5f293a0..000000000000 --- a/net-analyzer/sslsniff/files/sslsniff-0.8-underlinking.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- 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/metadata.xml b/net-analyzer/sslsniff/metadata.xml deleted file mode 100644 index e3c364f20d17..000000000000 --- a/net-analyzer/sslsniff/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - robbat2@gentoo.org - - - prometheanfire@gentoo.org - - - zerochaos@gentoo.org - Rick Farina - - diff --git a/net-analyzer/sslsniff/sslsniff-0.8-r2.ebuild b/net-analyzer/sslsniff/sslsniff-0.8-r2.ebuild deleted file mode 100644 index c0f2ea35d7d7..000000000000 --- a/net-analyzer/sslsniff/sslsniff-0.8-r2.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -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="~amd64 ~x86" - -DEPEND="dev-libs/boost:= - dev-libs/log4cpp:= - dev-libs/openssl:0" -RDEPEND="${DEPEND}" - -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 -) - -src_prepare() { - epatch "${PATCHES[@]}" - epatch_user - - eautoreconf -} - -src_install() { - default - - insinto /usr/share/sslsniff - doins leafcert.pem IPSCACLASEA1.crt - - insinto /usr/share/sslsniff/updates - doins updates/*xml - - insinto /usr/share/sslsniff/certs - doins certs/* -} -- cgit v1.2.3