9 Commits

Author SHA1 Message Date
John Crisp
b452829bb9 * Tue Apr 08 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-8.sme
- Remove old createlink [SME: 12940]
2025-04-08 13:21:41 +02:00
John Crisp
5b998c570f * Mon Feb 24 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-7.sme
- run sa_update after install [SME: 12941]
2025-02-25 12:57:23 +01:00
47689e3db3 * Fri Jan 17 2025 Brian Read <brianr@koozali.org> 11.0.0-6.sme
- Add ignoredir in spec file for /var/service/qpsmtpd and s and u variants [SME: 12873]
2025-01-17 12:27:19 +00:00
dc437d0940 * Wed Jan 15 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-5.sme
- remove Requires daemontools [SME: 12566]
2025-01-15 22:25:44 -05:00
72d426012b Add *.bak to .gitignore 2024-11-12 19:21:53 +00:00
645f9dcbb3 Deleting spurious *.spec.bak files 2024-11-12 19:21:51 +00:00
5016d5cdd3 Update README with specific Bugzilla links with status options 2024-10-27 14:29:42 +00:00
70f3d8a454 Update readme bugzilla link to show all outstanding bugs 2024-10-27 12:13:31 +00:00
f14cd67ce7 * Tue Aug 13 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-4.sme
- fix new log does not fill after log rotate [SME: 12689]
2024-08-13 23:29:21 -04:00
9 changed files with 33 additions and 9 deletions

1
.gitignore vendored
View File

@@ -2,3 +2,4 @@
*.log *.log
*spec-20* *spec-20*
*.tar.xz *.tar.xz
*.bak

View File

@@ -6,7 +6,14 @@ SMEServer Koozali developed git repo for smeserver-spamassassin smeserver
<br />https://wiki.koozali.org/ <br />https://wiki.koozali.org/
## Bugzilla ## Bugzilla
Show list of outstanding bugs: [here](https://bugs.koozali.org/buglist.cgi?component=smeserver-spamassassin&product=SME%20Server%2010.X&query_format=advanced&limit=0&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=CONFIRMED) Show list of outstanding bugs:
[All](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=UNCONFIRMED&bug_status=CONFIRMED&bug_status=NEEDINFO&bug_status=IN_PROGRESS&bug_status=RESOLVED&bug_status=VERIFIED&cf_package=smeserver-spamassassin&classification=SME+Server&list_id=105756&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
[Confirmed](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=CONFIRMED&cf_package=smeserver-spamassassin&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
[Unconfirmed](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=UNCONFIRMED&cf_package=smeserver-spamassassin&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
[Need info](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=NEEDINFO&cf_package=smeserver-spamassassin&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
[In progress](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=IN_PROGRESS&cf_package=smeserver-spamassassin&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
[Resolved](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=RESOLVED&cf_package=smeserver-spamassassin&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
[Verified](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=VERIFIED&cf_package=smeserver-spamassassin&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
## Description ## Description

View File

@@ -1 +0,0 @@
sme10

View File

@@ -24,7 +24,7 @@ foreach (qw(
bootstrap-console-save bootstrap-console-save
console-save console-save
email-update email-update
smeserver-spamassassin-update smeserver-spamassassin-update
)); ));
} }
@@ -32,7 +32,6 @@ foreach (qw(
$event="smeserver-spamassassin-update"; $event="smeserver-spamassassin-update";
event_link("systemd-default", $event, "88"); # updates all the service files etc event_link("systemd-default", $event, "88"); # updates all the service files etc
event_link("systemd-reload", $event, "89"); # systemctl daemon-reload event_link("systemd-reload", $event, "89"); # systemctl daemon-reload
event_link("spamassassin-update", $event, "99"); # Hopefully restarts spamassassin
safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/spamassassin"); safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/spamassassin");
templates2events("/etc/rsyslog.conf",$event); templates2events("/etc/rsyslog.conf",$event);
templates2events("/etc/sysconfig/spamassassin",$event); templates2events("/etc/sysconfig/spamassassin",$event);

View File

@@ -0,0 +1 @@
spamassassin:any:/sbin/e-smith/signal-event smeserver-spamassassin-update

View File

@@ -7,7 +7,7 @@
su root root su root root
create 600 root root create 600 root root
postrotate postrotate
/bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true /usr/bin/systemctl -s HUP kill rsyslog.service >/dev/null 2>&1 || true
endscript endscript
} }

View File

View File

View File

@@ -4,7 +4,7 @@ Summary: SME Server - spamassassin anti-spam module
%define name smeserver-spamassassin %define name smeserver-spamassassin
Name: %{name} Name: %{name}
%define version 11.0.0 %define version 11.0.0
%define release 3 %define release 8
Version: %{version} Version: %{version}
Release: %{release}%{?dist} Release: %{release}%{?dist}
License: GPL License: GPL
@@ -23,7 +23,7 @@ Requires: perl(Net::Ident)
Requires: perl(Compress::Zlib) Requires: perl(Compress::Zlib)
Requires: perl(Mail::DKIM) Requires: perl(Mail::DKIM)
Requires: perl(Mail::DMARC) >= 1.20200214 Requires: perl(Mail::DMARC) >= 1.20200214
Requires: ucspi-tcp daemontools Requires: ucspi-tcp
Requires: smeserver-lib >= 1.13.1-90 Requires: smeserver-lib >= 1.13.1-90
Requires: smeserver-base >= 4.13.16 Requires: smeserver-base >= 4.13.16
Requires: smeserver-qmail >= 1.9.0-09sme02 Requires: smeserver-qmail >= 1.9.0-09sme02
@@ -42,6 +42,21 @@ AutoReqProv: no
SME Server - spamassassin anti-spam module SME Server - spamassassin anti-spam module
%changelog %changelog
* Tue Apr 08 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-8.sme
- Remove old createlink [SME: 12940]
* Mon Feb 24 2025 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-7.sme
- run sa_update after install [SME: 12941]
* Fri Jan 17 2025 Brian Read <brianr@koozali.org> 11.0.0-6.sme
- Add ignoredir in spec file for /var/service/qpsmtpd and s and u variants [SME: 12873]
* Wed Jan 15 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-5.sme
- remove Requires daemontools [SME: 12566]
* Tue Aug 13 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-4.sme
- fix new log does not fill after log rotate [SME: 12689]
* Thu Apr 04 2024 Brian Read <brianr@koozali.org> 11.0.0-3.sme * Thu Apr 04 2024 Brian Read <brianr@koozali.org> 11.0.0-3.sme
- Set license file to GPL2.0 [SME: 12577] - Set license file to GPL2.0 [SME: 12577]
@@ -519,8 +534,10 @@ rm -f %{name}-%{version}-%{release}-filelist
--dir /usr/lib/systemd/system/spamd.service.d '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 /usr/lib/systemd/system/spamassassin.service.d 'attr(0755,root,root)' \
--dir /var/service/qpsmtpd/.spamassassin 'attr(2750,spamd,spamd)' \ --dir /var/service/qpsmtpd/.spamassassin 'attr(2750,spamd,spamd)' \
|grep -v "/var/service/qpsmtpd$" \ --ignoredir "/var/service" \
|grep -v "/var/service$" \ --ignoredir "/var/service/qpsmtpd" \
--ignoredir "/var/service/uqpsmtpd" \
--ignoredir "/var/service/sqpsmtpd" \
> %{name}-%{version}-%{release}-filelist > %{name}-%{version}-%{release}-filelist
%pre %pre