PR#6: Update epel8 to 6.0.4 - rpms/suricata

rpms / suricata

#6 Update epel8 to 6.0.4

Opened 2 years ago by dcavalca. Modified 4 months ago

rpms/ dcavalca/suricata epel8 into epel8

Davide Cavalca • 2 years ago

d247c6d

.gitignore

file modified

		`@@ -72,3 +72,7 @@`
		`/suricata-5.0.5.tar.gz`
		`/suricata-5.0.6.tar.gz`
		`/suricata-5.0.7.tar.gz`
		`+ /suricata-6.0.1.tar.gz`
		`+ /suricata-6.0.2.tar.gz`
		`+ /suricata-6.0.3.tar.gz`
		`+ /suricata-6.0.4.tar.gz`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (suricata-5.0.7.tar.gz) = dce3929c796e04778eb9437bd4c7203aa9dae56be0baa4b7d986d3eedff3bfc71aa2886ecdeed9d87ec3d88cd3060ff8ef01540d15eb857698a2c4696da5899c`
		`+ SHA512 (suricata-6.0.4.tar.gz) = 8dccea669e50758def06fe3f3e8d5048d76b27a80b5f96a7b56d2ab6e4da358d8b17ec2d764e1b53cc6a1334ee0b14191cc80f5dcf18cc4d804d5c530290adf0`

suricata-6.0.3-log-path-fixup.patch ~~suricata-5.0.7-log-path-fixup.patch~~

file renamed

+11 -10

		`@@ -1,7 +1,7 @@`
		`- diff -urp suricata-5.0.7.orig/configure.ac suricata-5.0.7/configure.ac`
		`- --- suricata-5.0.7.orig/configure.ac 2021-06-30 11:32:47.000000000 -0400`
		`- +++ suricata-5.0.7/configure.ac 2021-07-01 17:06:19.000050629 -0400`
		`- @@ -2557,7 +2557,7 @@ if test "$WINDOWS_PATH" = "yes"; then`
		`+ diff -urp suricata-6.0.3.orig/configure.ac suricata-6.0.3/configure.ac`
		`+ --- suricata-6.0.3.orig/configure.ac 2021-06-30 12:24:47.000000000 -0400`
		`+ +++ suricata-6.0.3/configure.ac 2021-07-01 13:19:04.292513777 -0400`
		`+ @@ -2752,7 +2752,7 @@ if test "$WINDOWS_PATH" = "yes"; then`
		`e_rustdir="$e_abs_srcdir/rust"`
		`fi`
		`else`
		`@@ -10,13 +10,14 @@`
		`EXPAND_VARIABLE(localstatedir, e_rundir, "/run/")`
		`EXPAND_VARIABLE(localstatedir, e_logfilesdir, "/log/suricata/files")`
		`EXPAND_VARIABLE(localstatedir, e_logcertsdir, "/log/suricata/certs")`
		`- diff -urp suricata-5.0.7.orig/etc/suricata.logrotate.in suricata-5.0.7/etc/suricata.logrotate.in`
		`- --- suricata-5.0.7.orig/etc/suricata.logrotate.in 2021-06-30 11:32:47.000000000 -0400`
		`- +++ suricata-5.0.7/etc/suricata.logrotate.in 2021-07-01 17:06:41.122048255 -0400`
		`+ Only in suricata-6.0.3: configure.ac.orig`
		`+ diff -urp suricata-6.0.3.orig/etc/suricata.logrotate.in suricata-6.0.3/etc/suricata.logrotate.in`
		`+ --- suricata-6.0.3.orig/etc/suricata.logrotate.in 2021-06-30 12:19:54.000000000 -0400`
		`+ +++ suricata-6.0.3/etc/suricata.logrotate.in 2021-07-01 13:19:44.455509467 -0400`
		`@@ -1,5 +1,5 @@`
		`# Sample /etc/logrotate.d/suricata configuration file.`
		`-@e_logdir@.log @e_logdir@.json {`
		`+@e_logdir@/.log @e_logdir@/.json {`
		`- daily`
		`- missingok`
		`- rotate 5`
		`+ daily`
		`+ missingok`
		`+ rotate 5`

