- rel 2; netdns fix; create pid file at /var/run/spamassassin.pid

diff --git a/spamassassin-3.4.1-netdns.patch b/spamassassin-3.4.1-netdns.patch
new file mode 100644 (file)
index 0000000..8a37352
--- /dev/null
+++ b/spamassassin-3.4.1-netdns.patch
@@ -0,0 +1,12 @@
+diff -Nur Mail-SpamAssassin-3.4.1.orig/lib/Mail/SpamAssassin/DnsResolver.pm Mail-SpamAssassin-3.4.1/lib/Mail/SpamAssassin/DnsResolver.pm
+--- Mail-SpamAssassin-3.4.1.orig/lib/Mail/SpamAssassin/DnsResolver.pm  2015-04-28 13:56:49.000000000 -0600
++++ Mail-SpamAssassin-3.4.1/lib/Mail/SpamAssassin/DnsResolver.pm       2016-06-11 13:55:15.380517343 -0600
+@@ -592,6 +592,8 @@
+   };
+ 
+   if ($packet) {
++    # RD flag needs to be set explicitly since Net::DNS 1.01, Bug 7223        
++    $packet->header->rd(1);
+   # my $udp_payload_size = $self->{res}->udppacketsize;
+     my $udp_payload_size = $self->{conf}->{dns_options}->{edns};
+     if ($udp_payload_size && $udp_payload_size > 512) {

diff --git a/spamassassin-spamd.init b/spamassassin-spamd.init
index 404ea98be474f8df1cf98f2f07d068d626c1cdee..615819c072b3a7a99508de307001afee33bd5c88 100644 (file)
--- a/spamassassin-spamd.init
+++ b/spamassassin-spamd.init
@@ -42,7 +42,7 @@ start() {
        fi
 
        msg_starting "SpamAssassin"
-       daemon /usr/bin/spamd $SPAMD_OPTS
+       daemon /usr/bin/spamd -r /var/run/spamassassin.pid $SPAMD_OPTS
        RETVAL=$?
        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/spamd
 }

diff --git a/spamassassin.spec b/spamassassin.spec
index 3fe7aedf6b56d8a617366b70f21dced9969395e3..bd52fed7f1b9ca117230efc9f579476651e8929a 100644 (file)
--- a/spamassassin.spec
+++ b/spamassassin.spec
@@ -13,7 +13,7 @@ Summary:      A spam filter for email which can be invoked from mail delivery agents
 Summary(pl.UTF-8):     Filtr antyspamowy, przeznaczony dla programów dostarczających pocztę (MDA)
 Name:          spamassassin
 Version:       3.4.1
-Release:       1
+Release:       2
 License:       Apache v2.0
 Group:         Applications/Mail
 Source0:       http://ftp.ps.pl/pub/apache//spamassassin/source/%{pdir}-%{pnam}-%{version}.tar.bz2
@@ -26,6 +26,7 @@ Source5:      sa-update.sh
 Source6:       sa-update.cron
 Source7:       spamassassin-official.conf
 Source8:       sought.conf
+Patch0:                spamassassin-3.4.1-netdns.patch
 URL:           http://spamassassin.apache.org/
 BuildRequires: openssl-devel >= 0.9.7d
 BuildRequires: perl(ExtUtils::MakeMaker) >= 6.16
@@ -260,6 +261,7 @@ aplikacji do czytania poczty.
 
 %prep
 %setup -q -n %{pdir}-%{pnam}-%{version}
+%patch0 -p1
 
 %build
 # for spamc/configure
@@ -279,7 +281,7 @@ export CFLAGS="%{rpmcflags}"
 %{__sed} -e "s,@@LOCAL_STATE_DIR@@,$(pwd)," sa-compile.raw > sa-compile.pl
 %{__perl} -T sa-compile.pl --siteconfigpath=rules
 
-%{?with_tests:%{__make} -j1 test}
+%{?with_tests:%{__make} -j1 TEST_VERBOSE=1 test}
 
 %install
 rm -rf $RPM_BUILD_ROOT