Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next

diff --git a/src/initscripts/system/suricata b/src/initscripts/system/suricata
index c9f131fcae3dfee203ce3058a90a803eef1c7347..38b6a40d831d61674738a4ee79d311cfe0546be4 100644 (file)
--- a/src/initscripts/system/suricata
+++ b/src/initscripts/system/suricata
@@ -171,6 +171,9 @@ case "$1" in
                # Remove suricata control socket.              
                rm /var/run/suricata/* >/dev/null 2>/dev/null
 
+               # Trash remain pid file if still exists.
+               rm -f $PID_FILE >/dev/null 2>/dev/null
+
                # Don't report returncode of rm if suricata was not started
                exit 0
         ;;

diff --git a/src/scripts/update-ids-ruleset b/src/scripts/update-ids-ruleset
index 14ea25ec6ce7106fcf2ef7495535e5b1d0dfb2ae..f28a8c156627b2df5f42923607cb66ec01570f12 100644 (file)
--- a/src/scripts/update-ids-ruleset
+++ b/src/scripts/update-ids-ruleset
@@ -58,6 +58,9 @@ if(&IDS::downloadruleset()) {
        exit 0;
 }
 
+# Set correct ownership for the downloaded tarball.
+&IDS::set_ownership("$IDS::rulestarball");
+
 # Call oinkmaster to alter the ruleset.
 &IDS::oinkmaster();