diff options
| author |   Marc Schiffbauer <mschiff@gentoo.org> | 2015-01-16 11:08:17 +0000 |
|---|---|---|
| committer | Marc Schiffbauer <mschiff@gentoo.org> | 2015-01-16 11:08:17 +0000 |
| commit | aade4090c3d299c3bfb82042fbf4e92b4ca77e93 (patch) | |
| tree | cf4bbb7a59a64d36ea8b673560f5be6721395e5c /mail-filter | |
| parent | Stable for x86, wrt bug #533312 (diff) | |
| download | gentoo-2-aade4090c3d299c3bfb82042fbf4e92b4ca77e93.tar.gz gentoo-2-aade4090c3d299c3bfb82042fbf4e92b4ca77e93.tar.bz2 gentoo-2-aade4090c3d299c3bfb82042fbf4e92b4ca77e93.zip | |
Fix new -B option. Thanks to Christian Roessner. Fixes #517088
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0x296C6CCA35A64134)
Diffstat (limited to 'mail-filter')
3 files changed, 62 insertions, 2 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/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, |