summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Johnston <matt@ucc.asn.au>2013-10-04 22:22:35 +0800
committerMatt Johnston <matt@ucc.asn.au>2013-10-04 22:22:35 +0800
commita1c2b9dc738d2e583b77f6f9bd733a19f5ac8ba9 (patch)
tree6ffbb4135c556d62a344d5c157e9eda91d07b620
parent045b9e8cf0c97bd33b7ae157a694ea4fd1850e19 (diff)
downloaddropbear-DROPBEAR_2013.59.tar.gz
Fix up debian buildDROPBEAR_2013.59
-rw-r--r--debian/changelog1
-rwxr-xr-xdebian/rules11
2 files changed, 5 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog
index 7c9f23d..bae4211 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
dropbear (2013.59-0.1) unstable; urgency=low
* New upstream release.
+ * Build with DEB_BUILD_MAINT_OPTIONS = hardening=+all
-- Matt Johnston <matt@ucc.asn.au> Fri, 4 Oct 2013 22:54:00 +0800
diff --git a/debian/rules b/debian/rules
index e1a4b7a..c6b2e85 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,9 @@
#!/usr/bin/make -f
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
+
#export DH_OPTIONS
DEB_HOST_GNU_TYPE ?=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -9,13 +13,6 @@ ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
STRIP =: nostrip
endif
-CFLAGS =-Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS +=-O0
-else
- CFLAGS +=-O2
-endif
-
CONFFLAGS =
CC =gcc
ifneq (,$(findstring diet,$(DEB_BUILD_OPTIONS)))