[cdo] 05/84: Apply hardening

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch master
in repository cdo.

commit fa528844b2d1a67d7a0e8c561d0131fa3d0bb946
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sat Dec 29 17:31:58 2012 +0000

    Apply hardening
---
 debian/changelog |  1 +
 debian/rules     | 11 ++++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f4240bb..ca1a7ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ cdo (1.5.9+dfsg.1-1) unstable; urgency=low
 
   * New upstream release. 
   * Standards-Version: 3.9.4. No changes required.
+  * Apply hardening.
 
  -- Alastair McKinstry <mckinstry at debian.org>  Sat, 29 Dec 2012 17:13:31 +0000
 
diff --git a/debian/rules b/debian/rules
index b02340a..4e80dfe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,8 +10,13 @@ DESTDIR:=`pwd`/debian/tmp/
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 LIBDIR:=/usr/lib/$(DEB_HOST_MULTIARCH)
 
-CFLAGS += -fPIC
-CPPFLAGS = -DgFortran
+# To enable all, uncomment following line
+DEB_BUILD_MAINT_OPTIONS:= hardening=+all
+DEB_CFLAGS_MAINT_APPEND:= -Wall -pedantic -fPIC
+export DEB_BUILD_MAINT_OPTIONS
+export DEB_CFLAGS_MAINT_APPEND
+
+CPPFLAGS += -DgFortran
 
 ARCH:=$(shell dpkg --print-architecture)
 WITH_GRIB:= --with-grib-api=/usr --disable-cgribex
@@ -48,7 +53,7 @@ override_dh_auto_clean:
 override_dh_auto_configure:
 	ln -sf /usr/include/cfortran.h libcdi/src/cfortran.h 
 	dh_autoreconf
-	LDFLAGS="-Wl,--as-needed"  
+	LDFLAGS="$(LDFLAGS) -Wl,--as-needed"  
 	  ./configure --prefix=/usr --libdir=$(LIBDIR) \
 		--enable-cdi-lib --with-zlib=/usr --with-netcdf=/usr  --with-proj=/usr --with-hdf5=/usr \
 		--enable-iso-c-interface   \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cdo.git