# HG changeset patch # User Matt Johnston # Date 1380896555 -28800 # Node ID 7b68e581985fd4ea50869f8608ab95cda5d17876 # Parent cb3cfcea1c8d8c6766881a776b13d995c1649a5e Fix up debian build diff -r cb3cfcea1c8d -r 7b68e581985f debian/changelog --- a/debian/changelog Fri Oct 04 21:49:32 2013 +0800 +++ b/debian/changelog Fri Oct 04 22:22:35 2013 +0800 @@ -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 Fri, 4 Oct 2013 22:54:00 +0800 diff -r cb3cfcea1c8d -r 7b68e581985f debian/rules --- a/debian/rules Fri Oct 04 21:49:32 2013 +0800 +++ b/debian/rules Fri Oct 04 22:22:35 2013 +0800 @@ -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 @@ 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)))