* [gentoo-commits] repo/proj/libressl:master commit in: net-analyzer/ettercap/files/, net-analyzer/ettercap/
@ 2023-04-13 2:19 orbea
0 siblings, 0 replies; 2+ messages in thread
From: orbea @ 2023-04-13 2:19 UTC (permalink / raw
To: gentoo-commits
commit: 168e1225785b12316d53a5e0322dc77b1ece5d3b
Author: orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Thu Apr 13 01:57:21 2023 +0000
Commit: orbea <orbea <AT> riseup <DOT> net>
CommitDate: Thu Apr 13 01:58:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=168e1225
net-analyzer/ettercap: add 0.8.3.1-r2
Includes Gentoo PR: https://github.com/gentoo/gentoo/pull/30577
Signed-off-by: orbea <orbea <AT> riseup.net>
...p-0.8.3.1.ebuild => ettercap-0.8.3.1-r2.ebuild} | 44 ++++++++++++++--------
.../ettercap/files/ettercap-0.8.3.1-curl-8.patch | 32 ++++++++++++++++
.../ettercap/files/ettercap-0.8.3.1-musl.patch | 39 +++++++++++++++++++
3 files changed, 99 insertions(+), 16 deletions(-)
diff --git a/net-analyzer/ettercap/ettercap-0.8.3.1.ebuild b/net-analyzer/ettercap/ettercap-0.8.3.1-r2.ebuild
similarity index 69%
rename from net-analyzer/ettercap/ettercap-0.8.3.1.ebuild
rename to net-analyzer/ettercap/ettercap-0.8.3.1-r2.ebuild
index 069c391..72f2ab5 100644
--- a/net-analyzer/ettercap/ettercap-0.8.3.1.ebuild
+++ b/net-analyzer/ettercap/ettercap-0.8.3.1-r2.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2021 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,15 +22,16 @@ 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
geoip? ( dev-libs/geoip )
gtk? (
- >=dev-libs/atk-1.2.4
+ >=app-accessibility/at-spi2-core-2.46.0
>=dev-libs/glib-2.2.2:2
media-libs/freetype
x11-libs/cairo
@@ -39,15 +40,25 @@ 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
- virtual/yacc"
+"
+BDEPEND="
+ doc? (
+ app-text/ghostscript-gpl
+ sys-apps/groff
+ )
+ test? ( dev-libs/check )
+"
-PATCHES=( "${FILESDIR}"/${P}-libressl.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-curl-8.patch
+ "${FILESDIR}"/${P}-musl.patch #897820
+ "${FILESDIR}"/${P}-libressl.patch
+)
src_prepare() {
sed -i "s:Release:Release Gentoo:" CMakeLists.txt || die
@@ -68,8 +79,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 0000000..e1c2259
--- /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
+
+
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 0000000..516823e
--- /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 3ef51159d4e2cea97accb87af08943333fbefb04 Mon Sep 17 00:00:00 2001
+From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
+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 <strings.h>
+ #include <unistd.h>
+ #include <time.h>
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/proj/libressl:master commit in: net-analyzer/ettercap/files/, net-analyzer/ettercap/
@ 2023-05-10 18:12 orbea
0 siblings, 0 replies; 2+ messages in thread
From: orbea @ 2023-05-10 18:12 UTC (permalink / raw
To: gentoo-commits
commit: b8c2efc6d2dfcf0eb6f334050131e8de5f096c9d
Author: orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Wed May 10 18:02:15 2023 +0000
Commit: orbea <orbea <AT> riseup <DOT> net>
CommitDate: Wed May 10 18:02:15 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=b8c2efc6
net-analyzer/ettercap: treeclean
Bug: https://bugs.gentoo.org/903001
Upstream-PR: https://github.com/gentoo/gentoo/pull/30813
Upstream-Commit: https://github.com/gentoo/gentoo/commit/3c567ba631c14b1605c441fba76cdaf65e05e828
Signed-off-by: orbea <orbea <AT> riseup.net>
net-analyzer/ettercap/Manifest | 1 -
net-analyzer/ettercap/ettercap-0.8.3.1-r3.ebuild | 87 ----------------------
.../ettercap/files/ettercap-0.8.3.1-curl-8.patch | 32 --------
.../ettercap/files/ettercap-0.8.3.1-libressl.patch | 37 ---------
.../ettercap/files/ettercap-0.8.3.1-musl.patch | 39 ----------
net-analyzer/ettercap/metadata.xml | 22 ------
6 files changed, 218 deletions(-)
diff --git a/net-analyzer/ettercap/Manifest b/net-analyzer/ettercap/Manifest
deleted file mode 100644
index fa8a33d..0000000
--- a/net-analyzer/ettercap/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ettercap-0.8.3.1.tar.gz 6678653 BLAKE2B 2680b97454626a6f1af3b21f689ba8eed7a023c3ef5cd84d5b2b5859382f398b3a6fc622270ca41941a8a18a7bdd260af64165344a33b2e195c86ee61567f2eb SHA512 9bd71dcc1730293ee83934aca3587dfde662cb3890c12fafa557b6359f12226e5cb6f59a0db1aa11245a132b275e355e3bcc8952db921171d27b792827f148b5
diff --git a/net-analyzer/ettercap/ettercap-0.8.3.1-r3.ebuild b/net-analyzer/ettercap/ettercap-0.8.3.1-r3.ebuild
deleted file mode 100644
index 72f2ab5..0000000
--- a/net-analyzer/ettercap/ettercap-0.8.3.1-r3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="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 ncurses +plugins test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/libbsd
- dev-libs/libpcre
- dev-libs/openssl:=
- net-libs/libnet:1.1
- >=net-libs/libpcap-0.8.1
- sys-libs/zlib
- geoip? ( dev-libs/geoip )
- gtk? (
- >=app-accessibility/at-spi2-core-2.46.0
- >=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="
- app-alternatives/yacc
- sys-devel/flex
-"
-BDEPEND="
- doc? (
- app-text/ghostscript-gpl
- sys-apps/groff
- )
- test? ( dev-libs/check )
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-curl-8.patch
- "${FILESDIR}"/${P}-musl.patch #897820
- "${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
- )
-
- # 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)
-
- 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
deleted file mode 100644
index e1c2259..0000000
--- a/net-analyzer/ettercap/files/ettercap-0.8.3.1-curl-8.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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
-
-
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 ed5a49c..0000000
--- 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 <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
-
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
deleted file mode 100644
index 516823e..0000000
--- a/net-analyzer/ettercap/files/ettercap-0.8.3.1-musl.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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 3ef51159d4e2cea97accb87af08943333fbefb04 Mon Sep 17 00:00:00 2001
-From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
-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 <strings.h>
- #include <unistd.h>
- #include <time.h>
diff --git a/net-analyzer/ettercap/metadata.xml b/net-analyzer/ettercap/metadata.xml
deleted file mode 100644
index 6a04919..0000000
--- a/net-analyzer/ettercap/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>zerochaos@gentoo.org</email>
- <name>Rick Farina</name>
- </maintainer>
- <maintainer type="person">
- <email>ago@gentoo.org</email>
- <name>Agostino Sarubbo</name>
- </maintainer>
- <maintainer type="project">
- <email>netmon@gentoo.org</email>
- <name>Gentoo network monitoring and analysis project</name>
- </maintainer>
- <use>
- <flag name="plugins">Install ettercap plugins (et_*.so)</flag>
- </use>
- <upstream>
- <remote-id type="github">Ettercap/ettercap</remote-id>
- </upstream>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-05-10 18:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-13 2:19 [gentoo-commits] repo/proj/libressl:master commit in: net-analyzer/ettercap/files/, net-analyzer/ettercap/ orbea
-- strict thread matches above, loose matches on Subject: below --
2023-05-10 18:12 orbea
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox