rpms/spamassassin/F-11 Makefile, 1.3, 1.4 sa-update.cronscript, 1.4, 1.5 sources, 1.42, 1.43 spamassassin.spec, 1.112, 1.113
Nick Bebout
nb at fedoraproject.org
Fri Dec 25 19:45:12 UTC 2009
Author: nb
Update of /cvs/pkgs/rpms/spamassassin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10645
Modified Files:
Makefile sa-update.cronscript sources spamassassin.spec
Log Message:
Upgrade to SpamAssassin 3.3.0-rc1
Index: sa-update.cronscript
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/F-11/sa-update.cronscript,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sa-update.cronscript 13 Feb 2007 20:58:07 -0000 1.4
+++ sa-update.cronscript 25 Dec 2009 19:45:11 -0000 1.5
@@ -1,5 +1,22 @@
#!/bin/bash
+# *** DO NOT MODIFY THIS FILE ***
+# Edit /etc/cron.d/sa-update to enable nightly automatic updates
+# /etc/mail/spamassassin/sa-update-channels.txt
+# Specify custom channels here
+# /etc/mail/spamassassin/sa-update-keys.txt
+# Specify trusted GPG keys for custom channels here
+# Sleep random amount of time before proceeding to avoid overwhelming the servers
sleep $(expr $RANDOM % 7200)
-# Only restart spamd if sa-update returns 0, meaning it updated the rules
-/usr/bin/sa-update && /etc/init.d/spamassassin condrestart > /dev/null
+
+# sa-update must create keyring
+if [ ! -d /etc/mail/spamassassin/sa-update-keys ]; then
+ sa-update
+fi
+# Import SOUGHT key
+sa-update --import /usr/share/spamassassin/sought-pubkey.txt
+
+# Update rules with sa-update, restart spamd if rules were updated
+/usr/bin/sa-update --channelfile /etc/mail/spamassassin/sa-update-channels.txt \
+ --gpgkeyfile /etc/mail/spamassassin/sa-update-keys.txt && \
+ /etc/init.d/spamassassin condrestart > /dev/null
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/F-11/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sources 27 Jun 2008 14:17:32 -0000 1.42
+++ sources 25 Dec 2009 19:45:11 -0000 1.43
@@ -1 +1,2 @@
-695f9107b240383e48df8938f2de334e Mail-SpamAssassin-3.2.5.tar.bz2
+41a68daf1bae2ded652a74c77b1fb498 Mail-SpamAssassin-3.3.0-rc1.proposed2.tar.bz2
+a7f03934e048ad6f277b55e95ed8e3ca Mail-SpamAssassin-rules-3.3.0-rc1.r893295.tgz
Index: spamassassin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/F-11/spamassassin.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -p -r1.112 -r1.113
--- spamassassin.spec 26 Feb 2009 02:17:23 -0000 1.112
+++ spamassassin.spec 25 Dec 2009 19:45:11 -0000 1.113
@@ -1,6 +1,8 @@
# OVERRIDE RHEL VERSION HERE, RHEL BUILDSYSTEM DOESN'T HAVE DIST TAG
#%%define rhel 4
+#%define _source_filedigest_algorithm md5
+
# Define Variables that must exist
%{?!rhel:%define rhel 0}
%{?!fedora:%define fedora 0}
@@ -14,16 +16,15 @@
%define fedora 6
%define dist .el5
%endif
+%if 0%{?rhel} == 6
+%define fedora 12
+%define dist .el6
+%endif
# Define variables to use in conditionals
-%define option_archive_tar 0
%define option_ssl 0
%define perl_devel 0
-
-# perl-Archive-Tar (FC2+, RHEL4.6+)
-%if 0%{?fedora} > 1
-%define option_archive_tar 1
-%endif
+%define dkim_deps 0
# SSL and IPv6 (FC6+, RHEL5+)
%if 0%{?fedora} > 5
@@ -35,17 +36,31 @@
%define perl_devel 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.
+Requires: portreserve
+%endif
+
+# Mail::DKIM by default (F11+)
+%if 0%{?fedora} >= 11
+%define dkim_deps 1
+%endif
+
%define real_name Mail-SpamAssassin
%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
Summary: Spam filter for email which can be invoked from mail delivery agents
Name: spamassassin
-Version: 3.2.5
-Release: 5%{?dist}
+Version: 3.3.0
+%define prename rc1
+%define proposed .proposed2
+Release: 0.26.%{prename}%{?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: http://www.apache.org/dist/%{name}/%{real_name}-%{version}-%{prename}%{proposed}.tar.bz2
+Source1: Mail-SpamAssassin-rules-3.3.0-rc1.r893295.tgz
Source2: redhat_local.cf
Source3: spamassassin-default.rc
Source4: spamassassin-spamc.rc
@@ -54,10 +69,12 @@ Source6: sa-update.logrotate
Source7: sa-update.crontab
Source8: sa-update.cronscript
Source10: spamassassin-helper.sh
+Source11: sa-update-channels.txt
+Source12: sa-update-keys.txt
+Source13: sought-pubkey.txt
# Patches 0-99 are RH specific
# none yet
# Patches 100+ are SVN backports (DO NOT REUSE!)
-#Patch100: Mail-SpamAssassin-3.2.2-bug5574-setuid.patch
# end of patches
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Buildroot: %{_tmppath}/%{name}-root
@@ -68,6 +85,7 @@ BuildRequires: perl >= 2:5.8.0
BuildRequires: perl(Net::DNS)
BuildRequires: perl(Time::HiRes)
BuildRequires: perl(HTML::Parser)
+BuildRequires: perl(NetAddr::IP)
BuildRequires: openssl-devel
Requires: perl(HTTP::Date)
@@ -75,16 +93,16 @@ Requires: perl(LWP::UserAgent)
Requires: perl(Net::DNS)
Requires: perl(Time::HiRes)
Requires: perl(DB_File)
+Requires: perl(Encode::Detect)
Requires: procmail
Requires: gnupg
-# Hard requirement
+# Hard requirements
BuildRequires: perl-HTML-Parser >= 3.43
Requires: perl-HTML-Parser >= 3.43
-
-%if %{option_archive_tar}
+BuildRequires: perl(Archive::Tar)
Requires: perl(Archive::Tar)
-%endif
+
%if %{option_ssl}
# Needed for spamc/spamd SSL
Requires: perl(IO::Socket::SSL)
@@ -94,6 +112,12 @@ Requires: perl(IO::Socket::INET6)
%if %{perl_devel}
BuildRequires: perl-devel
%endif
+# Mail::DKIM for F12+, works from RHEL5+ from EPEL5 but we don't require them
+%if %{dkim_deps}
+Requires: perl(Mail::DKIM)
+%endif
+
+
Obsoletes: perl-Mail-SpamAssassin
@@ -119,7 +143,7 @@ To filter spam for all users, add that l
# Patches 0-99 are RH specific
# none yet
# Patches 100+ are SVN backports (DO NOT REUSE!)
-#%patch100 -p0
+
# end of patches
%build
@@ -152,12 +176,18 @@ install -m 0644 %{SOURCE6} %buildroot/et
install -m 0644 %{SOURCE7} %buildroot/etc/cron.d/sa-update
# installed mode 744 as non root users can't run it, but can read it.
install -m 0744 %{SOURCE8} %buildroot%{_datadir}/spamassassin/sa-update.cron
+install -m 0644 %{SOURCE13} %buildroot%{_datadir}/spamassassin/
[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress
find $RPM_BUILD_ROOT \( -name perllocal.pod -o -name .packlist \) -exec rm -v {} \;
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
+# Default rules from separate tarball
+cd $RPM_BUILD_ROOT%{_datadir}/spamassassin/
+tar xfvz %{SOURCE1}
+cd -
+
find $RPM_BUILD_ROOT/usr -type f -print |
sed "s@^$RPM_BUILD_ROOT@@g" |
grep -v perllocal.pod |
@@ -172,6 +202,14 @@ find $RPM_BUILD_ROOT%{perl_vendorlib}/*
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/spamassassin
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/spamassassin
+# sa-update channels and keys
+install -m 0644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/
+install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/
+
+# Tell portreserve which port we want it to protect.
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/portreserve
+echo 783 > $RPM_BUILD_ROOT%{_sysconfdir}/portreserve/spamd
+
%files -f %{name}-%{version}-filelist
%defattr(-,root,root)
%doc LICENSE NOTICE CREDITS Changes README TRADEMARK UPGRADE
@@ -184,6 +222,7 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir
%dir %{_localstatedir}/run/spamassassin
%dir %{_localstatedir}/lib/spamassassin
%config(noreplace) %{_sysconfdir}/logrotate.d/sa-update
+%config(noreplace) %{_sysconfdir}/portreserve/spamd
%clean
rm -rf $RPM_BUILD_ROOT
@@ -222,6 +261,57 @@ fi
exit 0
%changelog
+* Mon Dec 21 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.26.rc1
+- 3.3.0-rc1.proposed2 with fixed spamc
+
+* Mon Dec 21 2009 Nick Bebout <nb at fedoraproject.org> - 3.3.0-0.24.beta1
+- Revert to beta1 to fix major error where spamc does nothing and mail
+ is lost into black hole.
+
+* Fri Dec 18 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.23.rc1
+- 3.3.0-rc1
+- Bug #103401: portreserve protect spamd port 783 on F-10+
+
+* Thu Dec 03 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.21.beta1
+- 3.3.0-beta1
+
+* Fri Nov 20 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.20.svn882672
+- svn882672 snapshot
+
+* Thu Nov 12 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.19.svn816416
+- Encode::Detect is important to spamassassin
+
+* Thu Sep 24 2009 Warren Togami <wtogami at redhat.com> - 3.3.3-0.18.svn816416
+- Enable SOUGHT ruleset in nightly sa-update http://wiki.apache.org/spamassassin/SoughtRules
+ You must enable the sa-update cron job manually in /etc/cron.d/sa-update
+- Custom channels may be specified in these config files:
+ /etc/mail/spamassassin/sa-update-channels.txt
+ /etc/mail/spamassassin/sa-update-keys.txt
+
+* Thu Sep 17 2009 Warren Togami <wtogami at redhat.com> - 3.3.3-0.14.svn816416
+- 3.3.0 svn816416 snapshot, pre-alpha3
+ Upstream just fixed important bug SA#6206. Many other bugs fixed since alpha2.
+
+* Thu Sep 17 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.13.alpha2
+- F11+ requires Mail::DKIM
+
+* Sun Sep 13 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.12.alpha2
+- require perl(Mail::DKIM), useful due to USER_IN_DEF_DKIM_WL
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.3.0-0.6.alpha2
+- rebuilt with new openssl
+
+* Mon Aug 10 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.5.alpha1
+- 3.3.0-alpha2
+
+* Tue Jul 07 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.2.alpha1
+- Include default rules to prevent mass confusion and complaints.
+ You should really use sa-update though. Really.
+ Edit /etc/cron.d/sa-update to automate it.
+
+* Mon Jul 06 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.1.alpha1
+- 3.3.0-alpha1
+
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.5-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
More information about the scm-commits
mailing list