diff options
| author |   Andrej Kacian <ticho@gentoo.org> | 2007-01-30 00:18:33 +0000 |
|---|---|---|
| committer | Andrej Kacian <ticho@gentoo.org> | 2007-01-30 00:18:33 +0000 |
| commit | 6bd4030b10baef26db02668b8da901390f0e4bfd (patch) | |
| tree | f869ab19ad3252c9f27ae6a7473861061ded31c3 /mail-filter | |
| parent | fix digest for Caster and I HATE YOU CVS ATTIC (diff) | |
| download | gentoo-2-6bd4030b10baef26db02668b8da901390f0e4bfd.tar.gz gentoo-2-6bd4030b10baef26db02668b8da901390f0e4bfd.tar.bz2 gentoo-2-6bd4030b10baef26db02668b8da901390f0e4bfd.zip | |
Provide new qmail-lf-workaround patch for 2.4.4. Bug #163689, reported by Elliot Van Resbeck <ellmout at ellmout.net>.
(Portage version: 2.1.2-r4)
Diffstat (limited to 'mail-filter')
| -rw-r--r-- | mail-filter/amavisd-new/ChangeLog | 8 | ||||
| -rw-r--r-- | mail-filter/amavisd-new/amavisd-new-2.4.4.ebuild | 6 | ||||
| -rw-r--r-- | mail-filter/amavisd-new/files/amavisd-new-2.4.4-qmail-lf-workaround.patch | 18 |
3 files changed, 29 insertions, 3 deletions
diff --git a/mail-filter/amavisd-new/ChangeLog b/mail-filter/amavisd-new/ChangeLog index 5ba2231e1bdf..c96d4f8d8379 100644 --- 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/amavisd-new-2.4.4.ebuild b/mail-filter/amavisd-new/amavisd-new-2.4.4.ebuild index 49d3a2672cae..abceb57cd6ee 100644 --- 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 index 000000000000..bfbeacf9aa99 --- /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; |