[arch-commits] Commit in spamassassin/repos (16 files)

Florian Pritz bluewind at archlinux.org
Mon Jan 16 09:03:49 UTC 2012


    Date: Monday, January 16, 2012 @ 04:03:49
  Author: bluewind
Revision: 146678

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  spamassassin/repos/extra-i686/PKGBUILD
    (from rev 146677, spamassassin/trunk/PKGBUILD)
  spamassassin/repos/extra-i686/spamassassin.install
    (from rev 146677, spamassassin/trunk/spamassassin.install)
  spamassassin/repos/extra-i686/spamd
    (from rev 146677, spamassassin/trunk/spamd)
  spamassassin/repos/extra-i686/spamd.conf.d
    (from rev 146677, spamassassin/trunk/spamd.conf.d)
  spamassassin/repos/extra-x86_64/PKGBUILD
    (from rev 146677, spamassassin/trunk/PKGBUILD)
  spamassassin/repos/extra-x86_64/spamassassin.install
    (from rev 146677, spamassassin/trunk/spamassassin.install)
  spamassassin/repos/extra-x86_64/spamd
    (from rev 146677, spamassassin/trunk/spamd)
  spamassassin/repos/extra-x86_64/spamd.conf.d
    (from rev 146677, spamassassin/trunk/spamd.conf.d)
Deleted:
  spamassassin/repos/extra-i686/PKGBUILD
  spamassassin/repos/extra-i686/spamassassin.install
  spamassassin/repos/extra-i686/spamd
  spamassassin/repos/extra-i686/spamd.conf.d
  spamassassin/repos/extra-x86_64/PKGBUILD
  spamassassin/repos/extra-x86_64/spamassassin.install
  spamassassin/repos/extra-x86_64/spamd
  spamassassin/repos/extra-x86_64/spamd.conf.d

-----------------------------------+
 extra-i686/PKGBUILD               |  112 ++++++++++++++++++------------------
 extra-i686/spamassassin.install   |   50 ++++++++--------
 extra-i686/spamd                  |  104 +++++++++++++++++----------------
 extra-i686/spamd.conf.d           |    2 
 extra-x86_64/PKGBUILD             |  112 ++++++++++++++++++------------------
 extra-x86_64/spamassassin.install |   50 ++++++++--------
 extra-x86_64/spamd                |  104 +++++++++++++++++----------------
 extra-x86_64/spamd.conf.d         |    2 
 8 files changed, 278 insertions(+), 258 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2012-01-16 08:56:03 UTC (rev 146677)
+++ extra-i686/PKGBUILD	2012-01-16 09:03:49 UTC (rev 146678)
@@ -1,54 +0,0 @@
-# $Id$
-# Maintainer: Dale Blount <dale at archlinux.org>
-# Contributor: Manolis Tzanidakis
-pkgname=spamassassin
-pkgver=3.3.2
-pkgrel=2
-pkgdesc="A mail filter to identify spam."
-arch=(i686 x86_64)
-license=(APACHE)
-url="http://spamassassin.apache.org"
-depends=('perl>=5.14' 'perl-net-dns' 'perl-uri' 'perl-html-parser' \
-		'perl-digest-sha1' 'perl-io-socket-ssl' 'openssl' \
-		'perl-libwww' 'perl-mail-spf' \
-	    'zlib' 're2c')
-        # perl-archive-tar perl-io-zlib)
-makedepends=('razor' 'perl-dbi') 
-optdepends=('razor: to identify collaborately-flagged spam'
-	        'gnupg: gpg support, without this use --nogpg flag for sa-update'
-            're2c: regexp compiler, for compiling rules with sa-compile'
-            'perl-mail-dkim: DomainKeys Identified Mail (DKIM) checking')
-backup=(etc/conf.d/spamd etc/mail/spamassassin/local.cf \
-	etc/mail/spamassassin/init.pre \
-	etc/mail/spamassassin/v310.pre \
-	etc/mail/spamassassin/v312.pre \
-	etc/mail/spamassassin/v320.pre)
-install=${pkgname}.install
-options=(!emptydirs)
-source=(http://mirrors.devlib.org/apache/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz \
-		spamd.conf.d spamd)
-md5sums=('d1d62cc5c6eac57e88c4006d9633b81e'
-         'af501c6b0bb937a2775b747cc4b6d150'
-         '0534d3071a526a27ddc2b297afa03b04')
-
-build() {
-  cd ${srcdir}/Mail-SpamAssassin-${pkgver}
-
-  # install module in vendor directories.
-  PERL_MM_USE_DEFAULT=1 /usr/bin/perl Makefile.PL INSTALLDIRS=vendor \
-      CONTACT_ADDRESS=root at localhost ENABLE_SSL=yes PERL_TAINT=no
-  /usr/bin/make 
-}
-
-check() {
-  cd ${srcdir}/Mail-SpamAssassin-${pkgver}
-  /usr/bin/make test || true
-}
-
-package() {
-  cd ${srcdir}/Mail-SpamAssassin-${pkgver}
-  /usr/bin/make DESTDIR=${pkgdir} install
-
-  /bin/install -D -m644 ${srcdir}/spamd.conf.d ${pkgdir}/etc/conf.d/spamd
-  /bin/install -D -m755 ${srcdir}/spamd ${pkgdir}/etc/rc.d/spamd
-}

