update ruleset, include KAM.cf

diff --git a/Makefile b/Makefile
index e4948ff01b11bb412462714abe683d4ad0fda817..1d0382507874b090ad7739fbb9a44dd08bf2a70d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,9 @@
 # warning: start with an empty sa-updates.tgz, install the package,
 # the run sa-update to generate the updates
 #
+# Note: we also add KAM.cf from
+# http://www.pccc.com/downloads/SpamAssassin/contrib/KAM.cf
+#
 # edit debin/rules to apply updates
 
 PKGREL=51
@@ -30,8 +33,11 @@ ${DEB}: ${OPKGNAME}.tar.gz sa-updates.tgz
        lintian ${DEB}
 
 
-sa-updates.tgz: 
-       -sa-update --updatedir updates.tmp --channel updates.spamassassin.org
+sa-updates.tgz:
+       rm -rf updates.tmp
+       sa-update --updatedir updates.tmp --channel updates.spamassassin.org
+       wget http://www.pccc.com/downloads/SpamAssassin/contrib/KAM.cf -O updates.tmp/KAM.cf
+       mv updates.tmp/KAM.cf updates.tmp/updates_spamassassin_org/ # atomic update
        tar cvzf sa-updates.tgz --exclude=local.cf --exclude=regression_tests.cf --exclude=*.txt  --exclude=MIRRORED.BY -C updates.tmp/updates_spamassassin_org/ .
 
 .PHONY: upload

diff --git a/sa-updates.tgz b/sa-updates.tgz
index 961a3bbda7acb977fdc07e98ba32d604ef9651bb..10e5eedff95f834699fd1a2f9667828efaf6c0f6 100644 (file)
Binary files a/sa-updates.tgz and b/sa-updates.tgz differ