gentoo auto-resync : 20:03:2024 - 13:00:14

8 files changed, 142 insertions, 22 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index e84ba40d28d0..09815de72334 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest
index 57d23f868771..a3fbb52a78fa 100644
--- a/net-analyzer/snort/Manifest
+++ b/net-analyzer/snort/Manifest
@@ -5,6 +5,6 @@ AUX snort.confd.2 420 BLAKE2B 984bc3a1b4f9fea044b150d1362950cc2bc0fae07a92351a88
 AUX snort.rc12 1469 BLAKE2B 6238dfc0f9e178fca864ee9485b8cf59c3056d8b047ee5fd62087f55e8a4627a903aff854827175fc80aaa6ecafa924d9ca57cd9fdba5a185d1e31814db69280 SHA512 ec398f06db147bc8ddf98b0d6a200af40c082053062b56a3fe78b1de6629cd7bf0b188e9baf44c1634f5f9f8ce8494a8a71be63c1e3f71838b77de58dbb45c71
 AUX snort.tmpfiles 32 BLAKE2B 39e4f2491f52d2a369b1c4747468ea3a9d5f2c05a85adb4666e733929be16b9cf868ea6878d3d71271dd8ee05ad8e8fac52c4f4ebfd17da873a3dc64c5368810 SHA512 705e49c172ba7bc0afee9910dcbf7b4ee96f05e6d3030c7928bbeb0df658aefb5f61fddd0da078b257ee9a0c86d1750e7b44d6f61d8e56ab799044cd141964b5
 AUX snort_at.service 322 BLAKE2B 14cc63b941b4931ec42bdd1abd5ac1ec2b67aff4d36db3fb6fbbdae5dc0e6bdf1398699fa3f7cf595c5545270e749d6d22fadcf6a55d721551f8e323ee6e3177 SHA512 7173ec7fb71ae5b2368ea5bbffd562afdc0ddd990071bc08d61577a8754452d200eb39710e7b9cca4792bb2f8572fd50fd771ff0233daade4fde0149bab365c7
-DIST snort-2.9.17.tar.gz 6983018 BLAKE2B 8a6d5f4311e304b141f705fdcd3f570e88540dc5ce5882887b6fa52ea16e41daac384012badcbbc087693ee631e30477b8af2a6c49efa8230c71b80937597355 SHA512 c1a69e697298b4e85b8b8898e29077f5e74d8e2a8e42c2164a5597b3739204d856a74f30bc7c30b1907ec7b3bd3c6c6d798ead890656386b0c2a2da2c201d006
-EBUILD snort-2.9.17-r1.ebuild 8196 BLAKE2B 4b484d9f4f03ce988795fd17c690611531bc15514838096a1bd055432cdf4860f7a823bbef9701248cb3903170c06f395b3e90ef8cb99cb133b58ade07058ff2 SHA512 9a611e49f6f853f841c6904db1a6c00232aa4ec274c6708ee4bf5604022aa329156edc11f37966a7c5e35903e4a775d5020a371ac00cba99a4057d23a0753092
-MISC metadata.xml 4036 BLAKE2B 63694245b4389785af4beef5134f10c069f28cce573ade1e6a0424f34420b38c72e1f611f220c1e8876d76a8d5ab23fbe6f678d4890d3d0be8453de3ed600488 SHA512 90fa5b28b1e90483d07f86ad933f9a9da7660d584fe9f5e1f146abf32b70f136e5b90662093d36542dc6863d459bf6152546a8f7bcfc833d26c24c8b165dd5d5
+DIST snort-2.9.20.tar.gz 7009894 BLAKE2B 0fa1426dce94e2800550691bb433c01371c1688616a528c27803f75837cb5eb430246ee113b2a5a1e374b14b6fd5a57140ce54fe13fb13df94276fbd19aa0a15 SHA512 a9ca37e814baeb978a6db06c3c62256b9e98fdd9fa18ce881a2ce854c0c9a5d92476c3384bec9017b8a67e5d78c6f31ca19956a914f54b817343a159a2a7fced
+EBUILD snort-2.9.20.ebuild 8222 BLAKE2B a8a489633d407e677caeee23a8c65f88e8b5febff9a676c2458a2f8cf8c408ed4445f64feab88dda6fd3457d5572fdd9f927ae38db9af95de2b7a41417e49051 SHA512 83fb6eeffcb6f47c16299df0782f5f50600d0121adb5c6a18626799e4e202d0b13c8d97c738df40d6dc7ce4f7d3360afe3f8e473ea1efd6ff2d1bf8cfaba02ee
+MISC metadata.xml 4035 BLAKE2B 6a00d75cab5f1dbbe75904635eefae5d272c0a462651ebc0edce9528bfebd5556caece7e7216a8fd0f36b470a07ff80b1e57b3bd53d5243800d60ff8af0256eb SHA512 c7d0c8c26d9bea2e39cfe9dcf8130844ed6405fb1fe5852c35f78b987c7b9071227c603aa7719fff911773f8b46e6c2ac8aeca765f2464039bf814b6545d7f64
diff --git a/net-analyzer/snort/metadata.xml b/net-analyzer/snort/metadata.xml
index 3d18523037cc..39900f601479 100644
--- a/net-analyzer/snort/metadata.xml
+++ b/net-analyzer/snort/metadata.xml
@@ -14,7 +14,7 @@
 		system (IDS/IPS) developed by Sourcefire. Combining the benefits of
 		signature, protocol, and anomaly-based inspection, Snort is the most
 		widely deployed IDS/IPS technology worldwide. With millions of downloads
