Re: [PATCH] logwatch: Update to 7.5.4

[Michael Tremer <michael.tremer@ipfire.org>]

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

Hi,

Did you develop this patch yourself or did it come from upstream?

-Michael

> On 13 Sep 2020, at 10:01, Matthias Fischer <matthias.fischer(a)ipfire.org> wrote:
> 
> Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
> ---
> lfs/logwatch                                      | 11 +++++++----
> .../logwatch-7.3.6-date_manip6.patch              |  0
> ...logwatch-7.5.4-dhcpd_reuse_lease_entries.patch | 15 +++++++++++++++
> 3 files changed, 22 insertions(+), 4 deletions(-)
> rename src/patches/{ => logwatch}/logwatch-7.3.6-date_manip6.patch (100%)
> create mode 100644 src/patches/logwatch/logwatch-7.5.4-dhcpd_reuse_lease_entries.patch
> 
> diff --git a/lfs/logwatch b/lfs/logwatch
> index a980b1b40..abf1ba02f 100644
> --- a/lfs/logwatch
> +++ b/lfs/logwatch
> @@ -1,7 +1,7 @@
> ###############################################################################
> #                                                                             #
> # IPFire.org - A linux based firewall                                         #
> -# Copyright (C) 2007-2019  IPFire Team  <info(a)ipfire.org>                     #
> +# Copyright (C) 2007-2020  IPFire Team  <info(a)ipfire.org>                     #
> #                                                                             #
> # This program is free software: you can redistribute it and/or modify        #
> # it under the terms of the GNU General Public License as published by        #
> @@ -24,7 +24,7 @@
> 
> include Config
> 
> -VER        = 7.5.3
> +VER        = 7.5.4
> 
> THISAPP    = logwatch-$(VER)
> DL_FILE    = $(THISAPP).tar.gz
> @@ -40,7 +40,7 @@ objects = $(DL_FILE)
> 
> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> 
> -$(DL_FILE)_MD5 = 8bcf3edc5a4687c8aad1b9c01e2be54b
> +$(DL_FILE)_MD5 = 47b35a8e5efc415b4a775415255b8d1f
> 
> install : $(TARGET)
> 
> @@ -71,7 +71,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> 	@$(PREBUILD)
> 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
> 	cd $(DIR_APP) && sed -e "s/^TEMPDIR=.*/TEMPDIR=\"\/tmp\"/g" -i install_logwatch.sh
> -	cd $(DIR_APP)/lib && patch < $(DIR_SRC)/src/patches/logwatch-7.3.6-date_manip6.patch
> +
> +	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-7.3.6-date_manip6.patch b/src/patches/logwatch/logwatch-7.3.6-date_manip6.patch
> similarity index 100%
> rename from src/patches/logwatch-7.3.6-date_manip6.patch
> rename to src/patches/logwatch/logwatch-7.3.6-date_manip6.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
> 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+//) {
> -- 
> 2.18.0
>