8 files changed, 46 insertions, 5 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 35fca2e8c179..9dde2aaf788d 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/ettercap/Manifest b/net-analyzer/ettercap/Manifest
index 4f487b7e19d0..10fe242839cc 100644
--- a/net-analyzer/ettercap/Manifest
+++ b/net-analyzer/ettercap/Manifest
@@ -1,5 +1,6 @@
 AUX ettercap-0.8.3.1-curl-8.patch 1110 BLAKE2B 7a70191da6b2376826f739d52445c35789af07f2cfddc24197cbeb637808f6e461694a34dff6faaf6971ce11d717fe2c18a8ff0291832ec27eb6479591f9e206 SHA512 cdb2ab8d8078c1b8c3305dd00345d295e2cf4b0127c8be471b326ed6375324d9c227f2d3cffd1ac6583e23385fd5fdb34dfc54f11b0952d2e8b1864455da95d3
+AUX ettercap-0.8.3.1-musl.patch 1196 BLAKE2B 104817bca2c0608314645713153120b348779c470052f5c9bfcb91592823aa6a0dc1c0c2363f05e1c1506805ef54742891b62e836dfe03d52c624ac0b585b4b4 SHA512 666078ad8b415b957d7d636299d67c7c4cca733820de01016fa29cd42915f4120324afd7560e417f8f91eb13583a543ca6852dcb3d32af38e2ced76186d87a88
 DIST ettercap-0.8.3.1.tar.gz 6678653 BLAKE2B 2680b97454626a6f1af3b21f689ba8eed7a023c3ef5cd84d5b2b5859382f398b3a6fc622270ca41941a8a18a7bdd260af64165344a33b2e195c86ee61567f2eb SHA512 9bd71dcc1730293ee83934aca3587dfde662cb3890c12fafa557b6359f12226e5cb6f59a0db1aa11245a132b275e355e3bcc8952db921171d27b792827f148b5
-EBUILD ettercap-0.8.3.1-r2.ebuild 1822 BLAKE2B 70f0fb76899fe3accd15668a3c6db01e273fa766ea7679cd3a4d9efa0cedd6f08da2273364b6f21917bda4b6690d4c62ae004dbe12f12de03348faf51af0847d SHA512 7c95f17b76d7db1b0e1e6763bbef44c05ac634c7f7965654dc29b09f62dd078e81d7aab6e7e70584421f898b1c90e6baa6bd9f2d9fbebf66a2bb5907e9d3ebac
+EBUILD ettercap-0.8.3.1-r3.ebuild 1861 BLAKE2B 42e511f6358774f57f08068f1c18b3ea083f3af54d94600d5abdfbdbdd69b8d37534a7522a19ec632cbdd2f645a343dc5b3447c64f712c8526c5da433c41db31 SHA512 f8d7bb4baf3537dfaa91c7cc7a71af98429b221d96a6de1b1ce17fcc279d8580ac7f910d19054089cfaf18a8d09bcbddc7af9a099dcefb6e55c2b115793fb20e
 EBUILD ettercap-9999.ebuild 1777 BLAKE2B 3fe67b7f5e0f925a40b776c48d0f50083b3645a6452ebd7c33bb269e77fa26d8fa63048ad5b419a3dffbd5e92c5780b54b23a5f053c7caf9dfd6db1ae32490d3 SHA512 bf30fd462d8cff05939e27bf6275391da68d43d7ce86a3bd4b1439e7917849dbfcdc4aa0fc926d9f3a4d180dd122a57b7594cf100b50c20c0ae90a1214dffaf4
 MISC metadata.xml 658 BLAKE2B b4696f4a0f2f3fb86352067988aa4cdf1860363bce7d1dfb7b625bb18157d8985a2a7873f3730acf092b46b94ec7804df11de5e736ef763841fa1a6238859986 SHA512 f9935abb68e3d85eaf393cad919b867ebfca66f8f9d3dc5a570c691c18ce7324dc6bd4e670345b1668b6593d90b99d6d47874ed08512e0ab882160fe0ea6cd24
