diff options
-rw-r--r-- | debian/changelog | 6 | ||||
-rwxr-xr-x | debian/rules | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index df9ce82ec..9f47e85fd 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -1,3 +1,9 @@ | |||
1 | openssh (1:8.4p1-4) UNRELEASED; urgency=medium | ||
2 | |||
3 | * Avoid using libmd's <sha2.h> even if it's installed (closes: #982705). | ||
4 | |||
5 | -- Colin Watson <cjwatson@debian.org> Sun, 14 Feb 2021 12:52:34 +0000 | ||
6 | |||
1 | openssh (1:8.4p1-3) unstable; urgency=medium | 7 | openssh (1:8.4p1-3) unstable; urgency=medium |
2 | 8 | ||
3 | * Backport from upstream: | 9 | * Backport from upstream: |
diff --git a/debian/rules b/debian/rules index 73a53c309..44bac00f1 100755 --- a/debian/rules +++ b/debian/rules | |||
@@ -65,6 +65,10 @@ ifeq ($(DEB_HOST_ARCH_OS),hurd) | |||
65 | confflags += --with-libs=-lcrypt | 65 | confflags += --with-libs=-lcrypt |
66 | endif | 66 | endif |
67 | 67 | ||
68 | # Avoid using libmd even if it's installed; see | ||
69 | # https://bugs.debian.org/982705. | ||
70 | confflags += ac_cv_header_sha2_h=false | ||
71 | |||
68 | # Everything above here is common to the deb and udeb builds. | 72 | # Everything above here is common to the deb and udeb builds. |
69 | confflags_udeb := $(confflags) | 73 | confflags_udeb := $(confflags) |
70 | 74 | ||