Fixed the postfix 2.3 compatibility patch, thanks to Kevin Parent <kparent at enersea.net>, bug 168766.

Package-Manager: portage-2.1.2-r11

5 files changed, 37 insertions, 19 deletions

diff --git a/net-mail/pflogsumm/ChangeLog b/net-mail/pflogsumm/ChangeLog
index 764a960ae740..a3791ca49599 100644
--- a/net-mail/pflogsumm/ChangeLog
+++ b/net-mail/pflogsumm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-mail/pflogsumm
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/pflogsumm/ChangeLog,v 1.7 2007/02/22 01:49:30 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/pflogsumm/ChangeLog,v 1.8 2007/03/03 12:26:37 ticho Exp $
+
+*pflogsumm-1.1.0-r2 (03 Mar 2007)
+
+  03 Mar 2007; Andrej Kacian <ticho@gentoo.org>
+  files/1.1.0-postfix-2.3-logs.patch, -pflogsumm-1.1.0-r1.ebuild,
+  +pflogsumm-1.1.0-r2.ebuild:
+  Fixed the postfix 2.3 compatibility patch, thanks to Kevin Parent <kparent
+  at enersea.net>, bug 168766.
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/net-mail/pflogsumm/Manifest b/net-mail/pflogsumm/Manifest
index f2c15f2280ce..deb2c74732d1 100644
--- a/net-mail/pflogsumm/Manifest
+++ b/net-mail/pflogsumm/Manifest
@@ -1,25 +1,28 @@
-AUX 1.1.0-postfix-2.3-logs.patch 535 RMD160 7fcc511bb3e89c06405c954632172de75dcab345 SHA1 54c2aa36323f225d8542a9d549a72c994a8c121a SHA256 32356614cde3e2332b3c5b1f4a592ddd7ee681b11f91ab97bfeef4a73df0b5bc
-MD5 7c55a211f3bed5e1888123ed2af78e78 files/1.1.0-postfix-2.3-logs.patch 535
-RMD160 7fcc511bb3e89c06405c954632172de75dcab345 files/1.1.0-postfix-2.3-logs.patch 535
-SHA256 32356614cde3e2332b3c5b1f4a592ddd7ee681b11f91ab97bfeef4a73df0b5bc files/1.1.0-postfix-2.3-logs.patch 535
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 1.1.0-postfix-2.3-logs.patch 536 RMD160 2dbb77cd806476a52e548ad9ef7f13b0b387a4f7 SHA1 dea87a5ed111860d8c670eca7406ea444bc799a1 SHA256 c455fd46434e4516e6e99e55b2cd19f252a53d6b8906d58de01a556a798b79db
+MD5 b17946a49bcfe28e482b2ad0294f5a57 files/1.1.0-postfix-2.3-logs.patch 536
+RMD160 2dbb77cd806476a52e548ad9ef7f13b0b387a4f7 files/1.1.0-postfix-2.3-logs.patch 536
+SHA256 c455fd46434e4516e6e99e55b2cd19f252a53d6b8906d58de01a556a798b79db files/1.1.0-postfix-2.3-logs.patch 536
 DIST pflogsumm-1.0.11.tar.gz 40228 RMD160 8e1a0fbf5089c436be7ca79cb78ee61414ed227a SHA1 937e47d4225273ad695f02c084607c78925f943d SHA256 2d527d8a0f30c93e995054db1f54cdb3d4d8a82ff2ab50de179f04d6bd20e0b7
 DIST pflogsumm-1.1.0.tar.gz 43588 RMD160 ab4af22a3bb993ca3b8e3d1b58052f4e69ae890c SHA1 8e4efaf192573bb14b64ffdc34b3548020a4a218 SHA256 e3ad3d798b9dbfb33af859940b8f4681a8fede45d744336aa68242b5e2c40417
 EBUILD pflogsumm-1.0.11.ebuild 597 RMD160 40b4f30d22522582cf3d3356fd20aad0699be48b SHA1 88b612d2ccf661d3e19cfe1ff7cec27749cacd51 SHA256 cad9f19333bf9a224fbf4cce5c9becb5852830e8979604dd3617e49983235a7f
 MD5 e973d627bd4089d78e7f71d193a502cb pflogsumm-1.0.11.ebuild 597
 RMD160 40b4f30d22522582cf3d3356fd20aad0699be48b pflogsumm-1.0.11.ebuild 597
 SHA256 cad9f19333bf9a224fbf4cce5c9becb5852830e8979604dd3617e49983235a7f pflogsumm-1.0.11.ebuild 597
