Provide new qmail-lf-workaround patch for 2.4.4. Bug #163689, reported by Elliot...

Package-Manager: portage-2.1.2-r4

diff --git a/mail-filter/amavisd-new/ChangeLog b/mail-filter/amavisd-new/ChangeLog
index 5ba2231e1bdfdcddbfb35eec185aa9a27f20f8e0..c96d4f8d8379063edd08a460807b50d6ae4cb4fc 100644 (file)
--- a/mail-filter/amavisd-new/ChangeLog
+++ b/mail-filter/amavisd-new/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-filter/amavisd-new
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.100 2007/01/26 22:17:13 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.101 2007/01/30 00:18:32 ticho Exp $
+
+  30 Jan 2007; Andrej Kacian <ticho@gentoo.org>
+  +files/amavisd-new-2.4.4-qmail-lf-workaround.patch,
+  amavisd-new-2.4.4.ebuild:
+  Provide new qmail-lf-workaround patch for 2.4.4. Bug #163689, reported by
+  Elliot Van Resbeck <ellmout at ellmout.net>.
 
   26 Jan 2007; Andrej Kacian <ticho@gentoo.org> amavisd-new-2.4.4.ebuild:
   Require either sendmail or libmilter. Bug #161392, reported by steveb

diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index ad2f552e021ef0453a94590a7530a08d7040964a..88866c1ab8e39f62b0cc744f4b013ff94caf9771 100644 (file)
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -29,6 +29,10 @@ AUX amavisd-new-2.4.4-amavisd.conf-gentoo.patch 4878 RMD160 bf7faec0c54aa24bd689
 MD5 863246523bc1dbf39b02d237f0be9cb2 files/amavisd-new-2.4.4-amavisd.conf-gentoo.patch 4878
 RMD160 bf7faec0c54aa24bd689db9d1d22cccbdcff47b3 files/amavisd-new-2.4.4-amavisd.conf-gentoo.patch 4878
 SHA256 b9db712af97ec836f1177fbeeaa284a4eb254f0a4eea1783606553273078fee3 files/amavisd-new-2.4.4-amavisd.conf-gentoo.patch 4878
+AUX amavisd-new-2.4.4-qmail-lf-workaround.patch 845 RMD160 95d77a438bc57e9cc7a192182fe15705dc45e3f6 SHA1 bae317857b6c380958c65f73dd08f6c38676aa09 SHA256 6206976516f904e374da5cf9cb4c0211077d473d52e495b6f3e2bca3348e1635
+MD5 ff439c0ce62a4b53a75de5bc7647558c files/amavisd-new-2.4.4-qmail-lf-workaround.patch 845
+RMD160 95d77a438bc57e9cc7a192182fe15705dc45e3f6 files/amavisd-new-2.4.4-qmail-lf-workaround.patch 845
+SHA256 6206976516f904e374da5cf9cb4c0211077d473d52e495b6f3e2bca3348e1635 files/amavisd-new-2.4.4-qmail-lf-workaround.patch 845
 AUX amavisd.rc6 310 RMD160 c06ac94f57382b5cbb7f9dea94007b927aaf6c8c SHA1 9674be4ffe07c6dea0c4f4ea34ff74d948536190 SHA256 c136451b550176c6292554c60e0d41d91e6ad3538dedecbdb48925898623dbd8
 MD5 1da4ebb5c79b4892074a61f52aff3eff files/amavisd.rc6 310
 RMD160 c06ac94f57382b5cbb7f9dea94007b927aaf6c8c files/amavisd.rc6 310
@@ -58,14 +62,14 @@ EBUILD amavisd-new-2.4.3.ebuild 5133 RMD160 79ba46a33ad8b5cd0d240950b72b84f1d1d6
 MD5 2485dfbe653652d133eb1cf0e3fd4cf9 amavisd-new-2.4.3.ebuild 5133
 RMD160 79ba46a33ad8b5cd0d240950b72b84f1d1d6feed amavisd-new-2.4.3.ebuild 5133
 SHA256 3be17677141e51e919b988fcf300d844f188909f644621ae228a46f01920878d amavisd-new-2.4.3.ebuild 5133