suricata.spec

file modified

+25 -8

		`@@ -1,6 +1,6 @@`
		`Summary: Intrusion Detection System`
		`Name: suricata`
		`- Version: 5.0.7`
		`+ Version: 6.0.4`
		`Release: 1%{?dist}`
		`License: GPLv2`
		`URL: https://suricata-ids.org/`
		`@@ -20,8 +20,9 @@`
		`# The default path needs to be fixed up to where Fedora keeps it`
		`Patch4: suricata-5.0.4-geolite-path-fixup.patch`
		`# The log path has an extra '/' at the end`
		`- Patch5: suricata-5.0.7-log-path-fixup.patch`
		`+ Patch5: suricata-6.0.3-log-path-fixup.patch`

		`+ BuildRequires: make`
		`BuildRequires: gcc gcc-c++`
		`BuildRequires: cargo rust >= 1.33`
		`BuildRequires: libyaml-devel python3-pyyaml`
		`@@ -40,7 +41,7 @@`
		`BuildRequires: systemd`
		`BuildRequires: hiredis-devel`
		`BuildRequires: libevent-devel`
		`- BuildRequires: libprelude-devel`
		`+ #BuildRequires: libprelude-devel`
		`BuildRequires: pkgconfig(gnutls)`

		`%if 0%{?fedora} \|\| 0%{?epel} >= 8`
		`@@ -88,7 +89,7 @@`
		`--with-libnspr-includes=/usr/include/nspr4 \`
		`--with-libnss-includes=/usr/include/nss3 \`
		`--enable-jansson --enable-geoip --enable-lua --enable-hiredis \`
		`- --enable-prelude --enable-rust \`
		`+ --enable-rust \`
		`%if 0%{?fedora} >= 32`
		`%ifarch x86_64`
		`--enable-ebpf-build --enable-ebpf \`
		`@@ -180,16 +181,32 @@`
		`%{_datadir}/%{name}/rules`

		`%changelog`
		`- * Thu Jul 01 2021 Steve Grubb <sgrubb@redhat.com> 5.0.7-1`
		`+ * Thu Nov 18 2021 Jason Taylor <jtfas90@gmail.com> 6.0.4-1`
		`- New security and bugfix release`
		`- - Fix logrotation directories (#1966955)`

		`- * Tue Mar 02 2021 Steve Grubb <sgrubb@redhat.com> 5.0.6-1`
		`+ * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.3-2`
		`+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild`
		`+`
		`+ * Thu Jul 01 2021 Steve Grubb <sgrubb@redhat.com> 6.0.3-1`
		`+ - New security and bugfix release`
		`+ - Fix logrotation location (#1966955)`
		`+`
		`+ * Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 6.0.2-2`
		`+ - Rebuilt for Python 3.10`
		`+`
		`+ * Tue Mar 02 2021 Steve Grubb <sgrubb@redhat.com> 6.0.2-1`
		`- New security and bugfix release`

		`- * Sat Feb 13 2021 Miro Hrončok <mhroncok@redhat.com> - 5.0.5-2`
		`+ * Sat Feb 13 2021 Miro Hrončok <mhroncok@redhat.com> - 6.0.1-4`
		`- Enable hyperscan on EPEL 8+`

		`+ * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.1-3`
		`+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild`
		`+`
		`+ * Thu Jan 07 2021 Steve Grubb <sgrubb@redhat.com> 6.0.1-2`
		`+ - New major feature release`
		`+ - Dropped prelude support due to (#1908783).`
		`+`
		`* Tue Dec 15 2020 Steve Grubb <sgrubb@redhat.com> 5.0.5-1`
		`- New bugfix release`