[mapserver] 09/11: Drop patches applied upstream, refresh remaining patches.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Sat Jun 20 00:20:34 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch experimental
in repository mapserver.
commit bdc0252555aa8dd36878188c5a52236104a1ef11
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sat Jun 20 01:30:18 2015 +0200
Drop patches applied upstream, refresh remaining patches.
---
debian/changelog | 1 +
debian/patches/cmake-mapserver-export.patch | 165 +++++++++++++++-------------
debian/patches/php56.patch | 73 ------------
debian/patches/series | 1 -
4 files changed, 87 insertions(+), 153 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 09f1e61..2df765f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ mapserver (7.0.0~beta1-1) UNRELEASED; urgency=medium
- Update Source URL for GitHub
- Add license & copyright for new files
* Drop transitional packages for libmapscript-ruby.
+ * Drop patches applied upstream, refresh remaining patches.
-- Bas Couwenberg <sebastic at debian.org> Fri, 19 Jun 2015 23:47:49 +0200
diff --git a/debian/patches/cmake-mapserver-export.patch b/debian/patches/cmake-mapserver-export.patch
index 846fade..fe90510 100644
--- a/debian/patches/cmake-mapserver-export.patch
+++ b/debian/patches/cmake-mapserver-export.patch
@@ -27,30 +27,24 @@ Last-Update: 2013-10-21
+endforeach()
macro (ms_link_libraries)
- target_link_libraries(mapserver ${ARGV})
-@@ -230,11 +248,20 @@ mapgeomtransform.c mapogroutput.c mapsde
- mapgeomutil.cpp mapkmlrenderer.cpp
- mapogr.cpp mapcontour.c mapsmoothing.c ${REGEX_SOURCES})
+ if(BUILD_DYNAMIC)
+@@ -246,6 +264,15 @@ mapgeomtransform.c mapogroutput.c mapwfs
+ mapgeomutil.cpp mapkmlrenderer.cpp fontcache.c textlayout.c maputfgrid.cpp
+ mapogr.cpp mapcontour.c mapsmoothing.c mapv8.cpp ${REGEX_SOURCES} kerneldensity.c)
+set(mapserver_HEADERS
-+cgiutil.h dxfcolor.h hittest.h mapaxisorder.h mapcopy.h mapentities.h
-+maperror.h mapfile.h mapgml.h maphash.h maphttp.h mapio.h mapkmlrenderer.h
-+maplibxml2.h mapogcfilter.h mapogcsld.h mapoglcontext.h mapoglrenderer.h
-+mapowscommon.h mapows.h mapparser.h mappostgis.h mapprimitive.h mapproject.h
-+mapraster.h mapregex.h mapresample.h mapserver-api.h mapserver.h mapserv.h
-+mapshape.h mapsymbol.h maptemplate.h mapthread.h maptile.h maptime.h maptree.h
-+mapwcs.h)
++cgiutil.h dejavu-sans-condensed.h dxfcolor.h fontcache.h hittest.h mapagg.h
++mapaxisorder.h mapcopy.h mapentities.h maperror.h mapfile.h mapgml.h maphash.h
++maphttp.h mapio.h mapkmlrenderer.h maplibxml2.h mapogcfilter.h mapogcsld.h
++mapoglcontext.h mapoglrenderer.h mapowscommon.h mapows.h mapparser.h
++mappostgis.h mapprimitive.h mapproject.h mapraster.h mapregex.h mapresample.h
++mapserver-api.h mapserver.h mapserv.h mapshape.h mapsymbol.h maptemplate.h
++mapthread.h maptile.h maptime.h maptree.h maputfgrid.h mapwcs.h uthash.h)
+
- add_library(mapserver SHARED ${mapserver_SOURCES} ${agg_SOURCES})
- set_target_properties( mapserver PROPERTIES
- VERSION ${MapServer_VERSION_STRING}
- SOVERSION 1
--)
-+)
- if(BUILD_STATIC)
- add_library(mapserver_static STATIC ${mapserver_SOURCES} ${agg_SOURCES})
- set_target_properties( mapserver_static PROPERTIES
-@@ -276,6 +303,7 @@ find_package(PNG)
+ if(BUILD_DYNAMIC)
+ add_library(mapserver SHARED ${mapserver_SOURCES} ${agg_SOURCES} ${v8_SOURCES})
+ set_target_properties( mapserver PROPERTIES
+@@ -299,6 +326,7 @@ find_package(PNG)
if(PNG_FOUND)
include_directories(${PNG_INCLUDE_DIR})
ms_link_libraries( ${PNG_LIBRARIES})
@@ -58,7 +52,7 @@ Last-Update: 2013-10-21
set(USE_PNG 1)
else(PNG_FOUND)
report_mandatory_not_found(PNG)
-@@ -285,6 +313,7 @@ find_package(JPEG)
+@@ -308,6 +336,7 @@ find_package(JPEG)
if(JPEG_FOUND)
include_directories(${JPEG_INCLUDE_DIR})
ms_link_libraries( ${JPEG_LIBRARY})
@@ -66,7 +60,7 @@ Last-Update: 2013-10-21
set(USE_JPEG 1)
else(JPEG_FOUND)
report_mandatory_not_found(JPEG)
-@@ -296,6 +325,7 @@ if(NOT FREETYPE_FOUND)
+@@ -319,6 +348,7 @@ if(NOT FREETYPE_FOUND)
endif(NOT FREETYPE_FOUND)
include_directories(${FREETYPE_INCLUDE_DIR})
ms_link_libraries( ${FREETYPE_LIBRARY})
@@ -74,7 +68,7 @@ Last-Update: 2013-10-21
if(WITH_PROJ)
-@@ -305,6 +335,7 @@ if(WITH_PROJ)
+@@ -328,6 +358,7 @@ if(WITH_PROJ)
else(NOT PROJ_FOUND)
include_directories(${PROJ_INCLUDE_DIR})
ms_link_libraries( ${PROJ_LIBRARY})
@@ -82,15 +76,15 @@ Last-Update: 2013-10-21
set (USE_PROJ 1)
endif(NOT PROJ_FOUND)
endif (WITH_PROJ)
-@@ -325,6 +356,7 @@ if(WITH_GD)
- else(NOT GD_FOUND)
- include_directories(${GD_INCLUDE_DIR})
- ms_link_libraries( ${GD_LIBRARY})
-+ list(APPEND ALL_INCLUDE_DIRS ${GD_INCLUDE_DIR})
- set (USE_GD 1)
- if(GD_SUPPORTS_PNG)
- set(USE_GD_PNG 1)
-@@ -348,6 +380,7 @@ if(WITH_FRIBIDI)
+@@ -337,6 +368,7 @@ if(WITH_PIXMAN)
+ if(PIXMAN_FOUND)
+ include_directories(${PIXMAN_INCLUDE_DIR})
+ ms_link_libraries(${PIXMAN_LIBRARY})
++ list(APPEND ALL_INCLUDE_DIRS ${PIXMAN_INCLUDE_DIR})
+ set (USE_PIXMAN 1)
+ else(PIXMAN_FOUND)
+ report_optional_not_found(PIXMAN)
+@@ -358,6 +390,7 @@ if(WITH_FRIBIDI)
else(NOT FRIBIDI_FOUND)
include_directories(${FRIBIDI_INCLUDE_DIR})
ms_link_libraries( ${FRIBIDI_LIBRARY})
@@ -98,7 +92,15 @@ Last-Update: 2013-10-21
set (USE_FRIBIDI 1)
if(FRIBIDI_LEGACY)
message(WARNING "Old Fribidi found, upgrade recommended")
-@@ -360,6 +393,7 @@ if(WITH_ICONV)
+@@ -372,6 +405,7 @@ if(WITH_HARFBUZZ)
+ else(NOT HARFBUZZ_FOUND)
+ include_directories(${HARFBUZZ_INCLUDE_DIR})
+ ms_link_libraries( ${HARFBUZZ_LIBRARY})
++ list(APPEND ALL_INCLUDE_DIRS ${HARFBUZZ_INCLUDE_DIR})
+ set (USE_HARFBUZZ 1)
+ endif(NOT HARFBUZZ_FOUND)
+ endif (WITH_HARFBUZZ)
+@@ -389,6 +423,7 @@ if(WITH_ICONV)
if(ICONV_FOUND)
include_directories(${ICONV_INCLUDE_DIR})
ms_link_libraries( ${ICONV_LIBRARY})
@@ -106,7 +108,7 @@ Last-Update: 2013-10-21
set (USE_ICONV 1)
else(ICONV_FOUND)
report_optional_not_found(ICONV)
-@@ -376,6 +410,7 @@ if(WITH_CAIRO)
+@@ -405,6 +440,7 @@ if(WITH_CAIRO)
if(CAIRO_FOUND)
include_directories(${CAIRO_INCLUDE_DIRS})
ms_link_libraries( ${CAIRO_LIBRARY})
@@ -114,7 +116,7 @@ Last-Update: 2013-10-21
set (USE_CAIRO 1)
else(CAIRO_FOUND)
report_optional_not_found(CAIRO)
-@@ -387,6 +422,7 @@ if(WITH_MYSQL)
+@@ -416,6 +452,7 @@ if(WITH_MYSQL)
if(MYSQL_FOUND)
include_directories(${MYSQL_INCLUDE_DIR})
ms_link_libraries( ${MYSQL_LIBRARY})
@@ -122,7 +124,7 @@ Last-Update: 2013-10-21
set (USE_MYSQL 1)
else(MYSQL_FOUND)
report_optional_not_found(MYSQL)
-@@ -404,6 +440,7 @@ if(WITH_ORACLESPATIAL OR WITH_ORACLE_PLU
+@@ -433,6 +470,7 @@ if(WITH_ORACLESPATIAL OR WITH_ORACLE_PLU
find_package(Oracle)
if(ORACLE_FOUND)
include_directories(${ORACLE_INCLUDE_DIR})
@@ -130,7 +132,7 @@ Last-Update: 2013-10-21
else(ORACLE_FOUND)
report_optional_not_found(ORACLESPATIAL)
#FIXME: error message here could be misleading, only states ORACLESPATIAL whereas
-@@ -430,6 +467,7 @@ if(WITH_MSSQL2008)
+@@ -459,6 +497,7 @@ if(WITH_MSSQL2008)
add_library(msplugin_mssql2008 MODULE mapmssql2008.c)
target_link_libraries(msplugin_mssql2008 ${ODBC_LIBRARY} ${MAPSERVER_LIBMAPSERVER})
set_target_properties(msplugin_mssql2008 PROPERTIES COMPILE_FLAGS "-DUSE_MSSQL2008_PLUGIN -DUSE_MSSQL2008")
@@ -138,23 +140,7 @@ Last-Update: 2013-10-21
set (USE_MSSQL2008 1)
else(ODBC_FOUND)
report_optional_not_found(ODBC)
-@@ -451,6 +489,7 @@ if(WITH_SDE_PLUGIN)
- target_link_libraries(msplugin_sde92 ${SDE_LIBRARY_DIR}/pe.lib ${SDE_LIBRARY_DIR}/sg.lib ${SDE_LIBRARY_DIR}/sde.lib ${MAPSERVER_LIBMAPSERVER})
- set_target_properties(msplugin_sde92 PROPERTIES COMPILE_FLAGS "-DUSE_SDE")
- endif(SDE_VERSION STREQUAL "91")
-+ list(APPEND ALL_INCLUDE_DIRS ${SDE_INCLUDE_DIR})
- set(USE_SDE_PLUGIN 1)
- else(SDE_INCLUDE_DIR AND SDE_LIBRARY_DIR)
- MESSAGE( SEND_ERROR "Must specify SDE_INCLUDE_DIR and SDE_LIBRARY_DIR for WITH_SDE_PLUGIN")
-@@ -462,6 +501,7 @@ if(WITH_SDE)
- if(SDE_FOUND)
- include_directories(${SDE_INCLUDE_DIRS})
- ms_link_libraries(${SDE_LIBRARIES})
-+ list(APPEND ALL_INCLUDE_DIRS ${SDE_INCLUDE_DIRS})
- set (USE_SDE 1)
- if(CMAKE_SIZEOF_VOID_P EQUAL 8)
- set(SDE64 1)
-@@ -477,6 +517,7 @@ if(WITH_FCGI)
+@@ -470,6 +509,7 @@ if(WITH_FCGI)
if(FCGI_FOUND)
include_directories(${FCGI_INCLUDE_DIR})
target_link_libraries(mapserv ${FCGI_LIBRARY})
@@ -162,7 +148,7 @@ Last-Update: 2013-10-21
set (USE_FASTCGI 1)
else(FCGI_FOUND)
report_optional_not_found(FCGI)
-@@ -488,6 +529,7 @@ if(WITH_GEOS)
+@@ -481,6 +521,7 @@ if(WITH_GEOS)
if(GEOS_FOUND)
include_directories(${GEOS_INCLUDE_DIR})
ms_link_libraries( ${GEOS_LIBRARY})
@@ -170,7 +156,7 @@ Last-Update: 2013-10-21
set (USE_GEOS 1)
else(GEOS_FOUND)
report_optional_not_found(GEOS)
-@@ -507,6 +549,7 @@ if(WITH_POSTGIS)
+@@ -500,6 +541,7 @@ if(WITH_POSTGIS)
include_directories(${POSTGRESQL_INCLUDE_DIR})
ms_link_libraries( ${POSTGRESQL_LIBRARY})
CHECK_LIBRARY_EXISTS(pq "PQserverVersion" POSTGRESQL_LIBRARY POSTGIS_HAS_SERVER_VERSION)
@@ -178,7 +164,7 @@ Last-Update: 2013-10-21
set (USE_POSTGIS 1)
else(POSTGRESQL_FOUND)
report_optional_not_found(POSTGIS)
-@@ -518,6 +561,7 @@ if(WITH_GDAL)
+@@ -511,6 +553,7 @@ if(WITH_GDAL)
if(GDAL_FOUND)
include_directories(${GDAL_INCLUDE_DIR})
ms_link_libraries( ${GDAL_LIBRARY})
@@ -186,15 +172,15 @@ Last-Update: 2013-10-21
set (USE_GDAL 1)
else(GDAL_FOUND)
report_optional_not_found(GDAL)
-@@ -532,6 +576,7 @@ if(WITH_SVGCAIRO)
+@@ -525,6 +568,7 @@ if(WITH_SVGCAIRO)
if(SVGCAIRO_FOUND)
- include_directories(${SVGCAIRO_INCLUDE_DIR})
+ include_directories(${SVG_INCLUDE_DIR} ${SVGCAIRO_INCLUDE_DIR})
ms_link_libraries( ${SVG_LIBRARY} ${SVGCAIRO_LIBRARY})
+ list(APPEND ALL_INCLUDE_DIRS ${SVGCAIRO_INCLUDE_DIR})
set (USE_SVG_CAIRO 1)
else(SVGCAIRO_FOUND)
report_optional_not_found(SVGCAIRO)
-@@ -546,8 +591,10 @@ if(WITH_RSVG)
+@@ -539,8 +583,10 @@ if(WITH_RSVG)
if(RSVG_FOUND AND GOBJECT_FOUND)
include_directories(${RSVG_INCLUDE_DIRS})
ms_link_libraries( ${RSVG_LIBRARY} )
@@ -205,7 +191,7 @@ Last-Update: 2013-10-21
set (USE_RSVG 1)
else(RSVG_FOUND AND GOBJECT_FOUND)
report_optional_not_found(RSVG)
-@@ -562,6 +609,7 @@ if(WITH_OGR)
+@@ -555,6 +601,7 @@ if(WITH_OGR)
if(GDAL_FOUND)
include_directories(${GDAL_INCLUDE_DIR})
ms_link_libraries( ${GDAL_LIBRARY})
@@ -213,15 +199,23 @@ Last-Update: 2013-10-21
set (USE_OGR 1)
else(GDAL_FOUND)
message(SEND_ERROR "GDAL library could not be found and is needed for OGR support.
-@@ -581,6 +629,7 @@ if(WITH_CURL)
+@@ -574,6 +621,7 @@ if(WITH_CURL)
if(CURL_FOUND)
include_directories(${CURL_INCLUDE_DIR})
ms_link_libraries( ${CURL_LIBRARY})
-+ list(APPEND ALL_INCLUDE_DIRS ${CURL_INCLUDE_DIR})
++ list(APPEND ALL_INCLUDE_DIRS ${CURL_INCLUDE_DIR})
set(USE_CURL 1)
else(CURL_FOUND)
report_optional_not_found(CURL)
-@@ -719,6 +768,7 @@ if(WITH_XMLMAPFILE)
+@@ -652,6 +700,7 @@ if(WITH_LIBXML2)
+ set(LIBXML2_LIBRARY ${LIBXML2_LIBRARIES})
+ endif()
+ ms_link_libraries( ${LIBXML2_LIBRARY})
++ list(APPEND ALL_INCLUDE_DIRS ${LIBXML2_INCLUDE_DIR})
+ set (USE_LIBXML2 1)
+ else(LIBXML2_FOUND)
+ report_optional_not_found(LIBXML2)
+@@ -716,6 +765,7 @@ if(WITH_XMLMAPFILE)
endif()
include_directories(${LIBXSLT_INCLUDE_DIR})
ms_link_libraries( ${LIBXSLT_LIBRARY} ${LIBXSLT_EXSLT_LIBRARY})
@@ -229,7 +223,7 @@ Last-Update: 2013-10-21
set(USE_XMLMAPFILE 1)
else(LIBXSLT_FOUND)
message(SEND_ERROR "Xml Mapfile support requires XSLT support which was not found.
-@@ -734,6 +784,7 @@ if(WITH_GIF)
+@@ -731,6 +781,7 @@ if(WITH_GIF)
if(GIF_FOUND)
include_directories(${GIF_INCLUDE_DIR})
ms_link_libraries( ${GIF_LIBRARY})
@@ -237,7 +231,7 @@ Last-Update: 2013-10-21
set(USE_GIF 1)
else(GIF_FOUND)
report_optional_not_found(GIF)
-@@ -745,6 +796,7 @@ if(WITH_EXEMPI)
+@@ -742,6 +793,7 @@ if(WITH_EXEMPI)
if(LIBEXEMPI_FOUND)
include_directories(${LIBEXEMPI_INCLUDE_DIR})
ms_link_libraries( ${LIBEXEMPI_LIBRARY})
@@ -245,7 +239,15 @@ Last-Update: 2013-10-21
set(USE_EXEMPI 1)
else(LIBEXEMPI_FOUND)
report_optional_not_found(EXEMPI)
-@@ -805,7 +857,9 @@ configure_file (
+@@ -759,6 +811,7 @@ if(WITH_V8)
+ SET(USE_V8_MAPSCRIPT 1)
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+ INCLUDE_DIRECTORIES(${V8_INCLUDE})
++ list(APPEND ALL_INCLUDE_DIRS ${V8_INCLUDE})
+ MS_LINK_LIBRARIES( ${V8_LIBS})
+ ELSE(V8_FOUND)
+ MESSAGE(SEND_ERROR "V8 JavaScript support requested but not found.
+@@ -817,7 +870,9 @@ configure_file (
"${PROJECT_BINARY_DIR}/mapserver-version.h"
)
@@ -256,7 +258,16 @@ Last-Update: 2013-10-21
macro(status_optional_component component enabled libpath)
if("${enabled}" EQUAL "1")
-@@ -903,23 +957,68 @@ endif(WIN32)
+@@ -895,7 +950,7 @@ status_optional_feature("Apache Module (
+
+ message(STATUS "")
+ message(STATUS "Will install files to ${CMAKE_INSTALL_PREFIX}")
+-message(STATUS "Will install libraries to ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
++message(STATUS "Will install libraries to ${INSTALL_LIB_DIR}")
+
+
+ include_directories("${PROJECT_BINARY_DIR}")
+@@ -908,20 +963,65 @@ endif(WIN32)
#INSTALL(FILES mapserver-api.h ${PROJECT_BINARY_DIR}/mapserver-version.h DESTINATION include)
if(USE_ORACLE_PLUGIN)
@@ -269,17 +280,8 @@ Last-Update: 2013-10-21
+ INSTALL(TARGETS msplugin_mssql2008 DESTINATION ${INSTALL_LIB_DIR})
endif(USE_MSSQL2008)
- if(USE_SDE91)
-- INSTALL(TARGETS msplugin_sde91 DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+ INSTALL(TARGETS msplugin_sde91 DESTINATION ${INSTALL_LIB_DIR})
- endif(USE_SDE91)
- if(USE_SDE92)
-- INSTALL(TARGETS msplugin_sde92 DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+ INSTALL(TARGETS msplugin_sde92 DESTINATION ${INSTALL_LIB_DIR})
- endif(USE_SDE92)
-
--INSTALL(TARGETS sortshp shptree shptreevis msencrypt legend scalebar tile4ms shptreetst shp2img mapserv mapserver RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+-INSTALL(TARGETS sortshp shptree shptreevis msencrypt legend scalebar tile4ms shptreetst shp2img mapserv RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+INSTALL(TARGETS sortshp shptree shptreevis msencrypt legend scalebar tile4ms shptreetst shp2img mapserv
+ RUNTIME DESTINATION ${INSTALL_BIN_DIR} COMPONENT bin
+)
@@ -288,10 +290,15 @@ Last-Update: 2013-10-21
+ LIBRARY DESTINATION ${INSTALL_LIB_DIR} COMPONENT shlib
+ PUBLIC_HEADER DESTINATION ${INSTALL_INCLUDE_DIR}/mapserver COMPONENT dev
+)
+
if(BUILD_STATIC)
- INSTALL(TARGETS mapserver_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ INSTALL(TARGETS mapserver_static DESTINATION ${INSTALL_LIB_DIR})
endif(BUILD_STATIC)
+ if(BUILD_DYNAMIC)
+- INSTALL(TARGETS mapserver DESTINATION ${CMAKE_INSTALL_LIBDIR})
++ INSTALL(TARGETS mapserver DESTINATION ${INSTALL_LIB_DIR})
+ endif(BUILD_DYNAMIC)
+# Add all targets to the build-tree export set
+export(TARGETS mapserver
diff --git a/debian/patches/php56.patch b/debian/patches/php56.patch
deleted file mode 100644
index 008adbc..0000000
--- a/debian/patches/php56.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-Description: Use php://input instead of raw_post_data to support PHP 5.6.
- php_stream handling largely taken from PECL HTTP:
- .
- http://git.php.net/?p=pecl/http/pecl_http.git;a=blob;f=php_http_env.c;h=30ee32d7c68b3341aeaeb24c909b102537caccdf;hb=8ec2c825719482e62222163a300b0e18319591d0#l229
- .
- Copyright (c) 2004-2014, Michael Wallner <mike at iworks.at>.
- All rights reserved.
- .
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- .
- * Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-Author: Bas Couwenberg <sebastic at debian.org>
-Bug-Debian: https://bugs.debian.org/745600
-Forwarded: https://github.com/mapserver/mapserver/issues/4911
-Applied-Upstream: https://github.com/mapserver/mapserver/commit/fc99472b8b2fc837148f71755f23349a71e307bf
---- a/mapscript/php/owsrequest.c
-+++ b/mapscript/php/owsrequest.c
-@@ -32,6 +32,9 @@
- #include "php_mapscript.h"
- #include "SAPI.h"
- #include "php_variables.h"
-+#if PHP_VERSION_ID >= 50600
-+#include "php_streams.h"
-+#endif
-
- char *owsrequest_getenv(const char *name, void *thread_context);
-
-@@ -193,9 +196,29 @@ PHP_METHOD(OWSRequestObj, loadParams)
- cgirequestObj_loadParams(php_owsrequest->cgirequest, owsrequest_getenv, NULL, 0, thread_context);
- }
- } else {
-+#if PHP_VERSION_ID >= 50600
-+ php_stream *s = php_stream_temp_new();
-+ php_stream *input = php_stream_open_wrapper("php://input", "r", 0, NULL);
-+
-+ /* php://input does not support stat */
-+ php_stream_copy_to_stream_ex(input, s, -1, NULL);
-+ php_stream_close(input);
-+
-+ php_stream_rewind(s);
-+
-+ char *raw_post_data = NULL;
-+ long raw_post_data_length = 0;
-+
-+ raw_post_data_length = php_stream_copy_to_mem(s, raw_post_data, -1, 0);
-+
-+ cgirequestObj_loadParams(php_owsrequest->cgirequest, owsrequest_getenv,
-+ raw_post_data,
-+ raw_post_data_length, thread_context);
-+#else
- cgirequestObj_loadParams(php_owsrequest->cgirequest, owsrequest_getenv,
- SG(request_info).raw_post_data,
- SG(request_info).raw_post_data_length, thread_context);
-+#endif
- }
- }
-
diff --git a/debian/patches/series b/debian/patches/series
index 1fd50e2..58ac143 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,3 @@ perl-mapscript-install.patch
ruby-mapscript-install.patch
cmake-mapserver-export.patch
java-hardening.patch
-php56.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapserver.git
More information about the Pkg-grass-devel
mailing list