Date: Thursday, January 11, 2018 @ 19:27:11 Author: heftig Revision: 314605
2.60.3-1 Added: libsoup/trunk/0002-xmlrpc-server.php-Don-t-try-to-count-NULL-params.patch Modified: libsoup/trunk/0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch libsoup/trunk/PKGBUILD -----------------------------------------------------------------+ 0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch | 15 ++-- 0002-xmlrpc-server.php-Don-t-try-to-count-NULL-params.patch | 33 ++++++++++ PKGBUILD | 13 ++- 3 files changed, 50 insertions(+), 11 deletions(-) Modified: 0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch =================================================================== --- 0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch 2018-01-11 19:26:33 UTC (rev 314604) +++ 0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch 2018-01-11 19:27:11 UTC (rev 314605) @@ -1,7 +1,8 @@ -From 22fae95aff7073da55b2a79055292d320475439b Mon Sep 17 00:00:00 2001 +From 7fc6a89a9fd1851fa77a3e39957385dec44ba08a Mon Sep 17 00:00:00 2001 +Message-Id: <7fc6a89a9fd1851fa77a3e39957385dec44ba08a.1515698698.git.jan.steff...@gmail.com> From: "Jan Alexander Steffens (heftig)" <[email protected]> Date: Tue, 9 May 2017 22:54:16 +0200 -Subject: [PATCH] Configure PHP to load the XMLRPC extension if present +Subject: [PATCH 1/2] Configure PHP to load the XMLRPC extension if present This is needed when the system PHP configuration does not already load the extension. @@ -14,7 +15,7 @@ create mode 100644 tests/php.ini.in diff --git a/configure.ac b/configure.ac -index 3df131e67d586522..868b00e7f091a70e 100644 +index 5c44d98c..e1e5d4e1 100644 --- a/configure.ac +++ b/configure.ac @@ -272,22 +272,26 @@ if test "$have_apache" = 1; then @@ -54,7 +55,7 @@ docs/Makefile docs/reference/Makefile diff --git a/tests/Makefile.am b/tests/Makefile.am -index 81a72cbc5ffd9739..d2986975be11eca2 100644 +index 81a72cbc..d2986975 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -73,24 +73,30 @@ test_data += \ @@ -90,7 +91,7 @@ TESTS_ENVIRONMENT += SOUP_TESTS_IN_MAKE_CHECK=1 diff --git a/tests/httpd.conf.in b/tests/httpd.conf.in -index b818c12d198e6618..31c36674a9c5d8c2 100644 +index b818c12d..31c36674 100644 --- a/tests/httpd.conf.in +++ b/tests/httpd.conf.in @@ -31,6 +31,8 @@ LoadModule proxy_connect_module @APACHE_MODULE_DIR@/mod_proxy_connect.so @@ -104,11 +105,11 @@ AddType application/x-httpd-php .php diff --git a/tests/php.ini.in b/tests/php.ini.in new file mode 100644 -index 0000000000000000..779c022323b2f55f +index 00000000..779c0223 --- /dev/null +++ b/tests/php.ini.in @@ -0,0 +1 @@ +@IF_HAVE_PHP_XMLRPC@extension=xmlrpc.so -- -2.12.2 +2.15.1 Added: 0002-xmlrpc-server.php-Don-t-try-to-count-NULL-params.patch =================================================================== --- 0002-xmlrpc-server.php-Don-t-try-to-count-NULL-params.patch (rev 0) +++ 0002-xmlrpc-server.php-Don-t-try-to-count-NULL-params.patch 2018-01-11 19:27:11 UTC (rev 314605) @@ -0,0 +1,33 @@ +From df7babe9c03735761ab5dad6b7e33909e7f000ae Mon Sep 17 00:00:00 2001 +Message-Id: <df7babe9c03735761ab5dad6b7e33909e7f000ae.1515698698.git.jan.steff...@gmail.com> +In-Reply-To: <7fc6a89a9fd1851fa77a3e39957385dec44ba08a.1515698698.git.jan.steff...@gmail.com> +References: <7fc6a89a9fd1851fa77a3e39957385dec44ba08a.1515698698.git.jan.steff...@gmail.com> +From: "Jan Alexander Steffens (heftig)" <[email protected]> +Date: Thu, 11 Jan 2018 20:22:58 +0100 +Subject: [PATCH 2/2] xmlrpc-server.php: Don't try to count NULL params +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Trying to count something uncountable causes PHP ≥7.2 to emit a warning. +I assume that $params is NULL when there are no parameters. +--- + tests/xmlrpc-server.php | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/xmlrpc-server.php b/tests/xmlrpc-server.php +index 4025f95c..f315b6d0 100644 +--- a/tests/xmlrpc-server.php ++++ b/tests/xmlrpc-server.php +@@ -71,7 +71,7 @@ function echo_ ($method_name, $params, $app_data) + + function ping ($method_name, $params, $app_data) + { +- if (count ($params) == 0) ++ if (is_null ($params) or count ($params) == 0) + return "pong"; + else + return paramfault (); +-- +2.15.1 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-01-11 19:26:33 UTC (rev 314604) +++ PKGBUILD 2018-01-11 19:27:11 UTC (rev 314605) @@ -2,7 +2,7 @@ # Maintainer: Jan de Groot <[email protected]> pkgname=libsoup -pkgver=2.60.2 +pkgver=2.60.3 pkgrel=1 pkgdesc="HTTP client/server library for GNOME" url="https://wiki.gnome.org/Projects/libsoup"; @@ -11,11 +11,13 @@ depends=(glib2 libxml2 glib-networking sqlite krb5) makedepends=(intltool gobject-introspection python vala git gtk-doc) checkdepends=(apache php-apache) -_commit=2a6368154fc324ecbb2d165636608a5362904862 # tags/2.60.2^0 +_commit=e2ec3f6958e18893bb48af0d781948824d52b56a # tags/2.60.3^0 source=("git+https://git.gnome.org/browse/libsoup#commit=$_commit"; - 0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch) + 0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch + 0002-xmlrpc-server.php-Don-t-try-to-count-NULL-params.patch) sha256sums=('SKIP' - '1ad674810317ff2be817d00e9490d0d70014a38682a3dabc22801ae5db78aecc') + '5833b210a3116241a16449df28c1b74e2c078456b53edfc3c55d2f2ad35e5d2a' + '4b68ddf7164e5469c367ee5b875a72cca62ed3d036c13d9deda455c141ea639d') pkgver() { cd $pkgname @@ -28,6 +30,9 @@ # https://bugzilla.gnome.org/show_bug.cgi?id=782410 patch -Np1 -i ../0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch + # tests fail with php 7.2 + patch -Np1 -i ../0002-xmlrpc-server.php-Don-t-try-to-count-NULL-params.patch + NOCONFIGURE=1 ./autogen.sh }
