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 4f6790a7e48c1c5bf52ad53c060ef6f3274bd5a1 (commit) via 3fa1cb5f35dd59fed503211898662c5cf22c3c97 (commit) via 9d8574996e7833f8a009cc4012990c2fcc8113cc (commit) via 31b34f950912478f8594f41cdf20dc715b15bc34 (commit) from 09f518fbb1c0a7db4f2e7202338ecf5ff8ea82c6 (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 4f6790a7e48c1c5bf52ad53c060ef6f3274bd5a1 Author: Michael Tremer Date: Wed Apr 5 10:33:49 2017 +0100 ipsecctrl: Reload IPsec block rules after connection is deleted Signed-off-by: Michael Tremer commit 3fa1cb5f35dd59fed503211898662c5cf22c3c97 Author: Matthias Fischer Date: Tue Apr 4 12:45:12 2017 +0200 logwatch: Update to 7.4.3 Signed-off-by: Matthias Fischer Signed-off-by: Michael Tremer commit 9d8574996e7833f8a009cc4012990c2fcc8113cc Author: Matthias Fischer Date: Tue Apr 4 12:38:33 2017 +0200 logwatch 7.4.1: another fix for rootfile Hi, similar to: http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=9f46e637ac345509ff75248d1087b1bff117ff20 A missing '#' for "usr/share/logwatch/default.conf/services" in rootfile. Best, Matthias Signed-off-by: Matthias Fischer Signed-off-by: Michael Tremer commit 31b34f950912478f8594f41cdf20dc715b15bc34 Author: Matthias Fischer Date: Tue Apr 4 00:46:38 2017 +0200 logwatch 7.4.1: fix for rootfile Hi, One missing '#' and all underlying 'services' in 'usr/share/logwatch/scripts/services' are installed. 147 files are active, but it should be only 33. Best, Matthias Signed-off-by: Matthias Fischer Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/logwatch | 13 ++++++------- lfs/logwatch | 6 +++--- src/misc-progs/ipsecctrl.c | 3 +++ 3 files changed, 12 insertions(+), 10 deletions(-) Difference in files: diff --git a/config/rootfiles/common/logwatch b/config/rootfiles/common/logwatch index 998ab8a..36b9067 100644 --- a/config/rootfiles/common/logwatch +++ b/config/rootfiles/common/logwatch @@ -1,11 +1,6 @@ #etc/logwatch etc/logwatch/conf #etc/logwatch/logwatch.cron -#etc/logwatch/conf/ignore.conf -#etc/logwatch/conf/logfiles -#etc/logwatch/conf/logwatch.conf -#etc/logwatch/conf/override.conf -#etc/logwatch/conf/services etc/logwatch/scripts etc/logwatch/scripts/services usr/sbin/logwatch @@ -72,7 +67,7 @@ usr/share/logwatch/default.conf/logfiles/xferlog.conf #usr/share/logwatch/default.conf/logfiles/yum.conf #usr/share/logwatch/default.conf/logfiles/zypp.conf usr/share/logwatch/default.conf/logwatch.conf -usr/share/logwatch/default.conf/services +#usr/share/logwatch/default.conf/services #usr/share/logwatch/default.conf/services/afpd.conf usr/share/logwatch/default.conf/services/amavis.conf #usr/share/logwatch/default.conf/services/arpwatch.conf @@ -166,10 +161,12 @@ usr/share/logwatch/default.conf/services/scsi.conf #usr/share/logwatch/default.conf/services/spamassassin.conf usr/share/logwatch/default.conf/services/sshd.conf usr/share/logwatch/default.conf/services/sshd2.conf +#usr/share/logwatch/default.conf/services/sssd.conf #usr/share/logwatch/default.conf/services/stunnel.conf usr/share/logwatch/default.conf/services/sudo.conf #usr/share/logwatch/default.conf/services/syslog-ng.conf usr/share/logwatch/default.conf/services/syslogd.conf +#usr/share/logwatch/default.conf/services/systemd.conf #usr/share/logwatch/default.conf/services/tac_acc.conf #usr/share/logwatch/default.conf/services/tivoli-smc.conf #usr/share/logwatch/default.conf/services/up2date.conf @@ -213,7 +210,7 @@ usr/share/logwatch/scripts/logfiles/xferlog/removeheaders #usr/share/logwatch/scripts/logfiles/yum #usr/share/logwatch/scripts/logfiles/yum/applydate usr/share/logwatch/scripts/logwatch.pl -usr/share/logwatch/scripts/services +#usr/share/logwatch/scripts/services #usr/share/logwatch/scripts/services/afpd usr/share/logwatch/scripts/services/amavis #usr/share/logwatch/scripts/services/arpwatch @@ -308,10 +305,12 @@ usr/share/logwatch/scripts/services/scsi #usr/share/logwatch/scripts/services/spamassassin usr/share/logwatch/scripts/services/sshd usr/share/logwatch/scripts/services/sshd2 +#usr/share/logwatch/scripts/services/sssd #usr/share/logwatch/scripts/services/stunnel usr/share/logwatch/scripts/services/sudo #usr/share/logwatch/scripts/services/syslog-ng usr/share/logwatch/scripts/services/syslogd +#usr/share/logwatch/scripts/services/systemd #usr/share/logwatch/scripts/services/tac_acc #usr/share/logwatch/scripts/services/tivoli-smc #usr/share/logwatch/scripts/services/up2date diff --git a/lfs/logwatch b/lfs/logwatch index 7144d07..9f9a0db 100644 --- a/lfs/logwatch +++ b/lfs/logwatch @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2015 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2017 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 7.4.1 +VER = 7.4.3 THISAPP = logwatch-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = a0c3d8721f877bdcd4a9089eb1b4691b +$(DL_FILE)_MD5 = 22bd22841caa45f12c605abc3e0c2b09 install : $(TARGET) diff --git a/src/misc-progs/ipsecctrl.c b/src/misc-progs/ipsecctrl.c index 7499e94..2047536 100644 --- a/src/misc-progs/ipsecctrl.c +++ b/src/misc-progs/ipsecctrl.c @@ -173,6 +173,9 @@ void turn_connection_off (char *name) { // Reload, so the connection is dropped. ipsec_reload(); + + // Reload the IPsec block chain + safe_system("/usr/lib/firewall/ipsec-block >/dev/null"); } int main(int argc, char *argv[]) { hooks/post-receive -- IPFire 2.x development tree