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: Update to 7.5.5
Date: Sat, 30 Jan 2021 13:44:54 +0100
Message-ID: <20210130124454.1317-1-matthias.fischer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1108693207648126221=="
List-Id: <development.lists.ipfire.org>

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

For details see:
https://build.opensuse.org/package/view_file/server:monitoring/logwatch/Chang=
eLog?expand=3D1

Plus: deleted no longer need dhcpd-patch.

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
---
 lfs/logwatch                                      |  5 ++---
 ...logwatch-7.5.4-dhcpd_reuse_lease_entries.patch | 15 ---------------
 2 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 100644 src/patches/logwatch/logwatch-7.5.4-dhcpd_reuse_lease_ent=
ries.patch

diff --git a/lfs/logwatch b/lfs/logwatch
index 0ad9a83f5..501903eda 100644
--- a/lfs/logwatch
+++ b/lfs/logwatch
@@ -24,7 +24,7 @@
=20
 include Config
=20
-VER        =3D 7.5.4
+VER        =3D 7.5.5
=20
 THISAPP    =3D logwatch-$(VER)
 DL_FILE    =3D $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D 47b35a8e5efc415b4a775415255b8d1f
+$(DL_FILE)_MD5 =3D b658e4db27d905151396ecadcbcb24b1
=20
 install : $(TARGET)
=20
@@ -73,7 +73,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && sed -e "s/^TEMPDIR=3D.*/TEMPDIR=3D\"\/tmp\"/g" -i install_=
logwatch.sh
=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
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/logwatch/logwatch-7.5=
.4-clamav_fix_unmatch_entries.patch
=20
diff --git a/src/patches/logwatch/logwatch-7.5.4-dhcpd_reuse_lease_entries.pa=
tch b/src/patches/logwatch/logwatch-7.5.4-dhcpd_reuse_lease_entries.patch
deleted file mode 100644
index a66170ae5..000000000
--- a/src/patches/logwatch/logwatch-7.5.4-dhcpd_reuse_lease_entries.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/scripts/services/dhcpd b/scripts/services/dhcpd
-index 87312f7..bb5cd4c 100644
---- a/scripts/services/dhcpd
-+++ b/scripts/services/dhcpd
-@@ -79,7 +79,9 @@ while (my $line =3D <STDIN>) {
-       ($line =3D~ /^Solicit message from/) or
-       ($line =3D~ /^Sending Advertise to/) or
-       ($line =3D~ /^pool [0-9a-f]+ /) or
--      ($line =3D~ /^[^ ]* file: /)
-+      ($line =3D~ /^[^ ]* file: /) or
-+      ($line =3D~ /^reuse_lease: lease age \d+ \(secs\) under \d+\% thresho=
ld, reply with unaltered, existing lease for/) or
-+      0 # noop, but makes diffs easier when appending ignore statements
-       ) {
-       # Ignore these lines
-    } elsif ($line =3D~ s/Listening on\s+//) {
--=20
2.18.0


--===============1108693207648126221==--