summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
-rw-r--r--debian/openssh-client.preinst2
-rw-r--r--debian/openssh-server.preinst2
3 files changed, 4 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index b75c994d3..dfbb49f05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ openssh (1:4.6p1-6) UNRELEASED; urgency=low
5 versions of debconf. 5 versions of debconf.
6 * Install authorized_keys(5) as a symlink to sshd(8) (thanks, Tomas 6 * Install authorized_keys(5) as a symlink to sshd(8) (thanks, Tomas
7 Pospisek; closes: #441817). 7 Pospisek; closes: #441817).
8 * Discard error output from dpkg-query in preinsts, in case the ssh
9 metapackage is not installed.
8 * debconf template translations: 10 * debconf template translations:
9 - Add Slovak (thanks, Ivan Masár; closes: #441690). 11 - Add Slovak (thanks, Ivan Masár; closes: #441690).
10 12
diff --git a/debian/openssh-client.preinst b/debian/openssh-client.preinst
index fd55a53bd..0b29c051d 100644
--- a/debian/openssh-client.preinst
+++ b/debian/openssh-client.preinst
@@ -37,7 +37,7 @@ prepare_transfer_conffile () {
37case $action in 37case $action in
38 install|upgrade) 38 install|upgrade)
39 if dpkg --compare-versions "$version" lt 0; then 39 if dpkg --compare-versions "$version" lt 0; then
40 CONFFILES="$(dpkg-query -W -f '${Conffiles}\n' ssh | sed 's/^ *//')" 40 CONFFILES="$(dpkg-query -W -f '${Conffiles}\n' ssh 2>/dev/null | sed 's/^ *//')"
41 prepare_transfer_conffile /etc/ssh/moduli "$ETC_SSH_MODULI" 0644 41 prepare_transfer_conffile /etc/ssh/moduli "$ETC_SSH_MODULI" 0644
42 prepare_transfer_conffile /etc/ssh/ssh_config "$ETC_SSH_SSH_CONFIG" 0644 42 prepare_transfer_conffile /etc/ssh/ssh_config "$ETC_SSH_SSH_CONFIG" 0644
43 fi 43 fi
diff --git a/debian/openssh-server.preinst b/debian/openssh-server.preinst
index 866cf8b1a..87871bdaa 100644
--- a/debian/openssh-server.preinst
+++ b/debian/openssh-server.preinst
@@ -112,7 +112,7 @@ EOF
112 fi 112 fi
113 113
114 if dpkg --compare-versions "$version" lt 0; then 114 if dpkg --compare-versions "$version" lt 0; then
115 CONFFILES="$(dpkg-query -W -f '${Conffiles}\n' ssh | sed 's/^ *//')" 115 CONFFILES="$(dpkg-query -W -f '${Conffiles}\n' ssh 2>/dev/null | sed 's/^ *//')"
116 prepare_transfer_conffile /etc/default/ssh "$ETC_DEFAULT_SSH" 0644 116 prepare_transfer_conffile /etc/default/ssh "$ETC_DEFAULT_SSH" 0644
117 prepare_transfer_conffile /etc/init.d/ssh "$ETC_INIT_D_SSH" 0755 117 prepare_transfer_conffile /etc/init.d/ssh "$ETC_INIT_D_SSH" 0755
118 prepare_transfer_conffile /etc/pam.d/ssh "$ETC_PAM_D_SSH" 0644 118 prepare_transfer_conffile /etc/pam.d/ssh "$ETC_PAM_D_SSH" 0644