gentoo resync : 13.06.2020

14 files changed, 366 insertions, 16 deletions

diff --git a/mail-filter/MailScanner/MailScanner-4.84.5.2.ebuild b/mail-filter/MailScanner/MailScanner-4.84.5.2.ebuild
index 35131939ad9f..426c5373fb9b 100644
--- a/mail-filter/MailScanner/MailScanner-4.84.5.2.ebuild
+++ b/mail-filter/MailScanner/MailScanner-4.84.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,8 +7,8 @@ MY_PV=$(ver_cut 1-3)
 MY_PVR=$(ver_rs 3 '-')
 
 DESCRIPTION="Free Anti-Virus and Anti-Spam Filter"
-HOMEPAGE="http://www.mailscanner.info/"
-SRC_URI="http://www.mailscanner.info/files/4/tar/${PN}-install-${MY_PVR}.tar.gz"
+HOMEPAGE="https://www.mailscanner.info/"
+SRC_URI="https://www.mailscanner.info/files/4/tar/${PN}-install-${MY_PVR}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/mail-filter/MailScanner/Manifest b/mail-filter/MailScanner/Manifest
index 2a1c0727319b..5b760a436336 100644
--- a/mail-filter/MailScanner/Manifest
+++ b/mail-filter/MailScanner/Manifest
@@ -1,5 +1,5 @@
 AUX confd.mailscanner 147 BLAKE2B be4369be15115d4e1194d0d56b547e88a824378dce4af82f1600cff3cbd7fc75bd99919a6127e1c4ae99268605cc4d96187b4806fb7dbe60000adda8b9c0b2fd SHA512 2fb6f96eef254fae597e23ddb80c649e5754999e542436b7172ab4fca0d3e281645a2fcf21a3bde4c6c9d7cd48de868e64e74c5caac7ff235dbbbcc6c2ebeda3
 AUX initd.mailscanner 982 BLAKE2B c630647b12057e9c56264b9d5b58a6cf4fca8e3d07d38204a64714fcc99d7be3929b2e774e268ec958fefa071db2ec20e9dacc22a64b6c1f4e338c57c1bee6ef SHA512 88a14b02ec004b487b6aa9a8732092a18b465f8aa81e2c958b96434064a15ad5a5ce43b473679bd8b18a661f972c8df756c54691d35c4261dff8a26cd8e291ec
 DIST MailScanner-install-4.84.5-2.tar.gz 9510489 BLAKE2B 7bfdb0ba9fbd38281328e66fab9512b6dcc596d92fb18186df950d26c451bff0a8fa5345df7849e60e0040e6559754ef9e2099c17425ed4a6465071e0fb610dd SHA512 d9d082e29ddb6eae4f30069298507805a7674c264bf8edad3db3322fa0f2c2ad4539c0c2213c6fcbee11b7c57a36218c1d24243077358bac98e7ae07f7ee506f
-EBUILD MailScanner-4.84.5.2.ebuild 9558 BLAKE2B 0fa0a676e8407e44fce381a0dc027026acc4bfe3fbc33190f4bc2e037b39ef0fde6cfd3aed3ab4675eeabf67b618815ac51428e5f1fd8944a3510b2b24a3dc91 SHA512 f0003842049b6a7f198d0ba64ceae698a6790b0de51f6a813151f8128871ea91495733fd62d43bee33a89853eaac842b53a4d8083a48d57b3b73eade85c9428b
+EBUILD MailScanner-4.84.5.2.ebuild 9560 BLAKE2B bd421f08f148633612872243d2c7fab5c748c795e92890521032f32000ebd40813babe09d83694062240de873864d950cdb6a6b0a4fc3cded7479ac0c69503ff SHA512 5327747a40ad5b828b70b1e04efdc2ca53e94244fbd498d09812d95c122be9e8cee78f6d0de2dc45ee068327cc3a0328294f305f3bd26ff83786a084325cca7a
 MISC metadata.xml 511 BLAKE2B aba5245d0255701f471123abd5309a3b2d8702ed1189257ffb47ff5af540a24c82aad2f6115f79e146e1c90a6208bd961da29a553219eb71508d152c8be4d0d0 SHA512 6087d7d6977befe9271c7f95cb0ed5a232e7d4bb1e070259ee3fef10173be00f77cc834ce14f55b9123f7c4379595c4a5f817fefdbd9fde760a57e66144791b0
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index f633d541c542..8dd7f9d3ec23 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/libspf2/Manifest b/mail-filter/libspf2/Manifest
index c01171ab4606..714d71efaed0 100644
--- a/mail-filter/libspf2/Manifest
+++ b/mail-filter/libspf2/Manifest
@@ -1,4 +1,4 @@
 AUX libspf2-1.2.10-gcc5.patch 1080 BLAKE2B ce085a71cba9f6a493c7b276dada02dceb8efdb75df9d0062b74acd9b0e9d5a9c56cdd970743cc9e4860a4714e24d0e4687d9a2c5d321e320a6888c06f88e6c3 SHA512 cd2af129e334e0e1efcd722680f8f7cb064e6f5581ce41c791cb4f5f34d1eb4ac0dc586114b3017b4fd2ba350f11972f78a4029a8fc03118cf74c4f1276cd12b
 DIST libspf2-1.2.10.tar.gz 508842 BLAKE2B d15a44f64c5e3da20aa349e61a6cc02a15f83ed3acff93fe4c23970e30533d6424b1db35d7d60ff488c9a239d343f8544426fbf8fcb66271237155e0b57df1b5 SHA512 162ce382628c6fcadac3e11f5a12442db622bb23f7ec503e16f5ba7fc88afdd777bce6b093c12a58210355985fd11b74b140f08fab347334d82d953dd183b130
-EBUILD libspf2-1.2.10.ebuild 1215 BLAKE2B 13dfc8b345caed7c7c8129905c7b7251686ab6bcfb2cbcb22a63360529890bb75e5813b9e9a92b2c649137dcdf81d3310a765e27a6895067d6e41a4fb2e62838 SHA512 746d8c4c07edac2d23281870d9983f0ca52ba9bc9494f9e7c9f077d5a7d2a8c68df75fcc78b218713df04dff766c4f7b2c1af18ad92400ba82a8a1df83fc7a65
+EBUILD libspf2-1.2.10.ebuild 1217 BLAKE2B 1bf70c5a8adc6658410a40975197dc227d25a62658d7cbb1533c940067e1b161969ab9783f8229f115d08d36f5c5b0d91e1a8da65efe24c7c15feb4fcb8768cf SHA512 66032f679276548e0b3e8999922e7008508d35824d59131c10c9eebe971675ade779a7377e73e414073844563570eebbdf5c2e7af4734280b1286649b15d3a14
 MISC metadata.xml 588 BLAKE2B f2a34d6c55b8678f9ef69824ccce32a51508fe251af758d4d4c3ae05b51498b543e5f60757764a4a47dbc98587bc2b57faced4965d8c401e35f8e36605313a4c SHA512 8328d959a8b69fa3e10108f21cf2c53a3daf4aacbd9646af8e5af95ec818eeb6aebc20185b991e4ce6a3a2d0101bf67ce47b7af85dec4b06c2748d5f4fafd18e
diff --git a/mail-filter/libspf2/libspf2-1.2.10.ebuild b/mail-filter/libspf2/libspf2-1.2.10.ebuild
index 38a4f67b8ce2..8e1ef5506072 100644
--- a/mail-filter/libspf2/libspf2-1.2.10.ebuild
+++ b/mail-filter/libspf2/libspf2-1.2.10.ebuild
@@ -5,8 +5,8 @@ EAPI=5
 inherit autotools eutils
 
 DESCRIPTION="libspf2 implements the Sender Policy Framework, a part of the SPF/SRS protocols"
-HOMEPAGE="http://www.libspf2.org"
-SRC_URI="http://www.libspf2.org/spf/libspf2-${PV}.tar.gz"
+HOMEPAGE="https://www.libspf2.org"
+SRC_URI="https://www.libspf2.org/spf/libspf2-${PV}.tar.gz"
 
 LICENSE="|| ( LGPL-2.1 BSD-2 )"
 SLOT="0"
