snort: 3.1.62.0

3 files changed, 44 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d589cc49703a..538d4a96429b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = snort
 	pkgdesc = A lightweight network IDS /IPS with OpenAppID support.
-	pkgver = 3.1.58.0
+	pkgver = 3.1.62.0
 	pkgrel = 1
 	url = https://www.snort.org
 	install = snort.install
@@ -37,15 +37,17 @@ pkgbase = snort
 	backup = etc/snort/lists/default.blocklist
 	backup = etc/snort/lists/default.allowlist
 	backup = etc/logrotate.d/snort
-	source = snort3-3.1.58.0.tar.gz::https://github.com/snort3/snort3/archive/refs/tags/3.1.58.0.tar.gz
+	source = snort3-3.1.62.0.tar.gz::https://github.com/snort3/snort3/archive/refs/tags/3.1.62.0.tar.gz
 	source = snort-openappid-26425.tar.gz::https://snort.org/downloads/openappid/26425
+	source = cstdint.patch
 	source = local.lua
 	source = snort.logrotate
 	source = snort.sysusers
 	source = snort.tmpfiles
 	source = snort.service
-	sha256sums = c2b37899db42e2db9a05089abbe0ba48633c6c48496d2c64565500b4f9061d78
+	sha256sums = 1f18936da65d52702f75e5b9ffe2cfbc9c9373201801ad275f6e636451f7e06f
 	sha256sums = 8513877ce2264bb22119d911c2cf11f73735c866e2ca0d061c35eef6740d51f9
+	sha256sums = 502fbfe78bbacc8d6d3384b70b8e6f0343c537532360cee755d7be8f30eab39c
 	sha256sums = 2e60695f90e7cb3f1faad5aa90b3ad351f2175268fb31d6fa9601f11fca22d1c
 	sha256sums = a8a7684a676da5cd55c2b5ab012dac3d14c5a6c62f6e37c4913ba1dbe506088e
 	sha256sums = ae3245c5de527fb487c459f2f4a9c78803ae6341e9c81b9a404277679cdee051
diff --git a/PKGBUILD b/PKGBUILD
index 3a42bed2defd..a8dc62997e09 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@
 pkgname=snort
 _pkgname=snort3
 _openappid=26425
-pkgver=3.1.58.0
+pkgver=3.1.62.0
 pkgrel=1
 pkgdesc='A lightweight network IDS /IPS with OpenAppID support.'
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64' 'arm')
@@ -30,12 +30,18 @@ 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'
   'local.lua'
   'snort.logrotate'
   'snort.sysusers'
   'snort.tmpfiles'
   'snort.service')
 
+prepare() {
+  cd "${_pkgname}-${pkgver}"
+  patch -p0 < "${srcdir}"/cstdint.patch
+}
+
 build() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
   ./configure_cmake.sh --prefix=/usr --enable-tcmalloc --with-daq-libraries=/usr/lib/daq/ --disable-static-daq
@@ -65,8 +71,9 @@ package() {
 
 }
 
-sha256sums=('c2b37899db42e2db9a05089abbe0ba48633c6c48496d2c64565500b4f9061d78'
+sha256sums=('1f18936da65d52702f75e5b9ffe2cfbc9c9373201801ad275f6e636451f7e06f'
             '8513877ce2264bb22119d911c2cf11f73735c866e2ca0d061c35eef6740d51f9'
+            '502fbfe78bbacc8d6d3384b70b8e6f0343c537532360cee755d7be8f30eab39c'
             '2e60695f90e7cb3f1faad5aa90b3ad351f2175268fb31d6fa9601f11fca22d1c'
             'a8a7684a676da5cd55c2b5ab012dac3d14c5a6c62f6e37c4913ba1dbe506088e'
             'ae3245c5de527fb487c459f2f4a9c78803ae6341e9c81b9a404277679cdee051'
diff --git a/cstdint.patch b/cstdint.patch
new file mode 100644
index 000000000000..9896a4f221ed
--- /dev/null
+++ b/cstdint.patch
@@ -0,0 +1,30 @@
+--- 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.amm	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;
+