commit: 5897af1453b6abf3f993d5b3a698c8184086b067 Author: orbea <orbea <AT> riseup <DOT> net> AuthorDate: Thu Apr 13 01:54:27 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Apr 14 00:27:29 2023 +0000 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 <orbea <AT> riseup.net> Closes: https://github.com/gentoo/gentoo/pull/30577 Signed-off-by: Sam James <sam <AT> 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 000000000000..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 3ef51159d4e2cea97accb87af08943333fbefb04 Mon Sep 17 00:00:00 2001 +From: Gianfranco Costamagna <costamagnagianfra...@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>
