gentoo auto-resync : 25:03:2023 - 06:49:35

4 files changed, 85 insertions, 32 deletions

diff --git a/net-analyzer/ettercap/Manifest b/net-analyzer/ettercap/Manifest
index 8197e7ed278f..1e9630a7af40 100644
--- a/net-analyzer/ettercap/Manifest
+++ b/net-analyzer/ettercap/Manifest
@@ -1,4 +1,5 @@
+AUX ettercap-0.8.3.1-curl-8.patch 1110 BLAKE2B 7a70191da6b2376826f739d52445c35789af07f2cfddc24197cbeb637808f6e461694a34dff6faaf6971ce11d717fe2c18a8ff0291832ec27eb6479591f9e206 SHA512 cdb2ab8d8078c1b8c3305dd00345d295e2cf4b0127c8be471b326ed6375324d9c227f2d3cffd1ac6583e23385fd5fdb34dfc54f11b0952d2e8b1864455da95d3
 DIST ettercap-0.8.3.1.tar.gz 6678653 BLAKE2B 2680b97454626a6f1af3b21f689ba8eed7a023c3ef5cd84d5b2b5859382f398b3a6fc622270ca41941a8a18a7bdd260af64165344a33b2e195c86ee61567f2eb SHA512 9bd71dcc1730293ee83934aca3587dfde662cb3890c12fafa557b6359f12226e5cb6f59a0db1aa11245a132b275e355e3bcc8952db921171d27b792827f148b5
-EBUILD ettercap-0.8.3.1.ebuild 1752 BLAKE2B db8517db29e514e61f1b4954aabffa258630ff32228a7e9c1e4db90bc5b4097f429f7de9221b6aed6c9295ca1d3452133c3033f17de32c63b8dbf61a69834f35 SHA512 c10308ccb289c568b2be8ef8da5a749fe3239ba0c3124f3d6483543057fd927d26d2047b6ca589b4e611441a139ec882468e51b59d2bbd745f4bb85fecfd796e
-EBUILD ettercap-9999.ebuild 1758 BLAKE2B 5c9e4e90fee581d98de3b96257235a12efbda2fd735bfbfda0ff167ba68654ff99afa8d5def89477d32e432a30d0fa43db4330d16b4ccbe48cbd24b8eb84cb2f SHA512 4dbc8e7abf5cf1ada321fde8b9d3212eeb37d4b71407584085605a1e215d082a6e37d1cfa48781ce97c72875fe714bd6119c40d9845a3f0c2d8796b85706a903
+EBUILD ettercap-0.8.3.1-r1.ebuild 1803 BLAKE2B 2105e84c2303b3898c02d494d941bb6e69ff8a4470861b55466bf94bf97097bc04c09cadd019ca218d0f83a7fd6e94b2b1cd2302a63a5f70fd3cd845b9ce7399 SHA512 6b0f116c7ad59f2122cb334ddbff0c16e2c68bd8c8d8f8147ed5ff74acd477a8ac198936789f6f7c6490de5c436018baf5f5bc9ef880a2a64977a0f9cbcf6dc5
+EBUILD ettercap-9999.ebuild 1758 BLAKE2B 1a898da9d037258473e19e9651a8e10630aaef9ec7d2791c9e76c746bd9503096771b293cf21411e3e042798e3dff667a435a64f187823f17125057dfaec8e97 SHA512 bc377934943fa5c4f6a872d82d113a736099a2e8ca0f03c948edfa33a0dd9506acb20b9e6d664a6a3f7b0a297315816b20ae9915e3bf92357c6eddcc2d4eeb75
 MISC metadata.xml 658 BLAKE2B b4696f4a0f2f3fb86352067988aa4cdf1860363bce7d1dfb7b625bb18157d8985a2a7873f3730acf092b46b94ec7804df11de5e736ef763841fa1a6238859986 SHA512 f9935abb68e3d85eaf393cad919b867ebfca66f8f9d3dc5a570c691c18ce7324dc6bd4e670345b1668b6593d90b99d6d47874ed08512e0ab882160fe0ea6cd24
diff --git a/net-analyzer/ettercap/ettercap-0.8.3.1.ebuild b/net-analyzer/ettercap/ettercap-0.8.3.1-r1.ebuild
index 9cda1724861c..5e686a896922 100644
--- a/net-analyzer/ettercap/ettercap-0.8.3.1.ebuild
+++ b/net-analyzer/ettercap/ettercap-0.8.3.1-r1.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
-DESCRIPTION="A suite for man in the middle attacks"
+DESCRIPTION="Suite for man in the middle attacks"
 HOMEPAGE="https://github.com/Ettercap/ettercap"
 
 LICENSE="GPL-2+"
 SLOT="0"
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Ettercap/${PN}.git"
 else
@@ -22,9 +22,10 @@ fi
 IUSE="doc geoip gtk ipv6 ncurses +plugins test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="dev-libs/libbsd
