diff options
-rw-r--r-- | debian/changelog | 7 | ||||
-rwxr-xr-x | debian/rules | 5 |
2 files changed, 12 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index fd3dee449..64742a3b3 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -1,3 +1,10 @@ | |||
1 | openssh (1:6.5p1-4) UNRELEASED; urgency=medium | ||
2 | |||
3 | * Configure --without-hardening on hppa, to work around | ||
4 | http://gcc.gnu.org/bugzilla/show_bug.cgi?id=60155 (closes: #738798). | ||
5 | |||
6 | -- Colin Watson <cjwatson@debian.org> Thu, 13 Feb 2014 10:53:22 +0000 | ||
7 | |||
1 | openssh (1:6.5p1-3) unstable; urgency=medium | 8 | openssh (1:6.5p1-3) unstable; urgency=medium |
2 | 9 | ||
3 | * Clarify socket activation mode in README.Debian, as suggested by Uoti | 10 | * Clarify socket activation mode in README.Debian, as suggested by Uoti |
diff --git a/debian/rules b/debian/rules index c878d5e2d..888921670 100755 --- a/debian/rules +++ b/debian/rules | |||
@@ -73,6 +73,11 @@ ifeq ($(DEB_HOST_ARCH_OS),hurd) | |||
73 | confflags += --with-libs=-lcrypt | 73 | confflags += --with-libs=-lcrypt |
74 | endif | 74 | endif |
75 | 75 | ||
76 | # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=60155 | ||
77 | ifeq ($(DEB_HOST_ARCH),hppa) | ||
78 | confflags += --without-hardening | ||
79 | endif | ||
80 | |||
76 | # Everything above here is common to the deb and udeb builds. | 81 | # Everything above here is common to the deb and udeb builds. |
77 | confflags_udeb := $(confflags) | 82 | confflags_udeb := $(confflags) |
78 | 83 | ||