From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4008815864F for ; Sat, 25 Mar 2023 05:52:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 50475E0894; Sat, 25 Mar 2023 05:52:08 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1F3A6E0894 for ; Sat, 25 Mar 2023 05:52:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0BF72341030 for ; Sat, 25 Mar 2023 05:52:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 088A08E4 for ; Sat, 25 Mar 2023 05:52:05 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1679723514.db26ce81811d5556c2c3afc877fe42854835be7e.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/ettercap/, net-analyzer/ettercap/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/ettercap/ettercap-0.8.3.1-r1.ebuild net-analyzer/ettercap/ettercap-0.8.3.1.ebuild net-analyzer/ettercap/ettercap-9999.ebuild net-analyzer/ettercap/files/ettercap-0.8.3.1-curl-8.patch X-VCS-Directories: net-analyzer/ettercap/ net-analyzer/ettercap/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: db26ce81811d5556c2c3afc877fe42854835be7e X-VCS-Branch: master Date: Sat, 25 Mar 2023 05:52:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 09382735-5dec-415b-b5f9-bde15b84f066 X-Archives-Hash: e2b6cb5de8f1c97d3766e1f20ca26a29 commit: db26ce81811d5556c2c3afc877fe42854835be7e Author: Sam James gentoo org> AuthorDate: Sat Mar 25 05:48:56 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sat Mar 25 05:51:54 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db26ce81 net-analyzer/ettercap: fix build w/ curl 8 Closes: https://bugs.gentoo.org/902987 Signed-off-by: Sam James gentoo.org> ...p-0.8.3.1.ebuild => ettercap-0.8.3.1-r1.ebuild} | 40 ++++++++++++++-------- net-analyzer/ettercap/ettercap-9999.ebuild | 38 ++++++++++++-------- .../ettercap/files/ettercap-0.8.3.1-curl-8.patch | 32 +++++++++++++++++ 3 files changed, 81 insertions(+), 29 deletions(-) diff --git a/net-analyzer/ettercap/ettercap-0.8.3.1.ebuild b/net-analyzer/ettercap/ettercap-0.8.3.1-r1.ebuild similarity index 74% rename from net-analyzer/ettercap/ettercap-0.8.3.1.ebuild rename to 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..c56915d82186 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 +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,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 +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 +--- a/plug-ins/sslstrip/sslstrip.c ++++ b/plug-ins/sslstrip/sslstrip.c +@@ -51,7 +51,7 @@ + + #include + +-#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 + +