gentoo resync : 25.08.2020

4 files changed, 128 insertions, 11 deletions

diff --git a/net-analyzer/ettercap/Manifest b/net-analyzer/ettercap/Manifest
index af353520c98f..79e3114488cf 100644
--- a/net-analyzer/ettercap/Manifest
+++ b/net-analyzer/ettercap/Manifest
@@ -1,5 +1,8 @@
 AUX ettercap-0.8.3-fno-common.patch 741 BLAKE2B 907c78c720e2a55bc7325f8611ec0bd8a869b9b0a172445e45f064faa988c5e2863bd46d3f2a724613c9f6311e4d925472d701aee4963546a2b4e771b4a04255 SHA512 6c896bdbfac24bd698f49ed33617f2a9b43f4ec080b292e9d1b06e038b53b3dfaeadc3d6d0e08a968f8a1e9ccc71cff266412a1858bbf4bfbb9c294947c795cf
+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
 DIST ettercap-0.8.3.tar.gz 8381943 BLAKE2B f49098d61f60877d3f979d7861f36dad6ec3fbfca7ed89d8f9826867145ea36daec65a1076c893f81391218688448515ef020a9cdf9a16ffddc830bacec8eb1c SHA512 1929c986d3a17ebc693ffe8531e01c66379c0ee6ea71305ea49b6a9eece84b6da1923135311db458bdb6035feb593e525786e6cf4c465ced5a7683384d4a4ae7
+EBUILD ettercap-0.8.3.1.ebuild 1856 BLAKE2B 2c0e47b8847593719b77a90538dbc22a896fda9696254be729b3f1164c3933566977c7d404d7814a37913ec240576980645fc32ebb34e25799debad745f188c2 SHA512 5a7515830f0754031aed249ddeb4cdcd2582ef09374deee492f09e97eeed6d247407f0a2a4a5f6910a79e3f8a11f722f784735adb103ece5183703b194846305
 EBUILD ettercap-0.8.3.ebuild 1825 BLAKE2B 67ea7421490b802862350501d505722efcfce8779a0e65a6815980ca4e25f3be75f8a50d94f3c2478375a79d04721d2b0ac9718932cb569a3050b5c91e6b592b SHA512 ef4f1d1488fd92569f42e699494eef056ed0252b287ec6c94eb21f92ef071772158a07fec18a1387c7a77d9ef01b4c3e73fb426df4886fa8eb8eecdf92c291f6
-EBUILD ettercap-9999.ebuild 1784 BLAKE2B fc95ad8135e4a4fa34c4b7ca09d1cb2279ce37b67a2aea48cd0a69502ebc8b610ab7d50b28b33bf27a1b885a3ba06551defba4258cdb6372a85c17ee59f800a4 SHA512 4aae70b5170b1edc944d1994d8a2729d8a8c17f0ab4a74c006b1b168002fe89c10d47cb03b67469854aed81449d4e3dcb0b822b9bf05af33bd0c7e4a5f882f98
+EBUILD ettercap-9999.ebuild 1809 BLAKE2B 2dcdca206b6ec876b887c0d4b126f4f0800ca9ac9e3b4801d3d2e4475f07d66683396320fdd3be51106bbf1c0151734d1cc1c9f9ccece788327e13e5f0b5d531 SHA512 d709b14a46a70723f0f72a2615bc97f720babf5900e177ded948a9c00e627db9a66fe6aeb80fb406bfd9e7ca966e01b9bb20aa85154a162e56763a035785c394
 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
