diff --git a/smeserver-spamassassin.spec.bak b/smeserver-spamassassin.spec.bak deleted file mode 100644 index 93016d7..0000000 --- a/smeserver-spamassassin.spec.bak +++ /dev/null @@ -1,563 +0,0 @@ -# $Id: smeserver-spamassassin.spec,v 1.27 2023/07/05 14:03:17 jcrisp Exp $ - -Summary: SME Server - spamassassin anti-spam module -%define name smeserver-spamassassin -Name: %{name} -%define version 11.0.0 -%define release 2 -Version: %{version} -Release: %{release}%{?dist} -License: GPL -Group: Networking/Daemons -Source: %{name}-%{version}.tar.xz - -BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot -Requires: smeserver-email >= 4.13.0-38 -Requires: headermatch -Requires: spamassassin >= 4.0.0 -Requires: perl(Crypt::OpenSSL::Bignum) -Requires: perl(IO::Socket::INET6) -Requires: perl(IP::Country) -Requires: perl(Net::DNS) >= 0.34-1 -Requires: perl(Net::Ident) -Requires: perl(Compress::Zlib) -Requires: perl(Mail::DKIM) -Requires: perl(Mail::DMARC) >= 1.20200214 -Requires: ucspi-tcp daemontools -Requires: smeserver-lib >= 1.13.1-90 -Requires: smeserver-base >= 4.13.16 -Requires: smeserver-qmail >= 1.9.0-09sme02 -Requires: smeserver-clamav >= 2.7.0 -Requires: perl-Razor-Agent -Requires: DCC -Requires: pyzor -Obsoletes: FuzzyOcr -Obsoletes: e-smith-spamassassin -Provides: e-smith-spamassassin -BuildArchitectures: noarch -BuildRequires: smeserver-devtools >= 1.11.0-12 -AutoReqProv: no - -%description -SME Server - spamassassin anti-spam module - -%changelog -* Sat Mar 23 2024 Brian Read 11.0.0-2.sme -- Change Requires: e-smith- to Requires:smeserver- - -* Sat Mar 23 2024 Brian Read 11.0.0-1.sme -- Update Release and Version to base version and 1st release for SME11 [SME: 12518] - -* Mon Jul 10 2023 cvs2git.sh aka Brian Read 2.7.0-13.sme -- Roll up patches and move to git repo [SME: 12338] - -* Mon Jul 10 2023 BogusDateBot -- Eliminated rpmbuild "bogus date" warnings due to inconsistent weekday, - by assuming the date is correct and changing the weekday. - -* Wed Jul 05 2023 John Crisp 2.7.0-12.sme -- Add requires perl-Mail-DMARC for spamassassin 4 - -* Tue Mar 07 2023 John Crisp 2.7.0-11.sme -- update for Spamassassin 4 - thanks for the patch Zsolt [SME: 12330] - -* Wed Apr 07 2021 Jean-Philippe Pialasse 2.7.0-10.sme -- prevent noise in log at spamassassin call from qpsmtpd [SME: 11491] - -* Tue Mar 16 2021 Jean-Philippe Pialasse 2.7.0-9.sme -- clean rsyslog syntax for spamd [SME: 11422] - -* Tue Feb 23 2021 Jean-Philipe Pialasse 2.7.0-8.sme -- remove warning while trying to delete file when missing in post script [SME: 11375] - -* Sun Feb 21 2021 Jean-Philipe Pialasse 2.7.0-7.sme -- remove spamd reference as service use spamassassin.service [SME: 11375] - migrate spamd propertie SpamLearning to spamassassin - template for /etc/sysconfig/spamassassin, revert --allow-tell option - stop spamassassin spamd and delete /etc/systemd/system/spamassassin.service link if exists - -* Sun Feb 21 2021 Jean-Philipe Pialasse 2.7.0-6.sme -- fix typo [SME: 11361] - -* Thu Feb 18 2021 Jean-Philipe Pialasse 2.7.0-5.sme -- fix spamd unable to load [SME: 11361] -- redirect spamd loging to spamd.log instead of message [SME: 11362] - -* Wed Feb 17 2021 Jean-Philipe Pialasse 2.7.0-4.sme -- add requires DCC as we have built it [SME: 11065] - -* Fri Jan 08 2021 Jean-Philipe Pialasse 2.7.0-3.sme -- fix smeserver-spamassassin-update event fix [SME: 11166] - -* Wed Dec 16 2020 John Crisp 2.7.0-1 -- Start systemd migration. Remove symlinks [SME: 11224] -- remove refresh clam as this will be provided by clamav -- require spamassassin 3.4.4 + - -* Wed Jun 28 2017 Jean-Philipe Pialasse 2.6.0-8.sme -- disable auto_learn by default when enabling Bayes [SME: 8160] -- added properties UseBayesAutoLearn, BayesAutoLearnThresholdSpam and BayesAutoLearnThresholdNonSpam - -* Wed Mar 8 2017 Daniel Berteaud 2.6.0-7.sme -- Rewrite spamd run script to add support for --allow-tell [SME: 10137] - -* Wed Apr 20 2016 Daniel Berteaud 2.6.0-6.sme -- Add X-Spam-Details header (and simplify X-Spam-Status) [SME: 9471] - -* Fri Mar 18 2016 Jean-Philipe Pialasse 2.6.0-5.sme -- fix claim to own /usr/bin [SME: 9348] -- rebuild for Bug [SME: 9347] - -* Fri Mar 18 2016 Daniel Berteaud 2.6.0-4.sme -- Update dependency for perl-Razor-Agent [SME: 9336] - -* Fri Mar 18 2016 Daniel Berteaud 2.6.0-3.sme -- Remove dependency on dcc as it's non free software [SME: 9331] - -* Fri Mar 18 2016 Jean-Philippe Pialasse 2.6.0-2.sme -- Change Requires DCC to dcc [SME: 9343] - -* Sat Feb 06 2016 stephane de Labrusse 2.6.0-1.sme -- Initial release to sme10 - -* Thu Jan 07 2016 Daniel Berteaud 2.4.0-6.sme -- Disable ipv6 support to prevent a warning during startup [SME: 9153] - -* Wed Jan 29 2014 Ian Wells 2.4.0-5.sme -- Remove workarounds for how qpsmtpd tags spam email [SME: 8109] -- Fix whitespace in 10required_score - -* Thu Jan 2 2014 Ian Wells 2.4.0-4.sme -- Include /usr/bin/refreshclam [SME: 8108] - -* Fri Jul 5 2013 Ian Wells 2.4.0-3.sme -- Load TextCat plugin if ok_languages is enabled [SME: 7757] - -* Sun May 19 2013 chris burnat 2.4.0-2.sme -- Fix how qpsmtpd tags spam email, codes by Charlie Brady [SME: 7604] - -* Wed Feb 6 2013 Shad L. Lords 2.4.0-1.sme -- Roll new stream for sme9 - -* 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 8 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] - -* Sun Apr 29 2007 Shad L. Lords -- Clean up spec so package can be built by koji/plague - -* Sun Feb 18 2007 Shad L. Lords 1.4.0-13 -- Add FuzzyOcr to spamassassin to detect graphic spam [SME: 1985] - -* Fri Feb 16 2007 Shad L. Lords 1.4.0-12 -- Change runsvctrl to sv to support runit v1.7.x [SME: 2486] - -* Wed Jan 24 2007 Shad L. Lords 1.4.0-11 -- Add requires for new spamassassin modules - -* Thu Dec 07 2006 Shad L. Lords -- Update to new release naming. No functional changes. -- Make Packager generic - -* Fri Nov 10 2006 Gordon Rowell 1.4.0-09 -- Only match X-Spam-Status in headers, via headermatch [SME: 1924] - -* Thu Jul 13 2006 Gordon Rowell 1.4.0-08 -- Anchor X-Spam-Status check to start of line [SME: 1712] - -* Wed Jun 14 2006 Gordon Rowell 1.4.0-07 -- Missing space in last change [SME: 1571] - -* Wed Jun 14 2006 Gordon Rowell 1.4.0-06 -- Add check for spamassassin{UseAutoWhitelist}, defaulting to 0 (off) - [SME: 1571] - -* Fri Jun 9 2006 Shad L. Lords 1.4.0-05 -- Add path/perm for auto_whitelist [SME: 1571] - -* Fri Jun 9 2006 Gordon Rowell 1.4.0-04 -- Adjust perl dependencies to perl module rather than RPM [SME: 1548] - -* Fri Jun 9 2006 Gordon Rowell 1.4.0-03 -- Correct previous changelog and rebuild [SME: 1548] - -* Wed Jun 7 2006 Shad L. Lords 1.4.0-02 -- Update config for spamassassin 3.10+ [SME: 1548] - -* Wed Mar 15 2006 Charlie Brady 1.4.0-01 -- Roll stable stream version. [SME: 1016] - -* Wed Feb 22 2006 Gavin Weight 1.3.0-07 -- Renamed 40customScore_BAYES_90 to 40customScore_BAYES_95, - Edited 40customScore_BAYES_95 to change 90 to 95. [SME: 836] - -* Tue Feb 7 2006 Shad L. Lords 1.3.0-06 -- Add db default for wbl.global_to|type [SME: 693] - -* Sat Jan 28 2006 Shad L. Lords 1.3.0-05 -- Add global white/black lists for to addresses [SME: 594] - -* Thu Nov 03 2005 Filippo Carletti 1.3.0-04 -- Avoid runit spinning if spamd is disabled [SF: 1312897] - -* Wed Nov 02 2005 Filippo Carletti 1.3.0-03sme01 -- Start spamd only if spam filter is enabled [SF: 1312897] - -* Mon Oct 10 2005 Gordon Rowell 1.3.0-03 -- Migrate SortSpam property from 0/1 to disabled/enabled [SF: 1321319] - -* Fri Oct 7 2005 Gordon Rowell 1.3.0-02 -- Clear qmail{DeliveryInstruction} and qmail{DeliveryType} if - they were set for the obsoleted sortspam [SF: 1315596] - -* Fri Sep 23 2005 Gordon Rowell -- [1.3.0] -- Package renamed to smeserver-spamassassin - -* Fri Sep 23 2005 Gordon Rowell -- [1.1.0-08sme01] -- Simplify .qmail template fragment and add Requires header - for recent e-smith-qmail since we need 00setup from it [SF: 1252336] - -* Tue Aug 2 2005 Shad Lords -- [1.1.0-08] -- Prepare for change of default database location. [SF: 1216546] - -* Tue May 31 2005 Charlie Brady -- [1.1.0-07] -- Default spamassassin{RejectLevel}==0 [Gordon SF:1202399] - -* Fri May 13 2005 Charlie Brady -- [1.1.0-06] -- Another update from Gordon. -- Use condredirect (redirecting to $USERNAME-junkmail) - instead of sortspam [SF:1200336] -- Provide template for .qmail-junkmail -- Remove db defaults for qmail{DeliveryType,DeliveryInstruction}. - We don't want one delivery instruction, we want as many as the - user has requested. Each instruction should be enabled/disabled - on a global and per-user basis, as per SortSpam -- TODO: Simplify e-smithForward20 in e-smith-email - -* Fri May 13 2005 Charlie Brady -- [1.1.0-05] -- Really add the new files in last patch from Shad/Gordon. - -* Thu May 5 2005 Charlie Brady -- [1.1.0-04] -- Various contributions from Shad Lords and Gordon Rowell, as follows -- Add sortspam from Shad Lords' e-smith-spamassassin -- Add lots of config entries and local.cf templates, also from Shad -- Modified templates to match new config db names -- Add migrate fragments - -* Wed Apr 27 2005 Charlie Brady -- [1.1.0-03] -- Change Requires header to "razor-agents". - -* Mon Mar 21 2005 Charlie Brady -- [1.1.0-02] -- Update config for SpamAssassin 3.0.2 - -* Wed Feb 4 2004 Michael Soulier -- [1.1.0-01] -- rolling to dev - 1.1.0 - -* Wed Feb 4 2004 Michael Soulier -- [1.0.0-01] -- rolling to stable - 1.0.0 - -* Thu Aug 28 2003 Michael Soulier -- [0.0.8-02] -- Added K* init symlinks to runlevels 0, 1 and 6. [msoulier 9761] - -* Thu Jun 26 2003 Gordon Rowell -- [0.0.8-01] -- Enable spamd by default [gordonr 9183] -- Simplify spamassassin-update script [gordonr 9183] -- Resolve spamd/spamassassing directory confusion [gordonr 9183] -- Change spamd use home directory to /var/spool/spamd [gordonr 9183] -- Log as smelog user in /var/log/spamd [gordonr 9183] -- Update SPEC file with new genfilelist [gordonr 9183] - -* Fri Jun 20 2003 Gordon Rowell -- [0.0.7-23] -- Add path to /service/spamd so restart works [gordonr 9095] - -* Mon Jun 9 2003 Gordon Rowell -- [0.0.7-22] -- Put back skip_rbl_checks|0 default [gordonr 8952] - -* Mon Jun 9 2003 Gordon Rowell -- [0.0.7-21] -- Generate the correct config lines, and make each fragment - valid perl [gordonr 8960] - -* Mon Jun 9 2003 Gordon Rowell -- [0.0.7-20] -- Move spamassassin configuration parameters into main configdb - as properties of the spamassassing service [gordonr 8960] - -* Mon Jun 9 2003 Charlie Brady -- [0.0.7-19] -- Change config to use RBLs by default. [charlieb 8952] - -* Wed Jun 4 2003 Charlie Brady -- [0.0.7-18] -- Use create-system-user to create spamd user. [charlieb 6033] - -* Tue Apr 22 2003 Gordon Rowell -- [0.0.7-17] -- Removed %post call - already done in various events [gordonr 2600] - -* Tue Apr 22 2003 Gordon Rowell -- [0.0.7-16] -- Changed spamd uid (1003 already taken) - [gordonr 8368] - -* Mon Apr 21 2003 Gordon Rowell -- [0.0.7-15] -- Let useradd add the group in %pre. Don't fail %pre if the uid is not - unique [gordonr 8368] - -* Wed Apr 9 2003 Charlie Brady -- [0.0.7-14] -- Replace serviceControl() calls with "svc-stop" or "svc -t" as required, - so that messages don't leak to console when spamd is restarted. - [charlieb 7883] - -* Thu Apr 3 2003 Gordon Rowell -- [0.0.7-13] -- Removed dangling panel link [gordonr 7787] - -* Wed Apr 2 2003 Charlie Brady -- [0.0.7-12] -- Add default DeliveryInstruction andi DeliveryType default - properties for qmail, so that "sortspam" is used for local delivery. - Update e-smith-email "requires" version to suit. [charlieb 2600] -- Change Copyright header to License. [charlieb] - -* Wed Apr 2 2003 Charlie Brady -- [0.0.7-11] -- Remove panel code. Greg's panel code can now be found in - e-smith-spamassassin-panel. [charlieb 7787] -- Split action into spamassassin config/restart and procmail - configure sections. Latter is not yet liked into any - actions. [charlieb 2600] -- Remove db initialization parts of action script - init done by - 'defaults' fragments. [charlieb 7526] -- Do stop/restart of 'spamd', not 'spamassassin'. [charlieb 2600] - -* Fri Mar 28 2003 Gordon Rowell -- [0.0.7-10] -- Change panel Spam Control -> Spam filtering [gordonr 2600] - -* Fri Mar 28 2003 Charlie Brady -- [0.0.7-09] -- Fix problem with sorting of sensitivity labels in panel [charlieb 7910] - -* Tue Mar 25 2003 Charlie Brady -- [0.0.7-08] -- Remove -c from run file which starts spamd - we don't want to try - to create missing user config files. [charlieb 2600] -- Create user spamd and run spamd as that userid. [charlieb 2600] - -* Mon Mar 17 2003 Charlie Brady -- [0.0.7-07] -- Add conf.global and wbl.global default configuration data. [charlieb 2600] - -* Fri Mar 14 2003 Charlie Brady -- [0.0.7-06] -- Various fixes to spamassassin db initialization templates - mostly CVS - repository issues. [charlieb 2600] - -* Fri Mar 14 2003 Charlie Brady -- [0.0.7-05] -- Add the panel link for the new panel. Configure spamd to be paranoid - and to create no use config files. [charlieb 2600] - -* Fri Mar 14 2003 Charlie Brady -- [0.0.7-04] -- Remove Greg's full-featured spamassassin panel. Consult CVS if you want - to resurrect any of the code. [charlieb 2600] - -* Fri Mar 14 2003 Charlie Brady -- [0.0.7-03] -- Fix the minimal FM panel so that it runs. [charlieb 2600] -- Fix compile problems in spamassassin-update script. [charlieb 2600] - -* Fri Mar 14 2003 Charlie Brady -- [0.0.7-02] -- Add starter en-us lexicon for FM version of the panel. [charlieb 2600] - -* Fri Mar 14 2003 Charlie Brady -- [0.0.7-01] -- Use new defaults directory structure to initialize db entries. - Add minimal Fm web panel. Add spamassassin-update to email-update - and bootstrap-console-save events. [charlieb 2600] - -* Tue Feb 4 2003 Gordon Rowell -- [0.0.6-01] -- Roll new source tarball after the merge [gordonr 2600] - -* Tue Feb 4 2003 Gordon Rowell -- [0.0.5-04] -- Merged in Greg Zartman's contrib - -* Wed Jan 29 2003 Greg Zartman -- Fixed a small typo in spamassassin server-manager - panel that caused a menu label to not show correctly - -* Wed Jan 29 2003 Greg Zartman -- [0.0.1-1] -- initial Alpha release - -* Sun Dec 29 2002 Gordon Rowell -- [0.0.5-03] -- And rename /service/spamd as well [gordonr 2600] - -* Sun Dec 29 2002 Gordon Rowell -- [0.0.5-02] -- Renamed spamassassin -> spamd to avoid conflict with spamassassin's - init script [gordonr 2600] - -* Sun Dec 29 2002 Gordon Rowell -- [0.0.5-01] -- Removed stray /etc/tcprules directory [gordonr 2600] - -* Sun Dec 29 2002 Gordon Rowell -- [0.0.4-01] -- Deleted some detritus [gordonr 2600] - -* Sun Dec 29 2002 Gordon Rowell -- [0.0.3-01] -- And an -as-source run to build the initial version [gordonr 2600] - -* Sun Dec 29 2002 Gordon Rowell -- [0.0.2-02] -- Missed some files on initial import [gordonr 2600] - -* Sun Dec 29 2002 Gordon Rowell -- [0.0.2-01] -- Initial import to 0.0.2 - -* Sun Dec 29 2002 Gordon Rowell -- [0.0.1-02] -- Initial SRPM from CVS [gordonr 2600] - -* Sun Dec 29 2002 Gordon Rowell -- [0.0.1-1] -- Initial - -%prep -%setup -rm -rf root/etc/e-smith/templates/usr/ -rm -rf root//usr/lib/systemd/system/spamd.service.d -rm -rf root/etc/e-smith/db/configuration/defaults/spamd -mkdir -p root/var/service/qpsmtpd/.spamassassin - -%build -perl createlinks - -%install -rm -rf $RPM_BUILD_ROOT -(cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT) -rm -f %{name}-%{version}-%{release}-filelist -/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ - --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)' \ - --dir /usr/lib/systemd/system/spamd.service.d 'attr(0755,root,root)' \ - --dir /usr/lib/systemd/system/spamassassin.service.d 'attr(0755,root,root)' \ - --dir /var/service/qpsmtpd/.spamassassin 'attr(2750,spamd,spamd)' \ - |grep -v "/var/service/qpsmtpd$" \ - |grep -v "/var/service$" \ - > %{name}-%{version}-%{release}-filelist - -%pre -/sbin/e-smith/create-system-user spamd 1005 \ - 'spamassassin daemon user' /var/spool/spamd /bin/false -#clean 10.0b1 bad choice -if [[ -L "/etc/systemd/system/spamassassin.service" ]]; then - unlink /etc/systemd/system/spamassassin.service; fi -if [[ -L "/usr/lib/systemd/system/spamassassin.service" ]]; then - /usr/bin/systemctl stop spamd.service - /usr/bin/systemctl stop spamassassin.service -fi - - - -%clean -rm -rf $RPM_BUILD_ROOT - -%post - -# Cleanup old files -if [[ -d /var/lib/spamassassin/3.004000 ]]; then - rm -rf /var/lib/spamassassin/3.004000 2>/dev/null || true -fi - -if [[ ! -d /var/lib/spamassassin/3.004004 ]]; then - echo "Installing new spam databases - please be patient" - nc -z 8.8.8.8 53 >/dev/null 2>&1 - online=$? - if [ $online -eq 0 ]; then - echo "Server Online - updating" - /usr/bin/sa-update -v - else - echo "Offline - please check your network connection and then run sa-update manually" - fi -fi - -if [[ -d /usr/lib/systemd/system/spamd.service.d ]]; then - rm -rf /usr/lib/systemd/system/spamd.service.d -fi - -%files -f %{name}-%{version}-%{release}-filelist -%defattr(-,root,root)