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

3 files changed, 24 insertions, 19 deletions

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) \