Package: release.debian.org Severity: normal Tags: stretch User: release.debian....@packages.debian.org Usertags: pu
Hello. I'd like to fix a number of bugs in spamassassin, mostly related to systemd service management. A debdiff against the current stretch version is attached. All the changes have been in buster for some time. I've tested them in fresh installation, upgrade, remove, and purge scenarios. Thanks noah
diff -Nru spamassassin-3.4.1/debian/65_debian.cf spamassassin-3.4.1/debian/65_debian.cf --- spamassassin-3.4.1/debian/65_debian.cf 2016-10-30 09:39:27.000000000 -0700 +++ spamassassin-3.4.1/debian/65_debian.cf 2017-11-19 10:43:02.000000000 -0800 @@ -25,3 +25,10 @@ meta D_SENT_BY_CRON __CRON_FROM && __CRON_HEADER score D_SENT_BY_CRON -5.0 describe D_SENT_BY_CRON Sent by Cron Daemon + +# As documented in https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=861671, +# the bb.barracudacentral.org blacklist requires users to register, making it +# unsuitable for use in the default configuration. If you've registered your +# use of this blacklist, remove the following line in order to re-activate +# this service: +score RCVD_IN_BRBL_LASTEXT 0 diff -Nru spamassassin-3.4.1/debian/changelog spamassassin-3.4.1/debian/changelog --- spamassassin-3.4.1/debian/changelog 2016-10-30 09:39:27.000000000 -0700 +++ spamassassin-3.4.1/debian/changelog 2017-11-19 10:43:02.000000000 -0800 @@ -1,3 +1,21 @@ +spamassassin (3.4.1-6+deb9u1) stretch; urgency=medium + + * Ensure that spamd doesn't automatically start upon initial + installation. + * Disable bb.barracudacentral.org (RCVD_IN_BRBL_LASTEXT), as + it requires users to register. (Closes: #861671) + * Update the systemd unit file to use the same pid file as was + used in the sysvinit script. (Closes: #808804) + * Update spamassassin docs to remove outdated gpg version + compatibility note. (Closes: #853913) + * Update systemd unit dependencies to include network and syslog. + (Closes: 864810) + * Fix inappropriate invocation of invoke-rc.d in cron script. + (Closes: 865514) + * Fix spamd service manage on upgrades. (Closes: #865356) + + -- Noah Meyerhans <no...@debian.org> Sun, 19 Nov 2017 10:43:02 -0800 + spamassassin (3.4.1-6) unstable; urgency=medium * Import upstream fix for spamassassin bug 7226: Enhance whitelist_from_dkim diff -Nru spamassassin-3.4.1/debian/rules spamassassin-3.4.1/debian/rules --- spamassassin-3.4.1/debian/rules 2016-10-30 09:39:27.000000000 -0700 +++ spamassassin-3.4.1/debian/rules 2017-11-19 10:43:02.000000000 -0800 @@ -125,9 +125,10 @@ dh_testroot -i dh_installman -i sa-awl.1p sa-check_spamd.1p dh_installdocs -i - dh_systemd_enable --no-enable dh_installexamples -i - dh_installinit -i -- defaults 19 21 + dh_systemd_enable -i --no-enable + dh_installinit -i --no-start -- defaults 19 21 + dh_systemd_start -i --no-start dh_installcron -i dh_installchangelogs Changes -i dh_link -i diff -Nru spamassassin-3.4.1/debian/spamassassin.cron.daily spamassassin-3.4.1/debian/spamassassin.cron.daily --- spamassassin-3.4.1/debian/spamassassin.cron.daily 2016-10-30 09:39:27.000000000 -0700 +++ spamassassin-3.4.1/debian/spamassassin.cron.daily 2017-11-19 10:43:02.000000000 -0800 @@ -53,8 +53,7 @@ invoke-rc.d --quiet spamassassin status > /dev/null && \ invoke-rc.d spamassassin reload > /dev/null else - invoke-rc.d --quiet spamassassin status > /dev/null && \ - /etc/init.d/spamassassin reload > /dev/null + /etc/init.d/spamassassin reload > /dev/null fi if [ -d /etc/spamassassin/sa-update-hooks.d ]; then run-parts --lsbsysinit /etc/spamassassin/sa-update-hooks.d diff -Nru spamassassin-3.4.1/debian/spamassassin.postinst spamassassin-3.4.1/debian/spamassassin.postinst --- spamassassin-3.4.1/debian/spamassassin.postinst 2016-10-30 09:39:27.000000000 -0700 +++ spamassassin-3.4.1/debian/spamassassin.postinst 2017-11-19 10:43:02.000000000 -0800 @@ -43,3 +43,9 @@ fi #DEBHELPER# + +if [ "$1" = "configure" ] && [ -n "$2" ]; then + if deb-systemd-helper was-enabled spamassassin.service > /dev/null; then + invoke-rc.d spamassassin restart + fi +fi diff -Nru spamassassin-3.4.1/debian/spamassassin.prerm spamassassin-3.4.1/debian/spamassassin.prerm --- spamassassin-3.4.1/debian/spamassassin.prerm 2016-10-30 09:39:27.000000000 -0700 +++ spamassassin-3.4.1/debian/spamassassin.prerm 2017-11-19 10:43:02.000000000 -0800 @@ -9,6 +9,7 @@ # /etc/spamassassin without causing dpkg to complain on purge. if [ "$1" = "remove" ]; then + invoke-rc.d --quiet spamassassin stop || true rm -Rf /var/lib/spamassassin rm -Rf /etc/spamassassin/sa-update-keys fi diff -Nru spamassassin-3.4.1/debian/spamassassin.README.Debian spamassassin-3.4.1/debian/spamassassin.README.Debian --- spamassassin-3.4.1/debian/spamassassin.README.Debian 2016-10-30 09:39:27.000000000 -0700 +++ spamassassin-3.4.1/debian/spamassassin.README.Debian 2017-11-19 10:43:02.000000000 -0800 @@ -12,7 +12,7 @@ /var/lib/spamassassin. If sa-compile is installed, the rule updates will be automatically compiled after download (see below). -Note that sa-update requires gnupg 1.x in order to function. Because the +Note that sa-update requires gnupg in order to function. Because the sa-update functionality is optional, the gnupg package is listed as a "Recommends" for spamassassin, not "Depends", and it is possible to install spamassassin without having gnupg installed. If you install diff -Nru spamassassin-3.4.1/debian/spamassassin.service spamassassin-3.4.1/debian/spamassassin.service --- spamassassin-3.4.1/debian/spamassassin.service 2016-10-30 09:39:27.000000000 -0700 +++ spamassassin-3.4.1/debian/spamassassin.service 2017-11-19 10:43:02.000000000 -0800 @@ -1,12 +1,16 @@ [Unit] Description=Perl-based spam filter using text analysis +After=syslog.target network.target [Service] Type=forking -PIDFile=/var/run/spamassassin.pid +PIDFile=/var/run/spamd.pid EnvironmentFile=-/etc/default/spamassassin -ExecStart=/usr/sbin/spamd -d --pidfile=/var/run/spamassassin.pid $OPTIONS +ExecStart=/usr/sbin/spamd -d --pidfile=/var/run/spamd.pid $OPTIONS ExecReload=/bin/kill -HUP $MAINPID +StandardOutput=null +StandardError=null +Restart=always [Install] WantedBy=multi-user.target
