[arch-commits] Commit in spamassassin/repos (14 files)
Florian Pritz
bluewind at nymeria.archlinux.org
Wed Jun 5 15:55:32 UTC 2013
Date: Wednesday, June 5, 2013 @ 17:55:32
Author: bluewind
Revision: 187368
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
spamassassin/repos/extra-i686/PKGBUILD
(from rev 187367, spamassassin/trunk/PKGBUILD)
spamassassin/repos/extra-i686/perl-5.18-fixes.patch
(from rev 187367, spamassassin/trunk/perl-5.18-fixes.patch)
spamassassin/repos/extra-i686/spamassassin.install
(from rev 187367, spamassassin/trunk/spamassassin.install)
spamassassin/repos/extra-i686/spamassassin.service
(from rev 187367, spamassassin/trunk/spamassassin.service)
spamassassin/repos/extra-x86_64/PKGBUILD
(from rev 187367, spamassassin/trunk/PKGBUILD)
spamassassin/repos/extra-x86_64/perl-5.18-fixes.patch
(from rev 187367, spamassassin/trunk/perl-5.18-fixes.patch)
spamassassin/repos/extra-x86_64/spamassassin.install
(from rev 187367, spamassassin/trunk/spamassassin.install)
spamassassin/repos/extra-x86_64/spamassassin.service
(from rev 187367, 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-x86_64/PKGBUILD
spamassassin/repos/extra-x86_64/spamassassin.install
spamassassin/repos/extra-x86_64/spamassassin.service
------------------------------------+
/PKGBUILD | 128 +++++++++++++++++++++++++++++++++++
/spamassassin.install | 22 ++++++
/spamassassin.service | 28 +++++++
extra-i686/PKGBUILD | 56 ---------------
extra-i686/perl-5.18-fixes.patch | 97 ++++++++++++++++++++++++++
extra-i686/spamassassin.install | 11 ---
extra-i686/spamassassin.service | 14 ---
extra-x86_64/PKGBUILD | 56 ---------------
extra-x86_64/perl-5.18-fixes.patch | 97 ++++++++++++++++++++++++++
extra-x86_64/spamassassin.install | 11 ---
extra-x86_64/spamassassin.service | 14 ---
11 files changed, 372 insertions(+), 162 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2013-06-05 15:55:24 UTC (rev 187367)
+++ extra-i686/PKGBUILD 2013-06-05 15:55:32 UTC (rev 187368)
@@ -1,56 +0,0 @@
-# $Id$
-# Maintainer: Florian Pritz <bluewind at xinu.at>
-# Contributor: Dale Blount <dale at 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 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}/spamassassin.service" "${pkgdir}/usr/lib/systemd/system/spamassassin.service"
-}
Copied: spamassassin/repos/extra-i686/PKGBUILD (from rev 187367, spamassassin/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-06-05 15:55:32 UTC (rev 187368)
@@ -0,0 +1,64 @@
+# $Id$
+# Maintainer: Florian Pritz <bluewind at xinu.at>
+# Contributor: Dale Blount <dale at archlinux.org>
+# Contributor: Manolis Tzanidakis
+pkgname=spamassassin
+pkgver=3.3.2
+pkgrel=9
+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'
+ 'perl-5.18-fixes.patch')
+md5sums=('d1d62cc5c6eac57e88c4006d9633b81e'
+ 'b8dcea016fb73b074b941e832cfae5c9'
+ '6cf63928eeeaea25967c2ffd875d106a')
+
+prepare() {
+ cd "${srcdir}/Mail-SpamAssassin-${pkgver}"
+
+ patch -p0 -d lib -i "$srcdir/perl-5.18-fixes.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}"
+
+ # 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"
+}
Copied: spamassassin/repos/extra-i686/perl-5.18-fixes.patch (from rev 187367, spamassassin/trunk/perl-5.18-fixes.patch)
===================================================================
--- extra-i686/perl-5.18-fixes.patch (rev 0)
+++ extra-i686/perl-5.18-fixes.patch 2013-06-05 15:55:32 UTC (rev 187368)
@@ -0,0 +1,97 @@
+--- Mail/SpamAssassin/AsyncLoop.pm~ 2011-06-07 01:59:17.000000000 +0200
++++ Mail/SpamAssassin/AsyncLoop.pm 2013-05-29 01:37:58.000000000 +0200
+@@ -361,5 +361,12 @@
+ $now = time; # capture new timestamp, after possible sleep in 'select'
+
+- while (my($key,$ent) = each %$pending) {
++ # A callback routine may generate another DNS query, which may insert
++ # an entry into the %$pending hash thus invalidating the each() context.
++ # So, make sure that callbacks are not called while the each() context
++ # is open, or avoid using each(). [Bug 6937]
++ #
++ # while (my($key,$ent) = each %$pending) {
++ foreach my $key (keys %$pending) {
++ my $ent = $pending->{$key};
+ my $id = $ent->{id};
+ if (defined $ent->{poll_callback}) { # call a "poll_callback" if exists
+@@ -449,5 +456,6 @@
+ my $foundcnt = 0;
+ my $now = time;
+- while (my($key,$ent) = each %$pending) {
++ foreach my $key (keys %$pending) {
++ my $ent = $pending->{$key};
+ dbg("async: aborting after %.3f s, %s: %s",
+ $now - $ent->{start_time},
+--- Mail/SpamAssassin/Conf/Parser.pm~ 2011-06-07 01:59:17.000000000 +0200
++++ Mail/SpamAssassin/Conf/Parser.pm 2013-05-29 01:32:06.000000000 +0200
+@@ -1249,5 +1249,5 @@
+ my $mods = '';
+ local ($1,$2);
+- if ($re =~ s/^m{//) {
++ if ($re =~ s/^m\{//) {
+ $re =~ s/}([a-z]*)$//; $mods = $1;
+ }
+--- Mail/SpamAssassin/DnsResolver.pm~ 2011-06-07 01:59:17.000000000 +0200
++++ Mail/SpamAssassin/DnsResolver.pm 2013-05-29 01:32:06.000000000 +0200
+@@ -441,8 +441,14 @@
+ if (!defined($timeout) || $timeout > 0)
+ { $timer = $self->{main}->time_method("poll_dns_idle") }
++ $! = 0;
+ ($nfound, $timeleft) = select($rout=$rin, undef, undef, $timeout);
+ }
+ if (!defined $nfound || $nfound < 0) {
+- warn "dns: select failed: $!";
++ if ($!) { warn "dns: select failed: $!\n" }
++ else { info("dns: select interrupted") }
++ return;
++ } elsif (!$nfound) {
++ if (!defined $timeout) { warn("dns: select returned empty-handed\n") }
++ elsif ($timeout > 0) { dbg("dns: select timed out %.3f s", $timeout) }
+ return;
+ }
+--- Mail/SpamAssassin/Message.pm~ 2011-06-07 01:59:17.000000000 +0200
++++ Mail/SpamAssassin/Message.pm 2013-05-29 01:32:06.000000000 +0200
+@@ -567,5 +567,5 @@
+ # bug 5557: windows requires tmp file be closed before it can be rm'd
+ if (ref $part->{'raw'} eq 'GLOB') {
+- close($part->{'raw'}) or die "error closing input file: $!";
++ close($part->{'raw'}) or warn "error closing input file: $!";
+ }
+
+--- Mail/SpamAssassin/PerMsgStatus.pm~ 2011-06-07 01:59:17.000000000 +0200
++++ Mail/SpamAssassin/PerMsgStatus.pm 2013-05-29 01:32:06.000000000 +0200
+@@ -421,6 +421,6 @@
+ }
+
+- # ignore tests with 0 score in this scoreset
+- next if ($scores->{$test} == 0);
++ # ignore tests with 0 score (or undefined) in this scoreset
++ next if !$scores->{$test};
+
+ # Go ahead and add points to the proper locations
+@@ -1253,11 +1253,10 @@
+ my $line = '';
+ foreach my $test (sort @{$self->{test_names_hit}}) {
+- if (!$line) {
+- $line .= $test . "=" . $self->{conf}->{scores}->{$test};
+- } else {
+- $line .= $arg . $test . "=" . $self->{conf}->{scores}->{$test};
+- }
++ my $score = $self->{conf}->{scores}->{$test};
++ $score = '0' if !defined $score;
++ $line .= $arg if $line ne '';
++ $line .= $test . "=" . $score;
+ }
+- $line ? $line : 'none';
++ $line ne '' ? $line : 'none';
+ },
+
+--- Mail/SpamAssassin/Util.pm~ 2013-05-29 01:29:59.000000000 +0200
++++ Mail/SpamAssassin/Util.pm 2013-05-29 01:33:16.000000000 +0200
+@@ -1588,5 +1588,5 @@
+ return undef; # invalid
+ }
+- elsif ($re =~ s/^m{//) { # m{foo/bar}
++ elsif ($re =~ s/^m\{//) { # m{foo/bar}
+ $delim = '}';
+ }
Deleted: extra-i686/spamassassin.install
===================================================================
--- extra-i686/spamassassin.install 2013-06-05 15:55:24 UTC (rev 187367)
+++ extra-i686/spamassassin.install 2013-06-05 15:55:32 UTC (rev 187368)
@@ -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 187367, spamassassin/trunk/spamassassin.install)
===================================================================
--- extra-i686/spamassassin.install (rev 0)
+++ extra-i686/spamassassin.install 2013-06-05 15:55:32 UTC (rev 187368)
@@ -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-06-05 15:55:24 UTC (rev 187367)
+++ extra-i686/spamassassin.service 2013-06-05 15:55:32 UTC (rev 187368)
@@ -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 187367, spamassassin/trunk/spamassassin.service)
===================================================================
--- extra-i686/spamassassin.service (rev 0)
+++ extra-i686/spamassassin.service 2013-06-05 15:55:32 UTC (rev 187368)
@@ -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 nobody
+StandardOutput=syslog
+StandardError=syslog
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2013-06-05 15:55:24 UTC (rev 187367)
+++ extra-x86_64/PKGBUILD 2013-06-05 15:55:32 UTC (rev 187368)
@@ -1,56 +0,0 @@
-# $Id$
-# Maintainer: Florian Pritz <bluewind at xinu.at>
-# Contributor: Dale Blount <dale at 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 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}/spamassassin.service" "${pkgdir}/usr/lib/systemd/system/spamassassin.service"
-}
Copied: spamassassin/repos/extra-x86_64/PKGBUILD (from rev 187367, spamassassin/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2013-06-05 15:55:32 UTC (rev 187368)
@@ -0,0 +1,64 @@
+# $Id$
+# Maintainer: Florian Pritz <bluewind at xinu.at>
+# Contributor: Dale Blount <dale at archlinux.org>
+# Contributor: Manolis Tzanidakis
+pkgname=spamassassin
+pkgver=3.3.2
+pkgrel=9
+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'
+ 'perl-5.18-fixes.patch')
+md5sums=('d1d62cc5c6eac57e88c4006d9633b81e'
+ 'b8dcea016fb73b074b941e832cfae5c9'
+ '6cf63928eeeaea25967c2ffd875d106a')
+
+prepare() {
+ cd "${srcdir}/Mail-SpamAssassin-${pkgver}"
+
+ patch -p0 -d lib -i "$srcdir/perl-5.18-fixes.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}"
+
+ # 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"
+}
Copied: spamassassin/repos/extra-x86_64/perl-5.18-fixes.patch (from rev 187367, spamassassin/trunk/perl-5.18-fixes.patch)
===================================================================
--- extra-x86_64/perl-5.18-fixes.patch (rev 0)
+++ extra-x86_64/perl-5.18-fixes.patch 2013-06-05 15:55:32 UTC (rev 187368)
@@ -0,0 +1,97 @@
+--- Mail/SpamAssassin/AsyncLoop.pm~ 2011-06-07 01:59:17.000000000 +0200
++++ Mail/SpamAssassin/AsyncLoop.pm 2013-05-29 01:37:58.000000000 +0200
+@@ -361,5 +361,12 @@
+ $now = time; # capture new timestamp, after possible sleep in 'select'
+
+- while (my($key,$ent) = each %$pending) {
++ # A callback routine may generate another DNS query, which may insert
++ # an entry into the %$pending hash thus invalidating the each() context.
++ # So, make sure that callbacks are not called while the each() context
++ # is open, or avoid using each(). [Bug 6937]
++ #
++ # while (my($key,$ent) = each %$pending) {
++ foreach my $key (keys %$pending) {
++ my $ent = $pending->{$key};
+ my $id = $ent->{id};
+ if (defined $ent->{poll_callback}) { # call a "poll_callback" if exists
+@@ -449,5 +456,6 @@
+ my $foundcnt = 0;
+ my $now = time;
+- while (my($key,$ent) = each %$pending) {
++ foreach my $key (keys %$pending) {
++ my $ent = $pending->{$key};
+ dbg("async: aborting after %.3f s, %s: %s",
+ $now - $ent->{start_time},
+--- Mail/SpamAssassin/Conf/Parser.pm~ 2011-06-07 01:59:17.000000000 +0200
++++ Mail/SpamAssassin/Conf/Parser.pm 2013-05-29 01:32:06.000000000 +0200
+@@ -1249,5 +1249,5 @@
+ my $mods = '';
+ local ($1,$2);
+- if ($re =~ s/^m{//) {
++ if ($re =~ s/^m\{//) {
+ $re =~ s/}([a-z]*)$//; $mods = $1;
+ }
+--- Mail/SpamAssassin/DnsResolver.pm~ 2011-06-07 01:59:17.000000000 +0200
++++ Mail/SpamAssassin/DnsResolver.pm 2013-05-29 01:32:06.000000000 +0200
+@@ -441,8 +441,14 @@
+ if (!defined($timeout) || $timeout > 0)
+ { $timer = $self->{main}->time_method("poll_dns_idle") }
++ $! = 0;
+ ($nfound, $timeleft) = select($rout=$rin, undef, undef, $timeout);
+ }
+ if (!defined $nfound || $nfound < 0) {
+- warn "dns: select failed: $!";
++ if ($!) { warn "dns: select failed: $!\n" }
++ else { info("dns: select interrupted") }
++ return;
++ } elsif (!$nfound) {
++ if (!defined $timeout) { warn("dns: select returned empty-handed\n") }
++ elsif ($timeout > 0) { dbg("dns: select timed out %.3f s", $timeout) }
+ return;
+ }
+--- Mail/SpamAssassin/Message.pm~ 2011-06-07 01:59:17.000000000 +0200
++++ Mail/SpamAssassin/Message.pm 2013-05-29 01:32:06.000000000 +0200
+@@ -567,5 +567,5 @@
+ # bug 5557: windows requires tmp file be closed before it can be rm'd
+ if (ref $part->{'raw'} eq 'GLOB') {
+- close($part->{'raw'}) or die "error closing input file: $!";
++ close($part->{'raw'}) or warn "error closing input file: $!";
+ }
+
+--- Mail/SpamAssassin/PerMsgStatus.pm~ 2011-06-07 01:59:17.000000000 +0200
++++ Mail/SpamAssassin/PerMsgStatus.pm 2013-05-29 01:32:06.000000000 +0200
+@@ -421,6 +421,6 @@
+ }
+
+- # ignore tests with 0 score in this scoreset
+- next if ($scores->{$test} == 0);
++ # ignore tests with 0 score (or undefined) in this scoreset
++ next if !$scores->{$test};
+
+ # Go ahead and add points to the proper locations
+@@ -1253,11 +1253,10 @@
+ my $line = '';
+ foreach my $test (sort @{$self->{test_names_hit}}) {
+- if (!$line) {
+- $line .= $test . "=" . $self->{conf}->{scores}->{$test};
+- } else {
+- $line .= $arg . $test . "=" . $self->{conf}->{scores}->{$test};
+- }
++ my $score = $self->{conf}->{scores}->{$test};
++ $score = '0' if !defined $score;
++ $line .= $arg if $line ne '';
++ $line .= $test . "=" . $score;
+ }
+- $line ? $line : 'none';
++ $line ne '' ? $line : 'none';
+ },
+
+--- Mail/SpamAssassin/Util.pm~ 2013-05-29 01:29:59.000000000 +0200
++++ Mail/SpamAssassin/Util.pm 2013-05-29 01:33:16.000000000 +0200
+@@ -1588,5 +1588,5 @@
+ return undef; # invalid
+ }
+- elsif ($re =~ s/^m{//) { # m{foo/bar}
++ elsif ($re =~ s/^m\{//) { # m{foo/bar}
+ $delim = '}';
+ }
Deleted: extra-x86_64/spamassassin.install
===================================================================
--- extra-x86_64/spamassassin.install 2013-06-05 15:55:24 UTC (rev 187367)
+++ extra-x86_64/spamassassin.install 2013-06-05 15:55:32 UTC (rev 187368)
@@ -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 187367, spamassassin/trunk/spamassassin.install)
===================================================================
--- extra-x86_64/spamassassin.install (rev 0)
+++ extra-x86_64/spamassassin.install 2013-06-05 15:55:32 UTC (rev 187368)
@@ -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-06-05 15:55:24 UTC (rev 187367)
+++ extra-x86_64/spamassassin.service 2013-06-05 15:55:32 UTC (rev 187368)
@@ -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 187367, spamassassin/trunk/spamassassin.service)
===================================================================
--- extra-x86_64/spamassassin.service (rev 0)
+++ extra-x86_64/spamassassin.service 2013-06-05 15:55:32 UTC (rev 187368)
@@ -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 nobody
+StandardOutput=syslog
+StandardError=syslog
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
More information about the arch-commits
mailing list