diff -u ureadahead-0.100.0/debian/changelog ureadahead-0.100.0/debian/changelog --- ureadahead-0.100.0/debian/changelog +++ ureadahead-0.100.0/debian/changelog @@ -1,3 +1,12 @@ +ureadahead (0.100.0-17) trusty; urgency=low + + * debian/control: build depend on hardening-wrapper + * debian/rules: + + convert to use DPKG_*_MAINT_* flags + + enable DEB_BUILD_HARDENING to get hardening=all (LP: #1266492) + + -- Steve Beattie Tue, 28 Jan 2014 08:27:44 -0800 + ureadahead (0.100.0-16) raring; urgency=low * src/trace.c: update to ignore symlinks when tracing + cleanup extra stat() diff -u ureadahead-0.100.0/debian/control ureadahead-0.100.0/debian/control --- ureadahead-0.100.0/debian/control +++ ureadahead-0.100.0/debian/control @@ -3,7 +3,7 @@ Priority: required Maintainer: Scott James Remnant Standards-Version: 3.9.1 -Build-Depends: debhelper (>= 7.3.15ubuntu3), dh-autoreconf, autopoint, pkg-config (>= 0.22), libnih-dev (>= 1.0.0), libblkid-dev (>= 2.16), e2fslibs-dev (>= 1.41) +Build-Depends: debhelper (>= 7.3.15ubuntu3), dh-autoreconf, autopoint, pkg-config (>= 0.22), libnih-dev (>= 1.0.0), libblkid-dev (>= 2.16), e2fslibs-dev (>= 1.41), hardening-wrapper Package: ureadahead Architecture: any diff -u ureadahead-0.100.0/debian/rules ureadahead-0.100.0/debian/rules --- ureadahead-0.100.0/debian/rules +++ ureadahead-0.100.0/debian/rules @@ -3,18 +3,22 @@ dh $@ --with autoreconf -CFLAGS = -Wall -g -fstack-protector -fPIE -LDFLAGS = -Wl,-z,relro -Wl,-z,now -pie +# use the following instead of +# export DEB_BUILD_MAINT_OPTIONS=hardening=+all +# due to LP: ##1266492 +export DEB_BUILD_HARDENING=1 # Disable optimisations if noopt found in $DEB_BUILD_OPTIONS ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 - LDFLAGS += -Wl,-O0 +export DEB_CFLAGS_MAINT_APPEND = -Wall -O0 +export DEB_LDFLAGS_MAINT_APPEND = -Wl,-O0 else - CFLAGS += -Os - LDFLAGS += -Wl,-O1 +export DEB_CFLAGS_MAINT_APPEND = -Wall -Os +export DEB_LDFLAGS_MAINT_APPEND = -Wl,-O1 endif +include /usr/share/dpkg/buildflags.mk + override_dh_auto_configure: dh_auto_configure -- CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ --exec-prefix=