install KAM.cf to /usr/share/spamassassin-extra/

diff --git a/Makefile b/Makefile
index b949c9637238ca5735e4564d4b055d20188bd8a8..7ad9521dde940a61b22faae8dede36a6e27e4c8b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -22,30 +22,34 @@ OPKGNAME = Mail-SpamAssassin-${SAVER}
 NPKGNAME = proxmox-spamassassin_${SAVER}
 DEB = proxmox-spamassassin_${SAVER}-${PKGREL}_amd64.deb
 
+EXTRA_RULES = KAM.cf
+
 #${DEB}: ${OPKGNAME}.tar.gz
-${DEB}: ${OPKGNAME}.tar.gz sa-updates.tgz
+${DEB}: ${OPKGNAME}.tar.gz sa-updates.tgz ${EXTRA_RULES}
        -rm -rf ${OPKGNAME} ${NPKGNAME}
        tar xzf ${OPKGNAME}.tar.gz
        mv ${OPKGNAME} ${NPKGNAME}
        cp -a debian ${NPKGNAME}
+       mkdir ${NPKGNAME}/extra_rules
+       cp ${EXTRA_RULES} ${NPKGNAME}/extra_rules
        cd ${NPKGNAME}; dpkg-buildpackage -us -uc -rfakeroot
        -rm -rf ${OPKGNAME} ${NPKGNAME}
        lintian ${DEB}
 
+KAM.cf:
+       wget http://www.pccc.com/downloads/SpamAssassin/contrib/KAM.cf -O $@.tmp
+       mv KAM.cf.tmp $@
 
 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
 upload: ${DEB}
        tar cf - ${DEB} | ssh -X repoman@repo.proxmox.com -- upload --product pmg --dist stretch
 
-CLEANFILES = *~ debian/*~ *.deb proxmox-spamassassin_*         \
-       updates.tmp
+CLEANFILES = *~ debian/*~ *.deb proxmox-spamassassin_* KAM.cf updates.tmp
 
 .PHONY: clean
 clean: 

diff --git a/debian/rules b/debian/rules
index ced12c8bc7830bffa6c94d9061c43c5a695a3871..9f8bb83cb7fab4ab28ffcd298f370282b2182cbb 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -67,6 +67,10 @@ install-stamp:
        tar xzvf ../sa-updates.tgz -C $(TMP)/usr/share/spamassassin/
        #patch -d $(TMP)/usr/share/spamassassin <../72_active.cf.diff
 
+       # install extra rules
+       mkdir $(TMP)/usr/share/spamassassin-extra/
+       install -m 0644 extra_rules/KAM.cf $(TMP)/usr/share/spamassassin-extra/
+
        # As this is a architecture dependent package, we are not
        # supposed to install stuff to /usr/share. MakeMaker creates
        # the dirs, we delete them from the deb:

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