/[smeserver]/rpms/smeserver-spamassassin/sme10/smeserver-spamassassin.spec
ViewVC logotype

Diff of /rpms/smeserver-spamassassin/sme10/smeserver-spamassassin.spec

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

Revision 1.18 by jpp, Mon Feb 22 04:04:24 2021 UTC Revision 1.27 by jcrisp, Wed Jul 5 14:03:17 2023 UTC
# Line 1  Line 1 
1  # $Id: smeserver-spamassassin.spec,v 1.17 2021/02/21 16:41:24 jpp Exp $  # $Id: smeserver-spamassassin.spec,v 1.26 2023/03/08 09:55:14 jcrisp Exp $
2    
3  Summary: SME Server - spamassassin anti-spam module  Summary: SME Server - spamassassin anti-spam module
4  %define name smeserver-spamassassin  %define name smeserver-spamassassin
5  Name: %{name}  Name: %{name}
6  %define version 2.7.0  %define version 2.7.0
7  %define release 7  %define release 12
8  Version: %{version}  Version: %{version}
9  Release: %{release}%{?dist}  Release: %{release}%{?dist}
10  License: GPL  License: GPL
# Line 13  Source: %{name}-%{version}.tar.xz Line 13  Source: %{name}-%{version}.tar.xz
13  Patch0: smeserver-spamassassin-2.7.0-bz11166-update.patch  Patch0: smeserver-spamassassin-2.7.0-bz11166-update.patch
14  Patch1: smeserver-spamassassin-2.7.0-bz11361-spamd-fails.patch  Patch1: smeserver-spamassassin-2.7.0-bz11361-spamd-fails.patch
15  Patch2: smeserver-spamassassin-2.7.0-bz11362-logging.patch  Patch2: smeserver-spamassassin-2.7.0-bz11362-logging.patch
16    Patch3: smeserver-spamassassin-2.7.0-bz11375-remove-spamd.patch
17    Patch4: smeserver-spamassassin-2.7.0-bz12330-logging-sa4.patch
18    
19  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
20  Requires: e-smith-email >= 4.13.0-38  Requires: e-smith-email >= 4.13.0-38
21  Requires: headermatch  Requires: headermatch
22  Requires: spamassassin >= 3.4.4  Requires: spamassassin >= 4.0.0
23  Requires: perl(Crypt::OpenSSL::Bignum)  Requires: perl(Crypt::OpenSSL::Bignum)
24  Requires: perl(IO::Socket::INET6)  Requires: perl(IO::Socket::INET6)
25  Requires: perl(IP::Country)  Requires: perl(IP::Country)
# Line 25  Requires: perl(Net::DNS) >= 0.34-1 Line 27  Requires: perl(Net::DNS) >= 0.34-1
27  Requires: perl(Net::Ident)  Requires: perl(Net::Ident)
28  Requires: perl(Compress::Zlib)  Requires: perl(Compress::Zlib)
29  Requires: perl(Mail::DKIM)  Requires: perl(Mail::DKIM)
30    Requires: perl(Mail::DMARC) >= 1.20200214
31  Requires: ucspi-tcp daemontools  Requires: ucspi-tcp daemontools
32  Requires: e-smith-lib >= 1.13.1-90  Requires: e-smith-lib >= 1.13.1-90
33  Requires: e-smith-base >= 4.13.16  Requires: e-smith-base >= 4.13.16
# Line 44  AutoReqProv: no Line 47  AutoReqProv: no
47  SME Server - spamassassin anti-spam module  SME Server - spamassassin anti-spam module
48    
49  %changelog  %changelog
50    * Wed Jul 05 2023 John Crisp <jcrisp@safeandsoundit.co.uk> 2.7.0-12.sme
51    - Add requires perl-Mail-DMARC for spamassassin 4
52    
53    * Tue Mar 07 2023 John Crisp <jcrisp@safeandsoundit.co.uk> 2.7.0-11.sme
54    - update for Spamassassin 4 - thanks for the patch Zsolt [SME: 12330]
55    
56    * Wed Apr 07 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.7.0-10.sme
57    - prevent noise in log at spamassassin call from qpsmtpd [SME: 11491]
58    
59    * Tue Mar 16 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.7.0-9.sme
60    - clean rsyslog syntax for spamd [SME: 11422]
61    
62    * Tue Feb 23 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.7.0-8.sme
63    - remove warning while trying to delete file when missing in post script [SME: 11375]
64    
65  * Sun Feb 21 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.7.0-7.sme  * Sun Feb 21 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.7.0-7.sme
66  - remove spamd reference as service use spamassassin.service [SME: 11375]  - remove spamd reference as service use spamassassin.service [SME: 11375]
67    migrate spamd propertie SpamLearning to spamassassin    migrate spamd propertie SpamLearning to spamassassin
# Line 147  SME Server - spamassassin anti-spam modu Line 165  SME Server - spamassassin anti-spam modu
165  * Tue Oct 7 2008 Shad L. Lords <slords@mail.com> 2.2.0-1.sme  * Tue Oct 7 2008 Shad L. Lords <slords@mail.com> 2.2.0-1.sme
166  - Roll new stream to separate sme7/sme8 trees [SME: 4633]  - Roll new stream to separate sme7/sme8 trees [SME: 4633]
167    
168  * Sat Mar 9 2008 chris burnat <devlist@burnat.com> 1.4.0-18  * Sat Mar 8 2008 chris burnat <devlist@burnat.com> 1.4.0-18
169  - Edit and rename deprecated template fragment [SME: 3857]    - Edit and rename deprecated template fragment [SME: 3857]  
170    
171  * Tue Dec 25 2007 Shad L. Lords <slords@mail.com> 1.4.0-17  * Tue Dec 25 2007 Shad L. Lords <slords@mail.com> 1.4.0-17
# Line 475  SME Server - spamassassin anti-spam modu Line 493  SME Server - spamassassin anti-spam modu
493  rm -rf root/etc/e-smith/templates/usr/  rm -rf root/etc/e-smith/templates/usr/
494  rm -rf root//usr/lib/systemd/system/spamd.service.d  rm -rf root//usr/lib/systemd/system/spamd.service.d
495  %patch2 -p1  %patch2 -p1
496    %patch3 -p1
497  rm -rf root/etc/e-smith/db/configuration/defaults/spamd  rm -rf root/etc/e-smith/db/configuration/defaults/spamd
498    mkdir -p root/var/service/qpsmtpd/.spamassassin
499    %patch4 -p1
500    
501  %build  %build
502  perl createlinks  perl createlinks
# Line 491  rm -f %{name}-%{version}-%{release}-file Line 512  rm -f %{name}-%{version}-%{release}-file
512      --file /etc/cron.hourly/sa-restart 'attr(0755,root,root)' \      --file /etc/cron.hourly/sa-restart 'attr(0755,root,root)' \
513      --dir /usr/lib/systemd/system/spamd.service.d 'attr(0755,root,root)' \      --dir /usr/lib/systemd/system/spamd.service.d 'attr(0755,root,root)' \
514      --dir /usr/lib/systemd/system/spamassassin.service.d 'attr(0755,root,root)' \      --dir /usr/lib/systemd/system/spamassassin.service.d 'attr(0755,root,root)' \
515        --dir /var/service/qpsmtpd/.spamassassin 'attr(2750,spamd,spamd)' \
516        |grep  -v "/var/service/qpsmtpd$" \
517        |grep  -v "/var/service$" \
518      > %{name}-%{version}-%{release}-filelist      > %{name}-%{version}-%{release}-filelist
519    
520  %pre  %pre
# Line 498  rm -f %{name}-%{version}-%{release}-file Line 522  rm -f %{name}-%{version}-%{release}-file
522      'spamassassin daemon user' /var/spool/spamd /bin/false      'spamassassin daemon user' /var/spool/spamd /bin/false
523  #clean 10.0b1 bad choice  #clean 10.0b1 bad choice
524  if [[ -L "/etc/systemd/system/spamassassin.service" ]]; then  if [[ -L "/etc/systemd/system/spamassassin.service" ]]; then
525          echo "unlink /etc/systemd/system/spamassassin.service"; fi          unlink /etc/systemd/system/spamassassin.service; fi
526  if [[ -L "/usr/lib/systemd/system/spamassassin.service" ]]; then  if [[ -L "/usr/lib/systemd/system/spamassassin.service" ]]; then
527          /usr/bin/systemctl stop spamd.service          /usr/bin/systemctl stop spamd.service
528          /usr/bin/systemctl stop spamassassin.service          /usr/bin/systemctl stop spamassassin.service
# Line 512  rm -rf $RPM_BUILD_ROOT Line 536  rm -rf $RPM_BUILD_ROOT
536  %post  %post
537    
538  # Cleanup old files  # Cleanup old files
539  rm -rf /var/lib/spamassassin/3.004000 2>/dev/null || true  if [[  -d /var/lib/spamassassin/3.004000 ]]; then
540      rm -rf /var/lib/spamassassin/3.004000 2>/dev/null || true
541    fi
542    
543  if [[ ! -d /var/lib/spamassassin/3.004004 ]]; then  if [[ ! -d /var/lib/spamassassin/3.004004 ]]; then
544    echo "Installing new spam databases - please be patient"    echo "Installing new spam databases - please be patient"
# Line 526  if [[ ! -d /var/lib/spamassassin/3.00400 Line 552  if [[ ! -d /var/lib/spamassassin/3.00400
552    fi    fi
553  fi  fi
554    
555  rm -rf /usr/lib/systemd/system/spamd.service.d 2>/dev/null || true  if [[  -d /usr/lib/systemd/system/spamd.service.d ]]; then
556      rm -rf /usr/lib/systemd/system/spamd.service.d
557    fi
558    
559  %files -f %{name}-%{version}-%{release}-filelist  %files -f %{name}-%{version}-%{release}-filelist
560  %defattr(-,root,root)  %defattr(-,root,root)

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed