Pullup ticket #3816 - requested by obache

geography/mapserver: security update

Revisions pulled up:
- geography/mapserver/Makefile                                  1.34
- geography/mapserver/distinfo                                  1.7

---
   Module Name:	pkgsrc
   Committed By:	obache
   Date:		Sat Jun  2 11:16:58 UTC 2012

   Modified Files:
   	pkgsrc/geography/mapserver: Makefile distinfo

   Log Message:
   Update MapServer to 5.6.8.
   PR 46504 By Wen Heping.

   Version 5.6.8 (2012-02-08):
   ---------------------------

   - Fix security issue with quote escape in WFS GetFeature Filter (#4087)

   - Fix segfault on join with postgresql tables (#4074)

   - Define Z_BEST_COMPRESSION for newer libpng versions (#4033)

   - Fixes to support latest PROJ versions (#4008)

   Version 5.6.7 (2011-07-12):
   ---------------------------

   IMPORTANT SECURITY FIXES:

   -  Fixes to prevent SQL injections through OGC filter encoding (in WMS, WFS
       and SOS), as well as a potential SQL injection in WMS time support.
       Your system may be vulnerable if it has MapServer with OGC protocols
       enabled, with layers connecting to an SQL RDBMS backend, either
       natively or via OGR (#3903)

   -  Fixed potentially exploitable buffer overflows in OGC Filter Encoding
       support (#3903)

   Other Fixes:

   - Fixed PHP/MapScript ms_iogetstdoutbufferbytes() always returning 0 bytes
      written (#3041)

   - OGC Filter: fix segfault when a ows_varname_type or wfs_varname_type is
      defined but not a gml_varname_type (#3902)

   - Fixed mssql2008 to return correct geometries with chart layer type (#3894)

   - Fix segfault with png-inimage exceptions and quantize_force=on (#2903)

   - Fix segfault on malformed <PropertyIsLike> filters (#3888)

   - Fixed potential crash with AVERAGE resampling and crazy reprojection (#3886)

   - Fixed segmentation fault on invalid symbol (#3849)

   - add support for gml:Box for spatial filters (#3789)

   - Fixed false computation of symbol size when used as a brush on line (#3760)

   - Fixed SQL Spatial to be able to use UniqueIdentifier field as unique key (#3722)

   - Fixed possible seg. fault when using "OGR:Label*" special attributes (#3667)

   - Fixed bug with newlines around multipart boundaries in wcs multipart (#3672)

   Version 5.6.6 (2011-01-17):
   ---------------------------

   - SLD: Fix point symbolizer issue when color is not set (#3658)

   - Fix WMS EXCEPTIONS parameter issue with fastcgi (#3525)

   - Fixed missing time in msDrawMap logging (#3651)

   - Fixed Internal error with Oracle Spatial multi point geometries (#3627)

   - Fixed double free in shp2img.c (#3497)

   - Fixed free(): invalid next size in mapfile.c (#3604)

   - Fix for the memory corruption when mapping the string data type in the
      Java bindings (3491)

   - Correct wms 1.3.0 latlong bbox error (#2578)

   - Fix ProperyIsLike not used efficiently with Oracle (#3557)

   - Fixed msOGRGetSymbolId according to the changes in gdal 1.8 (#3556)

   - Fixed crash when drawing a map using UNIQUE fid in the layer data (#3271)

   - Fixed Oracle Spatial Data gets corrupt (#3541)

   - Fixed issue with multiple styles and binding (#3538)

   - Fixed multiple include tags not supported in xml mapfiles (#3530)

   - Ensure the class is not marked BeforeFieldInit causing memory corruption
      with C#/CLR4 (#3438)

   - Fixed MSSQL2008 driver returning invalid extent (#3498)

   - Fix computation of shape bounds when the first line contains no points
      (#3119)(fixes #3383)

   - Fixed error message tiles on zero-sized map cause memory allocation errors
      in maperror.c. (#3524)

2 files changed, 6 insertions, 7 deletions

diff --git a/geography/mapserver/Makefile b/geography/mapserver/Makefile
index a1ca0373823..f141f4b3726 100644
--- a/geography/mapserver/Makefile
+++ b/geography/mapserver/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.33 2012/02/06 12:40:15 wiz Exp $
+# $NetBSD: Makefile,v 1.33.2.1 2012/06/03 19:25:38 tron Exp $
 
-DISTNAME=	mapserver-5.6.5
-PKGREVISION=	6
+DISTNAME=	mapserver-5.6.8
 CATEGORIES=	geography www
 MASTER_SITES=	http://download.osgeo.org/mapserver/
 
diff --git a/geography/mapserver/distinfo b/geography/mapserver/distinfo
index e1b63fa89ba..77d07d5f8f4 100644
--- a/geography/mapserver/distinfo
+++ b/geography/mapserver/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2010/07/30 12:51:22 adam Exp $
+$NetBSD: distinfo,v 1.6.14.1 2012/06/03 19:25:38 tron Exp $
 
-SHA1 (mapserver-5.6.5.tar.gz) = cb3db7093ceef9ec5af64b9c2a66382d09429972
-RMD160 (mapserver-5.6.5.tar.gz) = 0fef37adfaa4f71cec06bae41bbc494904786174
-Size (mapserver-5.6.5.tar.gz) = 2314003 bytes
+SHA1 (mapserver-5.6.8.tar.gz) = 44b813f888c8c950f5e2ba20ae4d7ef08d002bc4
+RMD160 (mapserver-5.6.8.tar.gz) = dd00c7e6ed57b3522f47a7fede8299bd8ef12566
+Size (mapserver-5.6.8.tar.gz) = 2332277 bytes
 SHA1 (patch-aa) = d842afeab3455304236bebbf4ea576c974cafbdd
 SHA1 (patch-ab) = f1521546905034304bc5f1556625d6171421d93d