--- rpms/smeserver-spamassassin/sme8/smeserver-spamassassin.spec 2007/06/26 18:35:59 1.2 +++ rpms/smeserver-spamassassin/sme8/smeserver-spamassassin.spec 2013/05/19 05:45:09 1.17 @@ -1,25 +1,26 @@ +# $Id: smeserver-spamassassin.spec,v 1.16 2012/04/08 15:12:14 snetram Exp $ + Summary: SME Server - spamassassin anti-spam module %define name smeserver-spamassassin Name: %{name} -%define version 1.4.0 -%define release 14 +%define version 2.2.0 +%define release 10 Version: %{version} Release: %{release}%{?dist} License: GPL Group: Networking/Daemons Source: %{name}-%{version}.tar.gz -Patch1: sa310.patch -Patch2: auto_whitelist_path.patch -Patch3: smeserver-spamassassin-1.3.0-AWLToggle.patch -Patch4: smeserver-spamassassin-1.3.0-AWLToggle.patch2 -Patch5: smeserver-spamassassin-1.4.0-SpamStatusAtStartOfLine.patch -Patch6: smeserver-spamassassin-1.4.0-headermatch.patch -Patch7: smeserver-spamassassin-1.4.0-runit17.patch -Patch8: smeserver-spamassassin-1.4.0-lognoise.patch +Patch1: smeserver-spamassassin-2.2.0-ServiceNameFix.patch +Patch2: smeserver-spamassassin-2.2.0-AWL.patch +Patch3: smeserver-spamassassin-2.2.0-cronjobs.patch +Patch4: smeserver-spamassassin-2.2.0-RequiredScore.patch +Patch5: smeserver-spamassassin-2.2.0-bootstrap-console-save-removal.patch +Patch6: smeserver-spamassassin-2.2.0-pyzor-timeout.patch +Patch7: smeserver-spamassassin-2.2.0-fix_10required_score.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot Requires: e-smith-email >= 4.13.0-38 Requires: headermatch -Requires: spamassassin >= 3.1.0 +Requires: spamassassin >= 3.3.0 Requires: perl(Crypt::OpenSSL::Bignum) Requires: perl(IO::Socket::INET6) Requires: perl(IP::Country) @@ -34,7 +35,7 @@ Requires: e-smith-qmail >= 1.9.0-09sme02 Requires: razor-agents >= 2.61-1 Requires: DCC Requires: pyzor -Requires: FuzzyOcr +Obsoletes: FuzzyOcr Obsoletes: e-smith-spamassassin Provides: e-smith-spamassassin BuildArchitectures: noarch @@ -45,6 +46,56 @@ AutoReqProv: no SME Server - spamassassin anti-spam module %changelog +* Sun May 19 2013 chris burnat 2.2.0-10 +- Reverse changes in 2.2.0-6 and fix how qpsmtpd tags spam email, codes by Charlie Brady [SME: 5603] + +* Sun Apr 8 2012 Jonathan Martens 2.2.0-9 +- Add template fragment for pyzor timeout [SME: 6896] + +* Fri Jan 20 2012 Jonathan Martens 2.2.0-8 +- Actually apply patch to remove spamd restart from bootstrap-console-save event [SME: 6717] + +* Fri Dec 23 2011 Jonathan Martens 2.2.0-7 +- Remove spamd restart from bootstrap-console-save event [SME: 6717] + +* Sat Aug 7 2010 Ian Wells 2.2.0-6.sme +- Work around how qpsmtpd tags spam email, by Michael McCarn [SME: 5603] + +* Mon Apr 19 2010 Shad L. Lords 2.2.0-5.sme +- Remove cron.daily jobs that are no longer needed +- Previous patch make spamassassin restart correctly [SME: 3304] +- Newer spamassassin imports keys on install [SME: 5889] + +* Wed Feb 17 2010 Filippo Carletti 2.2.0-4.sme +- Requires SpamAssassin 3.3.0 [SME: 5741] +- Remove FuzzyOcr [SME: 5771] +- Use ATrpm package (partially remove previous patch) + +* Tue Feb 16 2010 Filippo Carletti 2.2.0-3.sme +- Requires SpamAssassin 3.3.0 [SME: 5741] +- Remove FuzzyOcr [SME: 5771] +- Run sa-update every two hours and check restart every hour +- Redirect cron job output to logfile to avoid mail noise + +* Tue Nov 25 2008 Giacomo Sanchietti 2.2.0-2.sme +- Fix invalid service name in sa-update [SME: 3304] + +* Tue Oct 7 2008 Shad L. Lords 2.2.0-1.sme +- Roll new stream to separate sme7/sme8 trees [SME: 4633] + +* Sat Mar 9 2008 chris burnat 1.4.0-18 +- Edit and rename deprecated template fragment [SME: 3857] + +* Tue Dec 25 2007 Shad L. Lords 1.4.0-17 +- Import all spamassassin keys correctly [SME: 3206] + +* Sat Sep 8 2007 Shad L. Lords 1.4.0-16 +- Import spamassassin keys correctly [SME: 3206] + +* Thu Sep 6 2007 Shad L. Lords 1.4.0-15 +- Import spamassassin keys if sa_update is found [SME: 3206] +- Restart spamassassin if update successful [SME: 3351] + * Sun Jun 24 2007 Shad L. Lords 1.4.0-14 - Fix log (lint) noise [SME: 3100] @@ -355,14 +406,13 @@ SME Server - spamassassin anti-spam modu %prep %setup -%patch1 -p 1 -%patch2 -p 1 -%patch3 -p 1 -%patch4 -p 1 -%patch5 -p 1 -%patch6 -p 1 -%patch7 -p 1 -%patch8 -p 1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 %build perl createlinks @@ -396,6 +446,7 @@ rm -f %{name}-%{version}-%{release}-file --dir /var/log/spamd 'attr(2750,smelog,smelog)' \ --dir /var/spool/spamd 'attr(2750,spamd,spamd)' \ --dir /var/spool/spamd/.spamassassin 'attr(2750,spamd,spamd)' \ + --file /etc/cron.hourly/sa-restart 'attr(0755,root,root)' \ > %{name}-%{version}-%{release}-filelist %pre