gentoo auto-resync : 16:08:2023 - 21:30:25

3 files changed, 20 insertions, 10 deletions

diff --git a/net-analyzer/suricata/Manifest b/net-analyzer/suricata/Manifest
index 54760e9d5826..e8f937cb6556 100644
--- a/net-analyzer/suricata/Manifest
+++ b/net-analyzer/suricata/Manifest
@@ -6,10 +6,10 @@ AUX suricata.confd 2771 BLAKE2B c9f9ac6707f71ace993bcf730df5aab11a6e59fcbb636140
 AUX suricata.initd 5475 BLAKE2B 6f824b26d87d1519ac16bdb78bb2f3391040341ee709663b102ea8989d7ca3f38a475efc2796d7e78da35dbb54d327bb2e18e463fdc19880af1ed20e42a38a14 SHA512 0006e34f24f2cf967cc1e44ec626b53aaeee535a3810aa5ad71175f28b5649b2dbaadd2a97f10b8f4adb37d45b9e5fb0991aa92276183869531cb79887d742df
 AUX suricata.service 501 BLAKE2B 00631ada0d2993eae97a028ef950b031b91bb3af346ee3538bd7f0deb9d76bb8552761b4666a3ac80673fe31ffd95424f2ff71e35db0f5fe6667b32478fab4c4 SHA512 4e4e87735731fd0e18ab26e536e7904833a19ce8785ffdd15b22d494673c73044137908feee74800486960f9efd09d1ddc2c75a490a2e35ef06caf23c7439a0c
 AUX suricata.tmpfiles 24 BLAKE2B 150b74a6775137704915015871ab4455b8d0b9204a75c398ea746e9194b0c0a787904f9015b98f36a685fac0dbb0fcb43746096dd403bf882afa5dfef12af94d SHA512 1530aed4efb35f988e2f0134388ea11ffc3ba1f217845a2c5dd47f947983ed4d343126e49d66a86ca7894ff60b5134464ddbe07509dcc80c001131f09cb7e2dd
-DIST suricata-6.0.12.tar.gz 27388535 BLAKE2B 3cd16072014e814ec116bbde6649a0230200e447884028fef0440cbbc38a36b28c1edb39098e4089ee966890464bcd2573ea82d3e35e6d034ad465ac20c4c0b6 SHA512 aa8a51e0c6b04640a9df3ca46d736c23f213561a0f47e9022f0bd10cf4652b6912ff576fb6db0b663fcae5ab5a80ef5048da3a8888323326fb2b6d56d8ef7c0c
-DIST suricata-6.0.12.tar.gz.sig 566 BLAKE2B 50102891a3efec7a52e16bf7c3842cbdf3e9feb0f9a1fe34ab714ea1b5f01c02aafec74c7252b1bb0b0da0242c4f4eb1771c74aef06f356672f6e5bcc405b1a8 SHA512 b3cfb4791599e9c48a46cd39e28d74022ac2aa88887b6cb04ceff70ae66a5e4b1e166caa48a47869c37cffd82e6eae1f65744ca3d84521f8808f90210039f31b
 DIST suricata-6.0.13.tar.gz 27411308 BLAKE2B 47dcc47253c462510494dac35a4aa41a110f62bca148871d86509b76ac0c2a873b9fbb9fc981e65897d6443032c27c9f9eeb0fae524f4e56306ed01fe6e32b01 SHA512 7b7ea4b01b6ec4662db1e875e940d667b0aa71b7b91dccf72d32b644c6291814c3fde0c69c96c138d2f1e2412c92456fede823d61c3b7ba63f4bae0edc2dbb0d
 DIST suricata-6.0.13.tar.gz.sig 566 BLAKE2B 880dccc4db0f322bd11f123fb2ad012a2904e4bee5ed0c2f161e0baee7054acde2234a9da94184ba67a5bb7adab1da10ca00c7850ae1a046dea07b91297b8476 SHA512 3578087d3ee4bcc8e0f6bd704e42d553b4baf208fc04002f4931bf8d23babe7727a25720c52143a3c423f1cc1f5513105e177fd4368b40927d6fe7234db9de65