diff --git a/mail-filter/libsrs2/Manifest b/mail-filter/libsrs2/Manifest
index d2b3a86836e0..84c89f38c5f9 100644
--- a/mail-filter/libsrs2/Manifest
+++ b/mail-filter/libsrs2/Manifest
@@ -1,4 +1,4 @@
 AUX libsrs2-1.0.18-parallel-make.diff 477 BLAKE2B 21f7d1bdf54c73c28a7c5f59da1deb11282017becf812a3c964363eb6c316a03a9dac8f8d186489638f092b9fa76399a8763ea42104a5c09dafbd0be2253444b SHA512 a30b4ebe22f2f890597c8b1d6ffa5e0d81cc9b5bfb583899cf5996278d0b17a58850870db29d26c032dc10eeb0bf4e660071fc483c84fc70d317687339fbb482
 DIST libsrs2-1.0.18.tar.gz 295748 BLAKE2B c4572ec58b474f47d34e127db7ce142ba6e715fb7f987801ae55a26628b5e2535b645b8209b6f5b106150b7999d2757e6b7bb64ee556d4b1c52df73144081626 SHA512 b9c189caa227487e90566f65430345f09a3d545fc286a3eb0c445aee3a74905c1a9248ce78b36a7cfb6a2936f6cd1efbe99ba7b8df49a613a81c6435396f5422
-EBUILD libsrs2-1.0.18.ebuild 646 BLAKE2B c9fad4cc79e7cde66330bf1615e32fbac51fc79741b0d5a7185240012d6f2337ec80f4e74c41fb19d85d4afd6d0dfeaf87bd55f0bbfd2fa6d80295b521c3be28 SHA512 17293195555996e17d7ce7a74db0252ca29098b68f7663f4b6c5c01f35100cd0485207186c49c2a7ff71e13297dee6c7fb1d377a987e34e85f8f2033e8e79ded
+EBUILD libsrs2-1.0.18.ebuild 645 BLAKE2B 9498fbbe89354df714c5ad8c3dea93e34be7bc1405a3c07eae01ae0b70158f1bd5e597565e4ec483ec196444071cb4781041507c7f214635387d034f3c4798b0 SHA512 87ec4fb64213d1fda387dbea96ea832b9ff1d05c0fc5fb2398afc7d9d8d93424879d185a20705d6be41f1677807e50f3bb448861c83fec9ab41644d2befd3bde
 MISC metadata.xml 690 BLAKE2B b3a2bc9aa4161919f2180d85d14c186cbb116e48d9ec0594f495b4a592c2e5f35c09402c70acd5ea99af7e80734bfd64a6e8c41a8de8ddd32e5d30d2532fc475 SHA512 477ded5b9f894d5e438356ccbc8a9f39ca4790b965e8fe0a5f7d2ba6af4ccf571306e86fb30523ba4ae837a9ec88098f55e2d988c9bf2a35197aa643d3fe7381
diff --git a/mail-filter/libsrs2/libsrs2-1.0.18.ebuild b/mail-filter/libsrs2/libsrs2-1.0.18.ebuild
index 6eca36dacfb6..e31cfb85a72c 100644
--- a/mail-filter/libsrs2/libsrs2-1.0.18.ebuild
+++ b/mail-filter/libsrs2/libsrs2-1.0.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -6,8 +6,8 @@ EAPI=4
 inherit eutils autotools
 
 DESCRIPTION="libsrs2 is the next generation Sender Rewriting Scheme library"
