[SCM] gdal branch, master, updated. upstream/1.10.0-200-g009bec6

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit 86f0b5d61d764ac61e8c090244b422d0012872b3
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Oct 13 22:45:07 2013 +0200

    Add patch to use hardening flags for java and perl bindings.

diff --git a/debian/changelog b/debian/changelog
index 84cdbd9..7d9796e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,7 @@ gdal (1.10.1+dfsg-0~exp1) UNRELEASED; urgency=low
   * Drop ruby extension for ruby1.8 removal transition. See also: #684433.
     (closes: #722383)
   * Use minimal dh rules with dh-python, and dh-autoreconf for retooling.
+  * Add patch to use hardening flags for java and perl bindings.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Thu, 03 Oct 2013 23:19:27 +0200
 
diff --git a/debian/patches/hardening b/debian/patches/hardening
new file mode 100644
index 0000000..6e1716a
--- /dev/null
+++ b/debian/patches/hardening
@@ -0,0 +1,33 @@
+--- a/swig/perl/Makefile.PL
++++ b/swig/perl/Makefile.PL
+@@ -1,4 +1,5 @@
+ use ExtUtils::MakeMaker;
++use Config;
+ 
+ # pick up our parameters from @ARGV
+ my %ARGV;
+@@ -120,6 +121,8 @@ for my $module (keys %object) {
+ 		   MAKEFILE => 'Makefile_'.$add,
+ 		   LIBS => $LIB,
+ 		   INC => $INC,
++		   OPTIMIZE => "$ENV{CFLAGS} $ENV{CPPFLAGS}",
++		   LD => "$Config{ld} $ENV{CFLAGS} $ENV{LDFLAGS}",
+ 		   OBJECT => $object{$module},
+ 		   PM => {'lib/Geo/GDAL.pm' => '$(INST_LIBDIR)/GDAL.pm',
+ 			  'lib/Geo/OGR.pm' => '$(INST_LIBDIR)/OGR.pm',
+--- a/swig/java/GNUmakefile
++++ b/swig/java/GNUmakefile
+@@ -76,10 +76,10 @@ $(JAVA_MODULES): lib%jni.$(SO_EXT): %_wr
+ # Do not remove -fno-strict-aliasing while SWIG generates weird code in upcast methods
+ # See http://trac.osgeo.org/gdal/changeset/16006
+ %.$(OBJ_EXT): %.cpp
+-	$(CXX) -fno-strict-aliasing $(CFLAGS) $(GDAL_INCLUDE) $(JAVA_INCLUDE) -c $<
++	$(CXX) -fno-strict-aliasing $(CFLAGS) $(CPPFLAGS) $(GDAL_INCLUDE) $(JAVA_INCLUDE) -c $<
+ 
+ %.$(OBJ_EXT): %.cxx
+-	$(CXX) -fno-strict-aliasing $(CFLAGS) $(GDAL_INCLUDE) $(JAVA_INCLUDE) -c $<
++	$(CXX) -fno-strict-aliasing $(CFLAGS) $(CPPFLAGS) $(GDAL_INCLUDE) $(JAVA_INCLUDE) -c $<
+ 
+ %.$(OBJ_EXT): %.c
+-	$(CC) -fno-strict-aliasing $(CFLAGS) $(GDAL_INCLUDE) $(JAVA_INCLUDE) -c $<
++	$(CC) -fno-strict-aliasing $(CFLAGS) $(CPPFLAGS) $(GDAL_INCLUDE) $(JAVA_INCLUDE) -c $<
diff --git a/debian/patches/series b/debian/patches/series
index 4f47799..235a559 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -25,3 +25,4 @@ usefull-typo
 developement-typo
 algoritm-typo
 doc-brief
+hardening

-- 
GDAL/OGR library and tools