[cdftools] 215/228: M-A enable ; harden

[Alastair McKinstry]

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

mckinstry pushed a commit to branch master
in repository cdftools.

commit 6e89cb6c74ef147474571948776f8efb29564e23
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri May 24 10:51:23 2013 +0100

    M-A enable ; harden
---
 debian/cdftools.install     |  1 -
 debian/patches/harden.patch | 18 ++++++++++++++++++
 debian/patches/series       |  1 +
 debian/rules                |  7 +++++++
 4 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/debian/cdftools.install b/debian/cdftools.install
deleted file mode 100644
index e82dac3..0000000
--- a/debian/cdftools.install
+++ /dev/null
@@ -1 +0,0 @@
-bin/* /usr/bin
diff --git a/debian/patches/harden.patch b/debian/patches/harden.patch
new file mode 100644
index 0000000..3e80432
--- /dev/null
+++ b/debian/patches/harden.patch
@@ -0,0 +1,18 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Padd LDFLAGS in order to harden executables
+Last-Updated: 2013-05-24
+Forwarded: not-needed
+
+Index: amckinstry/deb-packages/cdftools/cdftools-3.0/Macrolib/macro.gfortran
+===================================================================
+--- amckinstry.orig/deb-packages/cdftools/cdftools-3.0/Macrolib/macro.gfortran	2013-05-24 10:36:45.000000000 +0100
++++ amckinstry/deb-packages/cdftools/cdftools-3.0/Macrolib/macro.gfortran	2013-05-24 10:48:05.000000000 +0100
+@@ -9,7 +9,6 @@
+ #F90=gfortran -v
+ F90=gfortran 
+ MPF90=
+-FFLAGS= -O  $(NCDF)  -fno-second-underscore -ffree-line-length-256
+-LMPI=-lmpich
++FFLAGS= -O3 $(LDFLAGS)  $(NCDF)  -fno-second-underscore -ffree-line-length-256
+ 
+ INSTALL=$(HOME)/bin
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d3adf2d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+harden.patch
diff --git a/debian/rules b/debian/rules
index 02543cf..dcd7085 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,9 @@
 
 # export DH_VERBOSE=1
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+BINDIR=debian/cdftools/usr/bin/$(DEB_HOST_MULTIARCH)
+
 # The magic debhelper  rule
 %:
 	dh $@ 
@@ -14,6 +17,10 @@ override_dh_auto_make:
 	$(MAKE)
 	$(MAKE) -c DOC pdf
 
+override_dh_auto_install:
+	mkdir -p $(BINDIR)
+	cp ./bin/* $(BINDIR)
+
 override_dh_auto_clean:
 	rm -f make.macro  *.mod *.o DOC/*.pdf DOC/*.docs
 	rm -fr bin

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