Update to 3.1.72.0

4 files changed, 20 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 682a374e17a6..ceff3beebf6d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = snort-nfqueue
 	pkgdesc = A lightweight network IDS / IPS with NFQUEUE and OpenAppID support.
-	pkgver = 3.1.69.0
+	pkgver = 3.1.72.0
 	pkgrel = 1
 	url = https://www.snort.org
 	install = snort.install
@@ -36,18 +36,18 @@ pkgbase = snort-nfqueue
 	backup = etc/snort/lists/default.blocklist
 	backup = etc/snort/lists/default.allowlist
 	backup = etc/logrotate.d/snort
-	source = snort3-3.1.69.0.tar.gz::https://github.com/snort3/snort3/archive/refs/tags/3.1.69.0.tar.gz
+	source = snort3-3.1.72.0.tar.gz::https://github.com/snort3/snort3/archive/refs/tags/3.1.72.0.tar.gz
 	source = snort-openappid-33380.tar.gz::https://snort.org/downloads/openappid/33380
-	source = cstdint.patch
+	source = string.patch
 	source = tcmjem.patch
 	source = local.lua
 	source = snort.logrotate
 	source = snort.sysusers
 	source = snort.tmpfiles
 	source = snort.service
-	sha256sums = 97083cd33a6ba33bdaa133bf19138a3f6a24ce93b2a9e285dcbd89858534cb72
+	sha256sums = 011bb367683ac5eccdef0ce2060d879562c31ca731230d803b8168094e20a69f
 	sha256sums = 3046c5af1dd81a104f13d8e895226ef64bca7fa358238fb5f29c659081eaee2a
-	sha256sums = b3d86ffa12207afa0f2d3a2349cf4746711e71b8a43bdc593b1527eda972f8ea
+	sha256sums = fbc178f33ddaa2add21a794f3deac2b1a3d3abe59310ae4601562c6059575547
 	sha256sums = 7fbf5c1b1ca10fba73350e563cafeb8ea4db7eb5d69ef62c067df602f27678f2
 	sha256sums = 55ae10b6d24abadb03dd4f010fdf71e077370227db6835e48881836a8ea082a8
 	sha256sums = a8a7684a676da5cd55c2b5ab012dac3d14c5a6c62f6e37c4913ba1dbe506088e
diff --git a/PKGBUILD b/PKGBUILD
index 245fa3682aa8..622ed44f114f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=snort-nfqueue
 _pkgname=snort3
 _openappid=33380
-pkgver=3.1.69.0
+pkgver=3.1.72.0
 pkgrel=1
 pkgdesc='A lightweight network IDS / IPS with NFQUEUE and OpenAppID support.'
 arch=('i686' 'x86_64')
@@ -25,16 +25,16 @@ backup=('etc/snort/snort.lua'
 install=snort.install
 source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/snort3/snort3/archive/refs/tags/${pkgver}.tar.gz"
         "snort-openappid-${_openappid}.tar.gz::https://snort.org/downloads/openappid/${_openappid}"
-        'cstdint.patch'
+        'string.patch'
         'tcmjem.patch'
         'local.lua'
         'snort.logrotate'
         'snort.sysusers'
         'snort.tmpfiles'
         'snort.service')
-sha256sums=('97083cd33a6ba33bdaa133bf19138a3f6a24ce93b2a9e285dcbd89858534cb72'
+sha256sums=('011bb367683ac5eccdef0ce2060d879562c31ca731230d803b8168094e20a69f'
             '3046c5af1dd81a104f13d8e895226ef64bca7fa358238fb5f29c659081eaee2a'
-            'b3d86ffa12207afa0f2d3a2349cf4746711e71b8a43bdc593b1527eda972f8ea'
+            'fbc178f33ddaa2add21a794f3deac2b1a3d3abe59310ae4601562c6059575547'
             '7fbf5c1b1ca10fba73350e563cafeb8ea4db7eb5d69ef62c067df602f27678f2'
             '55ae10b6d24abadb03dd4f010fdf71e077370227db6835e48881836a8ea082a8'
             'a8a7684a676da5cd55c2b5ab012dac3d14c5a6c62f6e37c4913ba1dbe506088e'
@@ -44,7 +44,7 @@ sha256sums=('97083cd33a6ba33bdaa133bf19138a3f6a24ce93b2a9e285dcbd89858534cb72'
 
 prepare() {
     cd "${_pkgname}-${pkgver}"
-    patch -p0 < "${srcdir}"/cstdint.patch
+    patch -p0 < "${srcdir}"/string.patch
     patch -p0 < "${srcdir}"/tcmjem.patch
     # Workaround https://github.com/intel/hyperscan/issues/388
     sed -i '/HAVE_HS_COMPILE_LIT/d' config.cmake.h.in cmake/sanity_checks.cmake
diff --git a/cstdint.patch b/cstdint.patch
deleted file mode 100644
index 095843d86714..000000000000
--- a/cstdint.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- src/js_norm/js_identifier_ctx.h	2023-05-07 00:46:24.000000000 +0530
-+++ src/js_norm/js_identifier_ctx.h	2023-05-07 20:19:04.069501050 +0530
-@@ -25,6 +25,7 @@
- #include <unordered_map>
- #include <unordered_set>
- #include <vector>
-+#include <cstdint>
- 
- namespace jsn
- {
---- src/packet_io/sfdaq_config.h	2023-05-24 09:05:32.765835939 +0530
-+++ src/packet_io/sfdaq_config.h	2023-05-24 09:06:10.796162609 +0530
-@@ -23,6 +23,7 @@
- 
- #include <string>
- #include <vector>
-+#include <cstdint>
- 
- using DaqVar = std::pair<std::string, std::string>;
- using DaqVarList = std::vector<DaqVar>;
---- src/service_inspectors/wizard/magic.h	2023-05-24 09:16:41.121404348 +0530
-+++ src/service_inspectors/wizard/magic.h	2023-05-24 09:17:13.008321620 +0530
-@@ -23,6 +23,7 @@
- #include <cassert>
- #include <string>
- #include <vector>
-+#include <cstdint>
- 
- class MagicBook;
- 
diff --git a/string.patch b/string.patch
new file mode 100644
index 000000000000..42b1502b24e9
--- /dev/null
+++ b/string.patch
@@ -0,0 +1,10 @@
+--- src/managers/module_manager.h	2023-10-17 06:29:31.817813432 +0530
++++ src/managers/module_manager.h	2023-10-17 06:29:52.671737795 +0530
+@@ -27,6 +27,7 @@
+ #include <list>
+ #include <mutex>
+ #include <set>
++#include <string>
+ 
+ #include "framework/counts.h"
+ #include "main/analyzer_command.h"