Version bump and fix for mails with no body (submitted upstream).

Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64

4 files changed, 136 insertions, 15 deletions

diff --git a/mail-mta/qpsmtpd/ChangeLog b/mail-mta/qpsmtpd/ChangeLog
index 1e8f9acc9705..56d378eec3af 100644
--- a/mail-mta/qpsmtpd/ChangeLog
+++ b/mail-mta/qpsmtpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-mta/qpsmtpd
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/ChangeLog,v 1.12 2011/09/20 22:49:28 mgorny Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/ChangeLog,v 1.13 2012/02/29 09:33:37 robbat2 Exp $
+
+*qpsmtpd-0.84 (29 Feb 2012)
+
+  29 Feb 2012; Robin H. Johnson <robbat2@gentoo.org>
+  +files/qpsmtpd-0.83-accept-empty-email.patch, +qpsmtpd-0.84.ebuild:
+  Version bump and fix for mails with no body (submitted upstream).
 
   20 Sep 2011; Michał Górny <mgorny@gentoo.org> qpsmtpd-9999.ebuild:
   Migrate to git-2.
diff --git a/mail-mta/qpsmtpd/Manifest b/mail-mta/qpsmtpd/Manifest
index 74070c164e84..1a612cf257c7 100644
--- a/mail-mta/qpsmtpd/Manifest
+++ b/mail-mta/qpsmtpd/Manifest
@@ -1,11 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX qpsmtpd-0.40-badhelo_disconnect.patch 520 RMD160 f4e72cbe1d769206f719d0f3eff3c14a9216a1b8 SHA1 24ec87ae2cf9e95a8850640081b1a6594a030360 SHA256 f93dff30d7a6837b8b3e5b4b6ef9b02bb4fdeb58499e54f4d94d43668ad82970
 AUX qpsmtpd-0.40-badrcptto_allowrelay.patch 498 RMD160 8afc719f895da5aeb9a8333daaf0b690eb44d56b SHA1 2f5d4d34560415000bc0319b5bfe993f6734ea43 SHA256 f0bc5f9d4865084ef673e5271725dd01ec1d3fbfcf4ea47988d728c5acd14acf
 AUX qpsmtpd-0.40-clamd_conf.patch 707 RMD160 819b17f489ca014d3552243af15084ea6ec4fa56 SHA1 9dd3aed08fa07e7748342c9743bc29a5440e5f50 SHA256 bedc83603a4411670d4926366d0c23b0ebcf5ec00aed4621135e66c25319d927
 AUX qpsmtpd-0.40-peer_hooks.patch 1681 RMD160 8aef8e002662b833b4cb44b02bd5de5439c2fa8f SHA1 d60bb457648a66c1e85649ad9d3a414bcf4a9cad SHA256 f2b73ddd6c27b40738b15092db6c5557e0444f2ce3e93687256ad7c2e97283f3
 AUX qpsmtpd-0.43-peer_hooks.patch 1698 RMD160 c9b270b43978fcdd570a288accd548c121b626ec SHA1 118b2c20e3566400a333af090b7299bce8dde4f7 SHA256 2eb53a921f01811ca6cdd550337c63c395f6ff48d809c0f9960ba8005505e363
+AUX qpsmtpd-0.83-accept-empty-email.patch 1599 RMD160 7fbde5346d9b73a706f826238d236d86681d89ca SHA1 b899647528c43b7b3e42ef33b211dd2dc36ef85e SHA256 036d280a67da1b737b16cb56ab4acb5fa03b2ade2d38399262c63583ee6874a7
 AUX qpsmtpd-0.83-clamd_conf.patch 706 RMD160 fe1a169917c435df4b73097e26b0f627ba421278 SHA1 b4c7c5c169eba9bf700c8b383c78106c8d6f19b8 SHA256 ead4226d7037bbeac5ca66b162a8858da520ef6be73604cfe0e86c9aa51aa6f3
 AUX qpsmtpd.confd 617 RMD160 3b95ace716df3f61f9280ca783dbef43e6ee23ac SHA1 b409a52c77fad35b1a6f3c4e7eb65a7fb78cea89 SHA256 7748b525d9c3a3e8cbeec66b8b5df48510a44a1d624168278ce71720e7de8bc0
 AUX qpsmtpd.envd 74 RMD160 963ae15c132be3f99226bf5efed7da5b8f3c2570 SHA1 3a9975274ee6b8cbf2158b5643bd692291625fe8 SHA256 bbf8f40198e8a87ff6103b5dc98cae561f0dc9738a6cda3492b00468fbfdfd8e
