diff --git a/suricata-5.0.7-log-path-fixup.patch b/suricata-5.0.7-log-path-fixup.patch new file mode 100644 index 0000000..712a3c4 --- /dev/null +++ b/suricata-5.0.7-log-path-fixup.patch @@ -0,0 +1,22 @@ +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 + e_rustdir="$e_abs_srcdir/rust" + fi + else +- EXPAND_VARIABLE(localstatedir, e_logdir, "/log/suricata/") ++ EXPAND_VARIABLE(localstatedir, e_logdir, "/log/suricata") + 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 +@@ -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 diff --git a/suricata-6.0.3-log-path-fixup.patch b/suricata-6.0.3-log-path-fixup.patch deleted file mode 100644 index 8b11302..0000000 --- a/suricata-6.0.3-log-path-fixup.patch +++ /dev/null @@ -1,23 +0,0 @@ -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 -- EXPAND_VARIABLE(localstatedir, e_logdir, "/log/suricata/") -+ EXPAND_VARIABLE(localstatedir, e_logdir, "/log/suricata") - EXPAND_VARIABLE(localstatedir, e_rundir, "/run/") - EXPAND_VARIABLE(localstatedir, e_logfilesdir, "/log/suricata/files") - EXPAND_VARIABLE(localstatedir, e_logcertsdir, "/log/suricata/certs") -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 diff --git a/suricata.spec b/suricata.spec index 7002895..4c1569c 100644 --- a/suricata.spec +++ b/suricata.spec @@ -20,7 +20,7 @@ Patch3: suricata-4.1.4-socket.patch # 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-6.0.3-log-path-fixup.patch +Patch5: suricata-5.0.7-log-path-fixup.patch BuildRequires: gcc gcc-c++ BuildRequires: cargo rust >= 1.33