summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rwxr-xr-xdebian/rules5
2 files changed, 2 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index 9f799969b..702b7c2ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -75,6 +75,8 @@ openssh (1:8.1p1-1) UNRELEASED; urgency=medium
75 heap allocators. 75 heap allocators.
76 - sshd(8): In the Linux seccomp-bpf sandbox, allow the s390-specific 76 - sshd(8): In the Linux seccomp-bpf sandbox, allow the s390-specific
77 ioctl for ECC hardware support. 77 ioctl for ECC hardware support.
78 * Re-enable hardening on hppa, since the corresponding GCC bug is
79 apparently fixed.
78 80
79 -- Colin Watson <cjwatson@debian.org> Wed, 09 Oct 2019 23:18:42 +0100 81 -- Colin Watson <cjwatson@debian.org> Wed, 09 Oct 2019 23:18:42 +0100
80 82
diff --git a/debian/rules b/debian/rules
index c8b778dc0..d1f282d11 100755
--- a/debian/rules
+++ b/debian/rules
@@ -65,11 +65,6 @@ ifeq ($(DEB_HOST_ARCH_OS),hurd)
65confflags += --with-libs=-lcrypt 65confflags += --with-libs=-lcrypt
66endif 66endif
67 67
68# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=60155
69ifeq ($(DEB_HOST_ARCH),hppa)
70confflags += --without-hardening
71endif
72
73# Everything above here is common to the deb and udeb builds. 68# Everything above here is common to the deb and udeb builds.
74confflags_udeb := $(confflags) 69confflags_udeb := $(confflags)
75 70