Gentoo Archives: gentoo-commits

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