gentoo resync : 13.11.2021

7 files changed, 137 insertions, 13 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index c3e667a1c43c..d2b55e42a7e4 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/dkimproxy/Manifest b/mail-filter/dkimproxy/Manifest
index c67d06827956..a8193dee6ad2 100644
--- a/mail-filter/dkimproxy/Manifest
+++ b/mail-filter/dkimproxy/Manifest
@@ -1,5 +1,5 @@
 AUX dkimproxy.in.initd 555 BLAKE2B 5b82c293f2a6788c534b7a5540deff2fb209297ed7883247d94316e1419de77cd5d428d49145342fd70afc5eafaad6e3c7da088ba64751c2f9203c8e4f31fed6 SHA512 fe91a571fcb82a14f4827b75011ce0209070b9bb1b1ed1dd09c26e4bc60d3e34cc4e96ee8000167d1d5d2a041956d8c86cd12c195c2b87cb19378ac18a5cd9cf
 AUX dkimproxy.out.initd 563 BLAKE2B 0baf74f0bb222a4003598fb71bfa1584b2fb0faf91f862173c117c2967745cf5ec0b5d8b41b50cd6ee865796d6a55a090d06c0546b7eaf839c3fe016241b2100 SHA512 77684fe2c41c2f60e1a11ba96a70d54a345707667983ec01585fd0dfa6ccc314a698310e04069bc7fa66fbf7e70cd9842b6d9d16c7f7eac4fa499040055bcc4f
 DIST dkimproxy-1.4.1.tar.gz 109040 BLAKE2B ced9f75c7fd126e85f947aeec69b7dbb2d2dab7be080b187e7e69d1fc1f538145a2499763418e7d7518e9394edc35ece1525c7083ec71149cb2c0701191fac84 SHA512 ad5ac961ea25cdd7ccc763521d1fa5e143ef93056ca4bdace1d0d8f564ab85cb128b4c97ace310bcbf9e4d49430dd5baf1e9f836f5a44a4b3f1e7498ebc352b6
-EBUILD dkimproxy-1.4.1.ebuild 599 BLAKE2B 8d296bc0d319eab2f404df2446c011907734734f1d796394c41734f9e64223837af7953801c22113a15cd9400ae097c861b8a8901cece1259eb462bf5fbaa638 SHA512 3329859d64f6dbe09c16840532e726de529b51626384032351aedbff860ae015134426a7a18052018694d133278b6623f5b6844cb2f9a7e2a043aa800f584354
+EBUILD dkimproxy-1.4.1.ebuild 580 BLAKE2B 4c825d9d8cb4363733cc5aa40b86e867a9c5379287ecb2d84ea64d5ecd4b74be7569ff2e48f2ff6e117b8256db34cb08a73c8f1e82210b25f3b0a1d8c3fcc759 SHA512 da7e4895120b7a2c5dbc64f77ffee1c11858c04d6cd5a78d446fa7ce2620293df2b6006d18490a22fccbb5650516086ff47c3a0903911a106038081f9533f701
 MISC metadata.xml 330 BLAKE2B 9ffebd3893aadd8dc2e89c5f5605fb4d0a16595d5acbeeb6ca97eba3ad566a6dd300dcf3a91e125183cbe1d79dbcdcdf227286e2814f099b25273dd4e7d289ea SHA512 c234536a6f62acee71ccfe1109e32986cb00c9668eb487c8cc2b7d5cbbd6db235d36f23d7199d8ac32e750e6e7da6c367b9997062ec64c62b8df4211e7c13117
diff --git a/mail-filter/dkimproxy/dkimproxy-1.4.1.ebuild b/mail-filter/dkimproxy/dkimproxy-1.4.1.ebuild
index 264fba2d8034..90d488b6b245 100644
--- a/mail-filter/dkimproxy/dkimproxy-1.4.1.ebuild
+++ b/mail-filter/dkimproxy/dkimproxy-1.4.1.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit eutils
+EAPI=8
 
 DESCRIPTION="An SMTP proxy server for adding DKIM headers"
 HOMEPAGE="http://dkimproxy.sourceforge.net"
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 978dc9abddfc..23b018effb37 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -12,7 +12,9 @@ AUX rspamd.conf 908 BLAKE2B 9d8c310c00990f47012e9d1710fbb7567ae5b0e92a411d3fb269
 AUX rspamd.tmpfile 33 BLAKE2B 3ce0f8ab29a2ca259023f90b12799d8c7f0f099a98ef1eb4abe3b3d3e6046d362dae9efc723dd675dff8f1c1df9d05c09e539fcd251382cd9fc5e92351ece8a9 SHA512 1c7e6b79a05cdf9a886c6e233417a0d7b398a1e27ddd3b19c3a595afd50e502a7fd7c09a3499cb9fe6e0291b8493d150550b094c8bf6e2221b71915239c72ef8
 DIST rspamd-2.7.tar.gz 5126227 BLAKE2B 70f57dba6ac9abe93d735d42e84bd17a1797035322029577a8e4376409bcee5345d4624925d3dd071bddce038858ebfdce8ee4f87f81b1fc8b1f71ad14e85930 SHA512 8779771baf85ef6ca1d7d2180429072ab1547ab834b073ee9222dcc6494efdd0a23f5e7ac52a777c23fd89296769f5b6f182593e714097c6f11ca7c9165e4ba7
 DIST rspamd-3.0.tar.gz 5535659 BLAKE2B 605ac59b947b49efb026e04d153df5fc0d56c65712def3f2c54a949db32b8534e634d172a1899cc08e98e0a9da839fc00f0f569dc8c52a743f38bd71b8abaeaa SHA512 1ea6f9ffe58b7f280dbd31e39db6412ebeddda634ca8a669fa5bff2951d17123a5d4a09ec0f366c6b0c0b585f868e646fd49e4d45bd451408675b927ec2557c4
+DIST rspamd-3.1.tar.gz 5566920 BLAKE2B dfb31534e7dbce303729e89537f83eea90d6524a0ccf81633e0d55840f21936985ba5991f2a2ed9ca5594a4a3938f9366f7a1879fc553f41ab52bb89460b87dc SHA512 3c3c06c10d3dfc90e4bc92c7ebaff4bd4854d3b0e56d6476f0223918c4a52f4cc7a8b381b1f867164199ee18ea00eda77ae0315925f3fd71596d610200667178
 EBUILD rspamd-2.7-r103.ebuild 2680 BLAKE2B 75275dd49ac5b6b2f33a53e54934025f0341df190efe6c66034e54377ece549a6fb0c93accac6ca54b543b78b3b600a3ad1a8e75ac1d3677a4688344ecd733d8 SHA512 1be59df83281b02c14cf24a4b13fc841e9dbc0a7e2218807ee3394dfaccc9b73001208dfe22dc88abf2073c6c6b3acf61937627b765a82e71eaad8d8c6054eab
 EBUILD rspamd-3.0-r3.ebuild 2971 BLAKE2B e610fb708f188a34b774743e41ad0bd921d78a143a2142b4743828ad2edd493baee0a819fd3df9328836d371c5c2da64269c0e3ec6c3d7b659396af6473b0e38 SHA512 d2cdd8c91c98c58a7bb73a1493f0d76684817678d01ad5a856c77863b429db4578c32739a49009d4815182940d40d9a2fcfbe3ec98a9edb56769578506d79d45
+EBUILD rspamd-3.1.ebuild 2851 BLAKE2B 98c4585f0676de1b818c4d2297c0f677fa7f99bec09296c8c6061928939ccca730ff080c9a7be84ac693f383f48339faf04c2566cdca6098cf2bed51d8e4f44c SHA512 ece9fa974ac682edaa3bedc42218cb43e4b1ab1348a9b8a31c0c47677d02c5d3a230676310d4406526c2a830e5fb9482297c1db6dd05bf6e8dd20d551b166d08
 EBUILD rspamd-9999.ebuild 2851 BLAKE2B 98c4585f0676de1b818c4d2297c0f677fa7f99bec09296c8c6061928939ccca730ff080c9a7be84ac693f383f48339faf04c2566cdca6098cf2bed51d8e4f44c SHA512 ece9fa974ac682edaa3bedc42218cb43e4b1ab1348a9b8a31c0c47677d02c5d3a230676310d4406526c2a830e5fb9482297c1db6dd05bf6e8dd20d551b166d08
 MISC metadata.xml 684 BLAKE2B d8307b970c2c3b029911bfca2d5949742acab13dc35b49c4bb3f8f13bb9e39edd00aad743dcdbbb1b07db3929dba1c32d04ccfcfd20613878dab81f84afc48da SHA512 a7efd262772d7323ae07d94738b3871ff3fd2ca89711a0950d1e4f1c80b228d6ea42df64bace80a6fd2e9786ae5fe4c760560556e9dc2a5deb6b4e36dd48024c
