bump version to 4.0.0-1

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

d/control: record breaks agains older pmg-api

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

packaging: run wrap-and-sort -tkn

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

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>

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>

buildsys: drop two configfiles we ship as templates

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

update SpamAssassin to 4.0.0

generated by make update-upstream

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

bump version to 3.4.6-5

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

buildsys: add lintian-overrides for national encoding

spamassassin rules do contain such data.

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

update KAM.cf

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

update SpamAssassin signatures

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

buildsys: track debug package

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

buildsys: upload to bullseye

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

bump to version 3.4.6-4

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

update KAM.cf

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

update SpamAssassin signatures

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

bump version to 3.4.6-3

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

update KAM.cf

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

update SpamAssassin signatures

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

bump version to 3.4.6-2+1

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

bump version to 3.4.6-1

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

update KAM.cf

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

update SpamAssassin signatures

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

update SpamAssassin to 3.4.6

contains 2 fixes:
- Fixed URIDNSBL not triggering meta rules
- Fix false positive in T_KAM_HTML_FONT_INVALID on CSS color !important

buildsys: add distclean target

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

buildsys: avoid automatic redownloading

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

bump version to 3.4.5-1

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

update KAM.cf

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

update SpamAssassin signatures

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

update spamassassin to 3.4.5

contains fixes for:
    * CVE-2020-1946

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

buildsys: drop upstream tarball and add extracted sources

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

buildsys: track SA rules in directory instead of tarball

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

buildsys: track upstream in directory instead of tarball

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

bump version to 3.4.4-4

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

add configuration file for KAM SA channel

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

update SpamAssassin signatures

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

update KAM.cf

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

bump version to 3.4.4-3

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

update KAM.cf

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

update SpamAssassin signatures

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

bump version to 3.4.4-2

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

update KAM.cf

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

update SpamAssassin signatures

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

bump version to 3.4.4-1

update SpamAssassin signatures

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

update KAM.cf

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

use https to download KAM.cf

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

update spamassassin to 3.4.4

contains fixes for:
* CVE-2020-1931
* CVE-2020-1930

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

Add download target for SA sources

add a convenience target to download the current SA tarball and corresponding
gpg-signature and verify it with SpamAssassin's release key [0].

[0] https://www.apache.org/dist/spamassassin/KEYS

d/control: add missing build-depends

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>

build: add -d to dsc target

we don't need any of the build-dependencies to generate a source package

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>

d/control: bump Standards-Version to 4.3.0

lintian warning ancient-standards-version

changed after skimming through the upgrading checklist [0].

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
[0] https://www.debian.org/doc/debian-policy/upgrading-checklist.html

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

buildsys: remove unused patches.

lintian warning patch-file-present-but-not-mentioned-in-series

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

d/control: drop depends on zlib

it gets substituted via ${shlibs:Depends}

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

buildsys: fix lintian warnings

This fixes 2 warnings shown when checking the source-package with
lintian:
* package-depends-on-hardcoded-libc
* debhelper-but-no-misc-depends

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

buildsys: add explicit dsc target

and check the .dsc with lintian

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

buildsys: raise debian/compat to 12

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

buildsys: use debhelper for building

this additionally creates a complete source package

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

buildsys: call 'make test' in build target

the build target gets invoked as regular user without 'fakeroot'. Running
SpamAssassin's tests as root (or via fakeroot) leads to a
non-deterministically failing testcase ('t/spamc_optC.t') - I couldn't find
the root-cause, but running the tests as regular user did work consistently.

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

do not ship config-files rendered from templates

while upgrading spamassassin from 3.4.2 to 3.4.3 users were initially asked
to confirm a changed '/etc/mail/spamassassin/init.pre', due to the differences
between the file in the shipped new upstream and the version rendered by the
templateing system of pmg.
This was mitigated by c0e5b8043c8ff69bc909f8b7ae128f9b5ed27e47.

Not shipping the files in the first place removes the need to adapt changed
upstream files to old versions, which get replaced by the templating system
anyways

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

bump version to 3.4.3-1

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

avoid pkg change of PMG controlled init.pre config file

as apt ask the user about the change, but we rewrite it anyway, as
it's effectively under direct PMG control.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

bump version to 3.4.3-1

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

update KAM.cf

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

update SpamAssassin signatures

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

update spamassassin to 3.4.3

drop already applied patch bug_7577_freemail_plugin

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

bump version to 3.4.2-13

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

update KAM.cf

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

update SpamAssassin signatures

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

bump version to 3.4.2-12

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

d/control: add recommends to gpg

people normally want gpg verified updates, and PMG actually relies on
it. While pmg can install it in it's own environments (ISO, CT
appliance) directly a recommendation should be still added, if only
fo those installing on top of plain Debian.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

fixup: remove one additional space to match upstream commit

https://pve.proxmox.com/pipermail/pmg-devel/2019-September/000554.html

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
Reported-by: Stoiko Ivanov <s.ivanov@proxmox.com>

fix #2359: backport bufix for SpamAssassin bug 7577

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
Reviewed-By: Stoiko Ivanov <s.ivanov@proxmox.com>
Tested-By: Stoiko Ivanov <s.ivanov@proxmox.com>

fix makefile comment to new line

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

bump version to 3.4.2-11

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

update KAM.cf

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

update SpamAssassin signatures

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

bump version to 3.4.2-10

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

d/control: use defined ${perl:Depends} and ${shlibs:Depends}

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

d/control: bump to 10

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

buildsys: switch upload dist over to buster

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

buildsys: fix bootstrap issue with sa-updates

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

buildsys: add deb target for consistency with other packages

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

d/control: record quilt build dependency

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

d/control: run wrap-and-sort -tkn

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

bump version to 3.4.2-3

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

pull and create current sa-updates.tgz

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

buildsys: only update sa-updates explicitly

Adding a dependency to ${SA_UPDATE_GPG_DIR}/.prepared caused make to
run the sa-updates.tgz recipe unless you had a ${SA_UPDATE_GPG_DIR} from
a previous run.

Since updating the spamassassin rules shipped with the package should probably
be only updated explicitly changing the dependency to an order-only one, stops
the extra sa-update buildstep.

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

buildsys: import sa-update key from tarball

`make sa-updates.tgz` runs sa-update with a temporary directory and packs the
gathered rules into a tarball, which gets extracted during dpkg-buildpackage.

This patch creates a gpg-homedir and imports the sa-update-key distributed with
the upstream tarball, and changes the call to sa-update to use this directory
instead of the default '/etc/mail/spamassassin/sa-update-keys'.
In addition to being a bit more self-contained this also enables running
`make sa-updates.tgz` without being root.

The temporary gpg-homedir is added to '.gitignore'

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

update KAM.cf

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

remove old 3.4.1 source tar ball

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

add missing source

bump version to 3.4.2-2

update ruleset

KAM.cf: update to latest version

update to 3.4.2, bump version to 3.4.2-1

bump version to 3.4.1-55

update KAM.cf

update sa rules

bump version to 3.4.1-54