* Use dpkg-query to fetch conffile md5sums rather than parsing

  /var/lib/dpkg/status directly.

3 files changed, 8 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index 8ed60f77e..69b408900 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ openssh (1:4.3p2-11) UNRELEASED; urgency=low
     maintainer, so the Maintainer field is getting a bit inaccurate. Set
     Maintainer to debian-ssh@lists.debian.org and leave Matthew and myself
     as Uploaders.
+  * Use dpkg-query to fetch conffile md5sums rather than parsing
+    /var/lib/dpkg/status directly.
   * Apply results of debconf templates and package descriptions review by
     debian-l10n-english (closes: #420107).
   * debconf template translations:
diff --git a/debian/openssh-client.preinst b/debian/openssh-client.preinst
index 9cf29dfba..fd55a53bd 100644
--- a/debian/openssh-client.preinst
+++ b/debian/openssh-client.preinst
@@ -11,10 +11,11 @@ prepare_transfer_conffile () {
         CONFFILE="$1"
         TEXT="$2"
         MODE="$3"
+        [ "$CONFFILES" ] || return 0
         [ -e "$CONFFILE" ] || return 0
 
         md5sum="$(md5sum "$CONFFILE" |sed -e 's/ .*//')"
-        old_md5sum="$(sed -n -e "/^Conffiles:/,/^[^ ]/{\\' $CONFFILE'{s/^ [^ ]* //;s/ .*//;p}}" /var/lib/dpkg/status)"
+        old_md5sum="$(echo "$CONFFILES" | awk '$1 == "'"$CONFFILE"'" { print $2 }')"
         if [ "$md5sum" = "$old_md5sum" ]; then
                 echo >&2 "Transferring ownership of conffile $CONFFILE ..."
                 # We have to write out the desired new text of the conffile,
@@ -36,6 +37,7 @@ prepare_transfer_conffile () {
 case $action in
         install|upgrade)
                 if dpkg --compare-versions "$version" lt 0; then
+                        CONFFILES="$(dpkg-query -W -f '${Conffiles}\n' ssh | sed 's/^ *//')"
                         prepare_transfer_conffile /etc/ssh/moduli "$ETC_SSH_MODULI" 0644
                         prepare_transfer_conffile /etc/ssh/ssh_config "$ETC_SSH_SSH_CONFIG" 0644
                 fi
diff --git a/debian/openssh-server.preinst b/debian/openssh-server.preinst
index 2c2e2687c..866cf8b1a 100644
--- a/debian/openssh-server.preinst
+++ b/debian/openssh-server.preinst
@@ -13,10 +13,11 @@ prepare_transfer_conffile () {
         CONFFILE="$1"
         TEXT="$2"
         MODE="$3"
+        [ "$CONFFILES" ] || return 0
         [ -e "$CONFFILE" ] || return 0
 
         md5sum="$(md5sum "$CONFFILE" |sed -e 's/ .*//')"
-        old_md5sum="$(sed -n -e "/^Conffiles:/,/^[^ ]/{\\' $CONFFILE'{s/^ [^ ]* //;s/ .*//;p}}" /var/lib/dpkg/status)"
+        old_md5sum="$(echo "$CONFFILES" | awk '$1 == "'"$CONFFILE"'" { print $2 }')"
         if [ "$md5sum" = "$old_md5sum" ]; then
                 echo >&2 "Transferring ownership of conffile $CONFFILE ..."
                 # We have to write out the desired new text of the conffile,
@@ -111,6 +112,7 @@ EOF
   fi
 
   if dpkg --compare-versions "$version" lt 0; then
+    CONFFILES="$(dpkg-query -W -f '${Conffiles}\n' ssh | sed 's/^ *//')"
     prepare_transfer_conffile /etc/default/ssh "$ETC_DEFAULT_SSH" 0644
     prepare_transfer_conffile /etc/init.d/ssh "$ETC_INIT_D_SSH" 0755
     prepare_transfer_conffile /etc/pam.d/ssh "$ETC_PAM_D_SSH" 0644