diff --git a/mail-filter/rspamd/rspamd-3.1.ebuild b/mail-filter/rspamd/rspamd-3.1.ebuild
new file mode 100644
index 000000000000..df5d75abfd0e
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-3.1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit cmake lua-single pax-utils systemd tmpfiles
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/rspamd/rspamd.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Rapid spam filtering system"
+HOMEPAGE="https://rspamd.com https://github.com/rspamd/rspamd"
+LICENSE="Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain unicode ZLIB"
+SLOT="0"
+IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit pcre2 test"
+RESTRICT="!test? ( test )"
+
+# A part of tests use ffi luajit extension
+REQUIRED_USE="${LUA_REQUIRED_USE}
+	jit? ( lua_single_target_luajit )
+	test? ( lua_single_target_luajit )"
+
+RDEPEND="${LUA_DEPS}
+	$(lua_gen_cond_dep '
+		dev-lua/LuaBitOp[${LUA_USEDEP}]
+	')
+	acct-group/rspamd
+	acct-user/rspamd
+	app-arch/zstd:=
+	dev-db/sqlite:3
+	dev-cpp/doctest
+	dev-libs/glib:2
+	dev-libs/icu:=
+	dev-libs/libev
+	dev-libs/libfmt:=
+	dev-libs/libsodium:=
+	dev-libs/snowball-stemmer:=
+	sys-apps/file
+	blas? (
+		virtual/blas
+		virtual/lapack
+	)
+	cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
+	jemalloc? ( dev-libs/jemalloc:= )
+	dev-libs/openssl:0=[-bindist(-)]
+	pcre2? ( dev-libs/libpcre2:=[jit=] )
+	!pcre2? ( dev-libs/libpcre[jit=] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/ragel
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/rspamd-3.0-cmake-lua-version.patch"
+	"${FILESDIR}/rspamd-2.6-unbundle-lua.patch"
+	"${FILESDIR}/rspamd-2.5-unbundle-snowball.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	rm -vrf contrib/{doctest,fmt,lua-bit,snowball,zstd} || die
+
+	sed -i -e 's/User=_rspamd/User=rspamd/g' \
+		rspamd.service \
+		|| die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCONFDIR=/etc/rspamd
+		-DRUNDIR=/var/run/rspamd
+		-DDBDIR=/var/lib/rspamd
+		-DLOGDIR=/var/log/rspamd
+
+		-DSYSTEM_DOCTEST=ON
+		-DSYSTEM_FMT=ON
+		-DSYSTEM_ZSTD=ON
+
+		-DENABLE_BLAS=$(usex blas ON OFF)
+		-DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
+		-DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
+		-DENABLE_LUAJIT=$(usex lua_single_target_luajit ON OFF)
+		-DENABLE_PCRE2=$(usex pcre2 ON OFF)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_build run-test
+}
+
+src_install() {
+	cmake_src_install
+
+	newconfd "${FILESDIR}"/rspamd.conf rspamd
+	newinitd "${FILESDIR}/rspamd-r7.init" rspamd
+	systemd_newunit rspamd.service rspamd.service
+
+	newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
+
+	# Remove mprotect for JIT support
+	if use lua_single_target_luajit; then
+		pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-*
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/rspamd-r1.logrotate rspamd
+
+	diropts -o rspamd -g rspamd
+	keepdir /var/{lib,log}/rspamd
+}
+
+pkg_postinst() {
+	tmpfiles_process "${PN}.conf"
+}
diff --git a/mail-filter/spampd/Manifest b/mail-filter/spampd/Manifest
index e92542741f22..69deacea8d82 100644
--- a/mail-filter/spampd/Manifest
+++ b/mail-filter/spampd/Manifest
@@ -2,5 +2,5 @@ AUX conf 665 BLAKE2B 21638b47bcd8f90b5521c131aae983ec7ceb51fc470eb991f5fe1b670d2
 AUX init 526 BLAKE2B 9b78b45417c996f9e533d151a5c7f7677857715c0f05ed586088fd4a9796a4442fad06ae1b8ed53deb3adc880fc985519a22fe513abbea1f57b581d6d1dc92f5 SHA512 bae9152a51e07f702649b64f0d44b12d115242dd9b44bc12b2695647eaedd635180d6cff31c26a203df7ce0ae7623db274c64d2c3eb80258aa0c6a92f31cb55f
 AUX init-r1 521 BLAKE2B 42b31324c1b9a3226429aaa58af1d19f280b09ab40c21769de401f533b7436df21bdada171de43b0888ebd83fbfbbb29227523ed2f608d696c0c0d8335dccd07 SHA512 fc32a28811b9d7f0d6f6d3d53b10df1b49b8ec68aaa058f5309809aa4c1e4ac17b5823b3b0f46b0823297b00548c45acff54acdb9c5f8e612260462fde2f8d72
 DIST spampd-2.42.tar.gz 202504 BLAKE2B 9ad74d3199345ba54c613fa928cfd177fded551ca304dd22c802b996b95e2905d40d92bfa25d7c64b823b2357c657f283c9550b635f3188fbbb42fb793cd2b8d SHA512 5c44b5902efd6c628fb62887b755012b137940d7d687f5d9489e5f96623d6eeca5f3641a76fe3b2ce8585040c3661e19df981c612cdb1a767b4a46fec982fa4e
-EBUILD spampd-2.42.ebuild 705 BLAKE2B fcf41d55115965a29547438c7f05d8dc6e86a086fb09c84bafe7f2a07496a7ecd312222548ae98a9839a443fa842013bf677216c80ef3868e6d38e2c244b9562 SHA512 1f5e4b9370233a5c1b405a46bd4d97a17a20421cc18a2cfd9b977d78807e5514e42651942de7aa12222156ce79dc58acfd9d5988fc30c450448759b4f6071287
+EBUILD spampd-2.42.ebuild 691 BLAKE2B 71619b66a3da13bcaa64c98649f2cc3e4437273ebe0ecae7c4781383bd59b52e896b2dfa6f9882d39e09924cdececcc81da0b3fe8f7491bc8369c97666b64d6c SHA512 aebd63988be67bd3a989e0094d49997267a4ead02ec17eaad97d940f017dbee911e71660fa9f209a13a0846e9c759e1074d3f0427d5d320836f26e622f6264be
 MISC metadata.xml 248 BLAKE2B f428f5f2f65de66d56a844d3a708834fec83b4299b30ad3d0f3a1c47b3784f7a249af8bf38bfd7743694e4102c990a646fd4f27ea0e0d955efba39ec7b86715e SHA512 b629842dc09e477b307a2627300c4e91c5613430c80396abfdcefb6f4c9a08cc6ee4b044d1ea4cf53e2e2d711a7123f74b9d38c871d96d18f7214ecfdbda322e
diff --git a/mail-filter/spampd/spampd-2.42.ebuild b/mail-filter/spampd/spampd-2.42.ebuild
index 357e81734992..a31d8091448b 100644
--- a/mail-filter/spampd/spampd-2.42.ebuild
+++ b/mail-filter/spampd/spampd-2.42.ebuild
@@ -1,25 +1,25 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 DESCRIPTION="spampd is a program to scan messages for Unsolicited Commercial E-mail content"
 HOMEPAGE="http://www.worlddesign.com/index.cfm/rd/mta/spampd.htm"
 SRC_URI="https://github.com/mpaperno/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
 
-RDEPEND="dev-lang/perl
+DEPEND="
 	dev-perl/Net-Server
 	mail-filter/spamassassin"
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}
+	dev-lang/perl"
 
 src_install() {
 	dosbin spampd.pl
-	dodoc changelog.txt misc/spampd-rh-rc-script.sh misc/spampd.service
-	dohtml spampd.html
+	dodoc changelog.txt misc/spampd-rh-rc-script.sh misc/spampd.service spampd.html
 	newinitd "${FILESDIR}"/init-r1 spampd
 	newconfd "${FILESDIR}"/conf spampd
 }