[med-svn] r12828 - in trunk/packages/zalign/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2013-01-23 16:09:58 +0000 (Wed, 23 Jan 2013)
New Revision: 12828

Added:
   trunk/packages/zalign/trunk/debian/patches/
   trunk/packages/zalign/trunk/debian/patches/hardening.patch
   trunk/packages/zalign/trunk/debian/patches/series
Modified:
   trunk/packages/zalign/trunk/debian/control
   trunk/packages/zalign/trunk/debian/rules
Log:
Try hard to tweak hardening flags in ... now package is lintian clean


Modified: trunk/packages/zalign/trunk/debian/control
===================================================================
--- trunk/packages/zalign/trunk/debian/control	2013-01-22 22:28:07 UTC (rev 12827)
+++ trunk/packages/zalign/trunk/debian/control	2013-01-23 16:09:58 UTC (rev 12828)
@@ -4,7 +4,7 @@
 Maintainer:  Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Steffen Moeller <moeller at debian.org>,
            Andreas Tille <tille at debian.org>
-Build-Depends: debhelper (>= 9), autotools-dev, libopenmpi-dev
+Build-Depends: debhelper (>= 9), autotools-dev, libopenmpi-dev, dh-autoreconf
 Standards-Version: 3.9.4
 Homepage: https://launchpad.net/zalign
 Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/zalign/trunk/

Added: trunk/packages/zalign/trunk/debian/patches/hardening.patch
===================================================================
--- trunk/packages/zalign/trunk/debian/patches/hardening.patch	                        (rev 0)
+++ trunk/packages/zalign/trunk/debian/patches/hardening.patch	2013-01-23 16:09:58 UTC (rev 12828)
@@ -0,0 +1,18 @@
+Author: Andreas Tille <tille at debian.org>
+LastChanged: Wed, 23 Jan 2013 17:04:13 +0100
+Description: Try hard to get CXXFLAGS into build to enable hardening
+ CXXFLAGS are hardwired inside configure.in so simply setting the
+ environment variable does not help here and we need to recreate
+ configure script using dh_autoreconf
+
+--- a/configure.in
++++ b/configure.in
+@@ -33,7 +33,7 @@ ACX_MPI
+ # Set compiler and compiler flags
+ CXX="$MPICXX"
+ CFLAGS="-g -O0"
+-CXXFLAGS="-g -O0 -ansi -pedantic -Wall -Wextra -Wno-long-long -Wno-unused-parameter -DHAVE_MPI_CPP -lm"
++CXXFLAGS="-g -O0 -ansi -pedantic -Wall -Wextra -Wno-long-long -Wno-unused-parameter -DHAVE_MPI_CPP -lm ${CXXFLAGS}"
+ 
+ # Autoconf output
+ AC_CONFIG_FILES([

Added: trunk/packages/zalign/trunk/debian/patches/series
===================================================================
--- trunk/packages/zalign/trunk/debian/patches/series	                        (rev 0)
+++ trunk/packages/zalign/trunk/debian/patches/series	2013-01-23 16:09:58 UTC (rev 12828)
@@ -0,0 +1 @@
+hardening.patch

Modified: trunk/packages/zalign/trunk/debian/rules
===================================================================
--- trunk/packages/zalign/trunk/debian/rules	2013-01-22 22:28:07 UTC (rev 12827)
+++ trunk/packages/zalign/trunk/debian/rules	2013-01-23 16:09:58 UTC (rev 12828)
@@ -1,15 +1,10 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-export CXXFLAGS=-I/usr/lib/openmpi/include
+export CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS) -I/usr/lib/openmpi/include
 
 %:
-	dh $@  --with autotools-dev
+	dh $@ --with autoreconf