Gentoo Archives: gentoo-commits

From: Stefan Strogin <steils@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ettercap/files/, net-analyzer/ettercap/
Date: Sat, 15 Aug 2020 05:34:25
Message-Id: 1597469630.6ea1b718ba18f07813d789e591fdb43f1302603a.steils@gentoo
1 commit: 6ea1b718ba18f07813d789e591fdb43f1302603a
2 Author: Stefan Strogin <steils <AT> gentoo <DOT> org>
3 AuthorDate: Sat Aug 15 05:31:52 2020 +0000
4 Commit: Stefan Strogin <steils <AT> gentoo <DOT> org>
5 CommitDate: Sat Aug 15 05:33:50 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ea1b718
7
8 net-analyzer/ettercap: add patch for LibreSSL
9
10 Closes: https://bugs.gentoo.org/736990
11 Package-Manager: Portage-3.0.2, Repoman-2.3.23
12 Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>
13
14 net-analyzer/ettercap/ettercap-0.8.3.1.ebuild | 2 ++
15 .../ettercap/files/ettercap-0.8.3.1-libressl.patch | 37 ++++++++++++++++++++++
16 2 files changed, 39 insertions(+)
17
18 diff --git a/net-analyzer/ettercap/ettercap-0.8.3.1.ebuild b/net-analyzer/ettercap/ettercap-0.8.3.1.ebuild
19 index f6f494b3507..bfaf4b447d3 100644
20 --- a/net-analyzer/ettercap/ettercap-0.8.3.1.ebuild
21 +++ b/net-analyzer/ettercap/ettercap-0.8.3.1.ebuild
22 @@ -48,6 +48,8 @@ DEPEND="${RDEPEND}
23 sys-devel/flex
24 virtual/yacc"
25
26 +PATCHES=( "${FILESDIR}"/${P}-libressl.patch )
27 +
28 src_prepare() {
29 sed -i "s:Release:Release Gentoo:" CMakeLists.txt || die
30 cmake_src_prepare
31
32 diff --git a/net-analyzer/ettercap/files/ettercap-0.8.3.1-libressl.patch b/net-analyzer/ettercap/files/ettercap-0.8.3.1-libressl.patch
33 new file mode 100644
34 index 00000000000..ed5a49ce436
35 --- /dev/null
36 +++ b/net-analyzer/ettercap/files/ettercap-0.8.3.1-libressl.patch
37 @@ -0,0 +1,37 @@
38 +From b2f7634c9dbc0ef68640f0571787d92300e9f9f9 Mon Sep 17 00:00:00 2001
39 +From: Stefan Strogin <stefan@××××××.org>
40 +Date: Sat, 15 Aug 2020 07:18:31 +0300
41 +Subject: [PATCH] ec_sslwrap: fix compilation with LibreSSL
42 +
43 +Disable taking over SNI extension from ClientHello and SSL configuration
44 +operations until LibreSSL supports the required API.
45 +
46 +Fixes: https://github.com/Ettercap/ettercap/issues/1068
47 +Upstream-Status: Submitted
48 +[https://github.com/Ettercap/ettercap/pull/1069]
49 +Signed-off-by: Stefan Strogin <steils@g.o>
50 +---
51 + src/ec_sslwrap.c | 4 ++--
52 + 1 file changed, 2 insertions(+), 2 deletions(-)
53 +
54 +diff --git a/src/ec_sslwrap.c b/src/ec_sslwrap.c
55 +index b9f26a14..1e4c24fc 100644
56 +--- a/src/ec_sslwrap.c
57 ++++ b/src/ec_sslwrap.c
58 +@@ -71,11 +71,11 @@
59 + #define TLS_server_method SSLv23_server_method
60 + #endif
61 +
62 +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
63 ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
64 + #define HAVE_OPENSSL_1_1_0
65 + #endif
66 +
67 +-#if (OPENSSL_VERSION_NUMBER >= 0x10101000L)
68 ++#if (OPENSSL_VERSION_NUMBER >= 0x10101000L) && !defined(LIBRESSL_VERSION_NUMBER)
69 + #define HAVE_OPENSSL_1_1_1
70 + #endif
71 +
72 +--
73 +2.28.0
74 +