Bug#854860: postfix: dynamicmaps.cf is NOT converted from Postfix 2.9 format

[SATOH Fumiyasu]

Not 2.9, but 2.X. Sorry.

Bug#854860: postfix: dynamicmaps.cf is NOT converted from Postfix 2.9 format

[SATOH Fumiyasu]

I'm sorry for the previous bad patch.

Corrected. (Remove the suffix '.1.0.1' from the module names)

From 798fe18329d63a8a163a90948ccbdc77161d43bd Mon Sep 17 00:00:00 2001
From: SATOH Fumiyasu 
Date: Sat, 11 Feb 2017 19:16:17 +0900
Subject: [PATCH] Convert intalled dynamicmaps.cf

Fix a regression in the commit 629c47c61d22fd9a9825159ff403d2a9043ce676
---
 debian/postfix.postinst | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/debian/postfix.postinst b/debian/postfix.postinst
index b413a50e..d2f4b055 100644
--- a/debian/postfix.postinst
+++ b/debian/postfix.postinst
@@ -293,6 +293,12 @@ if [ ! -f dynamicmaps.cf ]; then
fi
 done < /usr/share/postfix/dynamicmaps.cf > dynamicmaps.cf
 chmod 644 dynamicmaps.cf
+else
+if [ -f /var/spool/postfix/dynamicmaps_3.0_transition ]; then
+   echo "Updating dynamicmaps.cf"
+   sed -i '/^tcp[[:space:]]/d; 
s/\/usr\/lib\/postfix\/dict_\([a-z]*\).so/postfix-\1.so/' dynamicmaps.cf
+   rm -f /var/spool/postfix/dynamicmaps_3.0_transition
+fi
 fi
 
 # Remove from postfix postinst after stretch and uncomment in 
postfix-sqlite.postinst
-- 
2.11.0

-- 
-- Name: SATOH Fumiyasu @ OSS Technology Corp. (fumiyas @ osstech co jp)
-- Business Home: http://www.OSSTech.co.jp/
-- GitHub Home: https://GitHub.com/fumiyas/
-- PGP Fingerprint: BBE1 A1C9 525A 292E 6729  CDEC ADC2 9DCA 5E1C CBCA

Bug#854860: postfix: dynamicmaps.cf is NOT converted from Postfix 2.9 format

[SATOH Fumiyasu]

Package: postfix
Version: 3.1.3-3
Severity: important

The postfix.postinst script in postfix-3.1.3-3 and later
does NOT convert an old dynamicmaps.cf file because
the commit 629c47c61d22fd9a9825159ff403d2a9043ce676
drops the conversion script.

Please see the following patch. Thank you.

From 98e3e0130ab093cb4340aadf8c7f36fe55fb28a7 Mon Sep 17 00:00:00 2001
From: SATOH Fumiyasu 
Date: Sat, 11 Feb 2017 19:16:17 +0900
Subject: [PATCH] Convert intalled dynamicmaps.cf

Fix a regression in the commit 629c47c61d22fd9a9825159ff403d2a9043ce676
---
 debian/postfix.postinst | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/debian/postfix.postinst b/debian/postfix.postinst
index b413a50e..004a26ae 100644
--- a/debian/postfix.postinst
+++ b/debian/postfix.postinst
@@ -293,6 +293,12 @@ if [ ! -f dynamicmaps.cf ]; then
fi
 done < /usr/share/postfix/dynamicmaps.cf > dynamicmaps.cf
 chmod 644 dynamicmaps.cf
+else
+if [ -f /var/spool/postfix/dynamicmaps_3.0_transition ]; then
+   echo "Updating dynamicmaps.cf"
+   sed -i '/^tcp[[:space:]]/d; 
s/\/usr\/lib\/postfix\/dict_\([a-z]*\).so/postfix-\1.so.1.0.1/' dynamicmaps.cf
+   rm -f /var/spool/postfix/dynamicmaps_3.0_transition
+fi
 fi
 
 # Remove from postfix postinst after stretch and uncomment in 
postfix-sqlite.postinst
-- 
2.11.0

-- 
-- Name: SATOH Fumiyasu @ OSS Technology Corp. (fumiyas @ osstech co jp)
-- Business Home: http://www.OSSTech.co.jp/
-- GitHub Home: https://GitHub.com/fumiyas/
-- PGP Fingerprint: BBE1 A1C9 525A 292E 6729  CDEC ADC2 9DCA 5E1C CBCA