mail-filter/amavisd-new: DKIM signing bugfix

amavisd-new version 2.11.0 introduced a bug which breaks DKIM signing
for outbound mail. This ebuild adds a patch which fixes the issue.

Closes: https://bugs.gentoo.org/603582
Signed-off-by: Ralph Seichter <gentoo@seichter.de>
Closes: https://github.com/gentoo/gentoo/pull/10058
Package-Manager: Portage-2.3.49, Repoman-2.3.10
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>

diff --git a/mail-filter/amavisd-new/amavisd-new-2.11.0-r4.ebuild b/mail-filter/amavisd-new/amavisd-new-2.11.0-r4.ebuild
new file mode 100644 (file)
index 0000000..0efc27e
--- /dev/null
+++ b/mail-filter/amavisd-new/amavisd-new-2.11.0-r4.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit systemd user
+
+MY_P="${P/_/-}"
+DESCRIPTION="High-performance interface between the MTA and content checkers"
+HOMEPAGE="https://www.ijs.si/software/amavisd/"
+SRC_URI="https://www.ijs.si/software/amavisd/${MY_P}.tar.xz"
+PORTAGE_DOHTML_WARN_ON_SKIPPED_FILES=yes
+
+LICENSE="GPL-2 BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="clamav courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq"
+
+DEPEND=">=sys-apps/sed-4
+       >=dev-lang/perl-5.10.0"
+
+RDEPEND="${DEPEND}
+       >=sys-apps/coreutils-5.0-r3
+       app-arch/cpio
+       app-arch/gzip
+       app-arch/bzip2
+       app-arch/arc
+       app-arch/cabextract
+       app-arch/freeze
+       app-arch/lha
+       app-arch/lrzip
+       app-arch/lzop
+       app-arch/ncompress
+       app-arch/p7zip
+       app-arch/pax
+       app-arch/unarj
+       app-arch/unrar
+       app-arch/xz-utils
+       app-arch/zoo
+       net-mail/ripole
+       >=dev-perl/Archive-Zip-1.14
+       >=virtual/perl-IO-Compress-1.35
+       >=virtual/perl-Compress-Raw-Zlib-2.017
+       net-mail/tnef
+       virtual/perl-MIME-Base64
+       >=dev-perl/MIME-tools-5.415
+       >=dev-perl/MailTools-1.58
+       >=dev-perl/Net-Server-0.91
+       virtual/perl-Digest-MD5
+       dev-perl/IO-stringy
+       virtual/perl-IO-Socket-IP
+       >=virtual/perl-Time-HiRes-1.49
+       dev-perl/Unix-Syslog
+       dev-perl/Net-LibIDN
+       sys-apps/file
+       >=sys-libs/db-4.4.20
+       dev-perl/BerkeleyDB
+       dev-perl/Convert-BinHex
+       >=dev-perl/Mail-DKIM-0.31
+       virtual/perl-File-Temp
+       dev-perl/Net-SSLeay
+       dev-perl/IO-Socket-SSL
+       virtual/mta
+       clamav? ( app-antivirus/clamav )
+       ldap? ( >=dev-perl/perl-ldap-0.33 )
+       mysql? ( dev-perl/DBD-mysql )
+       postgres? ( dev-perl/DBD-Pg )
+       razor? ( mail-filter/razor )
+       snmp? ( net-analyzer/net-snmp[perl] )
+       spamassassin? ( mail-filter/spamassassin dev-perl/Image-Info )
+       zmq? ( dev-perl/ZMQ-LibZMQ3 )"
+
+AMAVIS_ROOT="/var/amavis"
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+       # amavisd-new version 2.11.0 breaks DKIM signing of outbound mail,
+       # see https://bugs.gentoo.org/603582
+       eapply "${FILESDIR}/amavisd-2.11.0-dkim.patch"
+
+       if use courier ; then
+               eapply -p0 amavisd-new-courier.patch
+       fi
+
+       if use qmail ; then
+               eapply -p0 amavisd-new-qmqpqq.patch
+       fi
+
+       sed -i  \
+               -e '/daemon/s/vscan/amavis/' \
+               -e "s:'/var/virusmails':\"\$MYHOME/quarantine\":" \
+               "${S}/amavisd.conf" "${S}/amavis-mc"  || die "missing conf file"
+
+       if ! use dkim ; then
+               sed -i -e '/enable_dkim/s/1/0/' "${S}/amavisd.conf" \
+                       || die "missing conf file - dkim"
+       fi
+
+       if use zmq ; then
+               sed -i -e '/enable_zmq/s/# //' "${S}/amavisd.conf" \
+                       || die "missing conf file - zmq"
+       fi
+
+       if ! use spamassassin ; then
+               sed -i -e \
+                       "/^#[[:space:]]*@bypass_spam_checks_maps[[:space:]]*=[[:space:]]*(1)/s/^#//" \
+                               "${S}/amavisd.conf" || die "missing conf file - sa"
+       fi
+       eapply_user
+}
+
+src_install() {
+       dosbin amavisd amavisd-agent amavisd-nanny amavisd-release \
+               amavisd-signer amavisd-status
+       dobin p0f-analyzer.pl amavisd-submit
+
+       if use snmp ; then
+               dosbin amavisd-snmp-subagent
+               use zmq && dosbin amavisd-snmp-subagent-zmq
+               dodoc AMAVIS-MIB.txt
+               newinitd "${FILESDIR}"/amavisd-snmp.initd amavisd-snmp
+       fi
+
+       if use zmq ; then
+               dosbin amavis-services amavis-mc
+               newinitd "${FILESDIR}"/amavis-mc.initd amavis-mc
+       fi
+
+       insinto /etc
+       insopts -m0640
+       doins amavisd.conf
+
+       newinitd "${FILESDIR}/amavisd.initd-r1" amavisd
+
+       systemd_dounit "${FILESDIR}/amavisd.service"
+       use clamav || sed -i -e '/Wants=clamd/d' "${ED}"/usr/lib/systemd/system/amavisd.service
+       use spamassassin || sed -i -e '/Wants=spamassassin/d' "${ED}"/usr/lib/systemd/system/amavisd.service
+
+       keepdir "${AMAVIS_ROOT}"
+       keepdir "${AMAVIS_ROOT}/db"
+       keepdir "${AMAVIS_ROOT}/quarantine"
+       keepdir "${AMAVIS_ROOT}/tmp"
+       keepdir "${AMAVIS_ROOT}/var"
+
+       dodoc AAAREADME.first INSTALL MANIFEST RELEASE_NOTES TODO \
+               amavisd.conf-default amavisd-custom.conf
+
+       docinto README_FILES
+       dodoc README_FILES/README*
+       dodoc -r README_FILES/*.{html,css}
+       docinto README_FILES/images
+       dodoc README_FILES/images/*.png
+       docinto README_FILES/images/callouts
+       dodoc README_FILES/images/callouts/*.png
+
+       docinto test-messages
+       dodoc test-messages/README
+       dodoc test-messages/sample.tar.gz.compl
+
+       if use ldap ; then
+               dodir /etc/openldap/schema
+               insinto /etc/openldap/schema
+               insopts -o root -g root -m 644
+               newins LDAP.schema ${PN}.schema || die
+       fi
+}
+
+pkg_preinst() {
+       enewgroup amavis
+       enewuser amavis -1 -1 "${AMAVIS_ROOT}" amavis
+       if use razor ; then
+               if [ ! -d "${ROOT}${AMAVIS_ROOT}/.razor" ] ; then
+                       elog "Setting up initial razor config files..."
+
+                       razor-admin -create -home="${D}/${AMAVIS_ROOT}/.razor"
+                       sed -i -e "s:debuglevel\([ ]*\)= .:debuglevel\1= 0:g" \
+                               "${D}/${AMAVIS_ROOT}/.razor/razor-agent.conf" || die
+               fi
+       fi
+}
+
+pkg_postinst() {
+       chown root:amavis "${ROOT}/etc/amavisd.conf"
+       chown -R amavis:amavis "${ROOT}/${AMAVIS_ROOT}"
+}

diff --git a/mail-filter/amavisd-new/files/amavisd-2.11.0-dkim.patch b/mail-filter/amavisd-new/files/amavisd-2.11.0-dkim.patch
new file mode 100644 (file)
index 0000000..d9aa07d
--- /dev/null
+++ b/mail-filter/amavisd-new/files/amavisd-2.11.0-dkim.patch
@@ -0,0 +1,12 @@
+Origin: https://lists.amavis.org/pipermail/amavis-users/2016-July/004428.html
+
+--- a/amavisd
++++ b/amavisd
+@@ -34338,6 +34338,7 @@
+     $sig_ind++;
+   }
+   Amavis::load_policy_bank($_,$msginfo) for @bank_names;
++  $msginfo->originating(c('originating'));
+   $msginfo->dkim_signatures_valid(\@signatures_valid)  if @signatures_valid;
+ # if (ll(5) && $sig_ind > 0) {
+ #   # show which header fields are covered by which signature