Gentoo Archives: gentoo-commits

From: "Richard Farina (zerochaos)" <zerochaos@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-analyzer/sslsniff/files: sslsniff-0.8-fix-compatibility-with-boost-1.47-and-higher.patch
Date: Tue, 28 Aug 2012 21:50:57
Message-Id: 20120828215046.3921020A8B@flycatcher.gentoo.org
1 zerochaos 12/08/28 21:50:46
2
3 Added:
4 sslsniff-0.8-fix-compatibility-with-boost-1.47-and-higher.patch
5 Log:
6 fix for bug #378629 from debian
7
8 (Portage version: 2.1.11.12/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.1 net-analyzer/sslsniff/files/sslsniff-0.8-fix-compatibility-with-boost-1.47-and-higher.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/sslsniff/files/sslsniff-0.8-fix-compatibility-with-boost-1.47-and-higher.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/sslsniff/files/sslsniff-0.8-fix-compatibility-with-boost-1.47-and-higher.patch?rev=1.1&content-type=text/plain
15
16 Index: sslsniff-0.8-fix-compatibility-with-boost-1.47-and-higher.patch
17 ===================================================================
18 Index: sslsniff/SSLConnectionManager.cpp
19 ===================================================================
20 --- sslsniff.orig/SSLConnectionManager.cpp 2011-12-31 09:25:04.000000000 +0100
21 +++ sslsniff/SSLConnectionManager.cpp 2011-12-31 09:26:14.394534948 +0100
22 @@ -44,7 +44,7 @@
23 }
24
25 void SSLConnectionManager::acceptIncomingConnection() {
26 - boost::shared_ptr<ip::tcp::socket> socket(new ip::tcp::socket(acceptor.io_service()));
27 + boost::shared_ptr<ip::tcp::socket> socket(new ip::tcp::socket(acceptor.get_io_service()));
28
29 acceptor.async_accept(*socket, boost::bind(&SSLConnectionManager::handleClientConnection,
30 this, socket, placeholders::error));
31 @@ -76,7 +76,7 @@
32 ip::tcp::endpoint &destination)
33
34 {
35 - Bridge::ptr bridge = RawBridge::create(clientSocket, destination, acceptor.io_service());
36 + Bridge::ptr bridge = RawBridge::create(clientSocket, destination, acceptor.get_io_service());
37 bridge->shuttle();
38 }
39
40 @@ -134,7 +134,7 @@
41 ip::tcp::endpoint &destination,
42 bool wildcardOK)
43 {
44 - ip::tcp::socket serverSocket(acceptor.io_service());
45 + ip::tcp::socket serverSocket(acceptor.get_io_service());
46 boost::system::error_code error;
47 serverSocket.connect(destination, error);
48
49 Index: sslsniff/http/HttpConnectionManager.cpp
50 ===================================================================
51 --- sslsniff.orig/http/HttpConnectionManager.cpp 2011-05-14 11:37:52.000000000 +0200
52 +++ sslsniff/http/HttpConnectionManager.cpp 2011-12-31 09:26:28.442534999 +0100
53 @@ -53,7 +53,7 @@
54 }
55
56 void HttpConnectionManager::acceptIncomingConnection() {
57 - boost::shared_ptr<ip::tcp::socket> socket(new ip::tcp::socket(acceptor_.io_service()));
58 + boost::shared_ptr<ip::tcp::socket> socket(new ip::tcp::socket(acceptor_.get_io_service()));
59
60 acceptor_.async_accept(*socket, boost::bind(&HttpConnectionManager::handleClientConnection,
61 this, socket, placeholders::error));
62 @@ -63,7 +63,7 @@
63 void HttpConnectionManager::bridgeHttpRequest(boost::shared_ptr<ip::tcp::socket> socket,
64 ip::tcp::endpoint destination)
65 {
66 - Bridge::ptr bridge = HttpBridge::create(socket, acceptor_.io_service(),
67 + Bridge::ptr bridge = HttpBridge::create(socket, acceptor_.get_io_service(),
68 FingerprintManager::getInstance());
69
70 bridge->getServerSocket().