Date: Sunday, May 12, 2013 @ 19:03:55 Author: bluewind Revision: 185272
archrelease: copy trunk to extra-i686, extra-x86_64 Added: spamassassin/repos/extra-i686/PKGBUILD (from rev 185271, spamassassin/trunk/PKGBUILD) spamassassin/repos/extra-i686/spamassassin.install (from rev 185271, spamassassin/trunk/spamassassin.install) spamassassin/repos/extra-i686/spamassassin.service (from rev 185271, spamassassin/trunk/spamassassin.service) spamassassin/repos/extra-x86_64/PKGBUILD (from rev 185271, spamassassin/trunk/PKGBUILD) spamassassin/repos/extra-x86_64/spamassassin.install (from rev 185271, spamassassin/trunk/spamassassin.install) spamassassin/repos/extra-x86_64/spamassassin.service (from rev 185271, spamassassin/trunk/spamassassin.service) Deleted: spamassassin/repos/extra-i686/PKGBUILD spamassassin/repos/extra-i686/spamassassin.install spamassassin/repos/extra-i686/spamassassin.service 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/spamassassin.service spamassassin/repos/extra-x86_64/spamd spamassassin/repos/extra-x86_64/spamd.conf.d -----------------------------------+ /PKGBUILD | 112 ++++++++++++++++++++++++++++++++++++ /spamassassin.install | 22 +++++++ /spamassassin.service | 28 +++++++++ extra-i686/PKGBUILD | 61 ------------------- extra-i686/spamassassin.install | 11 --- extra-i686/spamassassin.service | 14 ---- extra-i686/spamd | 55 ----------------- extra-i686/spamd.conf.d | 1 extra-x86_64/PKGBUILD | 61 ------------------- extra-x86_64/spamassassin.install | 11 --- extra-x86_64/spamassassin.service | 14 ---- extra-x86_64/spamd | 55 ----------------- extra-x86_64/spamd.conf.d | 1 13 files changed, 162 insertions(+), 284 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2013-05-12 17:03:49 UTC (rev 185271) +++ extra-i686/PKGBUILD 2013-05-12 17:03:55 UTC (rev 185272) @@ -1,61 +0,0 @@ -# $Id$ -# Maintainer: Florian Pritz <bluew...@xinu.at> -# Contributor: Dale Blount <d...@archlinux.org> -# Contributor: Manolis Tzanidakis -pkgname=spamassassin -pkgver=3.3.2 -pkgrel=7 -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' - 'ded3e012a4d502df001f2d97c495cc4e') - -build() { - cd "${srcdir}/Mail-SpamAssassin-${pkgver}" - - # install module in vendor directories. - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor \ - CONTACT_ADDRESS=root@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.service" -} Copied: spamassassin/repos/extra-i686/PKGBUILD (from rev 185271, spamassassin/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2013-05-12 17:03:55 UTC (rev 185272) @@ -0,0 +1,56 @@ +# $Id$ +# Maintainer: Florian Pritz <bluew...@xinu.at> +# Contributor: Dale Blount <d...@archlinux.org> +# Contributor: Manolis Tzanidakis +pkgname=spamassassin +pkgver=3.3.2 +pkgrel=8 +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/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" + 'spamassassin.service') +md5sums=('d1d62cc5c6eac57e88c4006d9633b81e' + 'ded3e012a4d502df001f2d97c495cc4e') + +build() { + cd "${srcdir}/Mail-SpamAssassin-${pkgver}" + + # install module in vendor directories. + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor \ + CONTACT_ADDRESS=root@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}/spamassassin.service" "${pkgdir}/usr/lib/systemd/system/spamassassin.service" +} Deleted: extra-i686/spamassassin.install =================================================================== --- extra-i686/spamassassin.install 2013-05-12 17:03:49 UTC (rev 185271) +++ extra-i686/spamassassin.install 2013-05-12 17:03:55 UTC (rev 185272) @@ -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 ]]; then - echo "Detected compiled rules, running sa-compile..." - sa-compile > /dev/null 2>&1 -fi -} Copied: spamassassin/repos/extra-i686/spamassassin.install (from rev 185271, spamassassin/trunk/spamassassin.install) =================================================================== --- extra-i686/spamassassin.install (rev 0) +++ extra-i686/spamassassin.install 2013-05-12 17:03:55 UTC (rev 185272) @@ -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: extra-i686/spamassassin.service =================================================================== --- extra-i686/spamassassin.service 2013-05-12 17:03:49 UTC (rev 185271) +++ extra-i686/spamassassin.service 2013-05-12 17:03:55 UTC (rev 185272) @@ -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 -d --pidfile /var/run/spamd.pid -c -StandardOutput=syslog -StandardError=syslog -Restart=always - -[Install] -WantedBy=multi-user.target Copied: spamassassin/repos/extra-i686/spamassassin.service (from rev 185271, spamassassin/trunk/spamassassin.service) =================================================================== --- extra-i686/spamassassin.service (rev 0) +++ extra-i686/spamassassin.service 2013-05-12 17:03:55 UTC (rev 185272) @@ -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 -d --pidfile /var/run/spamd.pid -c +StandardOutput=syslog +StandardError=syslog +Restart=always + +[Install] +WantedBy=multi-user.target Deleted: extra-i686/spamd =================================================================== --- extra-i686/spamd 2013-05-12 17:03:49 UTC (rev 185271) +++ extra-i686/spamd 2013-05-12 17:03:55 UTC (rev 185272) @@ -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 Deleted: extra-i686/spamd.conf.d =================================================================== --- extra-i686/spamd.conf.d 2013-05-12 17:03:49 UTC (rev 185271) +++ extra-i686/spamd.conf.d 2013-05-12 17:03:55 UTC (rev 185272) @@ -1 +0,0 @@ -SPAMD_OPTS="-c" Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2013-05-12 17:03:49 UTC (rev 185271) +++ extra-x86_64/PKGBUILD 2013-05-12 17:03:55 UTC (rev 185272) @@ -1,61 +0,0 @@ -# $Id$ -# Maintainer: Florian Pritz <bluew...@xinu.at> -# Contributor: Dale Blount <d...@archlinux.org> -# Contributor: Manolis Tzanidakis -pkgname=spamassassin -pkgver=3.3.2 -pkgrel=7 -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' - 'ded3e012a4d502df001f2d97c495cc4e') - -build() { - cd "${srcdir}/Mail-SpamAssassin-${pkgver}" - - # install module in vendor directories. - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor \ - CONTACT_ADDRESS=root@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.service" -} Copied: spamassassin/repos/extra-x86_64/PKGBUILD (from rev 185271, spamassassin/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2013-05-12 17:03:55 UTC (rev 185272) @@ -0,0 +1,56 @@ +# $Id$ +# Maintainer: Florian Pritz <bluew...@xinu.at> +# Contributor: Dale Blount <d...@archlinux.org> +# Contributor: Manolis Tzanidakis +pkgname=spamassassin +pkgver=3.3.2 +pkgrel=8 +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/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" + 'spamassassin.service') +md5sums=('d1d62cc5c6eac57e88c4006d9633b81e' + 'ded3e012a4d502df001f2d97c495cc4e') + +build() { + cd "${srcdir}/Mail-SpamAssassin-${pkgver}" + + # install module in vendor directories. + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor \ + CONTACT_ADDRESS=root@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}/spamassassin.service" "${pkgdir}/usr/lib/systemd/system/spamassassin.service" +} Deleted: extra-x86_64/spamassassin.install =================================================================== --- extra-x86_64/spamassassin.install 2013-05-12 17:03:49 UTC (rev 185271) +++ extra-x86_64/spamassassin.install 2013-05-12 17:03:55 UTC (rev 185272) @@ -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 ]]; then - echo "Detected compiled rules, running sa-compile..." - sa-compile > /dev/null 2>&1 -fi -} Copied: spamassassin/repos/extra-x86_64/spamassassin.install (from rev 185271, spamassassin/trunk/spamassassin.install) =================================================================== --- extra-x86_64/spamassassin.install (rev 0) +++ extra-x86_64/spamassassin.install 2013-05-12 17:03:55 UTC (rev 185272) @@ -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: extra-x86_64/spamassassin.service =================================================================== --- extra-x86_64/spamassassin.service 2013-05-12 17:03:49 UTC (rev 185271) +++ extra-x86_64/spamassassin.service 2013-05-12 17:03:55 UTC (rev 185272) @@ -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 -d --pidfile /var/run/spamd.pid -c -StandardOutput=syslog -StandardError=syslog -Restart=always - -[Install] -WantedBy=multi-user.target Copied: spamassassin/repos/extra-x86_64/spamassassin.service (from rev 185271, spamassassin/trunk/spamassassin.service) =================================================================== --- extra-x86_64/spamassassin.service (rev 0) +++ extra-x86_64/spamassassin.service 2013-05-12 17:03:55 UTC (rev 185272) @@ -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 -d --pidfile /var/run/spamd.pid -c +StandardOutput=syslog +StandardError=syslog +Restart=always + +[Install] +WantedBy=multi-user.target Deleted: extra-x86_64/spamd =================================================================== --- extra-x86_64/spamd 2013-05-12 17:03:49 UTC (rev 185271) +++ extra-x86_64/spamd 2013-05-12 17:03:55 UTC (rev 185272) @@ -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 Deleted: extra-x86_64/spamd.conf.d =================================================================== --- extra-x86_64/spamd.conf.d 2013-05-12 17:03:49 UTC (rev 185271) +++ extra-x86_64/spamd.conf.d 2013-05-12 17:03:55 UTC (rev 185272) @@ -1 +0,0 @@ -SPAMD_OPTS="-c"