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

[Arne Fitzenreiter <git@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 2687 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  fefb5173cf02c6b94f2f199bb342df550752ade0 (commit)
       via  d0db7550edb51ced239c640dada40db8fa1eacc1 (commit)
      from  29abc2d07cf297b5ccf32798d6c3cd7dbecef6b2 (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 fefb5173cf02c6b94f2f199bb342df550752ade0
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Fri May 24 17:45:33 2019 +0200

    ids-functions.pl: Do not delete the whitelist file on rulesdir cleanup.
    
    Fixes #12087.
    
    Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit d0db7550edb51ced239c640dada40db8fa1eacc1
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun May 26 16:05:41 2019 +0200

    core132: set correct permissions of security settings file.
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

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

Summary of changes:
 config/cfgroot/ids-functions.pl     | 3 +++
 config/rootfiles/core/132/update.sh | 2 ++
 2 files changed, 5 insertions(+)

Difference in files:
diff --git a/config/cfgroot/ids-functions.pl b/config/cfgroot/ids-functions.pl
index 5530da11e..88734a3ca 100644
--- a/config/cfgroot/ids-functions.pl
+++ b/config/cfgroot/ids-functions.pl
@@ -572,6 +572,9 @@ sub _cleanup_rulesdir() {
 		# Skip element if it has config as file extension.
 		next if ($file =~ m/\.config$/);
 
+		# Skip rules file for whitelisted hosts.
+		next if ("$rulespath/$file" eq $whitelist_file);
+
 		# Delete the current processed file, if not, exit this function
 		# and return an error message.
 		unlink("$rulespath/$file") or return "Could not delete $rulespath/$file. $!\n";
diff --git a/config/rootfiles/core/132/update.sh b/config/rootfiles/core/132/update.sh
index 982a9d964..979f31925 100644
--- a/config/rootfiles/core/132/update.sh
+++ b/config/rootfiles/core/132/update.sh
@@ -90,6 +90,8 @@ ldconfig
 
 # create main/security file
 touch /var/ipfire/main/security
+chmod 755 /var/ipfire/main/security
+chown nobody:nobody /var/ipfire/main/security
 
 # Update Language cache
 /usr/local/bin/update-lang-cache


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