13 files changed, 93 insertions, 21 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 00fe6bbbdbe3..7ae21a6a0ba0 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/dsniff/Manifest b/net-analyzer/dsniff/Manifest
index 55a4eab54c17..984a3886c827 100644
--- a/net-analyzer/dsniff/Manifest
+++ b/net-analyzer/dsniff/Manifest
@@ -2,9 +2,9 @@ AUX dsniff-2.4_beta1_p30-httppostfix.patch 635 BLAKE2B 1bec7f7441b80b4c3e965395d
 AUX dsniff-2.4_beta1_p30-libdir-configure.patch 3810 BLAKE2B dfa3813f013bd3ec0a527ed48d57d545f439dea42243798c8bd85672d17f57391a74c7d86fb87bab88233b45531acef3ee4c8b7b4398208df1deae091dc1e382 SHA512 80719d441ea45a78b3bab7f0fb5747f88d7cd8dc8c96ffc3ec2ffcb6f5ac02f8c889a8538b0ed8b82146cd7200efefd7318950372f27e6d28fd1dff72934e558
 AUX dsniff-2.4_beta1_p30-respect-AR.patch 508 BLAKE2B 585b4e0b959b037f695e191577db9ad99f41e579d1f047810999dfa39101380235b8641e9893ff9de323b00c2376c3cf96b2ba5788786c03d05df7748038c688 SHA512 2a408236f750d47b68b883d55dcf3bb0a2b50c74cf636f2aa61999972081ce6f96186a4fd6fa566928b3d0bbe2dcc14c0f715701e2b4ec417e8f9f5cc0d154e3
 AUX dsniff-2.4_beta1_p31-c99-fixes.patch 877 BLAKE2B 8332eb26db5b6bbc092aa35946e7a27a86967f581ee3e96b35155ff93125ab421ac5499a4a5a0b7fbb91ce134a4b0edf4bbbc6f58727ac280633ac5e36c2bdd2 SHA512 294ea0397de5e8d006455714a2f88359e3b160172df457ab7b75d9a888611bc039a643fd566e806e0f56f8e3675e7836a2d007c882c3bef08cdbfeb6cb3b7158
-DIST dsniff_2.4b1+debian-30.debian.tar.xz 30788 BLAKE2B 8605b1dcca36f626f31410d88d25a57e6661b57b941155cdbde951991b09fb2dd7c147b1fdd1a22eded1cf904c890317b1844a7829cd6e43fd2fc5defc79b5f3 SHA512 45ffe34fcd30cd1461a354891b9d5567038cc176dbfa79c67020075cd40ae09b7092954925019e583d0d69cae76a558049b489745454a8034ce3e9e832c58f64
 DIST dsniff_2.4b1+debian-31.debian.tar.xz 30848 BLAKE2B 46bdfa08170fbfbba35fcc67340fc35352ef276dd5e8e00a540da39d28364c3198198eefeb6b85cb05e74d3785fc61c7e8e58d6ce37e0b62e6018e4842d938ad SHA512 da927bb887db6761a07dc2460bdeb834b386ccc5b8aa50ebce804ee130f89379268412cddd83ad64cc763e98e2f42a7efc23b7ca77db59445533272cb408088f
+DIST dsniff_2.4b1+debian-34.debian.tar.xz 31148 BLAKE2B 09b605065d8e03ea5c2f9083420feca3a05d4453ca7a46f2886766f34aed23e3cb83d73f12dbb633c1142d187b66a5508b3c583582e1902d4957e3813ed9929a SHA512 f539d59d931acc7fba97f079a33301b415d6dc769bf2ca3f1b3bf0fcfdf9cfc3c2454e017f5c47d39bcc5f47b91f70f6e2abc8cdeae631aa72946eb84b6bebf5
 DIST dsniff_2.4b1+debian.orig.tar.gz 130220 BLAKE2B e6953a5bfc5331b030e1a5335987c51fa4cf2c644fc4e7ac9aefe17f52373a1f66ccef36c5d9136542f68a475350138b1f3e501bc9494a0fd4988c7c5a7b2eef SHA512 09c3a864f112f81b8fdf93436886b14eb8f603ec751b13f18cf027307f24098c018eacf98b3ae353731a0cf6f1c9cacfafbb534a0db8b9f0cc793e7515c41b5a
-EBUILD dsniff-2.4_beta1_p30.ebuild 1716 BLAKE2B 604355e16c5721effd2188c483816bf9c3b28c8ffdd3f132c4e6d311852bf158df21436c53fd4c75080d4d82d404124a1a6ca5520cf9c98d52d388ef06263e74 SHA512 41177a0f130770934bfd7c8eb7fdc7d802561f097c6b7e075f78aa37bdd106b61e21988f6228807e50f3530963cb6acf982001ac67f448e9083e24931537ba5c
 EBUILD dsniff-2.4_beta1_p31.ebuild 1767 BLAKE2B 6d278c25bd66f7985fce8443d1647ec84d218208e1c225ddb6dd185bbc5ddda1b7b55a9bfde534388056944ae551e38a4472562f995e2f2aa0838b1dae4619c6 SHA512 a1c241dd5a2393526e09ecddc4b1aca07f04e2b8d8a20e762e0da3350aa92c6e888750e2b985d1524fff25dd43bc6ca6e90a1339b4b95c93264c2244ce843550
+EBUILD dsniff-2.4_beta1_p34.ebuild 1891 BLAKE2B 700cf5c3cd2e6b3dfc51ce4297db67b743444378ce33f9d3a5e48c2e6d512975ff202276ba0133fc3621fbf02bee56c791a16f0d0d50099ee2f70ec6559da581 SHA512 2b520a820e296194099f385d0c85e509141f4452907f316ee8eb3827adf223320eeb0f7c6ab778d12bb8ba885cddb9f5fe70e0f70f8c50cb1ad947afa710d862
 MISC metadata.xml 853 BLAKE2B d91a9dd0cebe081176b43f3c480532ce6e55fd995c1c24a55cc8dfd4738bd04b82f88fa4422d12c55320c8360003fe5fa0ee1cfcbbec36a102ce68776d9586e1 SHA512 8138c27c6025549ae01ce3c766c1afb52e40f2cd386e27678b43da956b6cf9c42710d293067375d7b79171a0d1d8c5f80264f3d27aacd112a93c84eedd17266e
diff --git a/net-analyzer/dsniff/dsniff-2.4_beta1_p30.ebuild b/net-analyzer/dsniff/dsniff-2.4_beta1_p34.ebuild
index adb46e181081..4aa1cdbcd003 100644
--- a/net-analyzer/dsniff/dsniff-2.4_beta1_p30.ebuild
+++ b/net-analyzer/dsniff/dsniff-2.4_beta1_p34.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools toolchain-funcs
+inherit autotools flag-o-matic toolchain-funcs
 
 MY_PV="${PV/_beta/b}"
 MY_PV="${MY_PV/_p*/}"
@@ -25,16 +25,20 @@ IUSE="X"
 # There's a berkdb configure option but we get a build failure if
 # we try to disable it. Not clear how useful the package is
 # without it anyway.
-RDEPEND="net-libs/libpcap
+RDEPEND="
+	net-libs/libpcap
 	>=net-libs/libnet-1.1.2.1-r1
 	>=net-libs/libnids-1.21
 	net-libs/libnsl:=
 	net-libs/libtirpc:=
 	dev-libs/openssl:=
 	>=sys-libs/db-4:=
-	X? ( x11-libs/libXmu )"
-DEPEND="${DEPEND}
-	net-libs/rpcsvc-proto"
+	X? ( x11-libs/libXmu )
+"
+DEPEND="
+	${DEPEND}
+	net-libs/rpcsvc-proto
+"
 # Calls rpcgen during build
 BDEPEND="net-libs/rpcsvc-proto"
 
