diff --git a/.gitignore b/.gitignore index 576674a..4b316c7 100644 --- a/.gitignore +++ b/.gitignore @@ -83,3 +83,4 @@ suricata-1.0.0.tar.gz.sig /suricata-6.0.13.tar.gz /suricata-6.0.14.tar.gz /suricata-6.0.15.tar.gz +/suricata-7.0.2.tar.gz diff --git a/sources b/sources index d141973..986f9b0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (suricata-6.0.15.tar.gz) = ec9904fdc57e594653e3f48794c602429412fc85377630600b96081cfeb21361c353ce54d564c01ef0400885c508b49bd8c7a5d8b4482d45155b2007907107a9 +SHA512 (suricata-7.0.2.tar.gz) = bca6eb64495d36fcc83522e29a8ec24653752930d001191fca1d72de5513537fdb8c1805fc45afe55b5fb3a68cf3747af609eec46070505dcd5d9e53c0ed9b95 diff --git a/suricata-6.0.9-python.patch b/suricata-6.0.9-python.patch deleted file mode 100644 index 4931707..0000000 --- a/suricata-6.0.9-python.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -urp suricata-6.0.9.orig/python/suricata/sc/suricatasc.py suricata-6.0.9/python/suricata/sc/suricatasc.py ---- suricata-6.0.9.orig/python/suricata/sc/suricatasc.py 2022-11-28 01:31:05.000000000 -0500 -+++ suricata-6.0.9/python/suricata/sc/suricatasc.py 2022-12-13 17:17:12.651749381 -0500 -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python3 - # Copyright(C) 2012-2023 Open Information Security Foundation - - # This program is free software; you can redistribute it and/or modify diff --git a/suricata-7.0.2-python.patch b/suricata-7.0.2-python.patch new file mode 100644 index 0000000..10f2606 --- /dev/null +++ b/suricata-7.0.2-python.patch @@ -0,0 +1,8 @@ +diff -urp suricata-7.0.2.orig/python/suricata/sc/suricatasc.py suricata-7.0.2/python/suricata/sc/suricatasc.py +--- suricata-7.0.2.orig/python/suricata/sc/suricatasc.py 2023-10-18 10:25:29.000000000 -0400 ++++ suricata-7.0.2/python/suricata/sc/suricatasc.py 2024-01-31 16:44:40.501754111 -0500 +@@ -1,3 +1,4 @@ ++#!/usr/bin/python3 + # Copyright(C) 2012-2023 Open Information Security Foundation + + # This program is free software; you can redistribute it and/or modify diff --git a/suricata.spec b/suricata.spec index d952313..2bd402d 100644 --- a/suricata.spec +++ b/suricata.spec @@ -1,7 +1,7 @@ Summary: Intrusion Detection System Name: suricata -Version: 6.0.15 -Release: 2%{?dist} +Version: 7.0.2 +Release: 1%{?dist} License: GPL-2.0-only URL: https://suricata-ids.org/ Source0: https://www.openinfosecfoundation.org/download/%{name}-%{version}.tar.gz @@ -18,15 +18,15 @@ Patch3: suricata-5.0.4-geolite-path-fixup.patch # The log path has an extra '/' at the end Patch4: suricata-6.0.3-log-path-fixup.patch # Build fails with ambiguous python shebang -Patch5: suricata-6.0.9-python.patch +Patch5: suricata-7.0.2-python.patch BuildRequires: make BuildRequires: gcc gcc-c++ -BuildRequires: cargo rust >= 1.33 +BuildRequires: cargo rust >= 1.63 BuildRequires: rust-packaging BuildRequires: libyaml-devel python3-pyyaml BuildRequires: libnfnetlink-devel libnetfilter_queue-devel libnet-devel -BuildRequires: zlib-devel pcre-devel libcap-ng-devel +BuildRequires: zlib-devel pcre2-devel libcap-ng-devel BuildRequires: lz4-devel libpcap-devel BuildRequires: nspr-devel nss-devel nss-softokn-devel file-devel BuildRequires: jansson-devel libmaxminddb-devel python3-devel lua-devel @@ -189,6 +189,9 @@ fi %{_datadir}/%{name}/rules %changelog +* Wed Jan 31 2024 Steve Grubb 7.0.2-1 +- New major release + * Sat Jan 27 2024 Fedora Release Engineering - 6.0.15-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild