summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rwxr-xr-xdebian/rules4
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
135override_dh_auto_build: 135override_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