diff --git a/net-analyzer/ettercap/ettercap-0.8.3.1-r2.ebuild b/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 <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/nessus-agent-bin/Manifest b/net-analyzer/nessus-agent-bin/Manifest
index 685a6acc96ca..e988379cf38a 100644
--- a/net-analyzer/nessus-agent-bin/Manifest
+++ b/net-analyzer/nessus-agent-bin/Manifest
@@ -1,5 +1,5 @@
 AUX nessusagent.initd 563 BLAKE2B 63820368c95dc2358ff73843e239a084e21cea48bd4dfd170e486f0c702e7ec6be1581478f7c37dd12868dd3648dfd8f44b8ff47c85fdab0276a0c84b78eb7d1 SHA512 acc9a64e1cbff1119876f186aa6c40d6f5772c55a919914c410fed9e0974d2ce8fe5b965248aeae590ae5dd551ab530c59dad42c6f793d995193f9b8f9d89718
 DIST NessusAgent-10.3.2-es8.aarch64.rpm 17125280 BLAKE2B 323f41cc201d0b6348473af0cc297154db600f29560ef10a900aeb885b9a1f9577a4b546bb568a102f344856c67480de8beaa2652698ec62b73cd5b2db0bb0f3 SHA512 de49b421ebf4d72c771af2b1d64c25220d2062c3907f3c945061a09e97a2d8855cac668206bf388729365bbd80d58293109a196c1e36c511a70f75055bdef729
 DIST NessusAgent-10.3.2-es8.x86_64.rpm 18387452 BLAKE2B 2882209a43fe0d295543399e84e88b2db4738fdc1ad488c5e3448edb052c70f2482e9355dcebdcfa57ec067bfe7830889a5ce0fe99ab02a60c00103e740e4be9 SHA512 c663bb385197988c9c4f55963232dcf82c00456f64b683cd2b5c0092f2c776d89bea731148b5940f839f89104245fa2011486bbd7c78a64aabd310701f547727
-EBUILD nessus-agent-bin-10.3.2.ebuild 2227 BLAKE2B e063d2c5798e737d5f67720f6119a35ae390f4cf47a7b6767460427661f6cec0ab8951c75c2620b2f1e30c5a979dbbc41ae43c1e80244755ce65680b6021a2b4 SHA512 21fcfab85d69446232bf2fb7042e447bb43672b4fde112a9ddc79c7492a9077c7ce291337d8080ca6b87d67931e73b330016a763ef4a2d060542f21ab7c02d93
+EBUILD nessus-agent-bin-10.3.2.ebuild 2234 BLAKE2B 620772c2ff5dcb6a59cb08edda434103e71574bb426128ef0b9171cb1421817302226e538fca7a9b1c569f342bdec12704c9a0ad8d5dd84da1cfe9ef9b554f16 SHA512 0ee743504d011b6709c07a3d0e5727f917c656f86bca0b75e171bbed6b2e9fa3f103c3a1675bc80aaa424aa6d02689c067cfb0f27c595b11c9a0cc77a248b523
 MISC metadata.xml 354 BLAKE2B f3d046b6610423bd40c2cdbe29c8aa35d8111c56f6565d5b84aea31e03a8612b3a173965496833ec2ad2a38412b68d39f09d389e41797a0cda399758c85034a5 SHA512 1f4021d2781ddbccbbf0bf91492b50af18f142200bfc959a36b527941b9e8452a7814e12a1f720fcc62f6d069158cdb5093ae3760bc1b3b09d2cb73e4ab7f715
diff --git a/net-analyzer/nessus-agent-bin/nessus-agent-bin-10.3.2.ebuild b/net-analyzer/nessus-agent-bin/nessus-agent-bin-10.3.2.ebuild
index 8ead1442b14d..6544f6c99a76 100644
--- a/net-analyzer/nessus-agent-bin/nessus-agent-bin-10.3.2.ebuild
+++ b/net-analyzer/nessus-agent-bin/nessus-agent-bin-10.3.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 LICENSE="GPL-2 Tenable-Master-Agreement"
 SLOT="0"
 # -* temporarily removed
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 
 RESTRICT="mirror strip"
 
