[arch-commits] Commit in spamassassin/trunk (PKGBUILD spamd)

[Florian Pritz]

    Date: Sunday, January 15, 2012 @ 10:32:27
  Author: bluewind
Revision: 146656

clean up PKGBUILD; fix FS#20936

Modified:
  spamassassin/trunk/PKGBUILD
  spamassassin/trunk/spamd

----------+
 PKGBUILD |   59 +++++++++++++++++++++++++++--------------------------------
 spamd    |   10 ++++++++--
 2 files changed, 35 insertions(+), 34 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-01-15 12:58:26 UTC (rev 146655)
+++ PKGBUILD	2012-01-15 15:32:27 UTC (rev 146656)
@@ -3,53 +3,48 @@
 # Contributor: Manolis Tzanidakis
 pkgname=spamassassin
 pkgver=3.3.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A mail filter to identify spam."
-arch=(i686 x86_64)
-license=(APACHE)
+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)
+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'
-	        'gnupg: gpg support, without this use --nogpg flag for sa-update'
-            're2c: regexp compiler, for compiling rules with sa-compile'
-            'perl-io-socket-inet6: ipv6 support'
-            '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)
+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'
-         '0534d3071a526a27ddc2b297afa03b04')
+         '94ee712d7b521d1788171e804e86f785')
 
 build() {
-  cd ${srcdir}/Mail-SpamAssassin-${pkgver}
+  cd "${srcdir}/Mail-SpamAssassin-${pkgver}"
 
   # install module in vendor directories.
-  PERL_MM_USE_DEFAULT=1 /usr/bin/perl Makefile.PL INSTALLDIRS=vendor \
+  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor \
       CONTACT_ADDRESS=root at localhost ENABLE_SSL=yes PERL_TAINT=no
-  /usr/bin/make 
+  make 
 }
 
 check() {
-  cd ${srcdir}/Mail-SpamAssassin-${pkgver}
-  /usr/bin/make test || true
+  cd "${srcdir}/Mail-SpamAssassin-${pkgver}"
+  make test
 }
 
 package() {
-  cd ${srcdir}/Mail-SpamAssassin-${pkgver}
-  /usr/bin/make DESTDIR=${pkgdir} install
+  cd "${srcdir}/Mail-SpamAssassin-${pkgver}"
+  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
+  install -D -m644 "${srcdir}/spamd.conf.d" "${pkgdir}/etc/conf.d/spamd"
+  install -D -m755 "${srcdir}/spamd" "${pkgdir}/etc/rc.d/spamd"
 }

Modified: spamd
===================================================================
--- spamd	2012-01-15 12:58:26 UTC (rev 146655)
+++ spamd	2012-01-15 15:32:27 UTC (rev 146656)
@@ -6,11 +6,17 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
 
-PID=`pidof -o %PPID /usr/bin/vendor_perl/spamd`
+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 ${SPAMD_OPTS}
+    [ -z "$PID" ] && /usr/bin/vendor_perl/spamd -d -r "$PIDFILE" ${SPAMD_OPTS}
     if [ $? -gt 0 ]; then
       stat_fail
     else