-EBUILD pflogsumm-1.1.0-r1.ebuild 710 RMD160 c73ecc63f784c2418261b29b747889b17ff8d3e4 SHA1 bb80ec60567babce6cee558bea373479e03e5626 SHA256 3d5610dd585a14cd97c111c910cdc4e5388442f540b9b5d9d08e89d4bba47ef2
-MD5 e194c0b1f5a3403809e5aa713bc8aa32 pflogsumm-1.1.0-r1.ebuild 710
-RMD160 c73ecc63f784c2418261b29b747889b17ff8d3e4 pflogsumm-1.1.0-r1.ebuild 710
-SHA256 3d5610dd585a14cd97c111c910cdc4e5388442f540b9b5d9d08e89d4bba47ef2 pflogsumm-1.1.0-r1.ebuild 710
+EBUILD pflogsumm-1.1.0-r2.ebuild 710 RMD160 0271828283f601334acda514489cdc48e0bf56b5 SHA1 2d0b41b88137e142ac1d95091b64ec82964d8f67 SHA256 a732e586fc2e4337934c0eb2f42eab9e49fff32fbe26d53f27094b65f075addc
+MD5 e2d0144195b4db3abf9501377a2a12ac pflogsumm-1.1.0-r2.ebuild 710
+RMD160 0271828283f601334acda514489cdc48e0bf56b5 pflogsumm-1.1.0-r2.ebuild 710
+SHA256 a732e586fc2e4337934c0eb2f42eab9e49fff32fbe26d53f27094b65f075addc pflogsumm-1.1.0-r2.ebuild 710
 EBUILD pflogsumm-1.1.0.ebuild 602 RMD160 fe9a6c9f1b97ddc40f6f17b43932f4b0711a9cd7 SHA1 c5cc66c2d077b0eb31caab934ae575220341c772 SHA256 5ef2aaeac40b5bb71bb8a11fd6d251aba63e3e4c2c4456343e2b65d14bbc151e
 MD5 10b885d3ca2c21990e2851d60d7cbd0c pflogsumm-1.1.0.ebuild 602
 RMD160 fe9a6c9f1b97ddc40f6f17b43932f4b0711a9cd7 pflogsumm-1.1.0.ebuild 602
 SHA256 5ef2aaeac40b5bb71bb8a11fd6d251aba63e3e4c2c4456343e2b65d14bbc151e pflogsumm-1.1.0.ebuild 602
-MISC ChangeLog 1269 RMD160 9c06d2bd83d7b008d6bd16ba943151168535b0d5 SHA1 5b5e88fb817c57dc378d5f91604489d26d6ca45b SHA256 97ac8106a66d2952c2c7ca51aef227cc147eb6f0fac69890d994fff1cf76ddb4
-MD5 1f6381af2c93d0a9bd1b26832661004f ChangeLog 1269
-RMD160 9c06d2bd83d7b008d6bd16ba943151168535b0d5 ChangeLog 1269
-SHA256 97ac8106a66d2952c2c7ca51aef227cc147eb6f0fac69890d994fff1cf76ddb4 ChangeLog 1269
+MISC ChangeLog 1557 RMD160 8481269df956c9ced8da76845855ee594c9ab6ae SHA1 53becea971301952344ba8696e9381a8fa28d2f3 SHA256 09b337cda929f7e79b2e4366b5047923989b38f38ff21944979acff3baac4436
+MD5 e9bf7d250c03b7faa1096c14d6305770 ChangeLog 1557
+RMD160 8481269df956c9ced8da76845855ee594c9ab6ae ChangeLog 1557
+SHA256 09b337cda929f7e79b2e4366b5047923989b38f38ff21944979acff3baac4436 ChangeLog 1557
 MISC metadata.xml 254 RMD160 86528bcbd49f8acd5b836ca2a21e268878473345 SHA1 5959fc9516dd689a252d4adab15e002295e95306 SHA256 edb0d38cd8c18831d88ecf51d0f36b155527bef06b1e0b0dc290d3bdcf8f0547
 MD5 76d3681a949c983c4790bcd7e89d77bc metadata.xml 254
 RMD160 86528bcbd49f8acd5b836ca2a21e268878473345 metadata.xml 254