Copied: spamassassin/repos/extra-i686/PKGBUILD (from rev 146677, spamassassin/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2012-01-16 09:03:49 UTC (rev 146678)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Dale Blount <dale at archlinux.org>
+# Contributor: Manolis Tzanidakis
+pkgname=spamassassin
+pkgver=3.3.2
+pkgrel=3
+pkgdesc="A mail filter to identify spam."
+arch=('i686' 'x86_64')
+license=('APACHE')
+url="http://spamassassin.apache.org"
+depends=('openssl' 'zlib' 're2c' 'perl-net-dns' 'perl-io-socket-ssl'
+         'perl-libwww' 'perl-mail-spf' 'perl-http-message' 'perl-net-http'
+         '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'
+        'etc/mail/spamassassin/init.pre'
+        'etc/mail/spamassassin/v310.pre'
+        'etc/mail/spamassassin/v312.pre'
+        'etc/mail/spamassassin/v320.pre'
+        'etc/mail/spamassassin/v330.pre')
+install="${pkgname}.install"
+options=('!emptydirs')
+source=("http://mirrors.devlib.org/apache/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz"
+        'spamd.conf.d' 'spamd')
+md5sums=('d1d62cc5c6eac57e88c4006d9633b81e'
+         'af501c6b0bb937a2775b747cc4b6d150'
+         '57545e6877503d897db21e9a2e8bd2b9')
+
+build() {
+  cd "${srcdir}/Mail-SpamAssassin-${pkgver}"
+
+  # install module in vendor directories.
+  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor \
+      CONTACT_ADDRESS=root at localhost ENABLE_SSL=yes PERL_TAINT=no
+  make 
+}
+
+check() {
+  cd "${srcdir}/Mail-SpamAssassin-${pkgver}"
+
+  # SSLv2 is disabled by upstream so this test would fail
+  rm -rf t/spamd_ssl_v2.t
+
+  # parallel tests cause lots of failures; disable for now
+  #export HARNESS_OPTIONS="j$(echo $MAKEFLAGS | sed 's/.*-j\([0-9][0-9]*\).*/\1/')"
+
+  make test
+}
+
+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"
+}

Deleted: extra-i686/spamassassin.install
===================================================================
--- extra-i686/spamassassin.install	2012-01-16 08:56:03 UTC (rev 146677)
+++ extra-i686/spamassassin.install	2012-01-16 09:03:49 UTC (rev 146678)
@@ -1,25 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  echo "You must run 'sa-update' to install spam rules before use."
-  /bin/true
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  # Compile rules, if rules have previously been compiled, and it's possible
-  if [ -x /usr/bin/re2c -a -x /usr/bin/perlbin/vendor/sa-compile -a -d /var/lib/spamassassin/compiled ]; then
-    echo "Detected compiled rules, running sa-compile..."
-    sa-compile > /dev/null 2>&1
-fi
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  /bin/true
-}
-
-# arg 1:  the old package version
-post_remove() {
-  /bin/true
-}

Copied: spamassassin/repos/extra-i686/spamassassin.install (from rev 146677, spamassassin/trunk/spamassassin.install)
===================================================================
--- extra-i686/spamassassin.install	                        (rev 0)
+++ extra-i686/spamassassin.install	2012-01-16 09:03:49 UTC (rev 146678)
@@ -0,0 +1,25 @@
+# arg 1:  the new package version
+post_install() {
+  echo "You must run 'sa-update' to install spam rules before use."
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+  # Compile rules, if rules have previously been compiled, and it's possible
+  if [ -x /usr/bin/re2c -a -x /usr/bin/perlbin/vendor/sa-compile -a -d /var/lib/spamassassin/compiled ]; then
+    echo "Detected compiled rules, running sa-compile..."
+    sa-compile > /dev/null 2>&1
+fi
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}

