Date: Monday, January 16, 2012 @ 03:56:03 Author: bluewind Revision: 146677
fix make test and some syntax errors Modified: spamassassin/trunk/PKGBUILD spamassassin/trunk/spamd ----------+ PKGBUILD | 12 ++++++++++-- spamd | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-01-16 08:07:28 UTC (rev 146676) +++ PKGBUILD 2012-01-16 08:56:03 UTC (rev 146677) @@ -13,7 +13,8 @@ '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/conf.d/spamd' + 'etc/mail/spamassassin/local.cf' 'etc/mail/spamassassin/init.pre' 'etc/mail/spamassassin/v310.pre' 'etc/mail/spamassassin/v312.pre' @@ -25,7 +26,7 @@ 'spamd.conf.d' 'spamd') md5sums=('d1d62cc5c6eac57e88c4006d9633b81e' 'af501c6b0bb937a2775b747cc4b6d150' - '94ee712d7b521d1788171e804e86f785') + '57545e6877503d897db21e9a2e8bd2b9') build() { cd "${srcdir}/Mail-SpamAssassin-${pkgver}" @@ -38,6 +39,13 @@ 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 } Modified: spamd =================================================================== --- spamd 2012-01-16 08:07:28 UTC (rev 146676) +++ spamd 2012-01-16 08:56:03 UTC (rev 146677) @@ -7,7 +7,7 @@ . /etc/rc.d/functions PIDFILE=/var/run/spamd.pid -if [ -f $PIDFILE]; then +if [ -f $PIDFILE ]; then PID=$(cat $PIDFILE) else PID=$(pidof -o %PPID /usr/bin/vendor_perl/spamd) #backward compat