Commit Graph

157 Commits

Author SHA1 Message Date
Thomas Lamprecht
f9a36bcc88 bump version to 4.0.1-2
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2025-02-25 17:44:50 +01:00
Stoiko Ivanov
ab08f50bb7 update KAM ruleset
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2025-02-25 11:49:16 +01:00
Stoiko Ivanov
153b994c41 update SpamAssassin signatures
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2025-02-25 11:48:36 +01:00
Stoiko Ivanov
67a3815b65 d/triggers: add trigger to restart pmg services
currently an update to SpamAssassin does not reload the relevant
services in pmg (mostly pmg-smtp-filter and the api-daemons, but
through transitive use statements most others also pull in some
part of SpamAssassin)

This patch simply adds a new trigger [0,1] to reload all services,
as is already done for updates of pve-common).

[0] https://git.dpkg.org/cgit/dpkg/dpkg.git/tree/doc/spec/triggers.txt
[1] https://manpages.debian.org/bookworm/dpkg-dev/deb-triggers.5.en.html

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2025-02-21 18:38:11 +01:00
Stoiko Ivanov
4047653305 bump version to 4.0.1-1
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 [ TL: release version & slightly adapt commit and changelog format ]
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2024-06-11 18:41:51 +02:00
Stoiko Ivanov
cef615eca0 update KAM ruleset
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2024-06-11 18:04:49 +02:00
Stoiko Ivanov
54c714b2bf update SpamAssassin signatures
after installing the package with version 4.0.1

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2024-06-11 18:04:49 +02:00
Stoiko Ivanov
443c24b731 d/control: add perl depends to build-depends
especially when building in a clean environment (sbuild), it makes
sense to have everything available we also depend on in the binary
package

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2024-06-04 14:50:19 +02:00
Stoiko Ivanov
8a8b46bc5c add patch for building as root
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2024-06-04 12:51:59 +02:00
Stoiko Ivanov
fbb951ffb0 buildsys: fix running sbuild as root
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2024-06-04 12:45:13 +02:00
Stoiko Ivanov
f887dfc0c7 update SpamAssassin to 4.0.1
generated by make update-upstream

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2024-05-31 17:16:10 +02:00
Stoiko Ivanov
10a34462c9 bump version to 4.0.0-5
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2024-02-26 22:53:08 +01:00
Stoiko Ivanov
10758bc634 update KAM ruleset
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2024-02-26 21:37:16 +01:00
Stoiko Ivanov
151f49fd24 update SpamAssassin signatures
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2024-02-26 21:36:42 +01:00
Stoiko Ivanov
6ca0e3a236 bump version to 4.0.0-4
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2023-06-27 14:53:17 +02:00
Stoiko Ivanov
ec5973cd14 update KAM ruleset
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2023-06-27 14:14:28 +02:00
Stoiko Ivanov
fc5290a34d update SpamAssassin signatures
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2023-06-27 14:13:58 +02:00
Thomas Lamprecht
9f78c2890a buildsys: expand clean target
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2023-06-25 17:15:37 +02:00
Thomas Lamprecht
bdf5ac9e3b bump version to 4.0.0-3
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2023-06-25 16:55:57 +02:00
Thomas Lamprecht
8784c74753 buildsys: expand clean target
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2023-06-25 16:28:16 +02:00
Thomas Lamprecht
446f7108c3 buildsys: rework build-dir and original source tarball creation
Ship the updates in the source package to avoid that this needs to be
pulled on actual build.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2023-06-25 16:26:11 +02:00
Thomas Lamprecht
184cb476e6 buildsys: use more telling BUILDDIR variable name
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2023-06-25 16:26:11 +02:00
Thomas Lamprecht
454d7acbf9 buildsys: factor out package name into variable
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2023-06-25 16:26:11 +02:00
Stoiko Ivanov
94133cb96e d/control: define compat level via build-depends and raise to 13
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2023-06-25 16:26:11 +02:00
Stoiko Ivanov
2fe029b23a d/control: raise standards version compliance to 4.6.2
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2023-06-25 16:26:11 +02:00
Stoiko Ivanov
17b8f7da69 d/docs: add NOTICE file
it is present in upstream sources and needs to be redistributed
according to the APACHE license.
Lintian treated this as an error after raising the standards-version
and building with sbuild

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2023-06-25 16:26:11 +02:00
Stoiko Ivanov
b870b07a3d buildsys: add sbuild convenience target
and only call lintian on the source-package for the phony dsc target,
as sbuild calls it anyways

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2023-06-25 16:26:11 +02:00
Stoiko Ivanov
373b09f3cc d/source/lintian-overrides: symlink to overrides for binary package
the files in national encodings also cause a warning for the source
package, which needs its own lintian-overrides file [0].

