[gdal] 05/07: Drop hardening patch, applied upstream. Refresh remaining patches.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch experimental-2.0
in repository gdal.

commit 88874a1528f5d64863e3bbf587c4c3f01dd73bea
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jan 22 16:21:58 2016 +0100

    Drop hardening patch, applied upstream. Refresh remaining patches.
---
 debian/changelog          |  1 +
 debian/patches/hardening  | 22 ----------------------
 debian/patches/hdf4       | 10 +++++-----
 debian/patches/series     |  1 -
 debian/patches/spatialite |  6 +++---
 5 files changed, 9 insertions(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7088eee..74b7408 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ gdal (2.0.2~rc1+dfsg-1) UNRELEASED; urgency=medium
 
   * New upstream release candidate.
   * Update watch file for 2.0.2 pre-releases.
+  * Drop hardening patch, applied upstream. Refresh remaining patches.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 22 Jan 2016 16:09:05 +0100
 
diff --git a/debian/patches/hardening b/debian/patches/hardening
deleted file mode 100644
index 7a51bc4..0000000
--- a/debian/patches/hardening
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Add support for all hardening buildflags.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://trac.osgeo.org/gdal/ticket/5998
-Applied-Upstream: https://trac.osgeo.org/gdal/changeset/29360
-                  https://trac.osgeo.org/gdal/changeset/31064
-
---- a/swig/java/GNUmakefile
-+++ b/swig/java/GNUmakefile
-@@ -100,10 +100,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/hdf4 b/debian/patches/hdf4
index 0a826d8..6d37d27 100644
--- a/debian/patches/hdf4
+++ b/debian/patches/hdf4
@@ -5,7 +5,7 @@ Forwarded: not-needed
 
 --- a/configure
 +++ b/configure
-@@ -21397,7 +21397,7 @@ fi
+@@ -21407,7 +21407,7 @@ fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mfhdf_SDreaddata" >&5
  $as_echo "$ac_cv_lib_mfhdf_SDreaddata" >&6; }
  if test "x$ac_cv_lib_mfhdf_SDreaddata" = xyes; then :
@@ -14,7 +14,7 @@ Forwarded: not-needed
  else
    HDF_LIB_NAME=missing
  fi
-@@ -21457,7 +21457,7 @@ if ${ac_cv_lib_mfhdf_SDreaddata+:} false
+@@ -21467,7 +21467,7 @@ if ${ac_cv_lib_mfhdf_SDreaddata+:} false
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -23,7 +23,7 @@ Forwarded: not-needed
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -21488,7 +21488,7 @@ fi
+@@ -21498,7 +21498,7 @@ fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mfhdf_SDreaddata" >&5
  $as_echo "$ac_cv_lib_mfhdf_SDreaddata" >&6; }
  if test "x$ac_cv_lib_mfhdf_SDreaddata" = xyes; then :
@@ -32,7 +32,7 @@ Forwarded: not-needed
  else
    HDF_LIB_NAME=missing
  fi
-@@ -21503,7 +21503,7 @@ if ${ac_cv_lib_mfhdf_SDreaddata+:} false
+@@ -21513,7 +21513,7 @@ if ${ac_cv_lib_mfhdf_SDreaddata+:} false
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -41,7 +41,7 @@ Forwarded: not-needed
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -21534,7 +21534,7 @@ fi
+@@ -21544,7 +21544,7 @@ fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mfhdf_SDreaddata" >&5
  $as_echo "$ac_cv_lib_mfhdf_SDreaddata" >&6; }
  if test "x$ac_cv_lib_mfhdf_SDreaddata" = xyes; then :
diff --git a/debian/patches/series b/debian/patches/series
index aa1be10..a7979fc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,5 +7,4 @@ ecw-plugin
 mrsid-plugin
 spatialite
 java.opt
-hardening
 perl-vendor
diff --git a/debian/patches/spatialite b/debian/patches/spatialite
index 46d24de..a48c1f5 100644
--- a/debian/patches/spatialite
+++ b/debian/patches/spatialite
@@ -5,7 +5,7 @@ Forwarded: not-needed
 
 --- a/configure
 +++ b/configure
-@@ -25662,7 +25662,7 @@ if ${ac_cv_lib_spatialite_spatialite_ini
+@@ -25886,7 +25886,7 @@ if ${ac_cv_lib_spatialite_spatialite_ini
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -14,7 +14,7 @@ Forwarded: not-needed
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -25716,7 +25716,7 @@ if ${ac_cv_lib_spatialite_spatialite_ini
+@@ -25940,7 +25940,7 @@ if ${ac_cv_lib_spatialite_spatialite_ini
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -23,7 +23,7 @@ Forwarded: not-needed
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -25808,7 +25808,7 @@ if ${ac_cv_lib_spatialite_spatialite_tar
+@@ -26032,7 +26032,7 @@ if ${ac_cv_lib_spatialite_spatialite_tar
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gdal.git