commit d5edbf2da87597af66c8d6f62bd4e57906a387ff
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Mon Feb 16 14:04:27 2015 +0100
- rel 5; on fresh install --channelfile won't be used
sa-update.sh | 3 ++-
spamassassin.spec | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/spamassassin.spec b/spamassassin.spec
index 43c6de1..0fcc89a 100644
--- a/spamassassin.spec
+++ b/spamassassin.spec
@@ -13,7 +13,7 @@ Summary: A spam filter for email which can be invoked
from mail delivery agents
Summary(pl.UTF-8): Filtr antyspamowy, przeznaczony dla programów
dostarczających pocztę (MDA)
Name: spamassassin
Version: 3.4.0
-Release: 4
+Release: 5
License: Apache v2.0
Group: Applications/Mail
Source0:
http://ftp.ps.pl/pub/apache//spamassassin/source/%{pdir}-%{pnam}-%{version}.tar.bz2
diff --git a/sa-update.sh b/sa-update.sh
index 14f7378..b221c04 100644
--- a/sa-update.sh
+++ b/sa-update.sh
@@ -30,7 +30,8 @@ for file in /etc/mail/spamassassin/channel.d/*.conf; do
sa-update --import "$file"
done
-[ -f /etc/mail/spamassassin/channels ] && OPT="$OPT --channelfile
/etc/mail/spamassassin/channels"
+# Using --channelfile breaks channel.d support :-/ Need better way but stays
for now for backward compat
+grep -q "^[a-zA-Z0-9]" /etc/mail/spamassassin/channels && OPT="$OPT
--channelfile /etc/mail/spamassassin/channels"
# Run sa-update on each channel, restart spam daemon if success
for channel in $CHANNELLIST; do
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/spamassassin.git/commitdiff/d5edbf2da87597af66c8d6f62bd4e57906a387ff
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