-HOMEPAGE="http://www.libsrs2.org/"
-SRC_URI="http://www.libsrs2.org/srs/${P}.tar.gz"
+HOMEPAGE="https://www.libsrs2.org/"
+SRC_URI="https://www.libsrs2.org/srs/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest
index 7896bd81b3d9..817df39b475f 100644
--- a/mail-filter/opendkim/Manifest
+++ b/mail-filter/opendkim/Manifest
@@ -1,7 +1,8 @@
+AUX opendkim-2.10.3-define-P-macro-in-libvbr.patch 1111 BLAKE2B ef21e6609a80eadfc3c493b088df6afe368d0ed833d04e7cde922e643b434a7033c888e1b7158d1085152b128a60d95fae722885f15be08c63bed898e4924127 SHA512 6cf0cb4e54814f661f9869bfdfda0ab44c67f237475ebc69b18c670de9f356bb5375740dc8e0a922f25a3215ad5a884725629c92eac1dbf8251364725d77c105
 AUX opendkim-2.10.3-lua-pkgconfig.patch 5688 BLAKE2B 57fd8b57d12af4d1351e8bfa2ad01a39e85a6f1e440e3754e497082f5f1098dfc8c31771b1f83ae59f1e53ef242af78093601b1348b62945deacf8afdc42fca0 SHA512 b9ee7e625d1a3f00dcda7e441a81749d773daa9cfad7f046dd03d775564f1c111648c883ef1dcc16a6b518239b6a66bee4ba59f59227d182fcf61b887594d1d7
 AUX opendkim-2.10.3-openrc.patch 10203 BLAKE2B e825ae1258c82607eb6d10d5acc3246908868fd3d5703ba0044f93bdf51e5a95dbc39a1e3060855073d14c31da5cb3985afe81c526f592f56463bf698ce4c317 SHA512 34499044cb768d54c0c1653a62fb34c9815990d815c98ccfba22afc1ad9c837c6689ff17a3d1da1221d698c91ce9d77a1964d99055527dfd797f8d428e1db615
 AUX opendkim-2.10.3-openssl-1.1.1.patch.r2 5966 BLAKE2B c0dcb757f1195e8a3fc055f5162b805bf5bb2fe7a6a7c24317cfc1f0ed05491803f2fefbc22e96409a339f9741cac5344044a1efadec1f3e3c87084b2c221ed6 SHA512 e532d0411bc6cf1f55bf2de1bad54dc29d19558b2c4ea27aa72f17738688d48f111c3662e88064169a78347144eae289b362bfa4849ab4d3b06ff97d439cce47
 DIST opendkim-2.10.3.tar.gz 1210224 BLAKE2B affd4526568431fa1afee93a167c5569912c9344ea4e6eee3281a035bd0c76d2be5d2e8e144bbebabd681a73388a37ac56d9a2e4daf00af9baadad14ffb42265 SHA512 97923e533d072c07ae4d16a46cbed95ee799aa50f19468d8bc6d1dc534025a8616c3b4b68b5842bc899b509349a2c9a67312d574a726b048c0ea46dd4fcc45d8
 EBUILD opendkim-2.10.3-r17.ebuild 7370 BLAKE2B 5d651b5389f07920d307d9c9895d1bfb320edff2d4ce6cb339b9f2f75e9b2073ffeb528b3bfa409d5eab87d7c04b99c48f61793598c7d0b88cea84c8281f1c3c SHA512 cbc2f5869b49a0981ba874b26ff386adcaddcbc15d227d56ad3baf7b6b6b31c33691bfe5552daa8354cef1db3ded88f9576647347bc047835170bd5c31f9dff9
-EBUILD opendkim-2.10.3-r18.ebuild 7412 BLAKE2B f84da27ad0469bd5f194d2276d477fa639a58c777d0332a01d862ff0739b9d2fd448614b28e86aaa2d54440afd76c467877265f8a9bead4266f21feee896858b SHA512 e6950c55ae36dc38629a28a8c2f6db00dd36e10c959e735f409418792204ce44a8341657cdbcd6620347718004ba15709bcb9bb0aafc31a40b5ece1a0ba21de0
+EBUILD opendkim-2.10.3-r18.ebuild 7463 BLAKE2B 00b1603bb769d88cd18181dbaead0a69ab0380351cc8673f811782499b66e06a5ff5f205f6296f7fa94b06dd7c62022858de9133848df282f7dc002413a032f3 SHA512 00649a96436f8c1a78214e44bec9c685ca4730804f7bbc04bca85d5270233cd2bd9e69807b9fe9c7ee656e8d6c9b1a9017c5da9e655e880d5724f0604294bdd9
 MISC metadata.xml 2185 BLAKE2B 0cfb33303e8edf764700664863e2dbf90a288e71cf1a078c33ebaac20b11e398e34ae8ca289732b24401ec1f4b192e2c922a86297632af9a039736c52e0ac143 SHA512 56753bc62e8fa16ad3df9e49c2877bbfa5ca8f2f617455c8b9757e50cdd2afe6b27d2d185edb3620d447e42277d755373eafb448da08262723cfb0b5863c3399
diff --git a/mail-filter/opendkim/files/opendkim-2.10.3-define-P-macro-in-libvbr.patch b/mail-filter/opendkim/files/opendkim-2.10.3-define-P-macro-in-libvbr.patch
new file mode 100644
index 000000000000..bbb4eb8b33ba
--- /dev/null
+++ b/mail-filter/opendkim/files/opendkim-2.10.3-define-P-macro-in-libvbr.patch
@@ -0,0 +1,40 @@
+From 50a91575cee8d08682f090d2d6bdb4806eccfbcd Mon Sep 17 00:00:00 2001
+From: Wynn Wolf Arbor <wolf@oriole.systems>
+Date: Wed, 10 Jun 2020 09:37:03 +0200
+Subject: [PATCH] Define __P() macro in libvbr
+
+Definitions for this macro have been added throughout the codebase in
+commits 91e7407d, 705948fd, 227fa252, 842c1733, and b730bdc0, but one
+was still missing from libvbr. glibc contains a definition for legacy
+reasons, but other libcs might not. Particularly, the musl libc does not
+contain it, leading to build errors when enabling support for VBR.
+
+Add a definition for __P() to vbr.h to fix this.
+---
+ libvbr/vbr.h | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/libvbr/vbr.h b/libvbr/vbr.h
+index 4bef1f36..3bcb9212 100644
+--- a/libvbr/vbr.h
++++ b/libvbr/vbr.h
+@@ -12,6 +12,16 @@
+ /* system includes */
+ #include <sys/types.h>
+
++#ifdef __STDC__
++# ifndef __P
++#  define __P(x)  x
++# endif /* ! __P */
++#else /* __STDC__ */
++# ifndef __P
++#  define __P(x)  ()
++# endif /* ! __P */
++#endif /* __STDC__ */
++
+ /* strings */
+ #define	VBR_ALL			"all"
+ #define	VBR_INFOHEADER		"VBR-Info"
+--
+2.27.0
+
diff --git a/mail-filter/opendkim/opendkim-2.10.3-r18.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r18.ebuild
index 260010392d11..039036e23054 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r18.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r18.ebuild
@@ -51,6 +51,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-openrc.patch"
 	"${FILESDIR}/${P}-openssl-1.1.1.patch.r2"
 	"${FILESDIR}/${P}-lua-pkgconfig.patch"
