Date: Saturday, January 9, 2016 @ 17:48:55 Author: bluewind Revision: 155804
Fix FS#47676 - [spampd] Update spampd user home and PID file location upgpkg: spampd 2.30-11 Modified: spampd/trunk/PKGBUILD spampd/trunk/spampd.install spampd/trunk/spampd.service ----------------+ PKGBUILD | 7 +++++-- spampd.install | 10 ++++++---- spampd.service | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-01-09 16:22:09 UTC (rev 155803) +++ PKGBUILD 2016-01-09 16:48:55 UTC (rev 155804) @@ -1,7 +1,7 @@ # Maintainer: Florian "Bluewind" Pritz <f...@xssn.at> pkgname=spampd pkgver=2.30 -pkgrel=10 +pkgrel=11 pkgdesc="Spamassassin Proxy Daemon" arch=('any') url="http://www.worlddesign.com/index.cfm/rd/mta/spampd.htm" @@ -11,7 +11,7 @@ source=("http://www.worlddesign.com/Content/rd/mta/$pkgname/$pkgname-$pkgver.tar.gz" spampd.service perl-5.18-fixes.patch) md5sums=('742c6f2cb75db54e59d044a8ee40445f' - 'f29bea0766c07a18f6dc0a496a79e0ac' + '5bd4895da473e4e505956789de6b54d5' '55ea1067be9e70c60b708d355b085a0a') prepare() { @@ -32,6 +32,9 @@ install -Dm755 spampd "$pkgdir/usr/bin/spampd" install -Dm644 spampd.8.gz "$pkgdir/usr/share/man/man8/spampd.8.gz" install -Dm644 "$srcdir/spampd.service" "$pkgdir/usr/lib/systemd/system/spampd.service" + + mkdir -p "$pkgdir/usr/lib/tmpfiles.d" + printf "d /run/spampd 0700 spampd spampd -\n" > "$pkgdir/usr/lib/tmpfiles.d/spampd.conf" } # vim:set ts=2 sw=2 et: Modified: spampd.install =================================================================== --- spampd.install 2016-01-09 16:22:09 UTC (rev 155803) +++ spampd.install 2016-01-09 16:48:55 UTC (rev 155804) @@ -1,10 +1,12 @@ post_install() { - useradd -m -d /home/spampd -r spampd + post_upgrade "$1" } -post_remove() { - userdel spampd - echo "Remove /home/spampd if you don't want to keep spamassassin's data" >&2 +post_upgrade() { + if ! getent passwd spampd >/dev/null; then + useradd -m -d /var/lib/spampd -r spampd + fi + systemd-tmpfiles --create spampd.conf } # vim:set ts=2 sw=2 et: Modified: spampd.service =================================================================== --- spampd.service 2016-01-09 16:22:09 UTC (rev 155803) +++ spampd.service 2016-01-09 16:48:55 UTC (rev 155804) @@ -3,7 +3,7 @@ After=network.target [Service] -ExecStart=/usr/bin/spampd --port=10025 --relayhost=127.0.0.1:10026 --tagall --log-rules-hit --user spampd --group spampd --pid=/home/spampd/spampd.pid --nodetach +ExecStart=/usr/bin/spampd --port=10025 --relayhost=127.0.0.1:10026 --tagall --log-rules-hit --user spampd --group spampd --pid=/run/spampd/spampd.pid --nodetach PrivateTmp=true [Install]