gentoo resync : 24.12.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
commit: de49812990871e1705b64051c35161d5e6400269 (patch)
tree: 5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /mail-filter
parent: 536c3711867ec947c1738f2c4b96f22e4863322d (diff)
43 files changed, 279 insertions, 3765 deletions
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 9419cf06f57f..e9630200fba4 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index 062336c6d349..463ad132a0b9 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -1,20 +1,16 @@
 AUX amavis-mc.initd 384 BLAKE2B bc481913a052855add95b0149177754e95742bcafe70b3e44699b2765126d401bb6d406ca09f2252f768b2b8354209fdb35fb9d5c64f6749c83c1d5ca1e52767 SHA512 96bb67ce2088c2c4b3187d55040db4ef9f281506a368ceca54df3b90d3e9c6e8c8be96c8010c581c7b2fc75e8439892db800b361da75ed9549a89d94cf7d95df
+AUX amavis-mc.initd-r1 492 BLAKE2B b2bafdecd2d57ca52216154def014596f31670300510b0d2d049a4790ee3cc5a29c339ca8b7bb27503d0671b028d9da7d1ddadc662cabae18cac2a659ce2b676 SHA512 66d6364e12a0e71184682bfd35bdd1004c0cd6ee634936da8888b49f21d6c506e0645eabf8ae53ca08dccd9081f9753d63951258ccee8abd9fabf7d28233c533
 AUX amavisd-2.11.0-dkim.patch 428 BLAKE2B f9c1bcab637febaf0546f204db0260cb7dc6bc35e27092545f99fb13cb2de27638a3cb04177de6dcb406c216a1168f44141e477f460eced830ba4376581005af SHA512 85628ad2b9c1cde478b579865d414fb941798aafe8968d26af5ef9dddf0f9ec4a3ed1e2077a46ee0632a9ce9be159ad9696badad35a1117cb7437c2ab0c4a973
+AUX amavisd-snmp-subagent-zmq.initd 911 BLAKE2B 7cb247978f70d1b7468919b1df3f2e147b4ca48c6748401c6621d1db7b326981b513b0f02fce582052fdf6a0d5e8b6d55cab52198e262a673802626769050edd SHA512 846ed4622417657f7bc3dc5fa5d9b361dddfe7a13753dab7e8b2328a09dc9c21800c4cd990bc5dc466945ef857861413b8e5a8e726a40f0fa1831c509755e60b
+AUX amavisd-snmp-subagent.initd 890 BLAKE2B ccc1c91547775737676449765e90c12b70ff068ff8283e7bb8a55e7e568b30bb2b311f210ba34d932887476cda6114e204cb1535c76c5af739842ae283272363 SHA512 de18fbf19135625882e7c09753142f6cb9ef8ef74caa339201d0da338e0bace4e3626c8ad2bb1ad0f63f73b5d70e4cc156cc93a9484d6a90266a9b204d9a7d7e
 AUX amavisd-snmp.initd 692 BLAKE2B b47671b5e8962a151cda0369bf13eba302e37e2f014fddff63f1a1d706868cd14d82c9141a79f8d123fb50cd95251f45407a6bb884398899e456dcf972bc37d0 SHA512 0e8513f7bfb03ae6d28190edd0f4f59b87f81b412b68dcfa3c91d77fd138d4e92ff6b36864bb590d214c08d9f73ec5de694e5fbc1b7e1d27ae0e532f052e3910
-AUX amavisd.initd 716 BLAKE2B 1376292c5560add4b85c7fa3e34454d9999e9602997525d85b088c3660093f68027dd9fa95c205d75ea7c2ecfcc2fec200a59b5af3fee2ce87a09419822bee22 SHA512 e7f1f9f233b26402101d501ae09d6774d8483637f2c2180eee706015790ea2ea494a14b1ff17e3b600ca4571bfaa895d8df65682993e1fc9ce5c31d37f9548c3
 AUX amavisd.initd-r1 710 BLAKE2B 46d484e167e45f5a5772373a4d636727ceda2feecf2e6260c737d513f1d7fb563b069c5e79a28459a6c75fd382cf106a260bd4d94c7b0c76bfca7dbf74ac30ef SHA512 0c45276d4b487c9550b36a56e1e296a401fb46985dafe1227bf70ec840fc4a255e959026ef31dffbd0719ebbcec064619e096602ab32da2b95776030772878de
+AUX amavisd.initd-r2 1594 BLAKE2B b778d21239440b6b01a0860f69b1363d57cc0e241a86501131cbafb563b77a58828c5801b86b5419c1e04eeaa85eeecd087f37394bfec2dc69a466c45c8155fa SHA512 67414b2d5977d74a1b613e8a3478a9e1f2a60ba29685c219db1cc48ead6fcf94e93a2d5897768b7720d5db352028c2eca89265bb1e2520b2f10ae011db200b65
 AUX amavisd.service 459 BLAKE2B 66648cbc40345ae57c5934dc5377c7c1fb6220c591904dce8685123772ef3ecff2827105dcd0b52336700a0e16f593480446991690f27cf6a8a3714ed593fb7e SHA512 6f196484fc546e16f319abfcd171a68826da35813cc477a572c79594b0bb5e0f8f61370dba30af690be6d064e48f07139b6b0b7f6024dbbfb820547d8bc6998e
-DIST amavisd-new-2.10.1.tar.xz 767716 BLAKE2B 603dabc34e2304084f725633bb772fc78316bbccbd5635940cf257bf19d38ffcfc44087832d5d8db270b943c27b5074f32fb76804e2f19a721e7bc9aae09d9c6 SHA512 1939cc60136fe37a078ebd6117a774bcc7ee34b68807472eb08ab15414749300925f74898131299fb051c539cc59d264003439a6307c9d0fa16971d02dab1ff9
+AUX amavisd.service-r1 433 BLAKE2B 8e61e95cfdadb37afec0040f87eb67745ea6aae766ca07b5eebfefc90e40ceba267028c8bf51e5208f198001a05edaef326d0a8ff23159a4d705f191c48c3753 SHA512 9696d50ab845d067e1289af8525c0ee3a8d55b4617af6f4d146d4844c9667b63886955145bea33a2980ed153210da69fa3747451c337075ff4ca500abafc0c7a
+DIST amavis-amavisd-new-2.11.1.tar.gz 1093467 BLAKE2B 1e43ddea86ff269b02cbbcd125d913c51b66728b1063cde6ca3f3f24f1bd36f9f3c7f51a8baf509d2aca0d41a07a00bb9abe08dd70724391c552634715d01a75 SHA512 6ef291868908bd13d6ce913f5c8c3898b35eba490877e8eded3951a32be7549145df5db1409f124a3631ec88dd7eeb9457ce2b063ae3e3bccd76cc2a9b8741ae
 DIST amavisd-new-2.11.0.tar.xz 780548 BLAKE2B 59cea5219a737275411c08c7d137ff2109ebbfee8f5f567d80e0cd73cfbb22887dd186383bfd02ad9880e099e0c06b829de43b9e12dbc3151813533166e51654 SHA512 a33292c976abf54db9475392069658c926e7a6f11a4970bbe353b34b3343388bc83b40eda4729f8efa735a3a6e23fd1ed83487f6f7ccf1e9f0903220e6d26957
-DIST amavisd-new-2.7.2.tar.gz 945448 BLAKE2B b6315f080b246a8715761fbc9516631b6737fa6b7995a52b0e013ed8704546d741d678e09ed5f21d590527bcfb9fa27d051167cd673828b85539d9e495b8dafc SHA512 f707a5ac9d6acee2f9d144fda86fed92bbf33693858262ab0a95663da50f78a023102d9d50dd5a6a256ef6302a241f9c28d2b190e3efe2110c0eea15557ae756
-DIST amavisd-new-2.8.1.tar.xz 731816 BLAKE2B 6becb5a9d2029605030f04fc8876570aedd2c8d925a9a202aff22969d0e0001d9ed56e25e00ad7f1181671c16482a90b139f8327abf8478a3c56e5e132e5f662 SHA512 a840b57513b8a7b18e15085016c273ba2fba5cceb76ef52c52aa2ca34e9257be78f8bb8ea350dbdac3b26d2aba8f5aae821c1c45f2d37bc6be04ff2efb9f3ade
-DIST amavisd-new-2.9.1.tar.xz 753076 BLAKE2B 835ce09dcaa98b44447d48522b3dfddb8066add0e2fe10767118c5979aeaee37c0db439e17721d9e5c6b40977b5db3ff0213261ea0fc88a2d6566249c1d57888 SHA512 6829a769f50498aaec4fd5c198059f828e9ba90223083e439caa9d2bd19006e0cff8ae7b1e2416009bd2514aae4428598142e86a63260b5292c15b515792a7af
-EBUILD amavisd-new-2.10.1-r4.ebuild 4704 BLAKE2B b9a7a614f3ce46e95818f074a003f3cf68afe63e36c4be5d0f82c9483d818eee60e954b7c3fc9d8ff4fe773a3c866dee4743387c5620c1a40aeebfe8b14e4818 SHA512 e790362e3c1e266d70b6dc1de920439565037d349142eeb4637577833d3eb9b2bf09542ffe5367a54ad1cb8cd384d9a485ef9bf251caa2fb408effad46640042
-EBUILD amavisd-new-2.10.1.ebuild 4647 BLAKE2B 6a94883de88d63224f6bc126a8db5fbac1f12d1eee0375aa38f99921f097ecd38c4a76585f5b8899e07ba677d55843837f663e93d2991449ceed404723705929 SHA512 34c03fa676550f125dc0445b1e953356566e7a6a8d7d171b0145e21dd030e82a4478fec217fa478ef7df589598529eec114858b9252807edec09d0473d2e8568
-EBUILD amavisd-new-2.11.0-r2.ebuild 4516 BLAKE2B b4ffc91098bc1391b9c2cb0c044e7395d4e2e6872b1fd20322394143bded6374dc61998f0eb976005b74971fdd803456f263a713b2d354770cffea97e7dade0a SHA512 cd507065732fa2a2e2f87830005ef466abec65e58778c1219d560d05ef3b0ee701161ecbf1e045d1f57e47fcab921c5a92d8a1c9420c63adb5536f07b7169b48
 EBUILD amavisd-new-2.11.0-r3.ebuild 4605 BLAKE2B 5e08b390567ea546fa4bb7ab8371dabcef91cb0c39d2ff87cfab4580f2f878c3a066f4d607fb57f214c9b4e837c079ecce80157662df805768f2f1e3db33e469 SHA512 0e349d6bf27c0492688b3715270dcc4e49d2ce2b2050a08d7f8b8854981752efa32361c661982e3eec083efb571a0fa831cba6d040f9799d1facee4b59fa893a
-EBUILD amavisd-new-2.11.0-r4.ebuild 4765 BLAKE2B 686ce5268c24939367746162f50944cd2134e0fb6db5e3377caf9af6928f71c44d6e6b2f8f31984e1b56d1082ae432fc051538b1a8cce068e23a8acdd713e4d4 SHA512 e60e42e868f28dd9768578ab3203cd7153574e7ca32f900126b387c87453f0a5d05d2eee6132ff5e22a0d04ccd83def090871e2ce59a36fda0a2fe3b00999fec
-EBUILD amavisd-new-2.7.2.ebuild 4162 BLAKE2B df8e094ae544f60187d9d0b437c8429ec08de5a89b205bb37fe3e9c164a482023b6ba3599b6081cde4707311e533c4736a683454c38df59013e6b545fd490833 SHA512 39dd3b56f6fce585329eb159228dd2afe354ffd3ec3ac24dfec79b6b569f5345ef98cc9be7587d557f140ac96a0e412941c264545b2d47dec676a409141ff8b4
-EBUILD amavisd-new-2.8.1-r1.ebuild 4804 BLAKE2B a049093a184f387c3c4e7be7ecbba2838279d6461d54956c419e659cdaafbf5712a6bc03c35ca0ac314ae8442d3c52ba9a14b642a46e2b8b0de035702fca0807 SHA512 290fdbe57f59ba560c99e2abad84e0c4456be394986128f42161b67d22586c34f7fc59cd79099f525864565f06fbe7357626cadee5bf1f18cd97f4621852675f
-EBUILD amavisd-new-2.9.1-r2.ebuild 4683 BLAKE2B a76172816b36ccde43c3c4f82d95a558407aac07627dd90676150d4190ce408d310f4d8ca8e314787ff6a2e6fedacc37bfa6ea06f1e1224c6aab00faec007995 SHA512 cd5bbcfa7ba32fb3471d958b49d0c1f4a4a12235c08d12340752bdbaa6d88773c75d1b19b960a1aa33cad72d107eb5de72ca80465f878a53e8cf858c8bae2ac1
-MISC metadata.xml 738 BLAKE2B 4c1e1fd33c6b27a9a96b849d4c127da188776f3aa053be65feee899c2b82c30a470844511c110e4d36da4c3e386b1e03eaa0c10d4384dc78d67f8c87af26e846 SHA512 7a5af76581b61aece92c89c6bd4516b305dbd90310e7bfc4af40ae8306c5401aa21780bca3aae8007af74678d91b0b978aaefd12958c70345461678685d79ea1
+EBUILD amavisd-new-2.11.1-r1.ebuild 4949 BLAKE2B f0dc3dd57190d24752fe09be30b3c9299e7fdb591347548adea000b2ab2f8a5bc7b6ec66f76eb6046da4bd1857e2f7e6e017899fb466d9ea784dec2481a44308 SHA512 57cb159e9e4da2b6e2393039c85bbd534b275744cb435b0879bee2a3fcf41a86531e154be591281c4e51c066de52a1a75259fcc988de1582e7d1db0156f0db56
+EBUILD amavisd-new-2.11.1-r2.ebuild 5220 BLAKE2B b0488be1475b10b25582a3b020a8a8517c5e9062eb7ddcfd4790e3b36f29e8c0b8893f9183436ba0021d1507a11e73347bc537179bf9d281d5eb1c2938f894ae SHA512 12dbe4d2b83a4c12c98170224ba69f4c3d16d65db6c761beb5400f3c6709da8e0b71c24e1b9dd859dcb0728d92b727276f16e1de0d676db3a4418e6f59d985c0
+MISC metadata.xml 845 BLAKE2B 5ea031bb47ac8f1ca3cb703ed6e6bcd94fa63ea275874c616e3c24c5802f0f2f4b2443b379b62e708eb6ea075a0950116722319cc08023b20d7152cbabce512e SHA512 4409524d4819357253b63c143f0aa4b760ffe0b4ed22d30d28632f86ee2731c7e84a95131016a21ab43a63c32ea35cfbe741010a07f45e8d21fe05f020387228
diff --git a/mail-filter/amavisd-new/amavisd-new-2.10.1-r4.ebuild b/mail-filter/amavisd-new/amavisd-new-2.10.1-r4.ebuild
deleted file mode 100644
index f9e7a0683a5c..000000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.10.1-r4.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils 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"
-
-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.8.2"
-
-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/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 )
-	zmq? ( dev-perl/ZMQ-LibZMQ3 )"
-
-AMAVIS_ROOT="/var/amavis"
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	if use courier ; then
-		epatch amavisd-new-courier.patch
-	fi
-
-	if use qmail ; then
-		epatch 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
-}
-
-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*
-	dohtml 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
-
-	if has_version "<${CATEGORY}/${PN}-2.7.0" ; then
-		elog "Amavisd-new ships with a short and condensed config file now."
-		elog "Transferring your current settings to the new format is"
-		elog "recommended for ease of future upgrades."
-	fi
-}
-
-pkg_postinst() {
-	chown root:amavis "${ROOT}/etc/amavisd.conf"
-	chown -R amavis:amavis "${ROOT}/${AMAVIS_ROOT}"
-}
diff --git a/mail-filter/amavisd-new/amavisd-new-2.10.1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.10.1.ebuild
deleted file mode 100644
index 0a0c01a71b05..000000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.10.1.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils 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"
-
-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.8.2"
-
-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/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 )
-	zmq? ( dev-perl/ZMQ-LibZMQ2 )"
-
-AMAVIS_ROOT="/var/amavis"
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	if use courier ; then
-		epatch amavisd-new-courier.patch
-	fi
-
-	if use qmail ; then
-		epatch 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
-}
-
-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
-	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*
-	dohtml 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
-
-	if has_version "<${CATEGORY}/${PN}-2.7.0" ; then
-		elog "Amavisd-new ships with a short and condensed config file now."
-		elog "Transferring your current settings to the new format is"
-		elog "recommended for ease of future upgrades."
-	fi
-}
-
-pkg_postinst() {
-	chown root:amavis "${ROOT}/etc/amavisd.conf"
-	chown -R amavis:amavis "${ROOT}/${AMAVIS_ROOT}"
-}
diff --git a/mail-filter/amavisd-new/amavisd-new-2.11.0-r4.ebuild b/mail-filter/amavisd-new/amavisd-new-2.11.1-r1.ebuild
index 0efc27e64544..d436def3bdbe 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.11.0-r4.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.11.1-r1.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # 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"
+HOMEPAGE="https://gitlab.com/amavis/amavis"
+SRC_URI="${HOMEPAGE}/-/archive/${P}/amavis-${P}.tar.gz"
 PORTAGE_DOHTML_WARN_ON_SKIPPED_FILES=yes
 
 LICENSE="GPL-2 BSD-2"
@@ -51,7 +50,7 @@ RDEPEND="${DEPEND}
 	>=virtual/perl-Time-HiRes-1.49
 	dev-perl/Unix-Syslog
 	dev-perl/Net-LibIDN
-	sys-apps/file
+	dev-perl/File-LibMagic
 	>=sys-libs/db-4.4.20
 	dev-perl/BerkeleyDB
 	dev-perl/Convert-BinHex
@@ -70,7 +69,14 @@ RDEPEND="${DEPEND}
 	zmq? ( dev-perl/ZMQ-LibZMQ3 )"
 
 AMAVIS_ROOT="/var/amavis"
