This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch ubuntu-xenial in repository mapserver.
commit d849ff069ea2ba31343445c0f6e758b301d40cdf Author: Bas Couwenberg <[email protected]> Date: Wed Jan 18 23:38:33 2017 +0100 Imported Debian patch 7.0.0-9ubuntu3.1 --- debian/changelog | 2 +- debian/patches/CVE-2016-9839.patch | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6ea0f44..d915d3f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ mapserver (7.0.0-9ubuntu3.1) xenial-security; urgency=medium * Add upstream patches to fix CVE-2016-9839 & CVE-2017-5522. - (LP: 1648998) + (LP: #1648998) -- Bas Couwenberg <[email protected]> Wed, 18 Jan 2017 23:38:33 +0100 diff --git a/debian/patches/CVE-2016-9839.patch b/debian/patches/CVE-2016-9839.patch index 3365458..a9ba1f2 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 <[email protected]> Origin: https://github.com/mapserver/mapserver/commit/022d24bd34196b6dca67053fb797a6980210bc54 +Last-Update: 2017-01-24 ---- a/mapogr.cpp -+++ b/mapogr.cpp -@@ -1158,18 +1158,15 @@ msOGRFileOpen(layerObj *layer, const cha +Index: mapserver-7.0.0/mapogr.cpp +=================================================================== +--- mapserver-7.0.0.orig/mapogr.cpp 2017-01-24 09:12:57.751675311 -0500 ++++ mapserver-7.0.0/mapogr.cpp 2017-01-24 09:13:13.431845432 -0500 +@@ -1158,18 +1158,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; -@@ -1194,10 +1191,13 @@ msOGRFileOpen(layerObj *layer, const cha +@@ -1194,10 +1191,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 ); -@@ -1229,9 +1229,11 @@ msOGRFileOpen(layerObj *layer, const cha +@@ -1229,9 +1229,11 @@ } if (hLayer == NULL) { @@ -65,7 +68,7 @@ Origin: https://github.com/mapserver/mapserver/commit/022d24bd34196b6dca67053fb7 CPLFree( pszLayerDef ); msConnPoolRelease( layer, hDS ); return NULL; -@@ -1650,7 +1652,14 @@ static int msOGRFileWhichShapes(layerObj +@@ -1650,7 +1652,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; -@@ -1855,8 +1864,8 @@ msOGRFileNextShape(layerObj *layer, shap +@@ -1855,8 +1863,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 _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
