[mapserver] 05/07: Drop patches applied upstream.

[Bas Couwenberg]

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

sebastic pushed a commit to branch experimental
in repository mapserver.

commit 99994599332969665cbc7d74767eb5f0056d79a1
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue May 9 22:16:16 2017 +0200

    Drop patches applied upstream.
---
 debian/changelog                                   |  1 +
 ...Declare-nLayerOrder-where-it-s-used.-5387.patch | 25 ----------------------
 debian/patches/php-mapscript.patch                 | 18 ----------------
 debian/patches/series                              |  2 --
 4 files changed, 1 insertion(+), 45 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5b1b9ae..ffcfd40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 mapserver (7.0.5-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Drop patches applied upstream.
 
  -- Bas Couwenberg <sebastic at debian.org>  Tue, 09 May 2017 22:14:04 +0200
 
diff --git a/debian/patches/0001-Declare-nLayerOrder-where-it-s-used.-5387.patch b/debian/patches/0001-Declare-nLayerOrder-where-it-s-used.-5387.patch
deleted file mode 100644
index 1db6a69..0000000
--- a/debian/patches/0001-Declare-nLayerOrder-where-it-s-used.-5387.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Declare nLayerOrder where it's used.
- If LAYERS is specified multiple times in the query string, nLayerOrder isnt
- reset to 0, and this leads to memory corruption/double-free's upon exit.
-Author: Landry Breuil <breuil at craig.fr>
-Origin: https://github.com/mapserver/mapserver/commit/132695864b27bb6fced9a866f35365f445889a00
-Bug: https://github.com/mapserver/mapserver/issues/5387
-
---- a/mapwms.c
-+++ b/mapwms.c
-@@ -791,7 +791,6 @@ int msWMSLoadGetMapParams(mapObj *map, i
-                           const char *wms_request, owsRequestObj *ows_request)
- {
-   int i, adjust_extent = MS_FALSE, nonsquare_enabled = MS_FALSE;
--  int nLayerOrder = 0;
-   int transparent = MS_NOOVERRIDE;
-   int bbox_pixel_is_point = MS_FALSE;
-   outputFormatObj *format = NULL;
-@@ -870,6 +869,7 @@ int msWMSLoadGetMapParams(mapObj *map, i
- 
-     if (strcasecmp(names[i], "LAYERS") == 0) {
-       int  j, k, iLayer, *layerOrder;
-+      int nLayerOrder = 0;
-       char ***nestedGroups = NULL;
-       int *numNestedGroups = NULL;
-       int *isUsedInNestedGroup = NULL;
diff --git a/debian/patches/php-mapscript.patch b/debian/patches/php-mapscript.patch
deleted file mode 100644
index 560b933..0000000
--- a/debian/patches/php-mapscript.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Use include paths from php-config when include path not found.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/mapserver/mapserver/pull/5370
-Applied-Upstream: https://github.com/mapserver/mapserver/commit/37a70fff4ab54f12619833414cb1995643f7a10d
-
---- a/cmake/FindPHP5.cmake
-+++ b/cmake/FindPHP5.cmake
-@@ -86,6 +86,10 @@ IF(PHP5_CONFIG_EXECUTABLE)
- 
-   MESSAGE(STATUS ${PHP5_MAIN_INCLUDE_DIR})
- 
-+  IF(NOT PHP5_INCLUDE_PATH)
-+    set(PHP5_INCLUDE_PATH ${PHP5_INCLUDES})
-+  ENDIF(NOT PHP5_INCLUDE_PATH)
-+
-   IF(PHP5_VERSION LESS 5)
-     MESSAGE(FATAL_ERROR "PHP version is not 5 or later")
-   ENDIF(PHP5_VERSION LESS 5)
diff --git a/debian/patches/series b/debian/patches/series
index 6c87029..78cc1a1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,3 @@ hardening.patch
 perl-mapscript-install.patch
 ruby-mapscript-install.patch
 java-hardening.patch
-php-mapscript.patch
-0001-Declare-nLayerOrder-where-it-s-used.-5387.patch

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