+	"${FILESDIR}/${P}-define-P-macro-in-libvbr.patch"
 )
 
 src_prepare() {
diff --git a/mail-filter/pyzor/Manifest b/mail-filter/pyzor/Manifest
index bef5b63ee8dd..527907296de6 100644
--- a/mail-filter/pyzor/Manifest
+++ b/mail-filter/pyzor/Manifest
@@ -2,4 +2,4 @@ AUX read-stdin-as-binary-in-get_input_msg.patch 2751 BLAKE2B c348d28eeb703ff9b25
 AUX unfix-configparser-compat-for-2to3.patch 1210 BLAKE2B 1ad8b2528cbf723d46d18c25163f68738281c48638b86c8809b5dab8f6f3c0058f17b1e2232d7c704b4aa777aaaf43c63170478da95272e75492bbbaec696789 SHA512 d9f5308d1f9280db5a0556fcaf3927e261b6cd1d01ff42c05a912335c6f9343f78096eed645aab5c741c221adf5ece00137aa3ae6f950cafbeb77db1908949b9
 DIST pyzor-1.0.0.tar.gz 126276 BLAKE2B c60f26c53bf118c88dacbc49ddd414473748af1868b383a9c937ecf3cfe426ecdd60f64388fe7e555bd4641ef445769600e40879279dd544ef9ea32bd0dab6b9 SHA512 b3fb8b2c5261e187a2ab3a5a3b12d221df7de08766c6bb2ad9990c0f23517534871ecc9d5ad529e79b0d0aef8b2b800728320c57435a8c0d8c3f80a4ba0f7e4a
 EBUILD pyzor-1.0.0-r1.ebuild 2015 BLAKE2B bcbd30619b39d43b93ce6445cf986bff42dd1e7d4d1afd1f0c24aea1dc7a456de2840280c5455cacca55c90fdec80ca61fc36091676a800cf3a61b20fe975d88 SHA512 e2a0e1cb9be39ce9f3c1e44ee6de79ecb62d1ac66fd32e75c0b340ffaa5de842f945203fb58fb5723ebb8c12392d07567971d37fcbd744afa92d9e89dc2e8466
-MISC metadata.xml 887 BLAKE2B 5a399af14ad9aa5eefe9f37da9b43addf24e6c5416827721f110a5cceb44eb9f03c78ac0b149f31468e5206a10c93c98d3940783c39ffa8f04b840a94c3fa850 SHA512 c3967f9f0e2c64f510f04e7ce01f89a2c03a7e1f260ca25a3d29b6c7821dbcded3ffa4b16f640693b08f3763793c733689c30ef8710305a4bf0b706605eda138
+MISC metadata.xml 808 BLAKE2B 4c49c0d23d504122e7bb2d603f74cf5468cc84c212342dce3ca36b1fd5ec54b2b1aa65e8966ffb94a19a49d08eb8614af5f082faee32f94a315a8d51c9235ccc SHA512 8547153e5e1cd014039d497440197df6144d0dc1be2ebc31dca25551cb4ca1bd7399c2aac7e1c521e9c6b1d4172a6a88c1a98047f4a6bf49e58ac11671388230
diff --git a/mail-filter/pyzor/metadata.xml b/mail-filter/pyzor/metadata.xml
index 77b1c62d6729..21a8605f2713 100644
--- a/mail-filter/pyzor/metadata.xml
+++ b/mail-filter/pyzor/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>mjo@gentoo.org</email>
-  </maintainer>
   <maintainer type="project">
     <email>python@gentoo.org</email>
     <name>Python</name>
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index 417e0c9e37a2..649ce1b32b2d 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -7,5 +7,6 @@ AUX update-spamassassin-rules-r1.cron 1557 BLAKE2B f159c1dd8f00771c5232cfb653403
 DIST Mail-SpamAssassin-3.4.4.tar.bz2 2741290 BLAKE2B 03dec6c71a43ad7d288a96de32fb61e81e2c793756c76b7c36ec34226483a35123cc291376e7c15ce73571e7de5967cee058a1b34932fd0f27632028d22b092b SHA512 7dfd0cf3426df683f608218da8881538a24e833024f2a1eb0f8513bdf3e4bc6ac48198c4f380efe024a01ae7b6a5ab9d76205cec185d0e4818f1cc79bda0ea3f
 EBUILD spamassassin-3.4.4-r1.ebuild 9768 BLAKE2B b7f7c59ff8f13b2702ae54dc97084a04ba971b317402a1916bc3edc06491feefe48d7dd06ad0f03d2680783ebd77bab62cf42195a36a5dca6b82955a9d72855f SHA512 cdcd621b39e9d7f53a3e3f3e5bf4e80fdcd1edbcc440cfe43d4c0b525f58489021433d0892f7e1c8405cf073768860c4d0605fbcd8c94a6e3d19905b736b003d
 EBUILD spamassassin-3.4.4-r2.ebuild 9643 BLAKE2B 2cd5f87c164d2c56be84e533196e0a1f99f3955135540bb9f47dbd34f51fa1897f2508a8230c7e5c2d3a2c24da263f67c9e78b7855e1c15887d91627a65c12ec SHA512 d9c93a7a071b3a16ad38fd1c6c879ee82b80b1c8bb25689d4abea30c640ac4a90d423378f52bb80df666586ce35575039337f69077dbf87b4a8de8127dc50e54
+EBUILD spamassassin-3.4.4-r3.ebuild 9523 BLAKE2B fbe004494b8c1f7f506807643a308fa4bfeaeb869f3996b60296651670c74a7ebaff634b648686605f909499066bc7652f33b67c50d12bdded560f57c43b1e53 SHA512 4c5608e0f01d79d77d2b91e0db83dd5465d77b141d3a76863ea1c8be01a7075232c08df6769d86a173f23c90970a6891fdc3cdb9243c6bc6b7e2f449cef2980a
 EBUILD spamassassin-3.4.4.ebuild 8499 BLAKE2B 592546b060b152316a579e6f6d201590d4081c7eb1bea2ba8957f954fbda514051f14fc51bba7ffa2a6359a4551d806634b0219daba7ce98356b080192b20027 SHA512 ac9c0eb2934a33df010046706267ad58c4e12a3c8c07d6d43e51aa013f9c8031ccf9160e82f6bde5fef895430dec22016eb61daa8ce2c149ad426e3d3e6bc9e3
 MISC metadata.xml 693 BLAKE2B 57b8a079ed95858b27fb567e1c3b77389e8141315fcf69e34e2b80dab13e5b0f88c9f50f2387f7537cedd5a3cd56adcb611932a641e31a7f875914bb847708d3 SHA512 991a54ec305b6b4c4e9fd27ba77abf2ad7e72647776e0acc0e29a058566d0045e31df8ceebee6e320f758f10fb12973239d1650e469e910ac77a887656fcff3e
diff --git a/mail-filter/spamassassin/spamassassin-3.4.4-r3.ebuild b/mail-filter/spamassassin/spamassassin-3.4.4-r3.ebuild
new file mode 100644
index 000000000000..1e1e0be66e4a
--- /dev/null
+++ b/mail-filter/spamassassin/spamassassin-3.4.4-r3.ebuild
@@ -0,0 +1,310 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit perl-functions systemd toolchain-funcs
+
+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 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test"
+RESTRICT="!test? ( 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="acct-user/spamd
+	acct-group/spamd
+	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/BSD-Resource
+	dev-perl/Digest-SHA1
+	dev-perl/Encode-Detect
+	|| ( dev-perl/GeoIP2 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}"
+
+# There are a few renames and use-dependent ones in src_istall as well.
+DOCS=(
+	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
+)
+
+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
+
+	# 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
+
+	# Disable plugin by default
+	sed -i -e 's/^loadplugin/\#loadplugin/g' \
+		"rules/init.pre" \
+		|| die "failed to disable plugins by default"
+}
+
+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 () {
+	default
+
+	# 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
+
+	# 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
+	use qmail && dodoc spamc/README.qmail
+
+	# 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
+
+	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-r1.cron" \
+			   update-spamassassin-rules
+	fi
+
+	# Remove perllocal.pod to avoid file collisions (bug #603338).
+	perl_delete_localpod
+
+	# 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
+}
+
+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() {
+	if use mysql || use postgres ; then
+		local _awlwarn=0
+		local _v
+		for _v in ${REPLACING_VERSIONS}; do
+			if ver_test "${_v}" -lt "3.4.3"; then
+				_awlwarn=1
+				break
+			fi
+		done
+		if [[ ${_awlwarn} == 1 ]] ; then
+			ewarn 'If you used AWL before 3.4.3, the SQL schema has changed.'
+			ewarn 'You will need to manually ALTER your tables for them to'
+			ewarn 'continue working.  See the UPGRADE documentation for'
+			ewarn 'details.'
+			ewarn
+		fi
+	fi
+}
+
+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
+
+	if use mysql || use postgres ; then
+		local _v
+		for _v in ${REPLACING_VERSIONS}; do
+			if ver_test "${_v}" -lt "3.4.3"; then
+				ewarn
+				ewarn 'If you used AWL before 3.4.3, the SQL schema has changed.'
+				ewarn 'You will need to manually ALTER your tables for them to'
+				ewarn 'continue working.  See the UPGRADE documentation for'
+				ewarn 'details.'
+				ewarn
+
+				# show this only once
+				break
+			fi
+		done
+	fi
+
+	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.'
+
+	if [[ ! ~spamd -ef "${ROOT}/var/lib/spamd" ]] ; then
+		ewarn "The spamd user's home folder has been moved to a new location."
+		elog
+		elog "The acct-user/spamd package should have relocated it for you,"
+		elog "but may have failed because your spamd daemon was running."
+		elog
+		elog "To fix this:"
+		elog " - Stop your spamd daemon"
+		elog " - emerge -1 acct-user/spamd"
+		elog " - Restart your spamd daemon"
+		elog " - Remove the old home folder if you want"
+		elog "     rm -rf \"${ROOT}/home/spamd\""
+	fi
+	if [[ -e "${ROOT}/home/spamd" ]] ; then
+		ewarn
+		ewarn "The spamd user's home folder has been moved to a new location."
+		elog
+		elog "  Old Home: ${ROOT}/home/spamd"
+		elog "  New Home: ${ROOT}/var/lib/spamd"
+		elog
+		elog "You may wish to migrate your data to the new location:"
+		elog " - Stop your spamd daemon"
+		elog " - Re-emerge acct-user/spamd to ensure the home folder has been"
+		elog "   updated to the new location, now that the daemon isn't running:"
+		elog "     # emerge -1 acct-user/spamd"
+		elog "     # echo ~spamd"
+		elog " - Migrate the contents from the old location to the new home"
+		elog "   For example:"
+		elog "     # cp -Rpi \"${ROOT}/home/spamd/\" \"${ROOT}/var/lib/\""
+		elog " - Remove the old home folder"
+		elog "     # rm -rf \"${ROOT}/home/spamd\""
+		elog " - Restart your spamd daemon"
+		elog
+		elog "If you do not wish to migrate data, you should remove the old"
+		elog "home folder from your system as it is not used."
+	fi
+}