gentoo resync : 04.05.2021

4 files changed, 8 insertions, 50 deletions

diff --git a/net-analyzer/ettercap/Manifest b/net-analyzer/ettercap/Manifest
index 9523bd5e0184..1fa40418e9c0 100644
--- a/net-analyzer/ettercap/Manifest
+++ b/net-analyzer/ettercap/Manifest
@@ -1,5 +1,4 @@
-AUX ettercap-0.8.3.1-libressl.patch 1147 BLAKE2B bb3cf4e73f9a03cb13a82e6569d05f52ffe2bf438fc834f5793057c9aab85a5edff7a2c5830a5aecddce8646e9a5d370be4654610516bdbbdcfaff63a2b8ea04 SHA512 57c8c6c04f4b49598fedc702d119963e7633ebec4008d4c3467749e7f5053572f9d8fe1254f7ed6554975791300ba2e96e481a86a656f6ec0d80d5a011254b92
 DIST ettercap-0.8.3.1.tar.gz 6678653 BLAKE2B 2680b97454626a6f1af3b21f689ba8eed7a023c3ef5cd84d5b2b5859382f398b3a6fc622270ca41941a8a18a7bdd260af64165344a33b2e195c86ee61567f2eb SHA512 9bd71dcc1730293ee83934aca3587dfde662cb3890c12fafa557b6359f12226e5cb6f59a0db1aa11245a132b275e355e3bcc8952db921171d27b792827f148b5
-EBUILD ettercap-0.8.3.1.ebuild 1850 BLAKE2B 2bd65f9b1dee27731671f7b1f7e669a9be0968f45e8682833f2076cbd8319bc21f67f281932f3ab72c7a2a13845f36bc392df00576e56fbdd948e2dac47c2b24 SHA512 ab334f8a0e70726703d3d82562ccd160e6488e908c2fe415386484150116e600ff5079bee7fbf854bcbe5501531e399415e85f753d59f1972a3b7884660351d9
-EBUILD ettercap-9999.ebuild 1809 BLAKE2B 2dcdca206b6ec876b887c0d4b126f4f0800ca9ac9e3b4801d3d2e4475f07d66683396320fdd3be51106bbf1c0151734d1cc1c9f9ccece788327e13e5f0b5d531 SHA512 d709b14a46a70723f0f72a2615bc97f720babf5900e177ded948a9c00e627db9a66fe6aeb80fb406bfd9e7ca966e01b9bb20aa85154a162e56763a035785c394
+EBUILD ettercap-0.8.3.1.ebuild 1743 BLAKE2B c39a455b45f30b7455eec278d3cf4b37720c96444ece2f01e92fb31483e13f339e5435ae2420f93f4b11c974abf965a279ccff0b6c52b6a8bfbc6abf9c91332c SHA512 f2cfc92d6a07c038ef819905e285e22738d007655956838417fa1b38bb5c0de90ee397f78a3fd82f8955b4310eb74fd03daf08a66ca93a6ee40fb16e92025732
+EBUILD ettercap-9999.ebuild 1749 BLAKE2B ac8356bf6e5e6f79791e0ca0bea4a14efca12f9e2093b66ab1b5682162c453c7d19e9a80cd191733e14479bb57a614f1a5f634b2161c52818069f3e1e405c075 SHA512 d85cc1a853bd7521aba15c5481bf012fc85f2e5161d7ddd235cf2ce07ad2096e9573387e90969f587a0a282d5ea124429bf30c9c7eda5c4bd151091d94c0d502
 MISC metadata.xml 657 BLAKE2B e32e3fbc55029a9398399a2e2b69974f720826f8769379868ae80e32d2a9b2a69bfeb59b349dae91b7f27a759647091f58ea07a9b23a6dcf32d373966310bdde SHA512 0b682cb596f905882f2c0682c163d31410b94ca873a468db93e155103aeb1e943bff1c55bde1c9537478ce324d368f468bcb91c98f0aefb9dfa2a2239d7f73d5
diff --git a/net-analyzer/ettercap/ettercap-0.8.3.1.ebuild b/net-analyzer/ettercap/ettercap-0.8.3.1.ebuild
index 7d5c3ac6c11e..05db91778f2f 100644
--- a/net-analyzer/ettercap/ettercap-0.8.3.1.ebuild
+++ b/net-analyzer/ettercap/ettercap-0.8.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,13 +19,12 @@ else
 	KEYWORDS="~alpha amd64 arm ppc ppc64 sparc x86"
 fi
 
-IUSE="doc geoip gtk ipv6 libressl ncurses +plugins test"
+IUSE="doc geoip gtk ipv6 ncurses +plugins test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="dev-libs/libbsd
 	dev-libs/libpcre
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 	net-libs/libnet:1.1
 	>=net-libs/libpcap-0.8.1
 	sys-libs/zlib
@@ -48,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/ettercap-9999.ebuild b/net-analyzer/ettercap/ettercap-9999.ebuild
index f6f494b3507f..07c3e35f6522 100644
--- a/net-analyzer/ettercap/ettercap-9999.ebuild
+++ b/net-analyzer/ettercap/ettercap-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,13 +19,12 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 fi
 
-IUSE="doc geoip gtk ipv6 libressl ncurses +plugins test"
+IUSE="doc geoip gtk ipv6 ncurses +plugins test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="dev-libs/libbsd
 	dev-libs/libpcre
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 	net-libs/libnet:1.1
 	>=net-libs/libpcap-0.8.1
 	sys-libs/zlib
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 ed5a49ce4361..000000000000
--- 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
-