From mboxrd@z Thu Jan  1 00:00:00 1970
From: Matthias Fischer <matthias.fischer@ipfire.org>
To: development@lists.ipfire.org
Subject:
 [PATCH] logwatch: Disable iptables output in summary.dat, fixes #12533
Date: Thu, 26 Nov 2020 19:27:33 +0100
Message-ID: <20201126182733.1116-1-matthias.fischer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6273311427700242426=="
List-Id: <development.lists.ipfire.org>

--===============6273311427700242426==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
---
 lfs/logwatch                                       |  1 +
 .../logwatch/logwatch-7.5.4-disable_iptables.patch | 14 ++++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 src/patches/logwatch/logwatch-7.5.4-disable_iptables.patch

diff --git a/lfs/logwatch b/lfs/logwatch
index abf1ba02f..7aa145121 100644
--- a/lfs/logwatch
+++ b/lfs/logwatch
@@ -74,6 +74,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
=20
 	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
=20
 	@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
index 000000000..8ad0c3b3d
--- /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 =3D "-eximstats"      # Prevents execution of eximstats service, wh=
ich
+                             # is a wrapper for the eximstats program.
++
++# Disabled: 'iptables'
++Service =3D "-iptables"
++
+ # If you only cared about FTP messages, you could use these 2 lines
+ # instead of the above:
+ #Service =3D ftpd-messages   # Processes ftpd messages in /var/log/messages
--=20
2.18.0


--===============6273311427700242426==--