summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2010-12-30 11:41:09 +0000
committerColin Watson <cjwatson@debian.org>2010-12-30 11:41:09 +0000
commit3e361f96a730f828be7e9b29a778e09350b24c49 (patch)
tree2a02a090ad71825343b1ef44c6d03785f2c98db3
parent0b38b9f476db96ecb1ca31da9b8e212f551076bb (diff)
parentecdff7d91e9aa853a0fbdb746a640e497c17056b (diff)
* Merge 1:5.5p1-6.
-rw-r--r--debian/changelog10
-rw-r--r--debian/openssh-server.postinst3
-rw-r--r--debian/openssh-server.preinst6
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
2 2
3 * Drop override for desktop-file-but-no-dh_desktop-call, which Lintian no 3 * Drop override for desktop-file-but-no-dh_desktop-call, which Lintian no
4 longer issues. 4 longer issues.
5 * Merge 1:5.5p1-6.
5 6
6 -- Colin Watson <cjwatson@debian.org> Tue, 02 Nov 2010 23:00:07 +0000 7 -- Colin Watson <cjwatson@debian.org> Tue, 02 Nov 2010 23:00:07 +0000
7 8
@@ -29,6 +30,15 @@ openssh (1:5.6p1-1) experimental; urgency=low
29 30
30 -- Colin Watson <cjwatson@debian.org> Tue, 24 Aug 2010 00:37:54 +0100 31 -- Colin Watson <cjwatson@debian.org> Tue, 24 Aug 2010 00:37:54 +0100
31 32
33openssh (1:5.5p1-6) unstable; urgency=low
34
35 * Touch /var/run/sshd/.placeholder in the preinst so that /var/run/sshd,
36 which is intentionally no longer shipped in the openssh-server package
37 due to /var/run often being a temporary directory, is not removed on
38 upgrade (closes: #575582).
39
40 -- Colin Watson <cjwatson@debian.org> Sun, 26 Dec 2010 18:09:29 +0000
41
32openssh (1:5.5p1-5) unstable; urgency=low 42openssh (1:5.5p1-5) unstable; urgency=low
33 43
34 * Use an architecture wildcard for libselinux1-dev (closes: #591740). 44 * 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
473if dpkg --compare-versions "$2" lt 1:4.7p1-1; then 473if dpkg --compare-versions "$2" lt 1:4.7p1-1; then
474 rm -f /etc/ssh/primes 474 rm -f /etc/ssh/primes
475fi 475fi
476if dpkg --compare-versions "$2" lt 1:5.5p1-6; then
477 rm -f /var/run/sshd/.placeholder
478fi
476 479
477 480
478db_stop 481db_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
134 if dpkg --compare-versions "$version" lt 1:4.7p1-4; then 134 if dpkg --compare-versions "$version" lt 1:4.7p1-4; then
135 prepare_mv_conffile /etc/pam.d/ssh 135 prepare_mv_conffile /etc/pam.d/ssh
136 fi 136 fi
137
138 if dpkg --compare-versions "$version" lt 1:5.5p1-6 && \
139 [ -d /var/run/sshd ]; then
140 # make sure /var/run/sshd is not removed on upgrades
141 touch /var/run/sshd/.placeholder
142 fi
137fi 143fi
138 144
139#DEBHELPER# 145#DEBHELPER#