@@ -53,6 +57,12 @@ src_prepare() {
 }
 
 src_configure() {
+	# bug #946622
+	append-flags -std=gnu17
+	# Opt_dns clash (not worth reporting/patching; we already have
+	# a huge heap of patches from Debian)
+	filter-lto
+
 	tc-export AR
 
 	econf \
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index 80a5039600c4..221a4a3ed70b 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -5,5 +5,5 @@ DIST nagios-4.5.1.tar.gz 11540195 BLAKE2B 8fa4654a2e7f218d65c8a318418002f09b0e11
 DIST nagios-4.5.8.tar.gz 2587824 BLAKE2B c2f571ff7e9a525a70d6425905c5b04703ad5c9c516e36c0146d39c3ae13555f76a9a6429365f3c4cf4482f3053471b40989b81debb94d8974d0fecaf2788a7c SHA512 a293dc28638fffe944adfcf732025100550a1ab54d3a96bacebffb09a98954a9cd9fa122b4afea73b473dcf5560904d5acaa31d8ffd356b6e3b90ae37d86d4b2
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09 SHA512 bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766
 EBUILD nagios-core-4.5.1.ebuild 9299 BLAKE2B 55ba352f224aa71b6d9cffbffd6275e38c55253b6570b12f82422897224a0c2229c38877ba17cdbbc492b58f08c06ae9b7e42ef0e4372ccdea4a8d3288417d09 SHA512 5ae0f6b5c97616dd0924a7ff4eef1889c9ece4ee79184bd27ae588aabf814d11ac786c06aaa442382889ed7693b806edfa4ffae95fe92cad21a6d889c5922499
-EBUILD nagios-core-4.5.8.ebuild 9260 BLAKE2B 9b55c26456d7b45fb1048fecefbd547359fabd2d27d6d870205d8d1230ca481e5ca7221b478bc6e1cda7ac2d1528773e7fbceb72a420a073329726aba4afd01f SHA512 e4d3292bc5d37290e460536cabe02f761211f116072619595b44f0f4e74a7961b62fb2742150a66c1f04e0f447b2b7eb5e5f081f6409a4737da5521c67008d69
+EBUILD nagios-core-4.5.8.ebuild 9257 BLAKE2B ae63261b3d6bf20ef3f9bd48c411aadea869ec18ee6a7d3b4cab9602059fb8a8d4c12eed9a7db12216681e77fa5dcabfc2515a712cd1c481f34bb74c589b3def SHA512 2f921063a94ff992efc95beca864d37a72529cab3f8f8dfb5b97bb278447a8162e6fee3f2d00f4df032360e043de93c2df3b8f634f4d1c800fc8ea9f6c162062
 MISC metadata.xml 1467 BLAKE2B d5ddd6280aafd3ad3a36a408071037fa757810382761f617eb2763a20e65185b30eef94fb4cdad7d4b5e9b81b6245efacf57d4ec0003406d66ef2053f09f3708 SHA512 25d3d4d19c18b416a0902d2ff39c0ca71b2e7bcc2bac61119b9636c6462391e65b2767d8b0e794abb318b19fe1c2bcbf2c80ee8d1ea6faec3f6eb9cddf60a9cd
diff --git a/net-analyzer/nagios-core/nagios-core-4.5.8.ebuild b/net-analyzer/nagios-core/nagios-core-4.5.8.ebuild
index c5174613eade..5898db53f9c4 100644
--- a/net-analyzer/nagios-core/nagios-core-4.5.8.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.5.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ppc64 ~sparc x86"
 IUSE="apache2 classicui lighttpd +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration
diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest
index 9b0fd2353070..9a59f5265fcc 100644
--- a/net-analyzer/nagios-plugins/Manifest
+++ b/net-analyzer/nagios-plugins/Manifest
@@ -1,5 +1,5 @@
 DIST nagios-plugins-2.4.12.tar.gz 2752829 BLAKE2B b72b9350e9c72c9cbe0cbca3effce16ec753887945455a1ac47975105e68f516923020cc88ee42da0c8cd815fe841a82ff5053c3ba5688888bec7be12c08fb8c SHA512 fbff697d0cea1cbeb83737f240a42c00e18bf443b8af303b5d7f7f735eb6faa5305d8740fb27472876dc1398735204e0d7a0e5863c2064ec2a37541253f91502
 DIST nagios-plugins-2.4.6.tar.gz 2751770 BLAKE2B a85da8eaa8d926e2ccae3451d9faa680b75ebd736ba1306c69e7d3b2b8749787743dd6e26013d3a72fba12ef49fdf635c60052791fab558eb49c379bdbb6bac7 SHA512 f2a12a5b6a70849d7233debd1ca95667df981d3627287e3b8813d8fd709c4f4a26cf2128851837f33e0df3132132a4f891edef90e220bc16b1a6351d514faa43
-EBUILD nagios-plugins-2.4.12.ebuild 3281 BLAKE2B 6320c2af338658866447f4b23fe0cc786076619e6fb2746bfb680ed4d84026f687517e01696c3e741e9a8bd0ba3bd1fee3b77975774bf6aff56b1049e8ffa512 SHA512 787f749cd704763c756783219c56a041e67b4240cc89617f0f0a56ebc0fde48ae6d00856c3d58e9a465eb2dda9fd58b22171c2552a9305e85cc6ded41e52a6d2
+EBUILD nagios-plugins-2.4.12.ebuild 3278 BLAKE2B 3de79e14c92dac5aa42b3077ba57a33b70c5b874253b34da429a4801d6c15177af7468ea4d40ddce732334742b680633cd46cb363e3ef1f9ba5f675be62dd02e SHA512 bcccbd4fbd469e634fb60cb407d3cf17db9e539407994a1bf75d7f2ef33964c1e16c5bd3698e2d8e73c5a2c737ce700f056f0e2e99f60175382a2570b7ca4ae5
 EBUILD nagios-plugins-2.4.6.ebuild 3277 BLAKE2B a11fda621ca3b455586550f55704ff0eb0880cf244d566c5cb7cf76e011a22358d3c1bad8994bbbf754a4b3d33239790f262800e353dbf2a6059ce43423c623a SHA512 7a57cb998ed1b1021a008c5f54a9233fab73058b86547d3e18c610aa528cab2899b90270a232d4d328e4ce2b3124dc00c49d6f636d47f1326854eaf937715a0b
 MISC metadata.xml 1569 BLAKE2B 4ebfd50870acac360fa2708dba05d3ea925e7d93444da82ca93067b4c8eeb177e8055cba4d12d690c8d9e1f5448447d6bf94a5991a09d0f4a2ee6126338bb707 SHA512 fffa8c7bc36e0cfd4ca35ab8c8f327749e0c6744a9567d9a6c88180c178a2a5bbf67df31b289d9319bc725d2fab4433a9d00443a87d0950777ed0c05031da193
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.4.12.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.4.12.ebuild
index 841c473ee4dc..a10fd4c426e3 100644
--- a/net-analyzer/nagios-plugins/nagios-plugins-2.4.12.ebuild
+++ b/net-analyzer/nagios-plugins/nagios-plugins-2.4.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/release-${PV}/${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86"
 IUSE="ipv6 ldap mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux snmp ssh +ssl"
 
 # Most of the plugins use automagic dependencies, i.e. the plugin will
diff --git a/net-analyzer/nagios/Manifest b/net-analyzer/nagios/Manifest
index 9b55c02af3bb..a71d2c0a185b 100644
--- a/net-analyzer/nagios/Manifest
+++ b/net-analyzer/nagios/Manifest
@@ -1,3 +1,3 @@
 EBUILD nagios-4.5.1.ebuild 385 BLAKE2B 7bd4c6bf8923bc84e62a4d5394fe61279dad0f2f5c0daf693387cfd81b73d4ce29b6517cf71489d0727183ac58acddb7b7665bce38db15d7ce7a3aad5756510c SHA512 c7c25426e1e13ec3702d4e5378d540e8e72232b37e0ec09f7bca0a04430f6e7b0caa8ed3b6a12dc831b037e7ccabc64cbf64b062ab7d2c880d5dc70886c49340
-EBUILD nagios-4.5.8.ebuild 389 BLAKE2B fe8daa78ebe04a346d47607399325fdac61ec8eee29e13430f3432e9b0578121d58cb93dea42180d3497b01c1bbda004b6369ebafac5419362b8092ec360d867 SHA512 ea35e3170cf137e895971048e810b5611fca47d2f2989b4cb291889f4ccca3713bb0b4a94d55765f51e5453a069c11cc058e89a10ffda7c6b21497f754c3f60e
+EBUILD nagios-4.5.8.ebuild 386 BLAKE2B 904944bfe8e36fafa5bafeb81bf1f8c13b83854e8049e5ba99bf6203051f88fe14e324bd9b806f37937477008028afc05d1b7365199264c38aa43d7ef850fe1d SHA512 df4e54faf3fa3037070d27d055ba6994d0512a8278fc6698954d922349a225c3d79f976986a9d615389b1c8b15d9ebb5cb982e525663c80843dda50dcd6f04b8
 MISC metadata.xml 1111 BLAKE2B d2c8f269fe7ef92c656219c0c93efca6083c09ea1ea402ccab7cf37f415931ad5abdf46a20b568ec82883a574005a4788617c0786c20c2d326b2d481195261e0 SHA512 e6c32f8405e79a4a3cf03d21dce3539c28454d75929348efb30f5c7c2b55f5346e3cd39f9d64f4e276aaad12f1fbf274f2fc08c255c03df1a5a7f0356031d66e
diff --git a/net-analyzer/nagios/nagios-4.5.8.ebuild b/net-analyzer/nagios/nagios-4.5.8.ebuild
index 371d0ad43626..02d4a2e6f761 100644
--- a/net-analyzer/nagios/nagios-4.5.8.ebuild
+++ b/net-analyzer/nagios/nagios-4.5.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.nagios.org/"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ppc64 ~sparc x86"
 
 RDEPEND="~net-analyzer/nagios-core-${PV}
 	|| ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins )"
diff --git a/net-analyzer/ngrep/Manifest b/net-analyzer/ngrep/Manifest
index 1c864affd5f6..c8191a4e3043 100644
--- a/net-analyzer/ngrep/Manifest
+++ b/net-analyzer/ngrep/Manifest
@@ -1,5 +1,7 @@
 AUX ngrep-1.47-clang16.patch 657 BLAKE2B c4e92f07767e468604f8e8fe412269889eee55f537cc5128e549f9fcd7e36bace484b5814e8aad27db7c714f9df74a8e16523760af58a2f4c9c1bc672d06aa2d SHA512 23d3bedf8bcfcf5f0d7dcff958fd09aa3d3aac52c9f54bf37ffbd408ea55bdc16865967799ac54787505a33c40caba122b67912e05657c8acabe4709b5bc1a1e
 AUX ngrep-1.47-regex.patch 683 BLAKE2B 5eaed7398a140dee747664ce05c3f9afb9f57f827ef96efd4ad284be313dd234c15603bcd842c7d2c96a46900de46205cec1d0270cc83d36b5e9feedf1f3b2b3 SHA512 e435f1e4fb35fbed0eeef414da2fd19c09311287b466e667c9150d53a1ae52abbe31173758192c9638eaecf54e4c3be99020e9831a2543b2e4d0c61f5b9f55de
 DIST ngrep-1.47.tar.gz 187067 BLAKE2B 4fa47ed343b88e84fb5a3ab6e4dc8139cb008ffcbea901a67664335ad76d36e975e037620cebb1b204ba22e5b139e822c7cfbc74a061fc6cacae631be3f87a52 SHA512 47ba65878df6b555701c866721a8a935eabdcce636d398284cbfe5f63baf68c62d994a2f373ea4fc8f44fbed3eecee149f2ee48d39c71c04d34e5a088db8c657
+DIST ngrep-1.47_p20241209.gh.tar.gz 187290 BLAKE2B 4a58268a75b40ab31014de4bac48a6078090e99afea157e4794893d67d9496bf0e82f3930a7e2e26db9d86fc90eeabccd60356b2b0581f47b12c3cf5f300b567 SHA512 4c555ddb7e5427350f2767f45553565b07b312899139b4d6d9001470ee57ce890072d15ea0523c48b775d5196b498f06a5a3fe9a307eaa3d73416b2a9ab2dc81
 EBUILD ngrep-1.47-r2.ebuild 1062 BLAKE2B b7497857311cab8e867988a75d451b4f8ea0137f688c9631a50d80ef00726be394d9a23b85b54c913057b25e639ff519614635f4a258f41291b75a623c6ed085 SHA512 f23acd0984ade359a8eb4e42c0320b406b93afb8166b1bad0a4d41454decbe43ed2ed1476188e19f55c1b72fcd544284467e3adeb07e5aeb9e4272418c9dcedd
+EBUILD ngrep-1.47_p20241209.ebuild 1271 BLAKE2B ca7cc38b912c57939eeec3e0f2453bac58f0f14d74ed15949e28af0ead97eb3cede3c9e83dcd43ac2b8b4bcbbf9af6c7ae16bc2eecc6855e74748096c02c921e SHA512 370e85aa540144700ed6ab582521105075b42d5c504f29f77e07c6d4ecf66819a003667b7379b73566ae40179d4ff0399bae5ad04982c03db7f665f9db9eb8e2
 MISC metadata.xml 750 BLAKE2B 7771d4dc6aea1ffce67005400d0cc9221bd258467b6f4a2ee734ca7a050a1fe922ab8f982d67293bcddfaa037a0e56760ccebab0972c8837485771eb1d3d409d SHA512 f7e40fe3c1a0ae6fae47a26783692ca0b2e52259eb421f2916670ad87c8208bb095f8b4d1a865bfdb76de1033c3c52d4b72fa205ab565fceb9eb5ac66a5ffad4
diff --git a/net-analyzer/ngrep/ngrep-1.47_p20241209.ebuild b/net-analyzer/ngrep/ngrep-1.47_p20241209.ebuild
new file mode 100644
index 000000000000..7e4c82ae6335
--- /dev/null
+++ b/net-analyzer/ngrep/ngrep-1.47_p20241209.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="A grep for network layers"
+HOMEPAGE="https://github.com/jpr5/ngrep"
+if [[ ${PV} == *_p* ]] ; then
+	NGREP_COMMIT="b2e3ba3c5a593abf203e65a407c3a9de0f998d4a"
+	SRC_URI="https://github.com/jpr5/ngrep/archive/${NGREP_COMMIT}.tar.gz -> ${P}.gh.tar.gz"
+	S="${WORKDIR}"/${PN}-${NGREP_COMMIT}
+else
+	SRC_URI="https://github.com/jpr5/ngrep/archive/V${PV/./_}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${P/./_}"
+fi
+
+LICENSE="ngrep"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="ipv6"
+
+DEPEND="
+	dev-libs/libpcre
+	net-libs/libpcap
+"
+RDEPEND="
+	${DEPEND}
+	acct-group/ngrep
+	acct-user/ngrep
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.47-regex.patch
+	"${FILESDIR}"/${PN}-1.47-clang16.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i -e "s:configure.in:configure.ac:" regex*/{configure.in,Makefile.in} || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable ipv6)
+		--disable-pcap-restart
+		--enable-pcre
+		--with-dropprivs-user=ngrep
+		--with-pcap-includes="${EPREFIX}"/usr/include/pcap
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake STRIPFLAG="${CFLAGS}"
+}
diff --git a/net-analyzer/p0f/Manifest b/net-analyzer/p0f/Manifest
index ae963e48bc31..f473a760d456 100644
--- a/net-analyzer/p0f/Manifest
+++ b/net-analyzer/p0f/Manifest
@@ -1,5 +1,5 @@
 AUX p0f-3.09_beta-build.patch 1992 BLAKE2B 3bd51163cb7f86f7ba39a583bace4971035f2abf280e12cc54161a02a4b551f9ece8ebdd9732cdcaea284795fef6222d0700cc8061eb9a889e5e5de62b5c9f21 SHA512 673713ab0c1014abf2613f05e1a3c101cf95859d5df9b452c4454f9e2ff27898034b6edac791e848a975547bffc6e30b36a4dc767aef3581935ed5b0f92cd691
 DIST p0f-3.09b.tgz 92896 BLAKE2B 5db3fe335c1dd3fedca5c007e8a133ff7327189c640ec6bce254ae7b1e6fe5729acd39d5a3d507e286742ac0b7c7612eb5aae452d60ab0e737cb05b0191ffbbb SHA512 2a688baa865f27c91c023a7c53e530649f56a681e6ca2533152ab07b42883857b20c378b636e87dda8d1d5dfac17e426d09ee032b363d0b7d98e57a9ff6164d0
 EBUILD p0f-3.09_beta-r1.ebuild 1118 BLAKE2B 8a64a1e638a27d801608abc2a783a0f40f319ded73389d77fc8e07703c37f4c85d6f5488b0c7e97fcdbddb9100e0a4045e83481eda9d69fa02992df427fa2b12 SHA512 28c8a99af8a0d8ef014f39b88b5d79dc4930584c78b885d041d05a61439c5ea9a7ba2c8497e331b010914d5bf39d726a57d0005c1ad36ceb45894bda0bea22e4