@@ -30,6 +33,13 @@ SHA256 da75f1f343c26cd9e270b8c556a873f076bdf4c8664c98b1fb7643d6e280935a files/di
 MD5 a6543f25073903d2dfa9b33242ea02a0 files/digest-pflogsumm-1.1.0 244
 RMD160 f5e85c275d4dc35edc39b2bed5aa01fe952c26b0 files/digest-pflogsumm-1.1.0 244
 SHA256 5b49de66d5ce450c7aa9f42a1c92eeaa99543ecdec40312647974dfa6d0bda84 files/digest-pflogsumm-1.1.0 244
-MD5 a6543f25073903d2dfa9b33242ea02a0 files/digest-pflogsumm-1.1.0-r1 244
-RMD160 f5e85c275d4dc35edc39b2bed5aa01fe952c26b0 files/digest-pflogsumm-1.1.0-r1 244
-SHA256 5b49de66d5ce450c7aa9f42a1c92eeaa99543ecdec40312647974dfa6d0bda84 files/digest-pflogsumm-1.1.0-r1 244
+MD5 a6543f25073903d2dfa9b33242ea02a0 files/digest-pflogsumm-1.1.0-r2 244
+RMD160 f5e85c275d4dc35edc39b2bed5aa01fe952c26b0 files/digest-pflogsumm-1.1.0-r2 244
+SHA256 5b49de66d5ce450c7aa9f42a1c92eeaa99543ecdec40312647974dfa6d0bda84 files/digest-pflogsumm-1.1.0-r2 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFF6WmFQlM6RnzZP+IRAuJ2AJ9cnv4oZeU4umhN+ri4RkzDUsGfxgCgpooN
+9ZDB4fi+TAKRrOCMGXOhI7Q=
+=ghha
+-----END PGP SIGNATURE-----
diff --git a/net-mail/pflogsumm/files/1.1.0-postfix-2.3-logs.patch b/net-mail/pflogsumm/files/1.1.0-postfix-2.3-logs.patch
index f0cbfc9f61b6..b1e81a98e1a2 100644
--- a/net-mail/pflogsumm/files/1.1.0-postfix-2.3-logs.patch
+++ b/net-mail/pflogsumm/files/1.1.0-postfix-2.3-logs.patch
@@ -5,7 +5,7 @@
  	}
  	elsif((($addr, $relay, $delay, $status, $toRmdr) = $logRmdr =~
 -		/to=<([^>]*)>, (?:orig_to=<[^>]*>, )?relay=([^,]+), delay=([^,]+), status=(\S+)(.*)$/o) >= 4)
-+		/to=<([^>]*)>, (?:orig_to=<[^>]*>, )?relay=([^,]+), (?:conn_use=[^,]+, )?delay=([^,]+), (?:delays=[^,]+, )?(?:dsn=[^,]+,)?status=(\S+)(.*)$/o) >= 4)
++		/to=<([^>]*)>, (?:orig_to=<[^>]*>, )?relay=([^,]+), (?:conn_use=[^,]+, )?delay=([^,]+), (?:delays=[^,]+, )?(?:dsn=[^,]+, )?status=(\S+)(.*)$/o) >= 4)
  	{
  
  	    if($opts{'m'} && $addr =~ /^(.*!)*([^!]+)!([^!@]+)@([^\.]+)$/o) {
diff --git a/net-mail/pflogsumm/files/digest-pflogsumm-1.1.0-r1 b/net-mail/pflogsumm/files/digest-pflogsumm-1.1.0-r2
index 4d9e8a4b0b85..4d9e8a4b0b85 100644
--- a/net-mail/pflogsumm/files/digest-pflogsumm-1.1.0-r1
+++ b/net-mail/pflogsumm/files/digest-pflogsumm-1.1.0-r2
diff --git a/net-mail/pflogsumm/pflogsumm-1.1.0-r1.ebuild b/net-mail/pflogsumm/pflogsumm-1.1.0-r2.ebuild
index 8f26cfb73b8e..74a49ab2ea8d 100644
--- a/net-mail/pflogsumm/pflogsumm-1.1.0-r1.ebuild
+++ b/net-mail/pflogsumm/pflogsumm-1.1.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/pflogsumm/pflogsumm-1.1.0-r1.ebuild,v 1.1 2006/11/16 23:39:27 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/pflogsumm/pflogsumm-1.1.0-r2.ebuild,v 1.1 2007/03/03 12:26:37 ticho Exp $
 
 inherit eutils