[gentoo-commits] repo/gentoo:master commit in: net-mail/postfix-logwatch/

2023-11-14 Thread Michael Orlitzky 
commit: a837955096562f7615b8a7c76245280e9f26c80d
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Wed Nov 15 00:11:55 2023 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Wed Nov 15 00:24:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8379550

net-mail/postfix-logwatch: update HOMEPAGE, SRC_URI (http -> https)

Signed-off-by: Michael Orlitzky  gentoo.org>

 net-mail/postfix-logwatch/postfix-logwatch-1.40.05.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-mail/postfix-logwatch/postfix-logwatch-1.40.05.ebuild 
b/net-mail/postfix-logwatch/postfix-logwatch-1.40.05.ebuild
index 43edbac64654..b6113b4c9f09 100644
--- a/net-mail/postfix-logwatch/postfix-logwatch-1.40.05.ebuild
+++ b/net-mail/postfix-logwatch/postfix-logwatch-1.40.05.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 postfix"
-HOMEPAGE="http://michael.orlitzky.com/code/postfix-logwatch.xhtml;
-SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.xz;
+HOMEPAGE="https://michael.orlitzky.com/code/postfix-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/postfix-logwatch/

2022-08-19 Thread Michael Orlitzky 
commit: ac69f180d143ad13cd84a2b93603cfe71409c44c
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Fri Aug 19 21:59:50 2022 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Fri Aug 19 21:59:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac69f180

net-mail/postfix-logwatch: stabilize 1.40.05 for amd64, x86

Signed-off-by: Michael Orlitzky  gentoo.org>

 net-mail/postfix-logwatch/postfix-logwatch-1.40.05.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/postfix-logwatch/postfix-logwatch-1.40.05.ebuild 
b/net-mail/postfix-logwatch/postfix-logwatch-1.40.05.ebuild
index dc661eb713af..43edbac64654 100644
--- a/net-mail/postfix-logwatch/postfix-logwatch-1.40.05.ebuild
+++ b/net-mail/postfix-logwatch/postfix-logwatch-1.40.05.ebuild
@@ -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/postfix-logwatch/

2022-08-19 Thread Michael Orlitzky 
commit: 9a85f7e259c68dbbbdb5e9f11f2378c1d37dfcae
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Fri Aug 19 22:00:18 2022 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Fri Aug 19 22:00:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a85f7e2

net-mail/postfix-logwatch: drop 1.40.04

Signed-off-by: Michael Orlitzky  gentoo.org>

 net-mail/postfix-logwatch/Manifest |  1 -
 .../postfix-logwatch-1.40.04.ebuild| 31 --
 2 files changed, 32 deletions(-)

diff --git a/net-mail/postfix-logwatch/Manifest 
b/net-mail/postfix-logwatch/Manifest
index 51c32dfc4bad..e33bff96c3b7 100644
--- a/net-mail/postfix-logwatch/Manifest
+++ b/net-mail/postfix-logwatch/Manifest
@@ -1,2 +1 @@
-DIST postfix-logwatch-1.40.04.tar.xz 78996 BLAKE2B 
fea2a08a7bc776cf0106a60bc0f86730c562d6c893629a1028183150a246803bda8ada6a5ec7e264685fe40016b82ce4140031af7e508ac4b1d9a34e552b865d
 SHA512 
194917fe4d05e9808893da0c175859e932d5e48956d1dda96129dd5de7f9ee23131ae1831b558c8c2d32d03ffda80aa95cfd5048543b7766a0486a71efa6c19b
 DIST postfix-logwatch-1.40.05.tar.xz 79504 BLAKE2B 
5d45a43ef2206b77092a90cd463a1718fada286fdd499df4416739aea7246c79b0670503585e7e057174ac715986767e3a72974d9790f33a2cd251221d883687
 SHA512 
15ba438701be110ce75c59bb6803cbb308bd53876428b01a457f42b3fb12e565c9b0c2d4559d71451475ec4986fccfc9f06854760035b4653c72508b968d5a0d

diff --git a/net-mail/postfix-logwatch/postfix-logwatch-1.40.04.ebuild 
b/net-mail/postfix-logwatch/postfix-logwatch-1.40.04.ebuild
deleted file mode 100644
index 43edbac64654..
--- a/net-mail/postfix-logwatch/postfix-logwatch-1.40.04.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="A log analyzer for postfix"
-HOMEPAGE="http://michael.orlitzky.com/code/postfix-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_install() {
-   dodoc Bugs Changes README ${PN}.conf-topn
-   doman ${PN}.1
-   dobin ${PN}
-   insinto /etc
-   doins ${PN}.conf
-}

[gentoo-commits] repo/gentoo:master commit in: net-mail/postfix-logwatch/

2022-06-15 Thread Michael Orlitzky 
commit: 6fd43ab4062e470d8222dcc577a035e9bb8f0d9b
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Wed Jun 15 12:03:18 2022 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Wed Jun 15 12:13:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fd43ab4

net-mail/postfix-logwatch: new upstream v1.40.05.

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Orlitzky  gentoo.org>

 net-mail/postfix-logwatch/Manifest |  1 +
 .../postfix-logwatch-1.40.05.ebuild| 31 ++
 2 files changed, 32 insertions(+)

