You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by gb...@apache.org on 2025/05/22 16:22:44 UTC
svn commit: r1925745 [1/2] - in /spamassassin/trunk/debian: ./ patches/
Author: gbechis
Date: Thu May 22 16:22:44 2025
New Revision: 1925745
URL: http://svn.apache.org/viewvc?rev=1925745&view=rev
Log:
sync debian deb packaging with latest version
Modified:
spamassassin/trunk/debian/65_debian.cf
spamassassin/trunk/debian/NEWS
spamassassin/trunk/debian/changelog
spamassassin/trunk/debian/control
spamassassin/trunk/debian/patches/10_change_config_paths
spamassassin/trunk/debian/patches/20_edit_spamc_pod
spamassassin/trunk/debian/patches/series
spamassassin/trunk/debian/rules
spamassassin/trunk/debian/spamassassin.README.Debian
spamassassin/trunk/debian/spamassassin.cron.daily
spamassassin/trunk/debian/spamassassin.dirs
spamassassin/trunk/debian/spamassassin.postinst
spamassassin/trunk/debian/watch
Modified: spamassassin/trunk/debian/65_debian.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/debian/65_debian.cf?rev=1925745&r1=1925744&r2=1925745&view=diff
==============================================================================
--- spamassassin/trunk/debian/65_debian.cf (original)
+++ spamassassin/trunk/debian/65_debian.cf Thu May 22 16:22:44 2025
@@ -25,3 +25,10 @@ header __CRON_HEADER X-Cron-Env =~ /.
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
Modified: spamassassin/trunk/debian/NEWS
URL: http://svn.apache.org/viewvc/spamassassin/trunk/debian/NEWS?rev=1925745&r1=1925744&r2=1925745&view=diff
==============================================================================
--- spamassassin/trunk/debian/NEWS (original)
+++ spamassassin/trunk/debian/NEWS Thu May 22 16:22:44 2025
@@ -1,3 +1,54 @@
+spamassassin (4.0.0-2) unstable; urgency=medium
+
+ spamd now enables a number of hardening flags in the systemd service.
+ Among these settings is ProtectSystem=full, which runs spamd in a
+ private kernel mount namespace into which a number of system paths are
+ mounted read-only. This does not impact spamd's operation in the
+ default configuration, but if you've configured spamd such that it
+ relies on the ability to write to locations under nonstandard
+ locations, such as /usr, you may need to adjust the hardening flags to
+ permit write access to this location.
+
+ For additional details, see SANDBOXING in systemd.exec(5).
+
+ -- Noah Meyerhans <no...@debian.org> Sat, 31 Dec 2022 20:05:33 -0800
+
+spamassassin (4.0.0~0.0svn1883440-2) experimental; urgency=medium
+
+ The spamd service is now distributed in a dedicated spamd binary package.
+ The spamassassin package declares a Recommends relationship on the spamd
+ package, which means it will be installed in the default apt configuration.
+
+ If you do not wish to run the spamd service, you should simply remove the
+ spamd package.
+
+ NOTE: If you are upgrading from earlier spamassassin versions and have made
+ customizations to the spamd configuration in /etc/default/spamassassin, by
+ providing systemd drop-in unit configuration, or by editing
+ /etc/init.d/spamassassin, you will need to migrate your changes to
+ /etc/default/spamd or a spamd drop-in directory.
+
+ -- Noah Meyerhans <no...@debian.org> Sun, 29 Nov 2020 14:47:37 -0800
+
+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 <no...@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
+ package. If you want to use sa-compile to increase spamassassin's
+ efficiency and throughput, you'll need to install it explicitly.
+
+ -- Noah Meyerhans <no...@debian.org> Sun, 09 Feb 2014 14:45:30 -0800
+
spamassassin (3.3.1-2) unstable; urgency=low
This version of spamassassin introduces a change in behavior when
Modified: spamassassin/trunk/debian/changelog
URL: http://svn.apache.org/viewvc/spamassassin/trunk/debian/changelog?rev=1925745&r1=1925744&r2=1925745&view=diff
==============================================================================
--- spamassassin/trunk/debian/changelog (original)
+++ spamassassin/trunk/debian/changelog Thu May 22 16:22:44 2025
@@ -1,6 +1,707 @@
+spamassassin (4.0.1-3) unstable; urgency=medium
+
+ * Incorporate upstream fix for PDFInfo.pm uninitialized value warnings
+ (Closes: #1091683)
+ * clean up build-deps and set !nocheck where appropriate (Closes: #952698)
+ * spamd: drop system-log-daemon to Recommends (Closes: #1072032)
+ * prime the sa-update rule path with the packaged rules (Closes: #739489)
+ * Remove obsolete spamassassin preinst script
+ * cosmetic: whitespace fixes in maintainer scripts
+
+ -- Noah Meyerhans <no...@debian.org> Thu, 09 Jan 2025 13:32:43 -0500
+
+spamassassin (4.0.1-2) unstable; urgency=medium
+
+ * Remove rules referencing the defunct SORBS DNSBLs (Closes: #1072663)
+
+ -- Noah Meyerhans <no...@debian.org> Mon, 10 Jun 2024 11:00:26 -0700
+
+spamassassin (4.0.1-1) unstable; urgency=medium
+
+ * Fix systemd detection in cron script (Closes: #1067007)
+ * New upstream release
+
+ -- Noah Meyerhans <no...@debian.org> Mon, 01 Apr 2024 22:43:34 -0700
+
+spamassassin (4.0.1~rc1-1) unstable; urgency=medium
+
+ * New upstream release snapshot
+
+ -- Noah Meyerhans <no...@debian.org> Wed, 20 Mar 2024 09:23:21 -0700
+
+spamassassin (4.0.1~pre1-1) unstable; urgency=medium
+
+ * New upstream pre-release snapshot (Closes: #1039459)
+ * Remove a bashism in spamassassin-maint.sh
+ * spamassassin-maint.sh: minor shell improvements
+ * Refresh patch 10_change_config_paths
+ * spamassassin-maint.sh: Run sa-update-hooks regardless of whether spamd
+ is running (Closes: #1059744)
+ * Remove patches that have been incorporated upstream
+
+ -- Noah Meyerhans <no...@debian.org> Sat, 20 Jan 2024 18:39:17 -0800
+
+spamassassin (4.0.0-9) unstable; urgency=medium
+
+ * Run sa-update-hooks regardless of whether spamd is running (Closes: 1059744)
+ * Be more explicit about exit codes in spamassassin-maint.sh
+
+ -- Noah Meyerhans <no...@debian.org> Mon, 01 Jan 2024 09:34:51 -0800
+
+spamassassin (4.0.0-8) unstable; urgency=medium
+
+ * Drop reference to obsolete syslog.target in spamd.service
+ * Import upstream patch for bug 1056001 (Closes: #1056001)
+ * autopkgtest: give spamd time to set its cmd name
+
+ -- Noah Meyerhans <no...@debian.org> Sun, 19 Nov 2023 12:08:09 -0800
+
+spamassassin (4.0.0-7) unstable; urgency=medium
+
+ * Import upstream fix for DnsResolver.pm method deprecation warnings
+ (Closes: #1041759)
+ * spamassassin-maintenance: reload spamd only if it's running
+ (Closes: #1028030)
+ * sa-update: Import upstream fix to usage of deprecated function
+ (Closes: #1039960)
+ * Drop dependency on obsolete package lsb-base
+
+ -- Noah Meyerhans <no...@debian.org> Tue, 25 Jul 2023 09:23:47 -0700
+
+spamassassin (4.0.0-6) unstable; urgency=medium
+
+ * No change. This adds a new version to resolve the situation introduced
+ when locally built binary .deb files were inadvertently included with
+ the 4.0.0-5 upload.
+
+ -- Noah Meyerhans <no...@debian.org> Sun, 30 Apr 2023 09:16:27 -0700
+
+spamassassin (4.0.0-5) unstable; urgency=medium
+
+ * Update spamd.service to order after network-online.target (Closes: #1034347)
+
+ -- Noah Meyerhans <no...@debian.org> Sun, 16 Apr 2023 13:28:05 -0700
+
+spamassassin (4.0.0-4) unstable; urgency=medium
+
+ * Revert "drop unused params from Makefile.PL"
+ * Fix test for Socket module and drop libio-socket-inet6-perl
+ * Disable AI_ADDRCONFIG when passing IPv4 literals to getaddrinfo
+ (Closes: #1027925)
+
+ -- Noah Meyerhans <no...@debian.org> Fri, 06 Jan 2023 13:05:09 -0800
+
+spamassassin (4.0.0-3) unstable; urgency=medium
+
+ * drop unused params from Makefile.PL
+ * Add debug output for ipv6-only test failures
+
+ -- Noah Meyerhans <no...@debian.org> Wed, 04 Jan 2023 08:59:45 -0800
+
+spamassassin (4.0.0-2) unstable; urgency=medium
+
+ * fix typo in spamd.default (Closes: #1027307)
+ * move pid file to /run when running under sysvinit
+ * Update NEWS to document spamd sandboxing settings (Closes: #1024444)
+ * spamassassin: Add libmail-dmarc-perl to Recommends
+
+ -- Noah Meyerhans <no...@debian.org> Tue, 03 Jan 2023 17:09:07 -0800
+
+spamassassin (4.0.0-1) unstable; urgency=medium
+
+ * New upstream release
+ * Drop obsolete patches that have been incorporated upstream
+
+ -- Noah Meyerhans <no...@debian.org> Sat, 17 Dec 2022 08:41:25 -0800
+
+spamassassin (4.0.0~rc4-1) unstable; urgency=medium
+
+ * New upstream pre-release snapshot
+ - Drop patch fix__tests_with_ipv6-only, integrated upstream.
+ * Suppress lintian national-encoding warnings from encoding-specific files
+ * Fix a pod error upstream
+
+ -- Noah Meyerhans <no...@debian.org> Wed, 07 Dec 2022 21:22:57 -0800
+
+spamassassin (4.0.0~rc3-3) unstable; urgency=medium
+
+ * Enable hardening flags in systemd units
+ * Update spamd init script to load /etc/default/spamd (Closes: #1020859)
+
+ -- Noah Meyerhans <no...@debian.org> Sun, 02 Oct 2022 10:39:27 -0700
+
+spamassassin (4.0.0~rc3-2) unstable; urgency=medium
+
+ * Fix test execution in IPv6-only environments
+
+ -- Noah Meyerhans <no...@debian.org> Sat, 24 Sep 2022 20:41:03 -0700
+
+spamassassin (4.0.0~rc3-1) unstable; urgency=medium
+
+ * New upstream release candidate
+
+ -- Noah Meyerhans <no...@debian.org> Thu, 22 Sep 2022 10:55:12 -0700
+
+spamassassin (4.0.0~rc2-2) unstable; urgency=medium
+
+ * Fix autopkgtest failure
+
+ -- Noah Meyerhans <no...@debian.org> Sun, 11 Sep 2022 17:56:13 -0700
+
+spamassassin (4.0.0~rc2-1) unstable; urgency=medium
+
+ * New upstream release candidate.
+ * Preserve CRON=1 setting from /etc/default/spamassassin when migrating
+ to systemd timers
+
+ -- Noah Meyerhans <no...@debian.org> Sun, 11 Sep 2022 09:48:52 -0700
+
+spamassassin (4.0.0~rc1+take2-2) experimental; urgency=medium
+
+ [ Andreas Metzler ]
+ * [lintian] Drop trailing whitespace in debian/rules
+ * Use dh sequencer
+ * Use Rules-Requires-Root: no
+ * Implement Debian CPPFLAGS
+ * Set DEB_BUILD_MAINT_OPTIONS := hardening=+all
+ * Drop superfluous code from rules
+ * Use debhelper v13 compat mode
+ * Declare compatibility with Standards-Version: 4.6.0
+ * Also respect CPPFLAGS and LDFLAGS during testsuite run
+ * Point dh_autoreconf at directory containing autoconf code.
+
+ -- Noah Meyerhans <no...@debian.org> Sat, 10 Sep 2022 09:56:25 -0700
+
+spamassassin (4.0.0~rc1+take2-1) experimental; urgency=medium
+
+ * New upstream snapshot. Upstream re-pointed the 4.0.0-rc1 tag at svn
+ revision 1903702 after previously having tagged an RC1 prematurely.
+ * Add libtext-diff-perl to build-depends to support tests
+
+ -- Noah Meyerhans <no...@debian.org> Fri, 26 Aug 2022 22:51:29 -0700
+
+spamassassin (4.0.0~rc1+pre1-1) experimental; urgency=medium
+
+ * Upstream pre-release snapshot. This is formally 4.0.0-pre1 upstream,
+ but due to their prematurely released rc1, we've had to concoct a
+ custom upstream version string.
+
+ -- Noah Meyerhans <no...@debian.org> Thu, 05 May 2022 08:57:02 -0700
+
+spamassassin (4.0.0~rc1-1) experimental; urgency=medium
+
+ * Upstream release candidate
+
+ -- Noah Meyerhans <no...@debian.org> Sat, 30 Apr 2022 09:07:59 -0700
+
+spamassassin (4.0.0~0.0svn1900273-1) experimental; urgency=medium
+
+ * New upstream snapshot (Closes: #1009979)
+
+ -- Noah Meyerhans <no...@debian.org> Fri, 22 Apr 2022 14:46:11 -0700
+
+spamassassin (4.0.0~0.0svn1899920-1) experimental; urgency=medium
+
+ * New upstream snapshot
+ * Add libio-string-perl to (Build-)Depends (Closes: #1006890)
+ * Support passing https_proxy to sa-update if set (Closes: #1004489)
+
+ -- Noah Meyerhans <no...@debian.org> Sun, 17 Apr 2022 07:48:21 -0700
+
+spamassassin (4.0.0~0.0svn1896439-1) experimental; urgency=medium
+
+ * New upstream snapshot
+
+ -- Noah Meyerhans <no...@debian.org> Tue, 28 Dec 2021 11:46:22 -0800
+
+spamassassin (4.0.0~0.0svn1894153-1) experimental; urgency=medium
+
+ * update README.source
+ * d/control: remove duplicate entreies
+ * d/watch: update version, don't run uupdate
+ * Fix utf-8 encoding of lib/Mail/SpamAssassin/Util.pm
+ * New upstream snapshot
+
+ -- Noah Meyerhans <no...@debian.org> Wed, 13 Oct 2021 14:28:01 -0700
+
+spamassassin (4.0.0~0.0svn1892135-1) experimental; urgency=medium
+
+ * New upstream snapshot
+
+ -- Noah Meyerhans <no...@debian.org> Mon, 09 Aug 2021 10:40:38 -0700
+
+spamassassin (4.0.0~0.0svn1890446-2) experimental; urgency=medium
+
+ * Try harder to avoid pathname limits when running tests in buildd/CI
+ environments
+
+ -- Noah Meyerhans <no...@debian.org> Fri, 04 Jun 2021 08:33:43 -0700
+
+spamassassin (4.0.0~0.0svn1890446-1) experimental; urgency=medium
+
+ * New upstream snapshot
+ * Work around test failures due to excessively long socket path names
+ when running under GitLab CI environments.
+
+ -- Noah Meyerhans <no...@debian.org> Thu, 03 Jun 2021 17:16:24 -0700
+
+spamassassin (4.0.0~0.0svn1886510-1) experimental; urgency=medium
+
+ * New upstream snapshot
+
+ -- Noah Meyerhans <no...@debian.org> Tue, 16 Feb 2021 09:40:40 -0800
+
+spamassassin (4.0.0~0.0svn1885032-2) experimental; urgency=medium
+
+ * Don't try to stop spamassassin in preinst
+
+ -- Noah Meyerhans <no...@debian.org> Sun, 03 Jan 2021 11:48:13 -0800
+
+spamassassin (4.0.0~0.0svn1885032-1) experimental; urgency=medium
+
+ * New upstream snapshot
+
+ -- Noah Meyerhans <no...@debian.org> Sat, 02 Jan 2021 08:56:21 -0800
+
+spamassassin (4.0.0~0.0svn1883449-1) experimental; urgency=medium
+
+ * New upstream snapshot
+
+ -- Noah Meyerhans <no...@debian.org> Thu, 03 Dec 2020 10:24:01 -0800
+
+spamassassin (4.0.0~0.0svn1883440-2) experimental; urgency=medium
+
+ * Split spamd into a separate package, Recommended by spamassassin.
+ * replace start-stop-daemon with runuser in postinst scripts
+ * sa-compile: update lintian overrides
+ * d/rules: Remove generated rules during clean
+ * spamassassin: move cleanup steps to postrm
+
+ -- Noah Meyerhans <no...@debian.org> Mon, 30 Nov 2020 11:23:29 -0800
+
+spamassassin (4.0.0~0.0svn1883440-1) experimental; urgency=medium
+
+ * New upstream snapshot
+
+ -- Noah Meyerhans <no...@debian.org> Sun, 15 Nov 2020 06:04:03 -0800
+
+spamassassin (4.0.0~0.0svn1879217-2) experimental; urgency=medium
+
+ * Update python dependencies to support the python2 removal effort
+ (Closes: #967039)
+
+ -- Noah Meyerhans <no...@debian.org> Mon, 03 Aug 2020 15:58:43 -0700
+
+spamassassin (4.0.0~0.0svn1879217-1) experimental; urgency=medium
+
+ * Introduce a systemd timer in place of the daily cron job. The cron
+ job will still be used if systemd is not in use.
+ * New upstream snapshot
+ * Configure systemd service as a "simple" service, not a "forking" service.
+
+ -- Noah Meyerhans <no...@debian.org> Thu, 16 Apr 2020 14:41:49 -0700
+
+spamassassin (3.4.6-1) unstable; urgency=medium
+
+ [ Noah Meyerhans ]
+ * New upstream release
+ * Import fix for upstream bug 7848
+
+ [ Guillem Jover ]
+ * Finish partial removal of ENABLED handling (Closes: #947086)
+
+ -- Noah Meyerhans <no...@debian.org> Sat, 29 May 2021 21:26:45 -0700
+
+spamassassin (3.4.5~pre1-4) unstable; urgency=medium
+
+ [ Roel van Meer ]
+ * postinst: Fix perms only if dir exists (Closes: #977957)
+
+ [ Noah Meyerhans ]
+ * Import upstream bug fix patches from the 3.4 release branch
+
+ -- Noah Meyerhans <no...@debian.org> Thu, 15 Apr 2021 11:30:25 -0700
+
+spamassassin (3.4.5~pre1-3) unstable; urgency=medium
+
+ * Remove all python related dependencies from our autopkgtest suite to
+ actually unblock the python2 removal.
+ (Closes: #967039)
+
+ -- Noah Meyerhans <no...@debian.org> Mon, 03 Aug 2020 22:29:50 -0700
+
+spamassassin (3.4.5~pre1-2) unstable; urgency=medium
+
+ * Update python dependencies to support the python2 removal effort
+ (Closes: #967039)
+ * Import a number of bug fixes from upstream's 3.4 branch that haven't yet
+ made it into a pre-release snapshot
+
+ -- Noah Meyerhans <no...@debian.org> Mon, 03 Aug 2020 15:44:52 -0700
+
+spamassassin (3.4.5~pre1-1) unstable; urgency=medium
+
+ * New upstream pre-release snapshot
+ * Drop debian/patches/update-spamd-ssl-tests, which has been obviated by
+ upstream changes
+ * Fix warnings caused by numeric comparisons with non-numeric module version
+ * Update Homepage in debian/control (Closes: #964060)
+
+ -- Noah Meyerhans <no...@debian.org> Fri, 17 Jul 2020 09:25:33 -0700
+
+spamassassin (3.4.4-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Noah Meyerhans <no...@debian.org> Thu, 30 Jan 2020 11:47:40 -0800
+
+spamassassin (3.4.4~rc1-1) unstable; urgency=medium
+
+ * When creating the debian-spamd user, set its shell to /usr/sbin/nologin
+ (Closes: 920394, 918506)
+ * New upstream release candidate fixes security issues:
+ - CVE-2020-1930: Arbitrary code execution via malicious rules files
+ - CVE-2020-1931: Arbitrary code execution via malicious rules files
+
+ -- Noah Meyerhans <no...@debian.org> Mon, 20 Jan 2020 17:31:41 -0800
+
+spamassassin (3.4.3-1) unstable; urgency=medium
+
+ [ Debian Janitor ]
+ * Use secure URI in debian/watch.
+ * Bump debhelper from old 9 to 12.
+ * Set debhelper-compat version in Build-Depends.
+
+ [ Noah Meyerhans ]
+ * New upstream release.
+
+ -- Noah Meyerhans <no...@debian.org> Thu, 12 Dec 2019 10:40:56 -0800
+
+spamassassin (3.4.3~rc7-1) unstable; urgency=medium
+
+ * Don't install sandbox rules or .pre files in /usr/share/spamassassin.
+ * New upstream release candidate.
+
+ -- Noah Meyerhans <no...@debian.org> Mon, 25 Nov 2019 10:53:07 -0800
+
+spamassassin (3.4.3~rc6+1-1) unstable; urgency=medium
+
+ * Repack the upstream rc6 snapshot, including missing components that are not
+ included in upstream's subversion tag.
+
+ -- Noah Meyerhans <no...@debian.org> Fri, 15 Nov 2019 07:02:22 -0800
+
+spamassassin (3.4.3~rc6-1) unstable; urgency=medium
+
+ * New upstream release. (Closes: 878569)
+ * Incorporate upstream security fixes:
+ - CVE-2018-11805: Malicious rules files, possibly retrieved
+ automatically via sa-update, can run arbitrary commands.
+ - CVE-2019-12420: A message can be crafted in a way to use excessive
+ resources, resulting in a denial of service.
+ * Clarify location of "site-specific" configuration in spamassassin man page.
+ (Closes: 426031)
+
+ -- Noah Meyerhans <no...@debian.org> Tue, 12 Nov 2019 10:47:49 -0800
+
+spamassassin (3.4.2-2) unstable; urgency=medium
+
+ [ OndÅej Nový ]
+ * d/changelog: Remove trailing whitespaces
+ * d/control: Remove trailing whitespaces
+ * d/control: Remove XS-Testsuite field, not needed anymore
+
+ [ Noah Meyerhans ]
+ * Add libbsd-resource-perl to Suggests (Closes: 910434)
+ * Update debhelper build-dep to 11.1 to support the
+ dh_installinit --no-enable feature.
+ * Fix severity of some spamd logs. (Closes: 913571)
+ * Import upstream fix for "Not a HASH reference at
+ /usr/share/perl5/Mail/SpamAssassin/Plugin/FromNameSpoof.pm"
+ (Closes: 910435)
+ * Remove /var/lib/spamassassin/compiled during sa-compile upgrades.
+ * Move spamd pid file to from /var/run to /run
+ * Apply upstream fix for Mail::SpamAssassin::Plugin::ASN reports wrong
+ ASN for IPv6 (Closes: 918130)
+
+ -- Noah Meyerhans <no...@debian.org> Fri, 18 Oct 2019 11:22:48 -0700
+
+spamassassin (3.4.2-1) unstable; urgency=medium
+
+ * New upstream release fixes multiple security vulnerabilities
+ - CVE-2017-15705: Denial of service issue in which certain unclosed
+ tags in emails cause markup to be handled incorrectly leading to
+ scan timeouts. (Closes: 908969)
+ - CVE-2016-1238: Unsafe usage of "." in @INC in a configuration
+ script.
+ - CVE-2018-11780: potential Remote Code Execution bug with the
+ PDFInfo plugin. (Closes: 908970)
+ - CVE-2018-11781: local user code injection in the meta rule syntax.
+ (Closes: 908971)
+ - BayesStore: bayes_expire table grows, remove_running_expire_tok not
+ called (Closes: 883775)
+ - Fix use of uninitialized variable warning in PDFInfo.pm
+ (Closes: 865924)
+ - Fix "failed to parse plugin" error in
+ Mail::SpamAssassin::Plugin::URILocalBL (Closes: 891041)
+ * Don't recursively chown /var/lib/spamassassin during postinst.
+ (Closes: 889501)
+ * Reload spamd after compiling rules in sa-compile.postinst.
+ * Preserve locally set ENABLED=1 setting from /etc/default/spamassassin
+ when installing on systemd-based systems. (Closes: 884163, 858457)
+ * Update SysV init script to cope with upstream's change to $0.
+ * Remove compiled rules upon removal of the sa-compile package.
+ * Ensure that /var/lib/spamassassin/compiled doesn't change modes with
+ the cron job's execution. (Closes: 890650)
+ * Update standards version to 4.2.1
+ * Create /var/lib/spamassassin via dpkg, rather than the postinst.
+ (Closes: 891833)
+
+ -- Noah Meyerhans <no...@debian.org> Sun, 30 Sep 2018 23:44:58 -0700
+
+spamassassin (3.4.1-8) unstable; urgency=medium
+
+ * Fix inappropriate invocation of invoke-rc.d in cron script.
+ (Closes: 865514)
+ * Update systemd unit dependencies to include network and syslog.
+ (Closes: 864810)
+ * Migrate packaging to git, finally.
+ * Apply upstream patch to fix regex error leading to warnings in perl
+ 5.26+ (Closes: 869408)
+ * Add Multi-Arch: foreign headers to package definitions (Closes:
+ #850454)
+ * Update standards version to 4.1.0.0
+ * 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)
+
+ -- Noah Meyerhans <no...@debian.org> Sat, 09 Sep 2017 22:37:20 -0700
+
+spamassassin (3.4.1-7) unstable; 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)
+
+ -- Noah Meyerhans <no...@debian.org> Thu, 11 May 2017 19:45:36 -0700
+
+spamassassin (3.4.1-6) unstable; urgency=medium
+
+ * Import upstream fix for spamassassin bug 7226: Enhance whitelist_from_dkim
+ to let it accept signing subdomains
+ * Import upstream fix for spamassassin bug 7212: Warning of uninitialized
+ value in
+ Mail::SpamAssassin::PerMsgStatus::get_names_of_tests_hit_with_scores()
+ * Add libgeo-ip-perl to Suggests for
+ Mail::SpamAssassin::Plugin::URILocalBL (Closes: #841960)
+ * Add libnet-patricia-perl to Suggests
+ * Documentation updates
+ * Promote libmail-dkim-perl to Depends (Closes: #675540)
+ * Add missing dependency on lsb-base (>= 3.0-6)
+ * Correct an error in debian/watch
+ * Fix an error in -stamp file management in debian/rules.
+ * Pass CPPFLAGS to gcc when building spamc
+ * Allow building against OpenSSL 1.1.0 (Closes: #828552)
+ * Acknowledge 3.4.1-5.1 NMU (Closes: #839704)
+ * Support passing http_proxy to sa-update if set (Closes: #805009).
+ * Run test suite during build (Closes: #784023).
+ * Update to debhelper compatibility version 9
+
+ -- Noah Meyerhans <no...@debian.org> Sun, 30 Oct 2016 09:39:27 -0700
+
+spamassassin (3.4.1-5.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix uninitialized values in URIDNSBL.pm with Net::DNS 1.01
+ (Closes: #760277)
+
+ -- Peter Colberg <pe...@colberg.org> Thu, 29 Sep 2016 23:04:25 -0400
+
+spamassassin (3.4.1-5) unstable; urgency=medium
+
+ * Fix "FTBFS with '.' removed from perl's @INC" with patch from
+ Dominic Hargreaves <do...@earth.li> (Closes: #835494)
+ * Fix "fails to install: error: gpg required but not found!" by
+ making gpg usage optional. (Closes: #831872)
+
+ -- Noah Meyerhans <no...@debian.org> Mon, 29 Aug 2016 14:14:31 -0700
+
+spamassassin (3.4.1-4) unstable; urgency=medium
+
+ * Import upstream fix for DnsResolver.pm regression. (Closes: #821385)
+ * Bump standards version to 3.9.8
+
+ -- Noah Meyerhans <no...@debian.org> Fri, 22 Apr 2016 10:35:05 -0700
+
+spamassassin (3.4.1-3) unstable; urgency=medium
+
+ * Don't try to reload the spamd configuring in cron.daily if spamd
+ isn't actually running. (Closes: #774380)
+ * Add libhttp-date-perl to spamassassin's Depends. (Closes: #801472)
+ * Disable SSLv3 support for network communication between spamc and
+ spamd and let IO::Socket::SSL choose the TLS version.
+ * Fix debian/watch to not pick up rules archive updates.
+
+ -- Noah Meyerhans <no...@debian.org> Sun, 08 Nov 2015 16:12:40 -0800
+
+spamassassin (3.4.1-2) unstable; urgency=medium
+
+ * Clean up a bunch of dependencies; drop versioned deps going back
+ to old-oldstable and remove dependency on perl-modules.
+ (Closes: #788073)
+ * POD documentation fixes.
+ * Suggest libencode-detect-perl (Closes: #563293)
+
+ -- Noah Meyerhans <no...@debian.org> Mon, 08 Jun 2015 10:16:00 -0700
+
+spamassassin (3.4.1-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Noah Meyerhans <no...@debian.org> Wed, 29 Apr 2015 22:09:45 -0700
+
+spamassassin (3.4.0-6) unstable; urgency=medium
+
+ * Remove references to ahbl.org DNSBL, which has ceased operation.
+ (Closes: #774768)
+
+ -- Noah Meyerhans <no...@debian.org> Sat, 31 Jan 2015 10:53:22 -0800
+
+spamassassin (3.4.0-5) unstable; urgency=medium
+
+ * Import upstream fix for perl_version warnings (Closes: 771408)
+
+ -- Noah Meyerhans <no...@debian.org> Sat, 29 Nov 2014 11:48:48 -0800
+
+spamassassin (3.4.0-4) unstable; urgency=low
+
+ * Improve detection of Net::DNS versions. (Closes: 766718)
+
+ -- Noah Meyerhans <no...@debian.org> Sat, 22 Nov 2014 16:59:09 -0800
+
+spamassassin (3.4.0-3) unstable; urgency=low
+
+ * Fix regression that caused the --quiet option to be dropped
+ from sa-compile in 3.4.0-2. (Closes: 756402)
+ * Update comments in /etc/default/spamassassin to clarify
+ systemd integration with spamd (Closes: 764438)
+ * Fix spamassassin's handling of the perl-major-upgrade trigger to
+ ensure that spamd is restarted upon perl upgrade.
+ * Fix the init script such that 'restart' and 'stop' aren't broken if
+ the perl binary is replaced on the filesystem. (Closes: 759652)
+ * Fix missing python dependency for autopkgtests (Closes: 740171)
+
+ -- Noah Meyerhans <no...@debian.org> Mon, 13 Oct 2014 20:12:03 -0700
+
+spamassassin (3.4.0-2) unstable; urgency=low
+
+ * Install a systemd unit file. (Closes: 716887)
+ * Use env+start-stop-daemon instead of su in cron jobs.
+ * Skip the random pause in cron.daily if running interactively.
+ * Apply upstream patch to support new Net::DNS interface.
+ (Closes: 752542)
+ * Use dpkg-buildflags instead of the deprecated hardening-wrapper
+
+ -- Noah Meyerhans <no...@debian.org> Tue, 24 Jun 2014 23:44:30 -0700
+
+spamassassin (3.4.0-1) unstable; urgency=low
+
+ * New upstream version! (Closes: 738963, 738872, 738867)
+ * Scrub the environment when switching to the debian-spamd user in
+ postinst and cron.daily. (Closes: 738951)
+ * Enhancements to postinst to better manage ownership of
+ /var/lib/spamassassin, via Iain Lane <ia...@canonical.com>
+ (Closes: 738974)
+
+ -- Noah Meyerhans <no...@debian.org> Fri, 14 Feb 2014 22:45:15 -0800
+
+spamassassin (3.3.2-8) unstable; urgency=low
+
+ * Split sa-compile into a separate package. (Closes: 455084)
+ * Return an lsb-compliant exit code from /etc/init.d/spamassassin status
+ even if we're disabled in /etc/default/spamassassin. (Closes: 716691)
+ * Remove Jesus Climent <je...@hispalinux.es> from Uploaders.
+ * Bump standards version to 3.9.5 (no changes)
+
+ -- Noah Meyerhans <no...@debian.org> Sun, 09 Feb 2014 15:44:35 -0800
+
+spamassassin (3.3.2-7) unstable; urgency=low
+
+ * Incorporate upstream's fix for syntax warnings when running
+ under perl 5.18 (Closes: #721565)
+ * Bump standards version to 3.9.4 (no changes)
+ * Incorporate Ubuntu's dep-8 autopkgtests. (Closes: 710881)
+
+ -- Noah Meyerhans <no...@debian.org> Sun, 22 Sep 2013 14:44:37 -0700
+
+spamassassin (3.3.2-6.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix "FTBFS with perl 5.18: POD failure":
+ add patch 97_bug720499-pod-5.18 from Damyan Ivanov: fix POD errors with
+ perl 5.18
+ (Closes: #720499)
+
+ -- gregor herrmann <gr...@debian.org> Fri, 30 Aug 2013 17:48:37 +0200
+
+spamassassin (3.3.2-6) unstable; urgency=low
+
+ * Remove tests referring to NJABL, which has shut down as of March 1, 2013.
+ (Closes: #702839)
+
+ -- Noah Meyerhans <no...@debian.org> Mon, 11 Mar 2013 22:33:26 -0700
+
+spamassassin (3.3.2-5) unstable; urgency=low
+
+ * Import upstream's fix for a crash in SIGCHLD handler (Closes: #694504)
+
+ -- Noah Meyerhans <no...@debian.org> Mon, 28 Jan 2013 21:51:58 -0800
+
+spamassassin (3.3.2-4) unstable; urgency=low
+
+ * Incorporate upstream's fix for a bug where malformed multipart MIME
+ messages would bypass URIBL rules. (Closes: #684709)
+ * Update standards version to 3.9.3 (no changes)
+
+ -- Noah Meyerhans <no...@debian.org> Mon, 13 Aug 2012 21:37:11 -0700
+
+spamassassin (3.3.2-3.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * debian/spamassassin.postinst: Create /var/lib/spamassassin.
+ Closes: #684373.
+
+ -- Bart Martens <ba...@debian.org> Sat, 11 Aug 2012 17:29:42 +0000
+
+spamassassin (3.3.2-3.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * move GPG.KEY out of /usr/share/doc per §12.3(Closes: #683431)
+
+ -- Shawn Landden <sh...@gmail.com> Sat, 04 Aug 2012 16:20:46 +0000
+
+spamassassin (3.3.2-3) unstable; urgency=low
+
+ * Run sa-update and sa-compile as a non-root user.
+ (Closes: 623861, 504154)
+ * Store the default gpg keyring in /var/lib/spamassassin
+ * Pod cleanup (Closes: 521064)
+ * Note sa-check_spamd's incompatibility with Nagios EPM (Closes: 598573)
+ * Adjust perms on /var/lib/spamassassin/compiled after running sa-compile
+ in the cron.daily, not on all of /var/lib/spamassassin
+ * Set CFLAGS and LDFLAGS using dpkg-buildflags (Closes: 674016)
+
+ -- Noah Meyerhans <no...@debian.org> Thu, 14 Jun 2012 23:00:01 -0700
+
spamassassin (3.3.2-2) unstable; urgency=low
- * Remove dependencies on libdigest-sha1-perl, since it's being
+ * Remove dependencies on libdigest-sha1-perl, since it's being
removed from Debian. (Closes: #629612)
-- Noah Meyerhans <no...@debian.org> Thu, 18 Aug 2011 17:07:05 -0700
@@ -60,7 +761,7 @@ spamassassin (3.2.5-7) unstable; urgency
* Fix a bunch of spelling errors in spamassassin documentation.
* Add ${misc:Depends} to spamassassin Depends.
- * Fix FH_DATE_PAST_20XX so dates in 2010 aren't considered "grossly
+ * Fix FH_DATE_PAST_20XX so dates in 2010 aren't considered "grossly
in the future"
-- Noah Meyerhans <no...@debian.org> Fri, 01 Jan 2010 12:51:32 -0500
@@ -69,7 +770,7 @@ spamassassin (3.2.5-6) unstable; urgency
* Fix call to "make install" in debian/rules to handle changes to
ExtUtils::MakeMaker in perl. (Closes: #549726)
- * Fix Makefile.PL so DESTDIR actually works when provided on the
+ * Fix Makefile.PL so DESTDIR actually works when provided on the
"make install" commandline.
* Updated to standards compliance 3.8.3, dropping versioned build-dep on
perl (>= 5.6.0)
@@ -227,7 +928,7 @@ spamassassin (3.2.0-1) unstable; urgency
performance if enabled (Closes: #394939)
- Fix ordering of lines in sa-update generated files (Closes: #413978)
- Fix parsing of Exim received headers (Closes: #357696)
- - Stop requiring Crypt::OpenSSL::Bignum with DKIM (Closes: #400437)
+ - Stop requiring Crypt::OpenSSL::Bignum with DKIM (Closes: #400437)
- Better handling of trusted_networks (Closes: #290927)
- More robust prefork mechanism for spamd (multiple bugs fixed)
(Closes: #336236, #396500, #341055)
@@ -247,7 +948,7 @@ spamassassin (3.2.0-1) unstable; urgency
#408472)
* Stop pointing to the README for mail stream integration help in README.Debian (Closes:
#374714)
- * Remove reference to libnet-dns-perl now that it's required in README.Debian (Closes: #319478)
+ * Remove reference to libnet-dns-perl now that it's required in README.Debian (Closes: #319478)
-- Duncan Findlay <du...@debian.org> Mon, 21 May 2007 10:08:17 -0400
spamassassin (3.1.7-2) unstable; urgency=high
@@ -288,7 +989,7 @@ spamassassin (3.1.3-1) unstable; urgency
* New upstream release
- Fixes spamd --vpopmail/--paranoid remote command execution bug. This
has been assigned CVE-2006-2447.
-
+
-- Duncan Findlay <du...@debian.org> Sun, 4 Jun 2006 18:24:05 -0400
spamassassin (3.1.2-1) unstable; urgency=low
@@ -317,7 +1018,7 @@ spamassassin (3.1.1-1) unstable; urgency
* Drop logcheck files -- these should/will be in the logcheck-database package. (See bug #)
* Move libnet-dns-perl back to a Recommends:. The loud warnings should
have been silenced upstream.
-
+
-- Duncan Findlay <du...@debian.org> Wed, 9 Nov 2005 16:55:03 -0500
spamassassin (3.1.0a-2) unstable; urgency=low
@@ -446,7 +1147,7 @@ spamassassin (3.0.2-1) unstable; urgency
* Updated README.Debian to explain issues with performance and spamd
(Closes: #279981)
* Updated watch file to handle the apache.org layout better. (Closes: #281468)
-
+
-- Duncan Findlay <du...@debian.org> Sat, 1 Jan 2005 15:29:19 -0500
spamassassin (3.0.1-1) unstable; urgency=low
@@ -488,7 +1189,7 @@ spamassassin (3.0.0-1) unstable; urgency
- Document --home-helper-dir option in SYNOPSIS (Closes: #265887)
- More documentation fixes: --user-config is on by default (Closes: #263845, #263846)
- Doc: Typo "on" -> "or" (Closes: #271865)
-
+
* Changed /etc/default/spamassassin to be more verbose (Closes: #265518)
* Got rid of spamassassin-tools since it was more pain than it was worth.
@@ -606,11 +1307,11 @@ spamassassin (2.99pre3.0.0svn20040525-1)
Split ok_languages zh into zh.gb2312, zh.big5 (Closes: #224116)
Put all error output on one fd for spamc (Closes: #197879)
man Mail::SpamAssassin::Conf clearer about raw headers (Closes: #236431)
-
+
* Converted packaging to use dpatch in order to allow for easier
creation of SVN packages (Because Daniel Quinlan has been bugging
me to do figure out a better system!)
-
+
* Improved debian specific rules in 65_debian.cf (Closes: #237995, #240983)
* Changed dependencies for 3.0.0. Now suggest pyzor (Closes: #242456)
* Fixed logcheck files for whitespace (Closes: #243820)
@@ -636,10 +1337,10 @@ spamassassin (2.61-2) unstable; urgency=
* Improve copyright file in response to mail from Peter Palfrader
<we...@debian.org> to debian-devel-announce
* Drop versioned libhtml-parser-perl -- it was incorrect. (Closes: #224933)
-
+
* Added patch from Colin Watson / Marc Haber to ease backports. (Closes: #224237)
* Added patch from Francesco Potorti <po...@gnu.org> to allow setting of spamd's nice level (Closes: #224369)
-
+
-- Duncan Findlay <du...@debian.org> Sun, 28 Dec 2003 16:46:53 -0500
spamassassin (2.61-1) unstable; urgency=low
@@ -738,7 +1439,7 @@ spamassassin (2.59pre2.60cvs20030619-1)
* Fixed spamc's manpage to refer to spamd(8) not spamd(1) (Closes: #197880)
* Added doc on integrating spamassassin sitewide with Exim3 from
John Girash <gi...@skyron.harvard.edu> (Closes: #196706)
- * Added example configuration for gnus from Andreas Kneib
+ * Added example configuration for gnus from Andreas Kneib
<An...@t-online.de> (Closes: #196557)
* Noted the perl5.6->perl5.8 upgrade bug in README.Debian
@@ -827,7 +1528,7 @@ spamassassin (2.50-1) unstable; urgency=
Closes: #179641, #166567, #180115, #180117, #164367, #161067,
#165428, #165731, #170881, #154812, #163179, #164960, #161696,
#163297, #163328
-
+
* Added rules/STATISTICS.txt to /usr/share/doc/spamassassin (Closes: #179799)
-- Duncan Findlay <du...@debian.org> Wed, 26 Feb 2003 22:58:58 -0500
Modified: spamassassin/trunk/debian/control
URL: http://svn.apache.org/viewvc/spamassassin/trunk/debian/control?rev=1925745&r1=1925744&r2=1925745&view=diff
==============================================================================
--- spamassassin/trunk/debian/control (original)
+++ spamassassin/trunk/debian/control Thu May 22 16:22:44 2025
@@ -2,26 +2,37 @@ Source: spamassassin
Section: mail
Priority: optional
Maintainer: Noah Meyerhans <no...@debian.org>
-Uploaders: Jesus Climent <je...@hispalinux.es>
-Build-Depends: debhelper (>= 7), perl, libssl-dev,
- libhtml-parser-perl (>= 3.24), libnet-dns-perl (>= 0.34), libnetaddr-ip-perl
-Standards-Version: 3.9.2
-Homepage: http://www.spamassassin.org/
-Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/spamassassin/trunk
-Vcs-Browser: http://svn.debian.org/viewsvn/collab-maint/deb-maint/spamassassin/trunk/
+Build-Depends: debhelper-compat (= 13),
+ perl,
+ libssl-dev,
+ libhtml-parser-perl,
+ libnetaddr-ip-perl,
+ libnet-dns-perl <!nocheck>,
+ libberkeleydb-perl <!nocheck>,
+ netbase <!nocheck>,
+ libdbi-perl <!nocheck>,
+ libdbd-mysql-perl <!nocheck>,
+ libbsd-resource-perl <!nocheck>,
+ libio-string-perl <!nocheck>,
+ libtext-diff-perl <!nocheck>
+Rules-Requires-Root: no
+Standards-Version: 4.6.0
+Homepage: https://www.spamassassin.org/
+Vcs-Git: https://salsa.debian.org/debian/spamassassin.git
+Vcs-Browser: https://salsa.debian.org/debian/spamassassin
Package: spamassassin
Architecture: all
-Conflicts: spamass-milter (<< 0.2.0-7), gotmail (<= 0.8.1-1)
-Depends: perl (>= 5.8.0), libhtml-parser-perl (>= 3.43),
- libsocket6-perl, libsys-hostname-long-perl, libarchive-tar-perl,
- libwww-perl, libnet-dns-perl (>= 0.34), libnetaddr-ip-perl,
- perl-modules (>= 5.10) | libio-zlib-perl (>= 1.04), ${misc:Depends}
-Recommends: spamc (>= 2.30), libmail-spf-perl,
- re2c, libsys-syslog-perl, gnupg, gcc, libc6-dev, make, libio-socket-inet6-perl
-Suggests: razor (>= 2.361-2),
- libnet-ident-perl, libio-socket-ssl-perl, libdbi-perl, pyzor,
- libcompress-zlib-perl, libmail-dkim-perl
+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,
+ libio-string-perl, libwww-perl | curl | w3m, ${misc:Depends}
+Recommends: spamc, sa-compile (= ${source:Version}), libmail-spf-perl,
+ libsys-syslog-perl, gnupg, libbsd-resource-perl, libmail-dmarc-perl
+Suggests: razor, libio-socket-ssl-perl, libdbi-perl, pyzor,
+ libcompress-zlib-perl, libencode-detect-perl,
+ libgeoip2-perl, libnet-patricia-perl
Provides: libmail-spamassassin-perl
Description: Perl-based spam filter using text analysis
SpamAssassin is a very powerful and fully configurable spam filter
@@ -30,19 +41,19 @@ Description: Perl-based spam filter usin
designed to be called from a user's .procmail or .forward file, but
can also be integrated into a Mail Transport Agent (MTA).
.
- Included in this package is a daemonized form of spamassassin (spamd)
- which communicates with its client (spamc) via TCP, to reduce the
- overhead of loading perl with each message. To take advantage of
- this, you must install the spamc package.
+ If you use spamassassin on a moderately high-volume mail server, you
+ may which to consider installing the spamc and spamd packages, which
+ provide a daemonized variant of spamassassin that avoids the need to
+ start a full perl runtime for each message processed.
Package: spamc
Architecture: any
+Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: spamassassin
-Conflicts: spamassassin (<< 2.30-2)
+Recommends: spamd
Description: Client for SpamAssassin spam filtering daemon
spamc is the client to communicate with spamd, the daemonized form of
- SpamAssassin (see the spamassassin package). It is written in C for
+ SpamAssassin (see the spamd package). It is written in C for
maximum speed and minimum loading overhead.
.
spamc is quite useful for integrating spamassassin into an MTA or
@@ -51,3 +62,28 @@ Description: Client for SpamAssassin spa
This package is useless unless you have spamassassin installed,
either on this machine or another local machine (i.e. a mail server).
+Package: sa-compile
+Architecture: all
+Multi-Arch: foreign
+Enhances: spamassassin
+Depends: spamassassin (= ${source:Version}), re2c, gcc, libc6-dev, make, ${misc:Depends}
+Description: Tools for compiling SpamAssassin rules into C
+ sa-compile uses "re2c" to compile the site-wide parts of the
+ SpamAssassin ruleset into C code for more efficient processing by
+ spamd or spamassassin.
+
+Package: spamd
+Architecture: all
+Multi-Arch: foreign
+Pre-Depends: ${misc:Pre-Depends}
+Depends: spamassassin (= ${source:Version}),
+ init-system-helpers (>= 1.51),
+ ${shlibs:Depends}, ${misc:Depends}
+Recommends: systemd | rsyslog | system-log-daemon
+Replaces: spamassassin (<< 4.0.0~0.0svn1883440-2)
+Breaks: spamassassin (<< 4.0.0~0.0svn1883440-2)
+Description: Server for SpamAssassin spam filtering daemon
+ spamd is a daemonized spamassassin process. Intended to be used with
+ the spamc client, the persistent nature of the spamd server allows it
+ to avoid the overhead of instantiating the perl for each processed
+ message.
Modified: spamassassin/trunk/debian/patches/10_change_config_paths
URL: http://svn.apache.org/viewvc/spamassassin/trunk/debian/patches/10_change_config_paths?rev=1925745&r1=1925744&r2=1925745&view=diff
==============================================================================
--- spamassassin/trunk/debian/patches/10_change_config_paths (original)
+++ spamassassin/trunk/debian/patches/10_change_config_paths Thu May 22 16:22:44 2025
@@ -1,21 +1,21 @@
-Index: spamassassin_release_3_3_2_rc_1/INSTALL
+Index: spamassassin/INSTALL
===================================================================
---- spamassassin_release_3_3_2_rc_1.orig/INSTALL 2011-05-14 09:04:39.000000000 -0700
-+++ spamassassin_release_3_3_2_rc_1/INSTALL 2011-05-14 11:55:36.000000000 -0700
-@@ -455,7 +455,7 @@
- perl interpreter. Version 2.83 or later fixes this.
+--- spamassassin.orig/INSTALL
++++ spamassassin/INSTALL
+@@ -408,7 +408,7 @@ is too low for them to be used.
+ interpreter. Version 2.83 or later fixes this.
- If you do not plan to use this plugin, be sure to comment out
-- its loadplugin line in "/etc/mail/spamassassin/v310.pre".
-+ its loadplugin line in "/etc/spamassassin/v310.pre".
+ If you do not plan to use this plugin, be sure to comment out its
+- loadplugin line in "/etc/mail/spamassassin/v310.pre".
++ loadplugin line in "/etc/spamassassin/v310.pre".
+ - Digest::SHA1 (from CPAN)
- What Next?
-Index: spamassassin_release_3_3_2_rc_1/README
+Index: spamassassin/README
===================================================================
---- spamassassin_release_3_3_2_rc_1.orig/README 2011-05-14 09:04:39.000000000 -0700
-+++ spamassassin_release_3_3_2_rc_1/README 2011-05-14 11:55:36.000000000 -0700
-@@ -111,13 +111,13 @@
+--- spamassassin.orig/README
++++ spamassassin/README
+@@ -114,13 +114,13 @@ default locations that Apache SpamAssass
not modify these, as they are overwritten when you run
"sa-update".
@@ -31,7 +31,7 @@ Index: spamassassin_release_3_3_2_rc_1/R
Plugin control files, installed from the distribution. These are
used to control what plugins are loaded. Modifications here will
-@@ -126,7 +126,7 @@
+@@ -129,7 +129,7 @@ default locations that Apache SpamAssass
You want to modify these files if you want to load additional
plugins, or inhibit loading a plugin that is enabled by default.
@@ -40,7 +40,7 @@ Index: spamassassin_release_3_3_2_rc_1/R
be overwritten during future installs.
- /usr/share/spamassassin/user_prefs.template:
-@@ -134,14 +134,14 @@
+@@ -137,14 +137,14 @@ default locations that Apache SpamAssass
Distributed default user preferences. Do not modify this, as it is
overwritten when you upgrade.
@@ -57,42 +57,11 @@ Index: spamassassin_release_3_3_2_rc_1/R
just a template, which will be copied to a user's home directory
for them to change.
-Index: spamassassin_release_3_3_2_rc_1/UPGRADE
+Index: spamassassin/USAGE
===================================================================
---- spamassassin_release_3_3_2_rc_1.orig/UPGRADE 2011-05-14 09:04:39.000000000 -0700
-+++ spamassassin_release_3_3_2_rc_1/UPGRADE 2011-05-14 11:55:36.000000000 -0700
-@@ -49,7 +49,7 @@
- perldoc Mail::SpamAssassin::Plugin::* (ie AWL, DCC, etc)
-
- - There are now multiple files read to enable plugins in the
-- /etc/mail/spamassassin directory; previously only one, "init.pre" was
-+ /etc/spamassassin directory; previously only one, "init.pre" was
- read. Now both "init.pre", "v310.pre", and any other files ending
- in ".pre" will be read. As future releases are made, new plugins
- will be added to new files named according to the release they're
-@@ -207,7 +207,7 @@
- - If you are using a UNIX machine with all database files on local disks,
- and no sharing of those databases across NFS filesystems, you can use a
- more efficient, but non-NFS-safe, locking mechanism. Do this by adding
-- the line "lock_method flock" to the /etc/mail/spamassassin/local.cf
-+ the line "lock_method flock" to the /etc/spamassassin/local.cf
- file. This is strongly recommended if you're not using NFS, as it is
- much faster than the NFS-safe locker.
-
-Index: spamassassin_release_3_3_2_rc_1/USAGE
-===================================================================
---- spamassassin_release_3_3_2_rc_1.orig/USAGE 2011-05-14 09:04:39.000000000 -0700
-+++ spamassassin_release_3_3_2_rc_1/USAGE 2011-05-14 11:55:36.000000000 -0700
-@@ -117,7 +117,7 @@
- CPU-intensive task before they can send mail to you, so we give that
- some bonus points. However, it requires that you list what addresses
- you expect to receive mail for, by adding 'hashcash_accept' lines to
-- your ~/.spamassassin/user_prefs or /etc/mail/spamassassin/local.cf
-+ your ~/.spamassassin/user_prefs or /etc/spamassassin/local.cf
- files. See the Mail::SpamAssassin::Plugin::Hashcash manual page for
- details on how to specify these.
-
-@@ -129,14 +129,14 @@
+--- spamassassin.orig/USAGE
++++ spamassassin/USAGE
+@@ -120,14 +120,14 @@ Other Installation Notes
- You can create your own system-wide rules files in
@@ -109,11 +78,11 @@ Index: spamassassin_release_3_3_2_rc_1/U
override these files.
-Index: spamassassin_release_3_3_2_rc_1/ldap/README
+Index: spamassassin/ldap/README
===================================================================
---- spamassassin_release_3_3_2_rc_1.orig/ldap/README 2011-05-14 09:04:33.000000000 -0700
-+++ spamassassin_release_3_3_2_rc_1/ldap/README 2011-05-14 11:55:36.000000000 -0700
-@@ -13,7 +13,7 @@
+--- spamassassin.orig/ldap/README
++++ spamassassin/ldap/README
+@@ -13,7 +13,7 @@ therefore, the only way to have their ow
database or LDAP server.
SpamAssassin will check the global configuration file (ie. any file matching
@@ -122,11 +91,11 @@ Index: spamassassin_release_3_3_2_rc_1/l
user_scores_dsn ldap://host:port/dc=basedn,dc=de?attr?scope?uid=__USERNAME__
user_scores_ldap_username bind dn
-Index: spamassassin_release_3_3_2_rc_1/lib/Mail/SpamAssassin/Conf.pm
+Index: spamassassin/lib/Mail/SpamAssassin/Conf.pm
===================================================================
---- spamassassin_release_3_3_2_rc_1.orig/lib/Mail/SpamAssassin/Conf.pm 2011-05-14 09:04:33.000000000 -0700
-+++ spamassassin_release_3_3_2_rc_1/lib/Mail/SpamAssassin/Conf.pm 2011-05-14 11:55:36.000000000 -0700
-@@ -40,7 +40,7 @@
+--- spamassassin.orig/lib/Mail/SpamAssassin/Conf.pm
++++ spamassassin/lib/Mail/SpamAssassin/Conf.pm
+@@ -40,7 +40,7 @@ Mail::SpamAssassin::Conf - SpamAssassin
=head1 DESCRIPTION
SpamAssassin is configured using traditional UNIX-style configuration files,
@@ -135,7 +104,7 @@ Index: spamassassin_release_3_3_2_rc_1/l
directories.
The following web page lists the most important configuration settings
-@@ -1956,7 +1956,7 @@
+@@ -2846,7 +2846,7 @@ If this option is set to 1 and the messa
These settings differ from the ones above, in that they are considered
'privileged'. Only users running C<spamassassin> from their procmailrc's or
@@ -144,11 +113,11 @@ Index: spamassassin_release_3_3_2_rc_1/l
use them. C<spamd> users cannot use them in their C<user_prefs> files, for
security and efficiency reasons, unless C<allow_user_rules> is enabled (and
then, they may only add rules from below).
-Index: spamassassin_release_3_3_2_rc_1/lib/Mail/SpamAssassin/Plugin/Test.pm
+Index: spamassassin/lib/Mail/SpamAssassin/Plugin/Test.pm
===================================================================
---- spamassassin_release_3_3_2_rc_1.orig/lib/Mail/SpamAssassin/Plugin/Test.pm 2011-05-14 09:04:33.000000000 -0700
-+++ spamassassin_release_3_3_2_rc_1/lib/Mail/SpamAssassin/Plugin/Test.pm 2011-05-14 11:55:36.000000000 -0700
-@@ -27,7 +27,7 @@
+--- spamassassin.orig/lib/Mail/SpamAssassin/Plugin/Test.pm
++++ spamassassin/lib/Mail/SpamAssassin/Plugin/Test.pm
+@@ -27,7 +27,7 @@ Test - test plugin
=head1 DESCRIPTION
To try this plugin, write the above two lines in the synopsis to
@@ -157,20 +126,20 @@ Index: spamassassin_release_3_3_2_rc_1/l
=cut
-Index: spamassassin_release_3_3_2_rc_1/lib/spamassassin-run.pod
+Index: spamassassin/lib/spamassassin-run.pod
===================================================================
---- spamassassin_release_3_3_2_rc_1.orig/lib/spamassassin-run.pod 2011-05-14 09:04:33.000000000 -0700
-+++ spamassassin_release_3_3_2_rc_1/lib/spamassassin-run.pod 2011-05-14 11:55:36.000000000 -0700
-@@ -41,7 +41,7 @@
+--- spamassassin.orig/lib/spamassassin-run.pod
++++ spamassassin/lib/spamassassin-run.pod
+@@ -41,7 +41,7 @@ Options:
-p prefs, --prefspath=file, --prefs-file=file
Set user preferences file
--siteconfigpath=path Path for site configs
- (def: /etc/mail/spamassassin)
+ (def: /etc/spamassassin)
--cf='config line' Additional line of configuration
+ --pre='config line' Additional line of ".pre" (prepended to configuration)
-x, --nocreate-prefs Don't create user preferences file
- -e, --exit-code Exit with a non-zero exit code if the
-@@ -239,7 +239,7 @@
+@@ -269,7 +269,7 @@ Ignore the default directories (usually
=item B<--siteconfigpath>=I<path>
Use the specified path for locating site-specific configuration files. Ignore
@@ -179,33 +148,20 @@ Index: spamassassin_release_3_3_2_rc_1/l
=item B<--cf='config line'>
-Index: spamassassin_release_3_3_2_rc_1/rules/user_prefs.template
+Index: spamassassin/sa-compile.raw
===================================================================
---- spamassassin_release_3_3_2_rc_1.orig/rules/user_prefs.template 2011-05-14 09:04:34.000000000 -0700
-+++ spamassassin_release_3_3_2_rc_1/rules/user_prefs.template 2011-05-14 11:55:36.000000000 -0700
-@@ -5,7 +5,7 @@
- #* directory. At runtime, if a user has no preferences in their home directory
- #* already, it will be copied for them, allowing them to perform personalised
- #* customisation. If you want to make changes to the site-wide defaults,
--#* create a file in /etc/spamassassin or /etc/mail/spamassassin instead.
-+#* create a file in /etc/spamassassin instead.
- ###########################################################################
-
- # How many points before a mail is considered spam.
-Index: spamassassin_release_3_3_2_rc_1/sa-compile.raw
-===================================================================
---- spamassassin_release_3_3_2_rc_1.orig/sa-compile.raw 2011-05-14 09:04:39.000000000 -0700
-+++ spamassassin_release_3_3_2_rc_1/sa-compile.raw 2011-05-14 11:55:36.000000000 -0700
-@@ -674,7 +674,7 @@
+--- spamassassin.orig/sa-compile.raw
++++ spamassassin/sa-compile.raw
+@@ -678,7 +678,7 @@ Options:
-p prefs, --prefspath=file, --prefs-file=file
Set user preferences file
--siteconfigpath=path Path for site configs
-- (default: /etc/mail/spamassassin)
-+ (default: /etc/spamassassin)
+- (default: @@PREFIX@@/etc/mail/spamassassin)
++ (default: @@PREFIX@@/etc/spamassassin)
--updatedir=path Directory to place updates
(default: @@LOCAL_STATE_DIR@@/compiled/<perlversion>/@@VERSION@@)
--cf='config line' Additional line of configuration
-@@ -736,7 +736,7 @@
+@@ -743,7 +743,7 @@ Ignore the default directories (usually
=item B<--siteconfigpath>=I<path>
Use the specified path for locating site-specific configuration files. Ignore
@@ -214,20 +170,11 @@ Index: spamassassin_release_3_3_2_rc_1/s
=item B<--updatedir>
-Index: spamassassin_release_3_3_2_rc_1/sa-learn.raw
+Index: spamassassin/sa-learn.raw
===================================================================
---- spamassassin_release_3_3_2_rc_1.orig/sa-learn.raw 2011-05-14 09:04:39.000000000 -0700
-+++ spamassassin_release_3_3_2_rc_1/sa-learn.raw 2011-05-14 11:55:36.000000000 -0700
-@@ -643,7 +643,7 @@
- -p prefs, --prefspath=file, --prefs-file=file
- Set user preferences file
- --siteconfigpath=path Path for site configs
-- (default: /etc/mail/spamassassin)
-+ (default: /etc/spamassassin)
- --cf='config line' Additional line of configuration
- -D, --debug [area=n,...] Print debugging messages
- -V, --version Print version
-@@ -800,7 +800,7 @@
+--- spamassassin.orig/sa-learn.raw
++++ spamassassin/sa-learn.raw
+@@ -825,7 +825,7 @@ Ignore the default directories (usually
=item B<--siteconfigpath>=I<path>
Use the specified path for locating site-specific configuration files. Ignore
@@ -236,11 +183,11 @@ Index: spamassassin_release_3_3_2_rc_1/s
=item B<--cf='config line'>
-Index: spamassassin_release_3_3_2_rc_1/spamc/spamc.pod
+Index: spamassassin/spamc/spamc.pod
===================================================================
---- spamassassin_release_3_3_2_rc_1.orig/spamc/spamc.pod 2011-05-14 09:04:36.000000000 -0700
-+++ spamassassin_release_3_3_2_rc_1/spamc/spamc.pod 2011-05-14 11:55:36.000000000 -0700
-@@ -273,8 +273,8 @@
+--- spamassassin.orig/spamc/spamc.pod
++++ spamassassin/spamc/spamc.pod
+@@ -310,8 +310,8 @@ any settings in the configuration file.
If the B<-F> switch is specified, that file will be used. Otherwise,
C<spamc> will attempt to load spamc.conf in C<SYSCONFDIR> (default:
@@ -251,11 +198,11 @@ Index: spamassassin_release_3_3_2_rc_1/s
Example:
-Index: spamassassin_release_3_3_2_rc_1/spamd/README
+Index: spamassassin/spamd/README
===================================================================
---- spamassassin_release_3_3_2_rc_1.orig/spamd/README 2011-05-14 09:04:39.000000000 -0700
-+++ spamassassin_release_3_3_2_rc_1/spamd/README 2011-05-14 11:55:36.000000000 -0700
-@@ -105,7 +105,7 @@
+--- spamassassin.orig/spamd/README
++++ spamassassin/spamd/README
+@@ -105,7 +105,7 @@ The Bayesian Classifier
If you plan to use Bayesian classification (the BAYES rules) with spamd,
you will need to either
@@ -264,11 +211,11 @@ Index: spamassassin_release_3_3_2_rc_1/s
tokens, by setting the 'bayes_path' setting to a path all users can read
and write to. You will also need to set the 'bayes_file_mode' setting
to 0666 so that created files are shared, too.
-Index: spamassassin_release_3_3_2_rc_1/spamd/README.vpopmail
+Index: spamassassin/spamd/README.vpopmail
===================================================================
---- spamassassin_release_3_3_2_rc_1.orig/spamd/README.vpopmail 2011-05-14 09:04:39.000000000 -0700
-+++ spamassassin_release_3_3_2_rc_1/spamd/README.vpopmail 2011-05-14 11:55:36.000000000 -0700
-@@ -43,7 +43,7 @@
+--- spamassassin.orig/spamd/README.vpopmail
++++ spamassassin/spamd/README.vpopmail
+@@ -43,7 +43,7 @@ then their user_prefs would be stored in
/home/vpopmail/domains/somedomain.net/4/userid/.spamassassin/user_prefs
5. One gotcha - cannot have personal AWL dbs - only a sitewide AWL will work.
@@ -277,11 +224,11 @@ Index: spamassassin_release_3_3_2_rc_1/s
future enhancement would be to add the capability to have personal AWL db.
6. Of course vpopmail must have the seekable patch installed (see
-Index: spamassassin_release_3_3_2_rc_1/spamd/spamd.raw
+Index: spamassassin/spamd/spamd.raw
===================================================================
---- spamassassin_release_3_3_2_rc_1.orig/spamd/spamd.raw 2011-05-14 09:04:39.000000000 -0700
-+++ spamassassin_release_3_3_2_rc_1/spamd/spamd.raw 2011-05-14 11:55:36.000000000 -0700
-@@ -2951,7 +2951,7 @@
+--- spamassassin.orig/spamd/spamd.raw
++++ spamassassin/spamd/spamd.raw
+@@ -3453,7 +3453,7 @@ Ignore the default directories (usually
=item B<--siteconfigpath>=I<path>
Use the specified path for locating site-specific configuration files. Ignore
@@ -290,11 +237,11 @@ Index: spamassassin_release_3_3_2_rc_1/s
=item B<--cf='config line'>
-Index: spamassassin_release_3_3_2_rc_1/sql/README
+Index: spamassassin/sql/README
===================================================================
---- spamassassin_release_3_3_2_rc_1.orig/sql/README 2011-05-14 09:04:35.000000000 -0700
-+++ spamassassin_release_3_3_2_rc_1/sql/README 2011-05-14 11:55:36.000000000 -0700
-@@ -18,7 +18,7 @@
+--- spamassassin.orig/sql/README
++++ spamassassin/sql/README
+@@ -18,7 +18,7 @@ In addition, any config options marked a
SQL preferences.
SpamAssassin will check the global configuration file (ie. any file matching
@@ -303,12 +250,12 @@ Index: spamassassin_release_3_3_2_rc_1/s
user_scores_dsn DBI:driver:connection
user_scores_sql_username dbusername
-Index: spamassassin_release_3_3_2_rc_1/sql/README.awl
+Index: spamassassin/sql/README.awl
===================================================================
---- spamassassin_release_3_3_2_rc_1.orig/sql/README.awl 2011-05-14 09:04:35.000000000 -0700
-+++ spamassassin_release_3_3_2_rc_1/sql/README.awl 2011-05-14 11:55:36.000000000 -0700
-@@ -15,7 +15,7 @@
- auto_whitelist_factory Mail::SpamAssassin::SQLBasedAddrList
+--- spamassassin.orig/sql/README.awl
++++ spamassassin/sql/README.awl
+@@ -15,7 +15,7 @@ so:
+ auto_welcomelist_factory Mail::SpamAssassin::SQLBasedAddrList
SpamAssassin will check the global configuration file (ie. any file
-matching /etc/mail/spamassassin/*.cf) for the following settings:
@@ -316,10 +263,10 @@ Index: spamassassin_release_3_3_2_rc_1/s
user_awl_dsn DBI:driver:database:hostname[:port]
user_awl_sql_username dbusername
-Index: spamassassin_release_3_3_2_rc_1/t/data/testplugin.pm
+Index: spamassassin/t/data/testplugin.pm
===================================================================
---- spamassassin_release_3_3_2_rc_1.orig/t/data/testplugin.pm 2011-05-14 09:04:37.000000000 -0700
-+++ spamassassin_release_3_3_2_rc_1/t/data/testplugin.pm 2011-05-14 11:55:36.000000000 -0700
+--- spamassassin.orig/t/data/testplugin.pm
++++ spamassassin/t/data/testplugin.pm
@@ -1,6 +1,6 @@
=head1 testplugin.pm
@@ -328,3 +275,148 @@ Index: spamassassin_release_3_3_2_rc_1/t
loadplugin myTestPlugin
header MY_TEST_PLUGIN eval:check_test_plugin()
+Index: spamassassin/rules/init.pre
+===================================================================
+--- spamassassin.orig/rules/init.pre
++++ spamassassin/rules/init.pre
+@@ -8,7 +8,7 @@
+ # already have a file in place called "init.pre".
+ #
+ # There are now multiple files read to enable plugins in the
+-# /etc/mail/spamassassin directory; previously only one, "init.pre" was
++# /etc/spamassassin directory; previously only one, "init.pre" was
+ # read. Now both "init.pre", "v310.pre", and any other files ending in
+ # ".pre" will be read. As future releases are made, new plugins will be
+ # added to new files, named according to the release they're added in.
+Index: spamassassin/rules/v310.pre
+===================================================================
+--- spamassassin.orig/rules/v310.pre
++++ spamassassin/rules/v310.pre
+@@ -10,7 +10,7 @@
+ # if you so wish.
+ #
+ # There are now multiple files read to enable plugins in the
+-# /etc/mail/spamassassin directory; previously only one, "init.pre" was
++# /etc/spamassassin directory; previously only one, "init.pre" was
+ # read. Now both "init.pre", "v310.pre", and any other files ending in
+ # ".pre" will be read. As future releases are made, new plugins will be
+ # added to new files, named according to the release they're added in.
+Index: spamassassin/rules/v312.pre
+===================================================================
+--- spamassassin.orig/rules/v312.pre
++++ spamassassin/rules/v312.pre
+@@ -10,7 +10,7 @@
+ # if you so wish.
+ #
+ # There are now multiple files read to enable plugins in the
+-# /etc/mail/spamassassin directory; previously only one, "init.pre" was
++# /etc/spamassassin directory; previously only one, "init.pre" was
+ # read. Now both "init.pre", "v310.pre", and any other files ending in
+ # ".pre" will be read. As future releases are made, new plugins will be
+ # added to new files, named according to the release they're added in.
+Index: spamassassin/rules/v320.pre
+===================================================================
+--- spamassassin.orig/rules/v320.pre
++++ spamassassin/rules/v320.pre
+@@ -10,7 +10,7 @@
+ # if you so wish.
+ #
+ # There are now multiple files read to enable plugins in the
+-# /etc/mail/spamassassin directory; previously only one, "init.pre" was
++# /etc/spamassassin directory; previously only one, "init.pre" was
+ # read. Now both "init.pre", "v310.pre", and any other files ending in
+ # ".pre" will be read. As future releases are made, new plugins will be
+ # added to new files, named according to the release they're added in.
+Index: spamassassin/rules/v330.pre
+===================================================================
+--- spamassassin.orig/rules/v330.pre
++++ spamassassin/rules/v330.pre
+@@ -10,7 +10,7 @@
+ # if you so wish.
+ #
+ # There are now multiple files read to enable plugins in the
+-# /etc/mail/spamassassin directory; previously only one, "init.pre" was
++# /etc/spamassassin directory; previously only one, "init.pre" was
+ # read. Now both "init.pre", "v310.pre", and any other files ending in
+ # ".pre" will be read. As future releases are made, new plugins will be
+ # added to new files, named according to the release they're added in.
+Index: spamassassin/rules/v340.pre
+===================================================================
+--- spamassassin.orig/rules/v340.pre
++++ spamassassin/rules/v340.pre
+@@ -10,7 +10,7 @@
+ # if you so wish.
+ #
+ # There are now multiple files read to enable plugins in the
+-# /etc/mail/spamassassin directory; previously only one, "init.pre" was
++# /etc/spamassassin directory; previously only one, "init.pre" was
+ # read. Now both "init.pre", "v310.pre", and any other files ending in
+ # ".pre" will be read. As future releases are made, new plugins will be
+ # added to new files, named according to the release they're added in.
+Index: spamassassin/rules/v341.pre
+===================================================================
+--- spamassassin.orig/rules/v341.pre
++++ spamassassin/rules/v341.pre
+@@ -10,7 +10,7 @@
+ # if you so wish.
+ #
+ # There are now multiple files read to enable plugins in the
+-# /etc/mail/spamassassin directory; previously only one, "init.pre" was
++# /etc/spamassassin directory; previously only one, "init.pre" was
+ # read. Now both "init.pre", "v310.pre", and any other files ending in
+ # ".pre" will be read. As future releases are made, new plugins will be
+ # added to new files, named according to the release they're added in.
+Index: spamassassin/rules/v342.pre
+===================================================================
+--- spamassassin.orig/rules/v342.pre
++++ spamassassin/rules/v342.pre
+@@ -10,7 +10,7 @@
+ # if you so wish.
+ #
+ # There are now multiple files read to enable plugins in the
+-# /etc/mail/spamassassin directory; previously only one, "init.pre" was
++# /etc/spamassassin directory; previously only one, "init.pre" was
+ # read. Now both "init.pre", "v310.pre", and any other files ending in
+ # ".pre" will be read. As future releases are made, new plugins will be
+ # added to new files, named according to the release they're added in.
+Index: spamassassin/rules/v343.pre
+===================================================================
+--- spamassassin.orig/rules/v343.pre
++++ spamassassin/rules/v343.pre
+@@ -10,7 +10,7 @@
+ # if you so wish.
+ #
+ # There are now multiple files read to enable plugins in the
+-# /etc/mail/spamassassin directory; previously only one, "init.pre" was
++# /etc/spamassassin directory; previously only one, "init.pre" was
+ # read. Now both "init.pre", "v310.pre", and any other files ending in
+ # ".pre" will be read. As future releases are made, new plugins will be
+ # added to new files, named according to the release they're added in.
+Index: spamassassin/rules/v400.pre
+===================================================================
+--- spamassassin.orig/rules/v400.pre
++++ spamassassin/rules/v400.pre
+@@ -10,7 +10,7 @@
+ # if you so wish.
+ #
+ # There are now multiple files read to enable plugins in the
+-# /etc/mail/spamassassin directory; previously only one, "init.pre" was
++# /etc/spamassassin directory; previously only one, "init.pre" was
+ # read. Now both "init.pre", "v310.pre", and any other files ending in
+ # ".pre" will be read. As future releases are made, new plugins will be
+ # added to new files, named according to the release they're added in.
+Index: spamassassin/lib/Mail/SpamAssassin/Plugin/Phishing.pm
+===================================================================
+--- spamassassin.orig/lib/Mail/SpamAssassin/Plugin/Phishing.pm
++++ spamassassin/lib/Mail/SpamAssassin/Plugin/Phishing.pm
+@@ -29,8 +29,8 @@ Mail::SpamAssassin::Plugin::Phishing - c
+ loadplugin Mail::SpamAssassin::Plugin::Phishing
+
+ ifplugin Mail::SpamAssassin::Plugin::Phishing
+- phishing_openphish_feed /etc/mail/spamassassin/openphish-feed.txt
+- phishing_phishtank_feed /etc/mail/spamassassin/phishtank-feed.csv
++ phishing_openphish_feed /etc/spamassassin/openphish-feed.txt
++ phishing_phishtank_feed /etc/spamassassin/phishtank-feed.csv
+ body URI_PHISHING eval:check_phishing()
+ describe URI_PHISHING Url match phishing in feed
+ endif
Modified: spamassassin/trunk/debian/patches/20_edit_spamc_pod
URL: http://svn.apache.org/viewvc/spamassassin/trunk/debian/patches/20_edit_spamc_pod?rev=1925745&r1=1925744&r2=1925745&view=diff
==============================================================================
--- spamassassin/trunk/debian/patches/20_edit_spamc_pod (original)
+++ spamassassin/trunk/debian/patches/20_edit_spamc_pod Thu May 22 16:22:44 2025
@@ -1,8 +1,8 @@
-Index: spamassassin-3.3.1/spamc/spamc.pod
+Index: spamassassin/spamc/spamc.pod
===================================================================
---- spamassassin-3.3.1.orig/spamc/spamc.pod 2010-03-21 23:14:12.000000000 -0700
-+++ spamassassin-3.3.1/spamc/spamc.pod 2010-03-21 23:14:28.000000000 -0700
-@@ -321,7 +321,7 @@
+--- spamassassin.orig/spamc/spamc.pod
++++ spamassassin/spamc/spamc.pod
+@@ -363,7 +363,7 @@ The exit codes used are as follows:
=head1 SEE ALSO
Modified: spamassassin/trunk/debian/patches/series
URL: http://svn.apache.org/viewvc/spamassassin/trunk/debian/patches/series?rev=1925745&r1=1925744&r2=1925745&view=diff
==============================================================================
--- spamassassin/trunk/debian/patches/series (original)
+++ spamassassin/trunk/debian/patches/series Thu May 22 16:22:44 2025
@@ -1,3 +1,12 @@
10_change_config_paths
20_edit_spamc_pod
-30_edit_README
+55_disable_nagios_epm
+90_pod_cleanup
+debian_gitignore
+bug426031-pod-fix
+skip_config_tree_recurse_test
+use_utf8_encoding.patch
+add-ip-configuration-debug.patch
+spamd_disable_ai_addrconfig_for_ipv4_literals.patch
+sorbs-shutdown.patch
+bug1091683-pdfinfo.patch
Modified: spamassassin/trunk/debian/rules
URL: http://svn.apache.org/viewvc/spamassassin/trunk/debian/rules?rev=1925745&r1=1925744&r2=1925745&view=diff
==============================================================================
--- spamassassin/trunk/debian/rules (original)
+++ spamassassin/trunk/debian/rules Thu May 22 16:22:44 2025
@@ -1,184 +1,139 @@
#!/usr/bin/make -f
-
+#
# SpamAssassin debian/rules
-# Duncan Findlay
+# (C) 2004-2008 Duncan Findlay <du...@debian.org>
+# (C) 2008-2020 Noah Meyerhans <no...@debian.org>
+# (C) 2022 Andreas Metzler <am...@debian.org>
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to you under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at:
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
-# Based on sample debian/rules by Joey Hess
-# And patches from various people (see changelog)
+export DEB_BUILD_MAINT_OPTIONS := hardening=+all
-#export DH_VERBOSE=1
+include /usr/share/dpkg/buildflags.mk
# The architecture-dependent portion of this package can be built separately
# (i.e. without building the rest).
-# Bad things could probably happen if we run this in parallel
-.NOTPARALLEL:
-
-CFLAGS=-O2 -Wall
-
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -g
+SOURCE := $(shell dpkg-parsechangelog -SSource)
+VERSION := $(shell dpkg-parsechangelog -SVersion)
+VERSION_UPSTREAM := $(shell echo "$(VERSION)" | sed -e 's,-[^-]*$$,,')
+
+DIR_ORIG = ../orig/$(SOURCE)-$(VERSION_UPSTREAM)
+TAR_ORIG_NAME = $(SOURCE)_$(VERSION_UPSTREAM).orig.tar.xz
+TAR_ORIG = $(firstword $(wildcard ../$(TAR_ORIG_NAME)) $(wildcard ../orig/$(TAR_ORIG_NAME)))
+
+orig: $(DIR_ORIG)
+ rsync --delete --exclude /debian --exclude .svk --exclude .svn --exclude .git --link-dest=$(DIR_ORIG)/ -a $(DIR_ORIG)/ .
+ QUILT_PATCHES='$(CURDIR)/debian/patches' QUILT_PC=.pc quilt push --quiltrc - -a -q --fuzz=0
+
+$(DIR_ORIG):
+ifeq ($(TAR_ORIG),)
+ $(error Cannot find orig tarball $(TAR_ORIG_NAME))
+else
+ mkdir -p ../orig
+ tar -C ../orig -xaf $(TAR_ORIG)
endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
-
-# For building both spamc and spamassassin
-configure: configure-stamp
-configure-stamp:
-
- dh_testdir
-
- perl Makefile.PL INSTALLDIRS=vendor \
- DESTDIR=$(CURDIR)/debian/spamassassin \
- CONFDIR=/etc/spamassassin \
- ENABLE_SSL=yes < /dev/null
-
- touch configure-stamp
-
-build: build-indep build-arch
-install: install-indep install-arch
-binary: binary-indep binary-arch
+%:
+ dh $@ --no-parallel
-clean: clean1
-clean1:
- dh_testdir
- dh_testroot
- rm -f build-indep-stamp build-arch-stamp configure-stamp
+# For building both spamc and spamassassin
+override_dh_auto_configure:
+ dh_auto_configure --verbose -- \
+ LDFLAGS="$(LDFLAGS)" \
+ DESTDIR=$(CURDIR)/debian/spamassassin \
+ CONFDIR=/etc/spamassassin \
+ ENABLE_SSL=yes
+override_dh_auto_clean:
+ dh_auto_clean --verbose
[ ! -f Makefile ] || $(MAKE) veryclean
+ rm -f rules/70_sandbox.cf rules/72_active.cf
rm -f spamd/spamc.1p sa-awl.1p sa-check_spamd.1p
- rm -Rf t/log/*
- rm -f debian/semantic.cache
-
- dh_clean
-
-#debian/po/templates.pot: debian/spamassassin.templates
-# -debconf-updatepo
+ rm -Rf t/log/* t/home
+ rm -f debian/semantic.cache Mail-SpamAssassin-*.tar.gz
-# Spamassassin ONLY
+maintainerclean:
+ dh_testdir
+ rm -f build-indep-stamp build-arch-stamp configure-stamp
+ rm -rf $(filter-out debian .svk .svn .git, $(wildcard * .[^.]*))
-build-indep: build-indep-stamp
-#build-indep-stamp: configure debian/po/templates.pot
-build-indep-stamp: configure
- dh_testdir
+override_dh_auto_test:
+ env CFLAGS="$(CPPFLAGS) $(CFLAGS)" \
+ dh_auto_test --verbose --no-parallel -- HOME=$(CURDIR)/t/home \
+ LDFLAGS="$(LDFLAGS)"
- $(MAKE) CFOPTIMIZE="$(CFLAGS)" CFCCFLAGS="" CFLIBS="" CFLDFLAGS=""
+override_dh_auto_build-indep:
+ dh_auto_build --verbose --no-parallel
pod2man sa-awl.raw sa-awl.1p
pod2man sa-check_spamd.raw sa-check_spamd.1p
- touch build-arch-stamp
-
- touch build-indep-stamp
-
+override_dh_auto_build-arch:
+ env CFLAGS="$(CPPFLAGS) $(CFLAGS)" \
+ dh_auto_build --verbose --no-parallel -- \
+ spamc/spamc
-install-indep: install-spamassassin
-
-# SpamAssassin
-
-install-spamassassin: build-indep
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs -i
-
- $(MAKE) install DESTDIR=`pwd`/debian/spamassassin
-
-
-# Get rid of SPAMC stuff.
- rm debian/spamassassin/usr/bin/spamc debian/spamassassin/usr/share/man/man1/spamc.1p
+ -mkdir -p blib/man1
+ pod2man spamc/spamc.pod blib/man1/spamc.1p
+override_dh_installsystemd-indep:
+ dh_installsystemd -pspamassassin --no-enable --no-start --name spamassassin-maintenance
+ dh_installsystemd -Nspamassassin
+
+# SpamAssassin and sa-compile:
+override_dh_auto_install-indep:
+ dh_auto_install --verbose --no-parallel \
+ --destdir=$(CURDIR)/debian/spamassassin
+
+ rm -f debian/spamassassin/usr/bin/spamc debian/spamassassin/usr/share/man/man1/spamc.1p
+# ...and sa-compile
+ rm -f debian/spamassassin/usr/bin/sa-compile debian/spamassassin/usr/share/man/man1/sa-compile.1p
# Move spamd to /usr/sbin + fix the man file
sed 's#SPAMD 1#SPAMD 8#' \
debian/spamassassin/usr/share/man/man1/spamd.1p \
- > debian/spamassassin/usr/share/man/man8/spamd.8p
- rm debian/spamassassin/usr/share/man/man1/spamd.1p
-
- mv debian/spamassassin/usr/bin/spamd debian/spamassassin/usr/sbin/
-
-# Install Debian specific files
- cp debian/65_debian.cf debian/spamassassin/etc/spamassassin/65_debian.cf
+ > debian/spamd/usr/share/man/man8/spamd.8p
+ rm -f debian/spamassassin/usr/share/man/man1/spamd.1p
- -rmdir -p debian/spamassassin/usr/lib/perl5
-
-# dh_installdocs isn't flexible enough to install all the docs to the right place
-# Do it here!
- cp debian/copyright debian/GPG.KEY debian/spamassassin/usr/share/doc/spamassassin/
- cp debian/spamassassin.README.Debian debian/spamassassin/usr/share/doc/spamassassin/README.Debian
- cp CREDITS README TRADEMARK UPGRADE USAGE NOTICE debian/spamassassin/usr/share/doc/spamassassin/
- cp ldap/README debian/spamassassin/usr/share/doc/spamassassin/README.ldap
- cp rules/STATISTICS*.txt debian/spamassassin/usr/share/doc/spamassassin/rules/
- cp spamd/README debian/spamassassin/usr/share/doc/spamassassin/README.spamd
- cp spamd/README.vpopmail debian/spamassassin/usr/share/doc/spamassassin/README.spamd-vpopmail
- cp -r sql/ debian/spamassassin/usr/share/doc/spamassassin/
-
- cp pkgrules/* debian/spamassassin/usr/share/spamassassin
-
-binary-indep: build-indep install-indep
- dh_testdir -i
- dh_testroot -i
-# dh_installdebconf -i
-# dh_installlogcheck -i
- dh_installman -i sa-awl.1p sa-check_spamd.1p
- dh_installdocs -i
- dh_installexamples -i
- dh_installinit -i -- defaults 19 21
- dh_installcron -i
- dh_installchangelogs Changes -i
- dh_link -i
- dh_compress -i -XGPG.KEY
- dh_fixperms -i
- dh_installdeb -i
- dh_perl -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
-# spamc ONLY
-
-build-arch: build-arch-stamp
-#build-arch-stamp: configure debian/po/templates.pot
-build-arch-stamp: configure
-
- dh_testdir
-
- -mkdir -p blib/man1
-
- $(MAKE) CFOPTIMIZE="$(CFLAGS)" CFCCFLAGS="" CFLIBS="" CFLDFLAGS="" spamc/spamc
-
- pod2man spamc/spamc.pod blib/man1/spamc.1p
-
- touch build-arch-stamp
-
-install-arch: DH_OPTIONS=
-install-arch: build-arch
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs -a
-
- cp spamc/spamc debian/spamc/usr/bin/spamc
-
-binary-arch: build-arch install-arch
- dh_testdir -a
- dh_testroot -a
-# dh_installlogcheck -a
- dh_installdocs -a
- dh_installman -a
- dh_installchangelogs Changes -a
- dh_strip -a
- dh_compress -a
- dh_fixperms -a
- dh_installdeb -a
- dh_shlibdeps -a
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a
+ mv debian/spamassassin/usr/bin/spamd debian/spamd/usr/sbin/
-.PHONY: build build-indep build-arch clean clean1 binary-indep binary-arch binary install configure install-indep install-indep-docs install-arch
+# These files are renamed upon installation, which dh_install
+# doesn't support, so we do it "the old fashioned way":
+ install -m755 debian/spamassassin-maint.sh \
+ debian/spamassassin/usr/sbin/spamassassin-maint
+
+ install -m644 ldap/README \
+ debian/spamd/usr/share/doc/spamd/README.ldap
+ install -m644 spamd/README \
+ debian/spamd/usr/share/doc/spamd/README.spamd
+
+override_dh_install-indep:
+ dh_install
+ rm -f debian/spamassassin/usr/share/spamassassin/70_sandbox.cf \
+ debian/spamassassin/usr/share/spamassassin/sandbox-*.pm \
+ debian/spamassassin/usr/share/spamassassin/*.pre
+
+# File modes are inconsistent in upstream's rules repositories. Set them to something sane:
+ chmod 644 debian/spamassassin/usr/share/spamassassin/*.cf
+
+
+# spamc (arch specific) rules follow
+override_dh_auto_install-arch:
+ install -m755 spamc/spamc debian/spamc/usr/bin/spamc
Modified: spamassassin/trunk/debian/spamassassin.README.Debian
URL: http://svn.apache.org/viewvc/spamassassin/trunk/debian/spamassassin.README.Debian?rev=1925745&r1=1925744&r2=1925745&view=diff
==============================================================================
--- spamassassin/trunk/debian/spamassassin.README.Debian (original)
+++ spamassassin/trunk/debian/spamassassin.README.Debian Thu May 22 16:22:44 2025
@@ -1,35 +1,47 @@
READ "UPGRADE" IF YOU ARE UPGRADING FROM A PREVIOUS VERSION
-Cron job
---------
+sa-update
+---------
There is a cron job in /etc/cron.daily/spamassassin that will
automatically run sa-update and reload spamd every day if it is
enabled. To enable this script, edit
-/etc/default/spamassassin. sa-update, when run as root, downloads the
-latest set of rules distributed by upstream to a directory under
-/var/lib/spamassassin. This script will work correctly with sa-compile
-(see below).
+/etc/default/spamassassin. sa-update will store the latest set of
+rules distributed by upstream to a directory under
+/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 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
+spamassassin without gnupg and later want to enable sa-update, you
+should execute `dpkg-reconfigure spamassassin` after installation. Note
+that in the future it's likely that gnupg will become a hard dependency.
+
+Note that sa-update should not run as root, but as the debian-spamd
+user. Running as root will result in incorrect and potentially
+dangerous file ownership and permission. In general the included cron
+script is the recommended way to run this program.
sa-compile
----------
-This package now includes a new plugin to greatly improve the
-performance of SpamAssassin by compiling a ruleset using re2c. Please
-read the "sa-compile" manpage for more information. To enable this
-enhancement, you will need to uncomment a line in
-/etc/spamassassin/v320.pre and make sure the following packages are
-installed:
-
- aptitude install re2c libc6-dev gcc make
-
-The "compiled" ruleset is used whenever possible to speed spamassassin
-up. If you disable or change a rule in the configuration, the compiled
-version will no longer be used. If you create or change a rule, you
-will want to run sa-compile to generate the compiled version to
-improve performance, but if you don't you will simply use the
-un-compiled version.
+As of 3.3.2-8, sa-compile is now distributed in a separate package. If
+you wish to compile your spamassassin rules for improved efficiency
+and throughput, you can run sa-compile manually as "su debian-spamd -c
+sa-compile". If you have enabled the daily cron job (see above), then
+sa-compile will be automatically run whenever new rule updates are
+installed.
+
+Please see the sa-compile man page and
+Mail::SpamAssassin::Plugin::Rule2XSBody perldoc for more details.
+
+Note that sa-compile should not run as root, but as the debian-spamd
+user. Running as root will result in incorrect and potentially
+dangerous file ownership and permission. In general the included cron
+script is the recommended way to run this program.
Trusted Networks
----------------
@@ -64,9 +76,11 @@ Configuring spamd
spamd, the daemonized form of spamassassin, is generally the preferred
way of running spamassassin. Please read man spamd and README.spamd
-for more information. Init scripts are provided with this package in
-/etc/init.d/spamassassin. To change the command line options, please
-edit /etc/default/spamassassin.
+for more information. Spamd is disabled by default on Debian
+installations. To enable it, use "systemctl enable spamassassin" on
+systems using systemd, or "update-rc.d spamassassin enable" for systems
+using other init systems. To change the command
+line options, please edit /etc/default/spamassassin.
If you intend to use Bayes sitewide, it is recommended that you set up
an SQL-based Bayes storage module. (You may also want to store scores
@@ -77,6 +91,9 @@ Please note that SQL storage is not very
access to the database can read and write it freely, meaning users
could corrupt other users' Bayes databases.
+Please note that the --auth-ident option does not work with pidentd or
+gidentd. See http://bugs.debian.org/278030 for more information.
+
Poor Performance
----------------
@@ -152,4 +169,4 @@ Some users have reported difficulty runn
listening address. As a work around, please ensure you have
libio-socket-inet6-perl installed.
- -- Duncan Findlay <du...@debian.org>, Mon, 21 May 2007 23:53:57 -0400
+ -- Noah Meyerhans <no...@debian.org>, Sun, 12 Oct 2014 18:00:22 -0700
Modified: spamassassin/trunk/debian/spamassassin.cron.daily
URL: http://svn.apache.org/viewvc/spamassassin/trunk/debian/spamassassin.cron.daily?rev=1925745&r1=1925744&r2=1925745&view=diff
==============================================================================
--- spamassassin/trunk/debian/spamassassin.cron.daily (original)
+++ spamassassin/trunk/debian/spamassassin.cron.daily Thu May 22 16:22:44 2025
@@ -1,85 +1,50 @@
#!/bin/sh
-# Duncan Findlay
-# duncf@debian.org
+# Copyright 2007,2008 Duncan Findlay <du...@debian.org>
+# Copyright 2008-2019 Noah Meyerhans <no...@debian.org>
-# Daily cronjob for SpamAssassin updates. This isn't pretty but it
-# should do the job.
+# This script does not do anything by default. If you are using systemd,
+# invoke "systemctl enable --now spamassassin-maintenance.timer" to enable
+# spamassassin's daily maintenance systemd timer. If you are not using
+# systemd, or otherwise prefer to use cron for daily maintenance, set CRON=1
+# in /etc/cron.daily/spamassassin
CRON=0
test -f /etc/default/spamassassin && . /etc/default/spamassassin
test -x /usr/bin/sa-update || exit 0
-test -x /etc/init.d/spamassassin || exit 0
+command -v gpg > /dev/null || exit 0
if [ "$CRON" = "0" ] ; then
exit 0
fi
-# If there's a problem with the ruleset or configs, print the output
-# of spamassassin --lint (which will typically get emailed to root)
-# and abort.
-die_with_lint() {
- spamassassin --lint -D 2>&1
- exit 1
-}
-
-do_compile() {
-# Compile, if rules have previously been compiled, and it's possible
- if [ -x /usr/bin/re2c -a -x /usr/bin/sa-compile \
- -a -d /var/lib/spamassassin/compiled ]; then
- sa-compile --quiet
- # Fixup perms -- group and other should be able to
- # read and execute, but never write. Works around
- # sa-compile's failure to obey umask.
- if [ -d /var/lib/spamassassin ]; then
- chmod -R go-w,go+rX /var/lib/spamassassin/
- fi
- fi
-}
-
-# Tell a running spamd to reload its configs and rules.
-reload() {
- # Reload
- if which invoke-rc.d >/dev/null 2>&1; then
- invoke-rc.d spamassassin reload > /dev/null
- else
- /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
- fi
-}
-
-# Sleep for up to 3600 seconds
-RANGE=3600
-number=`od -vAn -N2 -tu4 < /dev/urandom`
-number=`expr $number "%" $RANGE`
-sleep $number
-
-
-# Update
-umask 022
-sa-update
-
-case $? in
- 0)
- # got updates!
- spamassassin --lint || die_with_lint
- do_compile
- reload
- ;;
- 1)
- # no updates
- exit 0
- ;;
- 2)
- # lint failed!
- die_with_lint
- ;;
- *)
- echo "sa-update failed for unknown reasons" 1>&2
- ;;
-esac
+# If the systemd timer is active, there's nothing else for us to do:
+if [ -d /run/systemd/system ] && \
+ systemctl is-enabled --quiet spamassassin-maintenance.timer; then
+ exit 0
+fi
+
+# If we're running under systemd, and we reach this point, then we can
+# safely convert to the timer. If you'd rather run the daily
+# maintenance task from cron, even if systemd is present, then create
+# a file named /etc/spamassassin/skip-timer-conversion to avoid
+# running this conversion.
+if [ -d /run/systemd/system ] && [ ! -e /etc/spamassassin/skip-timer-conversion ]; then
+ echo "Converting /etc/cron.daily/spamassassin to systemd timer" |
+ logger -p mail.notice
+ systemctl enable spamassassin-maintenance.timer
+ systemctl start spamassassin-maintenance.service
+ exit 0
+fi
+
+# Sleep for up to 3600 seconds if not running interactively
+if [ ! -t 0 ]; then
+ RANGE=3600
+ number=`od -vAn -N2 -tu4 < /dev/urandom`
+ number=`expr $number "%" $RANGE`
+ sleep $number
+fi
+exec /usr/sbin/spamassassin-maint
Modified: spamassassin/trunk/debian/spamassassin.dirs
URL: http://svn.apache.org/viewvc/spamassassin/trunk/debian/spamassassin.dirs?rev=1925745&r1=1925744&r2=1925745&view=diff
==============================================================================
--- spamassassin/trunk/debian/spamassassin.dirs (original)
+++ spamassassin/trunk/debian/spamassassin.dirs Thu May 22 16:22:44 2025
@@ -1,10 +1,8 @@
etc
-etc/init.d
-etc/default
etc/spamassassin
etc/spamassassin/sa-update-hooks.d
usr/share/doc/spamassassin
usr/share/doc/spamassassin/rules
usr/share/spamassassin
-usr/share/man/man8
+var/lib/spamassassin
usr/sbin