[arch-commits] Commit in spamassassin/trunk (3 files)
Date: Sunday, April 28, 2019 @ 12:30:45
Author: bluewind
Revision: 352207
upgpkg: spamassassin 3.4.2-2
FS#61855 - [spamassassin] Allow local socket connection instead of just TCP/IP
connection
Added:
spamassassin/trunk/spamassassin.tmpfiles.d
Modified:
spamassassin/trunk/PKGBUILD
spamassassin/trunk/spamassassin.service
-+
PKGBUILD|8 ++--
spamassassin.service|2 +-
spamassassin.tmpfiles.d |1 +
3 files changed, 8 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-04-28 09:40:01 UTC (rev 352206)
+++ PKGBUILD2019-04-28 12:30:45 UTC (rev 352207)
@@ -3,7 +3,7 @@
# Contributor: Manolis Tzanidakis
pkgname=spamassassin
pkgver=3.4.2
-pkgrel=1
+pkgrel=2
pkgdesc="A mail filter to identify spam."
arch=('x86_64')
license=('APACHE')
@@ -23,11 +23,13 @@
'etc/mail/spamassassin/v330.pre')
install="${pkgname}.install"
source=("https://www.us.apache.org/dist/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz"{,.asc}
+'spamassassin.tmpfiles.d'
'spamassassin.service')
validpgpkeys=(D8099BC79E17D7E49BC21E31FDE52F40F7D39814)
sha512sums=('85e3d78bb885ad1d0bf2066d1bc919d6ad5e9f86795069397e7c28cc1ba02870566ec014c08c81f68e7ed03b7f60d2de0b9730b3415b35d848abde2c8920a28f'
'SKIP'
-
'7e44370e9433134816db51681de388618f8b00f27e9229b673ca7da5821b6bfc27dfc9f6f7387ef18d1d310ea03a4569f46cae3089bba91dd71692b9eee8c8e4')
+
'994ebb2b6c127521676f35879017112a33da53ad99431837d06973a9abfc4aa0434ea2c9b19073ff2cc877ebe3a5a7fe8525bc93222fd05956069ce73e5ae389'
+
'5ad6aa8d992375b0989413d36ff0485f792ac9211a47e6a2a7fa5c0b9eb353aa6efe6f55da3ff4480bdef24beb4fa456c64c5a5ce72e8ad6c93c171c969fd6ee')
prepare() {
cd "${srcdir}/Mail-SpamAssassin-${pkgver}"
@@ -64,4 +66,6 @@
echo 'u spamd 182 - /var/lib/spamassassin' |
install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
+
+ install -Dm644 "$srcdir/spamassassin.tmpfiles.d"
"$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
}
Modified: spamassassin.service
===
--- spamassassin.service2019-04-28 09:40:01 UTC (rev 352206)
+++ spamassassin.service2019-04-28 12:30:45 UTC (rev 352207)
@@ -3,7 +3,7 @@
After=syslog.target network.target
[Service]
-ExecStart=/usr/bin/vendor_perl/spamd -x -u spamd -g spamd
+ExecStart=/usr/bin/vendor_perl/spamd -x -u spamd -g spamd
--listen=/run/spamd/spamd.sock --listen=localhost
StandardOutput=null
StandardError=null
Restart=always
Added: spamassassin.tmpfiles.d
===
--- spamassassin.tmpfiles.d (rev 0)
+++ spamassassin.tmpfiles.d 2019-04-28 12:30:45 UTC (rev 352207)
@@ -0,0 +1 @@
+d /run/spamd 0755 spamd spamd -
[arch-commits] Commit in spamassassin/trunk (3 files)
Date: Monday, February 16, 2015 @ 11:52:18
Author: bluewind
Revision: 231608
upgpkg: spamassassin 3.4.0-4
Fix FS#43428; unnecessary options in service file
Modified:
spamassassin/trunk/PKGBUILD
spamassassin/trunk/spamassassin.install
spamassassin/trunk/spamassassin.service
--+
PKGBUILD |4 ++--
spamassassin.install |6 --
spamassassin.service |8 +++-
3 files changed, 5 insertions(+), 13 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-02-15 22:01:50 UTC (rev 231607)
+++ PKGBUILD2015-02-16 10:52:18 UTC (rev 231608)
@@ -4,7 +4,7 @@
# Contributor: Manolis Tzanidakis
pkgname=spamassassin
pkgver=3.4.0
-pkgrel=3
+pkgrel=4
pkgdesc=A mail filter to identify spam.
arch=('i686' 'x86_64')
license=('APACHE')
@@ -26,7 +26,7 @@
validpgpkeys=(D8099BC79E17D7E49BC21E31FDE52F40F7D39814)
md5sums=('5d0b50cee3bfa905cca35c33296c8c2a'
'SKIP'
- 'd0ce5f8a02fd74dbc83632f4aaec6185'
+ '8adce028f25387ac3bc4dba697d209ed'
'0bcf0419608ec4ac200e794563620f31')
prepare() {
Modified: spamassassin.install
===
--- spamassassin.install2015-02-15 22:01:50 UTC (rev 231607)
+++ spamassassin.install2015-02-16 10:52:18 UTC (rev 231608)
@@ -30,9 +30,3 @@
true
}
-pre_remove() {
- getent passwd spamd /dev/null userdel spamd /dev/null
- getent group spamd /dev/null groupdel spamd /dev/null
- true
-}
-
Modified: spamassassin.service
===
--- spamassassin.service2015-02-15 22:01:50 UTC (rev 231607)
+++ spamassassin.service2015-02-16 10:52:18 UTC (rev 231608)
@@ -3,11 +3,9 @@
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
+ExecStart=/usr/bin/vendor_perl/spamd -x -u spamd -g spamd
+StandardOutput=null
+StandardError=null
Restart=always
[Install]
[arch-commits] Commit in spamassassin/trunk (3 files)
Date: Wednesday, June 5, 2013 @ 17:55:24
Author: bluewind
Revision: 187367
upgpkg: spamassassin 3.3.2-9
fix FS#35658; perl 5.18 issues
Added:
spamassassin/trunk/perl-5.18-fixes.patch
Modified:
spamassassin/trunk/PKGBUILD
spamassassin/trunk/spamassassin.service
---+
PKGBUILD | 16 +--
perl-5.18-fixes.patch | 97
spamassassin.service |2
3 files changed, 110 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-06-05 15:33:29 UTC (rev 187366)
+++ PKGBUILD2013-06-05 15:55:24 UTC (rev 187367)
@@ -4,7 +4,7 @@
# Contributor: Manolis Tzanidakis
pkgname=spamassassin
pkgver=3.3.2
-pkgrel=8
+pkgrel=9
pkgdesc=A mail filter to identify spam.
arch=('i686' 'x86_64')
license=('APACHE')
@@ -12,7 +12,7 @@
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')
+makedepends=('razor' 'perl-dbi')
optdepends=('razor: to identify collaborately-flagged spam')
backup=('etc/mail/spamassassin/local.cf'
'etc/mail/spamassassin/init.pre'
@@ -23,10 +23,18 @@
install=${pkgname}.install
options=('!emptydirs')
source=(http://mirrors.devlib.org/apache/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz;
-'spamassassin.service')
+'spamassassin.service'
+'perl-5.18-fixes.patch')
md5sums=('d1d62cc5c6eac57e88c4006d9633b81e'
- 'ded3e012a4d502df001f2d97c495cc4e')
+ '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}
Added: perl-5.18-fixes.patch
===
--- perl-5.18-fixes.patch (rev 0)
+++ perl-5.18-fixes.patch 2013-06-05 15:55:24 UTC (rev 187367)
@@ -0,0 +1,97 @@
+--- Mail/SpamAssassin/AsyncLoop.pm~2011-06-07 01:59:17.0 +0200
Mail/SpamAssassin/AsyncLoop.pm 2013-05-29 01:37:58.0 +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.0 +0200
Mail/SpamAssassin/Conf/Parser.pm 2013-05-29 01:32:06.0 +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.0 +0200
Mail/SpamAssassin/DnsResolver.pm 2013-05-29 01:32:06.0 +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.0 +0200
Mail/SpamAssassin/Message.pm 2013-05-29 01:32:06.0 +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.0 +0200
Mail/SpamAssassin/PerMsgStatus.pm 2013-05-29 01:32:06.0 +0200
+@@ -421,6
