From 8b502a9d2b9112f39c829cda0cac50b6a2c0c804 Mon Sep 17 00:00:00 2001
From: Nick Bebout <nb@fedoraproject.org>
Date: Oct 25 2010 16:06:20 +0000
Subject: Update to 3.3.2-0.1.xvn1027144


---

diff --git a/.gitignore b/.gitignore
index d411aa9..03446be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 Mail-SpamAssassin-3.3.1.tar.bz2
 Mail-SpamAssassin-rules-3.3.1.r923114.tgz
+/Mail-SpamAssassin-3.3.2.tar.bz2
+/Mail-SpamAssassin-rules-3.3.2.r1004932.tgz
diff --git a/sa-update.cronscript b/sa-update.cronscript
index ff99f69..6d81847 100644
--- a/sa-update.cronscript
+++ b/sa-update.cronscript
@@ -6,8 +6,9 @@
 #
 
 # Proceed with sa-update if spam daemon is running or forced in /etc/sysconfig/sa-update
-unset SAUPDATE
+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
     /sbin/pidof $daemon >& /dev/null
     [ $? -eq 0 ] && SAUPDATE=yes
@@ -55,9 +56,39 @@ done
 for keyid in $KEYLIST; do
     arglist="$arglist --gpgkey $keyid"
 done
-/usr/bin/sa-update $arglist
-if [ $? -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
+/usr/bin/sa-update $OPTIONS $arglist
+status=$?
+now=`date +"%d-%b-%Y %T"`
+# cron runs this script tee /var/log/sa-update.log
+# We want to always write to the log, but only send mail
+# as configured.  
+if [ $status -eq 0 ]; then
+        if [ -n "$DEBUG" -o -n "$NOTIFY_UPD" ]; then
+	    echo "$now: SpamAssassin: Update processed successfully" 
+	else
+            echo "$now: SpamAssassin: Update processed successfully" >>/var/log/sa-update.log
+	fi
+	 /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
+        exit $status
 fi
+if [ $status -eq 1 ]; then
+        if [ -n "$DEBUG" ]; then
+	    echo "$now: SpamAssassin: No update available"
+	else
+            echo "$now: SpamAssassin: No update available" >>/var/log/sa-update.log
+	fi
+        exit $status
+fi
+if [ $status -eq 2 ]; then
+        echo "$now: SpamAssassin: Problem applying update - pre files failed lint check"
+        exit $status
+fi
+if [ $status -eq 4 ]; then
+        echo "$now: SpamAssassin: Update available, but download or extract failed"
+        exit $status
+fi
+
+echo "$now: SpamAssassin: Unknown error code $status from sa-update"
+exit $status
diff --git a/sa-update.force-sysconfig b/sa-update.force-sysconfig
index e9de72c..0d64cb0 100644
--- a/sa-update.force-sysconfig
+++ b/sa-update.force-sysconfig
@@ -1,4 +1,23 @@
-# Uncomment below to force nightly sa-update
-# (you don't need to do this if you use spamd or amavisd)
+# sa-update configuration
+#
+# Note that the opposite of "yes" is the empty string, NOT "no"
 
+# Don't run sa-update even if it's in /etc/cron.d/ - as installed
+#SAUPDATE=no
+
+# Run sa-update even if no daemon is detected
 #SAUPDATE=yes
+
+# Default: Run only if a daemon is detected
+
+# Options for the actual sa-update command
+# These are added to the channel configuration from
+/etc/mail/spamassassin/channel.d/*.conf
+# OPTIONS=-v
+
+# Debug script - send mail even if no update available
+# DEBUG=yes
+
+# Send mail when updates successfully processed
+# Default: send mail only on error
+#NOTIFY_UPD=yes
diff --git a/sources b/sources
index f5a181c..ae1e546 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-bb977900c3b2627db13e9f44f9b5bfc8  Mail-SpamAssassin-3.3.1.tar.bz2
-3e6ae5a39b9dd2de7ec05a2b315c396b  Mail-SpamAssassin-rules-3.3.1.r923114.tgz
+5507dea43039b26640f65626ef7eeefd  Mail-SpamAssassin-3.3.2.tar.bz2
+11e340894be58fc49c0fbcea623e6f0c  Mail-SpamAssassin-rules-3.3.2.r1004932.tgz
diff --git a/spamassassin.spec b/spamassassin.spec
index 24b0343..bdf1b91 100644
--- a/spamassassin.spec
+++ b/spamassassin.spec
@@ -56,13 +56,14 @@ Requires: portreserve
 
 Summary: Spam filter for email which can be invoked from mail delivery agents
 Name: spamassassin
-Version: 3.3.1
-Release: 5%{?dist}
+Version: 3.3.2
+Release: 0.1.svn1027144%{?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
-Source1: Mail-SpamAssassin-rules-3.3.1.r923114.tgz
+#Source0: http://www.apache.org/dist/%{name}/%{real_name}-%{version}.tar.bz2
+Source0: %{real_name}-%{version}.tar.bz2
+Source1: Mail-SpamAssassin-rules-3.3.2.r1004932.tgz
 Source2: redhat_local.cf
 Source3: spamassassin-default.rc
 Source4: spamassassin-spamc.rc
@@ -273,6 +274,9 @@ fi
 exit 0
 
 %changelog
+* Mon Oct 25 2010 Nick Bebout <nb@fedoraproject.org> - 3.3.2-0.1.svn1027144
+- Update to 3.3.2 - svn1027144 to solve bug
+
 * Sat Jul 03 2010 Dennis Gilmore <dennis@ausil.us> - 3.3.1-5
 - rebuild against perl-5.12.0 again