diff --git a/.gitignore b/.gitignore index 77b8ac8..8213f8a 100644 --- a/.gitignore +++ b/.gitignore @@ -78,3 +78,4 @@ suricata-1.0.0.tar.gz.sig /suricata-6.0.6.tar.gz /suricata-6.0.9.tar.gz /suricata-6.0.10.tar.gz +/suricata-6.0.11.tar.gz diff --git a/sources b/sources index d94a288..e49db8b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (suricata-6.0.10.tar.gz) = 3e49d491cf1fb56a6773308380cae826016041018c18753d18529572712a6ffa415df2798805bffdf8482312fdb69c3f2e05f38870a5b725d333f928b840e1e2 +SHA512 (suricata-6.0.11.tar.gz) = b9b23aa9f71e9ce9c15312d14624133f772a0df82059a7c911cfb028ff00ba0eb39c7c263cb7f4612d2199c262cef1682c06f8b416a36e37dfb4277f12cb2ce9 diff --git a/suricata-6.0.11-maxint.patch b/suricata-6.0.11-maxint.patch new file mode 100644 index 0000000..a2e9724 --- /dev/null +++ b/suricata-6.0.11-maxint.patch @@ -0,0 +1,24 @@ +diff -urp suricata-6.0.11.orig/src/runmode-af-packet.c suricata-6.0.11/src/runmode-af-packet.c +--- suricata-6.0.11.orig/src/runmode-af-packet.c 2023-04-13 07:21:46.000000000 -0400 ++++ suricata-6.0.11/src/runmode-af-packet.c 2023-04-13 14:47:45.070132099 -0400 +@@ -57,7 +57,7 @@ + + #include "source-af-packet.h" + +-extern int max_pending_packets; ++extern intmax_t max_pending_packets; + + const char *RunModeAFPGetDefaultMode(void) + { +diff -urp suricata-6.0.11.orig/src/source-nfq.c suricata-6.0.11/src/source-nfq.c +--- suricata-6.0.11.orig/src/source-nfq.c 2023-04-13 07:21:46.000000000 -0400 ++++ suricata-6.0.11/src/source-nfq.c 2023-04-13 14:48:27.225050444 -0400 +@@ -94,7 +94,7 @@ static TmEcode NoNFQSupportExit(ThreadVa + + #else /* we do have NFQ support */ + +-extern int max_pending_packets; ++extern intmax_t max_pending_packets; + + #define MAX_ALREADY_TREATED 5 + #define NFQ_VERDICT_RETRY_TIME 3 diff --git a/suricata.spec b/suricata.spec index a51ccea..fc532da 100644 --- a/suricata.spec +++ b/suricata.spec @@ -1,6 +1,6 @@ Summary: Intrusion Detection System Name: suricata -Version: 6.0.10 +Version: 6.0.11 Release: 1%{?dist} License: GPL-2.0-only URL: https://suricata-ids.org/ @@ -23,6 +23,8 @@ Patch4: suricata-5.0.4-geolite-path-fixup.patch Patch5: suricata-6.0.3-log-path-fixup.patch # Build fails with ambiguous python shebang Patch6: suricata-6.0.9-python.patch +# Build has a warning that this fixes +Patch7: suricata-6.0.11-maxint.patch BuildRequires: make BuildRequires: gcc gcc-c++ @@ -77,12 +79,13 @@ Matching, and GeoIP identification. %prep %setup -q install -m 644 %{SOURCE2} doc/ -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 +%patch -P1 -p1 +%patch -P2 -p1 +%patch -P3 -p1 +%patch -P4 -p1 +%patch -P5 -p1 +%patch -P6 -p1 +%patch -P7 -p1 sed -i 's/(datadir)/(sysconfdir)/' etc/Makefile.am %ifarch x86_64 sed -i 's/-D__KERNEL__/-D__KERNEL__ -D__x86_64__/' ebpf/Makefile.am @@ -194,6 +197,9 @@ fi %{_datadir}/%{name}/rules %changelog +* Thu Apr 13 2023 Steve Grubb 6.0.11-1 +- New security and bugfix release + * Mon Mar 13 2023 Steve Grubb 6.0.10-1 - New security and bugfix release