rpms/spamassassin
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 3.4.1

Browse Source
This commit is contained in:
Kevin Fenzi 2015-04-29 19:36:21 -06:00
parent 569fc65779
commit bcf6f0331f
5 changed files with 11 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -4,3 +4,5 @@
/Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz.asc
/Mail-SpamAssassin-3.4.0.tar.bz2
/Mail-SpamAssassin-rules-3.4.0.r1565117.tgz
/Mail-SpamAssassin-3.4.1.tar.bz2
/Mail-SpamAssassin-rules-3.4.1.r1675274.tgz

4
sources
View File

@ -1,2 +1,2 @@
46e99adc0affebbe5f3524b4834e0345 Mail-SpamAssassin-3.4.0.tar.bz2
9c15df55e9ec2a3c8376f3e15e448a2e Mail-SpamAssassin-rules-3.4.0.r1565117.tgz
0db5d27d7b782ff5eadee12b95eae84c Mail-SpamAssassin-3.4.1.tar.bz2
4a1cbafbee2d0ae8c4f2f9ac05b4b3aa Mail-SpamAssassin-rules-3.4.1.r1675274.tgz

16
spamassassin-3.4.0-net-dns.patch
View File

@ -1,16 +0,0 @@
diff -Nur Mail-SpamAssassin-3.4.0.orig/lib/Mail/SpamAssassin/DnsResolver.pm Mail-SpamAssassin-3.4.0/lib/Mail/SpamAssassin/DnsResolver.pm
--- Mail-SpamAssassin-3.4.0.orig/lib/Mail/SpamAssassin/DnsResolver.pm 2014-02-07 01:36:28.000000000 -0700
+++ Mail-SpamAssassin-3.4.0/lib/Mail/SpamAssassin/DnsResolver.pm 2014-06-20 11:53:04.688979753 -0600
@@ -204,8 +204,10 @@
@ns_addr_port = @{$self->{conf}->{dns_servers}};
dbg("dns: servers set by config to: %s", join(', ',@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}});
+ my @ns = $res->UNIVERSAL::can('nameservers') ? $res->nameservers
+ : @{$res->{nameservers}};
+ my $port = $res->UNIVERSAL::can('port') ? $res->port : $res->{port};
+ @ns_addr_port = map(untaint_var("[$_]:" . $port), @ns);
dbg("dns: servers obtained from Net::DNS : %s", join(', ',@ns_addr_port));
}
return @ns_addr_port;

24
spamassassin-3.4.0-razor2-typo.patch
View File

@ -1,24 +0,0 @@
From e348191a69f29f59ebeaad8f2d250acf56b7a942 Mon Sep 17 00:00:00 2001
From: Kevin McGrail <kmcgrail@apache.org>
Date: Thu, 27 Feb 2014 00:50:42 +0000
Subject: [PATCH] Bug 7018 - Misspelling on Razor Configuration item thanks to
Alex from wombaz.de
git-svn-id: https://svn.apache.org/repos/asf/spamassassin/trunk@1572369 13f79535-47bb-0310-9956-ffa450edef68
---
lib/Mail/SpamAssassin/Plugin/Razor2.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/Mail/SpamAssassin/Plugin/Razor2.pm b/lib/Mail/SpamAssassin/Plugin/Razor2.pm
index 937c8cc..e24252c 100644
--- a/lib/Mail/SpamAssassin/Plugin/Razor2.pm
+++ b/lib/Mail/SpamAssassin/Plugin/Razor2.pm
@@ -115,7 +115,7 @@ the results
setting => 'razor_timeout',
is_admin => 1,
default => 5,
- type => $Mail::SpamAssassin::Conf::CONF_TYPE_DURATIION,
+ type => $Mail::SpamAssassin::Conf::CONF_TYPE_DURATION,
});
=item razor_config filename

21
spamassassin.spec
View File

@ -61,15 +61,15 @@
Summary: Spam filter for email which can be invoked from mail delivery agents
Name: spamassassin
Version: 3.4.0
Version: 3.4.1
#Release: 0.8.%{prerev}%{?dist}
Release: 14%{?dist}
Release: 1%{?dist}
License: ASL 2.0
Group: Applications/Internet
URL: http://spamassassin.apache.org/
Source0: http://www.apache.org/dist/%{name}/%{real_name}-%{version}.tar.bz2
Source0: http://www.apache.org/dist/%{name}/source/%{real_name}-%{version}.tar.bz2
#Source0: %{real_name}-%{version}-%{prerev}.tar.bz2
Source1: http://www.apache.org/dist/%{name}/%{real_name}-rules-%{version}.r1565117.tgz
Source1: http://www.apache.org/dist/%{name}/source/%{real_name}-rules-%{version}.r1675274.tgz
#Source1: %{real_name}-rules-%{version}.%{prerev}.tgz
Source2: redhat_local.cf
Source3: spamassassin-default.rc
@ -94,15 +94,7 @@ Source17: sa-update.timer
# https://bugzilla.redhat.com/show_bug.cgi?id=1055593
# Switch to using gnupg2 instead of gnupg1
Patch0: spamassassin-3.3.2-gnupg2.patch
# https://bugzilla.redhat.com/1111586
# fix for newer perl-Net-DNS
Patch1: spamassassin-3.4.0-net-dns.patch
# Patches 100+ are SVN backports (DO NOT REUSE!)
#
# Fix typo in Razor2 plugin
# https://github.com/apache/spamassassin/commit/e348191a69f29f59ebeaad8f2d250acf56b7a942
#
Patch100: spamassassin-3.4.0-razor2-typo.patch
# end of patches
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -181,9 +173,7 @@ To filter spam for all users, add that line to /etc/procmailrc
%setup -q -n Mail-SpamAssassin-%{version}
# Patches 0-99 are RH specific
%patch0 -p1
%patch1 -p1
# Patches 100+ are SVN backports (DO NOT REUSE!)
%patch100 -p1
# end of patches
echo "RHEL=%{rhel} FEDORA=%{fedora}"
@ -362,6 +352,9 @@ exit 0
%endif
%changelog
* Wed Apr 29 2015 Kevin Fenzi <kevin@scrye.com> 3.4.1-1
- Update to 3.4.1
* Fri Apr 03 2015 Kevin Fenzi <kevin@scrye.com> 3.4.0-14
- Switch to systemd timer unit from cron for rules updates. Fixes bug #1064537