-EBUILD p0f-3.09_beta-r2.ebuild 1077 BLAKE2B 29e5f73179a1e83c0188e39aa3047e815cc40f76d442a5e9c5c73a39063d94986379e51fb9f3c365510f306dab2d9b3196417c9a3b3509bd9381a2c1e75ded45 SHA512 95881991e877bebc4bf1015a98a19e01c7b4987b935fb8fe57c23e99053f99e872534d7f66924399eb17f2af6fb9912adb4f313c5c10e7564c4fad739f168ab4
+EBUILD p0f-3.09_beta-r2.ebuild 1047 BLAKE2B 52ecdf96249330c7bdffce0e981fc663d3e4b525e8c8bef83d32acc73363fe52cbb30125f04c15cf3e3e58d5c2f3168f0b3be2b5d44e7fa1b3f506fbd968335c SHA512 09cdd8bcce417daf4ddb5a0e6625e1ea983c472ab60e3fd28c61d0e10a1c1c7560873703973f99e477c251b3b2700f6093157df406e7f6270253467353f23f0d
 MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-analyzer/p0f/p0f-3.09_beta-r2.ebuild b/net-analyzer/p0f/p0f-3.09_beta-r2.ebuild
index 73adc9f6bb47..dcf94ce3ed73 100644
--- a/net-analyzer/p0f/p0f-3.09_beta-r2.ebuild
+++ b/net-analyzer/p0f/p0f-3.09_beta-r2.ebuild
@@ -41,8 +41,7 @@ src_test() {
 }
 
 src_install() {
-	dosbin p0f tools/p0f-{client,sendsyn}
-	use ipv6 && dosbin tools/p0f-sendsyn6
+	dosbin p0f tools/p0f-{client,sendsyn,sendsyn6}
 
 	insinto /etc
 	doins p0f.fp