From e72db093e3fdb13a668f4843e1f9fdd84888e86e Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jun 24 2015 10:39:00 +0000 Subject: import spamassassin-3.4.0-2.el7 --- diff --git a/SOURCES/spamassassin-3.4.0-razor2-typo.patch b/SOURCES/spamassassin-3.4.0-razor2-typo.patch new file mode 100644 index 0000000..ed5ff77 --- /dev/null +++ b/SOURCES/spamassassin-3.4.0-razor2-typo.patch @@ -0,0 +1,13 @@ +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 diff --git a/SPECS/spamassassin.spec b/SPECS/spamassassin.spec index 4baaf49..a2d235a 100644 --- a/SPECS/spamassassin.spec +++ b/SPECS/spamassassin.spec @@ -69,7 +69,7 @@ Summary: Spam filter for email which can be invoked from mail delivery agents Name: spamassassin Version: 3.4.0 #Release: 0.8.%{prerev}%{?dist} -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 2.0 Group: Applications/Internet URL: http://spamassassin.apache.org/ @@ -97,6 +97,9 @@ Patch1: spamassassin-HTTPSMismatch.pm # add note about rawbody split (#892350) Patch2: spamassassin-rawbody-split-documentation.patch # Patches 100+ are SVN backports (DO NOT REUSE!) + +# https://svn.apache.org/viewvc?view=revision&revision=1572369 +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) @@ -177,6 +180,7 @@ To filter spam for all users, add that line to /etc/procmailrc %patch1 -p1 %patch2 -p1 # Patches 100+ are SVN backports (DO NOT REUSE!) +%patch100 -p1 # end of patches @@ -367,6 +371,9 @@ fi %endif %changelog +* Tue May 19 2015 Jakub Jelen 3.4.0-2 +- Fix typo in Plugin/Razor2 preventing plugin to work + * Fri Sep 26 2014 Petr Lautrbach 3.4.0-1 - update to 3.4.0 - Apply fix for amavisd and spampd reloading after rules updates. Fixes bug #1145654