]> git.proxmox.com Git - proxmox-spamassassin.git/commitdiff
do not ship config-files rendered from templates
authorStoiko Ivanov <s.ivanov@proxmox.com>
Mon, 20 Jan 2020 18:37:27 +0000 (19:37 +0100)
committerThomas Lamprecht <t.lamprecht@proxmox.com>
Tue, 21 Jan 2020 08:25:22 +0000 (09:25 +0100)
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>
debian/rules

index 9f8bb83cb7fab4ab28ffcd298f370282b2182cbb..24da61b1642d0347b839b873d0bd14dcee92a6c1 100755 (executable)
@@ -63,6 +63,11 @@ install-stamp:
        # rm example local.cf
        rm $(TMP)/etc/mail/spamassassin/local.cf
 
+       # rm config files rendered by PMG templates
+       rm $(TMP)/etc/mail/spamassassin/init.pre
+       rm $(TMP)/etc/mail/spamassassin/v310.pre
+       rm $(TMP)/etc/mail/spamassassin/v320.pre
+
        # apply rule updates
        tar xzvf ../sa-updates.tgz -C $(TMP)/usr/share/spamassassin/
        #patch -d $(TMP)/usr/share/spamassassin <../72_active.cf.diff