summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog3
-rwxr-xr-xdebian/rules6
2 files changed, 9 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index bad06d225..4e4c2a1ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ openssh (1:4.3p2-7) UNRELEASED; urgency=low
3 [ Colin Watson ] 3 [ Colin Watson ]
4 * Ignore errors from usermod when changing sshd's shell, since it will 4 * Ignore errors from usermod when changing sshd's shell, since it will
5 fail if the sshd user is not local (closes: #398436). 5 fail if the sshd user is not local (closes: #398436).
6 * Remove version control tags from /etc/ssh/moduli and /etc/ssh/ssh_config
7 to avoid unnecessary conffile resolution steps for administrators
8 (thanks, Jari Aalto; closes: #335259).
6 9
7 [ Russ Allbery ] 10 [ Russ Allbery ]
8 * Create transitional ssh-krb5 package which enables GSSAPI configuration 11 * Create transitional ssh-krb5 package which enables GSSAPI configuration
diff --git a/debian/rules b/debian/rules
index 4404c28dd..3e36678da 100755
--- a/debian/rules
+++ b/debian/rules
@@ -165,6 +165,12 @@ install: build
165 install -m 755 build-udeb/sshd debian/openssh-server-udeb/usr/sbin/sshd 165 install -m 755 build-udeb/sshd debian/openssh-server-udeb/usr/sbin/sshd
166 install -m 755 build-udeb/ssh-keygen debian/openssh-server-udeb/usr/bin/ssh-keygen 166 install -m 755 build-udeb/ssh-keygen debian/openssh-server-udeb/usr/bin/ssh-keygen
167 167
168 # Remove version control tags to avoid unnecessary conffile
169 # resolution steps for administrators.
170 sed -i '/\$$OpenBSD:/' \
171 debian/openssh-client/etc/ssh/moduli \
172 debian/openssh-client/etc/ssh/ssh_config
173
168# Build architecture-independent files here. 174# Build architecture-independent files here.
169binary-indep: binary-ssh binary-ssh-krb5 175binary-indep: binary-ssh binary-ssh-krb5
170 176