Deleted: extra-i686/spamd
===================================================================
--- extra-i686/spamd	2012-01-16 08:56:03 UTC (rev 146677)
+++ extra-i686/spamd	2012-01-16 09:03:49 UTC (rev 146678)
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[ -f /etc/conf.d/spamd ] && . /etc/conf.d/spamd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/vendor_perl/spamd`
-case "$1" in
-  start)
-    stat_busy "Starting spamd"
-    [ -z "$PID" ] && /usr/bin/vendor_perl/spamd -d ${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

Copied: spamassassin/repos/extra-i686/spamd (from rev 146677, spamassassin/trunk/spamd)
===================================================================
--- extra-i686/spamd	                        (rev 0)
+++ extra-i686/spamd	2012-01-16 09:03:49 UTC (rev 146678)
@@ -0,0 +1,55 @@
+#!/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

Deleted: extra-i686/spamd.conf.d
===================================================================
--- extra-i686/spamd.conf.d	2012-01-16 08:56:03 UTC (rev 146677)
+++ extra-i686/spamd.conf.d	2012-01-16 09:03:49 UTC (rev 146678)
@@ -1 +0,0 @@
-SPAMD_OPTS="-c"

Copied: spamassassin/repos/extra-i686/spamd.conf.d (from rev 146677, spamassassin/trunk/spamd.conf.d)
===================================================================
--- extra-i686/spamd.conf.d	                        (rev 0)
+++ extra-i686/spamd.conf.d	2012-01-16 09:03:49 UTC (rev 146678)
@@ -0,0 +1 @@
+SPAMD_OPTS="-c"

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2012-01-16 08:56:03 UTC (rev 146677)
+++ extra-x86_64/PKGBUILD	2012-01-16 09:03:49 UTC (rev 146678)
@@ -1,54 +0,0 @@
-# $Id$
-# Maintainer: Dale Blount <dale at archlinux.org>
-# Contributor: Manolis Tzanidakis
-pkgname=spamassassin
-pkgver=3.3.2
-pkgrel=2
-pkgdesc="A mail filter to identify spam."
-arch=(i686 x86_64)
-license=(APACHE)
-url="http://spamassassin.apache.org"
-depends=('perl>=5.14' 'perl-net-dns' 'perl-uri' 'perl-html-parser' \
-		'perl-digest-sha1' 'perl-io-socket-ssl' 'openssl' \
-		'perl-libwww' 'perl-mail-spf' \
-	    'zlib' 're2c')
-        # perl-archive-tar perl-io-zlib)
-makedepends=('razor' 'perl-dbi') 
-optdepends=('razor: to identify collaborately-flagged spam'
-	        'gnupg: gpg support, without this use --nogpg flag for sa-update'
-            're2c: regexp compiler, for compiling rules with sa-compile'
-            'perl-mail-dkim: DomainKeys Identified Mail (DKIM) checking')
-backup=(etc/conf.d/spamd etc/mail/spamassassin/local.cf \
-	etc/mail/spamassassin/init.pre \
-	etc/mail/spamassassin/v310.pre \
-	etc/mail/spamassassin/v312.pre \
-	etc/mail/spamassassin/v320.pre)
-install=${pkgname}.install
-options=(!emptydirs)
-source=(http://mirrors.devlib.org/apache/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz \
-		spamd.conf.d spamd)
-md5sums=('d1d62cc5c6eac57e88c4006d9633b81e'
-         'af501c6b0bb937a2775b747cc4b6d150'
-         '0534d3071a526a27ddc2b297afa03b04')
-
-build() {
-  cd ${srcdir}/Mail-SpamAssassin-${pkgver}
-
-  # install module in vendor directories.
-  PERL_MM_USE_DEFAULT=1 /usr/bin/perl Makefile.PL INSTALLDIRS=vendor \
-      CONTACT_ADDRESS=root at localhost ENABLE_SSL=yes PERL_TAINT=no
-  /usr/bin/make 
-}
-
-check() {
-  cd ${srcdir}/Mail-SpamAssassin-${pkgver}
-  /usr/bin/make test || true
-}
-
-package() {
-  cd ${srcdir}/Mail-SpamAssassin-${pkgver}
-  /usr/bin/make DESTDIR=${pkgdir} install
-
-  /bin/install -D -m644 ${srcdir}/spamd.conf.d ${pkgdir}/etc/conf.d/spamd
-  /bin/install -D -m755 ${srcdir}/spamd ${pkgdir}/etc/rc.d/spamd
-}

Copied: spamassassin/repos/extra-x86_64/PKGBUILD (from rev 146677, spamassassin/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2012-01-16 09:03:49 UTC (rev 146678)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Dale Blount <dale at archlinux.org>
+# Contributor: Manolis Tzanidakis
+pkgname=spamassassin
+pkgver=3.3.2
+pkgrel=3
+pkgdesc="A mail filter to identify spam."
+arch=('i686' 'x86_64')
+license=('APACHE')
+url="http://spamassassin.apache.org"
+depends=('openssl' 'zlib' 're2c' 'perl-net-dns' 'perl-io-socket-ssl'
+         'perl-libwww' 'perl-mail-spf' 'perl-http-message' 'perl-net-http'
+         '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'
+        'etc/mail/spamassassin/init.pre'
+        'etc/mail/spamassassin/v310.pre'
+        'etc/mail/spamassassin/v312.pre'
+        'etc/mail/spamassassin/v320.pre'
+        'etc/mail/spamassassin/v330.pre')
+install="${pkgname}.install"
+options=('!emptydirs')
+source=("http://mirrors.devlib.org/apache/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz"
+        'spamd.conf.d' 'spamd')
+md5sums=('d1d62cc5c6eac57e88c4006d9633b81e'
+         'af501c6b0bb937a2775b747cc4b6d150'
+         '57545e6877503d897db21e9a2e8bd2b9')
+
+build() {
+  cd "${srcdir}/Mail-SpamAssassin-${pkgver}"
+
+  # install module in vendor directories.
+  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor \
+      CONTACT_ADDRESS=root at localhost ENABLE_SSL=yes PERL_TAINT=no
+  make 
+}
+
+check() {
+  cd "${srcdir}/Mail-SpamAssassin-${pkgver}"
+
+  # SSLv2 is disabled by upstream so this test would fail
+  rm -rf t/spamd_ssl_v2.t
+
+  # parallel tests cause lots of failures; disable for now
+  #export HARNESS_OPTIONS="j$(echo $MAKEFLAGS | sed 's/.*-j\([0-9][0-9]*\).*/\1/')"
+
+  make test
+}
+
+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"
+}

Deleted: extra-x86_64/spamassassin.install
===================================================================
--- extra-x86_64/spamassassin.install	2012-01-16 08:56:03 UTC (rev 146677)
+++ extra-x86_64/spamassassin.install	2012-01-16 09:03:49 UTC (rev 146678)
@@ -1,25 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  echo "You must run 'sa-update' to install spam rules before use."
-  /bin/true
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  # Compile rules, if rules have previously been compiled, and it's possible
-  if [ -x /usr/bin/re2c -a -x /usr/bin/perlbin/vendor/sa-compile -a -d /var/lib/spamassassin/compiled ]; then
-    echo "Detected compiled rules, running sa-compile..."
-    sa-compile > /dev/null 2>&1
-fi
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  /bin/true
-}
-
-# arg 1:  the old package version
-post_remove() {
-  /bin/true
-}

Copied: spamassassin/repos/extra-x86_64/spamassassin.install (from rev 146677, spamassassin/trunk/spamassassin.install)
===================================================================
--- extra-x86_64/spamassassin.install	                        (rev 0)
+++ extra-x86_64/spamassassin.install	2012-01-16 09:03:49 UTC (rev 146678)
@@ -0,0 +1,25 @@
+# arg 1:  the new package version
+post_install() {
+  echo "You must run 'sa-update' to install spam rules before use."
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+  # Compile rules, if rules have previously been compiled, and it's possible
+  if [ -x /usr/bin/re2c -a -x /usr/bin/perlbin/vendor/sa-compile -a -d /var/lib/spamassassin/compiled ]; then
+    echo "Detected compiled rules, running sa-compile..."
+    sa-compile > /dev/null 2>&1
+fi
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}

Deleted: extra-x86_64/spamd
===================================================================
--- extra-x86_64/spamd	2012-01-16 08:56:03 UTC (rev 146677)
+++ extra-x86_64/spamd	2012-01-16 09:03:49 UTC (rev 146678)
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[ -f /etc/conf.d/spamd ] && . /etc/conf.d/spamd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/vendor_perl/spamd`
-case "$1" in
-  start)
-    stat_busy "Starting spamd"
-    [ -z "$PID" ] && /usr/bin/vendor_perl/spamd -d ${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

Copied: spamassassin/repos/extra-x86_64/spamd (from rev 146677, spamassassin/trunk/spamd)
===================================================================
--- extra-x86_64/spamd	                        (rev 0)
+++ extra-x86_64/spamd	2012-01-16 09:03:49 UTC (rev 146678)
@@ -0,0 +1,55 @@
+#!/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

Deleted: extra-x86_64/spamd.conf.d
===================================================================
--- extra-x86_64/spamd.conf.d	2012-01-16 08:56:03 UTC (rev 146677)
+++ extra-x86_64/spamd.conf.d	2012-01-16 09:03:49 UTC (rev 146678)
@@ -1 +0,0 @@
-SPAMD_OPTS="-c"

Copied: spamassassin/repos/extra-x86_64/spamd.conf.d (from rev 146677, spamassassin/trunk/spamd.conf.d)
===================================================================
--- extra-x86_64/spamd.conf.d	                        (rev 0)
+++ extra-x86_64/spamd.conf.d	2012-01-16 09:03:49 UTC (rev 146678)
@@ -0,0 +1 @@
+SPAMD_OPTS="-c"




More information about the arch-commits mailing list