For details see: https://build.opensuse.org/package/view_file/server:monitoring/logwatch/Chan...

Plus: deleted no longer need dhcpd-patch.

Signed-off-by: Matthias Fischer matthias.fischer@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_entries.patch

diff --git a/lfs/logwatch b/lfs/logwatch index 0ad9a83f5..501903eda 100644 --- a/lfs/logwatch +++ b/lfs/logwatch @@ -24,7 +24,7 @@

include Config

-VER = 7.5.4 +VER = 7.5.5

THISAPP = logwatch-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 47b35a8e5efc415b4a775415255b8d1f +$(DL_FILE)_MD5 = b658e4db27d905151396ecadcbcb24b1

install : $(TARGET)

@@ -73,7 +73,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && sed -e "s/^TEMPDIR=.*/TEMPDIR="/tmp"/g" -i install_logwatch.sh

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

diff --git a/src/patches/logwatch/logwatch-7.5.4-dhcpd_reuse_lease_entries.patch 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 = <STDIN>) { - ($line =~ /^Solicit message from/) or - ($line =~ /^Sending Advertise to/) or - ($line =~ /^pool [0-9a-f]+ /) or -- ($line =~ /^[^ ]* file: /) -+ ($line =~ /^[^ ]* file: /) or -+ ($line =~ /^reuse_lease: lease age \d+ (secs) under \d+% threshold, reply with unaltered, existing lease for/) or -+ 0 # noop, but makes diffs easier when appending ignore statements - ) { - # Ignore these lines - } elsif ($line =~ s/Listening on\s+//) {