-		and approximately 300,000 registered users, Snort has become the de facto 
+		and approximately 300,000 registered users, Snort has become the de facto
 		standard for IPS.
 	</longdescription>
 	<upstream>
@@ -23,8 +23,8 @@
 			<name>Snort Team</name>
 		</maintainer>
 		<changelog>http://www.snort.org/snort-downloads</changelog>
-		<doc>http://www.snort.org/docs</doc>
-		<bugs-to>http://www.snort.org/snort-downloads/submit-a-bug/</bugs-to>
+		<doc>https://snort.org/documents#OfficialDocumentation</doc>
+		<bugs-to>https://snort.org/community#bugs</bugs-to>
 	</upstream>
 	<use>
 		<flag name="control-socket">
@@ -34,7 +34,7 @@
 			Enables extended file inspection capabilities.
 		</flag>
 		<flag name="gre">
-			Enable support for inspecting and processing Generic Routing 
+			Enable support for inspecting and processing Generic Routing
 			Encapsulation (GRE) packet headers. Only needed if you are
 			monitoring GRE tunnels.
 		</flag>
@@ -62,12 +62,12 @@
 			and implement application detection. Requires <pkg>dev-lang/luajit</pkg>.
 		</flag>
 		<flag name="perfprofiling">
-			Enables support for preprocessor and rule performance profiling 
+			Enables support for preprocessor and rule performance profiling
 			using the perfmonitor preprocessor.
 		</flag>
 		<flag name="ppm">
 			Enables support for setting per rule or per packet latency limits.
-			Helps protect against introducing network latency with inline 
+			Helps protect against introducing network latency with inline
 			deployments.
 		</flag>
 		<flag name="react">
@@ -86,17 +86,17 @@
 			--enable-perfprofiling and --enable-ppm.
 		</flag>
 		<flag name="reload-error-restart">
-			Enables support for completely restarting snort if an error is 
+			Enables support for completely restarting snort if an error is
 			detected during a reload.
 		</flag>
 		<flag name="active-response">
-			Enables support for automatically sending TCP resets and ICMP 
+			Enables support for automatically sending TCP resets and ICMP
 			unreachable messages to terminate connections. Used with inline
 			deployments.
 		</flag>
 		<flag name="flexresp3">
 			Enables support for new flexable response preprocessor for enabling
-			connection tearing for inline deployments. Replaces flexresp and 
+			connection tearing for inline deployments. Replaces flexresp and
 			flexresp2.
 		</flag>
 		<flag name="large-pcap-64bit">
