gentoo (valentine's day) resync : 14.02.2021

8 files changed, 193 insertions, 62 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 38c8c46fd90f..b01fc4560f91 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 7e5338b9bd2f..41ae34c8076e 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -4,5 +4,7 @@ AUX amavisd-snmp-subagent.initd 890 BLAKE2B ccc1c91547775737676449765e90c12b70ff
 AUX amavisd.initd-r2 1594 BLAKE2B b778d21239440b6b01a0860f69b1363d57cc0e241a86501131cbafb563b77a58828c5801b86b5419c1e04eeaa85eeecd087f37394bfec2dc69a466c45c8155fa SHA512 67414b2d5977d74a1b613e8a3478a9e1f2a60ba29685c219db1cc48ead6fcf94e93a2d5897768b7720d5db352028c2eca89265bb1e2520b2f10ae011db200b65
 AUX amavisd.service-r1 433 BLAKE2B 8e61e95cfdadb37afec0040f87eb67745ea6aae766ca07b5eebfefc90e40ceba267028c8bf51e5208f198001a05edaef326d0a8ff23159a4d705f191c48c3753 SHA512 9696d50ab845d067e1289af8525c0ee3a8d55b4617af6f4d146d4844c9667b63886955145bea33a2980ed153210da69fa3747451c337075ff4ca500abafc0c7a
 DIST amavis-v2.12.0.tar.bz2 873702 BLAKE2B cae44bb9cfa9125f44b1ef548947a5f826e91fc349b12a52f0267933e65c450a708c7a18e5ae90ee1a0d452d0b3d30a6c1cabcc310e3609de1eda8c35f222306 SHA512 f8d2dfb6e7d694c76c0ebca7592a3c85ff9b4911cbe43b3eb6d5002541bf036adfbf47c18df4b10c72bcceee0d8701b8c474e6432c5c136ca25170e42098d844
+DIST amavis-v2.12.1.tar.bz2 874339 BLAKE2B 23197298c448bae7bfaed62fda5065f507556737250caddde0d3bdec5fe219ab8834d4cbb1e06f443f2fc00b643d12d96447f58f37198b3ae7b96985f29ef2bf SHA512 8a2cef6ff6e2fa7f5d2e00a433a3f3ec7a15c47e21deadf6a25f50e0e29ad20d8641f474cd5d0dfcd3715458b07f08272f6df35efb2137b7c6a74a460cb91013
 EBUILD amavisd-new-2.12.0-r5.ebuild 4913 BLAKE2B 89efd4ca3df89f9875e7952d58a2440e88448410ed629ec77dcaf775c2a15cd5b75ba6af7b425855970c187864a1691175476c6f6d9c16f48f2f27e5440708d6 SHA512 b20582782a78fe683e4b33e5982ed5d9d6e676b7bf3c3ec2c0f5235cefbe709aa9c51bb8a31c8c0e95fd568865b7bf87dfd41e2f5ef462a2b9b126b269d6f80d
+EBUILD amavisd-new-2.12.1.ebuild 4918 BLAKE2B af107963f6342e4168a36036283982ddeb45a2f368319bce6ca74ff009b884fba0bcf5ab22b52e12cbd9b009d00ae9f2039f6484bb32a18ee32140ab08315b08 SHA512 d3f28f1e33889a8dcfce5abcaf6340cdd699ff2ddb8ffc4639dc3304be67be339463f75a5d305d68e46182bc6dfa4860dcbbeaec4d6afe713d1f374a2ee58b6a
 MISC metadata.xml 868 BLAKE2B e42a68930492d173c2443d86db2fd12630096283795a682cbf25075a162a8b76110f29c0826a8190c40bc6b80c8ebaf29de654ead212ab9b54f2e5e79ab7e9dc SHA512 1d3bdaf290a814086c1ccfd91fa6ed33872e9b30fd9c4899fee6f7718b9148c48e489934e972f81f7330b8177b85768333164a023a2887726d325f78e91e33db
diff --git a/mail-filter/amavisd-new/amavisd-new-2.12.1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.12.1.ebuild
new file mode 100644
index 000000000000..4245de32669f
--- /dev/null
+++ b/mail-filter/amavisd-new/amavisd-new-2.12.1.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="High-performance interface between the MTA and content checkers"
+HOMEPAGE="https://gitlab.com/amavis/amavis"
+SRC_URI="https://gitlab.com/amavis/amavis/-/archive/v${PV}/amavis-v${PV}.tar.bz2"
+
+LICENSE="GPL-2 BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="clamav courier dkim ldap mysql postgres qmail razor rspamd rspamd-https snmp spamassassin"
+
+MY_RSPAMD_DEPEND="dev-perl/HTTP-Message
+	dev-perl/JSON
+	dev-perl/LWP-UserAgent-Determined"
+DEPEND="acct-user/amavis"
+RDEPEND="${DEPEND}
+	app-arch/arc
+	app-arch/bzip2
+	app-arch/cabextract
+	app-arch/cpio
+	app-arch/gzip
+	app-arch/lha
+	app-arch/lrzip
+	app-arch/lzop
+	app-arch/ncompress
+	app-arch/p7zip
+	app-arch/pax
+	app-arch/arj
+	app-arch/unrar
+	app-arch/xz-utils
+	app-arch/zoo
+	dev-lang/perl:*
+	dev-perl/Archive-Zip
+	dev-perl/BerkeleyDB
+	dev-perl/Convert-BinHex
+	dev-perl/File-LibMagic
+	dev-perl/IO-Socket-SSL
+	dev-perl/IO-stringy
+	>=dev-perl/Mail-DKIM-0.31
+	>=dev-perl/MailTools-1.58
+	>=dev-perl/MIME-tools-5.415
+	dev-perl/Net-LibIDN
+	>=dev-perl/Net-Server-0.91
+	dev-perl/Net-SSLeay
+	dev-perl/Unix-Syslog
+	net-mail/ripole
+	net-mail/tnef
+	>=sys-apps/coreutils-5.0-r3
+	>=sys-libs/db-4.4.20
+	virtual/mta
+	virtual/perl-Compress-Raw-Zlib
+	virtual/perl-Digest-MD5
+	virtual/perl-File-Temp
+	virtual/perl-IO-Compress
+	virtual/perl-IO-Socket-IP
+	virtual/perl-MIME-Base64
+	virtual/perl-Time-HiRes
+	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 )
+	rspamd? ( ${MY_RSPAMD_DEPEND} )
+	rspamd-https? ( ${MY_RSPAMD_DEPEND}
+		dev-perl/LWP-Protocol-https
+		dev-perl/Net-SSLeay )
+	snmp? ( net-analyzer/net-snmp[perl] )
+	spamassassin? ( mail-filter/spamassassin dev-perl/Image-Info )"
+
+AMAVIS_ROOT="/var/lib/amavishome"
+S="${WORKDIR}/amavis-v${PV}"
+
+src_prepare() {
+	if use courier ; then
+		eapply -p0 amavisd-new-courier.patch
+	fi
+
+	if use qmail ; then
+		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"
+
+	if ! use dkim ; then
+		sed -i -e '/enable_dkim/s/1/0/' "${S}/amavisd.conf" \
+			|| die "missing conf file - dkim"
+	fi
+
+	if ! use spamassassin ; then
+		sed -i -e \
+			"/^#[[:space:]]*@bypass_spam_checks_maps[[:space:]]*=[[:space:]]*(1)/s/^#//" \
+			"${S}/amavisd.conf" || die "missing conf file - sa"
+	fi
+
+	eapply_user
+}
+
+src_install() {
+	dosbin amavisd{,-agent,-nanny,-release,-signer,-status}
+	dobin p0f-analyzer.pl amavisd-submit
+
+	if use snmp ; then
+		dosbin amavisd-snmp-subagent
+		newinitd "${FILESDIR}/amavisd-snmp-subagent.initd" \
+				 amavisd-snmp-subagent
+		dodoc AMAVIS-MIB.txt
+	fi
+
+	if use ldap ; then
+		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 -g amavis
+	doins amavisd.conf
+
+	# 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!
+	#
+
+	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
+
+	docinto README_FILES
+	dodoc README_FILES/README*
+	dodoc -r README_FILES/*.{html,css}
+	docinto README_FILES/images
+	dodoc README_FILES/images/*.png
+	docinto README_FILES/images/callouts
+	dodoc README_FILES/images/callouts/*.png
+
+	docinto test-messages
+	dodoc test-messages/README
+	dodoc test-messages/sample.tar.gz.compl
+}
+
+pkg_preinst() {
+	# 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..."
+
+			razor-admin -create -home="${D}/${AMAVIS_ROOT}/.razor"
+			sed -i -e "s:debuglevel\([ ]*\)= .:debuglevel\1= 0:g" \
+				"${D}/${AMAVIS_ROOT}/.razor/razor-agent.conf" || die
+		fi
+	fi
+}
+
+pkg_postinst() {
+	local d="/var/amavis"
+	if [ -d ${d} ]; then
+		elog "Existing data found. Please make sure to manually copy it to amavis' new"
+		elog "home directory by executing the following command as root from a shell:"
+		elog
+		elog "  cp -a ${d}/* ${d}/.??* ${AMAVIS_ROOT}/ && rm -r ${d}"
+		elog
+	fi
+}
diff --git a/mail-filter/imapfilter/Manifest b/mail-filter/imapfilter/Manifest
index 2cb8eb554fde..5de3d3392578 100644
--- a/mail-filter/imapfilter/Manifest
+++ b/mail-filter/imapfilter/Manifest
@@ -1,7 +1,5 @@
 AUX imapfilter-2.6.16-libressl.patch 920 BLAKE2B 6c0bc84885354f2f95430f9e827c391063acc8bc12113a775a24b6af58679c43eea500bb57405ddf89cf09a0a97c5255e49257cb76b87f3481a3b65b62f8e884 SHA512 81ff9036b77d763c57287b4852ae6e3c746478c1b1a98ee62d5021a8580c0245231078b806eed5e6857e71ed2935788552f6fc2565506c21ae336dd89b8b70a2
 AUX imapfilter-2.7.5-libressl.patch 806 BLAKE2B 4b0b40913d047f39b2faf23ebde782d5b34bf11f7e25243ea021c792d6a6854565e2df9924cd73b705d65a98dbe411677321dd848a11e929d8e32ada69937033 SHA512 ace3a8631dd23350a6a918bb2cd54d8eb3b9204c2f07d9fc64668216d0071a1acad76d2628936e0ac4a0b6e3ccc16299f17a8c833e866c3f346c27365a368051
-DIST imapfilter-2.6.16.tar.gz 59636 BLAKE2B 9de58800ab88aa6e22ead001fd4e635b1991d23a2345d729a59438d3774148b1478b561c36848af155da7d15e84afdf900b73054ef268243f333843b71417d1e SHA512 0500931143e593eb69357ef6a6a40be971abadd22d7e807685b88927da8db9a928470f5cad460252b95ccd42efcfd39b5c4001a8796fa79cbd35018405a7be19
 DIST imapfilter-2.7.5.tar.gz 59441 BLAKE2B 0326a698f3be18da47c99cbe20e5e51cde8abcaebf365b3f00e5b1dba6bfaed5139b65766bd447dc596736da504063d5c87c21d1c5c11d6bc7ebd947d9d44835 SHA512 a64747d745ecd5a2f61d486cd8fec1bceeb97ce459ec57454311a960dbfce526c15e8bddeb16860b8efd9710de93845adec61ec892355a0bef7bddc4517e1442
-EBUILD imapfilter-2.6.16-r100.ebuild 1088 BLAKE2B bd0dc6e83f3071dc1073ebc526cedbfb1234b40ffcbc42cf211f1cb76d0c9d514863c853f0e1b8fcd16510eaaed4b23a10bfadd4ce937ba0e502469fb4f67c65 SHA512 fae6481578765b345f29cda7ce90b6e1c410d6b73135d206ed3a5548dc7c08db34b00f82db9c26e24c2551d5a8c06ee4e0b1775183b6998415a6b073d7b56a2f
-EBUILD imapfilter-2.7.5.ebuild 1082 BLAKE2B 690d68059207515a33ef73b4b09197c12b5503efdb1ca694af05313145d02247ce38fd31f55aa78fec1aa4c794caacb1bbe388e8559cc948570087e70ec2b84a SHA512 6811135be7ce4febfb85719713de25c22633529542ba431e9f5d8b0110ce42632369ab8cf1c5db75ab81649a47cdae83c2e3e5acd49658b4b230dd630cbff79a
+EBUILD imapfilter-2.7.5.ebuild 1079 BLAKE2B 24f9fe64701889bb8484d1fcc62f849e419fa2cf33704380d3688c28ff78d656a88f4da61380ec2c1f2460f1f593abe87cbc9883c5c6cdc83a50e875954e13c1 SHA512 8d7c7e2b891b94b42869ef173313a384a41136db3d099a8c663ef44f19c5423fa944afd4a87553231128886d71e615668b3f6f0fb3e3e08b08b9d785f8e33d14
 MISC metadata.xml 249 BLAKE2B 8f4404564610b1fc4705b073c963909d882aa72717e386d0ddaa11f4a58ea4fedb0505711baf498cb59107d8486b890eb337d56fad641a0c656d4553fc0139fd SHA512 8fb3a6309758c23abad3fd09a007212a6f5c0beb6d03d3c7d94f5fc8b8818d5cbddd55ef8fbe25700eb11dce04486295ddcc413a3fe568b5ba620b0b5fe0b0a6
diff --git a/mail-filter/imapfilter/imapfilter-2.6.16-r100.ebuild b/mail-filter/imapfilter/imapfilter-2.6.16-r100.ebuild
deleted file mode 100644
index 8fd41a2ad96c..000000000000
--- a/mail-filter/imapfilter/imapfilter-2.6.16-r100.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..3} )
-
-inherit lua-single toolchain-funcs
-
-DESCRIPTION="An IMAP mail filtering utility"
-HOMEPAGE="https://github.com/lefcha/imapfilter"
-SRC_URI="https://github.com/lefcha/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-IUSE="libressl"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	dev-libs/libpcre
-	${LUA_DEPS}"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS NEWS README samples/*"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.6.16-libressl.patch
-)
-
-src_prepare() {
-	default
-	sed -i -e "/^PREFIX/s:/usr/local:${EPREFIX}/usr:" \
-		-e "/^MANDIR/s:man:share/man:" \
-		-e "/^CFLAGS/s:CFLAGS =:CFLAGS +=:" \
-		-e "/^CFLAGS/s/-O//" \
-		src/Makefile || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		LDFLAGS="${LDFLAGS}" \
-		INCDIRS=$(lua_get_CFLAGS) \
-		LIBLUA=$(lua_get_LIBS)
-}
-
-src_install() {
-	default
-	doman doc/imapfilter.1 doc/imapfilter_config.5
-}
diff --git a/mail-filter/imapfilter/imapfilter-2.7.5.ebuild b/mail-filter/imapfilter/imapfilter-2.7.5.ebuild
index b894e8eda7c2..7961612d5b7c 100644
--- a/mail-filter/imapfilter/imapfilter-2.7.5.ebuild
+++ b/mail-filter/imapfilter/imapfilter-2.7.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/lefcha/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 IUSE="libressl"
 
diff --git a/mail-filter/postgrey/Manifest b/mail-filter/postgrey/Manifest
index 516b61c2eef3..7661e86a8ac3 100644
--- a/mail-filter/postgrey/Manifest
+++ b/mail-filter/postgrey/Manifest
@@ -2,5 +2,5 @@ AUX postgrey-1.34-r3.rc.new 2373 BLAKE2B 6f7a1197735b710fbb23fd49acb1fc9a9b743e7
 AUX postgrey.conf.new 1914 BLAKE2B 826949afe4a8a7bbfe9dec493fd619b91235945420bbd5e4c70709aff23a7393277c88edac1b1f149ea34b4fdfce4649715a97b38052d3e2c360716439bf6489 SHA512 07c7bf82fa24486a62701238bc3684e7ed445bceeb54c842eba39b0d83732b704954247978784142ecf20329352dbe698ba2d9a76576d5082315a314278a6740
 AUX postgrey.service 345 BLAKE2B 4ca6ab7a5649ea49fe69128b64111113301ab891f3de9f2d433e40eca14d178dcb992f70802cc73d003e7903fc3edcb53242c656b9208fdd0aaef2562577d522 SHA512 f5f92cae916a8000da460c0c5bd2194b49518cf2bdadf7f6c4512a29dbee73b4a75d530ed0d2049ac46103235246b5b3b88e55216c9ed1a012ed306a4bf7d58c
 DIST postgrey-1.37_p20190625.tar.gz 124667 BLAKE2B ca2caba51a72198e42d6d4d9c5c7590b62c1bd1589d05bfb4096fb4d95ff62ff96976beac8c1b35136a4a6830af936244485ff7dcdcd46d8558a4bef0bbb123a SHA512 f3caf3c7663bd8784701c7e1ad45d1c577edf6fac14591a6983fda25e7f8a875f2501780a8f97ce72e6a324878404e9ac2a003a07ae07ad4debae61fe734b8d4
-EBUILD postgrey-1.37_p20190625-r1.ebuild 1720 BLAKE2B 584b89bb73658812f8a357a1a25942c6cb8d978d01b4230f9a40ba6dda6dd541bc4de47ee4ac3cba2cdb354eb7e21b6c8ff244f6a1e8dcf8350ce93400df9dd6 SHA512 3968b7226e218dfc215a404f8f8058fc7a7c87b6bb157c9d694cae51b5006ac03ca33cd05a5ccb0433849ba1a2fc560abd5cfff3e4545f84640f238c27d6d119
+EBUILD postgrey-1.37_p20190625-r1.ebuild 1721 BLAKE2B 828354b7312a41c984241bd754cdab028bc8e70cb688bae42f36d47700aaea1fe2042a0e1d54f516530904b92e65ef2cddac193d9f8a7bde4e306223937dd143 SHA512 45d25ac6bd738cd288ff215fb34258c0b8552dab81c5b812769adb12cecb0a62a3a618e7b437732e5a9e5579a934f70c0ff964e0657f3637a1b29eeb26e75965
 MISC metadata.xml 470 BLAKE2B 28f461f109f6883bd605e86a4e13436960db61cdc30467545a0a3826fa5f5282af1d73806288845474c87aaed616a83f9e77a5d264cde6dd07b2c8d9cdde0bba SHA512 9dec84c40a4b8705b458687fbd1d8300531bc77975f96be5e94ad251c8df2b2d1f20a08d4082f228353ee98cbf4f691b778d5bfdb9faa89ea1b3dd68b71fd331
diff --git a/mail-filter/postgrey/postgrey-1.37_p20190625-r1.ebuild b/mail-filter/postgrey/postgrey-1.37_p20190625-r1.ebuild
index 37d56b8a5b0b..6caabd8454a1 100644
--- a/mail-filter/postgrey/postgrey-1.37_p20190625-r1.ebuild
+++ b/mail-filter/postgrey/postgrey-1.37_p20190625-r1.ebuild
@@ -7,7 +7,7 @@ inherit systemd
 
 COMMIT="eb420c5dee57dd54e6f63bad5d74e85f5cc9535d"
 DESCRIPTION="Postgrey is a Postfix policy server implementing greylisting"
-HOMEPAGE="http://postgrey.schweikert.ch/"
+HOMEPAGE="https://postgrey.schweikert.ch/"
 SRC_URI="https://github.com/schweikert/postgrey/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${PN}-${COMMIT}"