summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
-rw-r--r--debian/openssh-server.postinst13
-rwxr-xr-xdebian/rules2
3 files changed, 3 insertions, 14 deletions
diff --git a/debian/changelog b/debian/changelog
index eb335d68f..6523de8a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ openssh (1:6.5p1-4) UNRELEASED; urgency=medium
5 * Amend "Running sshd from inittab" instructions in README.Debian to 5 * Amend "Running sshd from inittab" instructions in README.Debian to
6 recommend 'update-rc.d ssh disable', rather than manual removal of rc*.d 6 recommend 'update-rc.d ssh disable', rather than manual removal of rc*.d
7 symlinks that won't work with dependency-based sysv-rc. 7 symlinks that won't work with dependency-based sysv-rc.
8 * Remove code related to non-dependency-based sysv-rc ordering, since that
9 is no longer supported.
8 10
9 -- Colin Watson <cjwatson@debian.org> Thu, 13 Feb 2014 10:53:22 +0000 11 -- Colin Watson <cjwatson@debian.org> Thu, 13 Feb 2014 10:53:22 +0000
10 12
diff --git a/debian/openssh-server.postinst b/debian/openssh-server.postinst
index d4c1a4ddf..0189f5fbb 100644
--- a/debian/openssh-server.postinst
+++ b/debian/openssh-server.postinst
@@ -272,24 +272,11 @@ setup_sshd_user() {
272 fi 272 fi
273} 273}
274 274
275remove_old_init_links() {
276 # Yes, this only works with the SysV init script layout. I know.
277 # The important thing is that it doesn't actually *break* with
278 # file-rc ...
279 if [ -e /etc/rc2.d/S20ssh ]; then
280 update-rc.d -f ssh remove >/dev/null 2>&1
281 fi
282 rm -f /etc/rc0.d/K??ssh /etc/rc1.d/K??ssh /etc/rc6.d/K??ssh
283}
284
285if [ "$action" = configure ]; then 275if [ "$action" = configure ]; then
286 create_sshdconfig 276 create_sshdconfig
287 create_keys 277 create_keys
288 fix_statoverride 278 fix_statoverride
289 setup_sshd_user 279 setup_sshd_user
290 if dpkg --compare-versions "$2" lt 1:5.2p1-1; then
291 remove_old_init_links
292 fi
293 # Renamed to /etc/ssh/moduli in 2.9.9 (!) 280 # Renamed to /etc/ssh/moduli in 2.9.9 (!)
294 if dpkg --compare-versions "$2" lt 1:4.7p1-1; then 281 if dpkg --compare-versions "$2" lt 1:4.7p1-1; then
295 rm -f /etc/ssh/primes 282 rm -f /etc/ssh/primes
diff --git a/debian/rules b/debian/rules
index 888921670..f57ebaa80 100755
--- a/debian/rules
+++ b/debian/rules
@@ -200,7 +200,7 @@ override_dh_systemd_enable:
200 dh_systemd_enable -popenssh-server --name ssh --no-enable ssh.socket 200 dh_systemd_enable -popenssh-server --name ssh --no-enable ssh.socket
201 201
202override_dh_installinit: 202override_dh_installinit:
203 dh_installinit -R --name ssh -- start 16 2 3 4 5 . 203 dh_installinit -R --name ssh
204 204
205override_dh_installpam: 205override_dh_installpam:
206 dh_installpam --name sshd 206 dh_installpam --name sshd