[git.ipfire.org] IPFire 2.x development tree branch, next, updated. af94be24fea1ec1bcd1605034bd2bb5b4f5ee53c

[Michael Tremer <git@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 4013 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  af94be24fea1ec1bcd1605034bd2bb5b4f5ee53c (commit)
       via  5e11ef0f67f6baf9bbcb4e20f0987044397f5862 (commit)
      from  8a2105b2844fdb4b2306a0a27553f01842795535 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit af94be24fea1ec1bcd1605034bd2bb5b4f5ee53c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Oct 28 11:55:48 2020 +0000

    core153: Ship logwatch
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 5e11ef0f67f6baf9bbcb4e20f0987044397f5862
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date:   Wed Sep 16 20:44:45 2020 +0200

    logwatch: Added upstream patch for Bug #12242
    
    Added upstream patch from:
    
    https://sourceforge.net/p/logwatch/mailman/message/37106642/
    
    and
    
    https://sourceforge.net/p/logwatch/mailman/message/37106883/
    
    Fixes the display of "Unknown Entries: reuse_lease: ... " in dhpcd-logs.
    
    Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 .../{oldcore/111 => core/153}/filelists/logwatch          |  0
 lfs/logwatch                                              |  1 +
 .../logwatch-7.5.4-dhcpd_reuse_lease_entries.patch        | 15 +++++++++++++++
 3 files changed, 16 insertions(+)
 copy config/rootfiles/{oldcore/111 => core/153}/filelists/logwatch (100%)
 create mode 100644 src/patches/logwatch/logwatch-7.5.4-dhcpd_reuse_lease_entries.patch

Difference in files:
diff --git a/config/rootfiles/core/153/filelists/logwatch b/config/rootfiles/core/153/filelists/logwatch
new file mode 120000
index 000000000..f14eabda9
--- /dev/null
+++ b/config/rootfiles/core/153/filelists/logwatch
@@ -0,0 +1 @@
+../../../common/logwatch
\ No newline at end of file
diff --git a/lfs/logwatch b/lfs/logwatch
index 509201743..abf1ba02f 100644
--- a/lfs/logwatch
+++ b/lfs/logwatch
@@ -73,6 +73,7 @@ $(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) && chmod 755 install_logwatch.sh
 	cd $(DIR_APP) && yes "" | ./install_logwatch.sh
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
new file mode 100644
index 000000000..a66170ae5
--- /dev/null
+++ b/src/patches/logwatch/logwatch-7.5.4-dhcpd_reuse_lease_entries.patch
@@ -0,0 +1,15 @@
+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+//) {


hooks/post-receive
--
IPFire 2.x development tree