-S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/amavis-${P}"
+
+pkg_setup() {
+	# Create the user beforehand so that we can install the config file
+	# (and some directories) with group "amavis" in src_install().
+	enewgroup amavis
+	enewuser amavis -1 -1 "${AMAVIS_ROOT}" amavis
+}
 
 src_prepare() {
 	# amavisd-new version 2.11.0 breaks DKIM signing of outbound mail,
@@ -103,8 +109,9 @@ src_prepare() {
 	if ! use spamassassin ; then
 		sed -i -e \
 			"/^#[[:space:]]*@bypass_spam_checks_maps[[:space:]]*=[[:space:]]*(1)/s/^#//" \
-				"${S}/amavisd.conf" || die "missing conf file - sa"
+			"${S}/amavisd.conf" || die "missing conf file - sa"
 	fi
+
 	eapply_user
 }
 
@@ -125,21 +132,32 @@ src_install() {
 		newinitd "${FILESDIR}"/amavis-mc.initd amavis-mc
 	fi
 
+	if use ldap ; then
+		dodir /etc/openldap/schema
+		insinto /etc/openldap/schema
+		newins LDAP.schema ${PN}.schema || die
+	fi
+
+	# The config file should be root:amavis so that the amavis user can
+	# read (only) it after dropping privileges. And of course he should
+	# own everything in his home directory.
 	insinto /etc
-	insopts -m0640
+	insopts -m0640 -g amavis
 	doins amavisd.conf
 
-	newinitd "${FILESDIR}/amavisd.initd-r1" amavisd
+	# Implementation detail? Keepdir calls dodir under the hood.
+	diropts -o amavis -g amavis
+	keepdir "${AMAVIS_ROOT}"/{,db,quarantine,tmp,var}
 
-	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
+	# BEWARE:
+	#
+	# Anything below this line is using the mangled insopts/diropts from
+	# above!
+	#
 
-	keepdir "${AMAVIS_ROOT}"
-	keepdir "${AMAVIS_ROOT}/db"
-	keepdir "${AMAVIS_ROOT}/quarantine"
-	keepdir "${AMAVIS_ROOT}/tmp"
-	keepdir "${AMAVIS_ROOT}/var"
+	newinitd "${FILESDIR}/amavisd.initd-r2" amavisd
+
+	systemd_newunit "${FILESDIR}/amavisd.service-r1" amavisd.service
 
 	dodoc AAAREADME.first INSTALL MANIFEST RELEASE_NOTES TODO \
 		amavisd.conf-default amavisd-custom.conf
@@ -155,18 +173,11 @@ src_install() {
 	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
+	# TODO: the following is done as root, but should probably be done
+	# as the amavis user.
 	if use razor ; then
 		if [ ! -d "${ROOT}${AMAVIS_ROOT}/.razor" ] ; then
 			elog "Setting up initial razor config files..."
@@ -177,8 +188,3 @@ pkg_preinst() {
 		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/amavisd-new-2.11.0-r2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.11.1-r2.ebuild
index 37446c48476b..1767bdefc4a6 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.11.0-r2.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.11.1-r2.ebuild
@@ -1,18 +1,16 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # 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
+HOMEPAGE="https://gitlab.com/amavis/amavis"
+SRC_URI="${HOMEPAGE}/-/archive/${P}/amavis-${P}.tar.gz"
 
 LICENSE="GPL-2 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="clamav courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq"
 
 DEPEND=">=sys-apps/sed-4
@@ -51,11 +49,14 @@ RDEPEND="${DEPEND}
 	>=virtual/perl-Time-HiRes-1.49
 	dev-perl/Unix-Syslog
 	dev-perl/Net-LibIDN
-	sys-apps/file
+	dev-perl/File-LibMagic
 	>=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 )
@@ -63,13 +64,24 @@ RDEPEND="${DEPEND}
 	postgres? ( dev-perl/DBD-Pg )
 	razor? ( mail-filter/razor )
 	snmp? ( net-analyzer/net-snmp[perl] )
-	spamassassin? ( mail-filter/spamassassin )
+	spamassassin? ( mail-filter/spamassassin dev-perl/Image-Info )
 	zmq? ( dev-perl/ZMQ-LibZMQ3 )"
 
 AMAVIS_ROOT="/var/amavis"
-S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/amavis-${P}"
+
+pkg_setup() {
+	# Create the user beforehand so that we can install the config file
+	# (and some directories) with group "amavis" in src_install().
+	enewgroup amavis
+	enewuser amavis -1 -1 "${AMAVIS_ROOT}" amavis
+}
 
 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
@@ -78,10 +90,14 @@ src_prepare() {
 		eapply -p0 amavisd-new-qmqpqq.patch
 	fi
 
+	# We need to fix the daemon_user and daemon_group in amavis-mc even
+	# though we're going to run it in the foreground, because it calls
+	# "drop_priv" unconditionally and will crash if its user/group
+	# doesn't exist.
 	sed -i  \
 		-e '/daemon/s/vscan/amavis/' \
 		-e "s:'/var/virusmails':\"\$MYHOME/quarantine\":" \
-		"${S}/amavisd.conf" "${S}/amavis-mc"  || die "missing conf file"
+		"${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" \
@@ -96,43 +112,60 @@ src_prepare() {
 	if ! use spamassassin ; then
 		sed -i -e \
 			"/^#[[:space:]]*@bypass_spam_checks_maps[[:space:]]*=[[:space:]]*(1)/s/^#//" \
-				"${S}/amavisd.conf" || die "missing conf file - sa"
+			"${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
+	dosbin amavisd{,-agent,-nanny,-release,-signer,-status}
 	dobin p0f-analyzer.pl amavisd-submit
 
 	if use snmp ; then
 		dosbin amavisd-snmp-subagent
-		use zmq && dosbin amavisd-snmp-subagent-zmq
+		newinitd "${FILESDIR}/amavisd-snmp-subagent.initd" \
+				 amavisd-snmp-subagent
 		dodoc AMAVIS-MIB.txt
-		newinitd "${FILESDIR}"/amavisd-snmp.initd amavisd-snmp
+
+		if use zmq ; then
+			dosbin amavisd-snmp-subagent-zmq
+			newinitd "${FILESDIR}/amavisd-snmp-subagent-zmq.initd" \
+					 amavisd-snmp-subagent-zmq
+		fi
 	fi
 
 	if use zmq ; then
 		dosbin amavis-services amavis-mc
-		newinitd "${FILESDIR}"/amavis-mc.initd amavis-mc
+		newinitd "${FILESDIR}/amavis-mc.initd-r1" amavis-mc
 	fi
 
+	if use ldap ; then
+		dodir /etc/openldap/schema
+		insinto /etc/openldap/schema
+		newins LDAP.schema "${PN}.schema"
+	fi
+
+	# The config file should be root:amavis so that the amavis user can
+	# read (only) it after dropping privileges. And of course he should
+	# own everything in his home directory.
 	insinto /etc
-	insopts -m0640
+	insopts -m0640 -g amavis
 	doins amavisd.conf
 
-	newinitd "${FILESDIR}/amavisd.initd-r1" amavisd
+	# Implementation detail? Keepdir calls dodir under the hood.
+	diropts -o amavis -g amavis
+	keepdir "${AMAVIS_ROOT}"/{,db,quarantine,tmp,var}
+
+	# BEWARE:
+	#
+	# Anything below this line is using the mangled insopts/diropts from
+	# above!
+	#
 
-	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
+	newinitd "${FILESDIR}/amavisd.initd-r2" amavisd
 
-	keepdir "${AMAVIS_ROOT}"
-	keepdir "${AMAVIS_ROOT}/db"
-	keepdir "${AMAVIS_ROOT}/quarantine"
-	keepdir "${AMAVIS_ROOT}/tmp"
-	keepdir "${AMAVIS_ROOT}/var"
+	systemd_newunit "${FILESDIR}/amavisd.service-r1" amavisd.service
 
 	dodoc AAAREADME.first INSTALL MANIFEST RELEASE_NOTES TODO \
 		amavisd.conf-default amavisd-custom.conf
@@ -148,18 +181,11 @@ src_install() {
 	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
+	# TODO: the following is done as root, but should probably be done
+	# as the amavis user.
 	if use razor ; then
 		if [ ! -d "${ROOT}${AMAVIS_ROOT}/.razor" ] ; then
 			elog "Setting up initial razor config files..."
@@ -170,8 +196,3 @@ pkg_preinst() {
 		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/amavisd-new-2.7.2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.7.2.ebuild
deleted file mode 100644
index b2bce29bb34c..000000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.7.2.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils 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.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ~ppc ~ppc64 sparc x86"
-IUSE="courier dkim ldap mysql postgres qmail razor snmp spamassassin"
-
-DEPEND=">=sys-apps/sed-4
-	>=dev-lang/perl-5.8.2"
-
-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/ncompress
-	app-arch/pax
-	app-arch/unarj
-	app-arch/xz-utils
-	|| ( app-arch/unrar app-arch/rar )
-	app-arch/zoo
-	>=dev-perl/Archive-Zip-1.14
-	>=virtual/perl-IO-Compress-1.35
-	>=virtual/perl-Compress-Raw-Zlib-2.017
-	dev-perl/Convert-TNEF
-	>=dev-perl/Convert-UUlib-1.08
-	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-Time-HiRes-1.49
-	dev-perl/Unix-Syslog
-	sys-apps/file
-	>=sys-libs/db-4.4.20
-	dev-perl/BerkeleyDB
-	dev-perl/Convert-BinHex
-	>=dev-perl/Mail-DKIM-0.31
-	virtual/mta
-	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 )"
-
-AMAVIS_ROOT="/var/amavis"
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	if use courier ; then
-		epatch amavisd-new-courier.patch
-	fi
-
-	if use qmail ; then
-		epatch amavisd-new-qmqpqq.patch
-	fi
-
-	sed -i  \
-		-e '/daemon/s/vscan/amavis/' \
-		-e "s:'/var/virusmails':\"\$MYHOME/quarantine\":" \
-		"${S}/amavisd.conf" || die "missing conf file"
-
-	if ! use dkim ; then
-		sed -i -e '/enable_dkim/s/1/0/' "${S}/amavisd.conf" \
-			|| die "missing conf file"
-	fi
-}
-
-src_install() {
-	dosbin amavisd amavisd-agent amavisd-nanny amavisd-release \
-		amavisd-signer
-	dobin p0f-analyzer.pl amavisd-submit
-
-	if use snmp ; then
-		dosbin amavisd-snmp-subagent
-		dodoc AMAVIS-MIB.txt
-	fi
-
-	insinto /etc
-	insopts -m0640
-	doins amavisd.conf
-
-	newinitd "${FILESDIR}/amavisd.initd" amavisd
-
-	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*
-	dohtml 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
-
-	#for i in whitelist blacklist spam_lovers; do
-	#	if [ -f ${AMAVIS_ROOT}/${i} ]; then
-	#		cp "${AMAVIS_ROOT}/${i}" "${D}/${AMAVIS_ROOT}"
-	#	else
-	#		touch "${D}"/${AMAVIS_ROOT}/${i}
-	#	fi
-	#done
-
-	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"
-		fi
-	fi
-
-	if ! use spamassassin ; then
-		elog "Disabling anti-spam code in amavisd.conf..."
-		sed -i -e \
-			"/^#[[:space:]]*@bypass_spam_checks_maps[[:space:]]*=[[:space:]]*(1)/s/^#//" \
-				"${D}/etc/amavisd.conf"
-	fi
-
-	if has_version "<${CATEGORY}/${PN}-2.7.0" ; then
-		elog "Amavisd-new ships with a short and condensed config file now."
-		elog "Transferring your current settings to the new format is"
-		elog "recommended for ease of future upgrades."
-	fi
-}
-
-pkg_postinst() {
-	chown root:amavis "${ROOT}/etc/amavisd.conf"
-	chown -R amavis:amavis "${ROOT}/${AMAVIS_ROOT}"
-}
diff --git a/mail-filter/amavisd-new/amavisd-new-2.8.1-r1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.8.1-r1.ebuild
deleted file mode 100644
index fac90db569b4..000000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.8.1-r1.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils 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"
-
-LICENSE="GPL-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.8.2"
-
-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
-	dev-perl/Convert-TNEF
-	>=dev-perl/Convert-UUlib-1.08
-	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
-	sys-apps/file
-	>=sys-libs/db-4.4.20
-	dev-perl/BerkeleyDB
-	dev-perl/Convert-BinHex
-	>=dev-perl/Mail-DKIM-0.31
-	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 )
-	zmq? ( dev-perl/ZMQ-LibZMQ2 )"
-
-AMAVIS_ROOT="/var/amavis"
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	if use courier ; then
-		epatch amavisd-new-courier.patch
-	fi
-
-	if use qmail ; then
-		epatch 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
-
-	if ! use dkim ; then
-		sed -i -e '/enable_dkim/s/1/0/' "${S}/amavisd.conf" \
-			|| die "missing conf file"
-	fi
-
-	if use zmq ; then
-		sed -i -e '/enable_zmq/s/# //' "${S}/amavisd.conf"
-	fi
-}
-
-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
-	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*
-	dohtml 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
-
-	#for i in whitelist blacklist spam_lovers; do
-	#	if [ -f ${AMAVIS_ROOT}/${i} ]; then
-	#		cp "${AMAVIS_ROOT}/${i}" "${D}/${AMAVIS_ROOT}"
-	#	else
-	#		touch "${D}"/${AMAVIS_ROOT}/${i}
-	#	fi
-	#done
-
-	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"
-		fi
-	fi
-
-	if ! use spamassassin ; then
-		elog "Disabling anti-spam code in amavisd.conf..."
-		sed -i -e \
-			"/^#[[:space:]]*@bypass_spam_checks_maps[[:space:]]*=[[:space:]]*(1)/s/^#//" \
-				"${D}/etc/amavisd.conf"
-	fi
-
-	if has_version "<${CATEGORY}/${PN}-2.7.0" ; then
-		elog "Amavisd-new ships with a short and condensed config file now."
-		elog "Transferring your current settings to the new format is"
-		elog "recommended for ease of future upgrades."
-	fi
-}
-
-pkg_postinst() {
-	chown root:amavis "${ROOT}/etc/amavisd.conf"
-	chown -R amavis:amavis "${ROOT}/${AMAVIS_ROOT}"
-}
diff --git a/mail-filter/amavisd-new/amavisd-new-2.9.1-r2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.9.1-r2.ebuild
deleted file mode 100644
index 72d7bbcee46f..000000000000
--- a/mail-filter/amavisd-new/amavisd-new-2.9.1-r2.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils 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"
-
-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.8.2"
-
-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
-	sys-apps/file
-	>=sys-libs/db-4.4.20
-	dev-perl/BerkeleyDB
-	dev-perl/Convert-BinHex
-	>=dev-perl/Mail-DKIM-0.31
-	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 )
-	zmq? ( dev-perl/ZMQ-LibZMQ2 )"
-
-AMAVIS_ROOT="/var/amavis"
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	if use courier ; then
-		epatch amavisd-new-courier.patch
-	fi
-
-	if use qmail ; then
-		epatch 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
-}
-
-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*
-	dohtml 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
-
-	if has_version "<${CATEGORY}/${PN}-2.7.0" ; then
-		elog "Amavisd-new ships with a short and condensed config file now."
-		elog "Transferring your current settings to the new format is"
-		elog "recommended for ease of future upgrades."
-	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/amavis-mc.initd-r1 b/mail-filter/amavisd-new/files/amavis-mc.initd-r1
new file mode 100644
index 000000000000..6343d4255c4c
--- /dev/null
+++ b/mail-filter/amavisd-new/files/amavis-mc.initd-r1
@@ -0,0 +1,18 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/sbin/amavis-mc"
+pidfile="/run/${RC_SVCNAME}.pid"
+
+# Let OpenRC background this, because otherwise it will write its PID
+# file after dropping privileges which presents a security issue when
+# we go to `kill` the thing as root.
+command_args="-f"
+command_background="true"
+command_user="amavis:amavis"
+
+depend() {
+  use logger
+  before amavisd-new snmpd
+}
diff --git a/mail-filter/amavisd-new/files/amavisd-snmp-subagent-zmq.initd b/mail-filter/amavisd-new/files/amavisd-snmp-subagent-zmq.initd
new file mode 100644
index 000000000000..7482a3f1d20b
--- /dev/null
+++ b/mail-filter/amavisd-new/files/amavisd-snmp-subagent-zmq.initd
@@ -0,0 +1,26 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/sbin/amavisd-snmp-subagent-zmq"
+pidfile="/run/${RC_SVCNAME}.pid"
+
+# The RELEASE_NOTES say "it is safe to run it as root, although
+# perhaps not necessary." I'm not in a position to test, but I bet
+# it's safe to run this as amavis:amavis. Since the program itself
+# doesn't have the ability to drop privileges, we'd have to let OpenRC
+# do that; and in that case, the easiest way to deal with the PID file
+# is to let OpenRC handle that, too.
+#
+# Thus as a means of future-proofing, we run $command in the
+# foreground, and let OpenRC background it and write a PID file. So
+# if somebody wants to try command_user="amavis:amavis" here, it might
+# just work.
+command_args="-f"
+command_background="true"
+
+depend() {
+  use logger
+  before amavisd-new snmpd
+  need amavis-mc
+}
diff --git a/mail-filter/amavisd-new/files/amavisd-snmp-subagent.initd b/mail-filter/amavisd-new/files/amavisd-snmp-subagent.initd
new file mode 100644
index 000000000000..84784b619e2b
--- /dev/null
+++ b/mail-filter/amavisd-new/files/amavisd-snmp-subagent.initd
@@ -0,0 +1,25 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/sbin/amavisd-snmp-subagent"
+pidfile="/run/${RC_SVCNAME}.pid"
+
+# The RELEASE_NOTES say "it is safe to run it as root, although
+# perhaps not necessary." I'm not in a position to test, but I bet
+# it's safe to run this as amavis:amavis. Since the program itself
+# doesn't have the ability to drop privileges, we'd have to let OpenRC
+# do that; and in that case, the easiest way to deal with the PID file
+# is to let OpenRC handle that, too.
+#
+# Thus as a means of future-proofing, we run $command in the
+# foreground, and let OpenRC background it and write a PID file. So
+# if somebody wants to try command_user="amavis:amavis" here, it might
+# just work.
+command_args="-f"
+command_background="true"
+
+depend() {
+  use logger
+  before amavisd-new snmpd
+}
diff --git a/mail-filter/amavisd-new/files/amavisd.initd b/mail-filter/amavisd-new/files/amavisd.initd
deleted file mode 100644
index 4899296cc140..000000000000
--- a/mail-filter/amavisd-new/files/amavisd.initd
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_started_commands="reload"
-extra_commands="debug debug_sa"
-
-prog="/usr/sbin/amavisd"
-progname="amavisd-new"
-
-depend() {
-	need net
-	use logger antivirus snmpd
-	before mta
-}
-
-start() {
-	ebegin "Starting ${progname}"
-	"${prog}" start
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${progname}"
-	"${prog}" stop 1>/dev/null
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading ${progname}"
-	"${prog}" reload 1>/dev/null
-	eend $?
-}
-
-debug() {
-	ebegin "Starting ${progname} in debug mode"
-	"${prog}" debug
-	eend $?
-}
-
-debug_sa() {
-	ebegin "Starting ${progname} in debug-sa mode"
-	"${prog}" debug-sa
-	eend $?
-}
diff --git a/mail-filter/amavisd-new/files/amavisd.initd-r2 b/mail-filter/amavisd-new/files/amavisd.initd-r2
new file mode 100644
index 000000000000..2e58bf9b7a93
--- /dev/null
+++ b/mail-filter/amavisd-new/files/amavisd.initd-r2
@@ -0,0 +1,42 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="reload"
+command="/usr/sbin/${RC_SVCNAME}"
+pidfile="/run/${RC_SVCNAME}.pid"
+
+# Why run in the foreground? Typically amavisd will drop privileges
+# and then write its own PID file in its home directory. This is fine
+# so long as you use e.g. "amavisd stop" to stop the daemon. But, we
+# want to use start-stop-daemon to do it. And start-stop-daemon will
+# send a signal *as root* to the PID contained in the PID file. So, we
+# don't want to rely on a PID file that's controlled by a non-root
+# user.
+#
+# As a workaround, we run amavisd in the foreground, and let
+# start-stop-daemon push it into the background with its own PID
+# file. We don't pass "-P" via command_args below because we don't
+# want amavisd to try (and fail) to create that PID file. This does
+# mean that you can't run "amavisd stop" or "amavisd reload" directly;
+# sorry!
+command_args="foreground"
+command_background="true"
+
+# The amavisd daemon provides its own "stop" and "reload" functions,
+# but if you read into the source, they just do what start-stop-daemon
+# is going to do anyway. The "stop" command for amavisd will send a
+# SIGTERM immediately, and then a SIGKILL after 60 seconds. So, we do
+# that too. The "reload" command sends a SIGHUP; see reload() below.
+retry="SIGTERM/15 SIGKILL/60"
+
+depend() {
+  use net logger antivirus snmpd
+  before mta
+}
+
+reload() {
+  ebegin "Reloading ${RC_SVCNAME}"
+  start-stop-daemon --signal HUP --pidfile "${pidfile}"
+  eend $?
+}
diff --git a/mail-filter/amavisd-new/files/amavisd.service-r1 b/mail-filter/amavisd-new/files/amavisd.service-r1
new file mode 100644
index 000000000000..038712853551
--- /dev/null
+++ b/mail-filter/amavisd-new/files/amavisd.service-r1
@@ -0,0 +1,21 @@
+[Unit]
+Description=Amavisd Daemon
+Before=postfix.service
+After=clamd.service
+After=network.target
+
+[Service]
+User=amavis
+Group=amavis
+ExecStart=/usr/sbin/amavisd -c /etc/amavisd.conf foreground
+ExecReload=/usr/sbin/amavisd -c /etc/amavisd.conf reload
+PrivateTmp=true
+CapabilityBoundingSet=
+ProtectSystem=full
+NoNewPrivileges=true
+PrivateDevices=true
+ProtectHome=true
+MemoryDenyWriteExecute=true
+
+[Install]
+WantedBy=multi-user.target
diff --git a/mail-filter/amavisd-new/metadata.xml b/mail-filter/amavisd-new/metadata.xml
index 2a38ad5c4dac..8ab3437f40f6 100644
--- a/mail-filter/amavisd-new/metadata.xml
+++ b/mail-filter/amavisd-new/metadata.xml
@@ -9,6 +9,10 @@
 		<email>antivirus@gentoo.org</email>
 		<name>Gentoo Antivirus Project</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>mjo@gentoo.org</email>
+		<name>Michael Orlitzky</name>
+	</maintainer>
 	<use>
 		<flag name="courier">Add courier support</flag>
 		<flag name="dkim">Add DomainKeys Identified Mail support</flag>