diff --git a/net-mail/postfix-logwatch/Manifest 
b/net-mail/postfix-logwatch/Manifest
index dcdbf05f981c..51c32dfc4bad 100644
--- a/net-mail/postfix-logwatch/Manifest
+++ b/net-mail/postfix-logwatch/Manifest
@@ -1 +1,2 @@
 DIST postfix-logwatch-1.40.04.tar.xz 78996 BLAKE2B 
fea2a08a7bc776cf0106a60bc0f86730c562d6c893629a1028183150a246803bda8ada6a5ec7e264685fe40016b82ce4140031af7e508ac4b1d9a34e552b865d
 SHA512 
194917fe4d05e9808893da0c175859e932d5e48956d1dda96129dd5de7f9ee23131ae1831b558c8c2d32d03ffda80aa95cfd5048543b7766a0486a71efa6c19b
+DIST postfix-logwatch-1.40.05.tar.xz 79504 BLAKE2B 
5d45a43ef2206b77092a90cd463a1718fada286fdd499df4416739aea7246c79b0670503585e7e057174ac715986767e3a72974d9790f33a2cd251221d883687
 SHA512 
15ba438701be110ce75c59bb6803cbb308bd53876428b01a457f42b3fb12e565c9b0c2d4559d71451475ec4986fccfc9f06854760035b4653c72508b968d5a0d

diff --git a/net-mail/postfix-logwatch/postfix-logwatch-1.40.05.ebuild 
b/net-mail/postfix-logwatch/postfix-logwatch-1.40.05.ebuild
new file mode 100644
index ..dc661eb713af
--- /dev/null
+++ b/net-mail/postfix-logwatch/postfix-logwatch-1.40.05.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A log analyzer for postfix"
+HOMEPAGE="http://michael.orlitzky.com/code/postfix-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_install() {
+   dodoc Bugs Changes README ${PN}.conf-topn
+   doman ${PN}.1
+   dobin ${PN}
+   insinto /etc
+   doins ${PN}.conf
+}

[gentoo-commits] repo/gentoo:master commit in: net-mail/postfix-logwatch/files/, net-mail/postfix-logwatch/

2022-06-07 Thread Michael Orlitzky 
commit: 3ce69f10450f5113b8c885f536a7ef9ffb6eda51
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Tue Jun  7 20:18:57 2022 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Tue Jun  7 20:20:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ce69f10

net-mail/postfix-logwatch: remove old v1.40.03 and its patches.

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Orlitzky  gentoo.org>

 net-mail/postfix-logwatch/Manifest |  1 -
 .../files/all-server-ports-busy-lines.patch| 59 --
 .../files/data-without-valid-rcpt.patch| 33 
 .../files/multi-digit-enhanced-status.patch| 38 --
 .../files/redundant-argument-to-sprintf.patch  | 48 --
 .../files/unescaped-left-brace.patch   | 37 --
 .../postfix-logwatch-1.40.03-r4.ebuild | 45 -
 7 files changed, 261 deletions(-)

diff --git a/net-mail/postfix-logwatch/Manifest 
b/net-mail/postfix-logwatch/Manifest
index d7d14eaf1743..dcdbf05f981c 100644
--- a/net-mail/postfix-logwatch/Manifest
+++ b/net-mail/postfix-logwatch/Manifest
@@ -1,2 +1 @@
-DIST postfix-logwatch-1.40.03.tgz 107065 BLAKE2B 
153f83c3414d2773ec528260369a564624aacc6de5627ee1da77d1eea89b276fb014c045785bc8ae1fbf7e6da2279a0d309ab171ff55d1087d3379466570c5ea
 SHA512 
7059f409cabb3cb638885342ab876e1c85c87530c3544bf04c54a56707695acdc5cbb706e3f192ef5608c9a00706e4d7be3cc7b32286460719d7b497e44b3341
 DIST postfix-logwatch-1.40.04.tar.xz 78996 BLAKE2B 
fea2a08a7bc776cf0106a60bc0f86730c562d6c893629a1028183150a246803bda8ada6a5ec7e264685fe40016b82ce4140031af7e508ac4b1d9a34e552b865d
 SHA512 
194917fe4d05e9808893da0c175859e932d5e48956d1dda96129dd5de7f9ee23131ae1831b558c8c2d32d03ffda80aa95cfd5048543b7766a0486a71efa6c19b

diff --git a/net-mail/postfix-logwatch/files/all-server-ports-busy-lines.patch 
b/net-mail/postfix-logwatch/files/all-server-ports-busy-lines.patch
deleted file mode 100644
index dd5ae5869eb2..
--- a/net-mail/postfix-logwatch/files/all-server-ports-busy-lines.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 7b3930a9d44f91a63f0edbe765c75dc8f6128b7c Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky 
-Date: Wed, 26 Dec 2018 12:54:15 -0500
-Subject: [PATCH 1/1] Match postscreen "all server ports busy" lines.
-
-Lines that look like
-
-  NOQUEUE: reject: CONNECT from [192.168.0.1]:39410: all server ports busy
-
-were not being matched. There were two similar matches, one for a
-specific "too many connections" error
-
- NOQUEUE: reject: CONNECT from [192.168.0.1]:7197: too many connections
-
-and another for a more general form intended to match "all screening
-ports busy" errors from postscreen:
-
- reject: connect from [192.168.0.1]:21225: all screening ports busy
-
-The general form is preferable in my opinion, but the "screening
-ports" message is a bit of a black sheep. As a result, even the more
-general regular expression didn't match the other two errors due to
-their beginning with "NOQUEUE" and using an uppercase "CONNECT".
-
-To fix this, the general regular expression was made even more
-general. Now, a leading "NOQUEUE: " is optional, and the "CONNECT" can
-be capitalized. Thus, one regular expression now catches all three
-messages.

