fix for bug #378629 from debian

(Portage version: 2.1.11.12/cvs/Linux x86_64)

5 files changed, 115 insertions, 6 deletions

diff --git a/net-analyzer/sslsniff/ChangeLog b/net-analyzer/sslsniff/ChangeLog
index 2eff31e9afef..92066033a6a1 100644
--- a/net-analyzer/sslsniff/ChangeLog
+++ b/net-analyzer/sslsniff/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/sslsniff
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sslsniff/ChangeLog,v 1.3 2011/10/02 01:27:31 robbat2 Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sslsniff/ChangeLog,v 1.4 2012/08/28 21:50:45 zerochaos Exp $
+
+*sslsniff-0.8-r1 (28 Aug 2012)
+
+  28 Aug 2012; Rick Farina <zerochaos@gentoo.org>
+  +files/sslsniff-0.8-fix-compatibility-with-boost-1.47-and-higher.patch,
+  +sslsniff-0.8-r1.ebuild, metadata.xml, sslsniff-0.8.ebuild:
+  fix for bug #378629 from debian
 
 *sslsniff-0.8 (02 Oct 2011)
 
@@ -17,4 +24,3 @@
   +metadata.xml:
   Initial commit, ebuild by Robin H. Johnson <robbat2@gentoo.org>. *waves hi
   to ioerror*.
-
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
new file mode 100644
index 000000000000..eb0a052c7988
--- /dev/null
+++ b/net-analyzer/sslsniff/files/sslsniff-0.8-fix-compatibility-with-boost-1.47-and-higher.patch
@@ -0,0 +1,53 @@
+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().
diff --git a/net-analyzer/sslsniff/metadata.xml b/net-analyzer/sslsniff/metadata.xml
index c6d862855eb5..2ceaef764eac 100644
--- a/net-analyzer/sslsniff/metadata.xml
+++ b/net-analyzer/sslsniff/metadata.xml
@@ -4,4 +4,9 @@
 <maintainer>
   <email>robbat2@gentoo.org</email>
 </maintainer>
+<maintainer>
+  <email>zerochaos@gentoo.org</email>
+  <name>Rick Farina</name>
+  <description>co-maintainer</description>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/sslsniff/sslsniff-0.8-r1.ebuild b/net-analyzer/sslsniff/sslsniff-0.8-r1.ebuild
new file mode 100644
index 000000000000..1d0ee125214a
--- /dev/null
+++ b/net-analyzer/sslsniff/sslsniff-0.8-r1.ebuild
@@ -0,0 +1,45 @@
+# 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.1 2012/08/28 21:50:45 zerochaos Exp $
+
+EAPI=4
+PYTHON_DEPEND="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="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-libs/boost
+	dev-libs/log4cpp
+	dev-libs/openssl"
+RDEPEND=""
+
+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
+
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS README
+
+	insinto /usr/share/sslsniff
+	doins leafcert.pem IPSCACLASEA1.crt
+
+	insinto /usr/share/sslsniff/updates
+	doins updates/*xml
+
+	insinto /usr/share/sslsniff/certs
+	doins certs/*
+}
diff --git a/net-analyzer/sslsniff/sslsniff-0.8.ebuild b/net-analyzer/sslsniff/sslsniff-0.8.ebuild
index 6d5e2e3d1ed4..ffc271b87371 100644
--- a/net-analyzer/sslsniff/sslsniff-0.8.ebuild
+++ b/net-analyzer/sslsniff/sslsniff-0.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.ebuild,v 1.1 2011/10/02 01:27:31 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sslsniff/sslsniff-0.8.ebuild,v 1.2 2012/08/28 21:50:45 zerochaos Exp $
 
 EAPI=2
 inherit autotools eutils
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="dev-libs/boost
+DEPEND="dev-libs/boost:1.46
 	dev-libs/log4cpp
 	dev-libs/openssl"