+RDEPEND="
+	dev-libs/libbsd
 	dev-libs/libpcre
-	dev-libs/openssl:0=
+	dev-libs/openssl:=
 	net-libs/libnet:1.1
 	>=net-libs/libpcap-0.8.1
 	sys-libs/zlib
@@ -39,13 +40,23 @@ RDEPEND="dev-libs/libbsd
 		>=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 )
+	plugins? ( >=net-misc/curl-7.26.0 )
+"
+DEPEND="
+	app-alternatives/yacc
 	sys-devel/flex
-	app-alternatives/yacc"
+"
+BDEPEND="
+	doc? (
+		app-text/ghostscript-gpl
+		sys-apps/groff
+	)
+	test? ( dev-libs/check )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-curl-8.patch
+)
 
 src_prepare() {
 	sed -i "s:Release:Release Gentoo:" CMakeLists.txt || die
@@ -66,8 +77,9 @@ src_configure() {
 		-DINSTALL_SYSCONFDIR="${EPREFIX}"/etc
 	)
 
+	# right now we only support gtk2, but ettercap also supports gtk3
+	# do we care? do we want to support both?
 	! 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 b050ccc4f5d7..6514ab4a71fc 100644
--- a/net-analyzer/ettercap/ettercap-9999.ebuild
+++ b/net-analyzer/ettercap/ettercap-9999.ebuild
@@ -1,30 +1,31 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
-DESCRIPTION="A suite for man in the middle attacks"
+DESCRIPTION="Suite for man in the middle attacks"
 HOMEPAGE="https://github.com/Ettercap/ettercap"
 
 LICENSE="GPL-2+"
 SLOT="0"
 
-if [[ ${PV} == "9999" ]] ; then
+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"
+	KEYWORDS="~alpha amd64 arm ppc ppc64 sparc x86"
 fi
 
 IUSE="doc geoip gtk ipv6 ncurses +plugins test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="dev-libs/libbsd
-	dev-libs/libpcre
-	dev-libs/openssl:0=
+RDEPEND="
+	dev-libs/libbsd
+	dev-libs/libpcre2
+	dev-libs/openssl:=
 	net-libs/libnet:1.1
 	>=net-libs/libpcap-0.8.1
 	sys-libs/zlib
@@ -39,13 +40,19 @@ RDEPEND="dev-libs/libbsd
 		>=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 )
+	plugins? ( >=net-misc/curl-7.26.0 )
+"
+DEPEND="
+	app-alternatives/yacc
 	sys-devel/flex
-	app-alternatives/yacc"
+"
+BDEPEND="
+	doc? (
+		app-text/ghostscript-gpl
+		sys-apps/groff
+	)
+	test? ( dev-libs/check )
+"
 
 src_prepare() {
 	sed -i "s:Release:Release Gentoo:" CMakeLists.txt || die
@@ -66,8 +73,9 @@ src_configure() {
 		-DINSTALL_SYSCONFDIR="${EPREFIX}"/etc
 	)
 
+	# right now we only support gtk2, but ettercap also supports gtk3
+	# do we care? do we want to support both?
 	! 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/files/ettercap-0.8.3.1-curl-8.patch b/net-analyzer/ettercap/files/ettercap-0.8.3.1-curl-8.patch
new file mode 100644
index 000000000000..e1c2259733c2
--- /dev/null
+++ b/net-analyzer/ettercap/files/ettercap-0.8.3.1-curl-8.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/902987
+https://github.com/Ettercap/ettercap/commit/40534662043b7d831d1f6c70448afa9d374a9b63
+
+From 40534662043b7d831d1f6c70448afa9d374a9b63 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 23 Mar 2023 10:23:14 -0700
+Subject: [PATCH] sslstrip: Enhance the libcurl version check to consider
+ version 8+
+
+Lately curl has released version 8 and hence LIBCURL_VERSION_MAJOR is
+reset to 0, current check assumes major version to be 7 at max and hence
+on systems with libcurl 8+ this check breaks and build fails
+
+Fixes
+
+TOPDIR/build/tmp/work/cortexa15t2hf-neon-yoe-linux-gnueabi/ettercap/0.8.3.1-r0/git/plug-ins/sslstrip/sslstrip.c:57:2: error: libcurl 7.26.0 or up is needed
+ ^
+1 error generated.
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/plug-ins/sslstrip/sslstrip.c
++++ b/plug-ins/sslstrip/sslstrip.c
+@@ -51,7 +51,7 @@
+ 
+ #include <curl/curl.h>
+ 
+-#if (LIBCURL_VERSION_MAJOR < 7) || (LIBCURL_VERSION_MINOR < 26)
++#if (LIBCURL_VERSION_MAJOR < 7) || (LIBCURL_VERSION_MAJOR == 7 && LIBCURL_VERSION_MINOR < 26)
+ #error libcurl 7.26.0 or up is needed
+ #endif
+ 
+