webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

logwatch: Update to 7.5.5

Browse Source 
For details see:
https://build.opensuse.org/package/view_file/server:monitoring/logwatch/ChangeLog?expand=1

Plus: deleted no longer need dhcpd-patch.

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Matthias Fischer
2021-01-30 13:44:54 +01:00
committed by Michael Tremer
parent 6106a465d7
commit bf2ff65e6c
2 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lfs/logwatch
View File

@@ -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

15
src/patches/logwatch/logwatch-7.5.4-dhcpd_reuse_lease_entries.patch
View File

@@ -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+//) {