This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch jessie in repository mapserver.
commit 9f5a9adc59ed8709e02c75378de9491b88c7be17 Author: Bas Couwenberg <[email protected]> Date: Sat Jan 7 09:43:26 2017 +0100 Add upstream patch to fix FTBFS with php >= 5.6.25. --- debian/changelog | 6 ++++++ ...0001-Fix-build-issue-with-php-5.6.25-5318.patch | 25 ++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 32 insertions(+) diff --git a/debian/changelog b/debian/changelog index d3dbebc..5cb8e20 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mapserver (6.4.1-5+deb8u2) UNRELEASED; urgency=medium + + * Add upstream patch to fix FTBFS with php >= 5.6.25. + + -- Bas Couwenberg <[email protected]> Sat, 07 Jan 2017 09:43:05 +0100 + mapserver (6.4.1-5+deb8u1) stable; urgency=high * Add upstream patch to fix CVE-2016-9839. diff --git a/debian/patches/0001-Fix-build-issue-with-php-5.6.25-5318.patch b/debian/patches/0001-Fix-build-issue-with-php-5.6.25-5318.patch new file mode 100644 index 0000000..8093ff3 --- /dev/null +++ b/debian/patches/0001-Fix-build-issue-with-php-5.6.25-5318.patch @@ -0,0 +1,25 @@ +Description: Fix build issue with php >= 5.6.25. +Author: Landry Breuil +Origin: https://github.com/mapserver/mapserver/commit/d5cc5840683bded229dbc2cc7d534db6d1e1f386 +Bug: https://github.com/mapserver/mapserver/pull/5318 + +--- a/mapscript/php/error.c ++++ b/mapscript/php/error.c +@@ -31,6 +31,17 @@ + + #include "php_mapscript.h" + ++#if PHP_VERSION_ID >= 50625 ++#undef ZVAL_STRING ++#define ZVAL_STRING(z, s, duplicate) do { \ ++ const char *__s=(s); \ ++ zval *__z = (z); \ ++ Z_STRLEN_P(__z) = strlen(__s); \ ++ Z_STRVAL_P(__z) = (duplicate?estrndup(__s, Z_STRLEN_P(__z)):(char*)__s);\ ++ Z_TYPE_P(__z) = IS_STRING; \ ++} while (0) ++#endif ++ + zend_class_entry *mapscript_ce_error; + + ZEND_BEGIN_ARG_INFO_EX(error___get_args, 0, 0, 1) diff --git a/debian/patches/series b/debian/patches/series index ba6b786..80fc925 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,4 @@ cmake-mapserver-export.patch java-hardening.patch php56.patch 0001-Backport-4928-and-5356.patch +0001-Fix-build-issue-with-php-5.6.25-5318.patch -- 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