diff --git a/mail-filter/assp/Manifest b/mail-filter/assp/Manifest
deleted file mode 100644
index 16e77cfbe4fd..000000000000
--- a/mail-filter/assp/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX asspd.init 557 BLAKE2B b73f8361139a8103048009783d039ed63c7d96c7200167da316d02359bcefd56cd9003df6f28922661af5a0804e2468085289993564e8fa9b32222c349539b96 SHA512 ca762f84f123146a2e17c8c429ca03960d4cb82d74166ce3cead0d70529112eae2ce02f5ffa47d4730b21ff151c6eb05b1b28fa12d87d7f16d2859773c2845d7
-DIST ASSP_1.8.5.9-Install.zip 750552 BLAKE2B 6118ce4c66990632a7915a4fc9b13b89ec3aaf4893c911d87c9b541ea55d7d71ed97bdd5337128cba04e0e4f95eff824679dc792d2085633628cf9bb357965f9 SHA512 146f86b8ddd235cca784057a73ae45395d4dc81591001f28a63275e6cf0e234145086029f112953e26aa8433ba434002e5ca85acc2e63af1615e7b9f58764f1c
-DIST ASSP_1.9.4.9-Install.zip 1461140 BLAKE2B ce79146c42a2c48da125b603dc1084688baf4dc020a5fc4e8305a7afd5467f2e2a978d2fdc2e06055e8f7ab94a9a8b11b7ec40cf23f566dd8a76f9c8c21b2ccb SHA512 a049a8e36193aee12c7abc7bbfdc41a92a7a33f6f01f7e6cded406f1f84ddf3c514808ca1c4c6a25c3a441b3a2792b4451ca218021bb09dad508a56434c8656b
-DIST ASSP_1.98_13030_install.zip 874117 BLAKE2B c23e51dea63a9ecfa94a4110dbe4cd7dee44faf89107a0f1ba72441acbd28cf7a09928c1a2f0b5e39f7e47d5a197651740c82e0a6ec8ddd61f7bd29b3354b954 SHA512 46c067c9ffe98f860669166fca69346c974bc82a1c0a5046f607aae8344fe18d41f7a87c2f79bdfcaa24c6233a88a590031deab66c76d42fee78fec64dc2a2a1
-EBUILD assp-1.8.5.9.ebuild 5808 BLAKE2B 7080afa1842713cecdca76d7a57af7527a86103ab2a77492fd0705c6a9ec3c2b3e39150f033450a0c19c27a0341e5be2e24522a877729b46291a68edfc88d7fb SHA512 aead31f7b7b93154430eed8a66568d858ae569540016606890697538da62374553f90b5bf9be29e6244e76c765e5493c5d481d12252bb4ce2f5a37b763de50dc
-EBUILD assp-1.9.4.9.ebuild 5858 BLAKE2B 7cf3fe11ba05b1b864598458a71d8516a2622045155db4d85d84108e88cbcc177e09b1f475fb72cbbf3e59f745a58bbad11b1de888e870753fd5cfe568e87700 SHA512 32f7d74cac895f26f33f0e4a248b3d370c179afcfcebe2d6154ffc7880bcf1cc0d1d4327c639bc40e2f2052bc3768a8ceb24f94f1ac3ada41510b556f1cb1979
-EBUILD assp-1.9.8.13030.ebuild 5869 BLAKE2B de1572ea63ad737b9c11577e148f9fe8b9614cbfabb9c117b7a3172d12870d5f850c7e03bc56f5a22caafa11777f6158691caaa2d109fd456214c5ca174b6997 SHA512 6fa4a530524fe24e9c11b33b0ed052b5dba3a2640bd7df53cfb0cf8d7ea46df2fc5299fb2dc646519ddcf9668ce5484c53625c6f4917368bab14037f4dae6ac4
-MISC metadata.xml 1012 BLAKE2B a1d7936ab341bb80ed931ea07d09eafb9f5d0bd9e84f18fad315693e6585e39cd098aaff4ba63dc51b942d864f9b6b97d1c84d9d6939c13591ce35ba3000a958 SHA512 32be6692f834f853e7c7382422075851a8c86c115e5ac119a583d9c66b21350939e62197a9bbca3ef1d1b988833572de82cc2118eae9cc0b9eed260ce0838066
diff --git a/mail-filter/assp/assp-1.8.5.9.ebuild b/mail-filter/assp/assp-1.8.5.9.ebuild
deleted file mode 100644
index 6c940543990f..000000000000
--- a/mail-filter/assp/assp-1.8.5.9.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils user
-
-DESCRIPTION="Anti-Spam SMTP Proxy written in Perl"
-HOMEPAGE="http://assp.sourceforge.net/"
-MY_PN=ASSP_${PV}-Install
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}.zip"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="amd64 x86"
-
-IUSE="ipv6 ldap sasl spf srs ssl syslog"
-
-DEPEND="app-arch/unzip"
-
-RDEPEND="dev-lang/perl
-	dev-perl/Net-DNS
-	dev-perl/File-ReadBackwards
-	virtual/perl-IO-Compress
-	dev-perl/Email-MIME
-	dev-perl/Email-Send
-	dev-perl/Email-Valid
-	dev-perl/libwww-perl
-	dev-perl/mime-construct
-	dev-perl/Net-CIDR-Lite
-	virtual/perl-Digest-MD5
-	virtual/perl-Time-HiRes
-	ipv6? ( dev-perl/IO-Socket-INET6 )
-	sasl? ( dev-perl/Authen-SASL )
-	spf? ( dev-perl/Mail-SPF )
-	srs? ( dev-perl/Mail-SRS )
-	ssl? ( dev-perl/IO-Socket-SSL )
-	syslog? ( virtual/perl-Sys-Syslog )
-	ldap? ( dev-perl/perl-ldap )"
-
-S=${WORKDIR}/${MY_PN}/ASSP
-
-pkg_setup() {
-	enewgroup assp
-	enewuser assp -1 -1 /dev/null assp
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	local FILES="
-		assp.pl
-		rebuildspamdb.pl
-		stat.pl
-	"
-	# just being safe
-	for file in ${FILES}; do
-		edos2unix ${file}
-	done
-
-	# portable changes via sed vs patch
-	sed -i -e 's|file:files/|file:/etc/assp/|' \
-		-e 's|$base/images|/usr/share/assp/images|' \
-		-e 's|logs/maillog.txt|/var/log/assp/maillog.txt|' \
-		-e 's|PID File'\'',40,textinput,'\''pid'\''|PID File'\'',40,textinput,'\''asspd.pid'\''|' \
-		-e 's|Daemon\*\*'\'',0,checkbox,0|Daemon\*\*'\'',0,checkbox,1|' \
-		-e 's|UID\*\*'\'',20,textinput,'\'''\''|UID\*\*'\'',20,textinput,'\''assp'\''|' \
-		-e 's|GID\*\*'\'',20,textinput,'\'''\''|GID\*\*'\'',20,textinput,'\''assp'\''|' \
-		-e 's|popFileEditor'\('\\'\''pb/pbdb\.\([^\.]*\)\.db\\'\'',|popFileEditor(\\'\''/var/lib/assp/pb/pbdb.\1.db\\'\'',|g' \
-		-e 's|$base/assp.cfg|/etc/assp/assp.cfg|g' \
-		-e 's|$base/$pidfile|/var/run/assp/asspd.pid|' \
-		-e 's|mkdir "$base/$logdir",0700 if $logdir;||' \
-		-e 's|mkdir "$base/$logdir",0700;||' \
-		-e 's|$base/$logfile|$logfile|' \
-		-e 's|$base/$logdir|$logdir|' \
-		-e 's|"maillog.log"|"/var/log/assp/maillog.log"|' \
-		-e 's|-d "$base/logs" or mkdir "$base/logs",0700;||' \
-		-e 's|-d "$base/notes" or mkdir "$base/notes",0700;||' \
-		-e 's|-d "$base/docs" or mkdir "$base/docs",0777;||' \
-		-e 's|$base/$archivelogfile|$archivelogfile|' \
-		-e 's|"$base/$file",$sub,"$this|"/etc/assp/$file",$sub,"$this|' \
-		-e 's|"$base/$file",'\'''\'',"$this|"/etc/assp/$file",'\'''\'',"$this|' \
-		-e 's|my $fil=$1; $fil="$base/$fil" if $fil!~/^\\Q$base\\E/i;|my $fil=$1;|' \
-		-e 's|$fil="$base/$fil" if $fil!~/^\\Q$base\\E/i;|$fil="/etc/assp/$fil" if $fil!~/^\\/etc\\/assp\\/\|\\/var\\/lib\\/assp\\/\/i;|' \
-		-e 's|$fil="$base/$fil" if $fil!~/^((\[a-z\]:)?\[\\/\\\\\]\|\\Q$base\\E)/;||' \
-		-e 's|if ($fil !~ /^\\Q$base\\E/i) {|if ($fil !~ /^\\/usr\\/share\\/assp\\//i) {|' \
-		-e 's|$fil = "$base/$fil";|$fil = "/usr/share/assp/$fil";|' \
-		-e 's|Q$base\\E|Q\\/etc\\/assp\\/\\E|' \
-		-e 's|$fil="$base/$fil"|$fil="/etc/assp/$fil"|' \
-		-e 's|$base/$bf|/etc/assp/$bf|g' \
-		-e 's|rebuildrun.txt|/var/lib/assp/rebuildrun.txt|' \
-		assp.pl || die
-
-	# sed rebuildspamdb.pl
-	sed -i -e 's|assp.cfg|/etc/assp/assp.cfg|' \
-		-e 's|} && "$Config{base}/$Config{logfile}" \|\| '\''maillog.txt'\'';|};|' \
-		-e 's|tmaxtick('\''rebuild'\'');|tmaxtick('\''/var/lib/assp/rebuild'\'');|' \
-		-e 's|goodhosts|/var/lib/assp/goodhosts|g' \
-		-e 's|rebuildrun.txt|/var/lib/assp/rebuildrun.txt|' \
-		-e 's|$base/$DropList|$DropList|' \
-		-e 's|&fixPath($base) . "/|"|' \
-		-e 's|= "/var/lib/assp/rebuildrun.txt";|= "/var/lib/assp/rebuildrun.txt";\n    $RebuildLog          = "/var/lib/assp/rebuild.log";|' \
-		-e 's|"$base//|"/|g' \
-		rebuildspamdb.pl || die
-
-	# remove windows stuff
-	rm "${S}/addservice.pl" || die "Could not remove ${S}/addservice.pl"
-	rm -f "${S}/Win32-quickstart-guide.txt" || die "Could not remove ${S}/Win32-quickstart-guide.txt"
-}
-
-src_install() {
-	# Configuration directory
-	dodir /etc/assp/notes
-
-	insinto /etc/assp
-	# Installs files that are used by assp for black/gray lists,
-	# and domain country lookup. To be changed by admin as needed.
-	doins files/*.txt || die
-
-	fowners assp:assp /etc/assp -R
-	fperms 770 /etc/assp /etc/assp/notes
-
-	# Setup directories for mail to be stored for filter
-	keepdir /var/lib/assp/spam /var/lib/assp/notspam
-	keepdir /var/lib/assp/errors/spam /var/lib/assp/errors/notspam
-
-	# Logs directory
-	keepdir /var/log/assp
-	fowners assp:assp -R /var/log/assp
-	fperms 770 /var/log/assp
-
-	# Install the app
-	exeinto /usr/share/assp
-	doexe *.pl *.sh || die
-	insinto /usr/share/assp
-	doins -r images/ || die
-
-	# Lock down the files/data
-	fowners assp:assp -R /usr/share/assp
-	fperms 770 /usr/share/assp
-
-	# Data storage
-	fowners assp:assp -R /var/lib/assp
-	fperms 770 /var/lib/assp
-
-	# PID directory
-	dodir /var/run/assp
-	keepdir /var/run/assp
-	fowners assp:assp -R /var/run/assp
-	fperms 770 /var/run/assp
-
-	# Install the init.d script to listen
-	newinitd "${FILESDIR}/asspd.init" asspd
-
-	dohtml docs/*.htm || die "Failed to install html docs"
-}
-
-pkg_postinst() {
-	elog
-	elog "To configure ASSP, start /etc/init.d/asspd then point"
-	elog "your browser to http://localhost:55555"
-	elog "Username: admin  Password: nospam4me (CHANGE ASAP!)"
-	elog
-	elog "File permissions have been set to use assp:assp"
-	elog "with mode 770 on directories.  When you configure"
-	elog "ASSP, make sure and use the user assp."
-	elog
-	elog "Don't change any path related options."
-	elog
-	elog "See the on-line docs for a complete tutorial."
-	elog "http://assp.sourceforge.net/docs.html"
-	elog
-	elog "If upgrading, please update your old config to set both"
-	elog "redre.txt and nodelay.txt path of /etc/assp.  There are"
-	elog "also many new options that you should review."
-	elog
-}
diff --git a/mail-filter/assp/assp-1.9.4.9.ebuild b/mail-filter/assp/assp-1.9.4.9.ebuild
deleted file mode 100644
index 28803fea46ce..000000000000
--- a/mail-filter/assp/assp-1.9.4.9.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils user
-
-DESCRIPTION="Anti-Spam SMTP Proxy written in Perl"
-HOMEPAGE="http://assp.sourceforge.net/"
-MY_PN=ASSP_${PV}-Install
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}.zip"
-LICENSE="GPL-2"
-SLOT="0"
-
-# this is a pre-release, so no keywords for now
-KEYWORDS="~amd64 ~x86"
-
-IUSE="ipv6 ldap sasl spf srs ssl syslog"
-
-DEPEND="app-arch/unzip"
-
-RDEPEND="dev-lang/perl
-	dev-perl/Net-DNS
-	dev-perl/File-ReadBackwards
-	virtual/perl-IO-Compress
-	dev-perl/Email-MIME
-	dev-perl/Email-Send
-	dev-perl/Email-Valid
-	dev-perl/libwww-perl
-	dev-perl/mime-construct
-	dev-perl/Net-CIDR-Lite
-	virtual/perl-Digest-MD5
-	virtual/perl-Time-HiRes
-	ipv6? ( dev-perl/IO-Socket-INET6 )
-	sasl? ( dev-perl/Authen-SASL )
-	spf? ( dev-perl/Mail-SPF )
-	srs? ( dev-perl/Mail-SRS )
-	ssl? ( dev-perl/IO-Socket-SSL )
-	syslog? ( virtual/perl-Sys-Syslog )
-	ldap? ( dev-perl/perl-ldap )"
-
-S=${WORKDIR}/${MY_PN}/ASSP
-
-pkg_setup() {
-	enewgroup assp
-	enewuser assp -1 -1 /dev/null assp
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	local FILES="
-		assp.pl
-		rebuildspamdb.pl
-		stat.pl
-	"
-	# just being safe
-	for file in ${FILES}; do
-		edos2unix ${file}
-	done
-
-	# portable changes via sed vs patch
-	sed -i -e 's|file:files/|file:/etc/assp/|' \
-		-e 's|$base/images|/usr/share/assp/images|' \
-		-e 's|logs/maillog.txt|/var/log/assp/maillog.txt|' \
-		-e 's|PID File'\'',40,textinput,'\''pid'\''|PID File'\'',40,textinput,'\''asspd.pid'\''|' \
-		-e 's|Daemon\*\*'\'',0,checkbox,0|Daemon\*\*'\'',0,checkbox,1|' \
-		-e 's|UID\*\*'\'',20,textinput,'\'''\''|UID\*\*'\'',20,textinput,'\''assp'\''|' \
-		-e 's|GID\*\*'\'',20,textinput,'\'''\''|GID\*\*'\'',20,textinput,'\''assp'\''|' \
-		-e 's|popFileEditor'\('\\'\''pb/pbdb\.\([^\.]*\)\.db\\'\'',|popFileEditor(\\'\''/var/lib/assp/pb/pbdb.\1.db\\'\'',|g' \
-		-e 's|$base/assp.cfg|/etc/assp/assp.cfg|g' \
-		-e 's|$base/$pidfile|/var/run/assp/asspd.pid|' \
-		-e 's|mkdir "$base/$logdir",0700 if $logdir;||' \
-		-e 's|mkdir "$base/$logdir",0700;||' \
-		-e 's|$base/$logfile|$logfile|' \
-		-e 's|$base/$logdir|$logdir|' \
-		-e 's|"maillog.log"|"/var/log/assp/maillog.log"|' \
-		-e 's|-d "$base/logs" or mkdir "$base/logs",0700;||' \
-		-e 's|-d "$base/notes" or mkdir "$base/notes",0700;||' \
-		-e 's|-d "$base/docs" or mkdir "$base/docs",0777;||' \
-		-e 's|$base/$archivelogfile|$archivelogfile|' \
-		-e 's|"$base/$file",$sub,"$this|"/etc/assp/$file",$sub,"$this|' \
-		-e 's|"$base/$file",'\'''\'',"$this|"/etc/assp/$file",'\'''\'',"$this|' \
-		-e 's|my $fil=$1; $fil="$base/$fil" if $fil!~/^\\Q$base\\E/i;|my $fil=$1;|' \
-		-e 's|$fil="$base/$fil" if $fil!~/^\\Q$base\\E/i;|$fil="/etc/assp/$fil" if $fil!~/^\\/etc\\/assp\\/\|\\/var\\/lib\\/assp\\/\/i;|' \
-		-e 's|$fil="$base/$fil" if $fil!~/^((\[a-z\]:)?\[\\/\\\\\]\|\\Q$base\\E)/;||' \
-		-e 's|if ($fil !~ /^\\Q$base\\E/i) {|if ($fil !~ /^\\/usr\\/share\\/assp\\//i) {|' \
-		-e 's|$fil = "$base/$fil";|$fil = "/usr/share/assp/$fil";|' \
-		-e 's|Q$base\\E|Q\\/etc\\/assp\\/\\E|' \
-		-e 's|$fil="$base/$fil"|$fil="/etc/assp/$fil"|' \
-		-e 's|$base/$bf|/etc/assp/$bf|g' \
-		-e 's|rebuildrun.txt|/var/lib/assp/rebuildrun.txt|' \
-		assp.pl || die
-
-	# sed rebuildspamdb.pl
-	sed -i -e 's|assp.cfg|/etc/assp/assp.cfg|' \
-		-e 's|} && "$Config{base}/$Config{logfile}" \|\| '\''maillog.txt'\'';|};|' \
-		-e 's|tmaxtick('\''rebuild'\'');|tmaxtick('\''/var/lib/assp/rebuild'\'');|' \
-		-e 's|goodhosts|/var/lib/assp/goodhosts|g' \
-		-e 's|rebuildrun.txt|/var/lib/assp/rebuildrun.txt|' \
-		-e 's|$base/$DropList|$DropList|' \
-		-e 's|&fixPath($base) . "/|"|' \
-		-e 's|= "/var/lib/assp/rebuildrun.txt";|= "/var/lib/assp/rebuildrun.txt";\n    $RebuildLog          = "/var/lib/assp/rebuild.log";|' \
-		-e 's|"$base//|"/|g' \
-		rebuildspamdb.pl || die
-
-	# remove windows stuff
-	rm "${S}/addservice.pl" || die "Could not remove ${S}/addservice.pl"
-	rm -f "${S}/Win32-quickstart-guide.txt" || die "Could not remove ${S}/Win32-quickstart-guide.txt"
-}
-
-src_install() {
-	# Configuration directory
-	dodir /etc/assp/notes
-
-	insinto /etc/assp
-	# Installs files that are used by assp for black/gray lists,
-	# and domain country lookup. To be changed by admin as needed.
-	doins files/*.txt || die
-
-	fowners assp:assp /etc/assp -R
-	fperms 770 /etc/assp /etc/assp/notes
-
-	# Setup directories for mail to be stored for filter
-	keepdir /var/lib/assp/spam /var/lib/assp/notspam
-	keepdir /var/lib/assp/errors/spam /var/lib/assp/errors/notspam
-
-	# Logs directory
-	keepdir /var/log/assp
-	fowners assp:assp -R /var/log/assp
-	fperms 770 /var/log/assp
-
-	# Install the app
-	exeinto /usr/share/assp
-	doexe *.pl *.sh || die
-	insinto /usr/share/assp
-	doins -r images/ || die
-
-	# Lock down the files/data
-	fowners assp:assp -R /usr/share/assp
-	fperms 770 /usr/share/assp
-
-	# Data storage
-	fowners assp:assp -R /var/lib/assp
-	fperms 770 /var/lib/assp
-
-	# PID directory
-	dodir /var/run/assp
-	keepdir /var/run/assp
-	fowners assp:assp -R /var/run/assp
-	fperms 770 /var/run/assp
-
-	# Install the init.d script to listen
-	newinitd "${FILESDIR}/asspd.init" asspd
-
-	dohtml docs/*.htm || die "Failed to install html docs"
-}
-
-pkg_postinst() {
-	elog
-	elog "To configure ASSP, start /etc/init.d/asspd then point"
-	elog "your browser to http://localhost:55555"
-	elog "Username: admin  Password: nospam4me (CHANGE ASAP!)"
-	elog
-	elog "File permissions have been set to use assp:assp"
-	elog "with mode 770 on directories.  When you configure"
-	elog "ASSP, make sure and use the user assp."
-	elog
-	elog "Don't change any path related options."
-	elog
-	elog "See the on-line docs for a complete tutorial."
-	elog "http://assp.sourceforge.net/docs.html"
-	elog
-	elog "If upgrading, please update your old config to set both"
-	elog "redre.txt and nodelay.txt path of /etc/assp.  There are"
-	elog "also many new options that you should review."
-	elog
-}
diff --git a/mail-filter/assp/assp-1.9.8.13030.ebuild b/mail-filter/assp/assp-1.9.8.13030.ebuild
deleted file mode 100644
index bef8d2802b0d..000000000000
--- a/mail-filter/assp/assp-1.9.8.13030.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils user
-
-DESCRIPTION="Anti-Spam SMTP Proxy written in Perl"
-HOMEPAGE="http://assp.sourceforge.net/"
-MY_PN=ASSP_${PV/9.8.1/98_1}_install
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}.zip"
-LICENSE="GPL-2"
-SLOT="0"
-
-# this is a pre-release, so no keywords for now
-KEYWORDS="~amd64 ~x86"
-
-IUSE="ipv6 ldap sasl spf srs ssl syslog"
-
-DEPEND="app-arch/unzip"
-
-RDEPEND="dev-lang/perl
-	dev-perl/Net-DNS
-	dev-perl/File-ReadBackwards
-	virtual/perl-IO-Compress
-	dev-perl/Email-MIME
-	dev-perl/Email-Send
-	dev-perl/Email-Valid
-	dev-perl/libwww-perl
-	dev-perl/mime-construct
-	dev-perl/Net-CIDR-Lite
-	virtual/perl-Digest-MD5
-	virtual/perl-Time-HiRes
-	ipv6? ( dev-perl/IO-Socket-INET6 )
-	sasl? ( dev-perl/Authen-SASL )
-	spf? ( dev-perl/Mail-SPF )
-	srs? ( dev-perl/Mail-SRS )
-	ssl? ( dev-perl/IO-Socket-SSL )
-	syslog? ( virtual/perl-Sys-Syslog )
-	ldap? ( dev-perl/perl-ldap )"
-
-S=${WORKDIR}/${MY_PN}/ASSP
-
-pkg_setup() {
-	enewgroup assp
-	enewuser assp -1 -1 /dev/null assp
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	local FILES="
-		assp.pl
-		rebuildspamdb.pl
-		stat.pl
-	"
-	# just being safe
-	for file in ${FILES}; do
-		edos2unix ${file}
-	done
-
-	# portable changes via sed vs patch
-	sed -i -e 's|file:files/|file:/etc/assp/|' \
-		-e 's|$base/images|/usr/share/assp/images|' \
-		-e 's|logs/maillog.txt|/var/log/assp/maillog.txt|' \
-		-e 's|PID File'\'',40,textinput,'\''pid'\''|PID File'\'',40,textinput,'\''asspd.pid'\''|' \
-		-e 's|Daemon\*\*'\'',0,checkbox,0|Daemon\*\*'\'',0,checkbox,1|' \
-		-e 's|UID\*\*'\'',20,textinput,'\'''\''|UID\*\*'\'',20,textinput,'\''assp'\''|' \
-		-e 's|GID\*\*'\'',20,textinput,'\'''\''|GID\*\*'\'',20,textinput,'\''assp'\''|' \
-		-e 's|popFileEditor'\('\\'\''pb/pbdb\.\([^\.]*\)\.db\\'\'',|popFileEditor(\\'\''/var/lib/assp/pb/pbdb.\1.db\\'\'',|g' \
-		-e 's|$base/assp.cfg|/etc/assp/assp.cfg|g' \
-		-e 's|$base/$pidfile|/var/run/assp/asspd.pid|' \
-		-e 's|mkdir "$base/$logdir",0700 if $logdir;||' \
-		-e 's|mkdir "$base/$logdir",0700;||' \
-		-e 's|$base/$logfile|$logfile|' \
-		-e 's|$base/$logdir|$logdir|' \
-		-e 's|"maillog.log"|"/var/log/assp/maillog.log"|' \
-		-e 's|-d "$base/logs" or mkdir "$base/logs",0700;||' \
-		-e 's|-d "$base/notes" or mkdir "$base/notes",0700;||' \
-		-e 's|-d "$base/docs" or mkdir "$base/docs",0777;||' \
-		-e 's|$base/$archivelogfile|$archivelogfile|' \
-		-e 's|"$base/$file",$sub,"$this|"/etc/assp/$file",$sub,"$this|' \
-		-e 's|"$base/$file",'\'''\'',"$this|"/etc/assp/$file",'\'''\'',"$this|' \
-		-e 's|my $fil=$1; $fil="$base/$fil" if $fil!~/^\\Q$base\\E/i;|my $fil=$1;|' \
-		-e 's|$fil="$base/$fil" if $fil!~/^\\Q$base\\E/i;|$fil="/etc/assp/$fil" if $fil!~/^\\/etc\\/assp\\/\|\\/var\\/lib\\/assp\\/\/i;|' \
-		-e 's|$fil="$base/$fil" if $fil!~/^((\[a-z\]:)?\[\\/\\\\\]\|\\Q$base\\E)/;||' \
-		-e 's|if ($fil !~ /^\\Q$base\\E/i) {|if ($fil !~ /^\\/usr\\/share\\/assp\\//i) {|' \
-		-e 's|$fil = "$base/$fil";|$fil = "/usr/share/assp/$fil";|' \
-		-e 's|Q$base\\E|Q\\/etc\\/assp\\/\\E|' \
-		-e 's|$fil="$base/$fil"|$fil="/etc/assp/$fil"|' \
-		-e 's|$base/$bf|/etc/assp/$bf|g' \
-		-e 's|rebuildrun.txt|/var/lib/assp/rebuildrun.txt|' \
-		assp.pl || die
-
-	# sed rebuildspamdb.pl
-	sed -i -e 's|assp.cfg|/etc/assp/assp.cfg|' \
-		-e 's|} && "$Config{base}/$Config{logfile}" \|\| '\''maillog.txt'\'';|};|' \
-		-e 's|tmaxtick('\''rebuild'\'');|tmaxtick('\''/var/lib/assp/rebuild'\'');|' \
-		-e 's|goodhosts|/var/lib/assp/goodhosts|g' \
-		-e 's|rebuildrun.txt|/var/lib/assp/rebuildrun.txt|' \
-		-e 's|$base/$DropList|$DropList|' \
-		-e 's|&fixPath($base) . "/|"|' \
-		-e 's|= "/var/lib/assp/rebuildrun.txt";|= "/var/lib/assp/rebuildrun.txt";\n    $RebuildLog          = "/var/lib/assp/rebuild.log";|' \
-		-e 's|"$base//|"/|g' \
-		rebuildspamdb.pl || die
-
-	# remove windows stuff
-	rm "${S}/addservice.pl" || die "Could not remove ${S}/addservice.pl"
-	rm -f "${S}/Win32-quickstart-guide.txt" || die "Could not remove ${S}/Win32-quickstart-guide.txt"
-}
-
-src_install() {
-	# Configuration directory
-	dodir /etc/assp/notes
-
-	insinto /etc/assp
-	# Installs files that are used by assp for black/gray lists,
-	# and domain country lookup. To be changed by admin as needed.
-	doins files/*.txt || die
-
-	fowners assp:assp /etc/assp -R
-	fperms 770 /etc/assp /etc/assp/notes
-
-	# Setup directories for mail to be stored for filter
-	keepdir /var/lib/assp/spam /var/lib/assp/notspam
-	keepdir /var/lib/assp/errors/spam /var/lib/assp/errors/notspam
-
-	# Logs directory
-	keepdir /var/log/assp
-	fowners assp:assp -R /var/log/assp
-	fperms 770 /var/log/assp
-
-	# Install the app
-	exeinto /usr/share/assp
-	doexe *.pl *.sh || die
-	insinto /usr/share/assp
-	doins -r images/ || die
-
-	# Lock down the files/data
-	fowners assp:assp -R /usr/share/assp
-	fperms 770 /usr/share/assp
-
-	# Data storage
-	fowners assp:assp -R /var/lib/assp
-	fperms 770 /var/lib/assp
-
-	# PID directory
-	dodir /var/run/assp
-	keepdir /var/run/assp
-	fowners assp:assp -R /var/run/assp
-	fperms 770 /var/run/assp
-
-	# Install the init.d script to listen
-	newinitd "${FILESDIR}/asspd.init" asspd
-
-	dohtml docs/*.htm || die "Failed to install html docs"
-}
-
-pkg_postinst() {
-	elog
-	elog "To configure ASSP, start /etc/init.d/asspd then point"
-	elog "your browser to http://localhost:55555"
-	elog "Username: admin  Password: nospam4me (CHANGE ASAP!)"
-	elog
-	elog "File permissions have been set to use assp:assp"
-	elog "with mode 770 on directories.  When you configure"
-	elog "ASSP, make sure and use the user assp."
-	elog
-	elog "Don't change any path related options."
-	elog
-	elog "See the on-line docs for a complete tutorial."
-	elog "http://assp.sourceforge.net/docs.html"
-	elog
-	elog "If upgrading, please update your old config to set both"
-	elog "redre.txt and nodelay.txt path of /etc/assp.  There are"
-	elog "also many new options that you should review."
-	elog
-}
diff --git a/mail-filter/assp/files/asspd.init b/mail-filter/assp/files/asspd.init
deleted file mode 100644
index cad0d9426ac1..000000000000
--- a/mail-filter/assp/files/asspd.init
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-        need net
-}
-
-start() {
-        ebegin "Starting ASSP"
-        start-stop-daemon -b -m --start --quiet --startas /usr/share/assp/assp.pl \
-                --pidfile /var/run/assp/asspd.pid -- /var/lib/assp/
-                       2<&1 >> /var/log/assp/assp.log
-        eend $?
-}
-
-stop() {
-        ebegin "Stopping ASSP"
-        start-stop-daemon --stop --quiet --pidfile /var/run/assp/asspd.pid
-        eend $?
-}
diff --git a/mail-filter/assp/metadata.xml b/mail-filter/assp/metadata.xml
deleted file mode 100644
index c3631e5d6d67..000000000000
--- a/mail-filter/assp/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>patrick@gentoo.org</email>
-		<name>Patrick Lauer</name>
-	</maintainer>
-	<longdescription>
-	The Anti-Spam SMTP Proxy (ASSP) Server project is an open source
-	platform-independent SMTP Proxy server which implements whitelists
-	and Bayesian filtering to rid the planet of the blight of unsolicited
-	email (UCE). UCE must be stopped at the SMTP server. Anti-spam tools
-	must be adaptive to new spam and customized for each site's mail
-	patterns. This free, easy-to-use tool works with any mail transport
-	and achieves these goals requiring no operator intervention after the
-	initial setup phase.
-	</longdescription>
-	<use>
-		<flag name="spf">Adds support for Sender Policy Framework</flag>
-		<flag name="srs">Adds support for Sender Rewriting Scheme</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">assp</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/mail-filter/libsrs_alt/Manifest b/mail-filter/libsrs_alt/Manifest
index 9183eb276040..57a6aca707e8 100644
--- a/mail-filter/libsrs_alt/Manifest
+++ b/mail-filter/libsrs_alt/Manifest
@@ -1,4 +1,4 @@
 AUX libsrs_alt-1.0-ftime.patch 313 BLAKE2B f634abd1e527a199374fc55bf84927c5e38730f79d1b13f7cb0199ce338f825902df662248fa99bb3baf4c4c07117031b52e3e986a7ad0b2816ca28cfe7601b2 SHA512 2566c9b7e9187a243f5eb6b4b67d649bc081538350f647f1afa69812892a8ff8ef889068ccb73f019cf287e9e6ae3999bc62b2003d197963606a4c30ebecd214
 DIST libsrs_alt-1.0.tar.gz 337225 BLAKE2B 1fb10130eb44c8edfc3757b9ba6d8a77659d1ba53fa620da2f7c5fe6cb01fe3f9c1ac0aac5a49db7d9f1b8308ac4c07778e03e4aa6ad9c0204a0871dff40047f SHA512 c202b2cbd28ce0b1296a8000b9f2ae19f4fff259a2d9ea43674cab11b947d0f85a0fdbb13e5fef2a52b1ae675a8fa35b492b233f97f5e365a9c076a337010629
-EBUILD libsrs_alt-1.0.ebuild 1045 BLAKE2B 3a75cddf9e353ed2db846fd6ca2f645c49be1a575e2910ad289dd3daae8b46dbaa4114dd828fabce8cd4b8d673d6eb54a497ef362b6abce50c337ad35a208d9a SHA512 a8d1dc4463a99960f02fba815787bc5dacdc19d0c1afb560d227e48df4a8711a28c432d8ec2e1aa473940ba7134a07f66276b1911e6a942ac0f7dbc557875b19
+EBUILD libsrs_alt-1.0.ebuild 1047 BLAKE2B 83fa19ff750dfed2dce7b5fb2e22a2cfea92bd21e36f5be17a6b66dfcc68a0ecfe1525ec0ef2f773ae442a3aa9bedf9a67ada37289423921f40bde587eff6912 SHA512 483b670eb681e3c8fe98862b008529aebd5ca07ce3e6b230cef945482f7182281f2cefd8342ec10d07c6c16c7603799e0ab8c678d881be3d0b7299653d56d70d
 MISC metadata.xml 518 BLAKE2B d720f0e6fd11afb4166430b8f386946a077ecf54ca461263b7961add5925944327936065dd5a74916509f9eaedc5fd46c36a1c97bc26c08e3d5419a2834d2907 SHA512 db7db9ec2212bb9dbb1ee78dafff7ff249dfd5d90a40fcd690476a96c457fe72cce9f48f56bffc59e8b0e15ba0dcc15dfec138e09af3f59bf59fc8717fedce60
diff --git a/mail-filter/libsrs_alt/libsrs_alt-1.0.ebuild b/mail-filter/libsrs_alt/libsrs_alt-1.0.ebuild
index 5f643ea88cce..272b35e945f5 100644
--- a/mail-filter/libsrs_alt/libsrs_alt-1.0.ebuild
+++ b/mail-filter/libsrs_alt/libsrs_alt-1.0.ebuild
@@ -10,7 +10,7 @@ MY_RC=${PV}
 S=${WORKDIR}/${PN}-${MY_PV}
 
 DESCRIPTION="Sender Rewriting Scheme library"
-HOMEPAGE="http://srs.mirtol.com/"
+HOMEPAGE="http://opsec.eu/src/srs/"
 SRC_URI="http://srs.mirtol.com/libsrs_alt-${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/mail-filter/opendmarc/Manifest b/mail-filter/opendmarc/Manifest
index 93f36da32c42..c788054f659d 100644
--- a/mail-filter/opendmarc/Manifest
+++ b/mail-filter/opendmarc/Manifest
@@ -1,12 +1,9 @@
 AUX opendmarc.confd 85 BLAKE2B 52cccfd8d194febc24453ad92bebf4358f92125cc4512e664e279f09ee0c44bffc4fa2c4c6dbbdfaf653576bcce821597cccb58fafdfae51b81e5ac149e20113 SHA512 7e5faeebbccaaafe42e6edda3a812b9954f19d71b4593cb2ab895dfeb26a8073e4aaeb2f5c626b1c35877d08ea00077b0507fe833e2838b10d83d5e0acfe966c
 AUX opendmarc.initd 1509 BLAKE2B b1cde9546c95b51c8c395f10eddf85bcb2fd17fd8a537df523e04a71d241c0fad4a3d2e4c34c950d7b684be518368fe78538828b81627d647e3531177eabb85e SHA512 00c9901cf5b460e20d8010d4aedfd7c338c76d1053f9ddcd9d4aa2c183345e3b810d0bee1207ff9a7ad988577192c52470ca62c67130a981fa67e393d5c70129
-AUX opendmarc.service 799 BLAKE2B 08e6b800f46a6d21a50f7edb5b19117e0464e89af38d4e190c1962c132c27524e9ac591957c14133980e05212bdef5940cc4f0748437ae459a15530c8696440f SHA512 a918f9f6bcfc78c59244e7b6603ce49a70a88093ec9af9c3d73cdaa50b1d4941a857bb96c917a53ef4ff3929bf3556ca60d541d65a4a8e5318946386623b7f66
+AUX opendmarc.service 800 BLAKE2B 866b1aaa0c8570494ac56aaa9962821204a7a24437cdb8bec0343c716cfc1d3748a368a32ec314dfce7e4264188cfb1dff51212d60340d4be8e33394a85486f6 SHA512 b140dc3ac99ee7c3dcee80743d6c4295dec4ce5090ab9f560ffe35f9d5e63c7f5af871edcc759be462b8110706028c047cd05ae910a74ecba0436620d6b291bb
 DIST opendmarc-1.1.3.tar.gz 586574 BLAKE2B a5574aa705db6e5b87a704f3073039d667c9052d1ec907ca9423532f62d52cbdaf7af1680a2179198616f27786940650492ad39c4fdb668c27c5979804471eea SHA512 30de56b6da1665e0ed68484702bfcfcbd0b65275053818c807c16dea26f0e014a0484dc9d5ed6d1405628ea22a61082f13cecf66714a414139f612c51a294086
-DIST opendmarc-1.3.0.tar.gz 640017 BLAKE2B 6ffe63ac8a610ae4ef9904379e42e11f2dbc09e14a7febe36e875247f72d958b9ff931cd1a034f28d0a9eff15663cf0acb75d8d0c91186243fbab94470bf10db SHA512 c685cae0e02a72b797f24a28b9965f8745f165a3ce3a8f3f2e0167ebf6121e92389990870271204ca02b06703f4ad98c6d343345478040f7fc4013b1ce331b03
-DIST opendmarc-1.3.1.tar.gz 640151 BLAKE2B 8e0e29ac9b95730f226a16c6130ff78aca7ecaf8c896864d9868f7d285676b84c2896bd0663fafbd79a9a7e182655a644aa51e37dd23a08662406099a7f1c5d5 SHA512 0be11540bc26bd3b3e6cc9817bc379a5d290b63ef16c5d3559bf96b241ad6628bea7a9daeb468afac855bc16be16676f722b3c1d468ea82c8d8364e8a8137226
 DIST opendmarc-1.3.2.tar.gz 593448 BLAKE2B 80f47a82e38c6cdc5791a695485262c50e9363b81537a52d7af204bd6a830df6eea9e9b6f710b72b7934c3ab7df800def7d4b3e54f53b8908a7f1b42bcea2b2d SHA512 6045fb7d2be8f0ffdeca07324857d92908a41c6792749017c2fcc1058f05f55317b1919c67c780827dd7094ec8fff2e1fa4aeb5bab7ff7461537957af2652748
 EBUILD opendmarc-1.1.3.ebuild 768 BLAKE2B f9fcb819281ac3eadbfc22875fdfa0d663cd5c73c9e4221ade6af260ae0f3bfdbb5b396de53b297a7346120cbc36b06a698d6ae1cb3df0b916a1842944751d2e SHA512 d2f7ae5dd159315b6f96bea798796cd6ee9ff7a3fd07329c80e7764fc1e9d9cc35fab481dccb369dea0f1682590ecc17ec45448be514602626bd565dab527257
-EBUILD opendmarc-1.3.0.ebuild 1151 BLAKE2B ee9031d2b817db728a5deaf846bbcb0a31832bffb436f6275add51feb007b60fbff1c124140c57c65698af8afe7f6ba73608948ad1fe3acbe90a5008cf329b8c SHA512 5f78d95f7cee6896f592a907baf175f52b2d42f497f286392a7cc0db91d7a84de6628b99f914fec805045abb86e2b1f3ba86d61fc2eb7a1d5134de276cd8ed20
-EBUILD opendmarc-1.3.1.ebuild 1156 BLAKE2B f67a507aba98313c53b224e9cf4883d5fef73b4aea7b55daf7cd2583a3135919acfc46f8ccb09b31b767f3692d5d819558d3588fceba266b23fadb17b0b211b9 SHA512 16f9c896956264d1a4baea5d2b89d0a9faa67541e016e2e75304f087df60f72430b6f3fb079a250b183bfa2f5f868c3b97f350d8a11d24c817a68355d9c42e1d
 EBUILD opendmarc-1.3.2-r1.ebuild 1522 BLAKE2B d75259d5ce9c44e3f8ba59bba674d520d886d150843298dbef587843f842d7ca8c9b368140ab4daffba1c4222245254d818bc868d5e33c6c4e18b4618c280093 SHA512 27d9c2f088c7a5789837e49e8357a3f7100852e752786060d5eb00854cbf552bf3803364ecb181aae7c13b2e5e2abfeb21f8b11ca08e98259618e77eca170250
+EBUILD opendmarc-1.3.2-r2.ebuild 1653 BLAKE2B cd6586f514e0bf0d6ea7c2be0cefb7183c1e1eeae49ac604a7007faca8680bf011782d00e92874efe48849286529720bed5b9d8b00cdce8d99c82405497cffc4 SHA512 e08db6424216860a9da55b472398f917486c2ae4e2435c98c3d7049ea6204ec2644d58ffdabb82560d1054856ad43fa298c2c995743c157e6f49f1f0f2e3d187
 MISC metadata.xml 617 BLAKE2B 52663fcfe5269dff772d329e505644227b5a40226d354c2d633190a5206e80b6c8f9afbd1b8a2834f8995ee599117266beba893fb73bbabc226da31ac91e6e84 SHA512 d87d8c166d001457d673d4c19ed5a34aa6e2fd99dd91aee1d31649d1b9e671034dcec42b5e160817d45ed6f8f0a44bce579ce72861113588a4229f25b56386fb
diff --git a/mail-filter/opendmarc/files/opendmarc.service b/mail-filter/opendmarc/files/opendmarc.service
index e450637a02f6..90ee5ccb4341 100644
--- a/mail-filter/opendmarc/files/opendmarc.service
+++ b/mail-filter/opendmarc/files/opendmarc.service
@@ -1,7 +1,6 @@
 [Unit]
 Description=Domain-based Message Authentication, Reporting and Conformance (DMARC) Milter
-Documentation=man:opendmarc(8) man:opendmarc.conf(5) man:opendmarc-expire(8) man:opendmarc-importstats(8) man:opendmarc-reports(8)
-man:opendmarc-check(8) man:opendmarc-import(8) man:opendmarc-params(8) http://www.trusteddomain.org/opendmarc/
+Documentation=man:opendmarc(8) man:opendmarc.conf(5) man:opendmarc-expire(8) man:opendmarc-importstats(8) man:opendmarc-reports(8) man:opendmarc-check(8) man:opendmarc-import(8) man:opendmarc-params(8) http://www.trusteddomain.org/opendmarc/
 After=network.target nss-lookup.target syslog.target
 
 [Service]
@@ -17,4 +16,4 @@ Restart=on-failure
 RestartSec=3
 
 [Install]
-WantedBy=multi-user.target
-\ No newline at end of file
+WantedBy=multi-user.target
diff --git a/mail-filter/opendmarc/opendmarc-1.3.1.ebuild b/mail-filter/opendmarc/opendmarc-1.3.1.ebuild
deleted file mode 100644
index 22347bba5397..000000000000
--- a/mail-filter/opendmarc/opendmarc-1.3.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit user
-
-DESCRIPTION="Open source DMARC implementation "
-HOMEPAGE="http://www.trusteddomain.org/opendmarc/"
-SRC_URI="mirror://sourceforge/opendmarc/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~x86 ~x86-fbsd"
-IUSE="spf"
-
-DEPEND="dev-perl/DBI
-	|| ( mail-filter/libmilter mail-mta/sendmail )"
-RDEPEND="${DEPEND}
-	dev-perl/Switch
-	spf? ( mail-filter/libspf2 )"
-
-pkg_setup() {
-	enewgroup milter
-	enewuser milter -1 -1 /var/lib/milter milter
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		$(use_with spf)
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/opendmarc.initd opendmarc
-	newconfd "${FILESDIR}"/opendmarc.confd opendmarc
-
-	dodir /etc/opendmarc
-
-	# create config file
-	sed \
-		-e 's/^# UserID .*$/UserID milter/' \
-		-e 's/^# PidFile .*/PidFile \/var\/run\/opendmarc\/opendmarc.pid/' \
-		-e '/^# Socket /s/^# //' \
-		"${S}"/opendmarc/opendmarc.conf.sample \
-		> "${ED}"/etc/opendmarc/opendmarc.conf \
-		|| die
-}
diff --git a/mail-filter/opendmarc/opendmarc-1.3.0.ebuild b/mail-filter/opendmarc/opendmarc-1.3.2-r2.ebuild
index 7a751418a039..51f53a61e7d9 100644
--- a/mail-filter/opendmarc/opendmarc-1.3.0.ebuild
+++ b/mail-filter/opendmarc/opendmarc-1.3.2-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit user
+inherit user multilib systemd
 
 DESCRIPTION="Open source DMARC implementation "
 HOMEPAGE="http://www.trusteddomain.org/opendmarc/"
@@ -11,13 +11,17 @@ SRC_URI="mirror://sourceforge/opendmarc/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~x86 ~x86-fbsd"
-IUSE="spf"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~x86 ~x86-fbsd"
+IUSE="spf +reports static-libs"
 
-DEPEND="dev-perl/DBI
+DEPEND="reports? ( dev-perl/DBI )
 	|| ( mail-filter/libmilter mail-mta/sendmail )"
 RDEPEND="${DEPEND}
-	dev-perl/Switch
+	reports? (
+		dev-perl/DBD-mysql
+		dev-perl/HTTP-Message
+		dev-perl/Switch
+	)
 	spf? ( mail-filter/libspf2 )"
 
 pkg_setup() {
@@ -25,26 +29,39 @@ pkg_setup() {
 	enewuser milter -1 -1 /var/lib/milter milter
 }
 
+src_prepare() {
+	default
+	if use !reports ; then
+		sed -i -e '/^SUBDIRS =/s/reports//' Makefile.in || die
+	fi
+}
+
 src_configure() {
 	econf \
 		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		$(use_with spf)
+		$(use_with spf) \
+		$(use_with spf spf2-include "${EPREFIX}"/usr/include/spf2) \
+		$(use_with spf spf2-lib "${EPREFIX}"/usr/$(get_libdir)) \
+		$(use_enable static-libs static)
 }
 
 src_install() {
 	default
 
+	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.la
+
 	newinitd "${FILESDIR}"/opendmarc.initd opendmarc
 	newconfd "${FILESDIR}"/opendmarc.confd opendmarc
+	systemd_dounit "${FILESDIR}/${PN}.service"
 
 	dodir /etc/opendmarc
 
 	# create config file
 	sed \
-		-e 's/^# UserID .*$/UserID milter/' \
-		-e 's/^# PidFile .*/PidFile \/var\/run\/opendmarc\/opendmarc.pid/' \
-		-e '/^# Socket /s/^# //' \
+		-e 's:^# UserID .*$:UserID milter:' \
+		-e "s:^# PidFile .*:PidFile ${EPREFIX}/var/run/opendmarc/opendmarc.pid:" \
+		-e '/^# Socket /s:^# ::' \
 		"${S}"/opendmarc/opendmarc.conf.sample \
 		> "${ED}"/etc/opendmarc/opendmarc.conf \
 		|| die
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index 331e0393392d..bdb4ab7c2c92 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -2,26 +2,12 @@ AUX 3.4.1-spamd.conf-r1 1257 BLAKE2B bbdeeda731965dcd863c2a9bc615295b7d48e011099
 AUX 3.4.1-spamd.init-r2 1178 BLAKE2B 885a396e8b66e066e0f12bf49b9e66bad9db30551b8c807a7f8166b51a240aac751d0bab1d2cd50962a1f95f19d51a3e26b1d04d03276e4f3796de38382cfe38 SHA512 e17a735d4f0df52488c4e38acd9c4795145ae5355cc9ac640d07662883b65ff95d54168cca2ce6ec0a35d6879e3426b3b3e341fa0551c86d0e87b92d7f02cda1
 AUX 3.4.1-spamd.init-r3 1180 BLAKE2B c7290e6016b27247610b050f77368fcbf3dd3f4ab0a72a933b3819f35dfe9f9085f13f73be95b1169e04d3a09bc4cec6284e87963059ac047d5908df3458fb2b SHA512 2c968750da3252e8dcce4cebf105a26a9dbc471e39bda7d66180e0fbf930b11dd3a98337d7c387026375918b660768c637c2f2031d6624ce3237d9cc8cd88a02
 AUX secrets.cf 664 BLAKE2B a501fb93369743e3c9139cc780f166168313613c840857bc0e72def5b3e168f235afc16a1dc34afa0e839ffa9da6c0c360c9a93a126d9dd711b4473e0a19ebcc SHA512 bb6992098a44e16147be46b75b70e3fb81672285dd71a30719606e2cab556720fc9dd318c7a80832ceaf2e6d9c98c2dd7434f48242feede1922c3e1073559edb
-AUX spamassassin-3.4.1-bug_7199.patch 10254 BLAKE2B f1a070c47658d67ebf01b68fc9312a4cbf331555a89eb1305f2568d8c18b5c14b266b51456e1e42bf3286d59517a00f7528b4878a72357b9736e8cd4148f7a13 SHA512 dd9ffaeaea93d03524315f300b5ce8ba8f0fd3f024b391adf8c0d08ab9b07427164c7f9eaea36c603f92643e7523f2683e75cf0c878ff7aa90101e8f0b0976c2
-AUX spamassassin-3.4.1-bug_7208.patch 1271 BLAKE2B 56e3d3d1a7a29e0f8090d8e4da6c38c5eaad9558eeac6f2e9f5619eb0d04a91a1abfaf11369ca31560c928388092e68c8ae745c5b0f7b54bb1bbaa0d76fcb202 SHA512 2f353f88a3f9a2a0895e024314ca5243142c117a824ed526d05e63caed96fa8807b21628cb53e036df3f2e523529e0a057a00dca667110ec064a021deb45b7ba
-AUX spamassassin-3.4.1-bug_7223.patch 526 BLAKE2B b52af712616dc0247d740d9045a47c77a932bdb8e0ed397dec4b02815b7d4edbeeaa573331b048d17d840ab8af5f694a3473090ea00f622db3eb05381edfa5d1 SHA512 52949d391400582af028dfcfdbf1a781f6cbfe5bdd9125bfa4347f9ab0a4b596e3fa86ff112bf7a7992d0a0f619f686a533792b2d00d69aaf94ae678ba429d0b
-AUX spamassassin-3.4.1-bug_7231-extra.patch 6837 BLAKE2B a2d3e204835b7d07bd6e95f9405ad47150d96d5d09aba357de7bad015afa07bb163f84b4954f00a131d9e636ee0da07d9e2a6f49aa6f5b5e50816af3b1cd2af5 SHA512 ec29c56b33155bc287be74c5eb0bb8ff6a4a94a00e5d0f396cc8845a1cc6bbe75935a5f841a732f68fd2baa5fe5089642dc7633ce224006f57b4d989e400082c
-AUX spamassassin-3.4.1-bug_7231.patch 949 BLAKE2B efca0481d38375f73b83ad12832e9b9b553184ac0a2561d730c57f021eee9dc140b2fde03f8dfdc5ea9ffa0f036087ea11c63145eadaea104faa178319cb364b SHA512 319d517b1fd36d26c2bf34f348ddaf17ff708cbb7e8488c725fe14e8be154c2567d782de2291afa07696b988cbf984dfce9f05f060cbcbd8505f3520e6be4a29
-AUX spamassassin-3.4.1-bug_7265.patch 3432 BLAKE2B 9eb12bfb4134b1202c7bf3129e8986c0e7874553ee4a15447b2ab8151a1d5aab8e2de7e8657c837345c08c3f001432e1775fd02904778d139cedb8eb493d584a SHA512 8d77aafdf465d8063f0069cdc316bc1be7ffbf8f7a56879fd96a4370e0ccdb412b96d5749ac782d4d72d673d560162e3fc809cd796bb5db58d96f0387a134257
-AUX spamassassin-3.4.1-bug_7361.patch 16483 BLAKE2B bcb17a9e246bee95e0f5ffcd8b08d14467df7ba51062cdf848b8198a08ece48257d39f75bca1c6f59b954e535c9cd0822a67f73445850a8c6b231315a3d96283 SHA512 7c84ef8f94a1379d1fbd102cc1e6de35293809261f4989ed65eee05b5198fc1e7ea3cd035cbaeef680127a5b2ab43cb98f27f74fce1fb1999dec1f7881698a73
-AUX spamassassin-3.4.1-bug_7404.patch 792 BLAKE2B 711c5916827504dd06eebe6138df4bca7e364825c0df601b6bb6542e68f18d8a7546e05f23671b6a8d479f7dc12365217fc8437425b6a342331661f0e4aa644e SHA512 8bc613699872f0358d699f0c151bf9eac6ff80d9dc878d38fca522ac091f4e1348982bf2ce8029c7f241fdbabbf531e1d45f301159f6eddfbeb935252bd577e5
-AUX spamassassin-3.4.1-bug_7462.patch 5836 BLAKE2B 734601071cfff101177d98afa758f15622bd393ea02ab247b20a8fc368c8600a094bb1de04b3ffb3c9d9d9878d332c25587a65e1f4a5cbd01d21eb99f3ee7458 SHA512 68cad4b4ebd46fa186df04c926043fcdcf0099504451ed2b323d35871d142448431777baf2d374082554e1ef914efbf8f89001e1975c10e73e8865f3feff5878
-AUX spamassassin-3.4.1-perl526.patch 484 BLAKE2B eca4a52d15171fe048bfd3f997aa73c1eb0235a50c5b4e61a28ea1c707eddf184a888a0e1c75700cda9ced26ccf693d8a8040cac1bf59f46ea66854f0aa99d37 SHA512 ded5a6079f95bb4a771e23b382af83498f16144eb9ba613b97b365b52d96845255f26ddf561b7d6edaa53c7acad3d62294adb01ce4a8a4157470a5ed92cd1b13
 AUX spamassassin-3.4.2-bug_7631.patch 2022 BLAKE2B 33b67b585fdb2ce82b6e64856463714e014f8e6ae69671a70f0a8c0952450c888e9e42cd4cebe0d57cf6552d30ae50214757c0192f61601294b4e11c39537832 SHA512 f23c7f9d821ef9d24f716f56016ce3bb1b29fabd177ad7ce3f8b6728601fcfb22d2c8aad82f36b978f3343bc18a514e1e85ce7c5b207ffd732c2921cf4909353
 AUX spamassassin-3.4.2-bug_7632.patch 673 BLAKE2B a819b0817efb745f1dc9d971fa476d9da355b72df41ffc58a7a505a5a2c1588ecee3e1dbe79c3a0d03ba04a6fc2e63bc018b49240da1417bb2a967925ed85e84 SHA512 adf9f78a60a95d16cf918e048c178986ec5543fb80a350d9419800b2bcc8fbcc8669967b77d9a85dfce7b67528fe9d816f5ca9a435444197f9ac1aa83d92fec3
 AUX spamassassin.service-r4 182 BLAKE2B c5813612e78602d6e67b527f07a8a38171422a638bf419135b34f950a036e899ee6d6a129413ab52ca737f18258265cad971a0b84057561b7012fbc390efd7e9 SHA512 35da6ed8baa1cfc13546b409ed65d18334410ee497f9609c89cd4993dc8084ed479ddc7658e72a52a9b79f1a73d4efba42148b7238678c17a2965f9ff6a608e9
 AUX spamassassin.service.conf-r2 120 BLAKE2B cdefa5d73234be5331f7ff7cc646f10365adf515b85bf0d9912d240105579747f3834b7f72402a31b5be9b8ed0faf2545ae0a4ed46ebd3c7a90962f764fb5e8a SHA512 55b93ce1636505beabba21cd208541750ef448e952658b65d6e1447f92cec3a35e3d489d014a0229765117168cc03b4675652709f7ed9973be8fba84c10786dd
 AUX update-spamassassin-rules.cron 1378 BLAKE2B 0fda2be565deae75c0248c6dfc5abfc05a3fc4724cfed74175d35d276e8ea257ee93abce1d56be8c2f957621c039a2ba7e25a368f339b9b80f8dd9865944320b SHA512 90927b7709569a24ea2a233f42b16fce91bfda85e75e859ad85bc7ad16f7ad61ddb32bafc9b5b72515949b9ba8dda597679c24c2be4688d974375faf00bbccd5
-DIST Mail-SpamAssassin-3.4.1.tar.bz2 2710985 BLAKE2B f85b0ed2bae783bc6dfa39df36589a6cb90e6c657efcff1fa094f952847e4bcb24aa232b6689804bb1170204ae1d33216ed9bde207d7a7a6863410d8f847c391 SHA512 91d50e2ce6520e3e1c7bc66da133a0815be34ced15e26b6e6c17af5a03d5c62f41d8086f25f65084d6634497148cf5439977d7d4a44d7c3e307535beac6629af
 DIST Mail-SpamAssassin-3.4.2.tar.bz2 2700016 BLAKE2B a29b4cfce5e578c07ec54b2224191917dc45bcefff071f674c572fc905f1d6324827bcc21c338546bdea11140fc20474a16314218e2fd4fa685965b0e0078df8 SHA512 fe3d9d1d7b9fed3063549afd071066729f1f4d998be91ded1e5afc29bb37c7a298dc5f8f99a282b75435d317b5b5072a81393134ccfe059a73d953e26a9c3885
-EBUILD spamassassin-3.4.1-r19.ebuild 7828 BLAKE2B 2cbf6260632b4fba3e0f25eeb4301be18a321768d6ac77f479d0d0bb7914fb978b59817db61ac35acb19386b2831381f1e6f7784dd8c72f94999c0c9e8cb718c SHA512 822bbd4cefdd73a8174072c2131cd8deead8416192ce7b9373165476cdaa2b3056b589d9143fc84944ad9bd312333852cd510e3ac949afba5310fda9a778b64c
-EBUILD spamassassin-3.4.1-r20.ebuild 7814 BLAKE2B 144d0498236d9f504e252d7dea23910a7ece9739a8df0a2f840be25ae656702f64847f533b5dcbd54761e3fb5e073b49ca117107269b5bc25a36ab64c0d52468 SHA512 3bc999d93244311e074cbecf3b6e4ad7db065b8ddeb1a13f0cd93e654ed7694d8c527b35dc624479efb56bdb050fa46996a5a8bce15fa3968e26970e87552d32
-EBUILD spamassassin-3.4.1-r21.ebuild 7862 BLAKE2B 0d5897de61875e18bc7791ff15b6955be8685caf7ede9bc8294f46b3b7ab1a3f98657f2b1c3769303c4b728e530bf97187430b835c0dfb3b31f2f11951cc37ad SHA512 3d48cb3993e648c59a8073100f03a9f2e7b08c6aa2032374386ea014bc4df1053a6f01110655e8be1d217743f3927c4f183d61735602b09f54ed23eee38b0bbb
-EBUILD spamassassin-3.4.2-r2.ebuild 7609 BLAKE2B 00c115b66fb3b0d5da4a8e8a94c1bd834979e039d59732ee01f5d81ea29ffbc5144b552dc6f415d1184f6d7294a89f13d19fec6f5020d3b17016eb27ca5a54e8 SHA512 b308193d455c2d8a802e9c776c1e82e164f4f412da52bf13f7d4a565778bf499a8f5626e674eda2fc9fafd2c1de9d639f8e3e462579d4c4ed7f36e0f1a4ccdf9
+EBUILD spamassassin-3.4.2-r2.ebuild 7607 BLAKE2B c1232716b004a956480f5bc87f4ff1266471424302f17836bb34922e81d2815a97c12e4a204c0444b89180c0254dcd9b7f8e8f093d366c55274da9bf2836c97b SHA512 2b3bbad6b186b9af4dc17a5c664120e6a413fbf885f6ed91530653c88b2a9b2046dc0563a5f3dbe81492abe3dab4b55235e9b5c7caee5eb201cfdfd9c0ed41ed
 EBUILD spamassassin-3.4.2-r3.ebuild 8559 BLAKE2B 0657529ee4324147998e4b6ee935cebe63b20643abc3a7fdc321370ff9343a44b1d97e6d7073dc568e35fde983b0734d363f81599c423ac35546592b8b1be984 SHA512 b8ad6679c0928e174c8c0f446af91f2dbb8e40e5dd48fab6299aa3d68ef29d6e597d5656a50a7875b15cbc4c1029720950af994b0a0c1e98a4c2e46ed531d04a
 MISC metadata.xml 807 BLAKE2B 14bf38e1888040ece6a48e7a8234917d5f9ae8d699995a0414520c0d262b91518c233ee3d3b1d13d7b5068fea8ec612bfee2a84ce825748e471b6ba6c25728b5 SHA512 2cc4534cdb5ed62612419a99a67e9e8e1867ba73a2daf957e3df8e7f2fd0bd058b7c9bb31fdfadb56d4001ce89e66d8f9da89d620e482d8f13502f288eb4136b
diff --git a/mail-filter/spamassassin/files/spamassassin-3.4.1-bug_7199.patch b/mail-filter/spamassassin/files/spamassassin-3.4.1-bug_7199.patch
deleted file mode 100644
index 323740cbb048..000000000000
--- a/mail-filter/spamassassin/files/spamassassin-3.4.1-bug_7199.patch
+++ /dev/null
@@ -1,280 +0,0 @@
-The "sslv3" option doesn't do what it says (upstream bug 7093) and
-only makes things worse. The SSLv3 support also prevents SpamAssassin
-from working with LibreSSL, which no longer does SSLv3.
-
-Index: trunk/spamc/libspamc.c
-===================================================================
---- trunk.orig/spamc/libspamc.c
-+++ trunk/spamc/libspamc.c
-@@ -1187,7 +1187,7 @@ int message_filter(struct transport *tp,
-     unsigned int throwaway;
-     SSL_CTX *ctx = NULL;
-     SSL *ssl = NULL;
--    SSL_METHOD *meth;
-+    const SSL_METHOD *meth;
-     char zlib_on = 0;
-     unsigned char *zlib_buf = NULL;
-     int zlib_bufsiz = 0;
-@@ -1213,11 +1213,7 @@ int message_filter(struct transport *tp,
-     if (flags & SPAMC_USE_SSL) {
- #ifdef SPAMC_SSL
- 	SSLeay_add_ssl_algorithms();
--	if (flags & SPAMC_TLSV1) {
--	    meth = TLSv1_client_method();
--	} else {
--	    meth = SSLv3_client_method(); /* default */
--	}
-+	meth = SSLv23_client_method();
- 	SSL_load_error_strings();
- 	ctx = SSL_CTX_new(meth);
- #else
-@@ -1596,7 +1592,7 @@ int message_tell(struct transport *tp, c
-     int failureval;
-     SSL_CTX *ctx = NULL;
-     SSL *ssl = NULL;
--    SSL_METHOD *meth;
-+    const SSL_METHOD *meth;
- 
-     assert(tp != NULL);
-     assert(m != NULL);
-@@ -1604,7 +1600,7 @@ int message_tell(struct transport *tp, c
-     if (flags & SPAMC_USE_SSL) {
- #ifdef SPAMC_SSL
- 	SSLeay_add_ssl_algorithms();
--	meth = SSLv3_client_method();
-+	meth = SSLv23_client_method();
- 	SSL_load_error_strings();
- 	ctx = SSL_CTX_new(meth);
- #else
-Index: trunk/spamc/spamc.c
-===================================================================
---- trunk.orig/spamc/spamc.c
-+++ trunk/spamc/spamc.c
-@@ -368,16 +368,11 @@ read_args(int argc, char **argv,
-             case 'S':
-             {
-                 flags |= SPAMC_USE_SSL;
--		if (!spamc_optarg || (strcmp(spamc_optarg,"sslv3") == 0)) {
--		    flags |= SPAMC_SSLV3;
--		}
--		else if (strcmp(spamc_optarg,"tlsv1") == 0) {
--		    flags |= SPAMC_TLSV1;
--		}
--		else {
--		    libspamc_log(flags, LOG_ERR, "Please specify a legal ssl version (%s)", spamc_optarg);
--		    ret = EX_USAGE;
--		}
-+                if(spamc_optarg) {
-+                    libspamc_log(flags, LOG_ERR,
-+                        "Explicit specification of an SSL/TLS version no longer supported.");
-+                    ret = EX_USAGE;
-+                }
-                 break;
-             }
- #endif
-Index: trunk/spamd/spamd.raw
-===================================================================
---- trunk.orig/spamd/spamd.raw
-+++ trunk/spamd/spamd.raw
-@@ -409,7 +409,6 @@ GetOptions(
-   'sql-config!'              => \$opt{'sql-config'},
-   'ssl'                      => \$opt{'ssl'},
-   'ssl-port=s'               => \$opt{'ssl-port'},
--  'ssl-version=s'            => \$opt{'ssl-version'},
-   'syslog-socket=s'          => \$opt{'syslog-socket'},
-   'syslog|s=s'               => \$opt{'syslog'},
-   'log-timestamp-fmt:s'      => \$opt{'log-timestamp-fmt'},
-@@ -744,11 +743,6 @@ if ( defined $ENV{'HOME'} ) {
- 
- # Do whitelist later in tmp dir. Side effect: this will be done as -u user.
- 
--my $sslversion = $opt{'ssl-version'} || 'sslv3';
--if ($sslversion !~ /^(?:sslv3|tlsv1)$/) {
--  die "spamd: invalid ssl-version: $opt{'ssl-version'}\n";
--}
--
- $opt{'server-key'}  ||= "$LOCAL_RULES_DIR/certs/server-key.pem";
- $opt{'server-cert'} ||= "$LOCAL_RULES_DIR/certs/server-cert.pem";
- 
-@@ -899,9 +893,8 @@ sub compose_listen_info_string {
-                       $socket_info->{ip_addr}, $socket_info->{port}));
- 
-     } elsif ($socket->isa('IO::Socket::SSL')) {
--      push(@listeninfo, sprintf("SSL [%s]:%s, ssl version %s",
--                      $socket_info->{ip_addr}, $socket_info->{port},
--                      $opt{'ssl-version'}||'sslv3'));
-+      push(@listeninfo, sprintf("SSL [%r]:%s", $socket_info->{ip_addr},
-+                      $socket_info->{port}));
-     }
-   }
- 
-@@ -1072,7 +1065,6 @@ sub server_sock_setup_inet {
-     $sockopt{V6Only} = 1  if $io_socket_module_name eq 'IO::Socket::IP'
-                              && IO::Socket::IP->VERSION >= 0.09;
-     %sockopt = (%sockopt, (
--      SSL_version     => $sslversion,
-       SSL_verify_mode => 0x00,
-       SSL_key_file    => $opt{'server-key'},
-       SSL_cert_file   => $opt{'server-cert'},
-@@ -1093,7 +1085,8 @@ sub server_sock_setup_inet {
-     if (!$server_inet) {
-       $diag = sprintf("could not create %s socket on [%s]:%s: %s",
-                       $ssl ? 'IO::Socket::SSL' : $io_socket_module_name,
--                      $adr, $port, $!);
-+                      $adr, $port, $ssl && $IO::Socket::SSL::SSL_ERROR ?
-+                      "$!,$IO::Socket::SSL::SSL_ERROR" : $!);
-       push(@diag_fail, $diag);
-     } else {
-       $diag = sprintf("created %s socket on [%s]:%s",
-@@ -3238,7 +3231,6 @@ Options:
-  -H [dir], --helper-home-dir[=dir] Specify a different HOME directory
-  --ssl                             Enable SSL on TCP connections
-  --ssl-port port                   Override --port setting for SSL connections
-- --ssl-version sslversion          Specify SSL protocol version to use
-  --server-key keyfile              Specify an SSL keyfile
-  --server-cert certfile            Specify an SSL certificate
-  --socketpath=path                 Listen on a given UNIX domain socket
-@@ -3727,14 +3719,6 @@ Optionally specifies the port number for
- SSL connections (default: whatever --port uses).  See B<--ssl> for
- more details.
- 
--=item B<--ssl-version>=I<sslversion>
--
--Specify the SSL protocol version to use, one of B<sslv3> or B<tlsv1>.
--The default, B<sslv3>, is the most flexible, accepting a SSLv3 or
--higher hello handshake, then negotiating use of SSLv3 or TLSv1
--protocol if the client can accept it.  Specifying B<--ssl-version>
--implies B<--ssl>.
--
- =item B<--server-key> I<keyfile>
- 
- Specify the SSL key file to use for SSL connections.
-Index: trunk/spamc/spamc.pod
-===================================================================
---- trunk.orig/spamc/spamc.pod
-+++ trunk/spamc/spamc.pod
-@@ -177,12 +177,10 @@ The default is 1 time (ie. one attempt a
- Sleep for I<sleep> seconds between failed spamd filtering attempts.
- The default is 1 second.
- 
--=item B<-S>, B<--ssl>, B<--ssl>=I<sslversion>
-+=item B<-S>, B<--ssl>, B<--ssl>
- 
- If spamc was built with support for SSL, encrypt data to and from the
- spamd process with SSL; spamd must support SSL as well.
--I<sslversion> specifies the SSL protocol version to use, either
--C<sslv3>, or C<tlsv1>. The default, is C<sslv3>.
- 
- =item B<-t> I<timeout>, B<--timeout>=I<timeout>
- 
-Index: trunk/t/spamd_ssl_tls.t
-===================================================================
---- trunk.orig/t/spamd_ssl_tls.t
-+++ /dev/null
-@@ -1,28 +0,0 @@
--#!/usr/bin/perl
--
--use lib '.'; use lib 't';
--use SATest; sa_t_init("spamd_ssl_tls");
--use Test; plan tests => (($SKIP_SPAMD_TESTS || !$SSL_AVAILABLE) ? 0 : 9);
--
--exit if ($SKIP_SPAMD_TESTS || !$SSL_AVAILABLE);
--
--# ---------------------------------------------------------------------------
--
--%patterns = (
--
--q{ Return-Path: sb55sb55@yahoo.com}, 'firstline',
--q{ Subject: There yours for FREE!}, 'subj',
--q{ X-Spam-Status: Yes, score=}, 'status',
--q{ X-Spam-Flag: YES}, 'flag',
--q{ X-Spam-Level: **********}, 'stars',
--q{ TEST_ENDSNUMS}, 'endsinnums',
--q{ TEST_NOREALNAME}, 'noreal',
--q{ This must be the very last line}, 'lastline',
--
--
--);
--
--ok (sdrun ("-L --ssl --ssl-version=tlsv1 --server-key data/etc/testhost.key --server-cert data/etc/testhost.cert",
--           "--ssl=tlsv1 < data/spam/001",
--           \&patterns_run_cb));
--ok_all_patterns();
-Index: trunk/t/spamd_ssl_v3.t
-===================================================================
---- trunk.orig/t/spamd_ssl_v3.t
-+++ /dev/null
-@@ -1,28 +0,0 @@
--#!/usr/bin/perl
--
--use lib '.'; use lib 't';
--use SATest; sa_t_init("spamd_sslv3");
--use Test; plan tests => (($SKIP_SPAMD_TESTS || !$SSL_AVAILABLE) ? 0 : 9);
--
--exit if ($SKIP_SPAMD_TESTS || !$SSL_AVAILABLE);
--
--# ---------------------------------------------------------------------------
--
--%patterns = (
--
--q{ Return-Path: sb55sb55@yahoo.com}, 'firstline',
--q{ Subject: There yours for FREE!}, 'subj',
--q{ X-Spam-Status: Yes, score=}, 'status',
--q{ X-Spam-Flag: YES}, 'flag',
--q{ X-Spam-Level: **********}, 'stars',
--q{ TEST_ENDSNUMS}, 'endsinnums',
--q{ TEST_NOREALNAME}, 'noreal',
--q{ This must be the very last line}, 'lastline',
--
--
--);
--
--ok (sdrun ("-L --ssl --ssl-version=sslv3 --server-key data/etc/testhost.key --server-cert data/etc/testhost.cert",
--           "--ssl=sslv3 < data/spam/001",
--           \&patterns_run_cb));
--ok_all_patterns();
-Index: trunk/t/spamd_ssl_accept_fail.t
-===================================================================
---- trunk.orig/t/spamd_ssl_accept_fail.t
-+++ trunk/t/spamd_ssl_accept_fail.t
-@@ -23,9 +23,9 @@ q{ This must be the very last line}, 'la
- 
- );
- 
--ok (start_spamd ("-L --ssl --ssl-version=sslv3 --server-key data/etc/testhost.key --server-cert data/etc/testhost.cert"));
-+ok (start_spamd ("-L --ssl --server-key data/etc/testhost.key --server-cert data/etc/testhost.cert"));
- ok (spamcrun ("< data/spam/001", \&patterns_run_cb));
--ok (spamcrun ("--ssl=sslv3  < data/spam/001", \&patterns_run_cb));
-+ok (spamcrun ("--ssl < data/spam/001", \&patterns_run_cb));
- ok (stop_spamd ());
- 
- ok_all_patterns();
-Index: trunk/t/spamd_ssl.t
-===================================================================
---- trunk.orig/t/spamd_ssl.t
-+++ trunk/t/spamd_ssl.t
-@@ -2,10 +2,7 @@
- 
- use lib '.'; use lib 't';
- use SATest; sa_t_init("spamd_ssl");
--use Test; plan tests => (($SKIP_SPAMD_TESTS || !$SSL_AVAILABLE) ? 0 : 9),
--    onfail => sub {
--	warn "\n\nNote: This may not be a SpamAssassin bug, as some platforms require that you" .
--	    "\nspecify a protocol in spamc --ssl option, and possibly in spamd --ssl-version.\n\n" };
-+use Test; plan tests => (($SKIP_SPAMD_TESTS || !$SSL_AVAILABLE) ? 0 : 9);
- 
- exit if ($SKIP_SPAMD_TESTS || !$SSL_AVAILABLE);
- 
-Index: trunk/MANIFEST
-===================================================================
---- trunk.orig/MANIFEST
-+++ trunk/MANIFEST
-@@ -513,8 +513,6 @@ t/spamd_report_ifspam.t
- t/spamd_sql_prefs.t
- t/spamd_ssl.t
- t/spamd_ssl_accept_fail.t
--t/spamd_ssl_tls.t
--t/spamd_ssl_v3.t
- t/spamd_stop.t
- t/spamd_symbols.t
- t/spamd_syslog.t
diff --git a/mail-filter/spamassassin/files/spamassassin-3.4.1-bug_7208.patch b/mail-filter/spamassassin/files/spamassassin-3.4.1-bug_7208.patch
deleted file mode 100644
index da97e3ee56f8..000000000000
--- a/mail-filter/spamassassin/files/spamassassin-3.4.1-bug_7208.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7208
-https://bugs.gentoo.org/650638
---- a/lib/Mail/SpamAssassin/Plugin/URILocalBL.pm	2015/06/10 12:15:22	1684652
-+++ a/lib/Mail/SpamAssassin/Plugin/URILocalBL.pm	2015/06/10 12:18:50	1684653
-@@ -350,7 +350,7 @@
-     # look for W3 links only
-     next unless (defined $info->{types}->{a});
- 
--    while (my($host, $domain) = each $info->{hosts}) {
-+    while (my($host, $domain) = each %{$info->{hosts}}) {
- 
-       # skip if the domain name was matched
-       if (exists $rule->{exclusions} && exists $rule->{exclusions}->{$domain}) {
-@@ -374,7 +374,7 @@
-         }
- 
-         if (exists $rule->{countries}) {
--          dbg("check: uri_local_bl countries %s\n", join(' ', sort keys $rule->{countries}));
-+          dbg("check: uri_local_bl countries %s\n", join(' ', sort keys %{$rule->{countries}}));
- 
-           my $cc = $self->{geoip}->country_code_by_addr($ip);
- 
-@@ -403,7 +403,7 @@
-         }
- 
-         if (exists $rule->{isps}) {
--          dbg("check: uri_local_bl isps %s\n", join(' ', map { '"' . $_ . '"'; } sort keys $rule->{isps}));
-+          dbg("check: uri_local_bl isps %s\n", join(' ', map { '"' . $_ . '"'; } sort keys %{$rule->{isps}}));
- 
-           my $isp = $self->{geoisp}->isp_by_name($ip);
- 
diff --git a/mail-filter/spamassassin/files/spamassassin-3.4.1-bug_7223.patch b/mail-filter/spamassassin/files/spamassassin-3.4.1-bug_7223.patch
deleted file mode 100644
index 0fea1f9cdbd4..000000000000
--- a/mail-filter/spamassassin/files/spamassassin-3.4.1-bug_7223.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# Fix for Gentoo bug 579222 (SpamAssassin bug 7223).
-
---- a/lib/Mail/SpamAssassin/DnsResolver.pm	2015/07/20 18:23:18	1691991
-+++ b/lib/Mail/SpamAssassin/DnsResolver.pm	2015/07/20 18:24:48	1691992
-@@ -592,6 +592,9 @@
-   };
- 
-   if ($packet) {
-+    # RD flag needs to be set explicitly since Net::DNS 1.01, Bug 7223	
-+    $packet->header->rd(1);
-+
-   # my $udp_payload_size = $self->{res}->udppacketsize;
-     my $udp_payload_size = $self->{conf}->{dns_options}->{edns};
-     if ($udp_payload_size && $udp_payload_size > 512) {
diff --git a/mail-filter/spamassassin/files/spamassassin-3.4.1-bug_7231-extra.patch b/mail-filter/spamassassin/files/spamassassin-3.4.1-bug_7231-extra.patch
deleted file mode 100644
index 81c738668587..000000000000
--- a/mail-filter/spamassassin/files/spamassassin-3.4.1-bug_7231-extra.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-This should fix bug 7338, but the related commits were backported to
-the 3.4 branch as part of SpamAssassin bug 7231 (comment 13).
-
---- a/lib/Mail/SpamAssassin/Dns.pm	2017/04/16 06:19:30	1791572
-+++ b/lib/Mail/SpamAssassin/Dns.pm	2017/04/16 07:28:59	1791573
-@@ -171,7 +171,7 @@
-   if (substr($rule, 0, 2) eq "__") {
-     # don't bother with meta rules
-   } elsif ($answer->type eq 'TXT') {
--    # txtdata returns a non- zone-file-format encoded result, unlike rdatastr;
-+    # txtdata returns a non- zone-file-format encoded result, unlike rdstring;
-     # avoid space-separated RDATA <character-string> fields if possible,
-     # txtdata provides a list of strings in a list context since Net::DNS 0.69
-     $log = join('',$answer->txtdata);
-@@ -215,11 +215,13 @@
- 
-   my $qname = $question->qname;
- 
--  # txtdata returns a non- zone-file-format encoded result, unlike rdatastr;
-+  # txtdata returns a non- zone-file-format encoded result, unlike rdstring;
-   # avoid space-separated RDATA <character-string> fields if possible,
-   # txtdata provides a list of strings in a list context since Net::DNS 0.69
-   #
-+  # rdatastr() is historical/undocumented, use rdstring() since Net::DNS 0.69
-   my $rdatastr = $answer->UNIVERSAL::can('txtdata') ? join('',$answer->txtdata)
-+               : $answer->UNIVERSAL::can('rdstring') ? $answer->rdstring
-                                                     : $answer->rdatastr;
-   if (defined $qname && defined $rdatastr) {
-     my $qclass = $question->qclass;
-@@ -267,8 +269,13 @@
-     my $answ_type = $answer->type;
-     # TODO: there are some CNAME returns that might be useful
-     next if ($answ_type ne 'A' && $answ_type ne 'TXT');
--    # skip any A record that isn't on 127/8
--    next if ($answ_type eq 'A' && $answer->rdatastr !~ /^127\./);
-+    if ($answ_type eq 'A') {
-+      # Net::DNS::RR::A::address() is available since Net::DNS 0.69
-+      my $ip_address = $answer->UNIVERSAL::can('address') ? $answer->address
-+                                                          : $answer->rdatastr;
-+      # skip any A record that isn't on 127.0.0.0/8
-+      next if $ip_address !~ /^127\./;
-+    }
-     for my $rule (@{$rules}) {
-       $self->dnsbl_hit($rule, $question, $answer);
-     }
-@@ -284,11 +291,13 @@
- sub process_dnsbl_set {
-   my ($self, $set, $question, $answer) = @_;
- 
--  # txtdata returns a non- zone-file-format encoded result, unlike rdatastr;
-+  # txtdata returns a non- zone-file-format encoded result, unlike rdstring;
-   # avoid space-separated RDATA <character-string> fields if possible,
-   # txtdata provides a list of strings in a list context since Net::DNS 0.69
-   #
--  my $rdatastr = $answer->UNIVERSAL::can('txtdata') ? join('',$answer->txtdata)
-+  # rdatastr() is historical/undocumented, use rdstring() since Net::DNS 0.69
-+  my $rdatastr = $answer->UNIVERSAL::can('txtdata')  ? join('',$answer->txtdata)
-+               : $answer->UNIVERSAL::can('rdstring') ? $answer->rdstring
-                                                     : $answer->rdatastr;
- 
-   while (my ($subtest, $rule) = each %{ $self->{dnspost}->{$set} }) {
---- a/lib/Mail/SpamAssassin/Plugin/AskDNS.pm	2017/04/16 06:19:30	1791572
-+++ b/lib/Mail/SpamAssassin/Plugin/AskDNS.pm	2017/04/16 07:28:59	1791573
-@@ -140,7 +140,7 @@
- multiple character-strings (as defined in Section 3.3 of [RFC1035]), these
- strings are concatenated with no delimiters before comparing the result
- to the filtering string. This follows requirements of several documents,
--such as RFC 5518, RFC 4408, RFC 4871, RFC 5617.  Examples of a plain text
-+such as RFC 5518, RFC 7208, RFC 4871, RFC 5617.  Examples of a plain text
- filtering parameter: "127.0.0.1", "transaction", 'list' .
- 
- A regular expression follows a familiar perl syntax like /.../ or m{...}
-@@ -539,7 +539,7 @@
-     @answer = ( undef );
-   }
- 
--  # NOTE:  $rr->rdatastr returns the result encoded in a DNS zone file
-+  # NOTE:  $rr->rdstring returns the result encoded in a DNS zone file
-   # format, i.e. enclosed in double quotes if a result contains whitespace
-   # (or other funny characters), and may use \DDD encoding or \X quoting as
-   # per RFC 1035.  Using $rr->txtdata instead avoids this unnecessary encoding
-@@ -566,19 +566,26 @@
-       # special case, no answer records, only rcode can be tested
-     } else {
-       $rr_type = uc $rr->type;
--      if ($rr->UNIVERSAL::can('txtdata')) {  # TXT, SPF
--        # join with no intervening spaces, as per RFC 5518
-+      if ($rr_type eq 'A') {
-+        # Net::DNS::RR::A::address() is available since Net::DNS 0.69
-+        $rr_rdatastr = $rr->UNIVERSAL::can('address') ? $rr->address
-+                                                      : $rr->rdatastr;
-+        if ($rr_rdatastr =~ m/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\z/) {
-+          $rdatanum = Mail::SpamAssassin::Util::my_inet_aton($rr_rdatastr);
-+        }
-+
-+      } elsif ($rr->UNIVERSAL::can('txtdata')) {
-+        # TXT, SPF: join with no intervening spaces, as per RFC 5518
-         if ($txtdata_can_provide_a_list || $rr_type ne 'TXT') {
-           $rr_rdatastr = join('', $rr->txtdata);  # txtdata() in list context!
-         } else {  # char_str_list() is only available for TXT records
-           $rr_rdatastr = join('', $rr->char_str_list);  # historical
-         }
-       } else {
--        $rr_rdatastr = $rr->rdatastr;
--        if ($rr_type eq 'A' &&
--            $rr_rdatastr =~ m/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\z/) {
--          $rdatanum = Mail::SpamAssassin::Util::my_inet_aton($rr_rdatastr);
--        }
-+        # rdatastr() is historical, use rdstring() since Net::DNS 0.69
-+        $rr_rdatastr = $rr->UNIVERSAL::can('rdstring') ? $rr->rdstring
-+                                                       : $rr->rdatastr;
-+        utf8::encode($rr_rdatastr)  if utf8::is_utf8($rr_rdatastr);
-       }
-     # dbg("askdns: received rr type %s, data: %s", $rr_type, $rr_rdatastr);
-     }
---- a/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm	2017/04/16 06:19:30	1791572
-+++ b/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm	2017/04/16 07:28:59	1791573
-@@ -1009,10 +1009,9 @@
-     dbg("uridnsbl: complete_a_lookup aborted %s", $ent->{key});
-     return;
-   }
--
-   dbg("uridnsbl: complete_a_lookup %s", $ent->{key});
--  my @answer = $pkt->answer;
-   my $j = 0;
-+  my @answer = $pkt->answer;
-   foreach my $rr (@answer) {
-     $j++;
-     my $str = $rr->string;
-@@ -1099,7 +1098,9 @@
-     my $rr_type = $rr->type;
- 
-     if ($rr_type eq 'A') {
--      $rdatastr = $rr->rdatastr;
-+      # Net::DNS::RR::A::address() is available since Net::DNS 0.69
-+      $rdatastr = $rr->UNIVERSAL::can('address') ? $rr->address
-+                                                 : $rr->rdatastr;
-       if ($rdatastr =~ m/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/) {
-         $rdatanum = Mail::SpamAssassin::Util::my_inet_aton($rdatastr);
-       }
diff --git a/mail-filter/spamassassin/files/spamassassin-3.4.1-bug_7231.patch b/mail-filter/spamassassin/files/spamassassin-3.4.1-bug_7231.patch
deleted file mode 100644
index 0d6e43abb6dd..000000000000
--- a/mail-filter/spamassassin/files/spamassassin-3.4.1-bug_7231.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-# Fix for Gentoo bug 579222 (SpamAssassin bug 7231).
-
---- a/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm	(revision 1694052)
-+++ b/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm	(working copy)
-@@ -942,9 +942,8 @@
-     next unless (defined($str) && defined($dom));
-     dbg("uridnsbl: got($j) NS for $dom: $str");
- 
--    if ($str =~ /IN\s+NS\s+(\S+)/) {
--      my $nsmatch = lc $1;
--      $nsmatch =~ s/\.$//;
-+    if ($rr->type eq 'NS') {
-+      my $nsmatch = lc $rr->nsdname;  # available since at least Net::DNS 0.14
-       my $nsrhblstr = $nsmatch;
-       my $fullnsrhblstr = $nsmatch;
- 
-@@ -1025,9 +1024,9 @@
-     }
-     dbg("uridnsbl: complete_a_lookup got(%d) A for %s: %s", $j,$hname,$str);
- 
--    local $1;
--    if ($str =~ /IN\s+A\s+(\S+)/) {
--      $self->lookup_dnsbl_for_ip($pms, $ent->{obj}, $1);
-+    if ($rr->type eq 'A') {
-+      my $ip_address = $rr->rdatastr;
-+      $self->lookup_dnsbl_for_ip($pms, $ent->{obj}, $ip_address);
-     }
-   }
- }
diff --git a/mail-filter/spamassassin/files/spamassassin-3.4.1-bug_7265.patch b/mail-filter/spamassassin/files/spamassassin-3.4.1-bug_7265.patch
deleted file mode 100644
index f4fc4bcc718d..000000000000
--- a/mail-filter/spamassassin/files/spamassassin-3.4.1-bug_7265.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-# Fix for Gentoo bug 579222 (SpamAssassin bug 7265).
-# Two different revisions from that bug have been concatenated
-# together into this patch.
-
---- a/lib/Mail/SpamAssassin/DnsResolver.pm	2015/11/19 15:23:56	1715196
-+++ b/lib/Mail/SpamAssassin/DnsResolver.pm	2015/11/19 15:31:49	1715197
-@@ -725,6 +725,37 @@
- 
- ###########################################################################
- 
-+=item $id = $res->bgread()
-+
-+Similar to C<Net::DNS::Resolver::bgread>.  Reads a DNS packet from
-+a supplied socket, decodes it, and returns a Net::DNS::Packet object
-+if successful.  Dies on error.
-+
-+=cut
-+
-+sub bgread() {
-+  my ($self) = @_;
-+  my $sock = $self->{sock};
-+  my $packetsize = $self->{res}->udppacketsize;
-+  $packetsize = 512  if $packetsize < 512;  # just in case
-+  my $data = '';
-+  my $peeraddr = $sock->recv($data, $packetsize+256);  # with some size margin for troubleshooting
-+  defined $peeraddr or die "bgread: recv() failed: $!";
-+  my $peerhost = $sock->peerhost;
-+  $data ne '' or die "bgread: received empty packet from $peerhost";
-+  dbg("dns: bgread: received %d bytes from %s", length($data), $peerhost);
-+  my($answerpkt, $decoded_length) = Net::DNS::Packet->new(\$data);
-+  $answerpkt or die "bgread: decoding DNS packet failed: $@";
-+  $answerpkt->answerfrom($peerhost);
-+  if ($decoded_length ne length($data)) {
-+    warn sprintf("bgread: received a %d bytes packet from %s, decoded %d bytes\n",
-+                 length($data), $peerhost, $decoded_length);
-+  }
-+  return $answerpkt;
-+}
-+
-+###########################################################################
-+
- =item $nfound = $res->poll_responses()
- 
- See if there are any C<bgsend> reply packets ready, and return
-@@ -772,13 +803,25 @@
-     $timeout = 0;  # next time around collect whatever is available, then exit
-     last  if $nfound == 0;
- 
--    my $packet = $self->{res}->bgread($self->{sock});
-+    my $packet;
-+    eval {
-+      $packet = $self->bgread();
-+    } or do {
-+      undef $packet;
-+      my $eval_stat = $@ ne '' ? $@ : "errno=$!";  chomp $eval_stat;
-+      # resignal if alarm went off
-+      die $eval_stat  if $eval_stat =~ /__alarm__ignore__\(.*\)/s;
-+      info("dns: bad dns reply: %s", $eval_stat);
-+    };
-+
-+#   Bug 7265, use our own bgread()
-+#   my $packet = $self->{res}->bgread($self->{sock});
- 
-     if (!$packet) {
--      my $dns_err = $self->{res}->errorstring;
--      # resignal if alarm went off
--      die "dns (3) $dns_err\n"  if $dns_err =~ /__alarm__ignore__\(.*\)/s;
--      info("dns: bad dns reply: $dns_err");
-+      # error already reported above
-+#     my $dns_err = $self->{res}->errorstring;
-+#     die "dns (3) $dns_err\n"  if $dns_err =~ /__alarm__ignore__\(.*\)/s;
-+#     info("dns: bad dns reply: $dns_err");
-     } else {
-       my $header = $packet->header;
-       if (!$header) {
-
---- a/lib/Mail/SpamAssassin/Plugin/DKIM.pm	2015/11/19 19:20:06	1715247
-+++ b/lib/Mail/SpamAssassin/Plugin/DKIM.pm	2015/11/19 19:22:25	1715248
-@@ -793,7 +793,8 @@
-         # Only do so if EDNS0 provides a reasonably-sized UDP payload size,
-         # as our interface does not provide a DNS fallback to TCP, unlike
-         # the Net::DNS::Resolver::send which does provide it.
--        my $res = $self->{main}->{resolver}->get_resolver;
-+        my $res = $self->{main}->{resolver};
-+        dbg("dkim: providing our own resolver: %s", ref $res);
-         Mail::DKIM::DNS::resolver($res);
-       }
-     }
diff --git a/mail-filter/spamassassin/files/spamassassin-3.4.1-bug_7361.patch b/mail-filter/spamassassin/files/spamassassin-3.4.1-bug_7361.patch
deleted file mode 100644
index 525bf75c7fe8..000000000000
--- a/mail-filter/spamassassin/files/spamassassin-3.4.1-bug_7361.patch
+++ /dev/null
@@ -1,491 +0,0 @@
-This patch is a modified combination of the patches posted to
-
-  https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7361
-
-that allow SpamAssassin to build against (and work with) openssl-1.1.x.
-Mark Wright (gienah) made the necessary updates to get the patches to
-work on Gentoo and solve bug 624858.
-
-SpamAssassin-bug: 7361
-Gentoo-bug: 624858
-
---- a/spamc/configure	(revision 1767127)
-+++ b/spamc/configure	(working copy)
-@@ -943,7 +943,7 @@ 
-     else
-       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-     fi
--    cd "$ac_popdir"
-+    cd $ac_popdir
-   done
- fi
- 
-@@ -1874,7 +1874,8 @@ 
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -1932,7 +1933,8 @@ 
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2048,7 +2050,8 @@ 
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2102,7 +2105,8 @@ 
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2147,7 +2151,8 @@ 
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2191,7 +2196,8 @@ 
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2523,7 +2529,8 @@ 
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2693,7 +2700,8 @@ 
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2764,7 +2772,8 @@ 
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2917,7 +2926,8 @@ 
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -3069,7 +3079,8 @@ 
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -3260,7 +3271,8 @@ 
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -3323,7 +3335,8 @@ 
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -3388,7 +3401,8 @@ 
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -3491,7 +3505,8 @@ 
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -3557,7 +3572,8 @@ 
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -3628,7 +3644,8 @@ 
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -3666,9 +3683,9 @@ 
- SSLLIBS=""
- SSLCFLAGS=""
- if test yes = "$sa_ssl_enabled"; then
--	echo "$as_me:$LINENO: checking for CRYPTO_lock in -lcrypto" >&5
--echo $ECHO_N "checking for CRYPTO_lock in -lcrypto... $ECHO_C" >&6
--if test "${ac_cv_lib_crypto_CRYPTO_lock+set}" = set; then
-+	echo "$as_me:$LINENO: checking for CRYPTO_malloc in -lcrypto" >&5
-+echo $ECHO_N "checking for CRYPTO_malloc in -lcrypto... $ECHO_C" >&6
-+if test "${ac_cv_lib_crypto_CRYPTO_malloc+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -3686,11 +3703,11 @@ 
- #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
--char CRYPTO_lock ();
-+char CRYPTO_malloc ();
- int
- main ()
- {
--CRYPTO_lock ();
-+CRYPTO_malloc ();
-   ;
-   return 0;
- }
-@@ -3704,7 +3721,8 @@ 
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -3716,20 +3734,20 @@ 
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_lib_crypto_CRYPTO_lock=yes
-+  ac_cv_lib_crypto_CRYPTO_malloc=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_crypto_CRYPTO_lock=no
-+ac_cv_lib_crypto_CRYPTO_malloc=no
- fi
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_CRYPTO_lock" >&5
--echo "${ECHO_T}$ac_cv_lib_crypto_CRYPTO_lock" >&6
--if test $ac_cv_lib_crypto_CRYPTO_lock = yes; then
-+echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_CRYPTO_malloc" >&5
-+echo "${ECHO_T}$ac_cv_lib_crypto_CRYPTO_malloc" >&6
-+if test $ac_cv_lib_crypto_CRYPTO_malloc = yes; then
-   SSLLIBS="-lcrypto $SSLLIBS"
- fi
- 
-@@ -3771,7 +3789,8 @@ 
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -3804,7 +3823,7 @@ 
- 	# before defining SPAMC_SSL check that all its requirements are
- 	# actually available
- 	if test yes = "$ac_cv_header_openssl_crypto_h" && \
--	   test yes = "$ac_cv_lib_crypto_CRYPTO_lock" && \
-+	   test yes = "$ac_cv_lib_crypto_CRYPTO_malloc" && \
- 	   test yes = "$ac_cv_lib_ssl_SSL_CTX_free"; then
- 		SSLCFLAGS="-DSPAMC_SSL"
- 	else
-@@ -3854,7 +3873,8 @@ 
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -3927,7 +3947,8 @@ 
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4000,7 +4021,8 @@ 
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4073,7 +4095,8 @@ 
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4182,7 +4205,8 @@ 
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4246,7 +4270,8 @@ 
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4311,7 +4336,8 @@ 
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4368,7 +4394,8 @@ 
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4435,7 +4462,8 @@ 
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4500,7 +4528,8 @@ 
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4564,7 +4593,8 @@ 
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4628,7 +4658,8 @@ 
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4692,7 +4723,8 @@ 
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -5527,6 +5559,11 @@ 
- 
- 
- 
-+  if test x"$ac_file" != x-; then
-+    { echo "$as_me:$LINENO: creating $ac_file" >&5
-+echo "$as_me: creating $ac_file" >&6;}
-+    rm -f "$ac_file"
-+  fi
-   # Let's still pretend it is `configure' which instantiates (i.e., don't
-   # use $as_me), people would be surprised to read:
-   #    /* config.h.  Generated by config.status.  */
-@@ -5565,12 +5602,6 @@ 
- 	 fi;;
-       esac
-     done` || { (exit 1); exit 1; }
--
--  if test x"$ac_file" != x-; then
--    { echo "$as_me:$LINENO: creating $ac_file" >&5
--echo "$as_me: creating $ac_file" >&6;}
--    rm -f "$ac_file"
--  fi
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
-   sed "$ac_vpsub
-
---- a/spamc/configure.in	(revision 1767127)
-+++ b/spamc/configure.in	(working copy)
-@@ -64,13 +64,13 @@ 
- SSLLIBS=""
- SSLCFLAGS=""
- if test yes = "$sa_ssl_enabled"; then
--	AC_CHECK_LIB(crypto, CRYPTO_lock,[SSLLIBS="-lcrypto $SSLLIBS"])
-+	AC_CHECK_LIB(crypto, CRYPTO_malloc,[SSLLIBS="-lcrypto $SSLLIBS"])
- 	AC_CHECK_LIB(ssl, SSL_CTX_free,[SSLLIBS="-lssl $SSLLIBS"],,-lcrypto)
- 
- 	# before defining SPAMC_SSL check that all its requirements are
- 	# actually available
- 	if test yes = "$ac_cv_header_openssl_crypto_h" && \
--	   test yes = "$ac_cv_lib_crypto_CRYPTO_lock" && \
-+	   test yes = "$ac_cv_lib_crypto_CRYPTO_malloc" && \
- 	   test yes = "$ac_cv_lib_ssl_SSL_CTX_free"; then
- 		SSLCFLAGS="-DSPAMC_SSL"
- 	else
-
---- a/spamc/libspamc.c	2017-10-20 13:33:54.129653171 +1100
-+++ b/spamc/libspamc.c	2017-10-20 13:36:09.429653849 +1100
-@@ -1212,10 +1212,21 @@
- 
-     if (flags & SPAMC_USE_SSL) {
- #ifdef SPAMC_SSL
-+#if OPENSSL_API_COMPAT >= 0x10100000L
-+	OPENSSL_init_ssl(0, NULL);
-+	meth = TLS_method();
-+	ctx = SSL_CTX_new(meth);
-+	if (flags & SPAMC_TLSV1) {
-+	    SSL_CTX_set_min_proto_version(ctx, TLS1_VERSION);
-+	} else {
-+	    SSL_CTX_set_min_proto_version(ctx, SSL3_VERSION);
-+	}
-+#else
- 	SSLeay_add_ssl_algorithms();
- 	meth = SSLv23_client_method();
- 	SSL_load_error_strings();
- 	ctx = SSL_CTX_new(meth);
-+#endif
- #else
- 	UNUSED_VARIABLE(ssl);
- 	UNUSED_VARIABLE(meth);
-@@ -1599,10 +1610,17 @@
- 
-     if (flags & SPAMC_USE_SSL) {
- #ifdef SPAMC_SSL
-+#if OPENSSL_API_COMPAT >= 0x10100000L
-+	OPENSSL_init_ssl(0, NULL);
-+	meth = TLS_method();
-+	ctx = SSL_CTX_new(meth);
-+	SSL_CTX_set_min_proto_version(ctx, SSL3_VERSION);
-+#else
- 	SSLeay_add_ssl_algorithms();
- 	meth = SSLv23_client_method();
- 	SSL_load_error_strings();
- 	ctx = SSL_CTX_new(meth);
-+#endif
- #else
- 	UNUSED_VARIABLE(ssl);
- 	UNUSED_VARIABLE(meth);
diff --git a/mail-filter/spamassassin/files/spamassassin-3.4.1-bug_7404.patch b/mail-filter/spamassassin/files/spamassassin-3.4.1-bug_7404.patch
deleted file mode 100644
index 563110fcb1f3..000000000000
--- a/mail-filter/spamassassin/files/spamassassin-3.4.1-bug_7404.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/lib/Mail/SpamAssassin/PerMsgStatus.pm	(revision 1790817)
-+++ b/lib/Mail/SpamAssassin/PerMsgStatus.pm	(working copy)
-@@ -896,16 +896,16 @@ 
-     $str .= shift @{$ary};
-   }
-   undef $ary;
--  chomp ($str); $str .= " [...]\n";
- 
-   # in case the last line was huge, trim it back to around 200 chars
-   local $1;
--  $str =~ s/^(.{,200}).*$/$1/gs;
-+  $str =~ s/^(.{200}).+$/$1 [...]/gm;
-+  chomp ($str); $str .= "\n";
- 
-   # now, some tidy-ups that make things look a bit prettier
--  $str =~ s/-----Original Message-----.*$//gs;
-+  $str =~ s/-----Original Message-----.*$//gm;
-   $str =~ s/This is a multi-part message in MIME format\.//gs;
--  $str =~ s/[-_\*\.]{10,}//gs;
-+  $str =~ s/[-_*.]{10,}//gs;
-   $str =~ s/\s+/ /gs;
- 
-   # add "Content preview:" ourselves, so that the text aligns
diff --git a/mail-filter/spamassassin/files/spamassassin-3.4.1-bug_7462.patch b/mail-filter/spamassassin/files/spamassassin-3.4.1-bug_7462.patch
deleted file mode 100644
index bf4dc111acbc..000000000000
--- a/mail-filter/spamassassin/files/spamassassin-3.4.1-bug_7462.patch
+++ /dev/null
@@ -1,198 +0,0 @@
-https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7462
-https://bugs.gentoo.org/show_bug.cgi?id=627678
---- Mail-SpamAssassin-3.4.1/t/basic_meta.t	2015-04-28 15:56:59.000000000 -0400
-+++ Mail-SpamAssassin-3.4.1/t/basic_meta.t	2017-08-20 21:29:44.000000000 -0400
-@@ -14,10 +14,11 @@
- if (-e 'test_dir') {            # running from test directory, not ..
-   $prefix = '..';
- }
- 
- use strict;
-+use lib '.'; use lib 't';
- use SATest; sa_t_init("meta");
- use Test;
- use Mail::SpamAssassin;
- 
- use vars qw( %rules %scores $perl_path);
---- Mail-SpamAssassin-3.4.1/t/body_mod.t	2015-04-28 15:56:58.000000000 -0400
-+++ Mail-SpamAssassin-3.4.1/t/body_mod.t	2017-08-20 21:30:09.000000000 -0400
-@@ -14,10 +14,11 @@
- if (-e 'test_dir') {            # running from test directory, not ..
-   $prefix = '..';
- }
- 
- use strict;
-+use lib '.'; use lib 't';
- use SATest; sa_t_init("body_mod");
- use Test; BEGIN { plan tests => 3 };
- 
- use Mail::SpamAssassin;
- 
---- Mail-SpamAssassin-3.4.1/t/config_errs.t	2015-04-28 15:56:59.000000000 -0400
-+++ Mail-SpamAssassin-3.4.1/t/config_errs.t	2017-08-20 21:30:28.000000000 -0400
-@@ -39,10 +39,11 @@
- if (-e 'test_dir') {            # running from test directory, not ..
-   $prefix = '..';
- }
- 
- use strict;
-+use lib '.'; use lib 't';
- use SATest; sa_t_init("config_errs");
- use Test;
- use Mail::SpamAssassin;
- 
- # initialize SpamAssassin
---- Mail-SpamAssassin-3.4.1/t/debug.t	2015-04-28 15:56:58.000000000 -0400
-+++ Mail-SpamAssassin-3.4.1/t/debug.t	2017-08-20 21:31:02.000000000 -0400
-@@ -14,10 +14,11 @@
- if (-e 'test_dir') {            # running from test directory, not ..
-   $prefix = '..';
- }
- 
- use strict;
-+use lib '.'; use lib 't';
- use SATest; sa_t_init("debug");
- use Test;
- use Mail::SpamAssassin;
- 
- use constant TEST_ENABLED => conf_bool('run_long_tests');
---- Mail-SpamAssassin-3.4.1/t/get_headers.t	2015-04-28 15:56:58.000000000 -0400
-+++ Mail-SpamAssassin-3.4.1/t/get_headers.t	2017-08-20 21:31:48.000000000 -0400
-@@ -15,10 +15,11 @@
-   $prefix = '..';
- }
- 
- use strict;
- use Test;
-+use lib '.'; use lib 't';
- use SATest; sa_t_init("get_headers");
- use Mail::SpamAssassin;
- 
- plan tests => 16;
- 
---- Mail-SpamAssassin-3.4.1/t/idn_dots.t	2015-04-28 15:56:58.000000000 -0400
-+++ Mail-SpamAssassin-3.4.1/t/idn_dots.t	2017-08-20 21:32:03.000000000 -0400
-@@ -16,10 +16,11 @@
- if (-e 'test_dir') {            # running from test directory, not ..
-   $prefix = '..';
- }
- 
- use strict;
-+use lib '.'; use lib 't';
- use SATest; sa_t_init("normalize_utf8_dots.t");
- use Test;
- use Mail::SpamAssassin;
- use vars qw(%patterns %anti_patterns);
- 
---- Mail-SpamAssassin-3.4.1/t/missing_hb_separator.t	2015-04-28 15:56:58.000000000 -0400
-+++ Mail-SpamAssassin-3.4.1/t/missing_hb_separator.t	2017-08-20 21:32:17.000000000 -0400
-@@ -15,10 +15,11 @@
-   $prefix = '..';
- }
- 
- use strict;
- use Test;
-+use lib '.'; use lib 't';
- use SATest; sa_t_init("missing_hb_separator");
- use Mail::SpamAssassin;
- 
- plan tests => 13;
- 
---- Mail-SpamAssassin-3.4.1/t/priorities.t	2015-04-28 15:56:59.000000000 -0400
-+++ Mail-SpamAssassin-3.4.1/t/priorities.t	2017-08-20 21:34:21.000000000 -0400
-@@ -15,10 +15,11 @@
- my $prefix = '.';
- if (-e 'test_dir') {            # running from test directory, not ..
-   $prefix = '..';
- }
- 
-+use lib '.'; use lib 't';
- use SATest; sa_t_init("priorities");
- use strict;
- use Test; BEGIN { plan tests => NUM_TESTS };
- 
- use Mail::SpamAssassin;
---- Mail-SpamAssassin-3.4.1/t/regexp_valid.t	2015-04-28 15:56:59.000000000 -0400
-+++ Mail-SpamAssassin-3.4.1/t/regexp_valid.t	2017-08-20 21:34:31.000000000 -0400
-@@ -14,10 +14,11 @@
- if (-e 'test_dir') {            # running from test directory, not ..
-   $prefix = '..';
- }
- 
- use strict;
-+use lib '.'; use lib 't';
- use SATest; sa_t_init("regexp_valid");
- use Test;
- 
- # settings
- plan tests => 24;
---- Mail-SpamAssassin-3.4.1/t/relative_scores.t	2015-04-28 15:56:59.000000000 -0400
-+++ Mail-SpamAssassin-3.4.1/t/relative_scores.t	2017-08-20 21:34:43.000000000 -0400
-@@ -9,10 +9,11 @@
-   if (-e 'test_dir') {            # running from test directory, not ..
-     unshift(@INC, '../blib/lib', '.');
-   }
- }
- 
-+use lib '.'; use lib 't';
- use SATest; sa_t_init("relative_scores");
- use Test;
- use strict;
- use vars qw/ $error /;
- 
---- Mail-SpamAssassin-3.4.1/t/reuse.t	2015-04-28 15:56:58.000000000 -0400
-+++ Mail-SpamAssassin-3.4.1/t/reuse.t	2017-08-20 21:34:52.000000000 -0400
-@@ -14,10 +14,11 @@
- if (-e 'test_dir') {            # running from test directory, not ..
-   $prefix = '..';
- }
- 
- use strict;
-+use lib '.'; use lib 't';
- use SATest; sa_t_init("reuse");
- use Test;
- 
- use vars qw(%patterns %anti_patterns $perl_path &patterns_run_cb);
- 
---- Mail-SpamAssassin-3.4.1/t/uri_html.t	2015-04-28 15:56:58.000000000 -0400
-+++ Mail-SpamAssassin-3.4.1/t/uri_html.t	2017-08-20 21:35:20.000000000 -0400
-@@ -16,10 +16,11 @@
- if (-e 'test_dir') {            # running from test directory, not ..
-   $prefix = '..';
- }
- 
- use strict;
-+use lib '.'; use lib 't';
- use SATest; sa_t_init("uri_html");
- use Test;
- use Mail::SpamAssassin;
- use vars qw(%patterns %anti_patterns);
- 
---- Mail-SpamAssassin-3.4.1/t/uri.t	2015-04-28 15:56:59.000000000 -0400
-+++ Mail-SpamAssassin-3.4.1/t/uri.t	2017-08-20 21:35:30.000000000 -0400
-@@ -15,10 +15,11 @@
-   $prefix = '..';
- }
- 
- use strict;
- use Test;
-+use lib '.'; use lib 't';
- use SATest; sa_t_init("uri");
- 
- use Mail::SpamAssassin;
- use Mail::SpamAssassin::HTML;
- use Mail::SpamAssassin::Util;
---- Mail-SpamAssassin-3.4.1/t/uri_text.t	2015-04-28 15:56:58.000000000 -0400
-+++ Mail-SpamAssassin-3.4.1/t/uri_text.t	2017-08-20 21:35:07.000000000 -0400
-@@ -16,10 +16,11 @@
- if (-e 'test_dir') {            # running from test directory, not ..
-   $prefix = '..';
- }
- 
- use strict;
-+use lib '.'; use lib 't';
- use SATest; sa_t_init("uri_text");
- use Test;
- use Mail::SpamAssassin;
- use vars qw(%patterns %anti_patterns);
- 
diff --git a/mail-filter/spamassassin/files/spamassassin-3.4.1-perl526.patch b/mail-filter/spamassassin/files/spamassassin-3.4.1-perl526.patch
deleted file mode 100644
index 1c63136e3f66..000000000000
--- a/mail-filter/spamassassin/files/spamassassin-3.4.1-perl526.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7367
-https://bugs.gentoo.org/625316
-
---- Mail-SpamAssassin-3.4.1/spamc/configure.pl
-+++ Mail-SpamAssassin-3.4.1/spamc/configure.pl
-@@ -66,7 +66,7 @@
-   # Do the same thing as for the preprocessor below.
-   package version_h;
-   my $Z = $0;
--  local $0    = "version.h.pl";
-+  local $0    = "./version.h.pl";
-   local @ARGV = ();
-   # Got to check for defined because the script returns shell error level!
-   unless (defined do $0) {
diff --git a/mail-filter/spamassassin/spamassassin-3.4.1-r19.ebuild b/mail-filter/spamassassin/spamassassin-3.4.1-r19.ebuild
deleted file mode 100644
index d40f8141384e..000000000000
--- a/mail-filter/spamassassin/spamassassin-3.4.1-r19.ebuild
+++ /dev/null
@@ -1,251 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit perl-functions systemd toolchain-funcs user
-
-MY_P="Mail-SpamAssassin-${PV//_/-}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="An extensible mail filter which can identify and tag spam"
-HOMEPAGE="https://spamassassin.apache.org/"
-SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test"
-
-# The Makefile.PL script checks for dependencies, but only fails if a
-# required (i.e. not optional) dependency is missing. We therefore
-# require most of the optional modules only at runtime.
-REQDEPEND="dev-lang/perl:=
-	dev-perl/HTML-Parser
-	dev-perl/Net-DNS
-	dev-perl/NetAddr-IP
-	virtual/perl-Archive-Tar
-	virtual/perl-Digest-SHA
-	virtual/perl-IO-Zlib
-	virtual/perl-Time-HiRes
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl )
-	)"
-
-# SpamAssassin doesn't use libwww-perl except as a fallback for when
-# curl/wget are missing, so we depend on one of those instead. Some
-# mirrors use https, so we need those utilities to support SSL.
-#
-# re2c is needed to compile the rules (sa-compile).
-#
-# We still need the old Digest-SHA1 because razor2 has not been ported
-# to Digest-SHA.
-OPTDEPEND="app-crypt/gnupg
-	dev-perl/Digest-SHA1
-	dev-perl/Encode-Detect
-	dev-perl/Geo-IP
-	dev-perl/HTTP-Date
-	dev-perl/Mail-DKIM
-	dev-perl/Mail-SPF
-	dev-perl/Net-Patricia
-	dev-perl/Net-CIDR-Lite
-	dev-util/re2c
-	|| ( net-misc/wget[ssl] net-misc/curl[ssl] )
-	virtual/perl-MIME-Base64
-	virtual/perl-Pod-Parser
-	berkdb? ( virtual/perl-DB_File )
-	ipv6? ( dev-perl/IO-Socket-INET6 )
-	ldap? ( dev-perl/perl-ldap )
-	mysql? (
-		dev-perl/DBI
-		dev-perl/DBD-mysql
-	)
-	postgres? (
-		dev-perl/DBI
-		dev-perl/DBD-Pg
-	)
-	sqlite? (
-		dev-perl/DBI
-		dev-perl/DBD-SQLite
-	)
-	ssl? ( dev-perl/IO-Socket-SSL )"
-
-DEPEND="${REQDEPEND}
-	test? (
-		${OPTDEPEND}
-		virtual/perl-Test-Harness
-	)"
-RDEPEND="${REQDEPEND} ${OPTDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/spamassassin-3.4.1-bug_7199.patch"
-	"${FILESDIR}/spamassassin-3.4.1-bug_7223.patch"
-	"${FILESDIR}/spamassassin-3.4.1-bug_7231.patch"
-	"${FILESDIR}/spamassassin-3.4.1-bug_7265.patch"
-	"${FILESDIR}/spamassassin-3.4.1-bug_7231-extra.patch"
-	"${FILESDIR}/spamassassin-3.4.1-bug_7404.patch"
-	"${FILESDIR}/spamassassin-3.4.1-bug_7462.patch"
-	"${FILESDIR}/spamassassin-3.4.1-perl526.patch"
-	"${FILESDIR}/spamassassin-3.4.1-bug_7361.patch"
-)
-
-src_prepare() {
-	default
-
-	# The sa_compile test does some weird stuff like hopping around in
-	# the directory tree and calling "make" to create a dist tarball
-	# from ${S}. It fails, and is more trouble than it's worth...
-	perl_rm_files t/sa_compile.t || die 'failed to remove sa_compile test'
-
-	# The spamc tests (which need the networked spamd daemon) fail for
-	# irrelevant reasons. It's too hard to disable them (unlike the
-	# spamd tests themselves -- see src_test), so use a crude
-	# workaround.
-	perl_rm_files t/spamc_*.t || die 'failed to remove spamc tests'
-}
-
-src_configure() {
-	# This is how and where the perl-module eclass disables the
-	# MakeMaker interactive prompt.
-	export PERL_MM_USE_DEFAULT=1
-
-	# Set SYSCONFDIR explicitly so we can't get bitten by bug 48205 again
-	# (just to be sure, nobody knows how it could happen in the first place).
-	#
-	# We also set the path to the perl executable explictly. This will be
-	# used to create the initial shebang line in the scripts (bug 62276).
-	perl Makefile.PL \
-		PREFIX="${EPREFIX}/usr" \
-		INSTALLDIRS=vendor \
-		SYSCONFDIR="${EPREFIX}/etc" \
-		DATADIR="${EPREFIX}/usr/share/spamassassin" \
-		PERL_BIN="${EPREFIX}/usr/bin/perl" \
-		ENABLE_SSL="$(usex ssl)" \
-		DESTDIR="${D}" \
-		|| die 'failed to create a Makefile using Makefile.PL'
-
-	# Now configure spamc.
-	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" spamc/Makefile
-}
-
-src_compile() {
-	emake
-	use qmail && emake spamc/qmail-spamc
-}
-
-src_install () {
-	emake install
-	einstalldocs
-
-	# Create the stub dir used by sa-update and friends
-	keepdir /var/lib/spamassassin
-
-	# Move spamd to sbin where it belongs.
-	dodir /usr/sbin
-	mv "${ED}"/usr/bin/spamd "${ED}"/usr/sbin/spamd  || die "move spamd failed"
-
-	if use qmail; then
-		dobin spamc/qmail-spamc
-	fi
-
-	ln -s mail/spamassassin "${ED}"/etc/spamassassin || die
-
-	# Disable plugin by default
-	sed -i -e 's/^loadplugin/\#loadplugin/g' \
-		"${ED}/etc/mail/spamassassin/init.pre" \
-		|| die "failed to disable plugins by default"
-
-	# Add the init and config scripts.
-	newinitd "${FILESDIR}/3.4.1-spamd.init-r2" spamd
-	newconfd "${FILESDIR}/3.4.1-spamd.conf-r1" spamd
-
-	systemd_newunit "${FILESDIR}/${PN}.service-r4" "${PN}.service"
-	systemd_install_serviced "${FILESDIR}/${PN}.service.conf-r2" \
-							 "${PN}.service"
-
-	use postgres && dodoc sql/*_pg.sql
-	use mysql && dodoc sql/*_mysql.sql
-
-	dodoc NOTICE TRADEMARK CREDITS UPGRADE USAGE sql/README.bayes \
-		sql/README.awl procmailrc.example sample-nonspam.txt \
-		sample-spam.txt spamd/PROTOCOL spamd/README.vpopmail \
-		spamd-apache2/README.apache
-
-	# Rename some files so that they don't clash with others.
-	newdoc spamd/README README.spamd
-	newdoc sql/README README.sql
-	newdoc ldap/README README.ldap
-
-	if use qmail; then
-		dodoc spamc/README.qmail
-	fi
-
-	insinto /etc/mail/spamassassin/
-	insopts -m0400
-	newins "${FILESDIR}"/secrets.cf secrets.cf.example
-
-	# Create the directory where sa-update stores its GPG key (if you
-	# choose to import one). If this directory does not exist, the
-	# import will fail. This is bug 396307. We expect that the import
-	# will be performed as root, and making the directory accessible
-	# only to root prevents a warning on the command-line.
-	diropts -m0700
-	dodir /etc/mail/spamassassin/sa-update-keys
-
-	if use cron; then
-		# Install the cron job if they want it.
-		exeinto /etc/cron.daily
-		newexe "${FILESDIR}/update-spamassassin-rules.cron" \
-			   update-spamassassin-rules
-	fi
-
-	# Remove perllocal.pod to avoid file collisions (bug #603338).
-	perl_delete_localpod || die "failed to remove perllocal.pod"
-
-	# The perl-module eclass calls three other functions to clean
-	# up in src_install. The first fixes references to ${D} in the
-	# packlist, and is useful to us, too. The other two functions,
-	# perl_delete_emptybsdir and perl_remove_temppath, don't seem
-	# to be needed: there are no empty directories, *.bs files, or
-	# ${D} paths remaining in our installed image.
-	perl_fix_packlist || die "failed to fix paths in packlist"
-}
-
-src_test() {
-	# Trick the test suite into skipping the spamd tests. Setting
-	# SPAMD_HOST to a non-localhost value causes SKIP_SPAMD_TESTS to be
-	# set in SATest.pm.
-	export SPAMD_HOST=disabled
-	default
-}
-
-pkg_preinst() {
-	# The spamd daemon runs as this user. Use a real home directory so
-	# that it can hold SA configuration.
-	enewuser spamd -1 -1 /home/spamd
-}
-
-pkg_postinst() {
-	elog
-	elog 'No rules are installed by default. You will need to run sa-update'
-	elog 'at least once, and most likely configure SpamAssassin before it'
-	elog 'will work.'
-
-	if ! use cron; then
-		elog
-		elog 'You should consider a cron job for sa-update. One is provided'
-		elog 'for daily updates if you enable the "cron" USE flag.'
-	fi
-	elog
-	elog 'Configuration and update help can be found on the wiki:'
-	elog
-	elog '  https://wiki.gentoo.org/wiki/SpamAssassin'
-	elog
-
-	ewarn 'If this version of SpamAssassin causes permissions issues'
-	ewarn 'with your user configurations or bayes databases, then you'
-	ewarn 'may need to set SPAMD_RUN_AS_ROOT=true in your OpenRC service'
-	ewarn 'configuration file, or remove the --username and --groupname'
-	ewarn 'flags from the SPAMD_OPTS variable in your systemd service'
-	ewarn 'configuration file.'
-}
diff --git a/mail-filter/spamassassin/spamassassin-3.4.1-r20.ebuild b/mail-filter/spamassassin/spamassassin-3.4.1-r20.ebuild
deleted file mode 100644
index fbea7792df58..000000000000
--- a/mail-filter/spamassassin/spamassassin-3.4.1-r20.ebuild
+++ /dev/null
@@ -1,251 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit perl-functions systemd toolchain-funcs user
-
-MY_P="Mail-SpamAssassin-${PV//_/-}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="An extensible mail filter which can identify and tag spam"
-HOMEPAGE="https://spamassassin.apache.org/"
-SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test"
-
-# The Makefile.PL script checks for dependencies, but only fails if a
-# required (i.e. not optional) dependency is missing. We therefore
-# require most of the optional modules only at runtime.
-REQDEPEND="dev-lang/perl:=
-	dev-perl/HTML-Parser
-	dev-perl/Net-DNS
-	dev-perl/NetAddr-IP
-	virtual/perl-Archive-Tar
-	virtual/perl-Digest-SHA
-	virtual/perl-IO-Zlib
-	virtual/perl-Time-HiRes
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl )
-	)"
-
-# SpamAssassin doesn't use libwww-perl except as a fallback for when
-# curl/wget are missing, so we depend on one of those instead. Some
-# mirrors use https, so we need those utilities to support SSL.
-#
-# re2c is needed to compile the rules (sa-compile).
-#
-# We still need the old Digest-SHA1 because razor2 has not been ported
-# to Digest-SHA.
-OPTDEPEND="app-crypt/gnupg
-	dev-perl/Digest-SHA1
-	dev-perl/Encode-Detect
-	dev-perl/Geo-IP
-	dev-perl/HTTP-Date
-	dev-perl/Mail-DKIM
-	dev-perl/Mail-SPF
-	dev-perl/Net-Patricia
-	dev-perl/Net-CIDR-Lite
-	dev-util/re2c
-	|| ( net-misc/wget[ssl] net-misc/curl[ssl] )
-	virtual/perl-MIME-Base64
-	virtual/perl-Pod-Parser
-	berkdb? ( virtual/perl-DB_File )
-	ipv6? ( dev-perl/IO-Socket-INET6 )
-	ldap? ( dev-perl/perl-ldap )
-	mysql? (
-		dev-perl/DBI
-		dev-perl/DBD-mysql
-	)
-	postgres? (
-		dev-perl/DBI
-		dev-perl/DBD-Pg
-	)
-	sqlite? (
-		dev-perl/DBI
-		dev-perl/DBD-SQLite
-	)
-	ssl? ( dev-perl/IO-Socket-SSL )"
-
-DEPEND="${REQDEPEND}
-	test? (
-		${OPTDEPEND}
-		virtual/perl-Test-Harness
-	)"
-RDEPEND="${REQDEPEND} ${OPTDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/spamassassin-3.4.1-bug_7199.patch"
-	"${FILESDIR}/spamassassin-3.4.1-bug_7223.patch"
-	"${FILESDIR}/spamassassin-3.4.1-bug_7231.patch"
-	"${FILESDIR}/spamassassin-3.4.1-bug_7265.patch"
-	"${FILESDIR}/spamassassin-3.4.1-bug_7231-extra.patch"
-	"${FILESDIR}/spamassassin-3.4.1-bug_7404.patch"
-	"${FILESDIR}/spamassassin-3.4.1-bug_7462.patch"
-	"${FILESDIR}/spamassassin-3.4.1-perl526.patch"
-	"${FILESDIR}/spamassassin-3.4.1-bug_7361.patch"
-)
-
-src_prepare() {
-	default
-
-	# The sa_compile test does some weird stuff like hopping around in
-	# the directory tree and calling "make" to create a dist tarball
-	# from ${S}. It fails, and is more trouble than it's worth...
-	perl_rm_files t/sa_compile.t || die 'failed to remove sa_compile test'
-
-	# The spamc tests (which need the networked spamd daemon) fail for
-	# irrelevant reasons. It's too hard to disable them (unlike the
-	# spamd tests themselves -- see src_test), so use a crude
-	# workaround.
-	perl_rm_files t/spamc_*.t || die 'failed to remove spamc tests'
-}
-
-src_configure() {
-	# This is how and where the perl-module eclass disables the
-	# MakeMaker interactive prompt.
-	export PERL_MM_USE_DEFAULT=1
-
-	# Set SYSCONFDIR explicitly so we can't get bitten by bug 48205 again
-	# (just to be sure, nobody knows how it could happen in the first place).
-	#
-	# We also set the path to the perl executable explictly. This will be
-	# used to create the initial shebang line in the scripts (bug 62276).
-	perl Makefile.PL \
-		PREFIX="${EPREFIX}/usr" \
-		INSTALLDIRS=vendor \
-		SYSCONFDIR="${EPREFIX}/etc" \
-		DATADIR="${EPREFIX}/usr/share/spamassassin" \
-		PERL_BIN="${EPREFIX}/usr/bin/perl" \
-		ENABLE_SSL="$(usex ssl)" \
-		DESTDIR="${D}" \
-		|| die 'failed to create a Makefile using Makefile.PL'
-
-	# Now configure spamc.
-	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" spamc/Makefile
-}
-
-src_compile() {
-	emake
-	use qmail && emake spamc/qmail-spamc
-}
-
-src_install () {
-	emake install
-	einstalldocs
-
-	# Create the stub dir used by sa-update and friends
-	keepdir /var/lib/spamassassin
-
-	# Move spamd to sbin where it belongs.
-	dodir /usr/sbin
-	mv "${ED}"/usr/bin/spamd "${ED}"/usr/sbin/spamd  || die "move spamd failed"
-
-	if use qmail; then
-		dobin spamc/qmail-spamc
-	fi
-
-	dosym mail/spamassassin /etc/spamassassin
-
-	# Disable plugin by default
-	sed -i -e 's/^loadplugin/\#loadplugin/g' \
-		"${ED}/etc/mail/spamassassin/init.pre" \
-		|| die "failed to disable plugins by default"
-
-	# Add the init and config scripts.
-	newinitd "${FILESDIR}/3.4.1-spamd.init-r3" spamd
-	newconfd "${FILESDIR}/3.4.1-spamd.conf-r1" spamd
-
-	systemd_newunit "${FILESDIR}/${PN}.service-r4" "${PN}.service"
-	systemd_install_serviced "${FILESDIR}/${PN}.service.conf-r2" \
-							 "${PN}.service"
-
-	use postgres && dodoc sql/*_pg.sql
-	use mysql && dodoc sql/*_mysql.sql
-
-	dodoc NOTICE TRADEMARK CREDITS UPGRADE USAGE sql/README.bayes \
-		sql/README.awl procmailrc.example sample-nonspam.txt \
-		sample-spam.txt spamd/PROTOCOL spamd/README.vpopmail \
-		spamd-apache2/README.apache
-
-	# Rename some files so that they don't clash with others.
-	newdoc spamd/README README.spamd
-	newdoc sql/README README.sql
-	newdoc ldap/README README.ldap
-
-	if use qmail; then
-		dodoc spamc/README.qmail
-	fi
-
-	insinto /etc/mail/spamassassin/
-	insopts -m0400
-	newins "${FILESDIR}"/secrets.cf secrets.cf.example
-
-	# Create the directory where sa-update stores its GPG key (if you
-	# choose to import one). If this directory does not exist, the
-	# import will fail. This is bug 396307. We expect that the import
-	# will be performed as root, and making the directory accessible
-	# only to root prevents a warning on the command-line.
-	diropts -m0700
-	dodir /etc/mail/spamassassin/sa-update-keys
-
-	if use cron; then
-		# Install the cron job if they want it.
-		exeinto /etc/cron.daily
-		newexe "${FILESDIR}/update-spamassassin-rules.cron" \
-			   update-spamassassin-rules
-	fi
-
-	# Remove perllocal.pod to avoid file collisions (bug #603338).
-	perl_delete_localpod || die "failed to remove perllocal.pod"
-
-	# The perl-module eclass calls three other functions to clean
-	# up in src_install. The first fixes references to ${D} in the
-	# packlist, and is useful to us, too. The other two functions,
-	# perl_delete_emptybsdir and perl_remove_temppath, don't seem
-	# to be needed: there are no empty directories, *.bs files, or
-	# ${D} paths remaining in our installed image.
-	perl_fix_packlist || die "failed to fix paths in packlist"
-}
-
-src_test() {
-	# Trick the test suite into skipping the spamd tests. Setting
-	# SPAMD_HOST to a non-localhost value causes SKIP_SPAMD_TESTS to be
-	# set in SATest.pm.
-	export SPAMD_HOST=disabled
-	default
-}
-
-pkg_preinst() {
-	# The spamd daemon runs as this user. Use a real home directory so
-	# that it can hold SA configuration.
-	enewuser spamd -1 -1 /home/spamd
-}
-
-pkg_postinst() {
-	elog
-	elog 'No rules are installed by default. You will need to run sa-update'
-	elog 'at least once, and most likely configure SpamAssassin before it'
-	elog 'will work.'
-
-	if ! use cron; then
-		elog
-		elog 'You should consider a cron job for sa-update. One is provided'
-		elog 'for daily updates if you enable the "cron" USE flag.'
-	fi
-	elog
-	elog 'Configuration and update help can be found on the wiki:'
-	elog
-	elog '  https://wiki.gentoo.org/wiki/SpamAssassin'
-	elog
-
-	ewarn 'If this version of SpamAssassin causes permissions issues'
-	ewarn 'with your user configurations or bayes databases, then you'
-	ewarn 'may need to set SPAMD_RUN_AS_ROOT=true in your OpenRC service'
-	ewarn 'configuration file, or remove the --username and --groupname'
-	ewarn 'flags from the SPAMD_OPTS variable in your systemd service'
-	ewarn 'configuration file.'
-}
diff --git a/mail-filter/spamassassin/spamassassin-3.4.1-r21.ebuild b/mail-filter/spamassassin/spamassassin-3.4.1-r21.ebuild
deleted file mode 100644
index e8abe80c39e0..000000000000
--- a/mail-filter/spamassassin/spamassassin-3.4.1-r21.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit perl-functions systemd toolchain-funcs user
-
-MY_P="Mail-SpamAssassin-${PV//_/-}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="An extensible mail filter which can identify and tag spam"
-HOMEPAGE="https://spamassassin.apache.org/"
-SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test"
-
-# The Makefile.PL script checks for dependencies, but only fails if a
-# required (i.e. not optional) dependency is missing. We therefore
-# require most of the optional modules only at runtime.
-REQDEPEND="dev-lang/perl:=
-	dev-perl/HTML-Parser
-	dev-perl/Net-DNS
-	dev-perl/NetAddr-IP
-	virtual/perl-Archive-Tar
-	virtual/perl-Digest-SHA
-	virtual/perl-IO-Zlib
-	virtual/perl-Time-HiRes
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl )
-	)"
-
-# SpamAssassin doesn't use libwww-perl except as a fallback for when
-# curl/wget are missing, so we depend on one of those instead. Some
-# mirrors use https, so we need those utilities to support SSL.
-#
-# re2c is needed to compile the rules (sa-compile).
-#
-# We still need the old Digest-SHA1 because razor2 has not been ported
-# to Digest-SHA.
-OPTDEPEND="app-crypt/gnupg
-	dev-perl/Digest-SHA1
-	dev-perl/Encode-Detect
-	dev-perl/Geo-IP
-	dev-perl/HTTP-Date
-	dev-perl/Mail-DKIM
-	dev-perl/Mail-SPF
-	dev-perl/Net-Patricia
-	dev-perl/Net-CIDR-Lite
-	dev-util/re2c
-	|| ( net-misc/wget[ssl] net-misc/curl[ssl] )
-	virtual/perl-MIME-Base64
-	virtual/perl-Pod-Parser
-	berkdb? ( virtual/perl-DB_File )
-	ipv6? ( dev-perl/IO-Socket-INET6 )
-	ldap? ( dev-perl/perl-ldap )
-	mysql? (
-		dev-perl/DBI
-		dev-perl/DBD-mysql
-	)
-	postgres? (
-		dev-perl/DBI
-		dev-perl/DBD-Pg
-	)
-	sqlite? (
-		dev-perl/DBI
-		dev-perl/DBD-SQLite
-	)
-	ssl? ( dev-perl/IO-Socket-SSL )"
-
-DEPEND="${REQDEPEND}
-	test? (
-		${OPTDEPEND}
-		virtual/perl-Test-Harness
-	)"
-RDEPEND="${REQDEPEND} ${OPTDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/spamassassin-3.4.1-bug_7199.patch"
-	"${FILESDIR}/spamassassin-3.4.1-bug_7208.patch"
-	"${FILESDIR}/spamassassin-3.4.1-bug_7223.patch"
-	"${FILESDIR}/spamassassin-3.4.1-bug_7231.patch"
-	"${FILESDIR}/spamassassin-3.4.1-bug_7265.patch"
-	"${FILESDIR}/spamassassin-3.4.1-bug_7231-extra.patch"
-	"${FILESDIR}/spamassassin-3.4.1-bug_7404.patch"
-	"${FILESDIR}/spamassassin-3.4.1-bug_7462.patch"
-	"${FILESDIR}/spamassassin-3.4.1-perl526.patch"
-	"${FILESDIR}/spamassassin-3.4.1-bug_7361.patch"
-)
-
-src_prepare() {
-	default
-
-	# The sa_compile test does some weird stuff like hopping around in
-	# the directory tree and calling "make" to create a dist tarball
-	# from ${S}. It fails, and is more trouble than it's worth...
-	perl_rm_files t/sa_compile.t || die 'failed to remove sa_compile test'
-
-	# The spamc tests (which need the networked spamd daemon) fail for
-	# irrelevant reasons. It's too hard to disable them (unlike the
-	# spamd tests themselves -- see src_test), so use a crude
-	# workaround.
-	perl_rm_files t/spamc_*.t || die 'failed to remove spamc tests'
-}
-
-src_configure() {
-	# This is how and where the perl-module eclass disables the
-	# MakeMaker interactive prompt.
-	export PERL_MM_USE_DEFAULT=1
-
-	# Set SYSCONFDIR explicitly so we can't get bitten by bug 48205 again
-	# (just to be sure, nobody knows how it could happen in the first place).
-	#
-	# We also set the path to the perl executable explictly. This will be
-	# used to create the initial shebang line in the scripts (bug 62276).
-	perl Makefile.PL \
-		PREFIX="${EPREFIX}/usr" \
-		INSTALLDIRS=vendor \
-		SYSCONFDIR="${EPREFIX}/etc" \
-		DATADIR="${EPREFIX}/usr/share/spamassassin" \
-		PERL_BIN="${EPREFIX}/usr/bin/perl" \
-		ENABLE_SSL="$(usex ssl)" \
-		DESTDIR="${D}" \
-		|| die 'failed to create a Makefile using Makefile.PL'
-
-	# Now configure spamc.
-	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" spamc/Makefile
-}
-
-src_compile() {
-	emake
-	use qmail && emake spamc/qmail-spamc
-}
-
-src_install () {
-	emake install
-	einstalldocs
-
-	# Create the stub dir used by sa-update and friends
-	keepdir /var/lib/spamassassin
-
-	# Move spamd to sbin where it belongs.
-	dodir /usr/sbin
-	mv "${ED}"/usr/bin/spamd "${ED}"/usr/sbin/spamd  || die "move spamd failed"
-
-	if use qmail; then
-		dobin spamc/qmail-spamc
-	fi
-
-	dosym mail/spamassassin /etc/spamassassin
-
-	# Disable plugin by default
-	sed -i -e 's/^loadplugin/\#loadplugin/g' \
-		"${ED}/etc/mail/spamassassin/init.pre" \
-		|| die "failed to disable plugins by default"
-
-	# Add the init and config scripts.
-	newinitd "${FILESDIR}/3.4.1-spamd.init-r3" spamd
-	newconfd "${FILESDIR}/3.4.1-spamd.conf-r1" spamd
-
-	systemd_newunit "${FILESDIR}/${PN}.service-r4" "${PN}.service"
-	systemd_install_serviced "${FILESDIR}/${PN}.service.conf-r2" \
-							 "${PN}.service"
-
-	use postgres && dodoc sql/*_pg.sql
-	use mysql && dodoc sql/*_mysql.sql
-
-	dodoc NOTICE TRADEMARK CREDITS UPGRADE USAGE sql/README.bayes \
-		sql/README.awl procmailrc.example sample-nonspam.txt \
-		sample-spam.txt spamd/PROTOCOL spamd/README.vpopmail \
-		spamd-apache2/README.apache
-
-	# Rename some files so that they don't clash with others.
-	newdoc spamd/README README.spamd
-	newdoc sql/README README.sql
-	newdoc ldap/README README.ldap
-
-	if use qmail; then
-		dodoc spamc/README.qmail
-	fi
-
-	insinto /etc/mail/spamassassin/
-	insopts -m0400
-	newins "${FILESDIR}"/secrets.cf secrets.cf.example
-
-	# Create the directory where sa-update stores its GPG key (if you
-	# choose to import one). If this directory does not exist, the
-	# import will fail. This is bug 396307. We expect that the import
-	# will be performed as root, and making the directory accessible
-	# only to root prevents a warning on the command-line.
-	diropts -m0700
-	dodir /etc/mail/spamassassin/sa-update-keys
-
-	if use cron; then
-		# Install the cron job if they want it.
-		exeinto /etc/cron.daily
-		newexe "${FILESDIR}/update-spamassassin-rules.cron" \
-			   update-spamassassin-rules
-	fi
-
-	# Remove perllocal.pod to avoid file collisions (bug #603338).
-	perl_delete_localpod || die "failed to remove perllocal.pod"
-
-	# The perl-module eclass calls three other functions to clean
-	# up in src_install. The first fixes references to ${D} in the
-	# packlist, and is useful to us, too. The other two functions,
-	# perl_delete_emptybsdir and perl_remove_temppath, don't seem
-	# to be needed: there are no empty directories, *.bs files, or
-	# ${D} paths remaining in our installed image.
-	perl_fix_packlist || die "failed to fix paths in packlist"
-}
-
-src_test() {
-	# Trick the test suite into skipping the spamd tests. Setting
-	# SPAMD_HOST to a non-localhost value causes SKIP_SPAMD_TESTS to be
-	# set in SATest.pm.
-	export SPAMD_HOST=disabled
-	default
-}
-
-pkg_preinst() {
-	# The spamd daemon runs as this user. Use a real home directory so
-	# that it can hold SA configuration.
-	enewuser spamd -1 -1 /home/spamd
-}
-
-pkg_postinst() {
-	elog
-	elog 'No rules are installed by default. You will need to run sa-update'
-	elog 'at least once, and most likely configure SpamAssassin before it'
-	elog 'will work.'
-
-	if ! use cron; then
-		elog
-		elog 'You should consider a cron job for sa-update. One is provided'
-		elog 'for daily updates if you enable the "cron" USE flag.'
-	fi
-	elog
-	elog 'Configuration and update help can be found on the wiki:'
-	elog
-	elog '  https://wiki.gentoo.org/wiki/SpamAssassin'
-	elog
-
-	ewarn 'If this version of SpamAssassin causes permissions issues'
-	ewarn 'with your user configurations or bayes databases, then you'
-	ewarn 'may need to set SPAMD_RUN_AS_ROOT=true in your OpenRC service'
-	ewarn 'configuration file, or remove the --username and --groupname'
-	ewarn 'flags from the SPAMD_OPTS variable in your systemd service'
-	ewarn 'configuration file.'
-}
diff --git a/mail-filter/spamassassin/spamassassin-3.4.2-r2.ebuild b/mail-filter/spamassassin/spamassassin-3.4.2-r2.ebuild
index cdb0e67e84ef..a93e15ac4957 100644
--- a/mail-filter/spamassassin/spamassassin-3.4.2-r2.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.4.2-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test"
 
 # The Makefile.PL script checks for dependencies, but only fails if a
author	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
commit	de49812990871e1705b64051c35161d5e6400269 (patch)
tree	5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /mail-filter
parent	536c3711867ec947c1738f2c4b96f22e4863322d (diff)