diff --git a/net-analyzer/nessus-bin/Manifest b/net-analyzer/nessus-bin/Manifest
index dffc3c0c4e67..01c83fdf4783 100644
--- a/net-analyzer/nessus-bin/Manifest
+++ b/net-analyzer/nessus-bin/Manifest
@@ -1,5 +1,5 @@
 AUX nessusd-initd 582 BLAKE2B 67c5e73262512c590b5b4fc0668297a504677aa3d771fdeee2809c921d988faef19cbf10a7fb26d52114e1a67d33ef197e32c561cd5b2003c8abbde2dfe5cb4f SHA512 f825fad89564303aeff423f3c32a1544ee4b063ef57702cd54220aebed8e01e7b178ff5bd10b48b654ebdee78657a9bc41caf779a23968d008916fd51e88b2f4
 DIST Nessus-10.5.1-es8.aarch64.rpm 58158604 BLAKE2B 955c11338b038d5698be40de099d1c14ff39941f64058717ab1903a40b7b641cc769536d7897dc4cc17a471f495ef1a2ee0113ab06184500b7902c92efe8e81d SHA512 bbb01f93aa0656c143fa67175cea7b76af79cb27e204806ddf69f614e49a79d8ab455f29a228f47b8370b12effb5d2f2d258e3ee961c7072bc9aa2b8aa0fc216
 DIST Nessus-10.5.1-es8.x86_64.rpm 59526592 BLAKE2B 22d6ac787a9666de75236b8c9454a2e56aa4e589750414387248ab9c13b79cd8b3efc0dd8fd9b89b9ba542e4f05b3c763d235e3303301480726788c711e933a3 SHA512 9106161bc4f1cdf493d35e936f7f01d80be6776231646dec3803fee8ea5b5431e64dc0cba1c5d1439a37a95be6863748cb5901d01cb3553ababecb28bb1073d4
-EBUILD nessus-bin-10.5.1.ebuild 1901 BLAKE2B 9fd3e1b3d644c92155fd99c7066bfe95f6d2bbd06230197ac73af3e8ec101704fb9f8bc0637395d088c85911bc75465774142747529ede82afdcb789ed7928f6 SHA512 e10b76fa87916194e1715f75ac02a9f2ade5ff60fe61a0d018fe80f7dc549795b1e92e1aec6a196129139dff10efed6b7f926360b40d6ee1d38679afc6dbc3e2
+EBUILD nessus-bin-10.5.1.ebuild 1908 BLAKE2B 50a03911e4630cee594ef3a4fcce15d6acdbffb23cdf8a38be6178dcd124d24d6df5803f5f8cc72a2b7985964a8ef4bd243548c6ccaae1b94f3912a30260f527 SHA512 45aad07e4bc17324ca7afaee244b24342f88d46404e7328d31c6659c1450aef5c5d7188b75f8c255f0785f9046db81485304637038ebe7ed0c6b27a1e193c0c0
 MISC metadata.xml 346 BLAKE2B 5e72f68ab557c56cc09cedcaaa9760f3619723bd6fc58b8ecc921526b1b42b6b65e971876ec569c1e68a26e55def24767c5d896fd9eb6a706041b485a8885023 SHA512 ab7e122c344a3f5078b2d497ed36a63f6af74fcfa7f2b98d6299ec7c82e7cbaf427da8fa595e6445e49ee041114ac581fb5b1d703f16fc70a54ee98375062e82
diff --git a/net-analyzer/nessus-bin/nessus-bin-10.5.1.ebuild b/net-analyzer/nessus-bin/nessus-bin-10.5.1.ebuild
index 4d6d09672706..68663121ca00 100644
--- a/net-analyzer/nessus-bin/nessus-bin-10.5.1.ebuild
+++ b/net-analyzer/nessus-bin/nessus-bin-10.5.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 LICENSE="GPL-2 Tenable-Master-Agreement"
 SLOT="0"
 # -* temporarily removed
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 
 RESTRICT="mirror strip"