logwatch: Disable iptables output in summary.dat, fixes #12533

This patch disables the output of 'iptables' in 'summary.dat' by
modifying '/usr/share/conf/logwatch.conf'.

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/lfs/logwatch b/lfs/logwatch
index abf1ba02f7780cfd46c5cbbc38e5c33b18fe996e..7aa1451219a9a1ace283b2d44d48abc14a759d7c 100644 (file)
--- a/lfs/logwatch
+++ b/lfs/logwatch
@@ -74,6 +74,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
        cd $(DIR_APP)/lib && patch < $(DIR_SRC)/src/patches/logwatch/logwatch-7.3.6-date_manip6.patch
        cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/logwatch/logwatch-7.5.4-dhcpd_reuse_lease_entries.patch
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/logwatch/logwatch-7.5.4-disable_iptables.patch
 
        @cd $(DIR_APP) && chmod 755 install_logwatch.sh
        cd $(DIR_APP) && yes "" | ./install_logwatch.sh

diff --git a/src/patches/logwatch/logwatch-7.5.4-disable_iptables.patch b/src/patches/logwatch/logwatch-7.5.4-disable_iptables.patch
new file mode 100644 (file)
index 0000000..8ad0c3b
--- /dev/null
+++ b/src/patches/logwatch/logwatch-7.5.4-disable_iptables.patch
@@ -0,0 +1,14 @@
+diff -U 3 a/conf/logwatch.conf b/conf/logwatch.conf
+--- a/conf/logwatch.conf       Thu Sep 19 01:58:55 2019
++++ b/conf/logwatch.conf       Thu Nov 26 18:46:12 2020
+@@ -94,6 +94,10 @@
+                             # prints useful system configuration info.
+ Service = "-eximstats"      # Prevents execution of eximstats service, which
+                             # is a wrapper for the eximstats program.
++
++# Disabled: 'iptables'
++Service = "-iptables"
++
+ # If you only cared about FTP messages, you could use these 2 lines
+ # instead of the above:
+ #Service = ftpd-messages   # Processes ftpd messages in /var/log/messages