- postfix-logwatch | 13 +
- 1 file changed, 5 insertions(+), 8 deletions(-)
-
-diff --git a/postfix-logwatch b/postfix-logwatch
-index 827dfe0..648ba7a 100644
 a/postfix-logwatch
-+++ b/postfix-logwatch
-@@ -4399,14 +4399,11 @@ sub postfix_postscreen {
-   }
-}
- 
--   elsif ($line =~ /^NOQUEUE: reject: CONNECT from \[([^]]+)\](?::\d+)?: too 
many connections/) {
--  # NOQUEUE: reject: CONNECT from [192.168.0.1]:7197: too many connections
--  $Counts{'postscreen'}{'reject'}{'Too many connections'}{$1}{$END_KEY}++ 
 if $Collecting{'postscreen'};
--   }
--
--   elsif ($line =~ /^reject: connect from \[([^]]+)\](?::\d+)?: (.+)$/) {
--  # reject: connect from [192.168.0.1]:21225: all screening ports busy
--  $Counts{'postscreen'}{'reject'}{"\u$2"}{$1}{$END_KEY}++  if 
$Collecting{'postscreen'};
-+   elsif ($line =~ /^(NOQUEUE: )?reject: (connect|CONNECT) from 
\[([^]]+)\](?::\d+)?: (.+)$/) {
-+   # NOQUEUE: reject: CONNECT from [192.168.0.1]:7197: too many 
connections
-+   # NOQUEUE: reject: CONNECT from [192.168.0.1]:39410: all server ports 
busy
-+   # reject: connect from [192.168.0.1]:21225: all screening ports busy
-+  $Counts{'postscreen'}{'reject'}{"\u$4"}{$3}{$END_KEY}++  if 
$Collecting{'postscreen'};
-}
- 
-elsif ($line =~ /^(?:WHITELIST VETO) \[([^]]+)\](?::\d+)?$/) {
--- 
-2.19.2
-

diff --git a/net-mail/postfix-logwatch/files/data-without-valid-rcpt.patch 
b/net-mail/postfix-logwatch/files/data-without-valid-rcpt.patch
deleted file mode 100644
index 4c743a21c17a..
--- a/net-mail/postfix-logwatch/files/data-without-valid-rcpt.patch
+++

[gentoo-commits] repo/gentoo:master commit in: net-mail/postfix-logwatch/

2022-06-07 Thread Michael Orlitzky 
commit: b6ff43d4d57f77173552ab418005c222eb5eee1c
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Tue Jun  7 20:18:18 2022 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Tue Jun  7 20:20:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6ff43d4

net-mail/postfix-logwatch: maintainer stabilize v1.40.04.

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Orlitzky  gentoo.org>

 net-mail/postfix-logwatch/postfix-logwatch-1.40.04.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-mail/postfix-logwatch/postfix-logwatch-1.40.04.ebuild 
b/net-mail/postfix-logwatch/postfix-logwatch-1.40.04.ebuild
index bab89768c04c..43edbac64654 100644
--- a/net-mail/postfix-logwatch/postfix-logwatch-1.40.04.ebuild
+++ b/net-mail/postfix-logwatch/postfix-logwatch-1.40.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/postfix-logwatch/

2021-08-02 Thread Michael Orlitzky 
commit: 98539b029b43e863988d0ee2558577c7c08f2321
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Mon Aug  2 13:07:05 2021 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Mon Aug  2 13:09:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98539b02

net-mail/postfix-logwatch: new (forked) version 1.40.04.

I have finally forked this project, since I'm the only one who's been
patching it to work with new versions of perl and postfix. This is the
first release that I've made of the fork, which now thankfully does
not require any patches or workarounds in the ebuild.

Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Michael Orlitzky  gentoo.org>

 net-mail/postfix-logwatch/Manifest |  1 +
 net-mail/postfix-logwatch/metadata.xml |  3 ---
 .../postfix-logwatch-1.40.04.ebuild| 31 ++
 3 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/net-mail/postfix-logwatch/Manifest 
b/net-mail/postfix-logwatch/Manifest
index a2d12550489..d7d14eaf174 100644
--- a/net-mail/postfix-logwatch/Manifest
+++ b/net-mail/postfix-logwatch/Manifest
@@ -1 +1,2 @@
 DIST postfix-logwatch-1.40.03.tgz 107065 BLAKE2B 
153f83c3414d2773ec528260369a564624aacc6de5627ee1da77d1eea89b276fb014c045785bc8ae1fbf7e6da2279a0d309ab171ff55d1087d3379466570c5ea
 SHA512 
7059f409cabb3cb638885342ab876e1c85c87530c3544bf04c54a56707695acdc5cbb706e3f192ef5608c9a00706e4d7be3cc7b32286460719d7b497e44b3341
+DIST postfix-logwatch-1.40.04.tar.xz 78996 BLAKE2B 
fea2a08a7bc776cf0106a60bc0f86730c562d6c893629a1028183150a246803bda8ada6a5ec7e264685fe40016b82ce4140031af7e508ac4b1d9a34e552b865d
 SHA512 
194917fe4d05e9808893da0c175859e932d5e48956d1dda96129dd5de7f9ee23131ae1831b558c8c2d32d03ffda80aa95cfd5048543b7766a0486a71efa6c19b

diff --git a/net-mail/postfix-logwatch/metadata.xml 
b/net-mail/postfix-logwatch/metadata.xml
index c2f0518836b..a0128bcd9ef 100644
--- a/net-mail/postfix-logwatch/metadata.xml
+++ b/net-mail/postfix-logwatch/metadata.xml
@@ -4,7 +4,4 @@
   
 m...@gentoo.org
   
-  
-logreporters
-  
 

diff --git a/net-mail/postfix-logwatch/postfix-logwatch-1.40.04.ebuild 
b/net-mail/postfix-logwatch/postfix-logwatch-1.40.04.ebuild
new file mode 100644
index 000..bab89768c04
--- /dev/null
+++ b/net-mail/postfix-logwatch/postfix-logwatch-1.40.04.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A log analyzer for postfix"
+HOMEPAGE="http://michael.orlitzky.com/code/postfix-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_install() {
+   dodoc Bugs Changes README ${PN}.conf-topn
+   doman ${PN}.1
+   dobin ${PN}
+   insinto /etc
+   doins ${PN}.conf
+}