new file mode 100644
index 000000000000..bfaf4b447d3d
--- /dev/null
+++ b/net-analyzer/ettercap/ettercap-0.8.3.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A suite for man in the middle attacks"
+HOMEPAGE="https://github.com/Ettercap/ettercap"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Ettercap/${PN}.git"
+else
+	SRC_URI="https://github.com/Ettercap/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+IUSE="doc geoip gtk ipv6 libressl ncurses +plugins test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-libs/libbsd
+	dev-libs/libpcre
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	net-libs/libnet:1.1
+	>=net-libs/libpcap-0.8.1
+	sys-libs/zlib
+	geoip? ( dev-libs/geoip )
+	gtk? (
+		>=dev-libs/atk-1.2.4
+		>=dev-libs/glib-2.2.2:2
+		media-libs/freetype
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf:2
+		>=x11-libs/gtk+-2.2.2:2
+		>=x11-libs/pango-1.2.3
+	)
+	ncurses? ( >=sys-libs/ncurses-5.3:= )
+	plugins? ( >=net-misc/curl-7.26.0 )"
+DEPEND="${RDEPEND}
+	doc? ( app-text/ghostscript-gpl
+		sys-apps/groff )
+	test? ( dev-libs/check )
+	sys-devel/flex
+	virtual/yacc"
+
+PATCHES=( "${FILESDIR}"/${P}-libressl.patch )
+
+src_prepare() {
+	sed -i "s:Release:Release Gentoo:" CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_CURSES="$(usex ncurses)"
+		-DENABLE_GTK="$(usex gtk)"
+		-DENABLE_PLUGINS="$(usex plugins)"
+		-DENABLE_IPV6="$(usex ipv6)"
+		-DENABLE_TESTS="$(usex test)"
+		-DENABLE_PDF_DOCS="$(usex doc)"
+		-DENABLE_GEOIP="$(usex geoip)"
+		-DBUNDLED_LIBS=OFF
+		-DSYSTEM_LIBS=ON
+		-DINSTALL_SYSCONFDIR="${EPREFIX}"/etc
+	)
+
+	! use gtk && mycmakeargs+=(-DINSTALL_DESKTOP=OFF)
+		#right now we only support gtk2, but ettercap also supports gtk3
+		#do we care? do we want to support both?
+	cmake_src_configure
+}
diff --git a/net-analyzer/ettercap/ettercap-9999.ebuild b/net-analyzer/ettercap/ettercap-9999.ebuild
index 047be22f8f4c..f6f494b3507f 100644
--- a/net-analyzer/ettercap/ettercap-9999.ebuild
+++ b/net-analyzer/ettercap/ettercap-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="A suite for man in the middle attacks"
 HOMEPAGE="https://github.com/Ettercap/ettercap"
@@ -15,11 +15,11 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Ettercap/${PN}.git"
 else
-	SRC_URI="https://github.com/Ettercap/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" #mirror does not work
+	SRC_URI="https://github.com/Ettercap/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 fi
 
-IUSE="doc gtk ipv6 libressl ncurses +plugins test"
+IUSE="doc geoip gtk ipv6 libressl ncurses +plugins test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="dev-libs/libbsd
@@ -29,6 +29,7 @@ RDEPEND="dev-libs/libbsd
 	net-libs/libnet:1.1
 	>=net-libs/libpcap-0.8.1
 	sys-libs/zlib
+	geoip? ( dev-libs/geoip )
 	gtk? (
 		>=dev-libs/atk-1.2.4
 		>=dev-libs/glib-2.2.2:2
@@ -46,13 +47,10 @@ DEPEND="${RDEPEND}
 	test? ( dev-libs/check )
 	sys-devel/flex
 	virtual/yacc"
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.8.3-fno-common.patch
-)
 
 src_prepare() {
 	sed -i "s:Release:Release Gentoo:" CMakeLists.txt || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -63,11 +61,14 @@ src_configure() {
 		-DENABLE_IPV6="$(usex ipv6)"
 		-DENABLE_TESTS="$(usex test)"
 		-DENABLE_PDF_DOCS="$(usex doc)"
+		-DENABLE_GEOIP="$(usex geoip)"
 		-DBUNDLED_LIBS=OFF
 		-DSYSTEM_LIBS=ON
-		-DINSTALL_SYSCONFDIR="${EROOT}"etc
+		-DINSTALL_SYSCONFDIR="${EPREFIX}"/etc
 	)
+
+	! use gtk && mycmakeargs+=(-DINSTALL_DESKTOP=OFF)
 		#right now we only support gtk2, but ettercap also supports gtk3
 		#do we care? do we want to support both?
-	cmake-utils_src_configure
+	cmake_src_configure
 }
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
new file mode 100644
index 000000000000..ed5a49ce4361
--- /dev/null
+++ b/net-analyzer/ettercap/files/ettercap-0.8.3.1-libressl.patch
@@ -0,0 +1,37 @@
+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
+