[arch-commits] Commit in spamassassin/trunk (3 files)

[Florian Pritz]

    Date: Monday, February 16, 2015 @ 11:52:18
  Author: bluewind
Revision: 231608

upgpkg: spamassassin 3.4.0-4

Fix FS#43428; unnecessary options in service file

Modified:
  spamassassin/trunk/PKGBUILD
  spamassassin/trunk/spamassassin.install
  spamassassin/trunk/spamassassin.service

----------------------+
 PKGBUILD             |    4 ++--
 spamassassin.install |    6 ------
 spamassassin.service |    8 +++-----
 3 files changed, 5 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-02-15 22:01:50 UTC (rev 231607)
+++ PKGBUILD	2015-02-16 10:52:18 UTC (rev 231608)
@@ -4,7 +4,7 @@
 # Contributor: Manolis Tzanidakis
 pkgname=spamassassin
 pkgver=3.4.0
-pkgrel=3
+pkgrel=4
 pkgdesc="A mail filter to identify spam."
 arch=('i686' 'x86_64')
 license=('APACHE')
@@ -26,7 +26,7 @@
 validpgpkeys=(D8099BC79E17D7E49BC21E31FDE52F40F7D39814)
 md5sums=('5d0b50cee3bfa905cca35c33296c8c2a'
          'SKIP'
-         'd0ce5f8a02fd74dbc83632f4aaec6185'
+         '8adce028f25387ac3bc4dba697d209ed'
          '0bcf0419608ec4ac200e794563620f31')
 
 prepare() {

Modified: spamassassin.install
===================================================================
--- spamassassin.install	2015-02-15 22:01:50 UTC (rev 231607)
+++ spamassassin.install	2015-02-16 10:52:18 UTC (rev 231608)
@@ -30,9 +30,3 @@
 	true
 }
 
-pre_remove() {
-	getent passwd spamd &>/dev/null && userdel  spamd  >/dev/null
-	getent group spamd  &>/dev/null && groupdel spamd  >/dev/null
-	true
-}
-

Modified: spamassassin.service
===================================================================
--- spamassassin.service	2015-02-15 22:01:50 UTC (rev 231607)
+++ spamassassin.service	2015-02-16 10:52:18 UTC (rev 231608)
@@ -3,11 +3,9 @@
 After=syslog.target network.target
 
 [Service]
-Type=forking
-PIDFile=/var/run/spamd.pid
-ExecStart=/usr/bin/vendor_perl/spamd -d --pidfile /var/run/spamd.pid -c -c -x --virtual-config-dir=/var/lib/spamassassin -u spamd -g spamd
-StandardOutput=syslog
-StandardError=syslog
+ExecStart=/usr/bin/vendor_perl/spamd -x -u spamd -g spamd
+StandardOutput=null
+StandardError=null
 Restart=always
 
 [Install]