[arch-commits] Commit in spamassassin/repos (20 files)
Florian Pritz
bluewind at archlinux.org
Wed Aug 29 09:52:50 UTC 2012
Date: Wednesday, August 29, 2012 @ 05:52:49
Author: bluewind
Revision: 165693
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
spamassassin/repos/testing-i686/PKGBUILD
(from rev 165692, spamassassin/trunk/PKGBUILD)
spamassassin/repos/testing-i686/spamassassin.install
(from rev 165692, spamassassin/trunk/spamassassin.install)
spamassassin/repos/testing-i686/spamassassin.service
(from rev 165692, spamassassin/trunk/spamassassin.service)
spamassassin/repos/testing-i686/spamd
(from rev 165692, spamassassin/trunk/spamd)
spamassassin/repos/testing-i686/spamd.conf.d
(from rev 165692, spamassassin/trunk/spamd.conf.d)
spamassassin/repos/testing-x86_64/PKGBUILD
(from rev 165692, spamassassin/trunk/PKGBUILD)
spamassassin/repos/testing-x86_64/spamassassin.install
(from rev 165692, spamassassin/trunk/spamassassin.install)
spamassassin/repos/testing-x86_64/spamassassin.service
(from rev 165692, spamassassin/trunk/spamassassin.service)
spamassassin/repos/testing-x86_64/spamd
(from rev 165692, spamassassin/trunk/spamd)
spamassassin/repos/testing-x86_64/spamd.conf.d
(from rev 165692, spamassassin/trunk/spamd.conf.d)
Deleted:
spamassassin/repos/testing-i686/PKGBUILD
spamassassin/repos/testing-i686/spamassassin.install
spamassassin/repos/testing-i686/spamassassin.service
spamassassin/repos/testing-i686/spamd
spamassassin/repos/testing-i686/spamd.conf.d
spamassassin/repos/testing-x86_64/PKGBUILD
spamassassin/repos/testing-x86_64/spamassassin.install
spamassassin/repos/testing-x86_64/spamassassin.service
spamassassin/repos/testing-x86_64/spamd
spamassassin/repos/testing-x86_64/spamd.conf.d
-------------------------------------+
testing-i686/PKGBUILD | 120 +++++++++++++++++-----------------
testing-i686/spamassassin.install | 22 +++---
testing-i686/spamassassin.service | 28 +++----
testing-i686/spamd | 110 +++++++++++++++----------------
testing-i686/spamd.conf.d | 2
testing-x86_64/PKGBUILD | 120 +++++++++++++++++-----------------
testing-x86_64/spamassassin.install | 22 +++---
testing-x86_64/spamassassin.service | 28 +++----
testing-x86_64/spamd | 110 +++++++++++++++----------------
testing-x86_64/spamd.conf.d | 2
10 files changed, 282 insertions(+), 282 deletions(-)
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2012-08-29 09:52:02 UTC (rev 165692)
+++ testing-i686/PKGBUILD 2012-08-29 09:52:49 UTC (rev 165693)
@@ -1,60 +0,0 @@
-# $Id$
-# Maintainer: Dale Blount <dale at archlinux.org>
-# Contributor: Manolis Tzanidakis
-pkgname=spamassassin
-pkgver=3.3.2
-pkgrel=4
-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' 'spamassassin.service')
-md5sums=('d1d62cc5c6eac57e88c4006d9633b81e'
- 'af501c6b0bb937a2775b747cc4b6d150'
- '57545e6877503d897db21e9a2e8bd2b9'
- '1c39572b79bc20c822387814050ee5c1')
-
-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"
- install -D -m644 "${srcdir}/spamassassin.service" "${pkgdir}/usr/lib/systemd/system/spamassassin.serivce"
-}
Copied: spamassassin/repos/testing-i686/PKGBUILD (from rev 165692, spamassassin/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2012-08-29 09:52:49 UTC (rev 165693)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer: Dale Blount <dale at archlinux.org>
+# Contributor: Manolis Tzanidakis
+pkgname=spamassassin
+pkgver=3.3.2
+pkgrel=5
+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' 'spamassassin.service')
+md5sums=('d1d62cc5c6eac57e88c4006d9633b81e'
+ 'af501c6b0bb937a2775b747cc4b6d150'
+ '57545e6877503d897db21e9a2e8bd2b9'
+ '1c39572b79bc20c822387814050ee5c1')
+
+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"
+ install -D -m644 "${srcdir}/spamassassin.service" "${pkgdir}/usr/lib/systemd/system/spamassassin.serivce"
+}
Deleted: testing-i686/spamassassin.install
===================================================================
--- testing-i686/spamassassin.install 2012-08-29 09:52:02 UTC (rev 165692)
+++ testing-i686/spamassassin.install 2012-08-29 09:52:49 UTC (rev 165693)
@@ -1,11 +0,0 @@
-post_install() {
- echo "You must run 'sa-update' to install spam rules before use."
-}
-
-post_upgrade() {
- # Compile rules, if rules have previously been compiled, and it's possible
- if type re2c &>/dev/null && type sa-compile &>/dev/null && [[ -d /var/lib/spamassassin/compiled ]]
- echo "Detected compiled rules, running sa-compile..."
- sa-compile > /dev/null 2>&1
-fi
-}
Copied: spamassassin/repos/testing-i686/spamassassin.install (from rev 165692, spamassassin/trunk/spamassassin.install)
===================================================================
--- testing-i686/spamassassin.install (rev 0)
+++ testing-i686/spamassassin.install 2012-08-29 09:52:49 UTC (rev 165693)
@@ -0,0 +1,11 @@
+post_install() {
+ echo "You must run 'sa-update' to install spam rules before use."
+}
+
+post_upgrade() {
+ # Compile rules, if rules have previously been compiled, and it's possible
+ if type re2c &>/dev/null && type sa-compile &>/dev/null && [[ -d /var/lib/spamassassin/compiled ]]; then
+ echo "Detected compiled rules, running sa-compile..."
+ sa-compile > /dev/null 2>&1
+fi
+}
Deleted: testing-i686/spamassassin.service
===================================================================
--- testing-i686/spamassassin.service 2012-08-29 09:52:02 UTC (rev 165692)
+++ testing-i686/spamassassin.service 2012-08-29 09:52:49 UTC (rev 165693)
@@ -1,14 +0,0 @@
-[Unit]
-Description=Spamassassin daemon
-After=syslog.target network.target
-
-[Service]
-Type=forking
-PIDFile=/var/run/spamd.pid
-ExecStart=/usr/bin/vendor_perl/spamd --pidfile /var/run/spamd.pid -c
-StandardOutput=syslog
-StandardError=syslog
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
Copied: spamassassin/repos/testing-i686/spamassassin.service (from rev 165692, spamassassin/trunk/spamassassin.service)
===================================================================
--- testing-i686/spamassassin.service (rev 0)
+++ testing-i686/spamassassin.service 2012-08-29 09:52:49 UTC (rev 165693)
@@ -0,0 +1,14 @@
+[Unit]
+Description=Spamassassin daemon
+After=syslog.target network.target
+
+[Service]
+Type=forking
+PIDFile=/var/run/spamd.pid
+ExecStart=/usr/bin/vendor_perl/spamd --pidfile /var/run/spamd.pid -c
+StandardOutput=syslog
+StandardError=syslog
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
Deleted: testing-i686/spamd
===================================================================
--- testing-i686/spamd 2012-08-29 09:52:02 UTC (rev 165692)
+++ testing-i686/spamd 2012-08-29 09:52:49 UTC (rev 165693)
@@ -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
Copied: spamassassin/repos/testing-i686/spamd (from rev 165692, spamassassin/trunk/spamd)
===================================================================
--- testing-i686/spamd (rev 0)
+++ testing-i686/spamd 2012-08-29 09:52:49 UTC (rev 165693)
@@ -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: testing-i686/spamd.conf.d
===================================================================
--- testing-i686/spamd.conf.d 2012-08-29 09:52:02 UTC (rev 165692)
+++ testing-i686/spamd.conf.d 2012-08-29 09:52:49 UTC (rev 165693)
@@ -1 +0,0 @@
-SPAMD_OPTS="-c"
Copied: spamassassin/repos/testing-i686/spamd.conf.d (from rev 165692, spamassassin/trunk/spamd.conf.d)
===================================================================
--- testing-i686/spamd.conf.d (rev 0)
+++ testing-i686/spamd.conf.d 2012-08-29 09:52:49 UTC (rev 165693)
@@ -0,0 +1 @@
+SPAMD_OPTS="-c"
Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2012-08-29 09:52:02 UTC (rev 165692)
+++ testing-x86_64/PKGBUILD 2012-08-29 09:52:49 UTC (rev 165693)
@@ -1,60 +0,0 @@
-# $Id$
-# Maintainer: Dale Blount <dale at archlinux.org>
-# Contributor: Manolis Tzanidakis
-pkgname=spamassassin
-pkgver=3.3.2
-pkgrel=4
-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' 'spamassassin.service')
-md5sums=('d1d62cc5c6eac57e88c4006d9633b81e'
- 'af501c6b0bb937a2775b747cc4b6d150'
- '57545e6877503d897db21e9a2e8bd2b9'
- '1c39572b79bc20c822387814050ee5c1')
-
-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"
- install -D -m644 "${srcdir}/spamassassin.service" "${pkgdir}/usr/lib/systemd/system/spamassassin.serivce"
-}
Copied: spamassassin/repos/testing-x86_64/PKGBUILD (from rev 165692, spamassassin/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2012-08-29 09:52:49 UTC (rev 165693)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer: Dale Blount <dale at archlinux.org>
+# Contributor: Manolis Tzanidakis
+pkgname=spamassassin
+pkgver=3.3.2
+pkgrel=5
+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' 'spamassassin.service')
+md5sums=('d1d62cc5c6eac57e88c4006d9633b81e'
+ 'af501c6b0bb937a2775b747cc4b6d150'
+ '57545e6877503d897db21e9a2e8bd2b9'
+ '1c39572b79bc20c822387814050ee5c1')
+
+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"
+ install -D -m644 "${srcdir}/spamassassin.service" "${pkgdir}/usr/lib/systemd/system/spamassassin.serivce"
+}
Deleted: testing-x86_64/spamassassin.install
===================================================================
--- testing-x86_64/spamassassin.install 2012-08-29 09:52:02 UTC (rev 165692)
+++ testing-x86_64/spamassassin.install 2012-08-29 09:52:49 UTC (rev 165693)
@@ -1,11 +0,0 @@
-post_install() {
- echo "You must run 'sa-update' to install spam rules before use."
-}
-
-post_upgrade() {
- # Compile rules, if rules have previously been compiled, and it's possible
- if type re2c &>/dev/null && type sa-compile &>/dev/null && [[ -d /var/lib/spamassassin/compiled ]]
- echo "Detected compiled rules, running sa-compile..."
- sa-compile > /dev/null 2>&1
-fi
-}
Copied: spamassassin/repos/testing-x86_64/spamassassin.install (from rev 165692, spamassassin/trunk/spamassassin.install)
===================================================================
--- testing-x86_64/spamassassin.install (rev 0)
+++ testing-x86_64/spamassassin.install 2012-08-29 09:52:49 UTC (rev 165693)
@@ -0,0 +1,11 @@
+post_install() {
+ echo "You must run 'sa-update' to install spam rules before use."
+}
+
+post_upgrade() {
+ # Compile rules, if rules have previously been compiled, and it's possible
+ if type re2c &>/dev/null && type sa-compile &>/dev/null && [[ -d /var/lib/spamassassin/compiled ]]; then
+ echo "Detected compiled rules, running sa-compile..."
+ sa-compile > /dev/null 2>&1
+fi
+}
Deleted: testing-x86_64/spamassassin.service
===================================================================
--- testing-x86_64/spamassassin.service 2012-08-29 09:52:02 UTC (rev 165692)
+++ testing-x86_64/spamassassin.service 2012-08-29 09:52:49 UTC (rev 165693)
@@ -1,14 +0,0 @@
-[Unit]
-Description=Spamassassin daemon
-After=syslog.target network.target
-
-[Service]
-Type=forking
-PIDFile=/var/run/spamd.pid
-ExecStart=/usr/bin/vendor_perl/spamd --pidfile /var/run/spamd.pid -c
-StandardOutput=syslog
-StandardError=syslog
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
Copied: spamassassin/repos/testing-x86_64/spamassassin.service (from rev 165692, spamassassin/trunk/spamassassin.service)
===================================================================
--- testing-x86_64/spamassassin.service (rev 0)
+++ testing-x86_64/spamassassin.service 2012-08-29 09:52:49 UTC (rev 165693)
@@ -0,0 +1,14 @@
+[Unit]
+Description=Spamassassin daemon
+After=syslog.target network.target
+
+[Service]
+Type=forking
+PIDFile=/var/run/spamd.pid
+ExecStart=/usr/bin/vendor_perl/spamd --pidfile /var/run/spamd.pid -c
+StandardOutput=syslog
+StandardError=syslog
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
Deleted: testing-x86_64/spamd
===================================================================
--- testing-x86_64/spamd 2012-08-29 09:52:02 UTC (rev 165692)
+++ testing-x86_64/spamd 2012-08-29 09:52:49 UTC (rev 165693)
@@ -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
Copied: spamassassin/repos/testing-x86_64/spamd (from rev 165692, spamassassin/trunk/spamd)
===================================================================
--- testing-x86_64/spamd (rev 0)
+++ testing-x86_64/spamd 2012-08-29 09:52:49 UTC (rev 165693)
@@ -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: testing-x86_64/spamd.conf.d
===================================================================
--- testing-x86_64/spamd.conf.d 2012-08-29 09:52:02 UTC (rev 165692)
+++ testing-x86_64/spamd.conf.d 2012-08-29 09:52:49 UTC (rev 165693)
@@ -1 +0,0 @@
-SPAMD_OPTS="-c"
Copied: spamassassin/repos/testing-x86_64/spamd.conf.d (from rev 165692, spamassassin/trunk/spamd.conf.d)
===================================================================
--- testing-x86_64/spamd.conf.d (rev 0)
+++ testing-x86_64/spamd.conf.d 2012-08-29 09:52:49 UTC (rev 165693)
@@ -0,0 +1 @@
+SPAMD_OPTS="-c"
More information about the arch-commits
mailing list