[git.ipfire.org] IPFire 2.x development tree branch, next, updated. ac924baf924906b77353c03690c047183c363bfa

[Arne Fitzenreiter <git@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 4217 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, next has been updated
       via  ac924baf924906b77353c03690c047183c363bfa (commit)
       via  8c0ab3d471c2cb468c5c904dd3b62041aab528ba (commit)
       via  612bb2dff9c436f3a748c3572808ca699a21287f (commit)
      from  140707831bf512e9c8477ffde18c167e2c2d455b (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 ac924baf924906b77353c03690c047183c363bfa
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sat Jan 25 15:13:51 2020 +0000

    core141: cleanup go-8.3.0 and run filesystem-cleanup
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit 8c0ab3d471c2cb468c5c904dd3b62041aab528ba
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sat Jan 25 15:05:38 2020 +0000

    filesystem-cleanup: fix "fixed space" type
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit 612bb2dff9c436f3a748c3572808ca699a21287f
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Wed Jan 22 14:40:34 2020 +0100

    ids-functions.pl: Introduce file for local rules.
    
    This file is to be used, to store customized IDS rules.
    
    Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
    Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

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

Summary of changes:
 config/cfgroot/ids-functions.pl     | 6 ++++++
 config/rootfiles/core/141/update.sh | 6 +++++-
 src/scripts/filesystem-cleanup      | 2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/config/cfgroot/ids-functions.pl b/config/cfgroot/ids-functions.pl
index 3fa19fab7..3cfe837db 100644
--- a/config/cfgroot/ids-functions.pl
+++ b/config/cfgroot/ids-functions.pl
@@ -67,6 +67,9 @@ our $ids_page_lock_file = "/tmp/ids_page_locked";
 # Location where the rulefiles are stored.
 our $rulespath = "/var/lib/suricata";
 
+# Location to store local rules. This file will not be touched.
+our $local_rules_file = "$rulespath/local.rules";
+
 # File which contains the rules to whitelist addresses on suricata.
 our $whitelist_file = "$rulespath/whitelist.rules";
 
@@ -581,6 +584,9 @@ sub _cleanup_rulesdir() {
 		# Skip rules file for whitelisted hosts.
 		next if ("$rulespath/$file" eq $whitelist_file);
 
+		# Skip rules file with local rules.
+		next if ("$rulespath/$file" eq $local_rules_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/141/update.sh b/config/rootfiles/core/141/update.sh
index e757c2ed5..86ee7cefc 100644
--- a/config/rootfiles/core/141/update.sh
+++ b/config/rootfiles/core/141/update.sh
@@ -44,6 +44,7 @@ done
 
 # Remove files
 rm -f /etc/rc.d/init.d/networking/red.up/06-safe-search
+rm -f /usr/lib/go/8.3.0
 
 # Stop services
 
@@ -59,10 +60,13 @@ telinit u
 # Update Language cache
 /usr/local/bin/update-lang-cache
 
+# Update Language cache
+/usr/local/bin/filesystem-cleanup
+
 # Start services
 
 # This update needs a reboot...
-#touch /var/run/need_reboot
+touch /var/run/need_reboot
 
 # Finish
 /etc/init.d/fireinfo start
diff --git a/src/scripts/filesystem-cleanup b/src/scripts/filesystem-cleanup
index e0430e480..f4d4f7df2 100644
--- a/src/scripts/filesystem-cleanup
+++ b/src/scripts/filesystem-cleanup
@@ -85,7 +85,7 @@ main() {
 						echo "Removing ${file}..."
 
 						# Actually remove the file (maybe)
-						if [ "${dry_run}" = "false" ]; then
+						if [ "${dry_run}" = "false" ]; then
 							unlink "${file}"
 						fi
 						;;


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