Package: openssh-server Version: 1:6.7p1-5 Severity: minor Tags: patch User: [email protected] Usertags: origin-ubuntu ubuntu-patch vivid
Hello, In https://launchpad.net/bugs/1440070 it was reported that openssh-server prints a confusing error message on installation if upstart is installed, but not the active init system: initctl: Unable to connect to Upstart: Failed to connect to socket /com/ubuntu/upstart: Connection refused The attached patch fixes that, and also fixes the version comparisons for the other upgrade adjustments. Thanks for considering, Martin -- Martin Pitt | http://www.piware.de Ubuntu Developer (www.ubuntu.com) | Debian Developer (www.debian.org)
diff -Nru openssh-6.7p1/debian/changelog openssh-6.7p1/debian/changelog --- openssh-6.7p1/debian/changelog 2015-03-23 00:20:57.000000000 +0100 +++ openssh-6.7p1/debian/changelog 2015-04-09 09:22:55.000000000 +0200 @@ -1,3 +1,13 @@ +openssh (1:6.7p1-5ubuntu1) vivid; urgency=medium + + * openssh-server.postinst: Quiesce "Unable to connect to Upstart" error + message from initctl if upstart is installed, but not the current init + system. (LP: #1440070) + * openssh-server.postinst: Fix version comparisons of upgrade adjustments to + not apply to fresh installs. + + -- Martin Pitt <[email protected]> Thu, 09 Apr 2015 09:20:36 +0200 + openssh (1:6.7p1-5) unstable; urgency=medium * Revert change from previous upload, which causes far more trouble than diff -Nru openssh-6.7p1/debian/openssh-server.postinst openssh-6.7p1/debian/openssh-server.postinst --- openssh-6.7p1/debian/openssh-server.postinst 2015-03-23 00:09:05.000000000 +0100 +++ openssh-6.7p1/debian/openssh-server.postinst 2015-04-09 09:20:02.000000000 +0200 @@ -282,20 +282,20 @@ fix_statoverride setup_sshd_user # Renamed to /etc/ssh/moduli in 2.9.9 (!) - if dpkg --compare-versions "$2" lt 1:4.7p1-1; then + if dpkg --compare-versions "$2" lt-nl 1:4.7p1-1; then rm -f /etc/ssh/primes fi - if dpkg --compare-versions "$2" lt 1:5.5p1-6; then + if dpkg --compare-versions "$2" lt-nl 1:5.5p1-6; then rm -f /var/run/sshd/.placeholder fi - if dpkg --compare-versions "$2" lt 1:6.2p2-3 && \ - which initctl >/dev/null && initctl version | grep -q upstart && \ + if dpkg --compare-versions "$2" lt-nl 1:6.2p2-3 && \ + which initctl >/dev/null && initctl version 2>/dev/null | grep -q upstart && \ ! status ssh 2>/dev/null | grep -q ' start/'; then # We must stop the sysvinit-controlled sshd before we can # restart it under Upstart. start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/sshd.pid || true fi - if dpkg --compare-versions "$2" lt 1:6.5p1-2 && \ + if dpkg --compare-versions "$2" lt-nl 1:6.5p1-2 && \ deb-systemd-helper debian-installed ssh.socket && \ deb-systemd-helper --quiet was-enabled ssh.service && \ deb-systemd-helper --quiet was-enabled ssh.socket; then @@ -303,7 +303,7 @@ # enabled. deb-systemd-helper disable ssh.socket >/dev/null || true fi - if dpkg --compare-versions "$2" lt 1:6.5p1-3 && \ + if dpkg --compare-versions "$2" lt-nl 1:6.5p1-3 && \ [ -d /run/systemd/system ]; then # We must stop the sysvinit-controlled sshd before we can # restart it under systemd.
signature.asc
Description: Digital signature