[gentoo-commits] repo/gentoo:master commit in: net-mail/postfix-logwatch/

2020-07-24 Thread Michael Orlitzky 
commit: 8bfdc83d774c5867f95637f678e6c92c79e5cc3d
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Fri Jul 24 22:08:36 2020 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Fri Jul 24 22:08:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bfdc83d

net-mail/postfix-logwatch: maintainer stabilize on amd64/x86.

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Michael Orlitzky  gentoo.org>

 net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r4.ebuild 
b/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r4.ebuild
index e4fe1d212ae..9bf2ef83569 100644
--- a/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r4.ebuild
+++ b/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r4.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/postfix-logwatch/

2020-07-24 Thread Michael Orlitzky 
commit: 33a9f0ebc9c3f95ee8583cf1163996e7635993cc
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Fri Jul 24 22:09:14 2020 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Fri Jul 24 22:09:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33a9f0eb

net-mail/postfix-logwatch: remove old "unused" version.

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Michael Orlitzky  gentoo.org>

 .../postfix-logwatch-1.40.03-r3.ebuild | 44 --
 1 file changed, 44 deletions(-)

diff --git a/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r3.ebuild 
b/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r3.ebuild
deleted file mode 100644
index 49ed6220090..000
--- a/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r3.ebuild
+++ /dev/null
@@ -1,44 +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 postfix"
-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}/multi-digit-enhanced-status.patch"
-   "${FILESDIR}/all-server-ports-busy-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 ${PN}.conf-topn
-   doman ${PN}.1
-   dobin ${PN}
-   insinto /etc
-   doins ${PN}.conf
-}

[gentoo-commits] repo/gentoo:master commit in: net-mail/postfix-logwatch/files/, net-mail/postfix-logwatch/

2020-04-15 Thread Michael Orlitzky 
commit: 9d1239a0e53bdb804bb726542bc25542d504a7c2
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Wed Apr 15 12:13:10 2020 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Wed Apr 15 12:59:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d1239a0

net-mail/postfix-logwatch: new revision with a new patch.

The -r4 revision includes a patch to ignore the "DATA without valid
RCPT" notices that postscreen emits. The patch hasn't been upstreamed
because we're basically upstream at this point.

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Michael Orlitzky  gentoo.org>

 .../files/data-without-valid-rcpt.patch| 33 
 .../postfix-logwatch-1.40.03-r4.ebuild | 45 ++
 2 files changed, 78 insertions(+)

diff --git a/net-mail/postfix-logwatch/files/data-without-valid-rcpt.patch 
b/net-mail/postfix-logwatch/files/data-without-valid-rcpt.patch
new file mode 100644
index 000..4c743a21c17
--- /dev/null
+++ b/net-mail/postfix-logwatch/files/data-without-valid-rcpt.patch
@@ -0,0 +1,33 @@
+From 891b5ce1780e10cd94d230efacf6e8b5cb33a931 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky 
+Date: Wed, 15 Apr 2020 08:04:02 -0400
+Subject: [PATCH 1/1] Ignore postscreen "BDAT/DATA without valid RCPT" lines.
+
+Postscreen now emits a notice when clients send BDAT or DATA
+prematurely (after postscreen rejects the recipient):
+
+  DATA without valid RCPT from [192.168.0.1]:48580
+
+These are merely informational, since the connection was rejected for
+some other reason, so this commit ignores them.
+---
+ postfix-logwatch | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/postfix-logwatch b/postfix-logwatch
+index 648ba7a..1b89ad6 100644
+--- a/postfix-logwatch
 b/postfix-logwatch
+@@ -4359,7 +4359,8 @@ sub postfix_postscreen {
+   $line =~ /discarding EHLO keywords: / or
+   $line =~ /: discard_mask / or
+   $line =~ /: sq=\d+ cq=\d+ event/ or
+-  $line =~ /: replacing command "/
++  $line =~ /: replacing command "/ or
++  $line =~ /^(DATA|BDAT) without valid RCPT/
+);
+ 
+ 
+-- 
+2.24.1
+

