summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog7
-rw-r--r--debian/openssh-server.postinst8
-rwxr-xr-xdebian/rules3
3 files changed, 17 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 60f8d39a3..9e821ff25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
1openssh (1:6.5p1-2) UNRELEASED; urgency=medium
2
3 * Only enable ssh.service for systemd, not both ssh.service and
4 ssh.socket. Thanks to Michael Biebl for spotting this.
5
6 -- Colin Watson <cjwatson@debian.org> Tue, 11 Feb 2014 10:41:26 +0000
7
1openssh (1:6.5p1-1) unstable; urgency=medium 8openssh (1:6.5p1-1) unstable; urgency=medium
2 9
3 * New upstream release (http://www.openssh.com/txt/release-6.5, 10 * New upstream release (http://www.openssh.com/txt/release-6.5,
diff --git a/debian/openssh-server.postinst b/debian/openssh-server.postinst
index b35e227e7..72200604e 100644
--- a/debian/openssh-server.postinst
+++ b/debian/openssh-server.postinst
@@ -311,6 +311,14 @@ if [ "$action" = configure ]; then
311 # restart it under systemd. 311 # restart it under systemd.
312 start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/sshd.pid || true 312 start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/sshd.pid || true
313 fi 313 fi
314 if dpkg --compare-versions "$2" lt 1:6.5p1-2 && \
315 deb-systemd-helper debian-installed ssh.socket && \
316 deb-systemd-helper --quiet was-enabled ssh.service && \
317 deb-systemd-helper --quiet was-enabled ssh.socket; then
318 # 1:6.5p1-1 mistakenly left both ssh.service and ssh.socket
319 # enabled.
320 deb-systemd-helper disable ssh.socket >/dev/null || true
321 fi
314fi 322fi
315 323
316#DEBHELPER# 324#DEBHELPER#
diff --git a/debian/rules b/debian/rules
index c8870b3a4..0b63cbd48 100755
--- a/debian/rules
+++ b/debian/rules
@@ -191,7 +191,8 @@ override_dh_installdocs:
191 mkdir -p debian/openssh-server/usr/share/doc/openssh-client 191 mkdir -p debian/openssh-server/usr/share/doc/openssh-client
192 192
193override_dh_systemd_enable: 193override_dh_systemd_enable:
194 dh_systemd_enable --name ssh 194 dh_systemd_enable --name ssh ssh.service
195 dh_systemd_enable --name ssh --no-enable ssh.socket
195 196
196override_dh_installinit: 197override_dh_installinit:
197 dh_installinit -R --name ssh -- start 16 2 3 4 5 . 198 dh_installinit -R --name ssh -- start 16 2 3 4 5 .