Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/sslsplit/files/, net-analyzer/sslsplit/
Date: Fri, 27 May 2022 06:53:19
Message-Id: 1653634390.fc0df4819cf65619f4df3d4f8b76945c44c37abd.juippis@gentoo
1 commit: fc0df4819cf65619f4df3d4f8b76945c44c37abd
2 Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz>
3 AuthorDate: Mon May 23 15:29:15 2022 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Fri May 27 06:53:10 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc0df481
7
8 net-analyzer/sslsplit: fix openssl3 support
9
10 Upstream-issue: https://github.com/droe/sslsplit/issues/290
11 Closes: https://bugs.gentoo.org/805536
12 Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz>
13 Closes: https://github.com/gentoo/gentoo/pull/25611
14 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
15
16 .../sslsplit/files/sslsplit-0.5.5-openssl3.patch | 31 ++++++++++++++++++++++
17 net-analyzer/sslsplit/sslsplit-0.5.5.ebuild | 2 ++
18 2 files changed, 33 insertions(+)
19
20 diff --git a/net-analyzer/sslsplit/files/sslsplit-0.5.5-openssl3.patch b/net-analyzer/sslsplit/files/sslsplit-0.5.5-openssl3.patch
21 new file mode 100644
22 index 000000000000..10807bee3899
23 --- /dev/null
24 +++ b/net-analyzer/sslsplit/files/sslsplit-0.5.5-openssl3.patch
25 @@ -0,0 +1,31 @@
26 +From: Soner Tari <sonertari@×××××.com>
27 +Date: Fri, 4 Feb 2022 19:46:58 +0300
28 +Subject: [PATCH] Fix build errors with OpenSSL 3.0.x, but not deprecation
29 + warnings, issue #290
30 +
31 +This patch fixes errors only, so that build succeeds, but deprecation
32 +warnings remain. It seems we need considerable changes to replace those
33 +deprecated functions in the warnings.
34 +---
35 +
36 +Upstream-commit: e17de8454a65 ("Fix build errors with OpenSSL 3.0.x, but not deprecation warnings, issue #290")
37 +Upstream-issue: https://github.com/droe/sslsplit/issues/290
38 +
39 +diff --git a/pxyconn.c b/pxyconn.c
40 +index e69de20..09a8b80 100644
41 +--- a/pxyconn.c
42 ++++ b/pxyconn.c
43 +@@ -72,6 +72,10 @@ bufferevent_openssl_set_allow_dirty_shutdown(UNUSED struct bufferevent *bev,
44 + }
45 + #endif /* LIBEVENT_VERSION_NUMBER < 0x02010000 */
46 +
47 ++#if OPENSSL_VERSION_NUMBER >= 0x30000000L
48 ++#define ERR_GET_FUNC(x) 0
49 ++#define ERR_func_error_string(x) ""
50 ++#endif
51 +
52 + /*
53 + * Maximum size of data to buffer per connection direction before
54 +--
55 +2.35.1
56 +
57
58 diff --git a/net-analyzer/sslsplit/sslsplit-0.5.5.ebuild b/net-analyzer/sslsplit/sslsplit-0.5.5.ebuild
59 index c6f530a49947..7d9691cbbcef 100644
60 --- a/net-analyzer/sslsplit/sslsplit-0.5.5.ebuild
61 +++ b/net-analyzer/sslsplit/sslsplit-0.5.5.ebuild
62 @@ -32,6 +32,8 @@ DEPEND="${RDEPEND}
63 test? ( dev-libs/check )"
64 BDEPEND="virtual/pkgconfig"
65
66 +PATCHES=( "${FILESDIR}/${P}-openssl3.patch" )
67 +
68 src_prepare() {
69 default