[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 0c52297641c96927eba3476851957ef0fe321ec8

[Arne Fitzenreiter <git@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 3269 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, master has been updated
       via  0c52297641c96927eba3476851957ef0fe321ec8 (commit)
       via  0034a92ad79d6c9853216602960c8ebe22d13b21 (commit)
      from  9cf253e150078852877f5ee530aeb3408fa4216b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0c52297641c96927eba3476851957ef0fe321ec8
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Wed May 1 17:03:06 2019 +0200

    suricata: Remove PID file on stop
    
    Force the initscript to remove the PID file when calling "stop" section.
    
    If suricata crashes during startup, the PID file still remains and the service
    cannot be started anymore until the file has been deleted.
    
    Now when calling "stop" or "restart" the PID file will be deleted and the service
    can be used again.
    
    Fixes #12067.
    
    Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit 0034a92ad79d6c9853216602960c8ebe22d13b21
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Wed May 1 16:49:25 2019 +0200

    update-ids-ruleset: Set correct ownership for the rulestarball.
    
    The script usualy will be executed by cron which will start it with
    root permissions, so the downloaded tarball is owned by this user.
    
    This has to be changed to the user which runs the WUI (nobody:nobody) to
    allow, changing the ruleset to an other one and to display the ruleset area.
    
    Fixes #12066
    
    Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 src/initscripts/system/suricata | 3 +++
 src/scripts/update-ids-ruleset  | 3 +++
 2 files changed, 6 insertions(+)

Difference in files:
diff --git a/src/initscripts/system/suricata b/src/initscripts/system/suricata
index c9f131fca..38b6a40d8 100644
--- 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 14ea25ec6..f28a8c156 100644
--- 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();
 


hooks/post-receive
--
IPFire 2.x development tree