net-analyzer/sslsniff: Remove from tree

Closes: https://bugs.gentoo.org/561314
Closes: https://bugs.gentoo.org/594894
Closes: https://bugs.gentoo.org/672090
Closes: https://bugs.gentoo.org/674606
Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: David Seifert <soap@gentoo.org>
This commit is contained in:
David Seifert
2019-07-14 12:48:40 +02:00
parent c70fe723dc
commit 549e4fa2f9
8 changed files with 0 additions and 205 deletions
-1
View File
@@ -1 +0,0 @@
DIST sslsniff-0.8.tar.gz 207858 BLAKE2B bb53f5bee6528bd27e07a529ca3c908df4eb13c0b7164b34566faa1d6b36b55d118bbac2311fbfda9ae7a8d908a253ac7cfebc261b554ff56c930eb4a0cdf4a5 SHA512 4ac1bcff8f396d868b2381bc73bb0307022e9a7d5228c83722abde8d4d01e4c6273042763c1e003c8e60f606d60923a573122d33680f5d892b4ef7b62f02009f
@@ -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
@@ -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);
}
}
}
@@ -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<ip::tcp::socket> socket(new ip::tcp::socket(acceptor.io_service()));
+ boost::shared_ptr<ip::tcp::socket> 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<ip::tcp::socket> socket(new ip::tcp::socket(acceptor_.io_service()));
+ boost::shared_ptr<ip::tcp::socket> 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<ip::tcp::socket> 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().
@@ -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
-14
View File
@@ -1,14 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>robbat2@gentoo.org</email>
</maintainer>
<maintainer type="person">
<email>prometheanfire@gentoo.org</email>
</maintainer>
<maintainer type="person">
<email>zerochaos@gentoo.org</email>
<name>Rick Farina</name>
</maintainer>
</pkgmetadata>
@@ -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/*
}
-7
View File
@@ -174,13 +174,6 @@ games-misc/yadex
# days. See bug #688134.
games-kids/pytraffic
# David Seifert <soap@gentoo.org> (2019-06-15)
# Abandoned upstream, last release 8 years ago,
# multiple bugs, fails with boost 1.70 and
# openssl 1.1, removal in 30 days
# Bug #561314, #594894, #672090, #674606.
net-analyzer/sslsniff
# Mikle Kolyada <zlogene@gentoo.org> (2019-06-15)
# Part of dev-texlive/texlive-latexextra
# does not work with utf-8 (bug #688096)