diff options
author | Colin Watson <cjwatson@debian.org> | 2014-03-27 15:32:35 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2014-03-27 15:32:35 +0000 |
commit | 96f6b414c09ec85a923e02df06a90d935283f06e (patch) | |
tree | 97980f91967112b2648ab41b631a699496b9fee9 /debian | |
parent | 0789c0d760ff7a61156a5d567e9f8b9f8195ff6e (diff) |
Re-enable btmp logging, as its permissions were fixed a long time ago in response to #370050 (closes: #341883).
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 2 | ||||
-rwxr-xr-x | debian/rules | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 017f5bb0e..1b08a3d50 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -8,6 +8,8 @@ openssh (1:6.6p1-1) UNRELEASED; urgency=medium | |||
8 | sshd_config(5) AcceptEnv pattern with a wildcard, OpenSSH prior to 6.6 | 8 | sshd_config(5) AcceptEnv pattern with a wildcard, OpenSSH prior to 6.6 |
9 | could be tricked into accepting any environment variable that contains | 9 | could be tricked into accepting any environment variable that contains |
10 | the characters before the wildcard character. | 10 | the characters before the wildcard character. |
11 | * Re-enable btmp logging, as its permissions were fixed a long time ago in | ||
12 | response to #370050 (closes: #341883). | ||
11 | 13 | ||
12 | [ Matthew Vernon ] | 14 | [ Matthew Vernon ] |
13 | * Fix failure to check SSHFP records if server presents a certificate | 15 | * Fix failure to check SSHFP records if server presents a certificate |
diff --git a/debian/rules b/debian/rules index b412c3ae7..e05b31328 100755 --- a/debian/rules +++ b/debian/rules | |||
@@ -133,10 +133,6 @@ override_dh_auto_configure: | |||
133 | dh_auto_configure -Bbuild-udeb -- $(confflags_udeb) | 133 | dh_auto_configure -Bbuild-udeb -- $(confflags_udeb) |
134 | 134 | ||
135 | override_dh_auto_build: | 135 | override_dh_auto_build: |
136 | # Debian's /var/log/btmp has inappropriate permissions. | ||
137 | perl -pi -e 's,.*#define USE_BTMP .*,/* #undef USE_BTMP */,' build-deb/config.h | ||
138 | perl -pi -e 's,.*#define USE_BTMP .*,/* #undef USE_BTMP */,' build-udeb/config.h | ||
139 | |||
140 | # Avoid libnsl linkage. Ugh. | 136 | # Avoid libnsl linkage. Ugh. |
141 | perl -pi -e 's/ +-lnsl//' build-udeb/config.status | 137 | perl -pi -e 's/ +-lnsl//' build-udeb/config.status |
142 | cd build-udeb && ./config.status | 138 | cd build-udeb && ./config.status |