diff --git a/net-analyzer/snort/snort-2.9.17-r1.ebuild b/net-analyzer/snort/snort-2.9.20.ebuild
index ba2c56393269..1bfd9d0de604 100644
--- a/net-analyzer/snort/snort-2.9.17-r1.ebuild
+++ b/net-analyzer/snort/snort-2.9.20.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 LUA_COMPAT=( luajit )
 
-inherit autotools lua-single systemd tmpfiles
+inherit autotools flag-o-matic lua-single systemd tmpfiles
 
 DESCRIPTION="The de facto standard for intrusion detection/prevention"
 HOMEPAGE="https://www.snort.org"
@@ -52,14 +52,19 @@ src_prepare() {
 
 	mv configure.{in,ac} || die
 
-	# USE=debug exposes a macro whose name apparently wasn't changed
-	sed -i -e 's/BEFORE_SRV_FAIL/BEFORE_SERVICE_FAIL/' \
-		src/dynamic-preprocessors/appid/appInfoTable.c || die
-
 	AT_M4DIR=m4 eautoreconf
 }
 
 src_configure() {
+	# -Werror=strict-aliasing
+	# https://bugs.gentoo.org/861239
+	#
+	# Upstream does bug mail. Sent an email.
+	#
+	# Do not trust with LTO either.
+	append-flags -fno-strict-aliasing
+	filter-lto
+
 	econf \
 		$(use_enable gre) \
 		$(use_enable control-socket) \
diff --git a/net-analyzer/tcptrace/Manifest b/net-analyzer/tcptrace/Manifest
index c2e468ae40ad..a4cf5a5c9119 100644
--- a/net-analyzer/tcptrace/Manifest
+++ b/net-analyzer/tcptrace/Manifest
@@ -1,8 +1,10 @@
+AUX 0001-configure.in-fix-implicit-function-declaration-causi.patch 666 BLAKE2B 995305d68483738434a58f3af163947588f8bc32bd164f3c57c3d0c2936248a5ca50f8112105a858a2928dca146417a5f78c1a21f8db9b71b4fa8083f21ef207 SHA512 b32532a73c3243c6ffd257837ad42f2682591dd040c0d4ad487e8c8a8f6d113660c309133dec451a174ce37afa454655594fb466f82243fb1f09a94b9df3b272
 AUX tcptrace-6.6.7-_DEFAULT_SOURCE.patch 315 BLAKE2B b2024c742405be706c0ff6dfb8c54d3926f2443fb4c62bb37756ad9dbf0010e145421f684eb4ce04cde621f32aa3a6da22e37b5336868647d0bdf4755002c805 SHA512 d20a36a0ca57991f333d783db2442f14fcf06b1e88936b527edcf2973d82dbc88514eae5e051197d7dc4ce25f16bc10799bb91f5baf4a98076c22f60fecb2065
 AUX tcptrace-6.6.7-cross-compile.patch 1348 BLAKE2B f38a64ed02c45482db7b0fb18865c9584481f5875a9703cf010db603f977bf1bc7696391d3c135060f2b9160b76ebd8986c4a17091b4634e757772b690977377 SHA512 ea5f8d5352f1eb4059c0284abbce9ff9b6df78ac8c7cb17a2aa138fa912cb4197f09b8e43e91bd04b980b6d73e1670deb7e9a3b1386eaaede61a7bdb0f410d1e
 AUX tcptrace-6.6.7-fix-build-clang16.patch 894 BLAKE2B 3c210a578310dab410f8248c5ea8698837e6191187645ae4fa9a101a56be28a4509c4b70fcb5929031b2946d0213d86502917650ed3200dad8123c4254119ab9 SHA512 da5256b10dd81fbe218c521d2c3d6178a4dc95484bfac4d1bc5f0eded0ed569afbc2272068d54655301dc3f1ec17c15b437bb0e50866256de5bf893a58957559
 DIST tcptrace-6.6.7.tar.gz 3773308 BLAKE2B cae5816cb25c33f71c316d14de3c18ff26f0e7452375a962b88c4818ca7c43425e7298e788bd8cb43f2e22ac7dc9b89ed1921b7bd70d0e8befab3ee791453fb1 SHA512 3638770c342aea6c71aa556e758ed22e1fd44730f6c652cf82d3861eb1c31b186952c660071bd1df45020b80eaf9dd090a4ff58c979cc907eb8154dcb7b9b432
 DIST tcptrace_6.6.7-6.debian.tar.xz 6056 BLAKE2B a46a8a8a8f804066486566bccd10e33dc372a1fc30f37f401913c2b3038cf917891472e93a509cac8bdd2928d473c3ce21d0c4048c96ae54967fc48780384221 SHA512 82eebc2e297130cbafab0bb1757402d8b210885320ded1cd9b7ff064248d145c93196820564d4d1d7f1b1f7391cc5f734a0e0bf6275ddcae106d0bd540e32b61
-EBUILD tcptrace-6.6.7_p6-r1.ebuild 1306 BLAKE2B ea153aeac89f314cfb17d255f843e91b53711af4666059785764081e2cc0b40afbc9ab44b3e543e686b5453045a94046c17a4a4ab617d6b7e4cc5efe2d1342da SHA512 b68f74c2a8f934ed73e2ff64584b5546f0fd012108011db38d1f04d4b608e8b4876ceef8e66e364a28f6889d0f39c33b58cda8ea8e7ca40a507bb36232e40014
+EBUILD tcptrace-6.6.7_p6-r1.ebuild 1532 BLAKE2B e9fe981fab2712a4dacdb1ee351412f2d506527fc6d1adf5cf60ad53e18821b2fb150de27851a43e97207dc07827f5e830061739717772f36f05e05ae9ec8c4e SHA512 4d9fca46342eb0f9c0fbca08ce712968f904b7b072c20436ea3006a9b877a4d6677693a37f45367ff47239eaa583cd37669a723bce2842bbf8a8acd9bb68ba67
+EBUILD tcptrace-6.6.7_p6-r2.ebuild 1615 BLAKE2B 38a337a20fc4524b264e9f05f641f4c314007407d0e890c30727cb1930494f4f047525a27769e816c4828a65b04f6d2d82e6e764085f24acd9ed949d35b9c4ff SHA512 1231a26f3b106dc3db1591c6cf44a199c02cfd63bb24d2ded70943300346f6c5c53d6b01a183b641ad5ed90abd30e5728430514701247f5641615b64512f8cad
 EBUILD tcptrace-6.6.7_p6.ebuild 1258 BLAKE2B 50e31667149561f66e255ffc1679c5b10dca42d209b4cfdf60b6eb8a27dbc0414b5415d803abaf0e09c303a4738a01bca431f0b5fa516d331e922f3e0fd5a33d SHA512 5e11ec5bdc8bb3a85b0e3ffb4ca896e2d71a66599e9be97e99260cafdc6d64ebc84955cea753a875c6cf0e151f0696150855f68c5c253c8e1d35d535014df64e
 MISC metadata.xml 277 BLAKE2B 57fc90092c4674e5c4dfe38b0d79c983990fce4e8208b70c2ebb218aebb6d2135537f927115f3a7b7eb8c1ddb596461c17e60acb3e6a11b289796f20f3c80a33 SHA512 5ac67e6beabab60f83ac521249c6d1f021988d522fc86ab12ec98fbaa9d47a50157c10c7b9a39554e66a02b141cdc6dc6669e5e7c9c02c8b36ad404aa790d619
diff --git a/net-analyzer/tcptrace/files/0001-configure.in-fix-implicit-function-declaration-causi.patch b/net-analyzer/tcptrace/files/0001-configure.in-fix-implicit-function-declaration-causi.patch
new file mode 100644
index 000000000000..d9158bae6981
--- /dev/null
+++ b/net-analyzer/tcptrace/files/0001-configure.in-fix-implicit-function-declaration-causi.patch
@@ -0,0 +1,26 @@
+From f199970cdb38259f0748e79ece844dc2cd676cdf Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Tue, 19 Mar 2024 21:39:10 -0400
+Subject: [PATCH] configure.in: fix implicit function declaration causing test
+ to mistest
+
+---
+ configure.in | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configure.in b/configure.in
+index 38132e0..e973815 100644
+--- a/configure.in
++++ b/configure.in
+@@ -51,6 +51,8 @@ dnl If strcmp returns 0, we are on an enironment that uses %llu, otherwise
+ dnl we are on a MacOSX environment that uses %qu
+ AC_TRY_RUN([
+ #include <stdio.h>
++#include <string.h>
++#include <stdlib.h>
+ 
+ #define NIX "%llu"
+ 
+-- 
+2.43.2
+
diff --git a/net-analyzer/tcptrace/tcptrace-6.6.7_p6-r1.ebuild b/net-analyzer/tcptrace/tcptrace-6.6.7_p6-r1.ebuild
index 6757aed273ce..5453f2914699 100644
--- a/net-analyzer/tcptrace/tcptrace-6.6.7_p6-r1.ebuild
+++ b/net-analyzer/tcptrace/tcptrace-6.6.7_p6-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-inherit autotools
+inherit autotools flag-o-matic
 
 DESCRIPTION="A Tool for analyzing network packet dumps"
 HOMEPAGE="http://www.tcptrace.org/"
@@ -38,6 +38,19 @@ src_prepare() {
 	eautoreconf
 }
 
+src_configure() {
+	# -Werror=strict-aliasing
+	# https://bugs.gentoo.org/861260
+	#
+	# Upstream site no longer exists.
+	#
+	# Do not trust with LTO either.
+	append-flags -fno-strict-aliasing
+	filter-lto
+
+	default
+}
+
 src_compile() {
 	emake CCOPT="${CFLAGS}"
 }
diff --git a/net-analyzer/tcptrace/tcptrace-6.6.7_p6-r2.ebuild b/net-analyzer/tcptrace/tcptrace-6.6.7_p6-r2.ebuild
new file mode 100644
index 000000000000..c0cc55723524
--- /dev/null
+++ b/net-analyzer/tcptrace/tcptrace-6.6.7_p6-r2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit autotools flag-o-matic
+
+DESCRIPTION="A Tool for analyzing network packet dumps"
+HOMEPAGE="http://www.tcptrace.org/"
+SRC_URI="
+	http://www.tcptrace.org/download/${P/_p*}.tar.gz
+	http://www.tcptrace.org/download/old/$(ver_cut 1-2)/${P/_p*}.tar.gz
+	mirror://debian/pool/main/t/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz
+"
+S=${WORKDIR}/${P/_p*}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+DEPEND="
+	net-libs/libpcap
+"
+RDEPEND="
+	${DEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P/_p*}-cross-compile.patch
+	"${FILESDIR}"/${P/_p*}-_DEFAULT_SOURCE.patch
+	"${FILESDIR}"/${P/_p*}-fix-build-clang16.patch
+	"${FILESDIR}"/0001-configure.in-fix-implicit-function-declaration-causi.patch
+)
+
+src_prepare() {
+	default
+
+	eapply \
+		$(awk '{ print "'"${WORKDIR}"'/debian/patches/" $0; }' < "${WORKDIR}"/debian/patches/series)
+
+	eautoreconf
+}
+
+src_configure() {
+	# -Werror=strict-aliasing
+	# https://bugs.gentoo.org/861260
+	#
+	# Upstream site no longer exists.
+	#
+	# Do not trust with LTO either.
+	append-flags -fno-strict-aliasing
+	filter-lto
+
+	default
+}
+
+src_compile() {
+	emake CCOPT="${CFLAGS}"
+}
+
+src_install() {
+	dobin tcptrace xpl2gpl
+
+	newman tcptrace.man tcptrace.1
+	dodoc CHANGES COPYRIGHT FAQ README* THANKS WWW
+}
+
+pkg_postinst() {
+	if ! has_version ${CATEGORY}/${PN}; then
+		elog "Note: tcptrace outputs its graphs in the xpl (xplot)"
+		elog "format. Since xplot is unavailable, you will have to"
+		elog "use the included xpl2gpl utility to convert it to"
+		elog "the gnuplot format."
+	fi
+}