diff --git a/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r4.ebuild 
b/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r4.ebuild
new file mode 100644
index 000..e4fe1d212ae
--- /dev/null
+++ b/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A log analyzer for postfix"
+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}/multi-digit-enhanced-status.patch"
+   "${FILESDIR}/all-server-ports-busy-lines.patch"
+   "${FILESDIR}/data-without-valid-rcpt.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 ${PN}.conf-topn
+   doman ${PN}.1
+   dobin ${PN}
+   insinto /etc
+   doins ${PN}.conf
+}

[gentoo-commits] repo/gentoo:master commit in: net-mail/postfix-logwatch/

2019-04-08 Thread Michael Orlitzky 
commit: ca0328ba8c52e02566e879ab7ad9c33483100be5
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Mon Apr  8 14:06:02 2019 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Mon Apr  8 14:07:04 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca0328ba

net-mail/postfix-logwatch: remove "unused" -r2 ebuild.

Signed-off-by: Michael Orlitzky  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 .../postfix-logwatch-1.40.03-r2.ebuild | 43 --
 1 file changed, 43 deletions(-)

diff --git a/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r2.ebuild 
b/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r2.ebuild
deleted file mode 100644
index f1ae6f1bf1c..000
--- a/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r2.ebuild
+++ /dev/null
@@ -1,43 +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 postfix"
-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}/multi-digit-enhanced-status.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 ${PN}.conf-topn
-   doman ${PN}.1
-   dobin ${PN}
-   insinto /etc
-   doins ${PN}.conf
-}

[gentoo-commits] repo/gentoo:master commit in: net-mail/postfix-logwatch/

2019-04-08 Thread Michael Orlitzky 
commit: a846952e30dc45d0d920b98dfae26254b21fd27c
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Mon Apr  8 14:05:22 2019 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Mon Apr  8 14:07:03 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a846952e

net-mail/postfix-logwatch: maintainer stabilize -r3 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/postfix-logwatch/postfix-logwatch-1.40.03-r3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r3.ebuild 
b/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r3.ebuild
index 1e6cf975500..49ed6220090 100644
--- a/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r3.ebuild
+++ b/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r3.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
@@ -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/postfix-logwatch/, net-mail/postfix-logwatch/files/

2018-12-28 Thread Michael Orlitzky 
commit: 75d9e77e4bac2a796c9faf1ba820d12a02fc6a77
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Fri Dec 28 15:08:29 2018 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Fri Dec 28 15:22:34 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75d9e77e

net-mail/postfix-logwatch: new revision with a patch for an unmatched line.

Signed-off-by: Michael Orlitzky  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 .../files/all-server-ports-busy-lines.patch| 59 ++
 .../postfix-logwatch-1.40.03-r3.ebuild | 44 
 2 files changed, 103 insertions(+)

diff --git a/net-mail/postfix-logwatch/files/all-server-ports-busy-lines.patch 
b/net-mail/postfix-logwatch/files/all-server-ports-busy-lines.patch
new file mode 100644
index 000..dd5ae5869eb
--- /dev/null
+++ b/net-mail/postfix-logwatch/files/all-server-ports-busy-lines.patch
@@ -0,0 +1,59 @@
+From 7b3930a9d44f91a63f0edbe765c75dc8f6128b7c Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky 
+Date: Wed, 26 Dec 2018 12:54:15 -0500
+Subject: [PATCH 1/1] Match postscreen "all server ports busy" lines.
+
+Lines that look like
+
+  NOQUEUE: reject: CONNECT from [192.168.0.1]:39410: all server ports busy
+
+were not being matched. There were two similar matches, one for a
+specific "too many connections" error
+
+ NOQUEUE: reject: CONNECT from [192.168.0.1]:7197: too many connections
+
+and another for a more general form intended to match "all screening
+ports busy" errors from postscreen:
+
+ reject: connect from [192.168.0.1]:21225: all screening ports busy
+
+The general form is preferable in my opinion, but the "screening
+ports" message is a bit of a black sheep. As a result, even the more
+general regular expression didn't match the other two errors due to
+their beginning with "NOQUEUE" and using an uppercase "CONNECT".
+
+To fix this, the general regular expression was made even more
+general. Now, a leading "NOQUEUE: " is optional, and the "CONNECT" can
+be capitalized. Thus, one regular expression now catches all three
+messages.
+---
+ postfix-logwatch | 13 +
+ 1 file changed, 5 insertions(+), 8 deletions(-)
+
+diff --git a/postfix-logwatch b/postfix-logwatch
+index 827dfe0..648ba7a 100644
+--- a/postfix-logwatch
 b/postfix-logwatch
