From 2771f79232c273bc2a57d23bf335dd81ccf6af28 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sun, 5 Dec 2021 02:47:11 +0000
Subject: gentoo resync : 05.12.2021

---
 mail-filter/spampd/files/init                          |  8 ++++----
 mail-filter/spampd/files/spampd-2.61-no-pid-file.patch | 11 +++++++++++
 mail-filter/spampd/files/spampd.service                | 11 +++++++++++
 mail-filter/spampd/files/spampd.service.conf           |  5 +++++
 4 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 mail-filter/spampd/files/spampd-2.61-no-pid-file.patch
 create mode 100644 mail-filter/spampd/files/spampd.service
 create mode 100644 mail-filter/spampd/files/spampd.service.conf

(limited to 'mail-filter/spampd/files')

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"
+
-- 
cgit v1.2.3