[0] https://lintian.debian.org/manual/index.html#overrides

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2023-06-25 16:26:11 +02:00
Stoiko Ivanov
9e1a23026f buildsys: derive upload dist automatically
default.mk includes pkg-info.mk - so don't include it twice

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2023-06-25 16:26:11 +02:00
Stoiko Ivanov
701fc74628 buildsys: fix update-kam target
by not removing kam-updates the last `mv` command is not the atomic
rename we want, but rather moves the kam-updates.tmp folder inside
kam-updates.

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2023-06-25 16:26:11 +02:00
Stoiko Ivanov
3e32306b5a buildsys: use simple parenthesis for variables
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2023-06-25 16:26:11 +02:00
Stoiko Ivanov
4404233acb d/patches: drop unused patches
with commit 426b8f0a33 we use debhelper
for building, and I missed that the dpkg-buildpackage invocation for
building binary packages only does not prepare the source (by applying
quilt-patches)

Since no regressions for the accidental change were reported both
patches seem unneccessary:
disable-dkim.patch - our users do use DKIM and adapt rules which rely
on it - so it does not seem appropriate to not load the module anymore
(patch was introduced before PMG 5.0)
avoid-init.pre-update.patch: this was addressed differently by
d27e5c832e

noticed while trying to build the dsc target

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2023-06-25 16:26:11 +02:00
Thomas Lamprecht
8862132bd7 bump version to 4.0.0-2
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2023-03-27 11:02:45 +02:00
Stoiko Ivanov
c00fb2c705 drop obsolete KAM.cf
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2023-03-27 01:41:38 +02:00
Stoiko Ivanov
6927b9b6b3 kam-update: add complete KAM ruleset
generated by `make update-kam`

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2023-03-27 01:41:38 +02:00
Stoiko Ivanov
df264c7c15 buildsys: update outdated docs on updating rulesets
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2023-03-26 17:15:22 +02:00
Stoiko Ivanov
bbb3288321 kam-rules: ship full ruleset not only KAM.cf
The KAM ruleset consists of more files than just KAM.cf - and with the
enabling of the HashBL module in SA 4.0.0 the KAM.cf depends on
settings in other files from the ruleset. This leads to warnings when
starting pmg-smtp-filter on a freshly installed system (more exactly
on a system where pmg-daily did not already download the complete KAM
ruleset to /var/lib)

This patch follows the logic we use in pmg-daily and ships the
complete ruleset in /usr/share/spamassassin-extra

KAM.cf itself was also moved to the kam.sa-channels.mcgrail.org
subdirectory so that we can use the downloaded cf file to get the
correct includes

Given that the default installations from PMG 6.4 on download and use
the complete ruleset the potential for regression should be quite
small.

I shortly considered adding a symlink from KAM.cf pointing to
kam_sa-channels_mcgrail_com/KAM.cf so that users with unadapted
templates still load at least KAM.cf - but since SpamAssassin simply
ignores non-existing files, and most setups, which have modified
templates probably ran pmg-daily at some point resulting in the files
from /var/lib/spamassassin being preferred I left that out.

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2023-03-26 17:15:22 +02:00
Stoiko Ivanov
21dcadbf05 update SpamAssassin signatures
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2023-03-23 17:52:57 +01:00
Thomas Lamprecht
524f111508 bump version to 4.0.0-1
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2023-03-15 16:53:25 +01:00
Thomas Lamprecht
7379e784e5 d/control: record breaks agains older pmg-api
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2023-03-15 16:53:07 +01:00
Thomas Lamprecht
26bccdff2e packaging: run wrap-and-sort -tkn
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2023-03-15 14:54:44 +01:00
Stoiko Ivanov
6476869c38 d/control: add recommends for new feature dependencies
* libdbd-sqlite3-perl is needed for the caching of DecodeShortUrl
* libmail-dmarc-perl [0]  is used for DMARC and Authentication-Results
  handling
* libnet-idn2-perl [1] is needed if utf-8 domain-names are to be
  analyzed (or added to block/welcomelists)

the latter 2 packages are not in bullseye yet, but build and install
cleanly

[0]
https://salsa.debian.org/noahm/libmail-dmarc-perl
[1]
https://salsa.debian.org/perl-team/modules/packages/libnet-libidn2-perl

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2023-03-13 21:13:45 +01:00
Stoiko Ivanov
90403ff9a1 d/control: add libtext-diff-perl to build-deps
most modules seem optional while testing - this one is not.

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2023-03-13 21:13:45 +01:00
Stoiko Ivanov
5a982e3d26 buildsys: drop two configfiles we ship as templates
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2023-03-13 21:13:26 +01:00
Stoiko Ivanov
ae52237fd8 update SpamAssassin to 4.0.0
generated by make update-upstream

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2023-03-13 21:13:17 +01:00
Thomas Lamprecht
56cebc6b1a bump version to 3.4.6-5
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2022-11-28 16:14:48 +01:00
Stoiko Ivanov
a4a1174e51 buildsys: add lintian-overrides for national encoding
spamassassin rules do contain such data.

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2022-11-28 14:34:05 +01:00
Stoiko Ivanov
dab499ca48 update KAM.cf
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2022-11-28 13:49:57 +01:00
Stoiko Ivanov
dfdd1e0819 update SpamAssassin signatures
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2022-11-28 13:49:06 +01:00
Thomas Lamprecht
91f413819f buildsys: track debug package
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2021-11-26 13:18:21 +01:00