[gentoo-commits] repo/gentoo:master commit in: mail-filter/spamassassin/, mail-filter/spamassassin/files/

["Michael Orlitzky" <mjo@gentoo.org>]

commit:     8509fc8bb4d887a0a5ebf685d04508824165b6cd
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 24 18:25:03 2017 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Thu Aug 24 18:26:32 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8509fc8b

mail-filter/spamassassin: new revision to fix the systemd service.

As part of bug 590346, I accidentally broke the systemd service file
by starting the service as spamd:spamd when it needs to bind to port
783. Even when the service is run in the foreground, it needs to be
started as root; it will then drop privileges if given the --username
and --groupname flags. The new service file gets this right, with
root owning the main process and spamd:spamd the children.

Thanks to Dan Goodliffe for the report and help debugging the issue.

Gentoo-Bug: 590346

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 .../files/{spamassassin.service-r2 => spamassassin.service-r3}        | 4 +---
 .../{spamassassin-3.4.1-r15.ebuild => spamassassin-3.4.1-r16.ebuild}  | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/mail-filter/spamassassin/files/spamassassin.service-r2 b/mail-filter/spamassassin/files/spamassassin.service-r3
similarity index 66%
rename from mail-filter/spamassassin/files/spamassassin.service-r2
rename to mail-filter/spamassassin/files/spamassassin.service-r3
index 80320571784..6bc74c46cc5 100644
--- a/mail-filter/spamassassin/files/spamassassin.service-r2
+++ b/mail-filter/spamassassin/files/spamassassin.service-r3
@@ -3,10 +3,8 @@ Description=Spamassassin daemon
 After=network.target
 
 [Service]
-ExecStart=/usr/sbin/spamd $SPAMD_OPTS
+ExecStart=/usr/sbin/spamd --username=spamd --groupname=spamd $SPAMD_OPTS
 ExecReload=/bin/kill -HUP $MAINPID
-User=spamd
-Group=spamd
 
 [Install]
 WantedBy=multi-user.target

diff --git a/mail-filter/spamassassin/spamassassin-3.4.1-r15.ebuild b/mail-filter/spamassassin/spamassassin-3.4.1-r16.ebuild
similarity index 99%
rename from mail-filter/spamassassin/spamassassin-3.4.1-r15.ebuild
rename to mail-filter/spamassassin/spamassassin-3.4.1-r16.ebuild
index 47d77f361f7..3273f6b1706 100644
--- a/mail-filter/spamassassin/spamassassin-3.4.1-r15.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.4.1-r16.ebuild
@@ -158,7 +158,7 @@ src_install () {
 	newinitd "${FILESDIR}/3.4.1-spamd.init-r1" spamd
 	newconfd "${FILESDIR}/3.4.1-spamd.conf" spamd
 
-	systemd_newunit "${FILESDIR}/${PN}.service-r2" "${PN}.service"
+	systemd_newunit "${FILESDIR}/${PN}.service-r3" "${PN}.service"
 	systemd_install_serviced "${FILESDIR}/${PN}.service.conf-r1" \
 							 "${PN}.service"