Fix new -B option. Thanks to Christian Roessner. Fixes #517088

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x296C6CCA35A64134

4 files changed, 69 insertions, 17 deletions

diff --git a/mail-filter/amavisd-milter/ChangeLog b/mail-filter/amavisd-milter/ChangeLog
index 12694b035ae6..9f36ad1d61cf 100644
--- a/mail-filter/amavisd-milter/ChangeLog
+++ b/mail-filter/amavisd-milter/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-filter/amavisd-milter
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-milter/ChangeLog,v 1.9 2014/06/07 19:15:27 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-milter/ChangeLog,v 1.10 2015/01/16 11:08:17 mschiff Exp $
+
+*amavisd-milter-1.6.0-r1 (16 Jan 2015)
+
+  16 Jan 2015; Marc Schiffbauer <mschiff@gentoo.org>
+  +amavisd-milter-1.6.0-r1.ebuild, +files/amavisd-milter-1.6.0-policybank.patch:
+  Fix new -B option. Thanks to Christian Roessner. Fixes #517088
 
   07 Jun 2014; Agostino Sarubbo <ago@gentoo.org> amavisd-milter-1.5.0-r1.ebuild:
   Stable for x86, wrt bug #502824
diff --git a/mail-filter/amavisd-milter/Manifest b/mail-filter/amavisd-milter/Manifest
index 8337d748c635..46008f672d3b 100644
--- a/mail-filter/amavisd-milter/Manifest
+++ b/mail-filter/amavisd-milter/Manifest
@@ -1,29 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX amavisd-milter-1.6.0-policybank.patch 937 SHA256 86e11cbfc8b26ad91f7f405837ccdb5f6fed9eece1a18c7c50e5111750ee51a8 SHA512 a329e9b4e0c7b7de4b2b09ec8cf9f9157f7602761843278239530831673bd70e4a15cc5b3ec91700808de6a6a29baa00ea2f96d6c40736da27c7cb4fc059af4d WHIRLPOOL d0ce2336983289f97b844c60b975775907249bd6cb2e2d4f67d6894e47a49a322e4e868d6e4b852131c76fb16e3aa15074a91c44d819419e8a57ac324f7a9e03
 AUX amavisd-milter.confd 357 SHA256 fa8208d3bd15141808fc4612011a1f58850758a6191dbb81fad52e30312d9746 SHA512 354c7e1a0224bd0f8bd40e35dca99fc5c489f9b7ecc2292d992e5594ac969800ab19e99a784957bcc76e3b06788b0623fc5019d8965f002a67c3e01681c541de WHIRLPOOL 71ade6f23330e84ee23b0ba325f024880dc51ed3fa958e844464af79201fe6b8740a373355dca123ad98b7d9a7e29031eb20f1aa3cb79b2f2e08b0eff3a80ed9
 AUX amavisd-milter.initd 803 SHA256 072dc18b25a6b2138ce29fcd3c69cd4b181ff59d26fd76fc5edfa1004c7489fb SHA512 897aa7e944761b2a442a6e53013bedac21bb3d5f2e2e793602d2357f47c4fcc66f229223ce4fbdad28bbf462e92c5f52d8fb50986baff4ad8a0405eb100a7581 WHIRLPOOL 73fe1df065c57805ff29b066eb3cdb622f1df24a68839dfdeb94df8b145b1048397112aac1594848df3d68f16fdeac048c8c412ff6d5ca073c4eade2eb6e745f
 DIST amavisd-milter-1.5.0.tar.gz 175759 SHA256 cef897e2c172272d52a6e5d9415b25252bf669f0481f9bdf24e95d3071c5a2c5 SHA512 ef206cd2c64cf48edb8a679b92a960451e0edbec11e0c207942bf6f435f7d14538a409d8197774ea4bbf63f27ed73d52a7c51531155be6d8724981b5dd9e0037 WHIRLPOOL d48dfd540fdcae728425f0209f6fe2601a1bdbac9299d346ccc06f56da00f10b6c506b15129d93df1bf670a861afc25d40d1344369377f1ff0ee23cf90f40f39
 DIST amavisd-milter-1.6.0.tar.gz 187994 SHA256 c195750d42df41f4642a26b020fec1ba5752a997bcb366c70cd384bc560a98cd SHA512 2e0b39b733f88742fcb2f4e884e528b70731ad5950bd56d3af1391d666dc018d2f6c1ad4212e787872a503bccbc65c52d55ae195c384e9333e4f39d25b1d1a34 WHIRLPOOL ab1c0aee71597b0c5ccd3375a0df3ffd81ee24a69946b02d8e37a376ef1dca259c519338d5d7a391dd0947de907192d740ce8797f3a58b546461564dcc238d95
 EBUILD amavisd-milter-1.5.0-r1.ebuild 810 SHA256 3d33191f2eff313dd0760c61ca24dbe1c285d4f57cab1889b2d2faa5c47ae6c4 SHA512 8bdca90a75a372808163bc8f7264091ce2135518c9b7cdef3161acea6856eba004a1e1298b69070c42af3ad4eccd35a2a16d7dd858cf65b8c8711e5b00fde41d WHIRLPOOL 9e15da60d5706174f07dfcc92675ff2647a227c9d3a06352c777905ce43a309e115945e535e61a11820b208a26920504a8ee1036dcac02941a18b0af7692e90a
 EBUILD amavisd-milter-1.5.0.ebuild 757 SHA256 b0eca7a71f178ef913cfa618de9dbfaf0265508dcebf8ec605ff733eb1fc12ff SHA512 106e15323ad565804530b199eced21c050ee5dd2e73cd4aacf2c48d6f7805d506f073b167375b7892ffd4232a5d99d9694fe2ff801e81e1bb4b800c0255bd4fc WHIRLPOOL 65fcdfb2e0c24e9140f1e2a664f1b625bee2f4e95689223f6f431e43867b9bac091c6b03c68ff9b569cab3abe73e8990d5de6e0e600cb7192dbef18d7e6532e0
