From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ettercap/, net-analyzer/ettercap/files/
Date: Sat, 1 May 2021 18:07:12 +0000 (UTC) [thread overview]
Message-ID: <1619892382.03f6ff8bebd9895d930e8beabdbf5700a80e8090.sam@gentoo> (raw)
commit: 03f6ff8bebd9895d930e8beabdbf5700a80e8090
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May 1 17:29:20 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 1 18:06:22 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03f6ff8b
net-analyzer/ettercap: drop obsolete LibreSSL patch
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-analyzer/ettercap/ettercap-0.8.3.1.ebuild | 2 --
.../ettercap/files/ettercap-0.8.3.1-libressl.patch | 37 ----------------------
2 files changed, 39 deletions(-)
diff --git a/net-analyzer/ettercap/ettercap-0.8.3.1.ebuild b/net-analyzer/ettercap/ettercap-0.8.3.1.ebuild
index 069c391c021..05db91778f2 100644
--- a/net-analyzer/ettercap/ettercap-0.8.3.1.ebuild
+++ b/net-analyzer/ettercap/ettercap-0.8.3.1.ebuild
@@ -47,8 +47,6 @@ DEPEND="${RDEPEND}
sys-devel/flex
virtual/yacc"
-PATCHES=( "${FILESDIR}"/${P}-libressl.patch )
-
src_prepare() {
sed -i "s:Release:Release Gentoo:" CMakeLists.txt || die
cmake_src_prepare
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
deleted file mode 100644
index ed5a49ce436..00000000000
--- a/net-analyzer/ettercap/files/ettercap-0.8.3.1-libressl.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From b2f7634c9dbc0ef68640f0571787d92300e9f9f9 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <stefan@steils.org>
-Date: Sat, 15 Aug 2020 07:18:31 +0300
-Subject: [PATCH] ec_sslwrap: fix compilation with LibreSSL
-
-Disable taking over SNI extension from ClientHello and SSL configuration
-operations until LibreSSL supports the required API.
-
-Fixes: https://github.com/Ettercap/ettercap/issues/1068
-Upstream-Status: Submitted
-[https://github.com/Ettercap/ettercap/pull/1069]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- src/ec_sslwrap.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/ec_sslwrap.c b/src/ec_sslwrap.c
-index b9f26a14..1e4c24fc 100644
---- a/src/ec_sslwrap.c
-+++ b/src/ec_sslwrap.c
-@@ -71,11 +71,11 @@
- #define TLS_server_method SSLv23_server_method
- #endif
-
--#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
- #define HAVE_OPENSSL_1_1_0
- #endif
-
--#if (OPENSSL_VERSION_NUMBER >= 0x10101000L)
-+#if (OPENSSL_VERSION_NUMBER >= 0x10101000L) && !defined(LIBRESSL_VERSION_NUMBER)
- #define HAVE_OPENSSL_1_1_1
- #endif
-
---
-2.28.0
-
next reply other threads:[~2021-05-01 18:07 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-01 18:07 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-03-25 5:52 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ettercap/, net-analyzer/ettercap/files/ Sam James
2019-01-02 0:32 Craig Andrews
2018-02-24 5:06 Richard Farina
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1619892382.03f6ff8bebd9895d930e8beabdbf5700a80e8090.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox