Mercurial > dropbear

changeset 824:7b68e581985f DROPBEAR_2013.59

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix up debian build
author Matt Johnston <matt@ucc.asn.au>
date Fri, 04 Oct 2013 22:22:35 +0800
parents cb3cfcea1c8d
children deb211f75ca1
files debian/changelog debian/rules
diffstat 2 files changed, 5 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- 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 <[email protected]>  Fri, 4 Oct 2013 22:54:00 +0800
 
--- 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)))