+@@ -4399,14 +4399,11 @@ sub postfix_postscreen {
+   }
+}
+ 
+-   elsif ($line =~ /^NOQUEUE: reject: CONNECT from \[([^]]+)\](?::\d+)?: too 
many connections/) {
+-  # NOQUEUE: reject: CONNECT from [192.168.0.1]:7197: too many connections
+-  $Counts{'postscreen'}{'reject'}{'Too many connections'}{$1}{$END_KEY}++ 
 if $Collecting{'postscreen'};
+-   }
+-
+-   elsif ($line =~ /^reject: connect from \[([^]]+)\](?::\d+)?: (.+)$/) {
+-  # reject: connect from [192.168.0.1]:21225: all screening ports busy
+-  $Counts{'postscreen'}{'reject'}{"\u$2"}{$1}{$END_KEY}++  if 
$Collecting{'postscreen'};
++   elsif ($line =~ /^(NOQUEUE: )?reject: (connect|CONNECT) from 
\[([^]]+)\](?::\d+)?: (.+)$/) {
++   # NOQUEUE: reject: CONNECT from [192.168.0.1]:7197: too many 
connections
++   # NOQUEUE: reject: CONNECT from [192.168.0.1]:39410: all server ports 
busy
++   # reject: connect from [192.168.0.1]:21225: all screening ports busy
++  $Counts{'postscreen'}{'reject'}{"\u$4"}{$3}{$END_KEY}++  if 
$Collecting{'postscreen'};
+}
+ 
+elsif ($line =~ /^(?:WHITELIST VETO) \[([^]]+)\](?::\d+)?$/) {
+-- 
+2.19.2
+

diff --git a/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r3.ebuild 
b/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r3.ebuild
new file mode 100644
index 000..1e6cf975500
--- /dev/null
+++ b/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A log analyzer for postfix"
+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}/multi-digit-enhanced-status.patch"
+   "${FILESDIR}/all-server-ports-busy-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 ${PN}.conf-topn
+

[gentoo-commits] repo/gentoo:master commit in: net-mail/postfix-logwatch/

2017-10-24 Thread Michael Orlitzky 
commit: 7b88f1080eb8d6d4e6ad3504be37b7af35eb97a3
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Tue Oct 24 14:43:04 2017 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Tue Oct 24 14:43:04 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b88f108

net-mail/postfix-logwatch: stabilize -r2 on amd64 and x86.

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r2.ebuild 
b/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r2.ebuild
index b798aeb3512..f1ae6f1bf1c 100644
--- a/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r2.ebuild
+++ b/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r2.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/postfix-logwatch/

2017-10-24 Thread Michael Orlitzky 
commit: e4ee3a71f119ab026d51577796d9716cf52a3ee6
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Tue Oct 24 14:43:30 2017 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Tue Oct 24 14:43:30 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4ee3a71

net-mail/postfix-logwatch: remove unused postfix-logwatch-1.40.03.ebuild.

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 .../postfix-logwatch-1.40.03.ebuild| 36 --
 1 file changed, 36 deletions(-)

diff --git a/net-mail/postfix-logwatch/postfix-logwatch-1.40.03.ebuild 
b/net-mail/postfix-logwatch/postfix-logwatch-1.40.03.ebuild
deleted file mode 100644
index 375d2ed98b4..000
--- a/net-mail/postfix-logwatch/postfix-logwatch-1.40.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 postfix"
-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 ${PN}.conf-topn
-   doman ${PN}.1
-   dobin ${PN}
-   insinto /etc
-   doins ${PN}.conf
-}

[gentoo-commits] repo/gentoo:master commit in: net-mail/postfix-logwatch/, net-mail/postfix-logwatch/files/

2017-09-05 Thread Michael Orlitzky 
commit: dc1f3a7260ac66a9eddeccd01e60cb1fe7b780fb
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Tue Sep  5 13:27:09 2017 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Tue Sep  5 13:27:29 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc1f3a72

net-mail/postfix-logwatch: new revision with another new bugfix patch.

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 .../files/multi-digit-enhanced-status.patch| 38 ++
 ...1.ebuild => postfix-logwatch-1.40.03-r2.ebuild} |  1 +
 2 files changed, 39 insertions(+)

diff --git a/net-mail/postfix-logwatch/files/multi-digit-enhanced-status.patch 
b/net-mail/postfix-logwatch/files/multi-digit-enhanced-status.patch
new file mode 100644
index 000..f07ab22813c
--- /dev/null
+++ b/net-mail/postfix-logwatch/files/multi-digit-enhanced-status.patch
@@ -0,0 +1,38 @@
+From ced6e6fcbf1a025419e8ee9f940e5022ed440532 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky 
+Date: Tue, 5 Sep 2017 09:19:44 -0400
+Subject: [PATCH 1/1] Allow multi-digit numbers in enhanced SMTP status codes.
+
+The re_DSN regular expression is intended to match a response like
+"550 1.2.3", where "1.2.3" is an enhanced status code. However, the
+regular expression was only expecting single-digit numbers between the
+dots; thus it was missing codes like "550 5.7.23". The expression has
+been updated to accept any number of digits between the dots.
+
+This fixes unmatched rejection lines that begin with,
+
+  550 5.7.23 : Recipient address rejected...
+
+Such lines appear with newer versions of the python SPF policy daemon.
+---
+ postfix-logwatch | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/postfix-logwatch b/postfix-logwatch
+index 92ed621..827dfe0 100644
+--- a/postfix-logwatch
 b/postfix-logwatch