-EBUILD suricata-6.0.12.ebuild 6791 BLAKE2B e56af0fd9a66d5e9b28185ce39f3dffc296051bda5f27c411b41275d60f7b07bdf882c7ea56dc8a1a952fc2c186b2871e0d12cc545cf5131dca6910f35f7921d SHA512 a0c91424857dc80fa14950cd4f98eba0105e165ab93f9ff20d93b813d706a761b971138535a3fdfa33f14259e2ee32c0fc7283c0eefc2a06584649def8640158
+DIST suricata-7.0.0.tar.gz 23426302 BLAKE2B dc5026ee32dd679c18d8953048f7694c6ef69e9b60d91153e1fad5f0d757ccfcb0423ed6f3e21a27f02f6647476923d5c90e1ba83656249509414316f06cd18b SHA512 b512a8d9e7ce26b362be4e4b1e27b97c0fd6dad109e440d6227916a373e85341336782c0870a2b380fa215f4d2e8d86728f105a6af75d8662d746cee1752347d
+DIST suricata-7.0.0.tar.gz.sig 566 BLAKE2B 11033671642c953282fbb0dda0647d12ee143b16e1ee6202f0cc9bcee94eb123139e075ea860002851c2d37f3c9c7e90b72ef22c6cd0ea82dbf63d2bad852068 SHA512 216463c103c5f5fed3cb83190e78939b1efb6fcfe3f6bb8a023ff8a8df85fd7ad024fcc1d9720f196c6dbe3a3c80285a3689bf6e575ff51253a1e5df1a142fcb
 EBUILD suricata-6.0.13.ebuild 6791 BLAKE2B 5e222e8912760c87ae72fea54101744ab9070080330cdaeb9c9ae491cbb897e57e8aedbdf3017770f5050da75444d9af817ec5b0f3e6b2f45d154d475b1f2b13 SHA512 5bd4bf0f4b8e05b3b87db32d433cfddacd566744b3432245159b1ccb00d5471db74f55b7909c9c4ac3a313c185f7d04b7c456aaf94f606212c59b7bd60ddcc99
-MISC metadata.xml 1047 BLAKE2B 8418aaa86ecf0e2baaf3f927c764dd8f0471f29c0b691ec3baac6988291e9e591ea4263b89a4a25b44cc2642d58bbffcfa5fdecd628ea101e4dd3d67e1914515 SHA512 1e6e38f2d0cd4335e274ab1ac72a445a3bfdd7a5c028d06a387e0f879cf7859681856ff03986816d5dae1ac841958652003b5c8057187885c579a695f8bc11cd
+EBUILD suricata-7.0.0.ebuild 7004 BLAKE2B ecaf5d19423d2213d0ab93621fb03b8480ac53618a9bcc70d19d6abbd1c9d2e059809f9dbc55966d4f34e22cb357f8e2e59f91f3c612a12271b57bca03dfa8c0 SHA512 e8400cc501bd96ed9fef2ec203ee3493d92c92f068a43fd57944d1e218c2dea763fe14b3524fac0d3c94b2b8bfc69abe705b1e719f4f2fea5ef5fa353264695d
+MISC metadata.xml 1100 BLAKE2B 22631c517f844f3528ff0347d1e05104a1be008e3c1c69f58879926f2c37a703d4fc329133e18d76e4e5b5b1d1037b1c17ecf1da251f76f7ad2e88537484f4e1 SHA512 8659ad58b929e8c5d7bd62e202edfce1ca11cee058ba80ca25eac881bcf82a498a22a794a3fce6a4d8e99e03d183cc6a0eab74924a6fc9c27527328fe6335531
diff --git a/net-analyzer/suricata/metadata.xml b/net-analyzer/suricata/metadata.xml
index f55796e7f1ed..ab8f1004e969 100644
--- a/net-analyzer/suricata/metadata.xml
+++ b/net-analyzer/suricata/metadata.xml
@@ -7,6 +7,7 @@
   </maintainer>
   <use>
     <flag name="af-packet">Enable AF_PACKET support</flag>
+    <flag name="af-xdp">Enable AF_XDP support</flag>
     <flag name="bpf">Enable support for eBPF (as well as XDP if supported by the kernel and the NIC driver)
         for low-level, high-speed packet processing</flag>
     <flag name="control-socket">Enable unix socket</flag>
diff --git a/net-analyzer/suricata/suricata-6.0.12.ebuild b/net-analyzer/suricata/suricata-7.0.0.ebuild
index 9b453e9fdbc6..f66b8fc5a628 100644
--- a/net-analyzer/suricata/suricata-6.0.12.ebuild
+++ b/net-analyzer/suricata/suricata-7.0.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit autotools flag-o-matic linux-info lua-single python-single-r1 systemd tmpfiles verify-sig
 
@@ -14,14 +14,15 @@ SRC_URI="https://www.openinfosecfoundation.org/download/${P}.tar.gz
 	verify-sig? ( https://www.openinfosecfoundation.org/download/${P}.tar.gz.sig )"
 
 LICENSE="GPL-2"
-SLOT="0/6"
+SLOT="0/7"
 KEYWORDS="~amd64 ~riscv ~x86"
-IUSE="+af-packet bpf control-socket cuda debug +detection geoip hardened hyperscan lua lz4 nflog +nfqueue redis systemd test"
+IUSE="+af-packet af-xdp bpf control-socket cuda debug +detection geoip hardened hyperscan lua lz4 nflog +nfqueue redis systemd test"
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/openinfosecfoundation.org.asc"
 
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	af-xdp? ( bpf )
 	bpf? ( af-packet )
 	lua? ( ${LUA_REQUIRED_USE} )"
 
@@ -29,7 +30,7 @@ RDEPEND="${PYTHON_DEPS}
 	acct-group/suricata
 	acct-user/suricata
 	dev-libs/jansson:=
-	dev-libs/libpcre
+	dev-libs/libpcre2
 	dev-libs/libyaml
 	net-libs/libnet:*
 	net-libs/libnfnetlink
@@ -38,11 +39,12 @@ RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 	')
-	>=net-libs/libhtp-0.5.43
+	>=net-libs/libhtp-0.5.45
 	net-libs/libpcap
 	sys-apps/file
 	sys-libs/libcap-ng
-	bpf?        ( <dev-libs/libbpf-1.0.0 )
+	af-xdp?		( net-libs/xdp-tools )
+	bpf?        ( dev-libs/libbpf )
 	cuda?       ( dev-util/nvidia-cuda-toolkit )
 	geoip?      ( dev-libs/libmaxminddb:= )
 	hyperscan?  ( dev-libs/hyperscan )
@@ -64,6 +66,12 @@ PATCHES=(
 )
 
 pkg_pretend() {
+	if use af-xdp && use kernel_linux; then
+		if kernel_is -lt 4 18; then
+			ewarn "Kernel 4.18 or newer is required for AF_XDP"
+		fi
+	fi
+
 	if use bpf && use kernel_linux; then
 		if kernel_is -lt 4 15; then
 			ewarn "Kernel 4.15 or newer is necessary to use all XDP features like the CPU redirect map"
@@ -93,6 +101,7 @@ src_configure() {
 		"--enable-gccmarch-native=no" \
 		"--enable-python" \
 		$(use_enable af-packet) \
+		$(use_enable af-xdp) \
 		$(use_enable bpf ebpf) \
 		$(use_enable control-socket unix-socket) \
 		$(use_enable cuda) \