r45205 - in /packages/trilinos/trunk/debian: changelog patches/hardening.patch patches/series rules
trophime-guest at users.alioth.debian.org
trophime-guest at users.alioth.debian.org
Tue Jul 3 12:52:49 UTC 2012
Author: trophime-guest
Date: Tue Jul 3 12:52:48 2012
New Revision: 45205
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45205
Log:
add hardening.patch
Added:
packages/trilinos/trunk/debian/patches/hardening.patch
Modified:
packages/trilinos/trunk/debian/changelog
packages/trilinos/trunk/debian/patches/series
packages/trilinos/trunk/debian/rules
Modified: packages/trilinos/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/changelog?rev=45205&op=diff
==============================================================================
--- packages/trilinos/trunk/debian/changelog (original)
+++ packages/trilinos/trunk/debian/changelog Tue Jul 3 12:52:48 2012
@@ -1,10 +1,11 @@
trilinos (10.8.5.dfsg-2) UNRELEASED; urgency=low
- * debian/control: update Standard-Version to 3.9.3
* debian/rules:
- add override_dh_strip target to create dbg package
* Add python-pytrilinos.pyinstall
* Remove python-pytrilinos.install
+ * Add hardening.patch :
+ - fix FTBS when compiling with -D_FORTIFY_SOURCE=2
-- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr> Tue, 03 Jul 2012 10:45:21 +0200
@@ -31,7 +32,7 @@
- Replace libopenmpi-dev with mpi-default-dev in Build-Depends.
- Add mpi-default-bin to Build-Depends.
- -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr> Fri, 02 Dec 2011 10:55:54 +0200
+ -- Christophe Trophime <christophe.trophime at grenoble.cnrs.fr> Fri, 02 Dec 2011 10:55:54 +0200
trilinos (10.4.0.dfsg-1) unstable; urgency=low
Added: packages/trilinos/trunk/debian/patches/hardening.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/patches/hardening.patch?rev=45205&op=file
==============================================================================
--- packages/trilinos/trunk/debian/patches/hardening.patch (added)
+++ packages/trilinos/trunk/debian/patches/hardening.patch Tue Jul 3 12:52:48 2012
@@ -1,0 +1,60 @@
+Index: trilinos-10.8.5.dfsg/packages/galeri/src/iohb.cpp
+===================================================================
+--- trilinos-10.8.5.dfsg.orig/packages/galeri/src/iohb.cpp 2012-07-03 12:08:45.000000000 +0200
++++ trilinos-10.8.5.dfsg/packages/galeri/src/iohb.cpp 2012-07-03 12:59:17.000000000 +0200
+@@ -1611,7 +1611,7 @@
+
+ void IOHBTerminate(char* message)
+ {
+- fprintf(stderr,message);
++ fprintf(stderr,"%s",message);
+ exit(1);
+ }
+
+Index: trilinos-10.8.5.dfsg/packages/triutils/src/iohb.cpp
+===================================================================
+--- trilinos-10.8.5.dfsg.orig/packages/triutils/src/iohb.cpp 2012-07-03 12:08:45.000000000 +0200
++++ trilinos-10.8.5.dfsg/packages/triutils/src/iohb.cpp 2012-07-03 12:59:17.000000000 +0200
+@@ -1617,7 +1617,7 @@
+
+ void IOHBTerminate(const char* message)
+ {
+- std::fprintf(stderr,message);
++ std::fprintf(stderr,"%s",message);
+ std::exit(1);
+ }
+
+Index: trilinos-10.8.5.dfsg/packages/ml/src/Coarsen/ml_agg_min_energy.cpp
+===================================================================
+--- trilinos-10.8.5.dfsg.orig/packages/ml/src/Coarsen/ml_agg_min_energy.cpp 2012-07-03 12:08:45.000000000 +0200
++++ trilinos-10.8.5.dfsg/packages/ml/src/Coarsen/ml_agg_min_energy.cpp 2012-07-03 12:59:17.000000000 +0200
+@@ -1256,7 +1256,7 @@
+ for(int i = 0; i < rows; i++)
+ {
+ sprintf(str, "%d %d %1.16e \n", i+1, j+1, mat[counter]);
+- fprintf(fid, str);
++ fprintf(fid, "%s", str);
+ counter++;
+ }
+ }
+Index: trilinos-10.8.5.dfsg/packages/fei/support-Trilinos/fei_Aztec_LinSysCore.cpp
+===================================================================
+--- trilinos-10.8.5.dfsg.orig/packages/fei/support-Trilinos/fei_Aztec_LinSysCore.cpp 2012-01-09 18:07:59.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/fei/support-Trilinos/fei_Aztec_LinSysCore.cpp 2012-07-03 12:59:50.000000000 +0200
+@@ -2999,14 +2999,14 @@
+ if (path != debugPath_) {
+ delete [] debugPath_;
+ debugPath_ = new char[pathLength + 1];
+- sprintf(debugPath_, path);
++ sprintf(debugPath_, "%s", path);
+ }
+
+ int nameLength = strlen(name);
+ if (name != debugFileName_) {
+ delete [] debugFileName_;
+ debugFileName_ = new char[nameLength + 1];
+- sprintf(debugFileName_,name);
++ sprintf(debugFileName_,"%s", name);
+ }
+
+ char* dbFileName = new char[pathLength + nameLength + 3];
Modified: packages/trilinos/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/patches/series?rev=45205&op=diff
==============================================================================
--- packages/trilinos/trunk/debian/patches/series (original)
+++ packages/trilinos/trunk/debian/patches/series Tue Jul 3 12:52:48 2012
@@ -1,2 +1,3 @@
+hardening.patch
soname.patch
libname.patch
Modified: packages/trilinos/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/rules?rev=45205&op=diff
==============================================================================
--- packages/trilinos/trunk/debian/rules (original)
+++ packages/trilinos/trunk/debian/rules Tue Jul 3 12:52:48 2012
@@ -4,11 +4,18 @@
TRILINOS_HOME = $(CURDIR)/$(DEB_SRCDIR)
PYVERS := $(shell pyversions -dv)
+#include /usr/share/hardening-includes/hardening.make
+
+CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
+CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS)
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
+
export CC=/usr/bin/mpicc
export CXX=/usr/bin/mpic++
-export CFLAGS=-g -fPIC -O2
-export CXXFLAGS=-g -fPIC -O2
-export FFLAGS=-g -fPIC -O2
+#export CFLAGS=-g -fPIC -O2
+#export CXXFLAGS=-g -fPIC -O2
+#export FFLAGS=-g -fPIC -O2
version=1.0
version_major=1
More information about the debian-science-commits
mailing list