[mapserver] 01/02: Merge tag 'debian/7.0.3-1' into ubuntu/trusty

[Bas Couwenberg]

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

sebastic pushed a commit to branch ubuntu/trusty
in repository mapserver.

commit 19d07e610471e84a4ddf0b0d0af3601c0ff9cd93
Merge: dafbfa6 9a99fd3
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Dec 5 22:21:24 2016 +0100

    Merge tag 'debian/7.0.3-1' into ubuntu/trusty
    
    Conflicts:
    	debian/changelog

 CMakeLists.txt               |    4 +-
 README                       |    3 +-
 README.WIN32                 |    2 +-
 cmake/FindICONV.cmake        |    2 +-
 cmake/FindPHP5.cmake         |   29 +-
 debian/changelog             |   16 +
 debian/libmapserver2.symbols |    5 +-
 debian/rules                 |    5 +-
 fontcache.c                  |    6 +
 maplayer.c                   |   29 +-
 maplexer.c                   | 2387 +++++++++++++++++++++---------------------
 maplexer.l                   |    2 +-
 mapmssql2008.c               |  158 ++-
 mapogcfilter.c               |   65 +-
 mapogcfilter.h               |    2 +
 mapogcfiltercommon.c         |   42 +-
 mapogr.cpp                   |  614 ++++++++---
 mappostgis.c                 |   10 +-
 mapquery.c                   |    4 +-
 mapscript/csharp/csmodule.i  |    6 +
 mapscript/php/CMakeLists.txt |   10 +-
 mapscript/php/error.c        |   11 +
 mapscript/php/owsrequest.c   |    5 +-
 mapserv.c                    |    2 +
 mapserver.h                  |    9 +-
 maputfgrid.cpp               |    8 +-
 mapwfs.c                     |   14 +-
 27 files changed, 2054 insertions(+), 1396 deletions(-)

diff --cc debian/changelog
index 8d8073b,bcc1409..755b74f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,19 +1,26 @@@
+ mapserver (7.0.3-1) unstable; urgency=high
+ 
+   * New upstream release.
+     - Fixes CVE-2016-9839
+   * Update symbols for amd64.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Mon, 05 Dec 2016 21:44:37 +0100
+ 
+ mapserver (7.0.2-2) unstable; urgency=medium
+ 
+   * Enable pie hardening flags.
+     (closes: #844892)
+   * Drop unused overrides for hardening-no-pie.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sat, 19 Nov 2016 10:39:25 +0100
+ 
 +mapserver (7.0.2-1~trusty1) trusty; urgency=medium
 +
 +  * Rebuild for trusty.
 +  * Update branch in gbp.conf & Vcs-Git URL.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Mon, 26 Sep 2016 22:49:00 +0200
 +
  mapserver (7.0.2-1) unstable; urgency=medium
  
    * Update symbols for other architectures.

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