-EBUILD amavisd-new-2.4.4.ebuild 5004 RMD160 a565517c054353ff78eb5e045a52114830783565 SHA1 c4f90e7d8e3bb11ffd7a82f58e83ab00f14ec92f SHA256 2fe9166c7292fbb5b025e4d8f4a19795585fdc6bed755192085fc953b8a37ca9
-MD5 7d87ef4ef0d32b9b5c2f1db0532029e2 amavisd-new-2.4.4.ebuild 5004
-RMD160 a565517c054353ff78eb5e045a52114830783565 amavisd-new-2.4.4.ebuild 5004
-SHA256 2fe9166c7292fbb5b025e4d8f4a19795585fdc6bed755192085fc953b8a37ca9 amavisd-new-2.4.4.ebuild 5004
-MISC ChangeLog 20876 RMD160 ffe96b5189c228c5f4a65458802c676efa7a0088 SHA1 27d8243a75a7ddd41b37add4f6af0d2085b96d61 SHA256 f79a650087a9cfc8b93d0b85d909082910449d0d1919d4d2ab3666f6d928215c
-MD5 54ce7f55c5b1aed6be566cea77fff47a ChangeLog 20876
-RMD160 ffe96b5189c228c5f4a65458802c676efa7a0088 ChangeLog 20876
-SHA256 f79a650087a9cfc8b93d0b85d909082910449d0d1919d4d2ab3666f6d928215c ChangeLog 20876
+EBUILD amavisd-new-2.4.4.ebuild 5126 RMD160 b416940c18022922b0aa8cb8abc0220a7386041c SHA1 e0cf76aac7617b4814324469de365a39a9f9867b SHA256 6363632a0254213678b973d374676713c5141403cc35a14e2144d96cb5392798
+MD5 f02e837530cb41c6d56ee328915709ec amavisd-new-2.4.4.ebuild 5126
+RMD160 b416940c18022922b0aa8cb8abc0220a7386041c amavisd-new-2.4.4.ebuild 5126
+SHA256 6363632a0254213678b973d374676713c5141403cc35a14e2144d96cb5392798 amavisd-new-2.4.4.ebuild 5126
+MISC ChangeLog 21130 RMD160 7c6e4a94136910c0b391b3dc3374ccacfe01bba7 SHA1 0da085527d8598b32e2a45a3c6666b91e2b7e1d0 SHA256 0454f65e89ce45e9f4692ebcd8bec159e1a29a7ba151d886c86329f5ad7979db
+MD5 9710bfa129987d60404132beccce3eda ChangeLog 21130
+RMD160 7c6e4a94136910c0b391b3dc3374ccacfe01bba7 ChangeLog 21130
+SHA256 0454f65e89ce45e9f4692ebcd8bec159e1a29a7ba151d886c86329f5ad7979db ChangeLog 21130
 MISC metadata.xml 184 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 SHA1 cc0a188d9ad2411e78747326c62dd046bd5413c8 SHA256 d51011aa837db802ef539a1321a4af0a4a00879d475b92fd58f3c01df7320b58
 MD5 7e32edfd72887a57b16ecd73f0f7a1a0 metadata.xml 184
 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 metadata.xml 184
@@ -91,7 +95,7 @@ SHA256 3efe36b42ef294cc88b43fd99e066f1599af37a38b5764681067bb76b601a091 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFun6FQlM6RnzZP+IRAhidAJ0WZq7EJnSdN2Ra/srOx9wL/X384QCguP/s
-UpPYPYcNybHOn8OfYwjQRdM=
-=ls5S
+iD8DBQFFvo7lQlM6RnzZP+IRAhEQAJ0UWOz8xCg/Yu2xxB7LZTfcHsKmhACfQ9Rb
+wmg+n6HfkntDulEQBCX1AU8=
+=HKWe
 -----END PGP SIGNATURE-----

diff --git a/mail-filter/amavisd-new/amavisd-new-2.4.4.ebuild b/mail-filter/amavisd-new/amavisd-new-2.4.4.ebuild
index 49d3a2672caec57900d192aef38811e1edc9a521..abceb57cd6ee778b054ec61a07bbbedd5b333c6a 100644 (file)
--- a/mail-filter/amavisd-new/amavisd-new-2.4.4.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.4.ebuild,v 1.3 2007/01/26 22:17:13 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.4.ebuild,v 1.4 2007/01/30 00:18:32 ticho Exp $
 
 inherit eutils
 
@@ -75,8 +75,10 @@ src_unpack() {
                epatch "amavisd-new-qmqpqq.patch" || die "patch failed"
 
                einfo "Patching with qmail lf bug workaround."
-               epatch "${FILESDIR}/${P%.*}-qmail-lf-workaround.patch" || die "patch failed"
+               epatch "${FILESDIR}/${P}-qmail-lf-workaround.patch" || die "patch failed"
        fi
+               einfo "Patching with qmail lf bug workaround."
+               epatch "${FILESDIR}/${P}-qmail-lf-workaround.patch" || die "patch failed"
 
        epatch "${FILESDIR}/${P}-amavisd.conf-gentoo.patch" || die "patch failed"
 }

diff --git a/mail-filter/amavisd-new/files/amavisd-new-2.4.4-qmail-lf-workaround.patch b/mail-filter/amavisd-new/files/amavisd-new-2.4.4-qmail-lf-workaround.patch
new file mode 100644 (file)
index 0000000..bfbeacf
--- /dev/null
+++ b/mail-filter/amavisd-new/files/amavisd-new-2.4.4-qmail-lf-workaround.patch
@@ -0,0 +1,18 @@
+--- amavisd    2007-01-30 01:13:27.000000000 +0100
++++ amavisd.ticho      2007-01-30 01:13:12.000000000 +0100
+@@ -13224,13 +13224,13 @@
+         # we'll be calling Net::Cmd::datasend directly for speed
+         $smtp_data_fh->flush or die "Error flushing smtp_data_fh: $!";
+ 
+-        while (($nbytes=$msg->read($buff,65536)) > 0) {
++                              for ($! = 0; defined($buff=$msg->getline); $! = 0) {
+           do_log(-1,"WARN: Unicode string passed to Net::Cmd::datasend")
+             if $unicode_aware && Encode::is_utf8($buff);
+           $smtp_handle->datasend($buff)
+             or die "datasend timed out while sending body";
+         }
+-        defined $nbytes or die "Error reading: $!";
++                              defined $buff || $!==0 or die "Error reading: $!";
+       }
+       $smtp_data_fh->close or die "Error closing smtp_data_fh: $!";
+       $smtp_data_fh = undef;