bump version to 4.0.0-5

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

update KAM ruleset

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

update SpamAssassin signatures

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

bump version to 4.0.0-4

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

update KAM ruleset

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

update SpamAssassin signatures

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

buildsys: expand clean target

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

bump version to 4.0.0-3

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

buildsys: expand clean target

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

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>

buildsys: use more telling BUILDDIR variable name

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

buildsys: factor out package name into variable

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

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>

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>

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>

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>

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>

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>

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>

buildsys: use simple parenthesis for variables

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

d/patches: drop unused patches

with commit 426b8f0a33327cafbb4597ad9c8343b4aa890ed5 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
d27e5c832e0188a71b2d416de95e19b348072755

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>

bump version to 4.0.0-2

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

drop obsolete KAM.cf

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

kam-update: add complete KAM ruleset

generated by `make update-kam`

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

buildsys: update outdated docs on updating rulesets

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

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>

update SpamAssassin signatures

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

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>