1 |
commit: 71fba133a9b413309256c8dab51741a47deac8cc |
2 |
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Dec 25 08:55:41 2015 +0000 |
4 |
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Dec 25 08:55:41 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71fba133 |
7 |
|
8 |
net-analyzer/sslsniff: revision bump |
9 |
|
10 |
Add subslot to dev-libs/log4cpp dependency, |
11 |
add slot to dev-libs/openssl dependency, |
12 |
reorganize src_prepare and src_install functions. |
13 |
Fix building. Drop old revision |
14 |
|
15 |
Gentoo-Bug: 514792 |
16 |
|
17 |
Package-Manager: portage-2.2.26 |
18 |
|
19 |
.../files/sslsniff-0.8-error-redefinition.patch | 50 ++++++++++++++++++++++ |
20 |
...lsniff-0.8-r1.ebuild => sslsniff-0.8-r2.ebuild} | 29 +++++++------ |
21 |
2 files changed, 66 insertions(+), 13 deletions(-) |
22 |
|
23 |
diff --git a/net-analyzer/sslsniff/files/sslsniff-0.8-error-redefinition.patch b/net-analyzer/sslsniff/files/sslsniff-0.8-error-redefinition.patch |
24 |
new file mode 100644 |
25 |
index 0000000..f3c2fd0 |
26 |
--- /dev/null |
27 |
+++ b/net-analyzer/sslsniff/files/sslsniff-0.8-error-redefinition.patch |
28 |
@@ -0,0 +1,50 @@ |
29 |
+--- SSLConnectionManager.cpp.orig 2014-09-01 23:09:35.916376510 +0200 |
30 |
++++ SSLConnectionManager.cpp 2014-09-01 23:10:32.492515988 +0200 |
31 |
+@@ -95,13 +95,13 @@ |
32 |
+ } catch (SSLConnectionError &error) { |
33 |
+ std::stringstream errorStream; |
34 |
+ errorStream << "Got exception: " << error.what(); |
35 |
+- std::string error = errorStream.str(); |
36 |
+- Logger::logError(error); |
37 |
++ std::string errorStr = errorStream.str(); |
38 |
++ Logger::logError(errorStr); |
39 |
+ } catch (FirefoxUpdateException &error) { |
40 |
+ std::stringstream errorStream; |
41 |
+ errorStream << "Got exception: " << error.what(); |
42 |
+- std::string error = errorStream.str(); |
43 |
+- Logger::logError(error); |
44 |
++ std::string errorStr = errorStream.str(); |
45 |
++ Logger::logError(errorStr); |
46 |
+ } |
47 |
+ } |
48 |
+ |
49 |
+@@ -120,13 +120,13 @@ |
50 |
+ } catch (SSLConnectionError &error) { |
51 |
+ std::stringstream errorStream; |
52 |
+ errorStream << "Got exception: " << error.what(); |
53 |
+- std::string error = errorStream.str(); |
54 |
+- Logger::logError(error); |
55 |
++ std::string errorStr = errorStream.str(); |
56 |
++ Logger::logError(errorStr); |
57 |
+ } catch (FirefoxUpdateException &error) { |
58 |
+ std::stringstream errorStream; |
59 |
+ errorStream << "Got exception: " << error.what(); |
60 |
+- std::string error = errorStream.str(); |
61 |
+- Logger::logError(error); |
62 |
++ std::string errorStr = errorStream.str(); |
63 |
++ Logger::logError(errorStr); |
64 |
+ } |
65 |
+ } |
66 |
+ |
67 |
+@@ -151,9 +151,9 @@ |
68 |
+ } catch (SSLConnectionError &error) { |
69 |
+ std::stringstream errorStream; |
70 |
+ errorStream << "Got exception: " << error.what(); |
71 |
+- std::string error = errorStream.str(); |
72 |
++ std::string errorStr = errorStream.str(); |
73 |
+ |
74 |
+- Logger::logError(error); |
75 |
++ Logger::logError(errorStr); |
76 |
+ } |
77 |
+ } |
78 |
+ } |
79 |
|
80 |
diff --git a/net-analyzer/sslsniff/sslsniff-0.8-r1.ebuild b/net-analyzer/sslsniff/sslsniff-0.8-r2.ebuild |
81 |
similarity index 59% |
82 |
rename from net-analyzer/sslsniff/sslsniff-0.8-r1.ebuild |
83 |
rename to net-analyzer/sslsniff/sslsniff-0.8-r2.ebuild |
84 |
index 90d7c8a..998780d 100644 |
85 |
--- a/net-analyzer/sslsniff/sslsniff-0.8-r1.ebuild |
86 |
+++ b/net-analyzer/sslsniff/sslsniff-0.8-r2.ebuild |
87 |
@@ -1,9 +1,8 @@ |
88 |
-# Copyright 1999-2013 Gentoo Foundation |
89 |
+# Copyright 1999-2015 Gentoo Foundation |
90 |
# Distributed under the terms of the GNU General Public License v2 |
91 |
# $Id$ |
92 |
|
93 |
EAPI=5 |
94 |
-PYTHON_DEPEND="2" |
95 |
|
96 |
inherit autotools eutils |
97 |
|
98 |
@@ -14,27 +13,31 @@ SRC_URI="http://thoughtcrime.org/software/sslsniff/${P}.tar.gz" |
99 |
LICENSE="GPL-3" # plus OpenSSL exception |
100 |
SLOT="0" |
101 |
KEYWORDS="~amd64 ~x86" |
102 |
-IUSE="" |
103 |
|
104 |
DEPEND="dev-libs/boost:= |
105 |
- dev-libs/log4cpp |
106 |
- dev-libs/openssl" |
107 |
+ dev-libs/log4cpp:= |
108 |
+ dev-libs/openssl:0" |
109 |
RDEPEND="${DEPEND}" |
110 |
|
111 |
-src_prepare() { |
112 |
- epatch "${FILESDIR}"/${PN}-0.6-asneeded.patch |
113 |
+DOCS=( AUTHORS README ) |
114 |
+ |
115 |
+# last two patches are taken from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=652756 |
116 |
+PATCHES=( |
117 |
+ "${FILESDIR}"/${PN}-0.6-asneeded.patch |
118 |
+ "${FILESDIR}"/${P}-error-redefinition.patch |
119 |
+ "${FILESDIR}"/${P}-fix-compatibility-with-boost-1.47-and-higher.patch |
120 |
+ "${FILESDIR}"/${P}-underlinking.patch |
121 |
+) |
122 |
|
123 |
- #stolen from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=652756 |
124 |
- epatch \ |
125 |
- "${FILESDIR}"/${P}-fix-compatibility-with-boost-1.47-and-higher.patch \ |
126 |
- "${FILESDIR}"/${P}-underlinking.patch |
127 |
+src_prepare() { |
128 |
+ epatch ${PATCHES[@]} |
129 |
+ epatch_user |
130 |
|
131 |
eautoreconf |
132 |
} |
133 |
|
134 |
src_install() { |
135 |
- emake DESTDIR="${D}" install || die |
136 |
- dodoc AUTHORS README |
137 |
+ default |
138 |
|
139 |
insinto /usr/share/sslsniff |
140 |
doins leafcert.pem IPSCACLASEA1.crt |