rpms/spamassassin
5
0
Fork 0
Code Issues Pull Requests Releases Activity

minor cleanups, rename conf dir to /etc/mail/spamassassin/channel.d/

Browse Source
This commit is contained in:
Warren Togami 2010-01-11 22:51:02 +00:00
parent 70c58f5e2a
commit 5b2c53441d
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sa-update.cronscript
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# *** DO NOT MODIFY THIS FILE *** # *** DO NOT MODIFY THIS FILE ***
# #
# /etc/mail/spamassassin/channels/*.conf # /etc/mail/spamassassin/channel.d/*.conf
# Place files here to add custom channels. # Place files here to add custom channels.
# #
@ -46,8 +46,8 @@ fi
# Initialize Channels and Keys # Initialize Channels and Keys
CHANNELLIST="" CHANNELLIST=""
KEYLIST="" KEYLIST=""
# Process each channel defined in /etc/mail/spamassassin/channels/ # Process each channel defined in /etc/mail/spamassassin/channel.d/
for file in $(run_parts_list /etc/mail/spamassassin/channels/ .conf); do for file in $(run_parts_list /etc/mail/spamassassin/channel.d/ .conf); do
# Validate config file # Validate config file
PREFIXES="CHANNELURL KEYID BEGIN" PREFIXES="CHANNELURL KEYID BEGIN"
for prefix in $PREFIXES; do for prefix in $PREFIXES; do
@ -57,8 +57,8 @@ for file in $(run_parts_list /etc/mail/spamassassin/channels/ .conf); do
fi fi
done done
. $file . $file
echo "CHANNELURL=$CHANNELURL" #echo "CHANNELURL=$CHANNELURL"
echo "KEYID=$KEYID" #echo "KEYID=$KEYID"
CHANNELLIST="$CHANNELLIST $CHANNELURL" CHANNELLIST="$CHANNELLIST $CHANNELURL"
KEYLIST="$KEYLIST $KEYID" KEYLIST="$KEYLIST $KEYID"
sa-update --import $file sa-update --import $file

16
spamassassin.spec
View File

@ -52,7 +52,7 @@ Summary: Spam filter for email which can be invoked from mail delivery agents
Name: spamassassin Name: spamassassin
Version: 3.3.0 Version: 3.3.0
%define prename rc2 %define prename rc2
Release: 0.30.%{prename}%{?dist} Release: 0.31.%{prename}%{?dist}
License: ASL 2.0 License: ASL 2.0
Group: Applications/Internet Group: Applications/Internet
URL: http://spamassassin.apache.org/ URL: http://spamassassin.apache.org/
@ -201,9 +201,9 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/spamassassin
# sa-update channels and keyring directory # sa-update channels and keyring directory
mkdir -m 0700 $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/sa-update-keys/ mkdir -m 0700 $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/sa-update-keys/
mkdir -m 0755 $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/channels/ mkdir -m 0755 $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/channel.d/
install -m 0644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/channels/ install -m 0644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/channel.d/
install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/channels/ install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/channel.d/
# Tell portreserve which port we want it to protect. # Tell portreserve which port we want it to protect.
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/portreserve mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/portreserve
@ -261,11 +261,11 @@ fi
exit 0 exit 0
%changelog %changelog
* Mon Jan 11 2010 Warren Togami <wtogami@redhat.com> - 3.3.0-0.30-rc2 * Mon Jan 11 2010 Warren Togami <wtogami@redhat.com> - 3.3.0-0.31-rc2
- 3.3.0-rc2 - 3.3.0-rc2
* Mon Dec 28 2009 Warren Togami <wtogami@redhat.com> - 3.3.0-0.29.rc1 * Mon Dec 28 2009 Warren Togami <wtogami@redhat.com> - 3.3.0-0.29.rc1
- sa-update channels defined in /etc/mail/spamassassin/channels/*.conf - sa-update channels defined in /etc/mail/spamassassin/channel.d/*.conf files
* Mon Dec 28 2009 Warren Togami <wtogami@redhat.com> - 3.3.0-0.27.rc1 * Mon Dec 28 2009 Warren Togami <wtogami@redhat.com> - 3.3.0-0.27.rc1
- sa-update runs in cron automatically if spamd or amavisd is running - sa-update runs in cron automatically if spamd or amavisd is running
@ -274,10 +274,6 @@ exit 0
* Mon Dec 21 2009 Warren Togami <wtogami@redhat.com> - 3.3.0-0.26.rc1 * Mon Dec 21 2009 Warren Togami <wtogami@redhat.com> - 3.3.0-0.26.rc1
- 3.3.0-rc1.proposed2 with fixed spamc - 3.3.0-rc1.proposed2 with fixed spamc
* Mon Dec 21 2009 Nick Bebout <nb@fedoraproject.org> - 3.3.0-0.24.beta1
- Revert to beta1 to fix major error where spamc does nothing and mail
is lost into black hole.
* Fri Dec 18 2009 Warren Togami <wtogami@redhat.com> - 3.3.0-0.23.rc1 * Fri Dec 18 2009 Warren Togami <wtogami@redhat.com> - 3.3.0-0.23.rc1
- 3.3.0-rc1 - 3.3.0-rc1
- Bug #103401: portreserve protect spamd port 783 on F-10+ - Bug #103401: portreserve protect spamd port 783 on F-10+