From patchwork Sun Jan 31 08:06:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Fischer X-Patchwork-Id: 3843 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) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4DT3Z83ZZpz3wy6 for ; Sun, 31 Jan 2021 08:06:40 +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 "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4DT3Z72P8mz195; Sun, 31 Jan 2021 08:06:39 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4DT3Z7197Hz2xy4; Sun, 31 Jan 2021 08:06:39 +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) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4DT3Z50grPz2xbT for ; Sun, 31 Jan 2021 08:06:37 +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) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4DT3Z34wDzzYC for ; Sun, 31 Jan 2021 08:06:35 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1612080395; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=srPE6vDlLNNSJ8H9z9clQQj3vKbmg46uWQKphjLwdDU=; b=jydHHb/VTimsDfaA0vDWF1PN75ECstOg0mEnTkKCcGg3POxCIpWstmAxeLDxh4YirhFt3b sXwCrpW4UOYmQVCQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1612080395; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=srPE6vDlLNNSJ8H9z9clQQj3vKbmg46uWQKphjLwdDU=; b=A9jDP9d/28oKI0TeTN9gvuTMWMpvUtDEHeyXxjNRp3ZsAQceQ7adHfcBpEAIgswW9mflGW 0aENAcUdUWkJVAqXAY6qMxIDC9xSr8eYqmHvyFr2FPm3x/qHkp7hlTsRbO4FQ2T2uZu7gd xtkKYJ+b/WvxXSArldI0yJ0FRLX0rM8tDAZlJPq7bC1O4xPdUmYs1oi7+pMFW0Cwjymre/ BOlqlKZhFt1YkcRg8GefdQLd7/gLv+921o2JOMGbRgOYPtQ+3bzutZ2ldGkZcaFN6DBYF/ nnPKkdF4He0FSyUcY2fGCSjSC2RyrqBQAJLp/XGhzdaklP520s20FcPI3fSMOA== From: Matthias Fischer To: development@lists.ipfire.org Subject: [PATCH] logwatch 7.5.5: Deleted no longer needed patch for clamav 0.103.0 Date: Sun, 31 Jan 2021 09:06:27 +0100 Message-Id: <20210131080627.20849-1-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" I've should have read the changelog from opensuse more thoroughly: ... 4a862fa [clamav] Ignore new "Activating the newly loaded database" message ... Sorry for the noise. Signed-off-by: Matthias Fischer --- lfs/logwatch | 1 - .../logwatch-7.5.4-clamav_fix_unmatch_entries.patch | 11 ----------- 2 files changed, 12 deletions(-) delete mode 100644 src/patches/logwatch/logwatch-7.5.4-clamav_fix_unmatch_entries.patch diff --git a/lfs/logwatch b/lfs/logwatch index 501903eda..8baaef2ce 100644 --- a/lfs/logwatch +++ b/lfs/logwatch @@ -74,7 +74,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) 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-disable_iptables.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/logwatch/logwatch-7.5.4-clamav_fix_unmatch_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-clamav_fix_unmatch_entries.patch b/src/patches/logwatch/logwatch-7.5.4-clamav_fix_unmatch_entries.patch deleted file mode 100644 index 10fb8afcf..000000000 --- a/src/patches/logwatch/logwatch-7.5.4-clamav_fix_unmatch_entries.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -U 3 a/scripts/services/clamav b/scripts/services/clamav ---- a/scripts/services/clamav Fri Sep 21 00:46:14 2020 -+++ b/scripts/services/clamav Mon Dec 25 09:26:26 2020 -@@ -77,6 +77,7 @@ - ( $ThisLine =~ /Bytecode: Security mode set to /) or - ( $ThisLine =~ /^No stats for Database check/ ) or - ( $ThisLine =~ /^Received \d+ file descriptor\(s\) from systemd\.$/) or -+ ( $ThisLine =~ /^Activating the newly loaded database.../ ) or - 0 # This line prevents blame shifting as lines are added above - ) { - # We do not care about these.