From 3e1af02f64739e651076c59b8019db16ed37d398 Mon Sep 17 00:00:00 2001
From: Warren Togami <wtogami@fedoraproject.org>
Date: Mar 15 2010 19:48:45 +0000
Subject: 3.3.1 bug fix only release


---

diff --git a/.cvsignore b/.cvsignore
index c1f52b8..2267dd3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-Mail-SpamAssassin-3.3.0.tar.bz2
-Mail-SpamAssassin-rules-3.3.0.r901671.tgz
+Mail-SpamAssassin-3.3.1.tar.bz2
+Mail-SpamAssassin-rules-3.3.1.r923257.tgz
diff --git a/sa-update.cronscript b/sa-update.cronscript
index 14498b6..ff99f69 100644
--- a/sa-update.cronscript
+++ b/sa-update.cronscript
@@ -5,28 +5,6 @@
 #     Place files here to add custom channels.
 #
 
-# list files in a directory consisting only of alphanumerics, hyphens and
-# underscores
-# $1 - directory to list
-# $2 - optional suffix to limit which files are selected
-run_parts_list() {
-    if [ $# -lt 1 ]; then
-        echo "ERROR: Usage: run_parts_list <dir>" > /dev/stderr
-        exit 1
-    fi
-    if [ ! -d "$1" ]; then
-        echo "ERROR: Not a directory: $1" > /dev/stderr
-        exit 1
-    fi
-
-    if [ -d "$1" ]; then
-        if [ -n "$2" ]; then
-            find_opts='-name *'$2
-        fi
-        find -L $1 -mindepth 1 -maxdepth 1 -type f $find_opts | sort -n
-    fi
-}
-
 # Proceed with sa-update if spam daemon is running or forced in /etc/sysconfig/sa-update
 unset SAUPDATE
 [ -f /etc/sysconfig/sa-update ] && . /etc/sysconfig/sa-update
@@ -48,7 +26,8 @@ fi
 CHANNELLIST=""
 KEYLIST=""
 # Process each channel defined in /etc/mail/spamassassin/channel.d/
-for file in $(run_parts_list /etc/mail/spamassassin/channel.d/ .conf); do 
+for file in /etc/mail/spamassassin/channel.d/*.conf; do
+    [ ! -f "$file" ] && continue
     # Validate config file
     PREFIXES="CHANNELURL KEYID BEGIN"
     for prefix in $PREFIXES; do
@@ -57,12 +36,12 @@ for file in $(run_parts_list /etc/mail/spamassassin/channel.d/ .conf); do
             exit 255
         fi
     done
-    . $file
+    . "$file"
     #echo "CHANNELURL=$CHANNELURL"
     #echo "KEYID=$KEYID"
     CHANNELLIST="$CHANNELLIST $CHANNELURL"
     KEYLIST="$KEYLIST $KEYID"
-    sa-update --import $file
+    sa-update --import "$file"
 done
 
 # Sleep random amount of time before proceeding to avoid overwhelming the servers
@@ -78,7 +57,7 @@ for keyid in $KEYLIST; do
 done
 /usr/bin/sa-update $arglist
 if [ $? -eq 0 ]; then
-    /etc/init.d/spamassassin condrestart > /dev/null
-    [ -f /etc/init.d/amavisd ] && /etc/init.d/amavisd condrestart > /dev/null
-    [ -f /var/run/mimedefang.pid ] && /etc/init.d/mimedefang reload > /dev/null
+    /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
 fi
diff --git a/sources b/sources
index 7b344f0..38829fc 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-15af629a95108bf245ab600d78ae754b  Mail-SpamAssassin-3.3.0.tar.bz2
-5be313a60c27ae522700e20b557ade33  Mail-SpamAssassin-rules-3.3.0.r901671.tgz
+2290490889b2d91f71a3104eaf9c5cd3  Mail-SpamAssassin-3.3.1.tar.bz2
+e004b3172650f003c2e9f15e5b2f6ac4  Mail-SpamAssassin-rules-3.3.1.r923257.tgz
diff --git a/spamassassin.spec b/spamassassin.spec
index e2a2280..531b061 100644
--- a/spamassassin.spec
+++ b/spamassassin.spec
@@ -23,6 +23,7 @@
 %define option_ssl 0
 %define perl_devel 0
 %define dkim_deps  0
+%define require_encode_detect 0
 
 # SSL and IPv6 (FC6+, RHEL5+)
 %if 0%{?fedora} > 5
@@ -34,6 +35,11 @@
 %define perl_devel 1
 %endif
 
+# Encode::Detect, not strictly required but helpful if you enable language detection (FC7+)
+%if 0%{?fedora} > 6
+%define require_encode_detect 1
+%endif
+
 %if 0%{?fedora} >= 10
 # We use portreserve to prevent our TCP port being stolen.
 # Require the package here so that we know /etc/portreserve/ exists.
@@ -50,13 +56,13 @@ Requires: portreserve
 
 Summary: Spam filter for email which can be invoked from mail delivery agents
 Name: spamassassin
-Version: 3.3.0
-Release: 5%{?dist}
+Version: 3.3.1
+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
-Source1: Mail-SpamAssassin-rules-3.3.0.r901671.tgz
+Source1: Mail-SpamAssassin-rules-3.3.1.r923257.tgz
 Source2: redhat_local.cf
 Source3: spamassassin-default.rc
 Source4: spamassassin-spamc.rc
@@ -90,7 +96,9 @@ Requires: perl(LWP::UserAgent)
 Requires: perl(Net::DNS)
 Requires: perl(Time::HiRes)
 Requires: perl(DB_File)
+%if %{require_encode_detect}
 Requires: perl(Encode::Detect)
+%endif
 Requires: procmail
 Requires: gnupg
 
@@ -264,7 +272,10 @@ fi
 exit 0
 
 %changelog
-* Sun Jan 24 2010 Warren Togami <wtogami@redhat.com> - 3.3.0-5
+* Mon Mar 12 2010 Warren Togami <wtogami@redhat.com> - 3.3.1-1
+- 3.3.1 bug fix only release
+
+* Wed Feb 17 2010 Warren Togami <wtogami@redhat.com> - 3.3.0-6
 - Minor fix to update script
 
 * Thu Jan 21 2010 Warren Togami <wtogami@redhat.com> - 3.3.0-2
@@ -299,7 +310,7 @@ exit 0
 - svn882672 snapshot
 
 * Thu Nov 12 2009 Warren Togami <wtogami@redhat.com> - 3.3.0-0.19.svn816416
-- Encode::Detect is important to spamassassin
+- Encode::Detect is important to spamassassin, require for anything newer than RHEL-5
 
 * Thu Sep 24 2009 Warren Togami <wtogami@redhat.com> - 3.3.3-0.18.svn816416
 - Enable SOUGHT ruleset in nightly sa-update http://wiki.apache.org/spamassassin/SoughtRules