diff options
Diffstat (limited to 'debian/rules')
-rwxr-xr-x | debian/rules | 31 |
1 files changed, 5 insertions, 26 deletions
diff --git a/debian/rules b/debian/rules index ce56fdea4..0200d48d7 100755 --- a/debian/rules +++ b/debian/rules | |||
@@ -3,17 +3,9 @@ | |||
3 | # Uncomment this to turn on verbose mode. | 3 | # Uncomment this to turn on verbose mode. |
4 | # export DH_VERBOSE=1 | 4 | # export DH_VERBOSE=1 |
5 | 5 | ||
6 | include /usr/share/hardening-includes/hardening.make | ||
7 | |||
8 | # This has to be exported to make some magic below work. | 6 | # This has to be exported to make some magic below work. |
9 | export DH_OPTIONS | 7 | export DH_OPTIONS |
10 | 8 | ||
11 | ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) | ||
12 | OPTFLAGS := -O2 | ||
13 | else | ||
14 | OPTFLAGS := -O0 | ||
15 | endif | ||
16 | |||
17 | ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) | 9 | ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) |
18 | RUN_TESTS := yes | 10 | RUN_TESTS := yes |
19 | else | 11 | else |
@@ -31,7 +23,6 @@ else | |||
31 | endif | 23 | endif |
32 | 24 | ||
33 | DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null) | 25 | DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null) |
34 | DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2>/dev/null) | ||
35 | 26 | ||
36 | # Take account of old dpkg-architecture output. | 27 | # Take account of old dpkg-architecture output. |
37 | ifeq ($(DEB_HOST_ARCH_OS),) | 28 | ifeq ($(DEB_HOST_ARCH_OS),) |
@@ -40,20 +31,6 @@ ifeq ($(DEB_HOST_ARCH_OS),) | |||
40 | DEB_HOST_ARCH_OS := hurd | 31 | DEB_HOST_ARCH_OS := hurd |
41 | endif | 32 | endif |
42 | endif | 33 | endif |
43 | ifeq ($(DEB_HOST_ARCH_CPU),) | ||
44 | DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU) | ||
45 | ifeq ($(DEB_HOST_ARCH_CPU),x86_64) | ||
46 | DEB_HOST_ARCH_CPU := amd64 | ||
47 | endif | ||
48 | endif | ||
49 | |||
50 | ifneq (,$(findstring :$(DEB_HOST_ARCH_OS):,:linux:knetbsd:)) | ||
51 | ifneq (,$(findstring :$(DEB_HOST_ARCH_CPU):,:mips:mipsel:)) | ||
52 | # Apparently this is not implied by -fPIE, at least on the mipsen. | ||
53 | PIC_CFLAGS := -fPIC | ||
54 | PIC_LDFLAGS := -fPIC | ||
55 | endif | ||
56 | endif | ||
57 | 34 | ||
58 | # Change the version string to include the Debian version | 35 | # Change the version string to include the Debian version |
59 | SSH_EXTRAVERSION := Debian-$(shell dpkg-parsechangelog | sed -n -e '/^Version:/s/Version: //p' | sed -e 's/[^-]*-//') | 36 | SSH_EXTRAVERSION := Debian-$(shell dpkg-parsechangelog | sed -n -e '/^Version:/s/Version: //p' | sed -e 's/[^-]*-//') |
@@ -108,7 +85,9 @@ confflags += --with-default-path=$(DEFAULT_PATH) --with-superuser-path=$(SUPERUS | |||
108 | confflags_udeb += --with-default-path=/usr/local/bin:/usr/bin:/bin --with-superuser-path=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin | 85 | confflags_udeb += --with-default-path=/usr/local/bin:/usr/bin:/bin --with-superuser-path=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin |
109 | 86 | ||
110 | # Compiler flags. | 87 | # Compiler flags. |
111 | cflags := $(OPTFLAGS) $(PIC_CFLAGS) $(HARDENING_CFLAGS) | 88 | export DEB_BUILD_MAINT_OPTIONS := hardening=+all |
89 | default_cflags := $(shell dpkg-buildflags --get CPPFLAGS) $(shell dpkg-buildflags --get CFLAGS) | ||
90 | cflags := $(default_cflags) | ||
112 | cflags += -DLOGIN_PROGRAM=\"/bin/login\" -DLOGIN_NO_ENDOPT | 91 | cflags += -DLOGIN_PROGRAM=\"/bin/login\" -DLOGIN_NO_ENDOPT |
113 | cflags += -DSSH_EXTRAVERSION=\"$(SSH_EXTRAVERSION)\" | 92 | cflags += -DSSH_EXTRAVERSION=\"$(SSH_EXTRAVERSION)\" |
114 | cflags_udeb := -Os | 93 | cflags_udeb := -Os |
@@ -117,7 +96,7 @@ confflags += --with-cflags='$(cflags)' | |||
117 | confflags_udeb += --with-cflags='$(cflags_udeb)' | 96 | confflags_udeb += --with-cflags='$(cflags_udeb)' |
118 | 97 | ||
119 | # Linker flags. | 98 | # Linker flags. |
120 | confflags += --with-ldflags='$(strip -Wl,--as-needed $(PIC_LDFLAGS) $(HARDENING_LDFLAGS))' | 99 | confflags += --with-ldflags='$(strip -Wl,--as-needed $(shell dpkg-buildflags --get LDFLAGS))' |
121 | confflags_udeb += --with-ldflags='-Wl,--as-needed' | 100 | confflags_udeb += --with-ldflags='-Wl,--as-needed' |
122 | 101 | ||
123 | %: | 102 | %: |
@@ -139,7 +118,7 @@ override_dh_auto_build: | |||
139 | $(MAKE) -C build-deb -j 2 ASKPASS_PROGRAM='/usr/bin/ssh-askpass' | 118 | $(MAKE) -C build-deb -j 2 ASKPASS_PROGRAM='/usr/bin/ssh-askpass' |
140 | $(MAKE) -C build-udeb -j 2 ASKPASS_PROGRAM='/usr/bin/ssh-askpass' ssh scp sftp sshd ssh-keygen | 119 | $(MAKE) -C build-udeb -j 2 ASKPASS_PROGRAM='/usr/bin/ssh-askpass' ssh scp sftp sshd ssh-keygen |
141 | 120 | ||
142 | $(MAKE) -C contrib gnome-ssh-askpass2 CC='$(CC) $(OPTFLAGS) -g -Wall -Wl,--as-needed' | 121 | $(MAKE) -C contrib gnome-ssh-askpass2 CC='$(CC) $(default_cflags) -Wall -Wl,--as-needed' |
143 | 122 | ||
144 | override_dh_auto_test: | 123 | override_dh_auto_test: |
145 | ifeq ($(RUN_TESTS),yes) | 124 | ifeq ($(RUN_TESTS),yes) |