[mapserver] 01/01: Imported Debian patch 7.0.1-3ubuntu0.1

[Bas Couwenberg]

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

sebastic pushed a commit to branch ubuntu-yakkety
in repository mapserver.

commit bfb2699c434471ee20ff6ae188167a346c745084
Author: Bas Couwenberg <sebastic at debian.org>
Date:   Wed Jan 18 23:41:26 2017 +0100

    Imported Debian patch 7.0.1-3ubuntu0.1
---
 debian/changelog                   |  2 +-
 debian/control                     |  3 ++-
 debian/patches/CVE-2016-9839.patch | 18 ++++++++++--------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index eb93e4d..ab96b6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 mapserver (7.0.1-3ubuntu0.1) yakkety-security; urgency=medium
 
   * Add upstream patches to fix CVE-2016-9839 & CVE-2017-5522.
-    (LP: 1648998)
+    (LP: #1648998)
 
  -- Bas Couwenberg <sebastic at debian.org>  Wed, 18 Jan 2017 23:41:26 +0100
 
diff --git a/debian/control b/debian/control
index d1cc2c2..e773f9e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,6 @@
 Source: mapserver
-Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>,
            Alan Boudreault <aboudreault at mapgears.com>,
            Bas Couwenberg <sebastic at debian.org>
diff --git a/debian/patches/CVE-2016-9839.patch b/debian/patches/CVE-2016-9839.patch
index 4b943ae..6d6e018 100644
--- a/debian/patches/CVE-2016-9839.patch
+++ b/debian/patches/CVE-2016-9839.patch
@@ -1,10 +1,13 @@
 Description: Backport #4928 and #5356
 Author: Thomas Bonfort <thomas.bonfort at gmail.com>
 Origin: https://github.com/mapserver/mapserver/commit/022d24bd34196b6dca67053fb797a6980210bc54
+Last-Update: 2017-01-24
 
---- a/mapogr.cpp
-+++ b/mapogr.cpp
-@@ -1166,18 +1166,15 @@ msOGRFileOpen(layerObj *layer, const cha
+Index: mapserver-7.0.1/mapogr.cpp
+===================================================================
+--- mapserver-7.0.1.orig/mapogr.cpp	2017-01-24 09:11:10.138507761 -0500
++++ mapserver-7.0.1/mapogr.cpp	2017-01-24 09:11:29.750720544 -0500
+@@ -1166,18 +1166,15 @@
      RELEASE_OGR_LOCK;
  
      if( hDS == NULL ) {
@@ -32,7 +35,7 @@ Origin: https://github.com/mapserver/mapserver/commit/022d24bd34196b6dca67053fb7
        CPLFree( pszDSName );
        CPLFree( pszLayerDef );
        return NULL;
-@@ -1202,10 +1199,13 @@ msOGRFileOpen(layerObj *layer, const cha
+@@ -1202,10 +1199,13 @@
      ACQUIRE_OGR_LOCK;
      hLayer = OGR_DS_ExecuteSQL( hDS, pszLayerDef, NULL, NULL );
      if( hLayer == NULL ) {
@@ -50,7 +53,7 @@ Origin: https://github.com/mapserver/mapserver/commit/022d24bd34196b6dca67053fb7
        RELEASE_OGR_LOCK;
        msConnPoolRelease( layer, hDS );
        CPLFree( pszLayerDef );
-@@ -1237,9 +1237,11 @@ msOGRFileOpen(layerObj *layer, const cha
+@@ -1237,9 +1237,11 @@
    }
  
    if (hLayer == NULL) {
@@ -65,7 +68,7 @@ Origin: https://github.com/mapserver/mapserver/commit/022d24bd34196b6dca67053fb7
      CPLFree( pszLayerDef );
      msConnPoolRelease( layer, hDS );
      return NULL;
-@@ -1662,7 +1664,14 @@ static int msOGRFileWhichShapes(layerObj
+@@ -1662,7 +1664,13 @@
  
      CPLErrorReset();
      if( OGR_L_SetAttributeFilter( psInfo->hLayer, pszOGRFilter ) != OGRERR_NONE ) {
@@ -73,7 +76,6 @@ Origin: https://github.com/mapserver/mapserver/commit/022d24bd34196b6dca67053fb7
 +      msSetError(MS_OGRERR,
 +                 "SetAttributeFilter(%s) failed on layer %s.",
 +                 "msOGRFileWhichShapes()",
-+                 layer->filter.string+6,
 +                 layer->filter.string+6, layer->name?layer->name:"(null)");
 +      msDebug("SetAttributeFilter(%s) failed on layer %s.\n%s", 
 +              layer->filter.string+6, layer->name?layer->name:"(null)", 
@@ -81,7 +83,7 @@ Origin: https://github.com/mapserver/mapserver/commit/022d24bd34196b6dca67053fb7
        RELEASE_OGR_LOCK;
        msFree(pszOGRFilter);
        return MS_FAILURE;
-@@ -1875,8 +1884,8 @@ msOGRFileNextShape(layerObj *layer, shap
+@@ -1875,8 +1883,8 @@
      if( (hFeature = OGR_L_GetNextFeature( psInfo->hLayer )) == NULL ) {
        psInfo->last_record_index_read = -1;
        if( CPLGetLastErrorType() == CE_Failure ) {

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