From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3981B138334 for ; Sat, 16 Feb 2019 16:33:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1E987E08AA; Sat, 16 Feb 2019 16:33:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D9A58E08AA for ; Sat, 16 Feb 2019 16:33:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 61EC3335CDE for ; Sat, 16 Feb 2019 16:33:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9D502501 for ; Sat, 16 Feb 2019 16:32:59 +0000 (UTC) From: "Michael Orlitzky" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Orlitzky" Message-ID: <1550334718.dec77c2cdea324c5a0c50cf7a29afbd81b2aad73.mjo@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-mail/amavis-logwatch/, net-mail/amavis-logwatch/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r4.ebuild net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r5.ebuild net-mail/amavis-logwatch/files/handle-clamd-select-failed.patch X-VCS-Directories: net-mail/amavis-logwatch/files/ net-mail/amavis-logwatch/ X-VCS-Committer: mjo X-VCS-Committer-Name: Michael Orlitzky X-VCS-Revision: dec77c2cdea324c5a0c50cf7a29afbd81b2aad73 X-VCS-Branch: master Date: Sat, 16 Feb 2019 16:32:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d2587bea-c1c0-49f1-b1da-edd65341c4d3 X-Archives-Hash: 67ae483ddc34f07d285e85518f4046d9 commit: dec77c2cdea324c5a0c50cf7a29afbd81b2aad73 Author: Michael Orlitzky gentoo org> AuthorDate: Sat Feb 16 16:24:24 2019 +0000 Commit: Michael Orlitzky gentoo org> CommitDate: Sat Feb 16 16:31:58 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dec77c2c net-mail/amavis-logwatch: new revision with another custom patch. This -r5 adds handle-clamd-select-failed.patch, which allows the program to match those types of lines. Signed-off-by: Michael Orlitzky gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 ...r4.ebuild => amavis-logwatch-1.51.03-r5.ebuild} | 3 +- .../files/handle-clamd-select-failed.patch | 38 ++++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r4.ebuild b/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r5.ebuild similarity index 94% rename from net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r4.ebuild rename to net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r5.ebuild index db425aabba8..c7c607e6427 100644 --- a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r4.ebuild +++ b/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -24,6 +24,7 @@ PATCHES=( "${FILESDIR}/no-pid_file-configured.patch" "${FILESDIR}/will-bind-to-lines.patch" "${FILESDIR}/SANITIZED-NULL-bytes-messages.patch" + "${FILESDIR}/handle-clamd-select-failed.patch" ) src_prepare() { diff --git a/net-mail/amavis-logwatch/files/handle-clamd-select-failed.patch b/net-mail/amavis-logwatch/files/handle-clamd-select-failed.patch new file mode 100644 index 00000000000..83dad161e18 --- /dev/null +++ b/net-mail/amavis-logwatch/files/handle-clamd-select-failed.patch @@ -0,0 +1,38 @@ +From 869fa9d8b2113f50c3a97ef9f4a1f95171702be4 Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky +Date: Wed, 13 Feb 2019 11:25:33 -0500 +Subject: [PATCH 1/1] Catch "Select failed: Interrupted system call" entries + from clamd. + +When a select() call in clamd is interrupted, amavis logs the +following warning: + + ClamAV-clamd: Select failed: Interrupted system call at /usr/sbin/amavisd + line 8472, line 296., retrying (1) + +These are harmless in and of themselves, but we would like to classify +them as warnings. Currently they are unmatched. This commit adds a +pattern for them, moving them from the "Unmatched Entries" heading to +"Miscellaneous warnings" instead. Afterwards, the report looks like, + + 24 Miscellaneous warnings -------------------------------- + 2 ClamAV-clamd: Select failed: Interrupted system call +--- + amavis-logwatch | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/amavis-logwatch b/amavis-logwatch +index 044c94d..4c9b59f 100644 +--- a/amavis-logwatch ++++ b/amavis-logwatch +@@ -2817,6 +2817,7 @@ while (<>) { + ($p1 =~ /^TROUBLE/) or + ($p1 =~ /Can't (?:connect to UNIX|send to) socket/) or + ($p1 =~ /: Empty result from /) or ++ ($p1 =~ /: Select failed: Interrupted system call/) or + ($p1 =~ /: Error reading from socket: Connection reset by peer/) or + ($p1 =~ /open\(.*\): Permission denied/) or + ($p1 =~ /^_?WARN: /) or +-- +2.19.2 +