+@@ -66,7 +66,9 @@ my $re_QID_s   = qr/[A-Z\d]+/;
+ my $re_QID_l   = 
qr/(?:NOQUEUE|[bcdfghjklmnpqrstvwxyzBCDFGHJKLMNPQRSTVWXYZ\d]+)/;
+ our $re_QID;
+ 
+-our $re_DSN = qr/(?:(?:\d{3})?(?: ?\d\.\d\.\d)?)/;
++# The enhanced status codes can contain two-digit (or more) numbers;
++# for example, "550 5.7.23".
++our $re_DSN = qr/(?:(?:\d{3})?(?: ?\d+\.\d+\.\d+)?)/;
+ our $re_DDD = qr/(?:(?:conn_use=\d+ )?delay=-?[\d.]+(?:, 
delays=[\d\/.]+)?(?:, dsn=[\d.]+)?)/;
+ 
+ #MODULE: ../Logreporters/Utils.pm
+-- 
+2.13.0
+

diff --git a/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r1.ebuild 
b/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r2.ebuild
similarity index 95%
rename from net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r1.ebuild
rename to net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r2.ebuild
index 17046988053..b798aeb3512 100644
--- a/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r1.ebuild
+++ b/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r2.ebuild
@@ -16,6 +16,7 @@ RDEPEND="dev-lang/perl"
 PATCHES=(
"${FILESDIR}/unescaped-left-brace.patch"
"${FILESDIR}/redundant-argument-to-sprintf.patch"
+   "${FILESDIR}/multi-digit-enhanced-status.patch"
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: net-mail/postfix-logwatch/, net-mail/postfix-logwatch/files/

2017-08-24 Thread Michael Orlitzky 
commit: 0fde279c363ed228d5a1eae8716a5c236c48e084
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Thu Aug 24 13:21:28 2017 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Thu Aug 24 13:21:41 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fde279c

net-mail/postfix-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.

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 .../files/redundant-argument-to-sprintf.patch  | 48 ++
 .../files/unescaped-left-brace.patch   | 37 +
 .../postfix-logwatch-1.40.03-r1.ebuild | 42 +++
 3 files changed, 127 insertions(+)

diff --git 
a/net-mail/postfix-logwatch/files/redundant-argument-to-sprintf.patch 
b/net-mail/postfix-logwatch/files/redundant-argument-to-sprintf.patch
new file mode 100644
index 000..ee0e79bd41d
--- /dev/null
+++ b/net-mail/postfix-logwatch/files/redundant-argument-to-sprintf.patch
@@ -0,0 +1,48 @@
+From 6afb8e258a5a2a0e7c72c4c25927dde9d1e2ad89 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky 
+Date: Thu, 24 Aug 2017 07:34:36 -0400
+Subject: [PATCH 2/2] Fix redundant argument to sprintf warning.
+
+Perl 5.22 now warns about redundant (i.e. extra) arguments to the
+sprintf function. If your format string only has two place-holders but
+you pass three place-fillers, you get warned:
+
+  Redundant argument in sprintf at ./postfix-logwatch line 1382...
+
+The issue there was that the format string passed to sprintf was
+constructed dynamically; sometimes it would contain two place-holders,
+and sometimes three. Three place-fillers were always passed, so when
+only two place-holders were used, the warning would be thrown. This was
+fixed by testing whether or not there are two or three place-holders,
+and passing the appropriate number of place-fillers.
+---
+ postfix-logwatch | 13 +++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/postfix-logwatch b/postfix-logwatch
+index 1e58a95..92ed621 100644
+--- a/postfix-logwatch
 b/postfix-logwatch
+@@ -1378,8 +1378,17 @@ sub print_summary_report (\@) {
+  $$divisor == $Totals{$keyname} ? 100.00 : 
$Totals{$keyname} * 100 / $$divisor;
+ }
+ else {
+-   push @{$lines[$cur_level]}, 
+-  sprintf "$fmt  %-23s $extra\n", $total, $desc, commify 
($Totals{$keyname});
++  my $new_line;
++  if ($extra eq '') {
++  $new_line = sprintf("$fmt  %-23s \n", $total, $desc);
++  }
++  else {
++  $new_line = sprintf("$fmt  %-23s $extra\n",
++  $total,
++  $desc,
++  commify ($Totals{$keyname}));
++  }
++  push @{$lines[$cur_level]}, $new_line
+ }
+  }
+   }
+-- 
+2.13.0
+

