* Merge 1:5.5p1-6.

3 files changed, 19 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index 87da21257..b499cde66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ openssh (1:5.6p1-3) UNRELEASED; urgency=low
 
   * Drop override for desktop-file-but-no-dh_desktop-call, which Lintian no
     longer issues.
+  * Merge 1:5.5p1-6.
 
  -- Colin Watson <cjwatson@debian.org>  Tue, 02 Nov 2010 23:00:07 +0000
 
@@ -29,6 +30,15 @@ openssh (1:5.6p1-1) experimental; urgency=low
 
  -- Colin Watson <cjwatson@debian.org>  Tue, 24 Aug 2010 00:37:54 +0100
 
+openssh (1:5.5p1-6) unstable; urgency=low
+
+  * Touch /var/run/sshd/.placeholder in the preinst so that /var/run/sshd,
+    which is intentionally no longer shipped in the openssh-server package
+    due to /var/run often being a temporary directory, is not removed on
+    upgrade (closes: #575582).
+
+ -- Colin Watson <cjwatson@debian.org>  Sun, 26 Dec 2010 18:09:29 +0000
+
 openssh (1:5.5p1-5) unstable; urgency=low
 
   * Use an architecture wildcard for libselinux1-dev (closes: #591740).
diff --git a/debian/openssh-server.postinst b/debian/openssh-server.postinst
index 325af4ef4..4ed956454 100644
--- a/debian/openssh-server.postinst
+++ b/debian/openssh-server.postinst
@@ -473,6 +473,9 @@ commit_mv_conffile /etc/pam.d/ssh /etc/pam.d/sshd
 if dpkg --compare-versions "$2" lt 1:4.7p1-1; then
     rm -f /etc/ssh/primes
 fi
+if dpkg --compare-versions "$2" lt 1:5.5p1-6; then
+    rm -f /var/run/sshd/.placeholder
+fi
 
 
 db_stop
diff --git a/debian/openssh-server.preinst b/debian/openssh-server.preinst
index 43c4b57f9..510070645 100644
--- a/debian/openssh-server.preinst
+++ b/debian/openssh-server.preinst
@@ -134,6 +134,12 @@ EOF
   if dpkg --compare-versions "$version" lt 1:4.7p1-4; then
     prepare_mv_conffile /etc/pam.d/ssh
   fi
+
+  if dpkg --compare-versions "$version" lt 1:5.5p1-6 && \
+     [ -d /var/run/sshd ]; then
+    # make sure /var/run/sshd is not removed on upgrades
+    touch /var/run/sshd/.placeholder
+  fi
 fi
 
 #DEBHELPER#