[arch-commits] Commit in spamassassin/repos (16 files)
Felix Yan
fyan at nymeria.archlinux.org
Sun Jun 8 07:55:09 UTC 2014
Date: Sunday, June 8, 2014 @ 09:55:08
Author: fyan
Revision: 214376
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
spamassassin/repos/extra-i686/PKGBUILD
(from rev 214375, spamassassin/trunk/PKGBUILD)
spamassassin/repos/extra-i686/net-dns.patch
(from rev 214375, spamassassin/trunk/net-dns.patch)
spamassassin/repos/extra-i686/spamassassin.install
(from rev 214375, spamassassin/trunk/spamassassin.install)
spamassassin/repos/extra-i686/spamassassin.service
(from rev 214375, spamassassin/trunk/spamassassin.service)
spamassassin/repos/extra-x86_64/PKGBUILD
(from rev 214375, spamassassin/trunk/PKGBUILD)
spamassassin/repos/extra-x86_64/net-dns.patch
(from rev 214375, spamassassin/trunk/net-dns.patch)
spamassassin/repos/extra-x86_64/spamassassin.install
(from rev 214375, spamassassin/trunk/spamassassin.install)
spamassassin/repos/extra-x86_64/spamassassin.service
(from rev 214375, spamassassin/trunk/spamassassin.service)
Deleted:
spamassassin/repos/extra-i686/PKGBUILD
spamassassin/repos/extra-i686/net-dns.patch
spamassassin/repos/extra-i686/spamassassin.install
spamassassin/repos/extra-i686/spamassassin.service
spamassassin/repos/extra-x86_64/PKGBUILD
spamassassin/repos/extra-x86_64/net-dns.patch
spamassassin/repos/extra-x86_64/spamassassin.install
spamassassin/repos/extra-x86_64/spamassassin.service
-----------------------------------+
/PKGBUILD | 130 ++++++++++++++++++++++++++++++++++++
/net-dns.patch | 82 ++++++++++++++++++++++
/spamassassin.install | 76 +++++++++++++++++++++
/spamassassin.service | 28 +++++++
extra-i686/PKGBUILD | 65 ------------------
extra-i686/net-dns.patch | 27 -------
extra-i686/spamassassin.install | 38 ----------
extra-i686/spamassassin.service | 14 ---
extra-x86_64/PKGBUILD | 65 ------------------
extra-x86_64/net-dns.patch | 27 -------
extra-x86_64/spamassassin.install | 38 ----------
extra-x86_64/spamassassin.service | 14 ---
12 files changed, 316 insertions(+), 288 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2014-06-08 07:53:16 UTC (rev 214375)
+++ extra-i686/PKGBUILD 2014-06-08 07:55:08 UTC (rev 214376)
@@ -1,65 +0,0 @@
-# $Id$
-# Maintainer: Florian Pritz <bluewind at xinu.at>
-# Contributor: Dale Blount <dale at archlinux.org>
-# Contributor: Manolis Tzanidakis
-pkgname=spamassassin
-pkgver=3.4.0
-pkgrel=2
-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"
-source=("http://www.us.apache.org/dist/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz"{,.asc}
- 'spamassassin.service' net-dns.patch)
-md5sums=('5d0b50cee3bfa905cca35c33296c8c2a'
- 'SKIP'
- 'd0ce5f8a02fd74dbc83632f4aaec6185'
- 'bd27e3a54784a0a519d3abff3fa82392')
-
-prepare() {
- cd "${srcdir}/Mail-SpamAssassin-${pkgver}"
-
- sed -i t/sa_compile.t \
- -e 's#/foo/bin/spamassassin#/foo/bin/site_perl/spamassassin#' \
- -e 's#/foo/bin/sa-compile#/foo/bin/site_perl/sa-compile#'
-
- patch -p1 -i "$srcdir/net-dns.patch"
-}
-
-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}"
-
- # 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"
- install -d -o 182 -g 182 -m 755 "$pkgdir/var/lib/spamassassin"
-}
Copied: spamassassin/repos/extra-i686/PKGBUILD (from rev 214375, spamassassin/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-06-08 07:55:08 UTC (rev 214376)
@@ -0,0 +1,65 @@
+# $Id$
+# Maintainer: Florian Pritz <bluewind at xinu.at>
+# Contributor: Dale Blount <dale at archlinux.org>
+# Contributor: Manolis Tzanidakis
+pkgname=spamassassin
+pkgver=3.4.0
+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/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"
+source=("http://www.us.apache.org/dist/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz"{,.asc}
+ 'spamassassin.service' net-dns.patch)
+md5sums=('5d0b50cee3bfa905cca35c33296c8c2a'
+ 'SKIP'
+ 'd0ce5f8a02fd74dbc83632f4aaec6185'
+ '0bcf0419608ec4ac200e794563620f31')
+
+prepare() {
+ cd "${srcdir}/Mail-SpamAssassin-${pkgver}"
+
+ sed -i t/sa_compile.t \
+ -e 's#/foo/bin/spamassassin#/foo/bin/site_perl/spamassassin#' \
+ -e 's#/foo/bin/sa-compile#/foo/bin/site_perl/sa-compile#'
+
+ patch -p1 -i "$srcdir/net-dns.patch"
+}
+
+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}"
+
+ # 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"
+ install -d -o 182 -g 182 -m 755 "$pkgdir/var/lib/spamassassin"
+}
Deleted: extra-i686/net-dns.patch
===================================================================
--- extra-i686/net-dns.patch 2014-06-08 07:53:16 UTC (rev 214375)
+++ extra-i686/net-dns.patch 2014-06-08 07:55:08 UTC (rev 214376)
@@ -1,27 +0,0 @@
-Fix FS#40707 by disabling the failing version check. We don't ship versions that old anyway.
-
----
-diff -Nur a/lib/Mail/SpamAssassin/Dns.pm b/lib/Mail/SpamAssassin/Dns.pm
---- a/lib/Mail/SpamAssassin/Dns.pm 2014-06-05 19:34:56.299391918 +0200
-+++ b/lib/Mail/SpamAssassin/Dns.pm 2014-06-05 19:35:56.816256160 +0200
-@@ -518,7 +518,7 @@
- }
- }
- else {
-- if ($Net::DNS::VERSION < 0.34) {
-+ if (0) {
- warn("dns: Net::DNS version is $Net::DNS::VERSION, but need 0.34");
- return $IS_DNS_AVAILABLE;
- }
-diff -Nur a/lib/Mail/SpamAssassin/Plugin/AskDNS.pm Mail-SpamAssassin-3.4.0/lib/Mail/SpamAssassin/Plugin/AskDNS.pm
---- a/lib/Mail/SpamAssassin/Plugin/AskDNS.pm 2014-06-05 19:34:56.302725263 +0200
-+++ b/lib/Mail/SpamAssassin/Plugin/AskDNS.pm 2014-06-05 19:35:30.086168916 +0200
-@@ -211,7 +211,7 @@
-
- $self->set_config($sa_main->{conf});
-
-- $txtdata_can_provide_a_list = Net::DNS->VERSION >= 0.69;
-+ $txtdata_can_provide_a_list = 1;
-
- return $self;
- }
Copied: spamassassin/repos/extra-i686/net-dns.patch (from rev 214375, spamassassin/trunk/net-dns.patch)
===================================================================
--- extra-i686/net-dns.patch (rev 0)
+++ extra-i686/net-dns.patch 2014-06-08 07:55:08 UTC (rev 214376)
@@ -0,0 +1,41 @@
+Fix FS#40707 by
+
+- disabling the failing version check. We don't ship versions that old anyway.
+- fix nameservers fetching from Net::DNS
+
+---
+diff -Nur a/lib/Mail/SpamAssassin/Dns.pm b/lib/Mail/SpamAssassin/Dns.pm
+--- a/lib/Mail/SpamAssassin/Dns.pm 2014-06-05 19:34:56.299391918 +0200
++++ b/lib/Mail/SpamAssassin/Dns.pm 2014-06-05 19:35:56.816256160 +0200
+@@ -518,7 +518,7 @@
+ }
+ }
+ else {
+- if ($Net::DNS::VERSION < 0.34) {
++ if (0) {
+ warn("dns: Net::DNS version is $Net::DNS::VERSION, but need 0.34");
+ return $IS_DNS_AVAILABLE;
+ }
+diff -Nur a/lib/Mail/SpamAssassin/Plugin/AskDNS.pm Mail-SpamAssassin-3.4.0/lib/Mail/SpamAssassin/Plugin/AskDNS.pm
+--- a/lib/Mail/SpamAssassin/Plugin/AskDNS.pm 2014-06-05 19:34:56.302725263 +0200
++++ b/lib/Mail/SpamAssassin/Plugin/AskDNS.pm 2014-06-05 19:35:30.086168916 +0200
+@@ -211,7 +211,7 @@
+
+ $self->set_config($sa_main->{conf});
+
+- $txtdata_can_provide_a_list = Net::DNS->VERSION >= 0.69;
++ $txtdata_can_provide_a_list = 1;
+
+ return $self;
+ }
+--- a/lib/Mail/SpamAssassin/DnsResolver.pm 2014-06-08 12:48:29.064230952 +0800
++++ b/lib/Mail/SpamAssassin/DnsResolver.pm 2014-06-08 12:49:06.961872678 +0800
+@@ -205,7 +205,7 @@
+ dbg("dns: servers set by config to: %s", join(', ', at ns_addr_port));
+ } elsif ($res) { # default as provided by Net::DNS, e.g. /etc/resolv.conf
+ @ns_addr_port = map(untaint_var("[$_]:" . $res->{port}),
+- @{$res->{nameservers}});
++ $res->nameservers);
+ dbg("dns: servers obtained from Net::DNS : %s", join(', ', at ns_addr_port));
+ }
+ return @ns_addr_port;
Deleted: extra-i686/spamassassin.install
===================================================================
--- extra-i686/spamassassin.install 2014-06-08 07:53:16 UTC (rev 214375)
+++ extra-i686/spamassassin.install 2014-06-08 07:55:08 UTC (rev 214376)
@@ -1,38 +0,0 @@
-setup_user() {
- getent group spamd &>/dev/null || groupadd -g 182 spamd >/dev/null
- getent passwd spamd &>/dev/null || useradd -u 182 -d /var/lib/spamassassin -g spamd -s /bin/false spamd >/dev/null
-
- if [[ -d /var/lib/spamassassin ]]; then
- chown spamd:spamd /var/lib/spamassassin
- fi
-
- true
-}
-
-post_install() {
- echo "You must run 'sa-update' to install spam rules before use."
- setup_user
-}
-
-post_upgrade() {
- setup_user
- if [ "$(vercmp $2 3.4)" -lt 0 ]; then
- echo '/var/lib/spamassassin is now owned by the spamd user. spamassassin.service'
- echo 'will also run under that user. You may need to adjust your setup.'
- fi
-
- # 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
-
- true
-}
-
-pre_remove() {
- getent passwd spamd &>/dev/null && userdel spamd >/dev/null
- getent group spamd &>/dev/null && groupdel spamd >/dev/null
- true
-}
-
Copied: spamassassin/repos/extra-i686/spamassassin.install (from rev 214375, spamassassin/trunk/spamassassin.install)
===================================================================
--- extra-i686/spamassassin.install (rev 0)
+++ extra-i686/spamassassin.install 2014-06-08 07:55:08 UTC (rev 214376)
@@ -0,0 +1,38 @@
+setup_user() {
+ getent group spamd &>/dev/null || groupadd -g 182 spamd >/dev/null
+ getent passwd spamd &>/dev/null || useradd -u 182 -d /var/lib/spamassassin -g spamd -s /bin/false spamd >/dev/null
+
+ if [[ -d /var/lib/spamassassin ]]; then
+ chown spamd:spamd /var/lib/spamassassin
+ fi
+
+ true
+}
+
+post_install() {
+ echo "You must run 'sa-update' to install spam rules before use."
+ setup_user
+}
+
+post_upgrade() {
+ setup_user
+ if [ "$(vercmp $2 3.4)" -lt 0 ]; then
+ echo '/var/lib/spamassassin is now owned by the spamd user. spamassassin.service'
+ echo 'will also run under that user. You may need to adjust your setup.'
+ fi
+
+ # 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
+
+ true
+}
+
+pre_remove() {
+ getent passwd spamd &>/dev/null && userdel spamd >/dev/null
+ getent group spamd &>/dev/null && groupdel spamd >/dev/null
+ true
+}
+
Deleted: extra-i686/spamassassin.service
===================================================================
--- extra-i686/spamassassin.service 2014-06-08 07:53:16 UTC (rev 214375)
+++ extra-i686/spamassassin.service 2014-06-08 07:55:08 UTC (rev 214376)
@@ -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 -c -x --virtual-config-dir=/var/lib/spamassassin -u spamd -g spamd
-StandardOutput=syslog
-StandardError=syslog
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
Copied: spamassassin/repos/extra-i686/spamassassin.service (from rev 214375, spamassassin/trunk/spamassassin.service)
===================================================================
--- extra-i686/spamassassin.service (rev 0)
+++ extra-i686/spamassassin.service 2014-06-08 07:55:08 UTC (rev 214376)
@@ -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 -c -x --virtual-config-dir=/var/lib/spamassassin -u spamd -g spamd
+StandardOutput=syslog
+StandardError=syslog
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2014-06-08 07:53:16 UTC (rev 214375)
+++ extra-x86_64/PKGBUILD 2014-06-08 07:55:08 UTC (rev 214376)
@@ -1,65 +0,0 @@
-# $Id$
-# Maintainer: Florian Pritz <bluewind at xinu.at>
-# Contributor: Dale Blount <dale at archlinux.org>
-# Contributor: Manolis Tzanidakis
-pkgname=spamassassin
-pkgver=3.4.0
-pkgrel=2
-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"
-source=("http://www.us.apache.org/dist/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz"{,.asc}
- 'spamassassin.service' net-dns.patch)
-md5sums=('5d0b50cee3bfa905cca35c33296c8c2a'
- 'SKIP'
- 'd0ce5f8a02fd74dbc83632f4aaec6185'
- 'bd27e3a54784a0a519d3abff3fa82392')
-
-prepare() {
- cd "${srcdir}/Mail-SpamAssassin-${pkgver}"
-
- sed -i t/sa_compile.t \
- -e 's#/foo/bin/spamassassin#/foo/bin/site_perl/spamassassin#' \
- -e 's#/foo/bin/sa-compile#/foo/bin/site_perl/sa-compile#'
-
- patch -p1 -i "$srcdir/net-dns.patch"
-}
-
-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}"
-
- # 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"
- install -d -o 182 -g 182 -m 755 "$pkgdir/var/lib/spamassassin"
-}
Copied: spamassassin/repos/extra-x86_64/PKGBUILD (from rev 214375, spamassassin/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2014-06-08 07:55:08 UTC (rev 214376)
@@ -0,0 +1,65 @@
+# $Id$
+# Maintainer: Florian Pritz <bluewind at xinu.at>
+# Contributor: Dale Blount <dale at archlinux.org>
+# Contributor: Manolis Tzanidakis
+pkgname=spamassassin
+pkgver=3.4.0
+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/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"
+source=("http://www.us.apache.org/dist/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz"{,.asc}
+ 'spamassassin.service' net-dns.patch)
+md5sums=('5d0b50cee3bfa905cca35c33296c8c2a'
+ 'SKIP'
+ 'd0ce5f8a02fd74dbc83632f4aaec6185'
+ '0bcf0419608ec4ac200e794563620f31')
+
+prepare() {
+ cd "${srcdir}/Mail-SpamAssassin-${pkgver}"
+
+ sed -i t/sa_compile.t \
+ -e 's#/foo/bin/spamassassin#/foo/bin/site_perl/spamassassin#' \
+ -e 's#/foo/bin/sa-compile#/foo/bin/site_perl/sa-compile#'
+
+ patch -p1 -i "$srcdir/net-dns.patch"
+}
+
+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}"
+
+ # 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"
+ install -d -o 182 -g 182 -m 755 "$pkgdir/var/lib/spamassassin"
+}
Deleted: extra-x86_64/net-dns.patch
===================================================================
--- extra-x86_64/net-dns.patch 2014-06-08 07:53:16 UTC (rev 214375)
+++ extra-x86_64/net-dns.patch 2014-06-08 07:55:08 UTC (rev 214376)
@@ -1,27 +0,0 @@
-Fix FS#40707 by disabling the failing version check. We don't ship versions that old anyway.
-
----
-diff -Nur a/lib/Mail/SpamAssassin/Dns.pm b/lib/Mail/SpamAssassin/Dns.pm
---- a/lib/Mail/SpamAssassin/Dns.pm 2014-06-05 19:34:56.299391918 +0200
-+++ b/lib/Mail/SpamAssassin/Dns.pm 2014-06-05 19:35:56.816256160 +0200
-@@ -518,7 +518,7 @@
- }
- }
- else {
-- if ($Net::DNS::VERSION < 0.34) {
-+ if (0) {
- warn("dns: Net::DNS version is $Net::DNS::VERSION, but need 0.34");
- return $IS_DNS_AVAILABLE;
- }
-diff -Nur a/lib/Mail/SpamAssassin/Plugin/AskDNS.pm Mail-SpamAssassin-3.4.0/lib/Mail/SpamAssassin/Plugin/AskDNS.pm
---- a/lib/Mail/SpamAssassin/Plugin/AskDNS.pm 2014-06-05 19:34:56.302725263 +0200
-+++ b/lib/Mail/SpamAssassin/Plugin/AskDNS.pm 2014-06-05 19:35:30.086168916 +0200
-@@ -211,7 +211,7 @@
-
- $self->set_config($sa_main->{conf});
-
-- $txtdata_can_provide_a_list = Net::DNS->VERSION >= 0.69;
-+ $txtdata_can_provide_a_list = 1;
-
- return $self;
- }
Copied: spamassassin/repos/extra-x86_64/net-dns.patch (from rev 214375, spamassassin/trunk/net-dns.patch)
===================================================================
--- extra-x86_64/net-dns.patch (rev 0)
+++ extra-x86_64/net-dns.patch 2014-06-08 07:55:08 UTC (rev 214376)
@@ -0,0 +1,41 @@
+Fix FS#40707 by
+
+- disabling the failing version check. We don't ship versions that old anyway.
+- fix nameservers fetching from Net::DNS
+
+---
+diff -Nur a/lib/Mail/SpamAssassin/Dns.pm b/lib/Mail/SpamAssassin/Dns.pm
+--- a/lib/Mail/SpamAssassin/Dns.pm 2014-06-05 19:34:56.299391918 +0200
++++ b/lib/Mail/SpamAssassin/Dns.pm 2014-06-05 19:35:56.816256160 +0200
+@@ -518,7 +518,7 @@
+ }
+ }
+ else {
+- if ($Net::DNS::VERSION < 0.34) {
++ if (0) {
+ warn("dns: Net::DNS version is $Net::DNS::VERSION, but need 0.34");
+ return $IS_DNS_AVAILABLE;
+ }
+diff -Nur a/lib/Mail/SpamAssassin/Plugin/AskDNS.pm Mail-SpamAssassin-3.4.0/lib/Mail/SpamAssassin/Plugin/AskDNS.pm
+--- a/lib/Mail/SpamAssassin/Plugin/AskDNS.pm 2014-06-05 19:34:56.302725263 +0200
++++ b/lib/Mail/SpamAssassin/Plugin/AskDNS.pm 2014-06-05 19:35:30.086168916 +0200
+@@ -211,7 +211,7 @@
+
+ $self->set_config($sa_main->{conf});
+
+- $txtdata_can_provide_a_list = Net::DNS->VERSION >= 0.69;
++ $txtdata_can_provide_a_list = 1;
+
+ return $self;
+ }
+--- a/lib/Mail/SpamAssassin/DnsResolver.pm 2014-06-08 12:48:29.064230952 +0800
++++ b/lib/Mail/SpamAssassin/DnsResolver.pm 2014-06-08 12:49:06.961872678 +0800
+@@ -205,7 +205,7 @@
+ dbg("dns: servers set by config to: %s", join(', ', at ns_addr_port));
+ } elsif ($res) { # default as provided by Net::DNS, e.g. /etc/resolv.conf
+ @ns_addr_port = map(untaint_var("[$_]:" . $res->{port}),
+- @{$res->{nameservers}});
++ $res->nameservers);
+ dbg("dns: servers obtained from Net::DNS : %s", join(', ', at ns_addr_port));
+ }
+ return @ns_addr_port;
Deleted: extra-x86_64/spamassassin.install
===================================================================
--- extra-x86_64/spamassassin.install 2014-06-08 07:53:16 UTC (rev 214375)
+++ extra-x86_64/spamassassin.install 2014-06-08 07:55:08 UTC (rev 214376)
@@ -1,38 +0,0 @@
-setup_user() {
- getent group spamd &>/dev/null || groupadd -g 182 spamd >/dev/null
- getent passwd spamd &>/dev/null || useradd -u 182 -d /var/lib/spamassassin -g spamd -s /bin/false spamd >/dev/null
-
- if [[ -d /var/lib/spamassassin ]]; then
- chown spamd:spamd /var/lib/spamassassin
- fi
-
- true
-}
-
-post_install() {
- echo "You must run 'sa-update' to install spam rules before use."
- setup_user
-}
-
-post_upgrade() {
- setup_user
- if [ "$(vercmp $2 3.4)" -lt 0 ]; then
- echo '/var/lib/spamassassin is now owned by the spamd user. spamassassin.service'
- echo 'will also run under that user. You may need to adjust your setup.'
- fi
-
- # 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
-
- true
-}
-
-pre_remove() {
- getent passwd spamd &>/dev/null && userdel spamd >/dev/null
- getent group spamd &>/dev/null && groupdel spamd >/dev/null
- true
-}
-
Copied: spamassassin/repos/extra-x86_64/spamassassin.install (from rev 214375, spamassassin/trunk/spamassassin.install)
===================================================================
--- extra-x86_64/spamassassin.install (rev 0)
+++ extra-x86_64/spamassassin.install 2014-06-08 07:55:08 UTC (rev 214376)
@@ -0,0 +1,38 @@
+setup_user() {
+ getent group spamd &>/dev/null || groupadd -g 182 spamd >/dev/null
+ getent passwd spamd &>/dev/null || useradd -u 182 -d /var/lib/spamassassin -g spamd -s /bin/false spamd >/dev/null
+
+ if [[ -d /var/lib/spamassassin ]]; then
+ chown spamd:spamd /var/lib/spamassassin
+ fi
+
+ true
+}
+
+post_install() {
+ echo "You must run 'sa-update' to install spam rules before use."
+ setup_user
+}
+
+post_upgrade() {
+ setup_user
+ if [ "$(vercmp $2 3.4)" -lt 0 ]; then
+ echo '/var/lib/spamassassin is now owned by the spamd user. spamassassin.service'
+ echo 'will also run under that user. You may need to adjust your setup.'
+ fi
+
+ # 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
+
+ true
+}
+
+pre_remove() {
+ getent passwd spamd &>/dev/null && userdel spamd >/dev/null
+ getent group spamd &>/dev/null && groupdel spamd >/dev/null
+ true
+}
+
Deleted: extra-x86_64/spamassassin.service
===================================================================
--- extra-x86_64/spamassassin.service 2014-06-08 07:53:16 UTC (rev 214375)
+++ extra-x86_64/spamassassin.service 2014-06-08 07:55:08 UTC (rev 214376)
@@ -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 -c -x --virtual-config-dir=/var/lib/spamassassin -u spamd -g spamd
-StandardOutput=syslog
-StandardError=syslog
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
Copied: spamassassin/repos/extra-x86_64/spamassassin.service (from rev 214375, spamassassin/trunk/spamassassin.service)
===================================================================
--- extra-x86_64/spamassassin.service (rev 0)
+++ extra-x86_64/spamassassin.service 2014-06-08 07:55:08 UTC (rev 214376)
@@ -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 -c -x --virtual-config-dir=/var/lib/spamassassin -u spamd -g spamd
+StandardOutput=syslog
+StandardError=syslog
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
More information about the arch-commits
mailing list