...
 
Commits (5)
spamassassin (3.4.2-1) unstable; urgency=medium
Prior to version 3.4.2-1, spamd could be enabled by setting ENABLED=1 in
/etc/default/spamassassin. This pattern is discouraged Debian, is not
supported by the systemd unit file, and is considered
deprecated. Instead, please use the update-rc.d command, invoked for
example as "update-rc.d spamassassin enable", to enable the spamd
service.
-- Noah Meyerhans <noahm@debian.org> Sun, 23 Sep 2018 17:06:30 -0700
spamassassin (3.3.2-8) unstable; urgency=low
As of spamassassin 3.3.2-8, sa-compile has been split into its own
......
......@@ -12,6 +12,7 @@ spamassassin (3.4.2-1) unstable; urgency=medium
(Closes: 908971)
* Don't recursively chown /var/lib/spamassassin during postinst.
(Closes: 889501)
* Reload spamd after compiling rules in sa-compile.postinst.
-- Noah Meyerhans <noahm@debian.org> Mon, 17 Sep 2018 23:44:06 -0700
......@@ -27,7 +28,7 @@ spamassassin (3.4.1-8) unstable; urgency=medium
* Add Multi-Arch: foreign headers to package definitions (Closes:
#850454)
* Update standards version to 4.1.0.0
* Remove references to the obsolte syslog.target dependency in the
* Remove references to the obsolete syslog.target dependency in the
systemd service file.
* Clarify the use of the perl-major-upgrade dpkg trigger.
* Fix spamd service manage on upgrades. (Closes: #865356)
......
......@@ -17,7 +17,8 @@ Multi-Arch: foreign
Depends: perl, libhtml-parser-perl, libsocket6-perl, adduser,
libsys-hostname-long-perl, libarchive-tar-perl, libnet-dns-perl,
libnetaddr-ip-perl, libhttp-date-perl, libmail-dkim-perl,
lsb-base (>= 3.0-6), libwww-perl | curl | w3m, ${misc:Depends}
lsb-base (>= 3.0-6), libwww-perl | curl | w3m,
init-system-helpers (>= 1.51), ${misc:Depends}
Recommends: spamc, sa-compile, libmail-spf-perl,
libsys-syslog-perl, gnupg, libio-socket-inet6-perl
Suggests: razor, libio-socket-ssl-perl, libdbi-perl, pyzor,
......
......@@ -127,7 +127,7 @@ binary-indep: build-indep install-indep
dh_installdocs -i
dh_installexamples -i
dh_systemd_enable -i --no-enable
dh_installinit -i --no-start -- defaults 19 21
dh_installinit -i --no-enable --no-start
dh_systemd_start -i --no-start
dh_installcron -i
dh_installchangelogs Changes -i
......
......@@ -8,6 +8,12 @@ sa_compile() {
if [ -x /usr/bin/re2c -a -x /usr/bin/sa-compile ]; then
echo "Running sa-compile (may take a long time)"
su - $OWNER -c "sa-compile --quiet"
if command -v invoke-rc.d >/dev/null 2>&1; then
invoke-rc.d --quiet spamassassin status > /dev/null && \
invoke-rc.d spamassassin reload > /dev/null 2>&1 || true
else
/etc/init.d/spamassassin reload > /dev/null 2>&1 || true
fi
fi
}
......
......@@ -4,11 +4,10 @@
# WARNING: please read README.spamd before using.
# There may be security risks.
# If you're using systemd (default for jessie), the ENABLED setting is
# not used. Instead, enable spamd by issuing:
# systemctl enable spamassassin.service
# Change to "1" to enable spamd on systems using sysvinit:
ENABLED=0
# Prior to version 3.4.2-1, spamd could be enabled by setting
# ENABLED=1 in this file. This is no longer supported. Instead, please
# use the update-rc.d command, invoked for example as "update-rc.d
# spamassassin enable", to enable the spamd service.
# Options
# See man spamd for possible options. The -d option is automatically added.
......
......@@ -5,7 +5,6 @@ UPGRADE
USAGE
NOTICE
#ldap/README
rules/STATISTICS*.txt
#spamd/README
spamd/README.vpopmail
sql/
......@@ -26,7 +26,6 @@ export TMPDIR=/tmp
# Apparently people have trouble if this isn't explicitly set...
# Defaults - don't touch, edit /etc/default/spamassassin
ENABLED=0
OPTIONS=""
NICE=
......
......@@ -44,6 +44,31 @@ fi
#DEBHELPER#
if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || \
[ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ] ; then
set +e
invoke-rc.d --query spamassassin start
code=$?
set -e
if [ $code -eq 104 ] && \
! command -v systemctl > /dev/null ; then
# We're not using systemd and thus may have some sysvinit cleanup
# to do in order to comply with policy 9.3.3.1
ENABLED=0
if [ -f /etc/default/spamassassin ]; then
. /etc/default/spamassassin
fi
if [ -z "$ENABLED" -o "$ENABLED" = 0 ]; then
# The defaults were unmodified by the sysadmin. We'll
# preserve this setting by disabling the service:
update-rc.d -f spamassassin remove
update-rc.d -f spamassassin defaults-disabled
deb-systemd-helper disable spamassassin.service
fi
fi
fi
if [ "$1" = "configure" ] && [ -n "$2" ]; then
if deb-systemd-helper was-enabled spamassassin.service > /dev/null 2>&1; then
invoke-rc.d spamassassin restart
......