The following commit has been merged in the master branch: commit f33ac5481952b0bea9ba7a3732a16e1c5614853a Author: Johan Van de Wauw <johan.vandew...@gmail.com> Date: Fri Nov 15 00:12:26 2013 -0500
Enable hardening & fix security warnings diff --git a/debian/patches/0005-Fix-gcc-security-warnings.patch b/debian/patches/0005-Fix-gcc-security-warnings.patch new file mode 100644 index 0000000..71621f0 --- /dev/null +++ b/debian/patches/0005-Fix-gcc-security-warnings.patch @@ -0,0 +1,38 @@ +From: Johan Van de Wauw <johan.vandew...@gmail.com> +Date: Fri, 15 Nov 2013 01:57:38 -0500 +Subject: Fix gcc security warnings + +--- + src/modules_io/grid/io_grid/esri_arcinfo.cpp | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/modules_io/grid/io_grid/esri_arcinfo.cpp b/src/modules_io/grid/io_grid/esri_arcinfo.cpp +index 477dd41..970eb71 100644 +--- a/src/modules_io/grid/io_grid/esri_arcinfo.cpp ++++ b/src/modules_io/grid/io_grid/esri_arcinfo.cpp +@@ -594,13 +594,13 @@ bool CESRI_ArcInfo_Export::On_Execute(void) + { + if( x > 0 ) + { +- fprintf(Stream.Get_Stream(), " "); ++ fputs(" ",Stream.Get_Stream()); + } + +- fprintf(Stream.Get_Stream(), Write_Value(pGrid->asDouble(x, y), Precision, bComma).b_str()); ++ fputs(Write_Value(pGrid->asDouble(x, y), Precision, bComma).b_str(),Stream.Get_Stream()); + } + +- fprintf(Stream.Get_Stream(), "\n"); ++ fputs("\n", Stream.Get_Stream()); + } + + pGrid->Get_Projection().Save(SG_File_Make_Path(NULL, fName, SG_T("prj"))); +@@ -671,7 +671,7 @@ bool CESRI_ArcInfo_Export::Write_Header(CSG_File &Stream, CSG_Grid *pGrid, bool + s += CSG_String::Format(SG_T("%s %s\n") , HDR_BYTEORDER , Parameters("BYTEORD")->asInt() == 1 ? HDR_BYTEORDER_LO : HDR_BYTEORDER_HI); + } + +- fprintf(Stream.Get_Stream(), s.b_str()); ++ fputs(s.b_str(),Stream.Get_Stream()); + + return( true ); + } diff --git a/debian/patches/series b/debian/patches/series index ff689cf..091527e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ 0002-Use-debian-version-of-grib2.patch 0003-Autoreconf-fi-result.patch 0004-Use-qhull-instead-of-triangle.patch +0005-Fix-gcc-security-warnings.patch diff --git a/debian/rules b/debian/rules index 399e5fa..07d393c 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,7 @@ dh $@ --with python2 --with autoreconf override_dh_auto_configure: - dh_auto_configure -- --enable-unicode --prefix=/usr --enable-python + dh_auto_configure -- --enable-unicode --prefix=/usr --enable-python $(shell dpkg-buildflags --export=configure) VERSION := $(shell grep '^AC_INIT' configure.in | \ sed 's/AC_INIT(saga, \([0-9|\.]*\)\,.*)/\1/g') -- Saga GIS _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel