[gentoo-commits] repo/gentoo:master commit in: net-mail/amavis-logwatch/
commit: 0951fc094d0db0eec8676923e38bd2f151a20787
Author: Michael Orlitzky gentoo org>
AuthorDate: Wed Nov 15 00:11:21 2023 +
Commit: Michael Orlitzky gentoo org>
CommitDate: Wed Nov 15 00:24:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0951fc09
net-mail/amavis-logwatch: update HOMEPAGE, SRC_URI (http -> https)
Signed-off-by: Michael Orlitzky gentoo.org>
net-mail/amavis-logwatch/amavis-logwatch-1.51.04.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/net-mail/amavis-logwatch/amavis-logwatch-1.51.04.ebuild
b/net-mail/amavis-logwatch/amavis-logwatch-1.51.04.ebuild
index fcb4e13709c5..4b7091ba21f2 100644
--- a/net-mail/amavis-logwatch/amavis-logwatch-1.51.04.ebuild
+++ b/net-mail/amavis-logwatch/amavis-logwatch-1.51.04.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DESCRIPTION="A log analyzer for amavisd-new"
-HOMEPAGE="http://michael.orlitzky.com/code/amavis-logwatch.xhtml;
-SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.xz;
+HOMEPAGE="https://michael.orlitzky.com/code/amavis-logwatch.xhtml;
+SRC_URI="https://michael.orlitzky.com/code/releases/${P}.tar.xz;
LICENSE="MIT"
SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: net-mail/amavis-logwatch/files/, net-mail/amavis-logwatch/
commit: 423b051601ba365d33b9da6d09c5546ecb0fdbc5
Author: Michael Orlitzky gentoo org>
AuthorDate: Tue Jun 7 20:15:38 2022 +
Commit: Michael Orlitzky gentoo org>
CommitDate: Tue Jun 7 20:16:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=423b0516
net-mail/amavis-logwatch: remove old v1.51.03 and its patches.
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Orlitzky gentoo.org>
net-mail/amavis-logwatch/Manifest | 1 -
.../amavis-logwatch-1.51.03-r5.ebuild | 51 --
.../files/SANITIZED-NULL-bytes-messages.patch | 34 ---
.../files/file-libmagic-errors.patch | 35 ---
.../files/handle-clamd-select-failed.patch | 38
.../files/ignore-all-sd_notify-lines.patch | 33 --
.../ignore-amavis-startup-notifications.patch | 31 -
.../files/ignore-utf8smtp-lines.patch | 32 --
.../files/no-pid_file-configured.patch | 27
.../files/redundant-argument-to-sprintf.patch | 48
.../files/unchecked-encrypted.patch| 41 -
.../files/unescaped-left-brace.patch | 38
.../amavis-logwatch/files/will-bind-to-lines.patch | 29
13 files changed, 438 deletions(-)
diff --git a/net-mail/amavis-logwatch/Manifest
b/net-mail/amavis-logwatch/Manifest
index 44094c53ca96..e51474a8f5d9 100644
--- a/net-mail/amavis-logwatch/Manifest
+++ b/net-mail/amavis-logwatch/Manifest
@@ -1,2 +1 @@
-DIST amavis-logwatch-1.51.03.tgz 87304 BLAKE2B
08b49d6f67e406edee062659c6de0a2c5823286bc24db35030c2b63bc3f0a06617eecdcf0da7f1f66d8eda8f9743254aa752ada82a9963bfac76a1a467503344
SHA512
27338abf676f05ec77e3ffb65a1f9ab5274bf8de3ab65fa29d4584ed6fdeedcb85e9e95b124549afdc3fc47780540c1790fa8b273ee296fbd44378d4da450db5
DIST amavis-logwatch-1.51.04.tar.xz 66036 BLAKE2B
da2ae91db65586497e5e5bf53b94f8eab84f26ebbad26f563d14ff11960d5c3bd2e046f0a056c28c53c5ce40c6193a812abb4f93db5d7a18747c40444b954d3f
SHA512
aec2f6ccc1af7744364e734e2893adc68e034bfab8c9f96bd32e74c6c947c1b39faef2d442d32e50f2578fbc4687dfd2b339856624330aef64ae6cf4e408456f
diff --git a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r5.ebuild
b/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r5.ebuild
deleted file mode 100644
index 17b9ad2d5afe..
--- a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A log analyzer for amavisd-new"
-HOMEPAGE="http://logreporters.sourceforge.net/;
-SRC_URI="mirror://sourceforge/logreporters/${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-lang/perl"
-
-PATCHES=(
- "${FILESDIR}/unescaped-left-brace.patch"
- "${FILESDIR}/redundant-argument-to-sprintf.patch"
- "${FILESDIR}/ignore-amavis-startup-notifications.patch"
- "${FILESDIR}/ignore-utf8smtp-lines.patch"
- "${FILESDIR}/unchecked-encrypted.patch"
- "${FILESDIR}/file-libmagic-errors.patch"
- "${FILESDIR}/ignore-all-sd_notify-lines.patch"
- "${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() {
- default
- # Replace the default config file location with ours.
- local cfg_default='/usr/local/etc/${progname_prefix}-logwatch.conf'
- local cfg_gentoo='/etc/${progname_prefix}-logwatch.conf';
- sed -i "s~${cfg_default}~${cfg_gentoo}~" ${PN} \
- || die 'failed to update the default config location'
-}
-
-src_compile() {
- # The default make target just outputs instructions. We don't want
- # the user to see these, so we avoid the default emake.
- :
-}
-
-src_install() {
- dodoc Bugs Changes README
- doman ${PN}.1
- dobin ${PN}
- insinto /etc
- doins ${PN}.conf
-}
diff --git a/net-mail/amavis-logwatch/files/SANITIZED-NULL-bytes-messages.patch
b/net-mail/amavis-logwatch/files/SANITIZED-NULL-bytes-messages.patch
deleted file mode 100644
index 0cc27f0bd226..
--- a/net-mail/amavis-logwatch/files/SANITIZED-NULL-bytes-messages.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 6d985d29d8be2b70ee7e4048a7ae95e2b4013f17 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky
-Date: Fri, 28 Dec 2018 10:01:56 -0500
-Subject: [PATCH 4/4] Ignore "SANITIZED ... NULL byte(s)" messages.
-
-Newer versions of the amavisd daemon sanitize NULL bytes within the
-body of a message for the benefit of Cyrus IMAP. When it does this,
-the number of bytes sanitized is logged. This is an informational
-message only as far as I can tell, so it's been added to the list of
[gentoo-commits] repo/gentoo:master commit in: net-mail/amavis-logwatch/
commit: 1ec7a2675042be4aca85f7a230895ce5baabd80b
Author: Michael Orlitzky gentoo org>
AuthorDate: Tue Jun 7 20:14:05 2022 +
Commit: Michael Orlitzky gentoo org>
CommitDate: Tue Jun 7 20:16:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ec7a267
net-mail/amavis-logwatch: maintainer stabilize v1.51.04.
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Orlitzky gentoo.org>
net-mail/amavis-logwatch/amavis-logwatch-1.51.04.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-mail/amavis-logwatch/amavis-logwatch-1.51.04.ebuild
b/net-mail/amavis-logwatch/amavis-logwatch-1.51.04.ebuild
index 3369b162db4f..fcb4e13709c5 100644
--- a/net-mail/amavis-logwatch/amavis-logwatch-1.51.04.ebuild
+++ b/net-mail/amavis-logwatch/amavis-logwatch-1.51.04.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -9,7 +9,7 @@ SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.xz;
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="dev-lang/perl"
[gentoo-commits] repo/gentoo:master commit in: net-mail/amavis-logwatch/
commit: 5c9f3dcab8ba32e338ae1645fea5c3157e96d11d
Author: Michael Orlitzky gentoo org>
AuthorDate: Fri Aug 6 15:07:57 2021 +
Commit: Michael Orlitzky gentoo org>
CommitDate: Fri Aug 6 15:15:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c9f3dca
net-mail/amavis-logwatch: new version 1.51.04.
I've finally forked this upstream and have released a v1.51.04 that
incorporates all of the patches in $FILESDIR, along with an additional
fix for the next release of amavis. New EAPI, minor ebuild cleanup, et
cetera.
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Michael Orlitzky gentoo.org>
net-mail/amavis-logwatch/Manifest | 1 +
.../amavis-logwatch/amavis-logwatch-1.51.04.ebuild | 37 ++
net-mail/amavis-logwatch/metadata.xml | 9 ++
3 files changed, 41 insertions(+), 6 deletions(-)
diff --git a/net-mail/amavis-logwatch/Manifest
b/net-mail/amavis-logwatch/Manifest
index 54b79b324ee..44094c53ca9 100644
--- a/net-mail/amavis-logwatch/Manifest
+++ b/net-mail/amavis-logwatch/Manifest
@@ -1 +1,2 @@
DIST amavis-logwatch-1.51.03.tgz 87304 BLAKE2B
08b49d6f67e406edee062659c6de0a2c5823286bc24db35030c2b63bc3f0a06617eecdcf0da7f1f66d8eda8f9743254aa752ada82a9963bfac76a1a467503344
SHA512
27338abf676f05ec77e3ffb65a1f9ab5274bf8de3ab65fa29d4584ed6fdeedcb85e9e95b124549afdc3fc47780540c1790fa8b273ee296fbd44378d4da450db5
+DIST amavis-logwatch-1.51.04.tar.xz 66036 BLAKE2B
da2ae91db65586497e5e5bf53b94f8eab84f26ebbad26f563d14ff11960d5c3bd2e046f0a056c28c53c5ce40c6193a812abb4f93db5d7a18747c40444b954d3f
SHA512
aec2f6ccc1af7744364e734e2893adc68e034bfab8c9f96bd32e74c6c947c1b39faef2d442d32e50f2578fbc4687dfd2b339856624330aef64ae6cf4e408456f
diff --git a/net-mail/amavis-logwatch/amavis-logwatch-1.51.04.ebuild
b/net-mail/amavis-logwatch/amavis-logwatch-1.51.04.ebuild
new file mode 100644
index 000..3369b162db4
--- /dev/null
+++ b/net-mail/amavis-logwatch/amavis-logwatch-1.51.04.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A log analyzer for amavisd-new"
+HOMEPAGE="http://michael.orlitzky.com/code/amavis-logwatch.xhtml;
+SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.xz;
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-lang/perl"
+
+src_prepare() {
+ default
+ # Replace the default config file location with ours.
+ local cfg_default='/usr/local/etc/${progname_prefix}-logwatch.conf'
+ local cfg_gentoo='/etc/${progname_prefix}-logwatch.conf';
+ sed -i "s~${cfg_default}~${cfg_gentoo}~" ${PN} \
+ || die 'failed to update the default config location'
+}
+
+src_compile() {
+ # The default make target just outputs instructions. We don't want
+ # the user to see these, so we avoid the default emake.
+ :
+}
+
+src_install() {
+ dodoc Bugs Changes README
+ doman ${PN}.1
+ dobin ${PN}
+ insinto /etc
+ doins ${PN}.conf
+}
diff --git a/net-mail/amavis-logwatch/metadata.xml
b/net-mail/amavis-logwatch/metadata.xml
index 04df72792f2..a0128bcd9ef 100644
--- a/net-mail/amavis-logwatch/metadata.xml
+++ b/net-mail/amavis-logwatch/metadata.xml
@@ -1,10 +1,7 @@
http://www.gentoo.org/dtd/metadata.dtd;>
-
- m...@gentoo.org
-
-
- logreporters
-
+
+m...@gentoo.org
+
[gentoo-commits] repo/gentoo:master commit in: net-mail/amavis-logwatch/
commit: 87dcacfd4af8dc98c606a5156b70bec626812bc9
Author: Michael Orlitzky gentoo org>
AuthorDate: Mon Apr 8 14:02:50 2019 +
Commit: Michael Orlitzky gentoo org>
CommitDate: Mon Apr 8 14:02:50 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87dcacfd
net-mail/amavis-logwatch: maintainer stabilize -r5 on x86/amd64.
This package is pure perl, and so would have been marked ALLARCHES.
Moreover, it requires a special type of log file (that contains
sensitive information) to test. So, I think it's reasonable for me as
the maintainer to stabilize it on amd64, and (per ALLARCHES), on x86.
Signed-off-by: Michael Orlitzky gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r5.ebuild
b/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r5.ebuild
index c7c607e6427..17b9ad2d5af 100644
--- a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r5.ebuild
+++ b/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/logreporters/${P}.tgz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="dev-lang/perl"
[gentoo-commits] repo/gentoo:master commit in: net-mail/amavis-logwatch/
commit: 4ecb24c9a9a296762c31492819816d24964cb6b1
Author: Michael Orlitzky gentoo org>
AuthorDate: Mon Apr 8 14:03:41 2019 +
Commit: Michael Orlitzky gentoo org>
CommitDate: Mon Apr 8 14:06:56 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ecb24c9
net-mail/amavis-logwatch: remove "unused" -r3 ebuild.
Signed-off-by: Michael Orlitzky gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
.../amavis-logwatch-1.51.03-r3.ebuild | 46 --
1 file changed, 46 deletions(-)
diff --git a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r3.ebuild
b/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r3.ebuild
deleted file mode 100644
index 79d11a94ef7..000
--- a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A log analyzer for amavisd-new"
-HOMEPAGE="http://logreporters.sourceforge.net/;
-SRC_URI="mirror://sourceforge/logreporters/${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-lang/perl"
-
-PATCHES=(
- "${FILESDIR}/unescaped-left-brace.patch"
- "${FILESDIR}/redundant-argument-to-sprintf.patch"
- "${FILESDIR}/ignore-amavis-startup-notifications.patch"
- "${FILESDIR}/ignore-utf8smtp-lines.patch"
- "${FILESDIR}/unchecked-encrypted.patch"
- "${FILESDIR}/file-libmagic-errors.patch"
-)
-
-src_prepare() {
- default
- # Replace the default config file location with ours.
- local cfg_default='/usr/local/etc/${progname_prefix}-logwatch.conf'
- local cfg_gentoo='/etc/${progname_prefix}-logwatch.conf';
- sed -i "s~${cfg_default}~${cfg_gentoo}~" ${PN} \
- || die 'failed to update the default config location'
-}
-
-src_compile() {
- # The default make target just outputs instructions. We don't want
- # the user to see these, so we avoid the default emake.
- :
-}
-
-src_install() {
- dodoc Bugs Changes README
- doman ${PN}.1
- dobin ${PN}
- insinto /etc
- doins ${PN}.conf
-}
[gentoo-commits] repo/gentoo:master commit in: net-mail/amavis-logwatch/, net-mail/amavis-logwatch/files/
commit: dec77c2cdea324c5a0c50cf7a29afbd81b2aad73
Author: Michael Orlitzky gentoo org>
AuthorDate: Sat Feb 16 16:24:24 2019 +
Commit: Michael Orlitzky gentoo org>
CommitDate: Sat Feb 16 16:31:58 2019 +
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 000..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
+
[gentoo-commits] repo/gentoo:master commit in: net-mail/amavis-logwatch/, net-mail/amavis-logwatch/files/
commit: 54fd9e745a555871dd59174a48b3dd4218f3d210
Author: Michael Orlitzky gentoo org>
AuthorDate: Fri Dec 28 15:19:37 2018 +
Commit: Michael Orlitzky gentoo org>
CommitDate: Fri Dec 28 15:22:34 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54fd9e74
net-mail/amavis-logwatch: new revision with patches for unmatched lines.
Signed-off-by: Michael Orlitzky gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
.../amavis-logwatch-1.51.03-r4.ebuild | 50 ++
.../files/SANITIZED-NULL-bytes-messages.patch | 34 +++
.../files/ignore-all-sd_notify-lines.patch | 33 ++
.../files/no-pid_file-configured.patch | 27
.../amavis-logwatch/files/will-bind-to-lines.patch | 29 +
5 files changed, 173 insertions(+)
diff --git a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r4.ebuild
b/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r4.ebuild
new file mode 100644
index 000..db425aabba8
--- /dev/null
+++ b/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A log analyzer for amavisd-new"
+HOMEPAGE="http://logreporters.sourceforge.net/;
+SRC_URI="mirror://sourceforge/logreporters/${P}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-lang/perl"
+
+PATCHES=(
+ "${FILESDIR}/unescaped-left-brace.patch"
+ "${FILESDIR}/redundant-argument-to-sprintf.patch"
+ "${FILESDIR}/ignore-amavis-startup-notifications.patch"
+ "${FILESDIR}/ignore-utf8smtp-lines.patch"
+ "${FILESDIR}/unchecked-encrypted.patch"
+ "${FILESDIR}/file-libmagic-errors.patch"
+ "${FILESDIR}/ignore-all-sd_notify-lines.patch"
+ "${FILESDIR}/no-pid_file-configured.patch"
+ "${FILESDIR}/will-bind-to-lines.patch"
+ "${FILESDIR}/SANITIZED-NULL-bytes-messages.patch"
+)
+
+src_prepare() {
+ default
+ # Replace the default config file location with ours.
+ local cfg_default='/usr/local/etc/${progname_prefix}-logwatch.conf'
+ local cfg_gentoo='/etc/${progname_prefix}-logwatch.conf';
+ sed -i "s~${cfg_default}~${cfg_gentoo}~" ${PN} \
+ || die 'failed to update the default config location'
+}
+
+src_compile() {
+ # The default make target just outputs instructions. We don't want
+ # the user to see these, so we avoid the default emake.
+ :
+}
+
+src_install() {
+ dodoc Bugs Changes README
+ doman ${PN}.1
+ dobin ${PN}
+ insinto /etc
+ doins ${PN}.conf
+}
diff --git a/net-mail/amavis-logwatch/files/SANITIZED-NULL-bytes-messages.patch
b/net-mail/amavis-logwatch/files/SANITIZED-NULL-bytes-messages.patch
new file mode 100644
index 000..0cc27f0bd22
--- /dev/null
+++ b/net-mail/amavis-logwatch/files/SANITIZED-NULL-bytes-messages.patch
@@ -0,0 +1,34 @@
+From 6d985d29d8be2b70ee7e4048a7ae95e2b4013f17 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky
+Date: Fri, 28 Dec 2018 10:01:56 -0500
+Subject: [PATCH 4/4] Ignore "SANITIZED ... NULL byte(s)" messages.
+
+Newer versions of the amavisd daemon sanitize NULL bytes within the
+body of a message for the benefit of Cyrus IMAP. When it does this,
+the number of bytes sanitized is logged. This is an informational
+message only as far as I can tell, so it's been added to the list of
+messages to ignore.
+---
+ amavis-logwatch | 6 ++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/amavis-logwatch b/amavis-logwatch
+index 250a6ba..044c94d 100644
+--- a/amavis-logwatch
b/amavis-logwatch
+@@ -2052,6 +2052,12 @@ sub create_ignore_list() {
+# describe what is being sent to the systemd notification socket,
+# if one exists.
+push @ignore_list_final, qr/^sd_notify( \(no socket\))?:/;
++
++ # In amavisd-new-2.11.0-rc1 and later, amavis will replace any null
++ # bytes that it finds in the body of a message with a "modified
++ # UTF-8" encoded null. The number of times it does this is then
++ # logged with the following message.
++ push @ignore_list_final, qr/^smtp forwarding: SANITIZED (\d+) NULL
byte\(s\)/;
+ }
+
+ # Notes:
+--
+2.19.2
+
diff --git a/net-mail/amavis-logwatch/files/ignore-all-sd_notify-lines.patch
b/net-mail/amavis-logwatch/files/ignore-all-sd_notify-lines.patch
new file mode 100644
index 000..f3ce1d1091a
--- /dev/null
+++ b/net-mail/amavis-logwatch/files/ignore-all-sd_notify-lines.patch
@@ -0,0 +1,33 @@
+From 653f988ba163c74f3ebdb6e53f57db9d8e569b1f Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky
+Date: Fri, 28 Dec 2018 09:23:52 -0500
+Subject: [PATCH 1/4] Ignore all "sd_notify" lines.
+
+Lines beginning with either "sd_notify:" or "sd_notify (no socket):"
+contain information about what is being sent to the systemd
+notification socket, if one exists. One such line was already
[gentoo-commits] repo/gentoo:master commit in: net-mail/amavis-logwatch/
commit: 6f32221df6aadac6f35a3ce8f95153f751d9a9cb
Author: Michael Orlitzky gentoo org>
AuthorDate: Tue Oct 24 14:41:27 2017 +
Commit: Michael Orlitzky gentoo org>
CommitDate: Tue Oct 24 14:41:27 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f32221d
net-mail/amavis-logwatch: stabilize -r3 on amd64 and x86.
Package-Manager: Portage-2.3.8, Repoman-2.3.3
net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r3.ebuild
b/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r3.ebuild
index e312caecfdf..79d11a94ef7 100644
--- a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r3.ebuild
+++ b/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/logreporters/${P}.tgz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="dev-lang/perl"
[gentoo-commits] repo/gentoo:master commit in: net-mail/amavis-logwatch/
commit: 36eaf06ae04dcfc15012163b8d8016f60a369608
Author: Michael Orlitzky gentoo org>
AuthorDate: Tue Oct 24 14:42:07 2017 +
Commit: Michael Orlitzky gentoo org>
CommitDate: Tue Oct 24 14:42:07 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36eaf06a
net-mail/amavis-logwatch: remove unused amavis-logwatch-1.51.03.ebuild.
Package-Manager: Portage-2.3.8, Repoman-2.3.3
.../amavis-logwatch/amavis-logwatch-1.51.03.ebuild | 36 --
1 file changed, 36 deletions(-)
diff --git a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03.ebuild
b/net-mail/amavis-logwatch/amavis-logwatch-1.51.03.ebuild
deleted file mode 100644
index f8eb3efd3b4..000
--- a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A log analyzer for amavisd-new"
-HOMEPAGE="http://logreporters.sourceforge.net/;
-SRC_URI="mirror://sourceforge/logreporters/${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-lang/perl"
-
-src_prepare() {
- # Replace the default config file location with ours.
- local cfg_default='/usr/local/etc/${progname_prefix}-logwatch.conf'
- local cfg_gentoo='/etc/${progname_prefix}-logwatch.conf';
- sed -i "s~${cfg_default}~${cfg_gentoo}~" ${PN} \
- || die 'failed to update the default config location'
-}
-
-src_compile() {
- # The default make target just outputs instructions. We don't want
- # the user to see these, so we avoid the default emake.
- :
-}
-
-src_install() {
- dodoc Bugs Changes README
- doman ${PN}.1
- dobin ${PN}
- insinto /etc
- doins ${PN}.conf
-}
[gentoo-commits] repo/gentoo:master commit in: net-mail/amavis-logwatch/, net-mail/amavis-logwatch/files/
commit: ae1126934d8ed86f82d4c3f1e07a2c03f208ac26
Author: Michael Orlitzky gentoo org>
AuthorDate: Thu Sep 7 11:42:37 2017 +
Commit: Michael Orlitzky gentoo org>
CommitDate: Thu Sep 7 11:42:55 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae112693
net-mail/amavis-logwatch: new revision with yet another bugfix patch.
Package-Manager: Portage-2.3.6, Repoman-2.3.1
...r2.ebuild => amavis-logwatch-1.51.03-r3.ebuild} | 1 +
.../files/file-libmagic-errors.patch | 35 ++
2 files changed, 36 insertions(+)
diff --git a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r2.ebuild
b/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r3.ebuild
similarity index 96%
rename from net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r2.ebuild
rename to net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r3.ebuild
index 3fa4278da7a..e312caecfdf 100644
--- a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r2.ebuild
+++ b/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r3.ebuild
@@ -19,6 +19,7 @@ PATCHES=(
"${FILESDIR}/ignore-amavis-startup-notifications.patch"
"${FILESDIR}/ignore-utf8smtp-lines.patch"
"${FILESDIR}/unchecked-encrypted.patch"
+ "${FILESDIR}/file-libmagic-errors.patch"
)
src_prepare() {
diff --git a/net-mail/amavis-logwatch/files/file-libmagic-errors.patch
b/net-mail/amavis-logwatch/files/file-libmagic-errors.patch
new file mode 100644
index 000..2a28c4ee623
--- /dev/null
+++ b/net-mail/amavis-logwatch/files/file-libmagic-errors.patch
@@ -0,0 +1,35 @@
+From 63421f1c92403149be838c64ebb731778c148dde Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky
+Date: Thu, 7 Sep 2017 07:36:39 -0400
+Subject: [PATCH 1/1] Ignore errors from the File::LibMagic describe_filename
+ function.
+
+Newer versions of amavisd-new can make use of the File::LibMagic
+library (as opposed to the "file" executable) to get information about
+attachments. Using the library should be faster, but when it fails, it
+does so in a novel way:
+
+ (02859-21) File::LibMagic::describe_filename failed on p003: libmagic
+ JPEG image data, Exif standard: [TIFF image data, big-endian,...
+
+This commit adds such lines to the global ignore list, since they
+don't provide us with any useful information.
+---
+ amavis-logwatch | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/amavis-logwatch b/amavis-logwatch
+index 448de3a..ac93cbc 100644
+--- a/amavis-logwatch
b/amavis-logwatch
+@@ -2033,6 +2033,7 @@ sub create_ignore_list() {
+
+push @ignore_list_final, qr/^Inserting header field: X-Amavis-Hold: /;
+push @ignore_list_final, qr/^Decoding of .* failed, leaving it unpacked: /;
++ push @ignore_list_final, qr/^File::LibMagic::describe_filename failed on
p\d+: /;
+
+ # various forms of "Using ..."
+ # more specific, interesting variants already captured: search "Using"
+--
+2.13.0
+
[gentoo-commits] repo/gentoo:master commit in: net-mail/amavis-logwatch/, net-mail/amavis-logwatch/files/
commit: e8574b3cd2fbda95678d9f3c0bb8e11ded7ba0a5
Author: Michael Orlitzky gentoo org>
AuthorDate: Wed Sep 6 13:24:34 2017 +
Commit: Michael Orlitzky gentoo org>
CommitDate: Wed Sep 6 13:24:58 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8574b3c
net-mail/amavis-logwatch: new revision with another bugfix patch.
Package-Manager: Portage-2.3.6, Repoman-2.3.1
...r1.ebuild => amavis-logwatch-1.51.03-r2.ebuild} | 1 +
.../files/unchecked-encrypted.patch| 41 ++
2 files changed, 42 insertions(+)
diff --git a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r1.ebuild
b/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r2.ebuild
similarity index 96%
rename from net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r1.ebuild
rename to net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r2.ebuild
index 891d142b26f..3fa4278da7a 100644
--- a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r1.ebuild
+++ b/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r2.ebuild
@@ -18,6 +18,7 @@ PATCHES=(
"${FILESDIR}/redundant-argument-to-sprintf.patch"
"${FILESDIR}/ignore-amavis-startup-notifications.patch"
"${FILESDIR}/ignore-utf8smtp-lines.patch"
+ "${FILESDIR}/unchecked-encrypted.patch"
)
src_prepare() {
diff --git a/net-mail/amavis-logwatch/files/unchecked-encrypted.patch
b/net-mail/amavis-logwatch/files/unchecked-encrypted.patch
new file mode 100644
index 000..33c2214a2d0
--- /dev/null
+++ b/net-mail/amavis-logwatch/files/unchecked-encrypted.patch
@@ -0,0 +1,41 @@
+From e9f83dde1b241ce449264db7a517124bb115dd99 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky
+Date: Wed, 6 Sep 2017 09:19:42 -0400
+Subject: [PATCH 1/1] Catch mail that is passed UNCHECKED-ENCRYPTED.
+
+Some encrypted mail can pass through the system with a log line like,
+
+ (01495-17) Passed UNCHECKED-ENCRYPTED {RelayedTaggedInbound}, ...
+
+These were unmatched, because the "-ENCRYPTED" suffix is new. One
+regular expression and a dictionary have been updated to catch those
+lines and dump them into the "unchecked" bin with the rest of the
+UNCHECKED lines.
+---
+ amavis-logwatch | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/amavis-logwatch b/amavis-logwatch
+index deb9146..448de3a 100644
+--- a/amavis-logwatch
b/amavis-logwatch
+@@ -1799,6 +1799,7 @@ my %ccatmajor_to_sectkey = (
+'INFECTED'=> 'malware',
+'BANNED' => 'bannedname',
+'UNCHECKED' => 'unchecked',
++ 'UNCHECKED-ENCRYPTED' => 'unchecked',
+'SPAM'=> 'spam',
+'SPAMMY' => 'spammy',
+'BAD-HEADER' => 'badheader',
+@@ -2295,7 +2296,7 @@ while (<>) {
+ #XXX elsif (($action, $key, $ip, $from, $to) = ( $p1 =~ /^(?:Virus
found - quarantined|(?:(Passed|Blocked) )?INFECTED) \(([^\)]+)\),[A-Z .]*(?:
\[($re_IP)\])?(?: \[$re_IP\])* [<(]([^>)]*)[>)] -> [(<]([^(<]+)[(>]/o ))
+
+ # the first IP is the envelope sender.
+- if ($p1 !~ /^(CLEAN|SPAM(?:MY)?|INFECTED \(.*?\)|BANNED
\(.*?\)|BAD-HEADER(?:-\d)?|UNCHECKED|MTA-BLOCKED|OVERSIZED|OTHER|TEMPFAIL)(?:
\{[^}]+})?, ([^[]+ )?(?:([^<]+) )?[<(](.*?)[>)] -> ([(<].*?[)>]), (?:.*Hits:
([-+.\d]+))(?:.* size: (\d+))?(?:.* autolearn=(\w+))?/) {
++ if ($p1 !~ /^(CLEAN|SPAM(?:MY)?|INFECTED \(.*?\)|BANNED
\(.*?\)|BAD-HEADER(?:-\d)?|UNCHECKED|UNCHECKED-ENCRYPTED|MTA-BLOCKED|OVERSIZED|OTHER|TEMPFAIL)(?:
\{[^}]+})?, ([^[]+ )?(?:([^<]+) )?[<(](.*?)[>)] -> ([(<].*?[)>]), (?:.*Hits:
([-+.\d]+))(?:.* size: (\d+))?(?:.* autolearn=(\w+))?/) {
+ inc_unmatched('passblock');
+ next;
+ }
+--
+2.13.0
+
[gentoo-commits] repo/gentoo:master commit in: net-mail/amavis-logwatch/, net-mail/amavis-logwatch/files/
commit: 7ee7c4de8da575001f798e59a0914ace2d02e4e0
Author: Michael Orlitzky gentoo org>
AuthorDate: Thu Aug 24 13:14:42 2017 +
Commit: Michael Orlitzky gentoo org>
CommitDate: Thu Aug 24 13:16:21 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ee7c4de
net-mail/amavis-logwatch: new revision with some bugfix patches.
Upstream development has stalled for this package, so we now include a
few patches needed to support modern versions of perl and amavisd-new.
Package-Manager: Portage-2.3.6, Repoman-2.3.1
.../amavis-logwatch-1.51.03-r1.ebuild | 44
.../ignore-amavis-startup-notifications.patch | 31 ++
.../files/ignore-utf8smtp-lines.patch | 32 +++
.../files/redundant-argument-to-sprintf.patch | 48 ++
.../files/unescaped-left-brace.patch | 38 +
5 files changed, 193 insertions(+)
diff --git a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r1.ebuild
b/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r1.ebuild
new file mode 100644
index 000..891d142b26f
--- /dev/null
+++ b/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A log analyzer for amavisd-new"
+HOMEPAGE="http://logreporters.sourceforge.net/;
+SRC_URI="mirror://sourceforge/logreporters/${P}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-lang/perl"
+
+PATCHES=(
+ "${FILESDIR}/unescaped-left-brace.patch"
+ "${FILESDIR}/redundant-argument-to-sprintf.patch"
+ "${FILESDIR}/ignore-amavis-startup-notifications.patch"
+ "${FILESDIR}/ignore-utf8smtp-lines.patch"
+)
+
+src_prepare() {
+ default
+ # Replace the default config file location with ours.
+ local cfg_default='/usr/local/etc/${progname_prefix}-logwatch.conf'
+ local cfg_gentoo='/etc/${progname_prefix}-logwatch.conf';
+ sed -i "s~${cfg_default}~${cfg_gentoo}~" ${PN} \
+ || die 'failed to update the default config location'
+}
+
+src_compile() {
+ # The default make target just outputs instructions. We don't want
+ # the user to see these, so we avoid the default emake.
+ :
+}
+
+src_install() {
+ dodoc Bugs Changes README
+ doman ${PN}.1
+ dobin ${PN}
+ insinto /etc
+ doins ${PN}.conf
+}
diff --git
a/net-mail/amavis-logwatch/files/ignore-amavis-startup-notifications.patch
b/net-mail/amavis-logwatch/files/ignore-amavis-startup-notifications.patch
new file mode 100644
index 000..4dd019186e4
--- /dev/null
+++ b/net-mail/amavis-logwatch/files/ignore-amavis-startup-notifications.patch
@@ -0,0 +1,31 @@
+From 15bf4096ea496a28210e2f4c1f34ab28b413566a Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky
+Date: Thu, 24 Aug 2017 08:52:18 -0400
+Subject: [PATCH 3/4] Ignore amavisd-new "starting child processes"
+ notifications.
+
+Newer versions of amavisd-new log the following constantly:
+
+ sd_notify (no socket): STATUS=Starting child process(es), ready for work.
+
+It's of no use to us, so add it to the global "ignore" list.
+---
+ amavis-logwatch | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/amavis-logwatch b/amavis-logwatch
+index 1aab787..06b60c8 100644
+--- a/amavis-logwatch
b/amavis-logwatch
+@@ -2044,6 +2044,8 @@ sub create_ignore_list() {
+ # unanchored
+push @ignore_list_final, qr/\bRUSAGE\b/;
+push @ignore_list_final, qr/: Sending .* to UNIX socket/;
++
++ push @ignore_list_final, qr/sd_notify \(no socket\): STATUS=Starting child
process\(es\), ready for work./
+ }
+
+ # Notes:
+--
+2.13.0
+
diff --git a/net-mail/amavis-logwatch/files/ignore-utf8smtp-lines.patch
b/net-mail/amavis-logwatch/files/ignore-utf8smtp-lines.patch
new file mode 100644
index 000..83fd4cb80a4
--- /dev/null
+++ b/net-mail/amavis-logwatch/files/ignore-utf8smtp-lines.patch
@@ -0,0 +1,32 @@
+From a8dac25fe398e42abdb89b85b1435d52386827b4 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky
+Date: Thu, 24 Aug 2017 09:05:04 -0400
+Subject: [PATCH 4/4] Ignore UTF8SMTP lines.
+
+Lines that look like,
+
+ UTF8SMTP :10024 /var/...: ->
+ BODY=8BITMIME SMTPUTF8 Received: from mx.example.com ([127.0.0.1]) by...
+
+were previously unmatched because of the relatively-new "UTF8SMTP".
+Similar lines that have "ESMTP" instead of "UTF8SMTP" are already
+ignored, so it makes sense to ignore the "UTF8SMTP" lines too.
+---
+ amavis-logwatch | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/amavis-logwatch b/amavis-logwatch
+index 06b60c8..deb9146 100644
+--- a/amavis-logwatch
b/amavis-logwatch
+@@ -2132,6 +2132,7 @@ while (<>) {
+ or ($p1 =~ /^SpamControl/)
+ or ($p1 =~ /^Perl/)
+ or ($p1 =~
