Re: [PR PATCH] [Updated] Suricata update to 7.0.2

[tocsh1 <tocsh1@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 690 bytes --]

There is an updated pull request by tocsh1 against master on the void-packages repository

https://github.com/tocsh1/void-packages suricata
https://github.com/void-linux/void-packages/pull/48501

Suricata update to 7.0.2
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: YES
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): YES
- I built this PR locally for my native architecture x86_64-glibc



A patch file from https://github.com/void-linux/void-packages/pull/48501.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-suricata-48501.patch --]
[-- Type: text/x-diff, Size: 2921 bytes --]

From f1ec111c529a5000f48458513806bf01ba9e9dba Mon Sep 17 00:00:00 2001
From: tocsh1 <154625766+tocsh1@users.noreply.github.com>
Date: Mon, 29 Jan 2024 12:22:35 -0500
Subject: [PATCH] suricata update

---
 srcpkgs/libhtp/template   |  6 +++---
 srcpkgs/suricata/template | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/libhtp/template b/srcpkgs/libhtp/template
index 515fd4dac2a51..433ded15ec877 100644
--- a/srcpkgs/libhtp/template
+++ b/srcpkgs/libhtp/template
@@ -1,7 +1,7 @@
 # Template file for 'libhtp'
 pkgname=libhtp
-version=0.5.36
-revision=2
+version=0.5.45
+revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool"
 makedepends="zlib-devel"
@@ -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=d4214f94522fa5a1ec1909dbb52831c534788d93bc6b2ca8252de9332b11b606
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/suricata/template b/srcpkgs/suricata/template
index 3e4f58bae137d..ad8d97a367bad 100644
--- a/srcpkgs/suricata/template
+++ b/srcpkgs/suricata/template
@@ -1,14 +1,14 @@
 # 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
+ $(vopt_enable lua) $(vopt_enable hiredis)
  --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
+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)"
@@ -17,7 +17,7 @@ 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_default="hiredis"
@@ -50,8 +50,8 @@ 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 etc/classification.config 644 etc/$pkgname
+	vinstall etc/reference.config 644 etc/$pkgname
 	vinstall threshold.config 644 etc/$pkgname
 	vmkdir etc/$pkgname/rules
 	vcopy rules/*.rules etc/$pkgname/rules