summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2010-03-17 23:47:19 +0000
committerColin Watson <cjwatson@debian.org>2010-03-17 23:47:19 +0000
commitdcc4bb10e01d6b39ef614bd516fb362f1abc24c8 (patch)
tree2d90db908e4ae910a4c1359817c1137c964f3567
parentdd79498e0f4086a765cea7757ac023e925b75db2 (diff)
Fix substitution of ETC_PAM_D_SSH, following the rename in 1:4.7p1-4.
-rw-r--r--debian/changelog1
-rwxr-xr-xdebian/rules4
2 files changed, 4 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 8ce7bbae4..a98e9d638 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ openssh (1:5.3p1-4) UNRELEASED; urgency=low
10 mechanism was removed due to a serious security hole, and since these 10 mechanism was removed due to a serious security hole, and since these
11 versions of ssh-krb5 are no longer security-supported by Debian I don't 11 versions of ssh-krb5 are no longer security-supported by Debian I don't
12 think there's any point keeping client compatibility for them. 12 think there's any point keeping client compatibility for them.
13 * Fix substitution of ETC_PAM_D_SSH, following the rename in 1:4.7p1-4.
13 14
14 -- Colin Watson <cjwatson@debian.org> Mon, 01 Mar 2010 12:24:41 +0000 15 -- Colin Watson <cjwatson@debian.org> Mon, 01 Mar 2010 12:24:41 +0000
15 16
diff --git a/debian/rules b/debian/rules
index 0d47eb002..2101c97ee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -257,10 +257,12 @@ binary-openssh-server: build install
257 dh_compress 257 dh_compress
258 dh_fixperms 258 dh_fixperms
259 dh_installdeb 259 dh_installdeb
260 # Yes, ETC_PAM_D_SSH is meant to be spelled that way, to match the
261 # old configuration file name we need to transfer.
260 perl -i debian/substitute-conffile.pl \ 262 perl -i debian/substitute-conffile.pl \
261 ETC_DEFAULT_SSH debian/openssh-server/etc/default/ssh \ 263 ETC_DEFAULT_SSH debian/openssh-server/etc/default/ssh \
262 ETC_INIT_D_SSH debian/openssh-server/etc/init.d/ssh \ 264 ETC_INIT_D_SSH debian/openssh-server/etc/init.d/ssh \
263 ETC_PAM_D_SSH debian/openssh-server/etc/pam.d/ssh \ 265 ETC_PAM_D_SSH debian/openssh-server/etc/pam.d/sshd \
264 debian/openssh-server/DEBIAN/preinst 266 debian/openssh-server/DEBIAN/preinst
265 dh_shlibdeps 267 dh_shlibdeps
266 dh_gencontrol 268 dh_gencontrol