CMakeLists.txt

@@ -16,8 +16,8 @@ include(CheckCSourceCompiles)
 
 
 set (MapServer_VERSION_MAJOR 7)
-set (MapServer_VERSION_MINOR 2)
-set (MapServer_VERSION_REVISION 2)
+set (MapServer_VERSION_MINOR 4)
+set (MapServer_VERSION_REVISION 0)
 set (MapServer_VERSION_SUFFIX "")
 
 set(TARGET_VERSION_MAJOR ${MapServer_VERSION_MAJOR})
@@ -33,6 +33,10 @@ endif(MapServer_IS_DEV_VERSION)
 MATH(EXPR MapServer_VERSION_NUM "${MapServer_VERSION_MAJOR}*10000+${MapServer_VERSION_MINOR}*100+${MapServer_VERSION_REVISION}")
 
 SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
+
+# Add custom function to check Python modules are installed
+include(FindPythonModule)
+
 if (APPLE)
   set(CMAKE_FIND_FRAMEWORK "LAST")
 endif (APPLE)
@@ -142,6 +146,7 @@ option(WITH_THREAD_SAFETY "Choose if a thread-safe version of libmapserver shoul
 option(WITH_GIF "Enable GIF support (for PIXMAP loading)" ON)
 option(WITH_PYTHON "Enable Python mapscript support" OFF)
 option(WITH_PHP "Enable PHP mapscript support" OFF)
+option(WITH_PHPNG "Enable PHPNG (SWIG) mapscript support" OFF)
 option(WITH_PERL "Enable Perl mapscript support" OFF)
 option(WITH_RUBY "Enable Ruby mapscript support" OFF)
 option(WITH_JAVA "Enable Java mapscript support" OFF)
@@ -864,6 +869,11 @@ if(WITH_PHP)
    set(USE_PHP_MAPSCRIPT 1)
 endif(WITH_PHP)
 
+if(WITH_PHPNG)
+   add_subdirectory("mapscript/phpng")
+   set(USE_PHPNG_MAPSCRIPT 1)
+endif(WITH_PHPNG)
+
 if(WITH_APACHE_MODULE)
    add_subdirectory("apache")
    set(USE_APACHE_MODULE 1)
@@ -896,6 +906,9 @@ endif(UNIX)
 
 if (WIN32)
     ms_link_libraries( ${MS_EXTERNAL_LIBS} ws2_32.lib)
+    if (MSVC)
+        set_target_properties(mapserver PROPERTIES COMPILE_FLAGS "/wd4267 /wd4244 /wd4018")
+    endif(MSVC)
 endif (WIN32)
 
 configure_file (
@@ -982,6 +995,7 @@ status_optional_feature("XML Mapfile support" "${USE_XMLMAPFILE}")
 message(STATUS " * Mapscripts")
 status_optional_feature("Python" "${USE_PYTHON_MAPSCRIPT}")
 status_optional_feature("PHP" "${USE_PHP_MAPSCRIPT}")
+status_optional_feature("PHPNG" "${USE_PHPNG_MAPSCRIPT}")
 status_optional_feature("PERL" "${USE_PERL_MAPSCRIPT}")
 status_optional_feature("RUBY" "${USE_RUBY_MAPSCRIPT}")
 status_optional_feature("JAVA" "${USE_JAVA_MAPSCRIPT}")

HISTORY.TXT

@@ -12,6 +12,41 @@ For a complete change history, please see the Git log comments.  For more
 details about recent point releases, please see the online changelog at:
 http://mapserver.org/development/changelog/
 
+7.4.0 release (2019-5-14)
+-------------------------
+
+- No major changes, see detailed changelog for bug fixes
+
+7.4.0-rc2 release (2019-5-10)
+----------------------------
+
+- No major changes, see detailed changelog for bug fixes
+
+7.4.0-rc1 release (2019-5-1)
+----------------------------
+
+- No major changes, see detailed changelog for bug fixes
+
+7.4.0-beta2 release (2019-4-17)
+-------------------------------
+
+- Addresses XSS issue with [layers] template tag (fix available in 6.4, 7.0 and 7.2 branches as well)
+
+- Added Perl/Mapscript to Travis CI
+
+- No other major changes, see detailed changelog for bug fixes
+
+7.4.0-beta1 release (2019-3-29)
+-------------------------------
+
+- Python MapScript binding is available as installable Wheels with a full test suite and examples
+
+- C# MapScript binding is now compatible with .NET Core
+
+- PHP 7 MapScript binding support - both PHP/MapScript and Swig/MapScript
+
+- Added workaround to allow compiling against Proj 6 (#5766)
+
 7.2.2 release (2019-2-19)
 --------------------------
 
@@ -26,11 +61,13 @@ http://mapserver.org/development/changelog/
 --------------------------
 
 - Fixed issue with ring handling with polygons in MVT support (#5626)
+
 - No other major changes, see detailed changelog for bug fixes
 
 7.2.0-beta2 release (2018-6-13)
 
 - Update beta1 release notes to remove reference to PHP7 support
+
 - No other major changes, see detailed changelog for bug fixes
 
 7.2.0-beta1 release (2018-5-9)

INSTALL.CMAKE

@@ -147,7 +147,7 @@ Refer to the CMakeLists.txt file for up-to-date options.
  - option(WITH_THREAD_SAFETY "Choose if a thread-safe version of libmapserver should be built (only recommended for some mapscripts)" OFF)
  - option(WITH_GIF "Enable GIF support (for PIXMAP loading)" ON)
  - option(WITH_PYTHON "Enable Python mapscript support" OFF)
- - option(WITH_PHP "Enable Python mapscript support" OFF)
+ - option(WITH_PHP "Enable PHP mapscript support" OFF)
  - option(WITH_PERL "Enable Perl mapscript support" OFF)
  - option(WITH_RUBY "Enable Ruby mapscript support" OFF)
  - option(WITH_JAVA "Enable Java mapscript support" OFF)

Makefile

@@ -2,12 +2,14 @@ AUTOTEST_OPTS=-strict -q
 PHP_MAPSCRIPT=build/mapscript/php/php_mapscript.so
 PYTHON_MAPSCRIPT_PATH=build/mapscript/python
 JAVA_MAPSCRIPT_PATH=build/mapscript/java
+CSHARP_MAPSCRIPT_PATH=build/mapscript/csharp
+PERL_MAPSCRIPT_PATH=build/mapscript/perl
 BUILDPATH=../../build
 FLEX=flex
 YACC=yacc
 CMAKEFLAGS=-DCMAKE_C_FLAGS="--coverage" -DCMAKE_CXX_FLAGS="--coverage" \
 			  -DCMAKE_SHARED_LINKER_FLAGS="-lgcov" -DWITH_CLIENT_WMS=1 \
-			  -DWITH_CLIENT_WFS=1 -DWITH_KML=1 -DWITH_SOS=1 -DWITH_PHP=1 \
+			  -DWITH_CLIENT_WFS=1 -DWITH_KML=1 -DWITH_SOS=1 -DWITH_CSHARP=1 -DWITH_PHP=1 -DWITH_PERL=1 \
 			  -DWITH_PYTHON=1 -DWITH_JAVA=1 -DWITH_THREAD_SAFETY=1 -DWITH_FRIBIDI=1 -DWITH_FCGI=0 -DWITH_EXEMPI=1 \
 			  -DCMAKE_BUILD_TYPE=Release -DWITH_RSVG=1 -DWITH_CURL=1 -DWITH_HARFBUZZ=1 -DWITH_POINT_Z_M=1
 all: cmakebuild
@@ -37,16 +39,35 @@ query-testcase:
 mspython-testcase:
 	test -f "$(PYTHON_MAPSCRIPT_PATH)/_mapscript.so" && (export PYTHONPATH="../../$(PYTHON_MAPSCRIPT_PATH)" && cd msautotest/mspython && python run_all_tests.py)
 
+mspython-wheel:
+	cd build && cmake --build . --target pythonmapscript-wheel
+
 php-testcase:
 	test -f "$(PHP_MAPSCRIPT)" && (export PHP_MAPSCRIPT_SO="../../$(PHP_MAPSCRIPT)" && cd msautotest/php && ./run_test.sh)
 
 java-testcase:
 	test -d "$(JAVA_MAPSCRIPT_PATH)" && (export JAVA_MAPSCRIPT_SO="../../$(JAVA_MAPSCRIPT_PATH)" && cd mapscript/java && ./run_test.sh)
 
+csharp-testcase:
+	test -d "$(CSHARP_MAPSCRIPT_PATH)" && (export CSHARP_MAPSCRIPT_SO="../../$(CSHARP_MAPSCRIPT_PATH)" && cd mapscript/csharp && ./run_test.sh)
+
+perl-testcase:
+	cd "$(PERL_MAPSCRIPT_PATH)" \
+	&& PERL5LIB=`pwd` \
+	&& prove tests \
+	&& perl examples/RFC24.pl ../../../tests/test.map \
+	&& perl examples/shp_in_shp.pl --infile1 ../../../tests/line.shp --infile1_shpid 0 --infile2 ../../../tests/polygon.shp --infile2_shpid 0 \
+	&& perl examples/dump.pl --file ../../../tests/line.shp \
+	&& perl examples/thin.pl --input ../../../tests/polygon --output examples/junk --tolerance=5
+
+
+
 test:  cmakebuild
 	@$(MAKE) $(MFLAGS)	wxs-testcase renderers-testcase misc-testcase gdal-testcase query-testcase mspython-testcase
 	@./print-test-results.sh
 	@$(MAKE) $(MFLAGS)	php-testcase
+	@$(MAKE) $(MFLAGS)	csharp-testcase
+	@$(MAKE) $(MFLAGS)	perl-testcase
 
 
 lexer: maplexer.c

cmake/FindPHP.cmake

+# - Find PHP
+# This module finds if PHP is installed and determines where the include files
+# and libraries are. It also determines what the name of the library is. This
+# code sets the following variables:
+#
+#  PHP_INCLUDE_PATH       = path to where php.h can be found
+#  PHP_EXECUTABLE         = full path to the php binary
+#
+
+SET(PHP_FOUND "NO")
+
+SET(PHP_POSSIBLE_INCLUDE_PATHS
+  /usr/include/php
+  /usr/local/include/php
+  /usr/include/php
+  /usr/local/include/php
+  /usr/local/apache/php
+  ${PHP_INCLUDES}
+)
+
+find_library(PHP_LIBRARY NAMES php5ts php5 php7ts php7 PATHS /sw /opt/local)
+
+if(WIN32)
+  string(SUBSTRING $ENV{VSCMD_VER} 0 2 VSCMD_VER)
+  SET(PHP_INCLUDE_PATH "C:/php-sdk/phpmaster/vc${VSCMD_VER}/$ENV{VSCMD_ARG_TGT_ARCH}/php-src")
+  SET(PHP_POSSIBLE_INCLUDE_PATHS ${PHP_INCLUDE_PATH})
+  if(CMAKE_CL_64)
+    SET(PHP_INCLUDE_PATH "${PHP_INCLUDE_PATH}/$ENV{PLATFORM}")
+  endif(CMAKE_CL_64)
+  if(WITH_THREAD_SAFETY)
+    SET(PHP_INCLUDE_PATH "${PHP_INCLUDE_PATH}/Release_TS")
+    SET(PHP_LIBRARY_NAMES php5ts php7ts)
+  else(WITH_THREAD_SAFETY)
+    SET(PHP_INCLUDE_PATH "${PHP_INCLUDE_PATH}/Release")
+    SET(PHP_LIBRARY_NAMES php5 php7)
+  endif(WITH_THREAD_SAFETY)
+    find_library(PHP_LIBRARY NAMES ${PHP_LIBRARY_NAMES} PATHS ${PHP_INCLUDE_PATH})
+endif(WIN32)
+
+
+FIND_PATH(PHP_FOUND_INCLUDE_PATH main/php.h ${PHP_POSSIBLE_INCLUDE_PATHS})
+
+IF(PHP_FOUND_INCLUDE_PATH)
+  SET(php_paths "${PHP_POSSIBLE_INCLUDE_PATHS}")
+  FOREACH(php_path Zend main TSRM)
+    SET(php_paths ${php_paths} "${PHP_FOUND_INCLUDE_PATH}/${php_path}")
+  ENDFOREACH(php_path Zend main TSRM)
+  SET(PHP_INCLUDE_PATH "${php_paths}" INTERNAL "PHP include paths")
+ENDIF(PHP_FOUND_INCLUDE_PATH)
+
+FIND_PROGRAM(PHP_EXECUTABLE
+  NAMES php
+  PATHS
+  /usr/local/bin
+  )
+
+MARK_AS_ADVANCED(
+  PHP_EXECUTABLE
+  PHP_FOUND_INCLUDE_PATH
+  )
+
+IF( NOT PHP_CONFIG_EXECUTABLE )
+FIND_PROGRAM(PHP_CONFIG_EXECUTABLE
+  NAMES php-config
+  )
+ENDIF( NOT PHP_CONFIG_EXECUTABLE )
+
+IF(PHP_CONFIG_EXECUTABLE)
+  EXECUTE_PROCESS(COMMAND ${PHP_CONFIG_EXECUTABLE} --version
+    OUTPUT_VARIABLE PHP_VERSION)
+  STRING(REPLACE "\n" "" PHP_VERSION "${PHP_VERSION}")
+
+  EXECUTE_PROCESS(COMMAND ${PHP_CONFIG_EXECUTABLE} --extension-dir
+    OUTPUT_VARIABLE PHP_EXTENSION_DIR)
+  STRING(REPLACE "\n" "" PHP_EXTENSION_DIR "${PHP_EXTENSION_DIR}")
+
+  EXECUTE_PROCESS(COMMAND ${PHP_CONFIG_EXECUTABLE} --includes
+    OUTPUT_VARIABLE PHP_INCLUDES)
+  STRING(REPLACE "-I" "" PHP_INCLUDES "${PHP_INCLUDES}")
+  STRING(REPLACE " " ";" PHP_INCLUDES "${PHP_INCLUDES}")
+  STRING(REPLACE "\n" "" PHP_INCLUDES "${PHP_INCLUDES}")
+  LIST(GET PHP_INCLUDES 0 PHP_INCLUDE_DIR)
+
+  set(PHP_MAIN_INCLUDE_DIR ${PHP_INCLUDE_DIR}/main)
+  set(PHP_TSRM_INCLUDE_DIR ${PHP_INCLUDE_DIR}/TSRM)
+  set(PHP_ZEND_INCLUDE_DIR ${PHP_INCLUDE_DIR}/Zend)
+  set(PHP_REGEX_INCLUDE_DIR ${PHP_INCLUDE_DIR}/regex)
+  set(PHP_EXT_INCLUDE_DIR ${PHP_INCLUDE_DIR}/ext)
+  set(PHP_DATE_INCLUDE_DIR ${PHP_INCLUDE_DIR}/ext/date/lib)
+  set(PHP_STANDARD_INCLUDE_DIR ${PHP_INCLUDE_DIR}/ext/standard)
+
+  MESSAGE(STATUS ${PHP_MAIN_INCLUDE_DIR})
+
+  IF(NOT PHP_INCLUDE_PATH)
+    set(PHP_INCLUDE_PATH ${PHP_INCLUDES})
+  ENDIF(NOT PHP_INCLUDE_PATH)
+
+  IF(PHP_VERSION LESS 5)
+    MESSAGE(FATAL_ERROR "PHP version is not 5 or later")
+  ENDIF(PHP_VERSION LESS 5)
+
+  IF(PHP_EXECUTABLE AND PHP_INCLUDES)
+    set(PHP_FOUND "yes")
+    MESSAGE(STATUS "Found PHP-Version ${PHP_VERSION} (using ${PHP_CONFIG_EXECUTABLE})")
+  ENDIF(PHP_EXECUTABLE AND PHP_INCLUDES)
+
+  FIND_PROGRAM(PHPUNIT_EXECUTABLE
+    NAMES phpunit phpunit2
+    PATHS
+    /usr/local/bin
+  )
+
+  IF(PHPUNIT_EXECUTABLE)
+    MESSAGE(STATUS "Found phpunit: ${PHPUNIT_EXECUTABLE}")
+  ENDIF(PHPUNIT_EXECUTABLE)
+
+ENDIF(PHP_CONFIG_EXECUTABLE)

cmake/FindPHP5.cmake

-# - Find PHP5
-# This module finds if PHP5 is installed and determines where the include files
-# and libraries are. It also determines what the name of the library is. This
-# code sets the following variables:
-#
-#  PHP5_INCLUDE_PATH       = path to where php.h can be found
-#  PHP5_EXECUTABLE         = full path to the php4 binary
-#
-#  file is derived from FindPHP4.cmake
-#
-
-SET(PHP5_FOUND "NO")
-
-SET(PHP5_POSSIBLE_INCLUDE_PATHS
-  /usr/include/php5
-  /usr/local/include/php5
-  /usr/include/php
-  /usr/local/include/php
-  /usr/local/apache/php
-  ${PHP5_INCLUDES}
-  )
-
-SET(PHP5_POSSIBLE_LIB_PATHS
-  /usr/lib
-if(WIN32)
-  ${PHP5_INCLUDES}/Release_TS
-endif(WIN32)
-  )
-
-find_library(PHP5_LIBRARY
-   NAMES php5ts.lib
-   PATHS /sw /opt/local ${PHP5_INCLUDES}/Release_TS
-)
-  
-FIND_PATH(PHP5_FOUND_INCLUDE_PATH main/php.h
-  ${PHP5_POSSIBLE_INCLUDE_PATHS})
-
-IF(PHP5_FOUND_INCLUDE_PATH)
-  SET(php5_paths "${PHP5_POSSIBLE_INCLUDE_PATHS}")
-  FOREACH(php5_path Zend main TSRM)
-    SET(php5_paths ${php5_paths} "${PHP5_FOUND_INCLUDE_PATH}/${php5_path}")
-  ENDFOREACH(php5_path Zend main TSRM)
-  SET(PHP5_INCLUDE_PATH "${php5_paths}" INTERNAL "PHP5 include paths")
-ENDIF(PHP5_FOUND_INCLUDE_PATH)
-
-FIND_PROGRAM(PHP5_EXECUTABLE
-  NAMES php5 php
-  PATHS
-  /usr/local/bin
-  )
-
-MARK_AS_ADVANCED(
-  PHP5_EXECUTABLE
-  PHP5_FOUND_INCLUDE_PATH
-  )
-
-IF( NOT PHP5_CONFIG_EXECUTABLE )
-FIND_PROGRAM(PHP5_CONFIG_EXECUTABLE
-  NAMES php5-config php-config
-  )
-ENDIF( NOT PHP5_CONFIG_EXECUTABLE )
-
-IF(PHP5_CONFIG_EXECUTABLE)
-  EXECUTE_PROCESS(COMMAND ${PHP5_CONFIG_EXECUTABLE} --version
-    OUTPUT_VARIABLE PHP5_VERSION)
-  STRING(REPLACE "\n" "" PHP5_VERSION "${PHP5_VERSION}")
-
-  EXECUTE_PROCESS(COMMAND ${PHP5_CONFIG_EXECUTABLE} --extension-dir
-    OUTPUT_VARIABLE PHP5_EXTENSION_DIR)
-  STRING(REPLACE "\n" "" PHP5_EXTENSION_DIR "${PHP5_EXTENSION_DIR}")
-
-  EXECUTE_PROCESS(COMMAND ${PHP5_CONFIG_EXECUTABLE} --includes
-    OUTPUT_VARIABLE PHP5_INCLUDES)
-  STRING(REPLACE "-I" "" PHP5_INCLUDES "${PHP5_INCLUDES}")
-  STRING(REPLACE " " ";" PHP5_INCLUDES "${PHP5_INCLUDES}")
-  STRING(REPLACE "\n" "" PHP5_INCLUDES "${PHP5_INCLUDES}")
-  LIST(GET PHP5_INCLUDES 0 PHP5_INCLUDE_DIR)
-
-  set(PHP5_MAIN_INCLUDE_DIR ${PHP5_INCLUDE_DIR}/main)
-  set(PHP5_TSRM_INCLUDE_DIR ${PHP5_INCLUDE_DIR}/TSRM)
-  set(PHP5_ZEND_INCLUDE_DIR ${PHP5_INCLUDE_DIR}/Zend)
-  set(PHP5_REGEX_INCLUDE_DIR ${PHP5_INCLUDE_DIR}/regex)
-  set(PHP5_EXT_INCLUDE_DIR ${PHP5_INCLUDE_DIR}/ext)
-  set(PHP5_DATE_INCLUDE_DIR ${PHP5_INCLUDE_DIR}/ext/date/lib)
-  set(PHP5_STANDARD_INCLUDE_DIR ${PHP5_INCLUDE_DIR}/ext/standard)
-
-  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)
-
-  IF(PHP5_EXECUTABLE AND PHP5_INCLUDES)
-    set(PHP5_FOUND "yes")
-    MESSAGE(STATUS "Found PHP5-Version ${PHP5_VERSION} (using ${PHP5_CONFIG_EXECUTABLE})")
-  ENDIF(PHP5_EXECUTABLE AND PHP5_INCLUDES)
-
-  FIND_PROGRAM(PHPUNIT_EXECUTABLE
-    NAMES phpunit phpunit2
-    PATHS
-    /usr/local/bin
-  )
-
-  IF(PHPUNIT_EXECUTABLE)
-    MESSAGE(STATUS "Found phpunit: ${PHPUNIT_EXECUTABLE}")
-  ENDIF(PHPUNIT_EXECUTABLE)
-
-ENDIF(PHP5_CONFIG_EXECUTABLE)

cmake/FindPythonModule.cmake

+# Find if a Python module is installed
+# Found at http://www.cmake.org/pipermail/cmake/2011-January/041666.html
+# To use do: find_python_module(PyQt4 REQUIRED)
+function(find_python_module module)
+	string(TOUPPER ${module} module_upper)
+	if(NOT PY_${module_upper})
+		if(ARGC GREATER 1 AND ARGV1 STREQUAL "REQUIRED")
+			set(${module}_FIND_REQUIRED TRUE)
+		endif()
+		# A module's location is usually a directory, but for binary modules
+		# it's a .so file.
+		execute_process(COMMAND "${PYTHON_EXECUTABLE}" "-c" 
+			"import re, ${module}; print(re.compile('/__init__.py.*').sub('',${module}.__file__))"
+			RESULT_VARIABLE _${module}_status 
+			OUTPUT_VARIABLE _${module}_location
+			ERROR_QUIET 
+			OUTPUT_STRIP_TRAILING_WHITESPACE)
+		if(NOT _${module}_status)
+			set(PY_${module_upper} ${_${module}_location} CACHE STRING 
+				"Location of Python module ${module}")
+		endif(NOT _${module}_status)
+	endif(NOT PY_${module_upper})
+	find_package_handle_standard_args(PY_${module} DEFAULT_MSG PY_${module_upper})
+endfunction(find_python_module)

debian/changelog

-mapserver (7.2.2-2) UNRELEASED; urgency=medium
+mapserver (7.4.0-1) unstable; urgency=medium
 
-  * Remove package name from lintian overrides.
+  * Update symbols for other architectures.
+  * Update gbp.conf to use --source-only-changes by default.
+  * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Sun, 07 Jul 2019 08:41:08 +0200
+
+mapserver (7.4.0-1~exp1) experimental; urgency=medium
+
+  * New upstream release.
+  * Update 7.4.0~rc2 symbols for other architectures.
+  * Update 7.4.0 symbols for amd64.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Tue, 14 May 2019 17:28:54 +0200
+
+mapserver (7.4.0~rc2-1~exp1) experimental; urgency=medium
+
+  * New upstream release candidate.
+  * Update symbols for other architectures.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Fri, 10 May 2019 16:54:50 +0200
+
+mapserver (7.4.0~rc1-1~exp1) experimental; urgency=medium
 
- -- Bas Couwenberg <sebastic@debian.org>  Fri, 15 Mar 2019 15:48:31 +0100
+  * New upstream release candidate.
+  * Update 7.4.0~beta2 symbols for other architectures.
+  * Update 7.4.0~rc1 symbols for amd64.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Thu, 02 May 2019 06:27:49 +0200
+
+mapserver (7.4.0~beta2-1~exp1) experimental; urgency=medium
+
+  * New upstream beta release.
+  * Update symbols for other architectures.
+  * Drop patches applied upstream. Refresh remaining patches.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Thu, 18 Apr 2019 06:30:22 +0200
+
+mapserver (7.4.0~beta1-1~exp1) experimental; urgency=medium
+
+  * New upstream beta release.
+  * Remove package name from lintian overrides.
+  * Re-enable PHP MapScript, support for PHP 7 available now.
+  * Add python-setuptools to build dependencies.
+  * Switch Python MapScript to Python 3.
+  * Drop Ruby MapScript, causes FTBFS.
+  * Update symbols for amd64.
+  * Add patch to fix spelling errors.
+  * Use ttf-bitstream-vera instead of embedded copy.
+  * Add patch for shebang in Python MapScript example scripts.
+  * Set INSTALL_LIB_DIR to Multi-Arch path.
+  * Move all CMake options to dh_auto_configure override.
+  * Also build PHPNG MapScript (based on SWIG).
+  * Drop unused shlibs:Depends from cgi-mapserver package.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Sat, 30 Mar 2019 09:59:55 +0100
 
 mapserver (7.2.2-1) unstable; urgency=medium
 

debian/control

@@ -6,7 +6,7 @@ Uploaders: Francesco Paolo Lovergine <frankie@debian.org>,
 Section: devel
 Priority: optional
 Build-Depends: debhelper (>= 9.20160114),
-#               dh-php,
+               dh-php,
                dh-python,
                dpkg-dev (>= 1.16.1.1),
                cmake (>= 2.8.12.1-1.2),
@@ -32,15 +32,13 @@ Build-Depends: debhelper (>= 9.20160114),
                libxml2-dev,
                libxslt1-dev,
                zlib1g-dev (>= 1.1.4),
-#               php-dev,
+               php-dev,
                pkg-config,
                pkg-kde-tools,
                protobuf-c-compiler,
-               python-all (>= 2.6.6-3~),
-               python-all-dev (>= 2.6.6-3~),
-               ruby,
-               ruby-all-dev,
-               gem2deb,
+               python3-all,
+               python3-all-dev,
+               python3-setuptools,
                swig,
                docbook2x,
                docbook-xsl,
@@ -62,9 +60,9 @@ Suggests: cgi-mapserver,
           mapserver-bin,
           mapserver-doc,
           libmapscript-perl,
-#          php-mapscript,
-          python-mapscript,
-          ruby-mapscript
+          php-mapscript,
+          php-mapscript-ng,
+          python3-mapscript
 Pre-Depends: ${misc:Pre-Depends}
 Description: Shared library for MapServer
  This package contains the shared library.
@@ -83,9 +81,9 @@ Suggests: cgi-mapserver,
           mapserver-bin,
           mapserver-doc,
           libmapscript-perl,
-#          php-mapscript,
-          python-mapscript,
-          ruby-mapscript
+          php-mapscript,
+          php-mapscript-ng,
+          python3-mapscript
 Breaks: libmapserver-6.2.1-dev (<< 6.4.0-1~),
         libmapserver1-dev (<< 7.0.0~)
 Replaces: libmapserver-6.2.1-dev (<< 6.4.0-1~),
@@ -102,13 +100,12 @@ Package: cgi-mapserver
 Architecture: any
 Section: web
 Depends: mapserver-bin,
-         ${shlibs:Depends},
          ${misc:Depends}
 Suggests: mapserver-doc,
           libmapscript-perl,
-#          php-mapscript,
-          python-mapscript,
-          ruby-mapscript
+          php-mapscript,
+          php-mapscript-ng,
+          python3-mapscript
 Description: CGI executable for MapServer
  This package contains the mapserv CGI program. It provides the
  MapServer template language, and can be used to implement Web Map
@@ -128,9 +125,9 @@ Suggests: cgi-mapserver,
           mapserver-doc,
           shapelib,
           libmapscript-perl,
-#          php-mapscript,
-          python-mapscript,
-          ruby-mapscript
+          php-mapscript,
+          php-mapscript-ng,
+          python3-mapscript
 Description: MapServer utilities
  This package provides command-line utilities for MapServer.
  .
@@ -145,9 +142,9 @@ Section: doc
 Depends: ${misc:Depends}
 Suggests: cgi-mapserver,
           libmapscript-perl,
-#          php-mapscript,
-          python-mapscript,
-          ruby-mapscript
+          php-mapscript,
+          php-mapscript-ng,
+          python3-mapscript
 Description: documentation for MapServer
  This package provides some brief documentation for MapServer.
  .
@@ -156,19 +153,37 @@ Description: documentation for MapServer
  functionality in MapScript is provided by the suggested mapscript
  library packages.
 
-#Package: php-mapscript
-#Architecture: any
-#Section: php
-#Depends: ${php:Depends},
-#         ${shlibs:Depends},
-#         ${misc:Depends}
-#Suggests: mapserver-bin,
-#          mapserver-doc
-#Description: php-cgi module for MapServer
-# PHP MapScript provides MapServer functions for PHP scripts.
-# .
-# MapServer is a CGI-based framework for Internet map services which
-# supports Open Geospatial Consortium (OGC) standards.
+Package: php-mapscript
+Architecture: any
+Section: php
+Depends: ${php:Depends},
+         ${shlibs:Depends},
+         ${misc:Depends}
+Suggests: mapserver-bin,
+          mapserver-doc
+Description: php-cgi module for MapServer
+ PHP MapScript provides MapServer functions for PHP scripts.
+ .
+ MapServer is a CGI-based framework for Internet map services which
+ supports Open Geospatial Consortium (OGC) standards.
+ .
+ This package provides the traditional MapScript for PHP.
+
+Package: php-mapscript-ng
+Architecture: any
+Section: php
+Depends: ${php:Depends},
+         ${shlibs:Depends},
+         ${misc:Depends}
+Suggests: mapserver-bin,
+          mapserver-doc
+Description: PHP MapServer module (SWIG)
+ PHP MapScript provides MapServer functions for PHP scripts.
+ .
+ MapServer is a CGI-based framework for Internet map services which
+ supports Open Geospatial Consortium (OGC) standards.
+ .
+ This package provides MapScript for PHP based on SWIG.
 
 Package: libmapscript-perl
 Architecture: any
@@ -187,47 +202,22 @@ Description: Perl MapServer module
  MapServer is a CGI-based framework for Internet map services which
  supports Open Geospatial Consortium (OGC) standards.
 
-Package: python-mapscript
+Package: python3-mapscript
 Architecture: any
 Section: python
-Depends: ${python:Depends},
+Depends: ttf-bitstream-vera,
+         ${python3:Depends},
          ${shlibs:Depends},
          ${misc:Depends}
 Suggests: mapserver-bin,
           mapserver-doc
-Provides: ${python:Provides}
+Provides: ${python3:Provides}
 Description: Python library for MapServer
  Python MapScript provides MapServer functions for Python scripts.
  .
  MapServer is a CGI-based framework for Internet map services which
  supports Open Geospatial Consortium (OGC) standards.
 
-Package: ruby-mapscript
-Architecture: any
-Section: ruby
-Depends: ruby | ruby-interpreter,
-         ${shlibs:Depends},
-         ${misc:Depends}
-Suggests: mapserver-bin,
-          mapserver-doc
-Breaks: libmapscript-ruby (<< 6.4.0-1~),
-        libmapscript-ruby1.8 (<< 6.4.0-1~),
-        libmapscript-ruby1.9.1 (<< 6.4.0-1~)
-Provides: libmapscript-ruby,
-          libmapscript-ruby1.8,
-          libmapscript-ruby1.9.1
-Replaces: libmapscript-ruby (<< 6.4.0-1~),
-          libmapscript-ruby1.8 (<< 6.4.0-1~),
-          libmapscript-ruby1.9.1 (<< 6.4.0-1~)
-XB-Ruby-Versions: all
-Description: MapServer library for Ruby
- Ruby MapScript provides MapServer functions for Ruby scripts.
- .
- This package contains examples and the MapServer functions for Ruby.
- .
- MapServer is a CGI-based framework for Internet map services which
- supports Open Geospatial Consortium (OGC) standards.
-
 Package: libmapscript-java
 Architecture: any
 Section: java

debian/gbp.conf

@@ -14,3 +14,6 @@ upstream-tag = upstream/%(version)s
 
 # Always use pristine-tar.
 pristine-tar = True
+
+[buildpackage]
+pbuilder-options = --source-only-changes

debian/libmapserver2.symbols

-# SymbolsHelper-Confirmed: 7.2.2 amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips powerpc ppc64el s390x
+# SymbolsHelper-Confirmed: 7.4.0 amd64 ppc64
 libmapserver.so.2 #PACKAGE# #MINVER#
 * Build-Depends-Package: libmapserver-dev
  BuildExpressionTree@Base 6.2.1
@@ -21,7 +21,6 @@ libmapserver.so.2 #PACKAGE# #MINVER#
  FLTFreeFilterEncodingNode@Base 6.2.1
  FLTGetBBOX@Base 6.2.1
  FLTGetBinaryComparisonCommonExpression@Base 6.2.1
- FLTGetBinaryComparisonExpresssion@Base 6.2.1
  FLTGetBinaryComparisonSQLExpresssion@Base 6.2.1
  FLTGetCapabilities@Base 6.2.1
  FLTGetCommonExpression@Base 6.2.1
@@ -30,16 +29,11 @@ libmapserver.so.2 #PACKAGE# #MINVER#
  FLTGetFeatureIdCommonExpression@Base 6.2.1
  FLTGetGeosOperator@Base 6.2.1
  FLTGetIsBetweenComparisonCommonExpresssion@Base 6.2.1
- FLTGetIsBetweenComparisonExpresssion@Base 6.2.1
  FLTGetIsBetweenComparisonSQLExpresssion@Base 6.2.1
  FLTGetIsLikeComparisonCommonExpression@Base 6.2.1
- FLTGetIsLikeComparisonExpression@Base 6.2.1
  FLTGetIsLikeComparisonSQLExpression@Base 6.2.1
  FLTGetLogicalComparisonCommonExpression@Base 6.2.1
- FLTGetLogicalComparisonExpresssion@Base 6.2.1
  FLTGetLogicalComparisonSQLExpresssion@Base 6.2.1
- FLTGetMapserverExpression@Base 6.2.1
- FLTGetNodeExpression@Base 6.2.1
  FLTGetSQLExpression@Base 6.2.1
  FLTGetShape@Base 6.2.1
  FLTGetSpatialComparisonCommonExpression@Base 6.2.1
@@ -522,7 +516,6 @@ libmapserver.so.2 #PACKAGE# #MINVER#
  (optional=templinst|arch=sparc)_ZN9mapserver21rasterizer_outline_aaINS_22renderer_outline_imageINS_13renderer_baseINS_23pixfmt_alpha_blend_rgbaINS_16blender_rgba_preINS_5rgba8ENS_10order_bgraEEENS_12row_accessorIhEEjEEEENS_18line_image_patternINS_28pattern_filter_bilinear_rgbaIS5_EEEEEENS_14line_coord_satEED2Ev@Base 6.4.1
  (optional=templinst)_ZN9mapserver22comp_op_rgba_exclusionINS_5rgba8ENS_10order_bgraEE9blend_pixEPhjjjjj@Base 7.0.0
  (optional=templinst)_ZN9mapserver22rasterizer_scanline_aaINS_18rasterizer_sl_clipINS_12ras_conv_intEEEE10add_vertexEddj@Base 6.2.1
- (optional=templinst|arch=!amd64 !arm64 !kfreebsd-amd64 !ppc64el !s390x)_ZN9mapserver22rasterizer_scanline_aaINS_18rasterizer_sl_clipINS_12ras_conv_intEEEE14sweep_scanlineINS_11scanline_p8EEEbRT_@Base 7.2.2
  (optional=templinst|arch=armel armhf hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe)_ZN9mapserver22rasterizer_scanline_aaINS_18rasterizer_sl_clipINS_12ras_conv_intEEEE8add_pathINS_10conv_curveINS_20path_storage_integerIiLj6EEENS_6curve3ENS_6curve4EEEEEvRT_j@Base 6.2.1
  (optional=templinst|arch=armel armhf hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe)_ZN9mapserver22rasterizer_scanline_aaINS_18rasterizer_sl_clipINS_12ras_conv_intEEEE8add_pathINS_10conv_curveINS_20path_storage_integerIsLj6EEENS_6curve3ENS_6curve4EEEEEvRT_j@Base 6.2.1
  (optional=templinst)_ZN9mapserver22renderer_outline_imageINS_13renderer_baseINS_23pixfmt_alpha_blend_rgbaINS_16blender_rgba_preINS_5rgba8ENS_10order_bgraEEENS_12row_accessorIhEEjEEEENS_18line_image_patternINS_28pattern_filter_bilinear_rgbaIS4_EEEEE13line3_no_clipERKNS_15line_parametersEiiii@Base 6.2.1
@@ -599,7 +592,7 @@ libmapserver.so.2 #PACKAGE# #MINVER#
  _ZNK9mapserver25font_engine_freetype_base9find_faceEPKc@Base 6.2.1
  _ZNK9mapserver25font_engine_freetype_base9num_facesEv@Base 6.2.1
  (optional=templinst|arch=!amd64 !arm64 !hppa !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZNSt6vectorIN10ClipperLib11DoublePointESaIS1_EE17_M_default_appendEj@Base 7.0.2
- (optional=templinst|arch=amd64 arm64 kfreebsd-amd64 ppc64el s390x)_ZNSt6vectorIN10ClipperLib11DoublePointESaIS1_EE17_M_default_appendEm@Base 7.2.0
+ (optional=templinst)_ZNSt6vectorIN10ClipperLib11DoublePointESaIS1_EE17_M_default_appendEm@Base 7.4.0~rc1
  (optional=templinst|arch=!amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZNSt6vectorIN10ClipperLib8IntPointESaIS1_EE17_M_default_appendEj@Base 7.0.2
  (optional=templinst|arch=amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el riscv64 s390x sparc64)_ZNSt6vectorIN10ClipperLib8IntPointESaIS1_EE17_M_default_appendEm@Base 7.0.2
  (optional=templinst)_ZNSt6vectorIN10ClipperLib8IntPointESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 7.0.7
@@ -612,11 +605,11 @@ libmapserver.so.2 #PACKAGE# #MINVER#
  (optional=templinst)_ZNSt6vectorIP10msExprNodeSaIS1_EE9push_backERKS1_@Base 7.0.5
  (optional=templinst)_ZNSt6vectorIP10msExprNodeSaIS1_EEaSERKS3_@Base 7.0.5
  (optional=templinst|arch=armel armhf i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe sh4)_ZNSt6vectorIPN10ClipperLib11HorzJoinRecESaIS2_EE17_M_default_appendEj@Base 7.2.0
- (optional=templinst|arch=amd64 arm64 kfreebsd-amd64 ppc64el s390x)_ZNSt6vectorIPN10ClipperLib11HorzJoinRecESaIS2_EE17_M_default_appendEm@Base 7.2.0
+ (optional=templinst)_ZNSt6vectorIPN10ClipperLib11HorzJoinRecESaIS2_EE17_M_default_appendEm@Base 7.4.0~rc1
  (optional=templinst)_ZNSt6vectorIPN10ClipperLib5TEdgeESaIS2_EE17_M_realloc_insertIJRKS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 7.0.7
  (optional=templinst)_ZNSt6vectorIPN10ClipperLib6OutRecESaIS2_EE17_M_realloc_insertIJRKS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 7.0.7
  (optional=templinst|arch=armel armhf i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe sh4)_ZNSt6vectorIPN10ClipperLib7JoinRecESaIS2_EE17_M_default_appendEj@Base 7.2.0
- (optional=templinst|arch=amd64 arm64 kfreebsd-amd64 ppc64el s390x)_ZNSt6vectorIPN10ClipperLib7JoinRecESaIS2_EE17_M_default_appendEm@Base 7.2.0
+ (optional=templinst)_ZNSt6vectorIPN10ClipperLib7JoinRecESaIS2_EE17_M_default_appendEm@Base 7.4.0~rc1
  (optional=templinst)_ZNSt6vectorIPN10ClipperLib7JoinRecESaIS2_EE17_M_realloc_insertIJRKS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 7.2.0
  (optional=templinst|arch=!amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZNSt6vectorIS_IN10ClipperLib8IntPointESaIS1_EESaIS3_EE17_M_default_appendEj@Base 7.0.2
  (optional=templinst|arch=amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el riscv64 s390x sparc64)_ZNSt6vectorIS_IN10ClipperLib8IntPointESaIS1_EESaIS3_EE17_M_default_appendEm@Base 7.0.2
@@ -2109,7 +2102,6 @@ libmapserver.so.2 #PACKAGE# #MINVER#
  msWMSPrintScaleHint@Base 6.2.1
  msWMSSetTimePattern@Base 6.2.1
  msWMSValidateDimensionValue@Base 6.2.1
- msWrapText@Base 6.2.1
  msWriteClassToString@Base 6.4.0
  msWriteClusterToString@Base 6.4.0
  msWriteError@Base 6.2.1

debian/mapscript-ng.ini

+extension=php_mapscriptng.so

debian/patches/hardening.patch

-Description: Add support for hardening build flags.
-Author: Bas Couwenberg <sebastic@debian.org>
-Last-Update: 2013-09-02
-Forwarded: not-needed
-
---- a/mapscript/ruby/CMakeLists.txt
-+++ b/mapscript/ruby/CMakeLists.txt
-@@ -12,6 +12,23 @@ else ()
-     swig_add_module(rubymapscript ruby ../mapscript.i)
- endif ()
- 
-+# Ruby mapscript fails to build with -Werror=format-security
-+
-+if(${CMAKE_C_FLAGS} MATCHES "-Werror=format-security")
-+  string(REPLACE "-Werror=format-security" "" TMP "${CMAKE_C_FLAGS}")
-+  set(CMAKE_C_FLAGS "${TMP}")
-+endif(${CMAKE_C_FLAGS} MATCHES "-Werror=format-security")
-+
-+if(${CMAKE_CXX_FLAGS} MATCHES "-Werror=format-security")
-+  string(REPLACE "-Werror=format-security" "" TMP "${CMAKE_CXX_FLAGS}")
-+  set(CMAKE_CXX_FLAGS "${TMP}")
-+endif(${CMAKE_CXX_FLAGS} MATCHES "-Werror=format-security")
-+
-+if(${CMAKE_CPP_FLAGS} MATCHES "-Werror=format-security")
-+  string(REPLACE "-Werror=format-security" "" TMP "${CMAKE_CPP_FLAGS}")
-+  set(CMAKE_CPP_FLAGS "${TMP}")
-+endif(${CMAKE_CPP_FLAGS} MATCHES "-Werror=format-security")
-+
- swig_link_libraries(rubymapscript ${RUBY_LIBRARY} ${MAPSERVER_LIBMAPSERVER})
- 
- set_target_properties(${SWIG_MODULE_rubymapscript_REAL_NAME} PROPERTIES PREFIX "")

debian/patches/perl-mapscript-install.patch

@@ -14,7 +14,7 @@ Forwarded: not-needed
  include_directories(${PERL_INCLUDE_PATH})
  include_directories(${PROJECT_SOURCE_DIR}/mapscript/swiginc)
  include_directories(${PROJECT_SOURCE_DIR}/mapscript/)
-@@ -23,5 +23,5 @@ if(APPLE)
+@@ -23,8 +23,8 @@ if(APPLE)
    set_target_properties(perlmapscript PROPERTIES SUFFIX ".bundle")
  endif(APPLE)
  
@@ -22,3 +22,6 @@ Forwarded: not-needed
 -install(FILES $<TARGET_FILE_DIR:${SWIG_MODULE_perlmapscript_REAL_NAME}>/mapscript.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR})
 +install(FILES $<TARGET_FILE:${SWIG_MODULE_perlmapscript_REAL_NAME}> DESTINATION ${CUSTOM_PERL_VENDOR_ARCH_DIR}/auto/mapscript)
 +install(FILES $<TARGET_FILE_DIR:${SWIG_MODULE_perlmapscript_REAL_NAME}>/mapscript.pm DESTINATION ${CUSTOM_PERL_VENDOR_ARCH_DIR})
+ 
+ file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/tests DESTINATION  ${CMAKE_CURRENT_BINARY_DIR})
+ file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/examples DESTINATION  ${CMAKE_CURRENT_BINARY_DIR})

debian/patches/ruby-mapscript-install.patch

-Description: Install Ruby mapscript to vendorarchdir instead of archdir.
-Author: Bas Couwenberg <sebastic@debian.org>
-Last-Update: 2013-09-11
-Forwarded: not-needed
-
---- a/mapscript/ruby/CMakeLists.txt
-+++ b/mapscript/ruby/CMakeLists.txt
-@@ -39,5 +39,5 @@ if(APPLE)
- endif(APPLE)
- 
- set(mapscript_files $<TARGET_FILE:${SWIG_MODULE_rubymapscript_REAL_NAME}>)
--execute_process(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG['sitearchdir']" OUTPUT_VARIABLE RUBY_SITEARCHDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
--install(FILES ${mapscript_files} DESTINATION ${RUBY_SITEARCHDIR})
-+execute_process(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG['vendorarchdir']" OUTPUT_VARIABLE RUBY_VENDORARCHDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
-+install(FILES ${mapscript_files} DESTINATION ${RUBY_VENDORARCHDIR})

debian/patches/series

-hardening.patch
 perl-mapscript-install.patch
-ruby-mapscript-install.patch
 java-hardening.patch

debian/php-mapscript-ng.install

+usr/lib/php/*/php_mapscriptng.*

debian/php-mapscript-ng.lintian-overrides

+# Build uses -D_FORTIFY_SOURCE=2, but hardening-check reports:
+#  Fortify Source functions: no, only unprotected functions found!
+hardening-no-fortify-functions *
+

debian/php-mapscript-ng.php

+mod debian/mapscript-ng.ini

debian/php-mapscript-ng.postinst

+#!/bin/sh
+
+set -e
+
+# Source debconf library.
+. /usr/share/debconf/confmodule
+
+#DEBHELPER#
+
+exit 0