summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog4
-rw-r--r--debian/openssh-client.maintscript1
-rw-r--r--debian/openssh-server.postinst10
3 files changed, 15 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 75d338a73..9545f9606 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
1openssh (1:7.9p1-8) UNRELEASED; urgency=medium 1openssh (1:7.9p1-8) UNRELEASED; urgency=medium
2 2
3 [ Colin Watson ]
3 * Apply upstream patch to fix bug in HostbasedAcceptedKeyTypes and 4 * Apply upstream patch to fix bug in HostbasedAcceptedKeyTypes and
4 PubkeyAcceptedKeyTypes options in the case where only RSA-SHA2 signature 5 PubkeyAcceptedKeyTypes options in the case where only RSA-SHA2 signature
5 types were specified. 6 types were specified.
@@ -7,6 +8,9 @@ openssh (1:7.9p1-8) UNRELEASED; urgency=medium
7 rsa-sha2-{256|512}-cert-v01@openssh.com cert algorithms (closes: 8 rsa-sha2-{256|512}-cert-v01@openssh.com cert algorithms (closes:
8 #923419). 9 #923419).
9 10
11 [ Dominik George ]
12 * Correctly handle conffile move to openssh-server (closes: #919344).
13
10 -- Colin Watson <cjwatson@debian.org> Thu, 28 Feb 2019 10:33:32 +0000 14 -- Colin Watson <cjwatson@debian.org> Thu, 28 Feb 2019 10:33:32 +0000
11 15
12openssh (1:7.9p1-7) unstable; urgency=medium 16openssh (1:7.9p1-7) unstable; urgency=medium
diff --git a/debian/openssh-client.maintscript b/debian/openssh-client.maintscript
new file mode 100644
index 000000000..e39db9ac5
--- /dev/null
+++ b/debian/openssh-client.maintscript
@@ -0,0 +1 @@
rm_conffile /etc/ssh/moduli 1:7.9p1-8~
diff --git a/debian/openssh-server.postinst b/debian/openssh-server.postinst
index ae273e9c8..552b0744e 100644
--- a/debian/openssh-server.postinst
+++ b/debian/openssh-server.postinst
@@ -148,6 +148,16 @@ if [ "$action" = configure ]; then
148 # restart it under systemd. 148 # restart it under systemd.
149 start-stop-daemon --stop --quiet --oknodo --pidfile /run/sshd.pid --exec /usr/sbin/sshd || true 149 start-stop-daemon --stop --quiet --oknodo --pidfile /run/sshd.pid --exec /usr/sbin/sshd || true
150 fi 150 fi
151 if dpkg --compare-versions "$2" lt-nl 1:7.9p1-5 && \
152 [ -f /etc/ssh/moduli.dpkg-bak ]; then
153 # Handle /etc/ssh/moduli being moved from openssh-client to
154 # openssh-server. If there were no user modifications, then we
155 # don't need to do anything special here; but if there were,
156 # then the dpkg-maintscript-helper calls from openssh-client's
157 # maintainer scripts will have saved the old file as .dpkg-bak,
158 # which we now move back into place.
159 mv /etc/ssh/moduli.dpkg-bak /etc/ssh/moduli
160 fi
151fi 161fi
152 162
153#DEBHELPER# 163#DEBHELPER#