From 48f1bdcfc90c7584b33ada1317e1140aa9fa7364 Mon Sep 17 00:00:00 2001
From: tocsh1 <154625766+tocsh1@users.noreply.github.com>
Date: Sun, 10 Mar 2024 13:29:53 -0400
Subject: [PATCH 1/2] libhtp: update to 0.5.46.

---
 srcpkgs/libhtp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libhtp/template b/srcpkgs/libhtp/template
index 515fd4dac2a514..d7b49dfd344362 100644
--- a/srcpkgs/libhtp/template
+++ b/srcpkgs/libhtp/template
@@ -1,6 +1,6 @@
 # Template file for 'libhtp'
 pkgname=libhtp
-version=0.5.36
+version=0.5.46
 revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/OISF/libhtp"
 distfiles="https://github.com/OISF/libhtp/archive/${version}.tar.gz"
-checksum=ab1dd6cfd4ab4c36624a5c74793d80d1b7f50f5791620f47bfd831a79e32bc4b
+checksum=31a184c9aa1d015f5add33c5480f95738189449954c383e217b27cda97e98789
 
 pre_configure() {
 	autoreconf -fi

From ca94770be3ac3ef7be90866f88eaf6e21865fbc5 Mon Sep 17 00:00:00 2001
From: tocsh1 <154625766+tocsh1@users.noreply.github.com>
Date: Sun, 10 Mar 2024 13:24:25 -0400
Subject: [PATCH 2/2] suricata: update to 7.0.2.

---
 srcpkgs/suricata/template | 42 +++++++++++++++++----------------------
 1 file changed, 18 insertions(+), 24 deletions(-)

diff --git a/srcpkgs/suricata/template b/srcpkgs/suricata/template
index 3e4f58bae137db..277dc0df676473 100644
--- a/srcpkgs/suricata/template
+++ b/srcpkgs/suricata/template
@@ -1,31 +1,28 @@
 # Template file for 'suricata'
 pkgname=suricata
-version=4.1.8
-revision=2
+version=7.0.2
+revision=1
 build_style=gnu-configure
-build_helper="$(vopt_if rust rust)"
-configure_args="--disable-gccmarch-native $(vopt_enable rust)
- $(vopt_enable lua) $(vopt_enable hiredis) --disable-suricata-update
- --disable-static --enable-non-bundled-htp"
-hostmakedepends="pkg-config $(vopt_if rust cargo)"
-makedepends="libnet-devel libpcap-devel pcre-devel libyaml-devel libcap-ng-devel
+build_helper=rust
+configure_args="--disable-gccmarch-native $(vopt_enable lua) $(vopt_enable hiredis)
+ --disable-suricata-update --disable-static --enable-non-bundled-htp"
+hostmakedepends="pkg-config cargo"
+makedepends="libnet-devel libpcap-devel pcre2-devel libyaml-devel libcap-ng-devel
  liblz4-devel liblzma-devel file-devel jansson-devel nss-devel libhtp-devel
- $(vopt_if rust rust-std) $(vopt_if lua lua53-devel)
- $(vopt_if hiredis hiredis-devel)"
+ libunwind-devel rust-std $(vopt_if lua lua53-devel) $(vopt_if hiredis hiredis-devel)"
 short_desc="Suricata is a network IDS, IPS and NSM engine"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://suricata-ids.org/"
 distfiles="https://www.openinfosecfoundation.org/download/${pkgname}-${version}.tar.gz"
-checksum=c8a83a05f57cedc0ef81d833ddcfdbbfdcdb6f459a91b1b15dc2d5671f1aecbb
+checksum=b4eb604838ef99a8396bc8b7bb54cad11f2442cbd7cbb300e7f5aab19097bc4d
 
-build_options="lua rust hiredis"
+build_options="lua hiredis"
 build_options_default="hiredis"
 desc_option_hiredis="Enable hiredis support"
-desc_option_rust="Enable rust protocol parsers"
 
 if [ -z "$CROSS_BUILD" ]; then
-	build_options_default+=" rust lua"
+	build_options_default+=" lua"
 fi
 
 system_accounts="suricata"
@@ -34,10 +31,7 @@ conf_files="/etc/${pkgname}/*.* /etc/${pkgname}/rules/*"
 CFLAGS="-fcommon"
 
 post_configure() {
-	if [ "$build_option_rust" ]; then
-		vsed -i rust/Makefile \
-			-e 's/#RUST_TARGET[[:space:]]*=.*/RUST_TARGET = /'
-	fi
+	vsed -i rust/Makefile -e 's/.*RUST_TARGET[[:space:]]*=.*/RUST_TARGET = /'
 }
 
 post_build() {
@@ -49,10 +43,10 @@ post_build() {
 
 post_install() {
 	vsv $pkgname
-	vinstall $pkgname.yaml 644 etc/$pkgname
-	vinstall classification.config 644 etc/$pkgname
-	vinstall reference.config 644 etc/$pkgname
-	vinstall threshold.config 644 etc/$pkgname
-	vmkdir etc/$pkgname/rules
-	vcopy rules/*.rules etc/$pkgname/rules
+	vinstall suricata.yaml 644 etc/suricata
+	vinstall etc/classification.config 644 etc/suricata
+	vinstall etc/reference.config 644 etc/suricata
+	vinstall threshold.config 644 etc/suricata
+	vmkdir etc/suricata/rules
+	vcopy rules/*.rules etc/suricata/rules
 }