From patchwork Wed Sep 16 18:44:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Fischer X-Patchwork-Id: 3469 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Bs8Cq5Nt6z3x3W for ; Wed, 16 Sep 2020 18:44:55 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Bs8Cp3w8rzyw; Wed, 16 Sep 2020 18:44:54 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Bs8Cn5VDXz2xqS; Wed, 16 Sep 2020 18:44:53 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Bs8Cm4sFgz2xX9 for ; Wed, 16 Sep 2020 18:44:52 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Bs8Cl5tcZz56 for ; Wed, 16 Sep 2020 18:44:51 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1600281891; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=Zy4sMhKuPE+7XYLmA3PeWKpDfijnyOppMbyaigvNDjQ=; b=HZgOeknZyHM7cJATAM2ElclM12H1SeLJLjQd8pnv7SafHgpZMcgww9rQezNLSfSPDff886 FMwx00zF59BDaWBA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1600281891; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=Zy4sMhKuPE+7XYLmA3PeWKpDfijnyOppMbyaigvNDjQ=; b=e02VAQ4nG3aGbzxixjpfuf/ofGTzCm8oMpWXbQMhG9m7hIUKgE0ZRPhG7NRj72wIwhXMJ3 a+O5HH3zxJbThv9J8ROL+FAa99J8etvGNsqeGH2EmRZX/y+GFyDr0hqWGDpe5rGb+wW4yw LhG0Gwwuy8M680TRBWYUn2TPzkA4jXQAbIaw35SguyGrkFRaVhgmKpiSd6nhkVS8CGSGGM gwjbz8RFK7WFkTPTA8h7r4kVSU97q9F/TmeabLqQsV7yn+RMiYcb+VszzC5gFoXP4pN8qP jzjXxKOQNuASvIiszo4jUXCMkvkBPGyEq/s3XnbZWk7xIj6Da8FNxqAoS5f1zw== From: Matthias Fischer To: development@lists.ipfire.org Subject: [PATCH] logwatch: Added upstream patch for Bug #12242 Date: Wed, 16 Sep 2020 20:44:45 +0200 Message-Id: <20200916184445.1998-1-matthias.fischer@ipfire.org> Authentication-Results: mail01.ipfire.org; auth=pass smtp.mailfrom=matthias.fischer@ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" 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 --- lfs/logwatch | 1 + ...logwatch-7.5.4-dhcpd_reuse_lease_entries.patch | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 src/patches/logwatch/logwatch-7.5.4-dhcpd_reuse_lease_entries.patch 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 = ) { + ($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+//) {