+EBUILD amavisd-milter-1.6.0-r1.ebuild 860 SHA256 37488409bc2194471e3f9961f0ade11299a04e6ecdd23ce10013e210035cb7bf SHA512 e977aa5acc95fda303905415522ae1bf38b1cf66a79c89d21d70cd4830e0039097d39a9e8f8439c69a54712a2d47a1cacc369d0c231f1bcfcb9090588553309f WHIRLPOOL 70f9db56cea879aba07fc29fb9eac614f13aa5dba2902de45c539977fe180193cca43ce0786e97cfe50ecfb7d43d5f0bb7105e950e078ba2b524dbdcabf33fcb
 EBUILD amavisd-milter-1.6.0.ebuild 810 SHA256 ca2da5029c6d9167417d3599d0fb0c68384730630122ea97a68a4dcf32492ff4 SHA512 a36d520bbfed0c71befc2a36d38458d738eb241ba15ba36b8e3187dbee166b78f5ac840d6b33041a613eabb6cd3fb102bbc1e8a6fc86216df8f107d8b3dbbd01 WHIRLPOOL 935cd523fdad7103846318b73d4cba75214c86380f81c63910e3bfbe5973d8e7a849e3f9e3fd2ba32a7943a0562331b48012d1aab960557ea3b2ea0e24145dc0
