summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog6
-rwxr-xr-xdebian/rules12
2 files changed, 13 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index 21c0636b2..e8c9e4ba9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
1openssh (1:4.6p1-3) UNRELEASED; urgency=low
2
3 * Only build PIE executables on Linux and NetBSD (closes: #430455).
4
5 -- Colin Watson <cjwatson@debian.org> Tue, 26 Jun 2007 09:56:40 +0100
6
1openssh (1:4.6p1-2) unstable; urgency=low 7openssh (1:4.6p1-2) unstable; urgency=low
2 8
3 * Fix ordering of SYSLOG_LEVEL_QUIET and SYSLOG_LEVEL_FATAL. 9 * Fix ordering of SYSLOG_LEVEL_QUIET and SYSLOG_LEVEL_FATAL.
diff --git a/debian/rules b/debian/rules
index 71e291b7a..8edbc884b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,11 +12,6 @@ else
12OPTFLAGS := -O0 12OPTFLAGS := -O0
13endif 13endif
14 14
15# Use position-independent executables to take advantage of address space
16# layout randomisation. TODO: This should be done in configure.
17PIE_CFLAGS := -fPIE
18PIE_LDFLAGS := -fPIE -pie
19
20DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null) 15DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null)
21 16
22# Take account of old dpkg-architecture output. 17# Take account of old dpkg-architecture output.
@@ -27,6 +22,13 @@ ifeq ($(DEB_HOST_ARCH_OS),)
27 endif 22 endif
28endif 23endif
29 24
25ifneq (,$(findstring :$(DEB_HOST_ARCH_OS):,:linux:knetbsd:)
26# Use position-independent executables to take advantage of address space
27# layout randomisation. TODO: This should be done in configure.
28PIE_CFLAGS := -fPIE
29PIE_LDFLAGS := -fPIE -pie
30endif
31
30ifeq (,$(wildcard /usr/bin/po2debconf)) 32ifeq (,$(wildcard /usr/bin/po2debconf))
31PO2DEBCONF := no 33PO2DEBCONF := no
32MINDEBCONFVER := 0.5 34MINDEBCONFVER := 0.5