Update to 3.4.0

.gitignore

@@ -2,3 +2,5 @@
 /Mail-SpamAssassin-3.3.2.tar.bz2.asc
 /Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz
 /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

sa-update.cronscript

@@ -9,12 +9,11 @@
 unset SAUPDATE OPTIONS DEBUG NOTIFY_UPD
 [ -f /etc/sysconfig/sa-update ] && . /etc/sysconfig/sa-update
 [ "$SAUPDATE" = "no" ] && exit 0
-for daemon in spamd amavisd; do
+for daemon in spamd amavisd spampd; do
-    /usr/bin/pgrep $daemon >& /dev/null
+    /usr/bin/pgrep -f $daemon >& /dev/null
     [ $? -eq 0 ] && SAUPDATE=yes
 done
 [ -f /var/run/mimedefang.pid ] && SAUPDATE=yes
-[ -f /var/run/spampd/spampd.pid ] && SAUPDATE=yes
 
 # Skip sa-update if daemon not detected
 [ -z "$SAUPDATE" ] && exit 0
@@ -72,7 +71,7 @@ if [ $status -eq 0 ]; then
 	 /sbin/service spamassassin condrestart >& /dev/null
 	 [ -f /etc/init.d/amavisd ] && /sbin/service amavisd condrestart >& /dev/null
 	 [ -f /var/run/mimedefang.pid ] && /sbin/service mimedefang reload >& /dev/null
-	 [ -f /etc/init.d/spampd ] && /etc/init.d/spampd condrestart >& /dev/null
+	 /sbin/service spampd condrestart >& /dev/null
         exit $status
 fi
 if [ $status -eq 1 ]; then

sources

@@ -1,4 +1,2 @@
-253f8fcbeb6c8bfcab9d139865c1a404  Mail-SpamAssassin-3.3.2.tar.bz2
+46e99adc0affebbe5f3524b4834e0345  Mail-SpamAssassin-3.4.0.tar.bz2
-d848988ae0ab3c8a09077c965fba4df2  Mail-SpamAssassin-3.3.2.tar.bz2.asc
+9c15df55e9ec2a3c8376f3e15e448a2e  Mail-SpamAssassin-rules-3.4.0.r1565117.tgz
-72f8075499c618518c68c7399f02b458  Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz
-7603e85154d517beafe75cbf3b077c46  Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz.asc

spamassassin-3.3.2-gnupg2.patch

@@ -0,0 +1,12 @@
+diff -Nur Mail-SpamAssassin-3.3.2.orig/sa-update.raw Mail-SpamAssassin-3.3.2/sa-update.raw
+--- Mail-SpamAssassin-3.3.2.orig/sa-update.raw	2011-06-06 17:59:19.000000000 -0600
++++ Mail-SpamAssassin-3.3.2/sa-update.raw	2014-01-28 13:29:33.933526585 -0700
+@@ -281,7 +281,7 @@
+ if ($GPG_ENABLED || $opt{'import'}) {
+   # find GPG in the PATH
+   # bug 4958: for *NIX it's "gpg", in Windows it's "gpg.exe"
+-  $GPGPath = 'gpg' . $Config{_exe};
++  $GPGPath = 'gpg2' . $Config{_exe};
+   dbg("gpg: Searching for '$GPGPath'");
+ 
+   if ($GPGPath = Mail::SpamAssassin::Util::find_executable_in_env_path($GPGPath)) {

spamassassin.spec

@@ -67,15 +67,15 @@ Requires: portreserve
 
 Summary: Spam filter for email which can be invoked from mail delivery agents
 Name: spamassassin
-Version: 3.3.2
+Version: 3.4.0
 #Release: 0.8.%{prerev}%{?dist}
-Release: 18%{?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: %{real_name}-%{version}-%{prerev}.tar.bz2
-Source1: %{real_name}-rules-%{version}-r1104058.tar.gz
+Source1: http://www.apache.org/dist/%{name}/%{real_name}-rules-%{version}.r1565117.tgz
 #Source1: %{real_name}-rules-%{version}.%{prerev}.tgz
 Source2: redhat_local.cf
 Source3: spamassassin-default.rc
@@ -93,12 +93,10 @@ Source13: README.RHEL.Fedora
 Source14: spamassassin.service
 %endif
 # Patches 0-99 are RH specific
-# none yet
+# https://bugzilla.redhat.com/show_bug.cgi?id=1055593
+# Switch to using gnupg2 instead of gnupg1
+Patch0: spamassassin-3.3.2-gnupg2.patch
 # Patches 100+ are SVN backports (DO NOT REUSE!)
-# Fixes a warning spewed to syslog with recent perl.·
-# https://bugzilla.redhat.com/show_bug.cgi?id=1023670
-# https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6937
-Patch100: spamassassin-3.3.2-fix-warning.patch
 # end of patches
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -125,7 +123,7 @@ Requires: perl(Mail::SPF)
 Requires: perl(Encode::Detect)
 %endif
 Requires: procmail
-Requires: gnupg
+Requires: gnupg2
 
 # Hard requirements
 BuildRequires: perl-HTML-Parser >= 3.43
@@ -176,9 +174,8 @@ To filter spam for all users, add that line to /etc/procmailrc
 %prep
 %setup -q -n Mail-SpamAssassin-%{version}
 # Patches 0-99 are RH specific
-# none yet
+%patch0 -p1
 # Patches 100+ are SVN backports (DO NOT REUSE!)
-%patch100 -p1
 # end of patches
 
 echo "RHEL=%{rhel} FEDORA=%{fedora}"
@@ -368,6 +365,14 @@ fi
 %endif
 
 %changelog
+* Tue Feb 11 2014 Kevin Fenzi <kevin@scrye.com> 3.4.0-1
+- Update to 3.4.0
+
+* Sun Feb 02 2014 Kevin Fenzi <kevin@scrye.com> 3.3.2-19
+- Use pgrep -f for full command line. Fixes bug #1057926
+- Patch to use gnupg2 instead of gnupg1. Fixes bug #1055593
+- Use pgrep for spampd as well. Fixes bug #1058976
+
 * Sat Jan 04 2014 Kevin Fenzi <kevin@scrye.com> 3.3.2-18
 - Add patch to fix warning to syslog with recent perl.·
 - Fixes bug #1023670