-MISC ChangeLog 1466 SHA256 4ff66f4d680adf25692604e28f59f0ded86e2db8557c0442466f49dba41b0d03 SHA512 9a3a42fe97509988359a1bcd95c1432a762afe9c1eee3b1f40503d7e0b1ad2e2c5b694a92ca9207ff2059c329814e16f1aef35b40cdab1e9d042f6a38d631775 WHIRLPOOL cb32c5492612775840e7d974fac0ac811abf787a5c06bc0dcd6fb92d22c3cb0fc16b634898482a9b0be116470a29902c183aaf91ad2c8fdd14ed537c6f2ac9cd
+MISC ChangeLog 1711 SHA256 df0d19a9dbe16d9986585cc885dcbdf02a4701f594ae93e20022330a0c38ea0e SHA512 33ee06b468cd5baf75b9173f407381915bb05ca69cb36da5ccd9dde99ca3896dd69986fc0e6be0e9667f2024436a68d7af7593301f9ae71ef043587eb256a414 WHIRLPOOL 2c7d5233fee73081815b50d74b02e3106952896d6648018699528814baeb1239f5ca02cade209c2443d24c2a7f4467a591d9583f8f3e9b61a872fe8321d8f918
 MISC metadata.xml 208 SHA256 fc3144c7664167b56b0babaed686a8f63744ecabdd9490486e035040f9676e58 SHA512 bbb32b94e05fe820f49b9fc9886803c4c7cafdb32e0f93e7ce5b02d9737d8c7f68ef6b862e912af8a5c61b31a7d48ea43c69a807accc83dfce147f32569af058 WHIRLPOOL 2b606e04de80a5123b09be8cc6ebd1e2639ce4c9debdd0e79db1f8f380ebbad61edd1edc1eb97ffa8f23c900745eb1efcb708120aee17db0f5b6643ba2d6e215
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTk2TRAAoJELp701BxlEWftlYP/25ImtsWZlLcxMT7oOk/0xy2
-8mH5iGmchDHL7jkIOz4/ojxec1SkCg7C+Xg+ZwK3/nkGxocLhjYu0VHEWONe/Hdv
-mJb5/AH4WJxaI4qZI/XBy8+6fa7qGi7OEb4kfnppp4ZXCVtYRwrk6T5Fib3doIcS
-U100NCqMC2wo64IPh21DRt7ktpnIJ6dVKM5lzZU/QqUgRlRJwOzGmO/X2XqXOxzu
-bd0XASvOw60AKRt7QvjYvAvlRq1zpB9Hjbe3+kPFkX5FR5VmcyM/ImbnSTG7258V
-yww9nGcZuqhfP1gLGX7EXHf/1vDFS8zLvTkO64LeZNu2NYer0C3TSxH18/fobrSq
-jP5NMUimkt0z3/VhCjyBOGZCsHnMqMUffDHbzOvIYoKls9DRLarFvTOgTsI93L6g
-26UccwJWUl++L02PC1B62eRXCR0ew1O/uS/JdboTBWLwhXkfpPfC6QHxpyy3L7DW
-9EE8tZ3xF/7oYrac/uPyMmgosuANUVXKzeAmmD6vpBkEOWgB2L9cPjdpanutg8oM
-IKO5Vh+xyqTOrWh3Drdzn7QFtyR72Pct851vFmUP8yUq7cLGqW9DA3uFfjadHKNF
-4TJczLruJxR9BtEOyCAKYzovBtDtcnGIaqSgHnl6rwd2aELSN5/xF1awd30cAjcP
-m19CX1+4s8rsTLrWuNcy
-=K8Py
+iD8DBQFUuPEnKWxsyjWmQTQRCH/dAJ9ezRFTQ0F7AO7FhRUorE5N40y8BQCgkrhV
+8wgC6odXjOpSc2I9JZABM9U=
+=vji0
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/amavisd-milter/amavisd-milter-1.6.0-r1.ebuild b/mail-filter/amavisd-milter/amavisd-milter-1.6.0-r1.ebuild
new file mode 100644
index 000000000000..ea354dc78036
--- /dev/null
+++ b/mail-filter/amavisd-milter/amavisd-milter-1.6.0-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-milter/amavisd-milter-1.6.0-r1.ebuild,v 1.1 2015/01/16 11:08:17 mschiff Exp $
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="sendmail milter for amavisd-new"
+HOMEPAGE="http://amavisd-milter.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
+		mail-filter/amavisd-new"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-policybank.patch"
+	epatch_user
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS CHANGES INSTALL README TODO
+
+	newinitd "${FILESDIR}/amavisd-milter.initd" amavisd-milter
+	newconfd "${FILESDIR}/amavisd-milter.confd" amavisd-milter
+}
diff --git a/mail-filter/amavisd-milter/files/amavisd-milter-1.6.0-policybank.patch b/mail-filter/amavisd-milter/files/amavisd-milter-1.6.0-policybank.patch
new file mode 100644
index 000000000000..afbdefc55c80
--- /dev/null
+++ b/mail-filter/amavisd-milter/files/amavisd-milter-1.6.0-policybank.patch
@@ -0,0 +1,20 @@
+--- amavisd-milter/mlfi.c	22 Apr 2013 00:36:12 -0000	1.60
++++ amavisd-milter/mlfi.c	13 Jan 2015 17:00:47 -0000
+@@ -695,14 +695,14 @@
+     l = 0;
+     *mlfi->mlfi_amabuf = '\0';
+     if ((policybank_from_daemon_name == 1) && (mlfi->mlfi_daemon_name != NULL)) {
+-	l += snprintfcat(0, mlfi->mlfi_amabuf, mlfi->mlfi_amabuf_length,
++	l += snprintfcat(l, mlfi->mlfi_amabuf, mlfi->mlfi_amabuf_length,
+ 	    "%s", mlfi->mlfi_daemon_name);
+     }
+     if (auth_type != NULL) {
+ 	if (l > 0) {
+-	    l += snprintfcat(0, mlfi->mlfi_amabuf, mlfi->mlfi_amabuf_length, ",");
++	    l += snprintfcat(l, mlfi->mlfi_amabuf, mlfi->mlfi_amabuf_length, ",");
+ 	}
+-	l += snprintfcat(0, mlfi->mlfi_amabuf, mlfi->mlfi_amabuf_length,
++	l += snprintfcat(l, mlfi->mlfi_amabuf, mlfi->mlfi_amabuf_length,
+ 	    "SMTP_AUTH,SMTP_AUTH_%s", auth_type);
+ 	if (auth_ssf != NULL && *auth_ssf != '\0') {
+ 	    l += snprintfcat(l, mlfi->mlfi_amabuf, mlfi->mlfi_amabuf_length,