@@ -14,20 +12,13 @@ AUX qpsmtpd.xinetd 526 RMD160 040c159e3c637dc00f1816088852207766c286fa SHA1 81de
 DIST qpsmtpd-0.81.tar.gz 175691 RMD160 945029280222e6221445a89c61e124f266ba4bed SHA1 8bfe4142565f9aaf407bcdc94da62cf09e00190e SHA256 302f16be06c62aac3135a5ab8fe29612e7831769e11861e5a98190987b58517d
 DIST qpsmtpd-0.82.tar.gz 176806 RMD160 8d7642f1887278ce45b3355de7da7f6b2c98a7d4 SHA1 540155086c0b5e553f951ef4f8967886384dca24 SHA256 794af76a1be3cc766ce034311a351ff76b0323c2decc49af96d626e3f3de4df9
 DIST qpsmtpd-0.83.tar.gz 177298 RMD160 b65f81b88635bc00465fe1493ee1d5f073b36255 SHA1 7d614f0a0dcdaa174e76e9853989cc86009c7d08 SHA256 4de72f28dd9b36e7e7c9de6c2574627e6704a181b99ced1949e4949dc9ff0925
+DIST qpsmtpd-0.84.tar.gz 178260 RMD160 baaf4527539090a745f6f78ec855f6e503242f95 SHA1 329943caf8e8671b09b2a5030a41a1c62c287482 SHA256 a09865816322531edd59d6fecd4bda35a9d583610b69d69a86e44038da841c98
 EBUILD qpsmtpd-0.43_rc2_pre955.ebuild 2496 RMD160 057e325094aa85dc264a570b4f13dfad2b88094c SHA1 60a5fb8e09c1660c7dd7a0077b5329d4d936af1a SHA256 3b19c2fb0516a78a6403d2faded4f388ba10ca0d1f0ef73208447e3d94daae11
 EBUILD qpsmtpd-0.81.ebuild 2334 RMD160 26d7f5faaea8ab0acaae8d08c12acb0bfd0080ed SHA1 1ac279d8a1f7908143ea16ada54b218bff3f8b22 SHA256 ffb06381ad72b21ce16a75fc2a6a39a41de440011832e573f6816ff0024cbb9c
 EBUILD qpsmtpd-0.82.ebuild 2173 RMD160 da339be1d8e7ea2a6d537649d16d6d9e9efcfe1a SHA1 543f8ecdd9a0098588d39f1cf4bd8a5d4ab704f7 SHA256 0b6007749b592edeafcff31c285d2a87f3db9b5ba032c9d6b8bed0ec8fa2329c
 EBUILD qpsmtpd-0.83-r1.ebuild 2190 RMD160 4c0e1ac9bcfa1035c59c7ebc48200216bd2720a2 SHA1 3195435fe2606a6d11bc37c40e1c23239739536c SHA256 d8d110f041d3b6d704037a8853f20e167ebde66f7826cdc3f8e4b5759ca6cdc0
 EBUILD qpsmtpd-0.83.ebuild 2115 RMD160 a6b72c34e9812ac93a2fb1637d81db0e72bedcf7 SHA1 00e4ec6e015dc674f5c15a4b18e8a90116d2c2f2 SHA256 feee2ed9c6eb4479a163f4aa875dc427b744d44597ed67b7735e2869954a884a
