update to 3.4.2, bump version to 3.4.2-1

[proxmox-spamassassin.git] / Makefile

diff --git a/Makefile b/Makefile
index 211a101eecafcff80457d10ed4eb257a9d0a40b0..f99dbcd84a1b45b8525257ac825db59334c02951 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,8 @@
-
-RELEASE=4.0
-
 # howto add rule updates:
 # edit paths ($srcdir) in changes.pl 
 # update changes.diff - verify changes!
 
-# dig  -t any 2.3.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
@@ -14,43 +11,50 @@ RELEASE=4.0
 # 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=2
-SAVER=3.4.0
+PKGREL=1
+SAVER=3.4.2
 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: 
-       -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
        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}
-       umount /proxmox/${RELEASE}; mount /proxmox/${RELEASE} -o rw 
-       mkdir -p /proxmox/${RELEASE}/extra
-       rm -rf /proxmox/${RELEASE}/extra/Packages*
-       rm -rf /proxmox/${RELEASE}/extra/proxmox-spamassassin_*.deb
-       cp ${DEB} /proxmox/${RELEASE}/extra
-       cd /proxmox/${RELEASE}/extra; dpkg-scanpackages . /dev/null > Packages; gzip -9c Packages > Packages.gz
-       umount /proxmox/${RELEASE}; mount /proxmox/${RELEASE} -o ro 
-
+       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
 
 .PHONY: clean
 clean: 
        rm -rf ${CLEANFILES}
+
+.PHONY: dinstall
+dinstall: ${DEB}
+       dpkg -i ${DEB}