[gentoo-commits] repo/gentoo:master commit in: net-analyzer/ettercap/files/, net-analyzer/ettercap/
commit: 3c567ba631c14b1605c441fba76cdaf65e05e828
Author: orbea riseup net>
AuthorDate: Sun Apr 30 01:58:30 2023 +
Commit: Sam James gentoo org>
CommitDate: Wed May 10 16:35:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c567ba6
net-analyzer/ettercap: add upstream libressl patch
This patch was accepted upstream and disables APIs not supported by
LibreSSL <= 3.7.2.
Bug: https://bugs.gentoo.org/903001
Bug: https://bugs.gentoo.org/736990
Upstream-Issue: https://github.com/Ettercap/ettercap/issues/1068
Upstream-PR: https://github.com/Ettercap/ettercap/pull/1069
Upstream-Commit:
https://github.com/Ettercap/ettercap/commit/b2fc8e959dc71fdbaba08aecb1f157c914490a07
Signed-off-by: orbea riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/30813
Signed-off-by: Sam James gentoo.org>
net-analyzer/ettercap/ettercap-0.8.3.1-r3.ebuild | 1 +
.../ettercap/files/ettercap-0.8.3.1-libressl.patch | 36 ++
2 files changed, 37 insertions(+)
diff --git a/net-analyzer/ettercap/ettercap-0.8.3.1-r3.ebuild
b/net-analyzer/ettercap/ettercap-0.8.3.1-r3.ebuild
index 26b54257f1db..75306f098cca 100644
--- a/net-analyzer/ettercap/ettercap-0.8.3.1-r3.ebuild
+++ b/net-analyzer/ettercap/ettercap-0.8.3.1-r3.ebuild
@@ -56,6 +56,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${P}-curl-8.patch
+ "${FILESDIR}"/${P}-libressl.patch #903001, 736990
"${FILESDIR}"/${P}-musl.patch #897820
)
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 ..a56e75c88b75
--- /dev/null
+++ b/net-analyzer/ettercap/files/ettercap-0.8.3.1-libressl.patch
@@ -0,0 +1,36 @@
+https://bugs.gentoo.org/903001
+https://bugs.gentoo.org/736990
+https://github.com/Ettercap/ettercap/pull/1069
+https://github.com/Ettercap/ettercap/commit/b2fc8e959dc71fdbaba08aecb1f157c914490a07
+
+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
+---
+ 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 b9f26a142..1e4c24fc1 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
+
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/ettercap/files/, net-analyzer/ettercap/
commit: 5897af1453b6abf3f993d5b3a698c8184086b067
Author: orbea riseup net>
AuthorDate: Thu Apr 13 01:54:27 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Apr 14 00:27:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5897af14
net-analyzer/ettercap: Fix musl build
Closes: https://bugs.gentoo.org/897820
Upsream-PR: https://github.com/Ettercap/ettercap/pull/1220
Uptream-Commit:
https://github.com/Ettercap/ettercap/commit/f03a1174ffccf9343423498fa3c65bd9090d4ce0
Signed-off-by: orbea riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/30577
Signed-off-by: Sam James gentoo.org>
8.3.1-r2.ebuild => ettercap-0.8.3.1-r3.ebuild} | 1 +
.../ettercap/files/ettercap-0.8.3.1-musl.patch | 39 ++
2 files changed, 40 insertions(+)
diff --git a/net-analyzer/ettercap/ettercap-0.8.3.1-r2.ebuild
b/net-analyzer/ettercap/ettercap-0.8.3.1-r3.ebuild
similarity index 97%
rename from net-analyzer/ettercap/ettercap-0.8.3.1-r2.ebuild
rename to net-analyzer/ettercap/ettercap-0.8.3.1-r3.ebuild
index 3583a1dd0776..26b54257f1db 100644
--- a/net-analyzer/ettercap/ettercap-0.8.3.1-r2.ebuild
+++ b/net-analyzer/ettercap/ettercap-0.8.3.1-r3.ebuild
@@ -56,6 +56,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${P}-curl-8.patch
+ "${FILESDIR}"/${P}-musl.patch #897820
)
src_prepare() {
diff --git a/net-analyzer/ettercap/files/ettercap-0.8.3.1-musl.patch
b/net-analyzer/ettercap/files/ettercap-0.8.3.1-musl.patch
new file mode 100644
index ..516823ec6972
--- /dev/null
+++ b/net-analyzer/ettercap/files/ettercap-0.8.3.1-musl.patch
@@ -0,0 +1,39 @@
+Upsream-PR: https://github.com/Ettercap/ettercap/pull/1220
+Uptream-Commit:
https://github.com/Ettercap/ettercap/commit/f03a1174ffccf9343423498fa3c65bd9090d4ce0
+Bug: https://bugs.gentoo.org/897820
+
+From 3ef51159d4e2cea97accb87af0894fbefb04 Mon Sep 17 00:00:00 2001
+From: Gianfranco Costamagna
+Date: Fri, 3 Mar 2023 21:27:14 +0100
+Subject: [PATCH] Define _GNU_SOURCE to make sure memmem is found when musl
+ library is used. This fixes issue: #1219
+
+Thanks Sam James for the suggestion!
+---
+ include/ec.h | 6 ++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/include/ec.h b/include/ec.h
+index fbf048111..561062c2f 100644
+--- a/include/ec.h
b/include/ec.h
+@@ -21,6 +21,9 @@
+ #if !defined (__USE_GNU) /* for memmem(), strsignal(), etc etc... */
+#define __USE_GNU
+ #endif
++#if !defined (_GNU_SOURCE) /* for memmem(), strsignal(), etc etc... on musl */
++ #define _GNU_SOURCE
++#endif
+ #ifdef OS_SOLARIS
+#define _REENTRANT /* for strtok_r() */
+ #endif
+@@ -28,6 +31,9 @@
+ #if defined (__USE_GNU)
+#undef __USE_GNU
+ #endif
++#if defined (_GNU_SOURCE)
++ #undef _GNU_SOURCE
++#endif
+ #include
+ #include
+ #include
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/ettercap/files/, net-analyzer/ettercap/
commit: 6ea1b718ba18f07813d789e591fdb43f1302603a
Author: Stefan Strogin gentoo org>
AuthorDate: Sat Aug 15 05:31:52 2020 +
Commit: Stefan Strogin gentoo org>
CommitDate: Sat Aug 15 05:33:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ea1b718
net-analyzer/ettercap: add patch for LibreSSL
Closes: https://bugs.gentoo.org/736990
Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Stefan Strogin 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 insertions(+)
diff --git a/net-analyzer/ettercap/ettercap-0.8.3.1.ebuild
b/net-analyzer/ettercap/ettercap-0.8.3.1.ebuild
index f6f494b3507..bfaf4b447d3 100644
--- a/net-analyzer/ettercap/ettercap-0.8.3.1.ebuild
+++ b/net-analyzer/ettercap/ettercap-0.8.3.1.ebuild
@@ -48,6 +48,8 @@ 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
new file mode 100644
index 000..ed5a49ce436
--- /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
+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/files/, net-analyzer/ettercap/
commit: 62034fa04d7370f9c19c9fda7a257cf9acb2c955
Author: Jeroen Roovers gentoo org>
AuthorDate: Sat Feb 1 00:28:52 2020 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sat Feb 1 00:29:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62034fa0
net-analyzer/ettercap: Fix CFLAGS=-fno-common
Package-Manager: Portage-2.3.86, Repoman-2.3.20
Closes: https://bugs.gentoo.org/show_bug.cgi?id=707674
Signed-off-by: Jeroen Roovers gentoo.org>
net-analyzer/ettercap/ettercap-0.8.3.ebuild| 5 -
net-analyzer/ettercap/ettercap-.ebuild | 5 -
.../ettercap/files/ettercap-0.8.3-fno-common.patch | 22 ++
3 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/net-analyzer/ettercap/ettercap-0.8.3.ebuild
b/net-analyzer/ettercap/ettercap-0.8.3.ebuild
index 5a67e97e516..f49ef8cf2e4 100644
--- a/net-analyzer/ettercap/ettercap-0.8.3.ebuild
+++ b/net-analyzer/ettercap/ettercap-0.8.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -47,6 +47,9 @@ 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
diff --git a/net-analyzer/ettercap/ettercap-.ebuild
b/net-analyzer/ettercap/ettercap-.ebuild
index 8db7873acf3..047be22f8f4 100644
--- a/net-analyzer/ettercap/ettercap-.ebuild
+++ b/net-analyzer/ettercap/ettercap-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -46,6 +46,9 @@ 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
diff --git a/net-analyzer/ettercap/files/ettercap-0.8.3-fno-common.patch
b/net-analyzer/ettercap/files/ettercap-0.8.3-fno-common.patch
new file mode 100644
index 000..eddca836905
--- /dev/null
+++ b/net-analyzer/ettercap/files/ettercap-0.8.3-fno-common.patch
@@ -0,0 +1,22 @@
+--- a/include/ec_threads.h
b/include/ec_threads.h
+@@ -12,7 +12,7 @@
+ };
+
+ /* a value to be used to return errors in fuctcions using pthread_t values */
+-pthread_t EC_PTHREAD_NULL;
++extern pthread_t EC_PTHREAD_NULL;
+ #define EC_PTHREAD_SELF EC_PTHREAD_NULL
+ #define PTHREAD_ID(id) (*(unsigned long*)&(id))
+
+--- a/src/ec_threads.c
b/src/ec_threads.c
+@@ -46,6 +46,8 @@
+ #define INIT_LOCK do{ DEBUG_MSG("thread_init_lock");
pthread_mutex_lock(_mtx); } while(0)
+ #define INIT_UNLOCK do{ DEBUG_MSG("thread_init_unlock");
pthread_mutex_unlock(_mtx); } while(0)
+
++pthread_t EC_PTHREAD_NULL;
++
+ /* protos... */
+
+ pthread_t ec_thread_detached(char *name, char *desc, void *(*function)(void
*), void *args, int detached);
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/ettercap/files/, net-analyzer/ettercap/
commit: b03eb00c0d027efc945c09fdf73dca25477a7cf8
Author: Agostino Sarubbo gentoo org>
AuthorDate: Fri Nov 1 19:57:32 2019 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Fri Nov 1 19:57:32 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b03eb00c
net-analyzer/ettercap: remove old
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Agostino Sarubbo gentoo.org>
net-analyzer/ettercap/Manifest | 1 -
net-analyzer/ettercap/ettercap-0.8.2-r2.ebuild | 73 --
net-analyzer/ettercap/files/cve-2017-6430.patch| 68 --
.../files/ettercap-0.8.2-openssl-1.1.patch | 254 -
4 files changed, 396 deletions(-)
diff --git a/net-analyzer/ettercap/Manifest b/net-analyzer/ettercap/Manifest
index dccca758f86..fb40201464a 100644
--- a/net-analyzer/ettercap/Manifest
+++ b/net-analyzer/ettercap/Manifest
@@ -1,2 +1 @@
-DIST ettercap-0.8.2.tar.gz 8082561 BLAKE2B
851df0a8700de45ce0e3427f7fdbdcd13feb2f75c0d1136563449db634b1f02276bade0d82a1a51bf8de726d6faddf05ff537e397c2e56cfc3e3181d25566fe9
SHA512
18137b1cc518c9db3c9650157a5cbf09dbb665b79876a24875d6c5125e8923ebde543464adb61cf1d1244101242f4d66b80d94ef3b36aa265cefca7646aa6415
DIST ettercap-0.8.3.tar.gz 8381943 BLAKE2B
f49098d61f60877d3f979d7861f36dad6ec3fbfca7ed89d8f9826867145ea36daec65a1076c893f81391218688448515ef020a9cdf9a16ffddc830bacec8eb1c
SHA512
1929c986d3a17ebc693ffe8531e01c66379c0ee6ea71305ea49b6a9eece84b6da1923135311db458bdb6035feb593e525786e6cf4c465ced5a7683384d4a4ae7
diff --git a/net-analyzer/ettercap/ettercap-0.8.2-r2.ebuild
b/net-analyzer/ettercap/ettercap-0.8.2-r2.ebuild
deleted file mode 100644
index ae48afb1a7e..000
--- a/net-analyzer/ettercap/ettercap-0.8.2-r2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="A suite for man in the middle attacks"
-HOMEPAGE="https://github.com/Ettercap/ettercap;
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-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" #mirror does not work
- KEYWORDS="~alpha amd64 arm ppc ppc64 sparc x86"
-fi
-
-IUSE="doc gtk ipv6 libressl ncurses +plugins 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
- 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}"/cve-2017-6430.patch
- "${FILESDIR}"/${P}-openssl-1.1.patch
-)
-
-src_prepare() {
- sed -i "s:Release:Release Gentoo:" CMakeLists.txt || die
- cmake-utils_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)"
- -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?
- cmake-utils_src_configure
-}
diff --git a/net-analyzer/ettercap/files/cve-2017-6430.patch
b/net-analyzer/ettercap/files/cve-2017-6430.patch
deleted file mode 100644
index 67483dcc024..000
--- a/net-analyzer/ettercap/files/cve-2017-6430.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-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
