summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2019-10-09 23:52:05 +0100
committerColin Watson <cjwatson@debian.org>2019-10-09 23:52:05 +0100
commite94cbd8370c27e6c28ea400eba2bcf7be45e4868 (patch)
tree5ee807872bf91c0a5da43d56672c820a74b4f8bb
parent32ddb2b545cb9a18b6467091575c80e180e6fbb7 (diff)
Re-enable hardening on hppa
The corresponding GCC bug is apparently fixed.
-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
heap allocators.
- sshd(8): In the Linux seccomp-bpf sandbox, allow the s390-specific
ioctl for ECC hardware support.
+ * Re-enable hardening on hppa, since the corresponding GCC bug is
+ apparently fixed.
-- Colin Watson <cjwatson@debian.org> Wed, 09 Oct 2019 23:18:42 +0100
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)
confflags += --with-libs=-lcrypt
endif
-# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=60155
-ifeq ($(DEB_HOST_ARCH),hppa)
-confflags += --without-hardening
-endif
-
# Everything above here is common to the deb and udeb builds.
confflags_udeb := $(confflags)