[gentoo-commits] repo/gentoo:master commit in: net-analyzer/ettercap/, net-analyzer/ettercap/files/
commit: db26ce81811d5556c2c3afc877fe42854835be7e
Author: Sam James gentoo org>
AuthorDate: Sat Mar 25 05:48:56 2023 +
Commit: Sam James gentoo org>
CommitDate: Sat Mar 25 05:51:54 2023 +
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-.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} == "" ]] ; then
+if [[ ${PV} == ]] ; 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-.ebuild
b/net-analyzer/ettercap/ettercap-.ebuild
index b050ccc4f5d7..c56915d82186 100644
--- a/net-analyzer/ettercap/ettercap-.ebuild
+++ b/net-analyzer/ettercap/ettercap-.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} == "" ]] ; then
+if [[ ${PV} == ]] ; 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
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/ettercap/, net-analyzer/ettercap/files/
commit: 03f6ff8bebd9895d930e8beabdbf5700a80e8090
Author: Sam James gentoo org>
AuthorDate: Sat May 1 17:29:20 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat May 1 18:06:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03f6ff8b
net-analyzer/ettercap: drop obsolete LibreSSL patch
Signed-off-by: Sam James 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..000
--- 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
-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
- 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 >= 0x1010L)
-+#if (OPENSSL_VERSION_NUMBER >= 0x1010L) &&
!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
-
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/ettercap/, net-analyzer/ettercap/files/
commit: fe87ccdf589165221731be9d02fa9a1a576356ed
Author: Craig Andrews gentoo org>
AuthorDate: Sat Dec 29 01:41:03 2018 +
Commit: Craig Andrews gentoo org>
CommitDate: Wed Jan 2 00:31:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe87ccdf
net-analyzer/ettercap: openssl 1.1 compatiblity, EAPI=6, fix tests
Closes: https://bugs.gentoo.org/673222
Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Craig Andrews gentoo.org>
...tercap-.ebuild => ettercap-0.8.2-r2.ebuild} | 33 +--
net-analyzer/ettercap/ettercap-.ebuild | 29 ++-
.../files/ettercap-0.8.2-openssl-1.1.patch | 254 +
3 files changed, 284 insertions(+), 32 deletions(-)
diff --git a/net-analyzer/ettercap/ettercap-.ebuild
b/net-analyzer/ettercap/ettercap-0.8.2-r2.ebuild
similarity index 65%
copy from net-analyzer/ettercap/ettercap-.ebuild
copy to net-analyzer/ettercap/ettercap-0.8.2-r2.ebuild
index c8f2e6e8f41..6fa10f902c2 100644
--- a/net-analyzer/ettercap/ettercap-.ebuild
+++ b/net-analyzer/ettercap/ettercap-0.8.2-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
inherit cmake-utils
@@ -16,10 +16,10 @@ if [[ ${PV} == "" ]] ; then
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
- KEYWORDS="~alpha ~amd64 ~arm ~sparc ~x86 ~x86-fbsd"
+ KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
fi
-#IUSE="doc gtk ipv6 ncurses +plugins test"
-IUSE="doc gtk ipv6 libressl ncurses +plugins"
+
+IUSE="doc gtk ipv6 libressl ncurses +plugins test"
RDEPEND="dev-libs/libbsd
dev-libs/libpcre
@@ -37,13 +37,18 @@ RDEPEND="dev-libs/libbsd
>=x11-libs/gtk+-2.2.2:2
>=x11-libs/pango-1.2.3
)
- ncurses? ( sys-libs/ncurses:0= )
+ 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}"/cve-2017-6430.patch
+ "${FILESDIR}"/${P}-openssl-1.1.patch
+)
src_prepare() {
sed -i "s:Release:Release Gentoo:" CMakeLists.txt || die
@@ -52,21 +57,17 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
- $(cmake-utils_use_enable ncurses CURSES)
- $(cmake-utils_use_enable gtk)
- $(cmake-utils_use_enable plugins)
- $(cmake-utils_use_enable ipv6)
- $(cmake-utils_use_enable doc PDF_DOCS)
+ -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)"
-DBUNDLED_LIBS=OFF
-DSYSTEM_LIBS=ON
-DINSTALL_SYSCONFDIR="${EROOT}"etc
)
#right now we only support gtk2, but ettercap also supports gtk3
#do we care? do we want to support both?
-
- #we want to enable testing but it fails right now
- #we want to disable the bundled crap, but we are missing at
least "libcheck"
- #if we want to enable tests, we need to fix it, and either
package libcheck or allow bundled version
- #$(cmake-utils_use_enable test TESTS)
cmake-utils_src_configure
}
diff --git a/net-analyzer/ettercap/ettercap-.ebuild
b/net-analyzer/ettercap/ettercap-.ebuild
index c8f2e6e8f41..b83933eda5d 100644
--- a/net-analyzer/ettercap/ettercap-.ebuild
+++ b/net-analyzer/ettercap/ettercap-.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
inherit cmake-utils
@@ -16,10 +16,10 @@ if [[ ${PV} == "" ]] ; then
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
- KEYWORDS="~alpha ~amd64 ~arm ~sparc ~x86 ~x86-fbsd"
+ KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
fi
-#IUSE="doc gtk ipv6 ncurses +plugins test"
-IUSE="doc gtk ipv6 libressl ncurses +plugins"
+
+IUSE="doc gtk ipv6 libressl ncurses +plugins test"
RDEPEND="dev-libs/libbsd
dev-libs/libpcre
@@ -37,11 +37,12 @@ RDEPEND="dev-libs/libbsd
>=x11-libs/gtk+-2.2.2:2
>=x11-libs/pango-1.2.3
)
- ncurses? ( sys-libs/ncurses:0= )
+ ncurses? (
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/ettercap/, net-analyzer/ettercap/files/
commit: 30594418a8d35519a5a055157ea8be27d8c49e9f
Author: Zero_Chaos gentoo org>
AuthorDate: Sat Feb 24 05:06:02 2018 +
Commit: Richard Farina gentoo org>
CommitDate: Sat Feb 24 05:06:02 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30594418
net-analyzer/ettercap: bug #612226
Package-Manager: Portage-2.3.24, Repoman-2.3.6
net-analyzer/ettercap/ettercap-0.8.2-r1.ebuild | 62 ++
net-analyzer/ettercap/files/cve-2017-6430.patch | 68 +
2 files changed, 130 insertions(+)
diff --git a/net-analyzer/ettercap/ettercap-0.8.2-r1.ebuild
b/net-analyzer/ettercap/ettercap-0.8.2-r1.ebuild
new file mode 100644
index 000..71fe6afb63c
--- /dev/null
+++ b/net-analyzer/ettercap/ettercap-0.8.2-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="A suite for man in the middle attacks"
+HOMEPAGE="https://github.com/Ettercap/ettercap;
+SRC_URI="https://github.com/Ettercap/${PN}/archive/v${PV}.tar.gz ->
${P}.tar.gz" #mirror does not work
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="gtk ipv6 ncurses +plugins"
+
+RDEPEND="dev-libs/libbsd
+ dev-libs/libpcre
+ dev-libs/openssl:0=
+ net-libs/libnet:1.1
+ >=net-libs/libpcap-0.8.1
+ sys-libs/zlib
+ 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}
+ sys-devel/flex
+ virtual/yacc"
+
+src_prepare() {
+ sed -i "s:Release:Release Gentoo:" CMakeLists.txt || die
+ epatch "${FILESDIR}"/cve-2017-6430.patch
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_enable ncurses CURSES)
+ $(cmake-utils_use_enable gtk)
+ $(cmake-utils_use_enable plugins)
+ $(cmake-utils_use_enable ipv6)
+ -DBUNDLED_LIBS=OFF
+ -DSYSTEM_LIBS=ON
+ -DINSTALL_SYSCONFDIR="${EROOT}"etc
+ )
+ #right now we only support gtk2, but ettercap also supports gtk3
+ #do we care? do we want to support both?
+
+ #we want to enable testing but it fails right now
+ #we want to disable the bundled crap, but we are missing at
least "libcheck"
+ #if we want to enable tests, we need to fix it, and either
package libcheck or allow bundled version
+ #$(cmake-utils_use_enable test TESTS)
+ cmake-utils_src_configure
+}
diff --git a/net-analyzer/ettercap/files/cve-2017-6430.patch
b/net-analyzer/ettercap/files/cve-2017-6430.patch
new file mode 100644
index 000..67483dcc024
--- /dev/null
+++ b/net-analyzer/ettercap/files/cve-2017-6430.patch
@@ -0,0 +1,68 @@
+From 4ad7f85dc01202e363659aa473c99470b3f4e1f4 Mon Sep 17 00:00:00 2001
+From: Gianfranco Costamagna
+Date: Tue, 7 Mar 2017 22:05:31 +0100
+Subject: [PATCH] Fix issue #782
+
+---
+ utils/etterfilter/ef_compiler.c | 4 +++-
+ utils/etterfilter/ef_main.c | 10 +++---
+ utils/etterfilter/ef_output.c | 3 +++
+ 3 files changed, 13 insertions(+), 4 deletions(-)
+
+diff --git a/utils/etterfilter/ef_compiler.c b/utils/etterfilter/ef_compiler.c
+index db876636e..ddb73bd30 100644
+--- a/utils/etterfilter/ef_compiler.c
b/utils/etterfilter/ef_compiler.c
+@@ -239,7 +239,9 @@ size_t compile_tree(struct filter_op **fop)
+struct filter_op *array = NULL;
+struct unfold_elm *ue;
+
+- BUG_IF(tree_root == NULL);
++ // invalid file
++ if (tree_root == NULL)
++ return 0;
+
+fprintf(stdout, " Unfolding the meta-tree ");
+fflush(stdout);
+diff --git a/utils/etterfilter/ef_main.c b/utils/etterfilter/ef_main.c
+index ae4591344..431084b91 100644
+--- a/utils/etterfilter/ef_main.c
b/utils/etterfilter/ef_main.c
+@@ -39,7 +39,7 @@ struct globals *gbls;
+
+ int main(int argc, char *argv[])
+ {
+-
++ int ret_value = 0;
+globals_alloc();
+/* etterfilter copyright */
+fprintf(stdout, "\n" EC_COLOR_BOLD "%s %s" EC_COLOR_END " copyright %s
%s\n\n",
+@@ -84,8 +84,12 @@ int main(int argc, char *argv[])
+ fprintf(stdout, "\n\nThe script contains errors...\n\n");
+
+/* write to file */
+- if (write_output() != E_SUCCESS)
+- FATAL_ERROR("Cannot write output file (%s)", GBL_OPTIONS->output_file);
++ ret_value = write_output();
++ if (ret_value == -E_NOTHANDLED)
++ FATAL_ERROR("Cannot write output file (%s): the filter is not correctly
handled.", GBL_OPTIONS->output_file);
++
