rpms/spamassassin/FC-6 sa-update.cronscript, 1.1, 1.2 spamassassin.spec, 1.77, 1.78

[fedora-cvs-commits at redhat.com]

Author: wtogami

Update of /cvs/dist/rpms/spamassassin/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv7624

Modified Files:
	sa-update.cronscript spamassassin.spec 
Log Message:
- 3.1.8 CVE-2007-0451
- silence sa-update cron script
- only restart spamd if necessary after sa-update (#227756)
- requires gnupg (#227738)
- explicit requires on perl(HTTP::Date) and perl(LWP::UserAgent) 
  (Bug #193100)



Index: sa-update.cronscript
===================================================================
RCS file: /cvs/dist/rpms/spamassassin/FC-6/sa-update.cronscript,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sa-update.cronscript	19 Jan 2007 20:28:59 -0000	1.1
+++ sa-update.cronscript	13 Feb 2007 21:19:00 -0000	1.2
@@ -1,7 +1,5 @@
 #!/bin/bash
 
 sleep $(expr $RANDOM % 7200)
-echo SpamAssassin rule update begins at `date`
-/usr/bin/sa-update
-/etc/init.d/spamassassin condrestart
-echo
+# Only restart spamd if sa-update returns 0, meaning it updated the rules
+/usr/bin/sa-update && /etc/init.d/spamassassin condrestart > /dev/null


Index: spamassassin.spec
===================================================================
RCS file: /cvs/dist/rpms/spamassassin/FC-6/spamassassin.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- spamassassin.spec	22 Jan 2007 17:31:17 -0000	1.77
+++ spamassassin.spec	13 Feb 2007 21:19:00 -0000	1.78
@@ -11,8 +11,8 @@
 
 Summary: Spam filter for email which can be invoked from mail delivery agents.
 Name: spamassassin
-Version: 3.1.7
-Release: 5%{?dist}
+Version: 3.1.8
+Release: 1%{?dist}
 License: Apache License
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
@@ -42,10 +42,13 @@
 BuildRequires: perl(HTML::Parser)
 BuildRequires: openssl-devel
 
+Requires: perl(HTTP::Date)
+Requires: perl(LWP::UserAgent)
 Requires: perl(Net::DNS)
 Requires: perl(Time::HiRes)
 Requires: perl(DB_File)
 Requires: procmail
+Requires: gnupg
 
 %if %{option_archive_tar}
 Requires: perl(Archive::Tar)
@@ -183,6 +186,22 @@
 exit 0
 
 %changelog
+* Tue Feb 13 2007 Warren Togami <wtogami at redhat.com> 3.1.8-1
+- 3.1.8 CVE-2007-0451
+
+* Tue Feb 13 2007 Warren Togami <wtogami at redhat.com> 3.1.7-9
+- silence sa-update cron script
+
+* Wed Feb 07 2007 Warren Togami <wtogami at redhat.com> 3.1.7-8
+- only restart spamd if necessary after sa-update (#227756)
+
+* Wed Feb 07 2007 Warren Togami <wtogami at redhat.com> 3.1.7-7
+- requires gnupg (#227738)
+
+* Sun Jan 28 2007 Warren Togami <wtogami at redhat.com> 3.1.7-6
+- explicit requires on perl(HTTP::Date) and perl(LWP::UserAgent) 
+  (Bug #193100)
+
 * Mon Jan 22 2007 Warren Togami <wtogami at redhat.com> 3.1.7-5
 - fix typo in logrotate.d (#223817)