X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=d8896cf429fc557707703103a93940150d107e96;hb=034839550cdbfdc208b7887fa7a39c330fc92365;hp=b949c9637238ca5735e4564d4b055d20188bd8a8;hpb=f497c68800e28aa4f4c63be10395a2878d4bd074;p=proxmox-spamassassin.git

diff --git a/Makefile b/Makefile
index b949c96..d8896cf 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 # edit paths ($srcdir) in changes.pl 
 # update changes.diff - verify changes!
 
-# dig  -t any 1.4.3.updates.spamassassin.org
+# dig  -t any 2.4.3.updates.spamassassin.org
 # wget http://spamassassin.kluge.net/updates/501214.tar.gz
 # wget http://spamassassin.kluge.net/updates/501214.tar.gz.asc
 # gpg --verify 501214.tar.gz.asc 501214.tar.gz
@@ -16,36 +16,50 @@
 #
 # edit debin/rules to apply updates
 
-PKGREL=52
-SAVER=3.4.1
+PKGREL=3
+SAVER=3.4.2
 OPKGNAME = Mail-SpamAssassin-${SAVER}
 NPKGNAME = proxmox-spamassassin_${SAVER}
 DEB = proxmox-spamassassin_${SAVER}-${PKGREL}_amd64.deb
 
+EXTRA_RULES = KAM.cf
+
+SA_UPDATE_GPG_DIR = .sa-update-gpghome
+
 #${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_UPDATE_GPG_DIR}/.prepared: ${OPKGNAME}.tar.gz
+	rm -rf ${SA_UPDATE_GPG_DIR}
+	mkdir --mode=0700 -p ${SA_UPDATE_GPG_DIR}
+	tar --strip-components 2 -xzf ${OPKGNAME}.tar.gz ${OPKGNAME}/rules/sa-update-pubkey.txt
+	sa-update --gpghomedir ${SA_UPDATE_GPG_DIR} --import sa-update-pubkey.txt
+	rm sa-update-pubkey.txt
+	touch $@
 
-sa-updates.tgz:
+sa-updates.tgz: | ${SA_UPDATE_GPG_DIR}/.prepared
 	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
+	sa-update --gpghomedir ${SA_UPDATE_GPG_DIR} --updatedir updates.tmp --channel updates.spamassassin.org
 	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_*	updates.tmp ${SA_UPDATE_GPG_DIR}
 
 .PHONY: clean
 clean: