/[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.15 by jpp, Fri Feb 19 05:56:55 2021 UTC Revision 1.26 by jcrisp, Wed Mar 8 09:55:14 2023 UTC
# Line 1  Line 1 
1  # $Id: smeserver-spamassassin.spec,v 1.14 2021/02/19 04:53:21 jpp Exp $  # $Id: smeserver-spamassassin.spec,v 1.25 2021/04/07 21:24:36 jpp 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 5  %define release 11
8  Version: %{version}  Version: %{version}
9  Release: %{release}%{?dist}  Release: %{release}%{?dist}
10  License: GPL  License: GPL
# Line 12  Group: Networking/Daemons Line 12  Group: Networking/Daemons
12  Source: %{name}-%{version}.tar.xz  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
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 43  AutoReqProv: no Line 46  AutoReqProv: no
46  SME Server - spamassassin anti-spam module  SME Server - spamassassin anti-spam module
47    
48  %changelog  %changelog
49    * Tue Mar 07 2023 John Crisp <jcrisp@safeandsoundit.co.uk> 2.7.0-11.sme
50    - update for Spamassassin 4 - thanks for the patch Zsolt [SME: 12330]
51    
52    * Wed Apr 07 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.7.0-10.sme
53    - prevent noise in log at spamassassin call from qpsmtpd [SME: 11491]
54    
55    * Tue Mar 16 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.7.0-9.sme
56    - clean rsyslog syntax for spamd [SME: 11422]
57    
58    * Tue Feb 23 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.7.0-8.sme
59    - remove warning while trying to delete file when missing in post script [SME: 11375]
60    
61    * Sun Feb 21 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.7.0-7.sme
62    - remove spamd reference as service use spamassassin.service [SME: 11375]
63      migrate spamd propertie SpamLearning to spamassassin
64      template for /etc/sysconfig/spamassassin, revert --allow-tell option
65      stop spamassassin spamd and delete /etc/systemd/system/spamassassin.service link if exists
66    
67    * Sun Feb 21 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.7.0-6.sme
68    - fix typo [SME: 11361]
69    
70  * Thu Feb 18 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.7.0-5.sme  * Thu Feb 18 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.7.0-5.sme
71  - fix spamd unable to load [SME: 11361]  - fix spamd unable to load [SME: 11361]
72    - redirect spamd loging to spamd.log instead of message [SME: 11362]
73    
74  * Wed Feb 17 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.7.0-4.sme  * Wed Feb 17 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.7.0-4.sme
75  - add requires DCC as we have built it  [SME: 11065]  - add requires DCC as we have built it  [SME: 11065]
# Line 136  SME Server - spamassassin anti-spam modu Line 161  SME Server - spamassassin anti-spam modu
161  * 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
162  - Roll new stream to separate sme7/sme8 trees [SME: 4633]  - Roll new stream to separate sme7/sme8 trees [SME: 4633]
163    
164  * 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
165  - Edit and rename deprecated template fragment [SME: 3857]    - Edit and rename deprecated template fragment [SME: 3857]  
166    
167  * 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 463  SME Server - spamassassin anti-spam modu Line 488  SME Server - spamassassin anti-spam modu
488  %patch1 -p1  %patch1 -p1
489  rm -rf root/etc/e-smith/templates/usr/  rm -rf root/etc/e-smith/templates/usr/
490  rm -rf root//usr/lib/systemd/system/spamd.service.d  rm -rf root//usr/lib/systemd/system/spamd.service.d
491    %patch2 -p1
492    %patch3 -p1
493    rm -rf root/etc/e-smith/db/configuration/defaults/spamd
494    mkdir -p root/var/service/qpsmtpd/.spamassassin
495    %patch4 -p1
496    
497  %build  %build
498  perl createlinks  perl createlinks
# Line 478  rm -f %{name}-%{version}-%{release}-file Line 508  rm -f %{name}-%{version}-%{release}-file
508      --file /etc/cron.hourly/sa-restart 'attr(0755,root,root)' \      --file /etc/cron.hourly/sa-restart 'attr(0755,root,root)' \
509      --dir /usr/lib/systemd/system/spamd.service.d 'attr(0755,root,root)' \      --dir /usr/lib/systemd/system/spamd.service.d 'attr(0755,root,root)' \
510      --dir /usr/lib/systemd/system/spamassassin.service.d 'attr(0755,root,root)' \      --dir /usr/lib/systemd/system/spamassassin.service.d 'attr(0755,root,root)' \
511        --dir /var/service/qpsmtpd/.spamassassin 'attr(2750,spamd,spamd)' \
512        |grep  -v "/var/service/qpsmtpd$" \
513        |grep  -v "/var/service$" \
514      > %{name}-%{version}-%{release}-filelist      > %{name}-%{version}-%{release}-filelist
515    
516  %pre  %pre
517  /sbin/e-smith/create-system-user spamd 1005 \  /sbin/e-smith/create-system-user spamd 1005 \
518      'spamassassin daemon user' /var/spool/spamd /bin/false      'spamassassin daemon user' /var/spool/spamd /bin/false
519    #clean 10.0b1 bad choice
520    if [[ -L "/etc/systemd/system/spamassassin.service" ]]; then
521            unlink /etc/systemd/system/spamassassin.service; fi
522    if [[ -L "/usr/lib/systemd/system/spamassassin.service" ]]; then
523            /usr/bin/systemctl stop spamd.service
524            /usr/bin/systemctl stop spamassassin.service
525    fi
526    
527    
528    
529  %clean  %clean
530  rm -rf $RPM_BUILD_ROOT  rm -rf $RPM_BUILD_ROOT
# Line 490  rm -rf $RPM_BUILD_ROOT Line 532  rm -rf $RPM_BUILD_ROOT
532  %post  %post
533    
534  # Cleanup old files  # Cleanup old files
535  rm -rf /var/lib/spamassassin/3.004000 2>/dev/null || true  if [[  -d /var/lib/spamassassin/3.004000 ]]; then
536      rm -rf /var/lib/spamassassin/3.004000 2>/dev/null || true
537    fi
538    
539  if [[ ! -d /var/lib/spamassassin/3.004004 ]]; then  if [[ ! -d /var/lib/spamassassin/3.004004 ]]; then
540    echo "Installing new spam databases - please be patient"    echo "Installing new spam databases - please be patient"
# Line 504  if [[ ! -d /var/lib/spamassassin/3.00400 Line 548  if [[ ! -d /var/lib/spamassassin/3.00400
548    fi    fi
549  fi  fi
550    
551  rm -rf /usr/lib/systemd/system/spamd.service.d 2>/dev/null || true  if [[  -d /usr/lib/systemd/system/spamd.service.d ]]; then
552      rm -rf /usr/lib/systemd/system/spamd.service.d
553    fi
554    
555  %files -f %{name}-%{version}-%{release}-filelist  %files -f %{name}-%{version}-%{release}-filelist
556  %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