diff options
author | Colin Watson <cjwatson@debian.org> | 2006-12-06 05:15:17 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2006-12-06 05:15:17 +0000 |
commit | 85ac9ac00c22a6fda66bd74710d6ad4e56c0343f (patch) | |
tree | 8e7cc6ceae9442059f7e2fedd9a8ed66651940c2 | |
parent | 8192db15a045ac850e4a1d5fa2108cf839a605a4 (diff) |
* Remove version control tags from /etc/ssh/moduli and /etc/ssh/ssh_config
to avoid unnecessary conffile resolution steps for administrators
(thanks, Jari Aalto; closes: #335259).
-rw-r--r-- | debian/changelog | 3 | ||||
-rwxr-xr-x | debian/rules | 6 |
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. |
169 | binary-indep: binary-ssh binary-ssh-krb5 | 175 | binary-indep: binary-ssh binary-ssh-krb5 |
170 | 176 | ||