[cdftools] 218/228: Harder.

[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 f463f8d095633b5a848a8a4e9fd218e874b82483
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri May 24 11:20:57 2013 +0100

    Harder.
---
 debian/copyright            |  2 +-
 debian/patches/harden.patch | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index fa5460a..aeeb4e5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Copyright © 2003 LEGI-MEOM (Jean-Marc.Molines at legi.grenoble-inp.fr ) 
+Copyright © 1998-2013 LEGI-MEOM (Jean-Marc.Molines at legi.grenoble-inp.fr ) 
 
 This package was debianized by Alastair McKinstry <mckinstry at debian.org>, 2013-05-24;
 
diff --git a/debian/patches/harden.patch b/debian/patches/harden.patch
index 3e80432..64f4387 100644
--- a/debian/patches/harden.patch
+++ b/debian/patches/harden.patch
@@ -1,18 +1,19 @@
 Author: Alastair McKinstry <mckinstry at debian.org>
-Description: Padd LDFLAGS in order to harden executables
+Description: Add 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
+Index: 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 @@
+--- cdftools-3.0.orig/Macrolib/macro.gfortran	2013-05-24 11:04:28.000000000 +0100
++++ cdftools-3.0/Macrolib/macro.gfortran	2013-05-24 11:08:48.000000000 +0100
+@@ -8,8 +8,6 @@
+ 
  #F90=gfortran -v
  F90=gfortran 
- MPF90=
+-MPF90=
 -FFLAGS= -O  $(NCDF)  -fno-second-underscore -ffree-line-length-256
 -LMPI=-lmpich
-+FFLAGS= -O3 $(LDFLAGS)  $(NCDF)  -fno-second-underscore -ffree-line-length-256
++FFLAGS= -O3 -Wl,-z,now $(LDFLAGS)  $(NCDF)  -fno-second-underscore -ffree-line-length-256 -D_FORTIFY_SOURCE=2
  
  INSTALL=$(HOME)/bin

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