diff --git a/net-mail/postfix-logwatch/files/unescaped-left-brace.patch 
b/net-mail/postfix-logwatch/files/unescaped-left-brace.patch
new file mode 100644
index 000..65139a3aff1
--- /dev/null
+++ b/net-mail/postfix-logwatch/files/unescaped-left-brace.patch
@@ -0,0 +1,37 @@
+From 84f9fb47783e63757f27e5990ee606ff01e079a9 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky 
+Date: Thu, 24 Aug 2017 07:09:28 -0400
+Subject: [PATCH 1/2] Fix unescaped left brace warning for "Config: {".
+
+New versions of Perl are starting to complain about unescaped braces
+in regular expressions, and supposedly the warning will become a fatal
+error in Perl 5.30. This particular warning is,
+
+  Unescaped left brace in regex is deprecated, passed through in regex;
+  marked by <-- HERE in m/^Config: { <-- HERE / at ./postfix-logwatch
+  line 1850.
+
+and it was fixed by going to line 1850 and putting a backslash before
+the left brace.
+
+Bug: https://sourceforge.net/p/logreporters/bugs/4/
+---
+ postfix-logwatch | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/postfix-logwatch b/postfix-logwatch
+index 3e4a673..1e58a95 100644
+--- a/postfix-logwatch
 b/postfix-logwatch
+@@ -1847,7 +1847,7 @@ sub postfix_policy_spf($) {
+ # KeyboardInterrupt 
+ $line =~ /^Read line: "/ or
+ $line =~ /^Found the end of entry$/ or
+-$line =~ /^Config: {/ or
++$line =~ /^Config: \{/ or
+ $line =~ /^spfcheck: pyspf result/ or
+ $line =~ /^Starting$/ or
+ $line =~ /^Normal exit$/ or
+-- 
+2.13.0
+

diff --git a/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r1.ebuild 
b/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r1.ebuild
new file mode 100644
index 000..17046988053
--- /dev/null
+++ b/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r1.ebuild
@@ -0,0 +1,42 @@
+#

[gentoo-commits] repo/gentoo:master commit in: net-mail/postfix-logwatch/

2016-08-08 Thread Michael Orlitzky 
commit: d797fdf429db27d74f1cb53e3f438203cf4f397a
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Tue Aug  9 03:59:46 2016 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Tue Aug  9 04:00:22 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d797fdf4

net-mail/postfix-logwatch: remove old v1.40.00.

Package-Manager: portage-2.2.28

 net-mail/postfix-logwatch/Manifest |  1 -
 net-mail/postfix-logwatch/metadata.xml |  5 --
 .../postfix-logwatch-1.40.00.ebuild| 64 --
 3 files changed, 70 deletions(-)

diff --git a/net-mail/postfix-logwatch/Manifest 
b/net-mail/postfix-logwatch/Manifest
index 802d5e9..2eaa511 100644
--- a/net-mail/postfix-logwatch/Manifest
+++ b/net-mail/postfix-logwatch/Manifest
@@ -1,2 +1 @@
-DIST postfix-logwatch-1.40.00.tgz 107441 SHA256 
d72a9a91a6871606810485b342ca684a2e8724897b9c906cc27d3df7a15b2616 SHA512 
c388cfefceeefcc19bc987865dbe0312ef0f470524ebd8af33abe639137cce699ad79f33b2b64168d2d572981372a9af58e60f6cdfbc661fc56ab64f1c19be03
 WHIRLPOOL 
027af839c2118eb4abb00c9417ecd4c612a8f6ed81d26461c6025df4effe644b9a809c57d90474f8d515326b3528f6b0311c7b9626fa655e158cfa4712d1abd8
 DIST postfix-logwatch-1.40.03.tgz 107065 SHA256 
c9aae87471554bb93c9d91bd2df3999ce3fae19f75ffd43fdee3f8552232c748 SHA512 
7059f409cabb3cb638885342ab876e1c85c87530c3544bf04c54a56707695acdc5cbb706e3f192ef5608c9a00706e4d7be3cc7b32286460719d7b497e44b3341
 WHIRLPOOL 
3c8e556863a79ec55af5e1a19204ddbc2fb3ac60c1a8162239f465da2cda465983f705755be7750e58e0a196c680b1e880f5c6aed0157baf275f6443535104a4

diff --git a/net-mail/postfix-logwatch/metadata.xml 
b/net-mail/postfix-logwatch/metadata.xml
index 426d9f5..c2f0518 100644
--- a/net-mail/postfix-logwatch/metadata.xml
+++ b/net-mail/postfix-logwatch/metadata.xml
@@ -4,11 +4,6 @@
   
 m...@gentoo.org
   
-  
-
-Install filters for use with sys-apps/logwatch.
-  
-  
   
 logreporters
   

diff --git a/net-mail/postfix-logwatch/postfix-logwatch-1.40.00.ebuild 
b/net-mail/postfix-logwatch/postfix-logwatch-1.40.00.ebuild
deleted file mode 100644
index ac84ab3..000
--- a/net-mail/postfix-logwatch/postfix-logwatch-1.40.00.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="A log analyzer for postfix"
-HOMEPAGE="http://logreporters.sourceforge.net/;
-SRC_URI="mirror://sourceforge/logreporters/${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-# >sys-apps/logwatch-7.4.0 ships our logwatch scripts and will
-# thus obsolete this use flag.
-IUSE="logwatch"
-
-RDEPEND="dev-lang/perl
-   logwatch? ( !>sys-apps/logwatch-7.4.0 )"
-
-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() {
-   # There are two different "versions" of the package in the
-   # tarball: a standalone executable and a logwatch filter. The
-   # standalone is always installed. However, the logwatch filter is
-   # only installed with USE="logwatch".
-   dodoc Bugs Changes README ${PN}.conf-topn
-   doman ${PN}.1
-   dobin ${PN}
-   insinto /etc
-   doins ${PN}.conf
-
-   if use logwatch; then
-   # Remove the taint mode (-T) switch from the header of the
-   # standalone executable, and save the result as our logwatch
-   # filter.
-   #
-   # We don't do this for the standalone script because it's nice
-   # to have the taint flag when it works.
-   #
-   sed 's~^#!/usr/bin/perl -T$~#!/usr/bin/perl~' ${PN} > postfix \
-   || die 'failed to remove the perl taint switch'
-
-   insinto /etc/logwatch/scripts/services
-   doins postfix
-
-   insinto /etc/logwatch/conf/services
-   newins ${PN}.conf postfix.conf
-   fi
-}