+EBUILD qpsmtpd-0.84.ebuild 2244 RMD160 5a43726021a1c6b77db3a28856b82306df1891ec SHA1 50fa2d1af69e315884e79c05f42ca613a29bad6b SHA256 60cd608e3fc9c6c9f157e870f1726db8d60441721914a3ba318163a88940eeac
 EBUILD qpsmtpd-9999.ebuild 2145 RMD160 d8023cb10e9c38c5766c1c2ac1311c86cacd1307 SHA1 474bbcae16eb5dc5645b846a1ba9b898f204e583 SHA256 d839ee50f153cb03ed9c76e2316e8958dd4e80bb13f647f76f03c8968756b9be
-MISC ChangeLog 2648 RMD160 f5f8705f34939e884f73668597b6b6e01a152ebb SHA1 883ba9583b28117d4cbc6e541789ce832776a3d7 SHA256 6240727163f73feaabac559fe94cf62398e2203b476422c4c5d739f8587c4d88
+MISC ChangeLog 2870 RMD160 a471706e2f5312c817897699b8c535d6bc2b1d4a SHA1 23d3d21a0fbe029ecd3b93eac706375ab0b347c4 SHA256 ec39510ee7c517c4a0b3b983fa2e0670febb1ddcf93ab26be2ce3f3567a64217
 MISC metadata.xml 485 RMD160 0362a983d522720988a075feb3fe643ef09d7e36 SHA1 2fa98543a44b5b9a73f248f4fd605c1de32f56d1 SHA256 5f825ec7910cf1e3486d9d490f2bdbbacb68a2532a7a691500150c1b10c09e06
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iJwEAQEIAAYFAk55GP0ACgkQfXuS5UK5QB0ZzwP/UXATQaBUPLZvJGzzcCMxCrf9
-NBL/skT6rYY5zZTj/o1Y7qXxL8rSB21kJSr59yJzjooo6TCSboGtvrLVQ0AuKPxk
-lbSg8zuhxqRTYYZ8pHwoIMLIb+a9Adam0GE892rwh/uFvC0tCYL+l6cCchGAMc+A
-4SODTrAW5W8cPMrCBZs=
-=60xQ
------END PGP SIGNATURE-----
diff --git a/mail-mta/qpsmtpd/files/qpsmtpd-0.83-accept-empty-email.patch b/mail-mta/qpsmtpd/files/qpsmtpd-0.83-accept-empty-email.patch
new file mode 100644
index 000000000000..2e1dcacc46c3
--- /dev/null
+++ b/mail-mta/qpsmtpd/files/qpsmtpd-0.83-accept-empty-email.patch
@@ -0,0 +1,44 @@
+Accept messages with no body.
+
+If a message has no body, there is nothing in the RFC spec that says it
+needs to have a trailing \n for a blank line after the headers.
+
+Thumderbird 10 generates some emails like this, which will always cause
+plugin errors when $transaction->header is accessed otherwise, as there
+is almost no checking that $transaction->header is defined before usage.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+Thanks-To: Jack Bates <ms419@freezone.co.uk>
+
+--- qpsmtpd-0.83.orig/lib/Qpsmtpd/SMTP.pm	2009-04-03 06:24:21.000000000 +0000
++++ qpsmtpd-0.83/lib/Qpsmtpd/SMTP.pm	2012-02-25 05:52:14.000000000 +0000
+@@ -632,7 +632,7 @@
+ 
+   my $timeout = $self->config('timeout');
+   while (defined($_ = $self->getline($timeout))) {
+-    $complete++, last if $_ eq ".\r\n";
++    $complete++, $_ = '' if $_ eq ".\r\n";
+     $i++;
+ 
+     # should probably use \012 and \015 in these checks instead of \r and \n ...
+@@ -648,7 +648,7 @@
+     unless (($max_size and $size > $max_size)) {
+       s/\r\n$/\n/;
+       s/^\.\./\./;
+-      if ($in_header and m/^$/) {
++      if ($in_header and (m/^$/ or $complete > 0)) {
+         $in_header = 0;
+         my @headers = split /^/m, $buffer;
+ 
+@@ -691,9 +691,10 @@
+ 
+       # copy all lines into the spool file, including the headers
+       # we will create a new header later before sending onwards
+-      $self->transaction->body_write($_);
++      $self->transaction->body_write($_) unless $complete;
+       $size += length $_;
+     }
++    last if $complete > 0;
+     #$self->log(LOGDEBUG, "size is at $size\n") unless ($i % 300);
+   }
+ 
diff --git a/mail-mta/qpsmtpd/qpsmtpd-0.84.ebuild b/mail-mta/qpsmtpd/qpsmtpd-0.84.ebuild
new file mode 100644
index 000000000000..e8324d860e38
--- /dev/null
+++ b/mail-mta/qpsmtpd/qpsmtpd-0.84.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qpsmtpd/qpsmtpd-0.84.ebuild,v 1.1 2012/02/29 09:33:37 robbat2 Exp $
+
+EAPI=2
+
+inherit eutils perl-app
+
+DESCRIPTION="qpsmtpd is a flexible smtpd daemon written in Perl"
+HOMEPAGE="http://smtpd.develooper.com"
+SRC_URI="http://smtpd.develooper.com/files/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="postfix ipv6 syslog"
+
+RDEPEND=">=dev-lang/perl-5.8.0
+	dev-perl/Net-DNS
+	virtual/perl-MIME-Base64
+	dev-perl/MailTools
+	dev-perl/IPC-Shareable
+	dev-perl/Socket6
+	dev-perl/Danga-Socket
+	dev-perl/ParaDNS
+	ipv6? ( dev-perl/IO-Socket-INET6 )
+	syslog? ( virtual/perl-Sys-Syslog )
+	virtual/inetd"
+
+pkg_setup() {
+	enewgroup smtpd
+	local additional_groups
+	if use postfix; then
+		additional_groups="${additional_groups},postdrop"
+	fi
+	enewuser smtpd -1 -1 /var/spool/qpsmtpd smtpd${additional_groups}
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.40-badrcptto_allowrelay.patch
+	#epatch "${FILESDIR}"/${PN}-0.83-clamd_conf.patch
+	epatch "${FILESDIR}"/${PN}-0.83-accept-empty-email.patch
+}
+
+src_install() {
+	perl-module_src_install
+
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/qpsmtpd.xinetd qpsmtpd
+
+	dodir /usr/share/qpsmtpd
+	cp -Rf plugins "${D}"/usr/share/qpsmtpd/
+
+	insinto /etc/qpsmtpd
+	doins config.sample/*
+
+	echo "/usr/share/qpsmtpd/plugins" > "${D}"/etc/qpsmtpd/plugin_dirs
+	echo "/var/spool/qpsmtpd" > "${D}"/etc/qpsmtpd/spool_dir
+	cat >"${D}"/etc/qpsmtpd/logging <<-EOF
+		#logging/syslog loglevel LOGINFO priority LOG_NOTICE
+		#logging/file loglevel LOGINFO /var/log/qpsmtpd/%Y-%m-%d
+	EOF
+	if use syslog; then
+		sed -i -e '/^#logging\/syslog/s,^#,,g' "${D}"/etc/qpsmtpd/logging
+	else
+		sed -i -e '/^#logging\/file/s,^#,,g' "${D}"/etc/qpsmtpd/logging
+	fi
+
+	newenvd "${FILESDIR}"/qpsmtpd.envd 99qpsmtpd
+
+	newconfd "${FILESDIR}"/qpsmtpd.confd qpsmtpd || die "Installing conf.d file"
+	newinitd "${FILESDIR}"/qpsmtpd.initd qpsmtpd || die "Installing init.d file"
+
+	dodoc CREDITS Changes README README.plugins STATUS
+
+	diropts -m 0755 -o smtpd -g smtpd
+	dodir /var/spool/qpsmtpd /var/run/qpsmtpd /var/log/qpsmtpd
+	keepdir /var/spool/qpsmtpd /var/run/qpsmtpd /var/log/qpsmtpd
+
+}