gentoo resync : 05.12.2021

6 files changed, 82 insertions, 5 deletions

diff --git a/mail-filter/spampd/Manifest b/mail-filter/spampd/Manifest
index 69deacea8d82..faf67247f8ad 100644
--- a/mail-filter/spampd/Manifest
+++ b/mail-filter/spampd/Manifest
@@ -1,6 +1,11 @@
 AUX conf 665 BLAKE2B 21638b47bcd8f90b5521c131aae983ec7ceb51fc470eb991f5fe1b670d267efc0314b787e8e6f094b793a08239717d0d183766a676b127320a59037ccd718c7b SHA512 f184a784261923b8e36279c5cca24783812617220d266f5f16f15e83e2e2f3b0f9c1b9a82b9b3ac7d297b28a15af78d858f9f250757171187e6ff2c885a3b741
-AUX init 526 BLAKE2B 9b78b45417c996f9e533d151a5c7f7677857715c0f05ed586088fd4a9796a4442fad06ae1b8ed53deb3adc880fc985519a22fe513abbea1f57b581d6d1dc92f5 SHA512 bae9152a51e07f702649b64f0d44b12d115242dd9b44bc12b2695647eaedd635180d6cff31c26a203df7ce0ae7623db274c64d2c3eb80258aa0c6a92f31cb55f
+AUX init 541 BLAKE2B c642ca0ccfa1518471a2138ba024ff7289c45907c0afa05c23808ab4180db58281a26ac9e058776ed540ce2ef3006d00119fc408248884a7177b556907130f8f SHA512 751d763683c9a9fa7323be9cefdd09414b0bf2972d3b5e275e24675bc458dca5ea64c059edaf0ecafa83a18e1ade23ac0d808cb34e812addc67273c18b217dc3
 AUX init-r1 521 BLAKE2B 42b31324c1b9a3226429aaa58af1d19f280b09ab40c21769de401f533b7436df21bdada171de43b0888ebd83fbfbbb29227523ed2f608d696c0c0d8335dccd07 SHA512 fc32a28811b9d7f0d6f6d3d53b10df1b49b8ec68aaa058f5309809aa4c1e4ac17b5823b3b0f46b0823297b00548c45acff54acdb9c5f8e612260462fde2f8d72
+AUX spampd-2.61-no-pid-file.patch 457 BLAKE2B 12783c433d04ac6799799c95a18d069daad6a0b0e68d41fda4b8a714da68ae648362194136110f70b5f5e144e9e7d916164062eb367991f60d66d7071113a8bb SHA512 a9e57ab781e91a61e25a0b985060aff443c9650ee3688c6d7210a5bc658c6a1953d3c4f87b9742cd367b9c643486808cbb5ba94c9e44c2b62df369af6006ddfa
+AUX spampd.service 249 BLAKE2B 54417bbe22213fbdcf66a242d2eebe09a2e5cd5ab2dd739b4d1ff26ab091c4a4ede85517a4daf1f39df77dddcf5e503b8a3d643faccb920ab96d6f805826b24a SHA512 c36213a5b446329cb30e480af7fd594235fe5918e6f4b398b79d2eec5d6f72a4f93a9f12feae3bf343edc363e8138359f7c3e2e5dd8bcba66fe34ac2af5c25d6
+AUX spampd.service.conf 138 BLAKE2B dc636d87ce96d5db36702400b80f6dadb95e4ac4317b8587f5738fb39d7935343f9bf82bee836bb0fefed63f300fc449baa923e9be98f6a2325399547804f65f SHA512 f6b563daadf9890aee13a46ab79fe47cc6b7f337e7f4a8259620c051472bcf245436647ad86b8f019be3afeb4effb6d6d15ebae564267cef790a1bf53366e183
 DIST spampd-2.42.tar.gz 202504 BLAKE2B 9ad74d3199345ba54c613fa928cfd177fded551ca304dd22c802b996b95e2905d40d92bfa25d7c64b823b2357c657f283c9550b635f3188fbbb42fb793cd2b8d SHA512 5c44b5902efd6c628fb62887b755012b137940d7d687f5d9489e5f96623d6eeca5f3641a76fe3b2ce8585040c3661e19df981c612cdb1a767b4a46fec982fa4e
+DIST spampd-2.61.tar.gz 246956 BLAKE2B de2b428fbed80ba6d65bd2b249a3adfb00cd0a33df21b71676da1949b680dbfee72412ae2c752f4e5dcf9f7f7349ae59ce94f81b2abae5fd4de34d3a92954fbb SHA512 e2f84c4b24648d4f4db70174f04b72981faa1c54ffc4bbc433d14c730ef4ad7fd4cd3772a476f25be0bee103e951700d038634d14848f1eb90849d1a6655199b
 EBUILD spampd-2.42.ebuild 691 BLAKE2B 71619b66a3da13bcaa64c98649f2cc3e4437273ebe0ecae7c4781383bd59b52e896b2dfa6f9882d39e09924cdececcc81da0b3fe8f7491bc8369c97666b64d6c SHA512 aebd63988be67bd3a989e0094d49997267a4ead02ec17eaad97d940f017dbee911e71660fa9f209a13a0846e9c759e1074d3f0427d5d320836f26e622f6264be
+EBUILD spampd-2.61.ebuild 1005 BLAKE2B 5ab5ba9ceae0e1cbe4ce0659646c6bd7c511ffa4b094c287d5cd00d01550d0ff184cd377515949857fbae852cd135d79c4e34531abb4c66f605fe05067bb52cf SHA512 099fdf40c8f6e8ca16179062676d3fd65955ed7b3a8d6df6da3ad514d8c4d99ef4117b41fac3f22c594970e1ba15ac9694cd399d53377bde51906abc4a5d6f87
 MISC metadata.xml 248 BLAKE2B f428f5f2f65de66d56a844d3a708834fec83b4299b30ad3d0f3a1c47b3784f7a249af8bf38bfd7743694e4102c990a646fd4f27ea0e0d955efba39ec7b86715e SHA512 b629842dc09e477b307a2627300c4e91c5613430c80396abfdcefb6f4c9a08cc6ee4b044d1ea4cf53e2e2d711a7123f74b9d38c871d96d18f7214ecfdbda322e
diff --git a/mail-filter/spampd/files/init b/mail-filter/spampd/files/init
index 7a5171e46034..339a938d9c7d 100644
--- a/mail-filter/spampd/files/init
+++ b/mail-filter/spampd/files/init
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Note: spampd configuration file is /etc/conf.d/spampd
@@ -10,14 +10,14 @@ depend() {
 
 start() {
 	ebegin "Starting spampd"
-	start-stop-daemon --start --quiet \
-		--exec /usr/sbin/spampd -- --pid=/var/run/spampd.pid \
+	start-stop-daemon --start --quiet --interpreted \
+		--exec /usr/sbin/spampd -- --pid=/run/spampd.pid \
 			${SPAMPD_OPTS}
 	eend $? "Failed to start spampd"
 }
 
 stop() {
 	ebegin "Stopping spampd"
-	start-stop-daemon --stop --quiet --pidfile /var/run/spampd.pid
+	start-stop-daemon --stop --quiet  --retry 60 --pidfile /run/spampd.pid
 	eend $? "Failed to stop spampd"
 }
diff --git a/mail-filter/spampd/files/spampd-2.61-no-pid-file.patch b/mail-filter/spampd/files/spampd-2.61-no-pid-file.patch
new file mode 100644
index 000000000000..b5151e11f8a5
--- /dev/null
+++ b/mail-filter/spampd/files/spampd-2.61-no-pid-file.patch
@@ -0,0 +1,11 @@
+diff -ruN spampd-2.61-v/spampd.pl spampd-2.61/spampd.pl
+--- spampd-2.61-v/spampd.pl	2021-08-07 06:01:37.000000000 +1000
++++ spampd-2.61/spampd.pl	2021-08-13 03:48:34.527166029 +1000
+@@ -761,6 +761,7 @@
+ 
+   # Set misc. options based on other options.
+   $srv_p->{setsid}= 0 if !$srv_p->{background};
++  $srv_p->{pid_file} = undef if !$srv_p->{background};
+   $sa_p->{home_dir_for_helpers} = $sa_p->{userstate_dir};
+   $sa_p->{username} = $srv_p->{user};
+ }
diff --git a/mail-filter/spampd/files/spampd.service b/mail-filter/spampd/files/spampd.service
new file mode 100644
index 000000000000..78ef5520323c
--- /dev/null
+++ b/mail-filter/spampd/files/spampd.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=SpamAssassin Proxy Daemon
+Before=mail-transfer-agent.target
+After=syslog.target network.target
+
+[Service]
+ExecStart=/usr/sbin/spampd --nodetach $SPAMPD_OPTS
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
diff --git a/mail-filter/spampd/files/spampd.service.conf b/mail-filter/spampd/files/spampd.service.conf
new file mode 100644
index 000000000000..1c2d9c1154e1
--- /dev/null
+++ b/mail-filter/spampd/files/spampd.service.conf
@@ -0,0 +1,5 @@
+[Service]
+User=mail
+Group=mail
+Environment="SPAMPD_OPTS=--host=localhost:10025 --relayhost=localhost:10026 --tagall --set-envelope-from"
+
diff --git a/mail-filter/spampd/spampd-2.61.ebuild b/mail-filter/spampd/spampd-2.61.ebuild
new file mode 100644
index 000000000000..347362e06dc9
--- /dev/null
+++ b/mail-filter/spampd/spampd-2.61.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+DESCRIPTION="A program to scan messages for Unsolicited Commercial E-mail content"
+HOMEPAGE="http://www.worlddesign.com/index.cfm/rd/mta/spampd.htm https://github.com/mpaperno/spampd"
+SRC_URI="https://github.com/mpaperno/spampd/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="acct-group/mail
+	acct-user/mail
+	dev-lang/perl
+	dev-perl/Net-Server
+	mail-filter/spamassassin
+	virtual/perl-IO-Socket-IP"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/perl"
+
+PATCHES=(
+	"${FILESDIR}/${P}-no-pid-file.patch"
+)
+
+src_compile() {
+	mv ${PN}.pl ${PN} || die
+	pod2man ${PN}.pod > ${PN}.1 || die
+}
+
+src_install() {
+	dosbin ${PN}
+
+	dodoc changelog.txt
+	doman ${PN}.1
+
+	newinitd "${FILESDIR}"/init spampd
+	newconfd "${FILESDIR}"/conf spampd
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
+}