kevin pushed to spamassassin (f21). "Remove last parts of portreserve. Fixes bug #1175798 (..more)"

Fri Apr 3 17:19:09 UTC 2015

>From ec777e5ac47f274a7e3e4a45dd012330200786a8 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin at scrye.com>
Date: Fri, 3 Apr 2015 11:00:05 -0600
Subject: Remove last parts of portreserve. Fixes bug #1175798

- Fix typo in Razor2 plugin. Fixes bug #1208776
- Disabled the AHBL blacklist thats no longer in service in base rules. Fixes bug #1180338

diff --git a/spamassassin-3.4.0-razor2-typo.patch b/spamassassin-3.4.0-razor2-typo.patch
new file mode 100644
index 0000000..de95ba8
--- /dev/null
+++ b/spamassassin-3.4.0-razor2-typo.patch
@@ -0,0 +1,24 @@
+From e348191a69f29f59ebeaad8f2d250acf56b7a942 Mon Sep 17 00:00:00 2001
+From: Kevin McGrail <kmcgrail at 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
diff --git a/spamassassin.service b/spamassassin.service
index 3ec5d06..089c4cd 100644
--- a/spamassassin.service
+++ b/spamassassin.service
@@ -4,7 +4,6 @@ After=syslog.target network.target
 
 [Service]
 EnvironmentFile=-/etc/sysconfig/spamassassin
-ExecStartPre=-/sbin/portrelease spamd
 ExecStart=/usr/bin/spamd $SPAMDOPTIONS
 StandardOutput=null
 StandardError=null
diff --git a/spamassassin.spec b/spamassassin.spec
index a5ce6ea..66603ee 100644
--- a/spamassassin.spec
+++ b/spamassassin.spec
@@ -63,7 +63,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: 12%{?dist}
+Release: 13%{?dist}
 License: ASL 2.0
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
@@ -87,6 +87,7 @@ Source13: README.RHEL.Fedora
 Source14: spamassassin.service
 %endif
 Source15: spamassassin.sysconfig.el
+
 # Patches 0-99 are RH specific
 # https://bugzilla.redhat.com/show_bug.cgi?id=1055593
 # Switch to using gnupg2 instead of gnupg1
@@ -95,6 +96,11 @@ Patch0: spamassassin-3.3.2-gnupg2.patch
 # 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)
@@ -175,6 +181,7 @@ To filter spam for all users, add that line to /etc/procmailrc
 %patch0 -p1
 %patch1 -p1
 # Patches 100+ are SVN backports (DO NOT REUSE!)
+%patch100 -p1
 # end of patches
 
 echo "RHEL=%{rhel} FEDORA=%{fedora}"
@@ -213,6 +220,7 @@ install -m 0644 %{SOURCE4} %buildroot/etc/mail/spamassassin
 # installed mode 755 as it's executed by users. 
 install -m 0755 %{SOURCE10} %buildroot/etc/mail/spamassassin
 install -m 0644 %{SOURCE6} %buildroot/etc/logrotate.d/sa-update
+
 install -m 0644 %{SOURCE7} %buildroot/etc/cron.d/sa-update
 install -m 0644 %{SOURCE9} %buildroot%{_sysconfdir}/sysconfig/sa-update
 # installed mode 744 as non root users can't run it, but can read it.
@@ -231,6 +239,8 @@ find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 cd $RPM_BUILD_ROOT%{_datadir}/spamassassin/
 tar xfvz %{SOURCE1}
 sed -i -e 's|\@\@VERSION\@\@|%{saversion}|' *.cf
+# Disable AHBL score as they no longer exist. See https://bugzilla.redhat.com/show_bug.cgi?id=1180338
+sed -i -e 's|score DNS_FROM_AHBL_RHSBL 0 2.438 0 2.699 # n=0 n=2||' 50_scores.cf
 cd -
 
 find $RPM_BUILD_ROOT/usr -type f -print |
@@ -253,10 +263,6 @@ mkdir   -m 0755             $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/chan
 install -m 0644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/channel.d/
 install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/channel.d/
 
-# Tell portreserve which port we want it to protect.
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/portreserve
-echo 783 > $RPM_BUILD_ROOT%{_sysconfdir}/portreserve/spamd
-
 install -m 0644 %{SOURCE13} $RPM_BUILD_DIR/Mail-SpamAssassin-%{version}/
 
 %files -f %{name}-%{version}-filelist
@@ -271,13 +277,11 @@ install -m 0644 %{SOURCE13} $RPM_BUILD_DIR/Mail-SpamAssassin-%{version}/
 %config(noreplace) %{_sysconfdir}/mail/spamassassin
 %config(noreplace) %{_sysconfdir}/sysconfig/spamassassin
 %config(noreplace) %{_sysconfdir}/sysconfig/sa-update
-%dir %{_sysconfdir}/portreserve
 %{_sysconfdir}/cron.d/sa-update
 %dir %{_datadir}/spamassassin
 %dir %{_localstatedir}/run/spamassassin
 %dir %{_localstatedir}/lib/spamassassin
 %config(noreplace) %{_sysconfdir}/logrotate.d/sa-update
-%config(noreplace) %{_sysconfdir}/portreserve/spamd
 %if %{use_systemd}
 %{_unitdir}/spamassassin.service
 %endif
@@ -291,14 +295,7 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %if %{use_systemd}
-%if 0%{?fedora} > 17
-        %systemd_post spamassassin.service
-%else
-if [ $1 -eq 1 ] ; then 
-    # Initial installation 
-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
-%endif
+%systemd_post spamassassin.service
 %endif
 
 # -a and --auto-whitelist options were removed from 3.0.0
@@ -327,15 +324,7 @@ exit 0
 %endif
 
 %if %{use_systemd}
-%if 0%{?fedora} > 17
-        %systemd_postun spamassassin.service
-%else
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
-    # Package upgrade, not uninstall
-    /bin/systemctl try-restart spamassassin.service >/dev/null 2>&1 || :
-fi
-%endif
+%systemd_postun spamassassin.service
 %endif
 
 %preun
@@ -348,15 +337,7 @@ exit 0
 %endif
 
 %if %{use_systemd}
-%if 0%{?fedora} > 17
-        %systemd_preun spamassassin.service
-%else
-if [ $1 -eq 0 ] ; then
-    # Package removal, not upgrade
-    /bin/systemctl --no-reload disable spamassassin.service > /dev/null 2>&1 || :
-    /bin/systemctl stop spamassassin.service > /dev/null 2>&1 || :
-fi
-%endif
+%systemd_preun spamassassin.service
 %endif
 
 %if %{use_systemd}
@@ -369,6 +350,11 @@ fi
 %endif
 
 %changelog
+* Fri Apr 03 2015 Kevin Fenzi <kevin at scrye.com> 3.4.0-13
+- Remove last parts of portreserve. Fixes bug #1175798
+- Fix typo in Razor2 plugin. Fixes bug #1208776
+- Disabled the AHBL blacklist thats no longer in service in base rules. Fixes bug #1180338
+
 * Thu Sep 25 2014 Kevin Fenzi <kevin at scrye.com> 3.4.0-12
 - Apply fix for amavisd and spampd reloading after rules updates. Fixes bug #1145654
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/spamassassin.git/commit/?h=f21&id=ec777e5ac47f274a7e3e4a45dd012330200786a8
