Mon May 13 01:16:27 PDT 2013

3 files changed, 4 insertions, 65 deletions

diff --git a/extra/spamassassin/PKGBUILD b/extra/spamassassin/PKGBUILD
index 9e80adbea..8782d5e5d 100644
--- a/extra/spamassassin/PKGBUILD
+++ b/extra/spamassassin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 169317 2012-10-19 09:03:47Z bluewind $
+# $Id: PKGBUILD 185272 2013-05-12 17:03:55Z bluewind $
 # Maintainer: Florian Pritz <bluewind@xinu.at>
 # Contributor: Dale Blount <dale@archlinux.org>
 # Contributor: Manolis Tzanidakis
 pkgname=spamassassin
 pkgver=3.3.2
-pkgrel=7
+pkgrel=8
 pkgdesc="A mail filter to identify spam."
 arch=('i686' 'x86_64')
 license=('APACHE')
@@ -14,8 +14,7 @@ depends=('openssl' 'zlib' 're2c' 'perl-net-dns' 'perl-io-socket-ssl'
          'perl-io-socket-inet6' 'perl-mail-dkim' 'perl-crypt-ssleay')
 makedepends=('razor' 'perl-dbi') 
 optdepends=('razor: to identify collaborately-flagged spam')
-backup=('etc/conf.d/spamd' 
-        'etc/mail/spamassassin/local.cf'
+backup=('etc/mail/spamassassin/local.cf'
         'etc/mail/spamassassin/init.pre'
         'etc/mail/spamassassin/v310.pre'
         'etc/mail/spamassassin/v312.pre'
@@ -24,10 +23,8 @@ backup=('etc/conf.d/spamd'
 install="${pkgname}.install"
 options=('!emptydirs')
 source=("http://mirrors.devlib.org/apache/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz"
-        'spamd.conf.d' 'spamd' 'spamassassin.service')
+        'spamassassin.service')
 md5sums=('d1d62cc5c6eac57e88c4006d9633b81e'
-         'af501c6b0bb937a2775b747cc4b6d150'
-         '57545e6877503d897db21e9a2e8bd2b9'
          'ded3e012a4d502df001f2d97c495cc4e')
 
 build() {
@@ -55,7 +52,5 @@ package() {
   cd "${srcdir}/Mail-SpamAssassin-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
-  install -D -m644 "${srcdir}/spamd.conf.d" "${pkgdir}/etc/conf.d/spamd"
-  install -D -m755 "${srcdir}/spamd" "${pkgdir}/etc/rc.d/spamd"
   install -D -m644 "${srcdir}/spamassassin.service" "${pkgdir}/usr/lib/systemd/system/spamassassin.service"
 }
diff --git a/extra/spamassassin/spamd b/extra/spamassassin/spamd
deleted file mode 100644
index 3fb97566e..000000000
--- a/extra/spamassassin/spamd
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[ -f /etc/conf.d/spamd ] && . /etc/conf.d/spamd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PIDFILE=/var/run/spamd.pid
-if [ -f $PIDFILE ]; then
-  PID=$(cat $PIDFILE)
-else
-  PID=$(pidof -o %PPID /usr/bin/vendor_perl/spamd) #backward compat
-fi
-
-case "$1" in
-  start)
-    stat_busy "Starting spamd"
-    [ -z "$PID" ] && /usr/bin/vendor_perl/spamd -d -r "$PIDFILE" ${SPAMD_OPTS}
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon spamd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping spamd"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      # Some users report that a second attempt at stopping the process
-      # works.  So, take a little nap and give it another whirl...
-      sleep 2
-      kill $PID &> /dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        rm_daemon spamd
-        stat_done
-      fi
-    else
-      rm_daemon spamd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
-# vim: ts=2 sw=2 et ft=sh
diff --git a/extra/spamassassin/spamd.conf.d b/extra/spamassassin/spamd.conf.d
deleted file mode 100644
index 4295e0073..000000000
--- a/extra/spamassassin/spamd.conf.d
+++ /dev/null
@@ -1 +0,0 @@
-SPAMD_OPTS="-c"