[arch-commits] Commit in libsoup/trunk (2 files)

2018-09-04 Thread Jan Steffens via arch-commits 
Date: Wednesday, September 5, 2018 @ 00:14:57
  Author: heftig
Revision: 63

2.64.0+7+g1dda-1

Modified:
  libsoup/trunk/PKGBUILD(contents, properties)
Deleted:
  libsoup/trunk/0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch

-+
 0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch |  115 
--
 PKGBUILD|   32 --
 2 files changed, 10 insertions(+), 137 deletions(-)

Deleted: 0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch
===
--- 0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch 
2018-09-05 00:07:36 UTC (rev 62)
+++ 0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch 
2018-09-05 00:14:57 UTC (rev 63)
@@ -1,115 +0,0 @@
-From 437356c457cfeb7b4ab0cdad67f59f431d459536 Mon Sep 17 00:00:00 2001
-Message-Id: 
<437356c457cfeb7b4ab0cdad67f59f431d459536.1520796778.git.jan.steff...@gmail.com>
-From: "Jan Alexander Steffens (heftig)" 
-Date: Tue, 9 May 2017 22:54:16 +0200
-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.

- configure.ac| 7 ++-
- tests/Makefile.am   | 8 +++-
- tests/httpd.conf.in | 2 ++
- tests/php.ini.in| 1 +
- 4 files changed, 16 insertions(+), 2 deletions(-)
- create mode 100644 tests/php.ini.in
-
-diff --git a/configure.ac b/configure.ac
-index e2d828f7..224bac24 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -272,22 +272,26 @@ if test "$have_apache" = 1; then
- 
- if test "$have_php" = yes; then
-   AC_MSG_CHECKING([for php-xmlrpc])
--  if $PHP --rf xmlrpc_server_create | grep -q "does not exist"; then
-+  if $PHP -d extension=xmlrpc.so --rf xmlrpc_server_create | grep -q 
"does not exist"; then
-   have_php_xmlrpc=no
-+  IF_HAVE_PHP_XMLRPC=";"
-   else
-   have_php_xmlrpc=yes
-+  IF_HAVE_PHP_XMLRPC=""
-   AC_DEFINE(HAVE_PHP_XMLRPC, 1, [Have php-xmlrpc])
-   fi
-   AC_MSG_RESULT($have_php_xmlrpc)
-+  AC_SUBST(IF_HAVE_PHP_XMLRPC)
- fi
- 
- if test -f "$APACHE_MODULE_DIR/mod_unixd.so"; then
-   IF_HAVE_MOD_UNIXD=""
- else
-   IF_HAVE_MOD_UNIXD="#"
- fi
- AC_SUBST(IF_HAVE_MOD_UNIXD)
- fi
-+AM_CONDITIONAL(HAVE_PHP, test "$have_php" = yes)
- 
- AC_PATH_PROG(CURL, curl, no)
- if test "$CURL" != no; then
-@@ -415,6 +419,7 @@ AC_CONFIG_FILES([
-   po/Makefile
-   tests/Makefile
-   tests/httpd.conf
-+  tests/php.ini
-   examples/Makefile
-   docs/Makefile
-   docs/reference/Makefile
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 81a72cbc..d2986975 100644
 a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -73,24 +73,30 @@ test_data +=   \
-   httpd.conf
- endif
- 
-+if HAVE_PHP
-+test_data +=  \
-+  php.ini
-+endif
-+
- RESOURCES = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) 
--generate-dependencies $(srcdir)/soup-tests.gresource.xml)
- 
- soup-tests.gresource: soup-tests.gresource.xml $(RESOURCES)
-   $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) 
$<
- 
- EXTRA_DIST +=  \
-   htdigest \
-   htpasswd \
-   httpd.conf.in\
-   index.txt\
-   libsoup.supp \
-+  php.ini.in   \
-   soup-tests.gresource.xml \
-   test-cert.pem\
-   test-key.pem \
-   xmlrpc-server.php\
-   $(RESOURCES)
- 
--DISTCLEANFILES += soup-tests.gresource httpd.conf
-+DISTCLEANFILES += soup-tests.gresource httpd.conf php.ini
- 
- TESTS_ENVIRONMENT += SOUP_TESTS_IN_MAKE_CHECK=1
- 
-diff --git a/tests/httpd.conf.in b/tests/httpd.conf.in
-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
- LoadModule ssl_module   @APACHE_SSL_MODULE_DIR@/mod_ssl.so
- @IF_HAVE_MOD_UNIXD@LoadModule unixd_module 
@APACHE_SSL_MODULE_DIR@/mod_unixd.so
- 
-+@IF_HAVE_PHP@PHPIniDir .
-+
- DirectoryIndex index.txt
- TypesConfig /dev/null
- AddType application/x-httpd-php .php
-diff --git a/tests/php.ini.in b/tests/php.ini.in
-new file mode 100644
-index ..779c0223
 /dev/null
-+++ b/tests/php.ini.in
-@@ -0,0 +1 @@
-+@IF_HAVE_PHP_XMLRPC@extension=xmlrpc.so
--- 
-2.16.2
-

Modified: PKGBUILD
===
--- PKGBUILD2018-09-05 00:07:36 UTC (rev 62)
+++ PKGBUILD2018-09-05 00:14:57 UTC (rev 63)
@@ -1,8 +1,8 @@
-# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) 
 # Maintainer: Jan de Groot 
 
 pkgname=libsoup

[arch-commits] Commit in libsoup/trunk (2 files)

2018-05-07 Thread Jan Steffens via arch-commits 
Date: Monday, May 7, 2018 @ 13:36:53
  Author: heftig
Revision: 323438

2.62.2-1

Modified:
  libsoup/trunk/PKGBUILD
Deleted:
  libsoup/trunk/0002-xmlrpc-server.php-Don-t-try-to-count-NULL-params.patch

-+
 0002-xmlrpc-server.php-Don-t-try-to-count-NULL-params.patch |   33 --
 PKGBUILD|   13 +--
 2 files changed, 4 insertions(+), 42 deletions(-)

Deleted: 0002-xmlrpc-server.php-Don-t-try-to-count-NULL-params.patch
===
--- 0002-xmlrpc-server.php-Don-t-try-to-count-NULL-params.patch 2018-05-07 
09:18:31 UTC (rev 323437)
+++ 0002-xmlrpc-server.php-Don-t-try-to-count-NULL-params.patch 2018-05-07 
13:36:53 UTC (rev 323438)
@@ -1,33 +0,0 @@
-From e8b8f9776dae4007b4d9bf0e729a00c7f553daad Mon Sep 17 00:00:00 2001
-Message-Id: 

-In-Reply-To: 
<437356c457cfeb7b4ab0cdad67f59f431d459536.1520796778.git.jan.steff...@gmail.com>
-References: 
<437356c457cfeb7b4ab0cdad67f59f431d459536.1520796778.git.jan.steff...@gmail.com>
-From: "Jan Alexander Steffens (heftig)" 
-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.16.2
-

Modified: PKGBUILD
===
--- PKGBUILD2018-05-07 09:18:31 UTC (rev 323437)
+++ PKGBUILD2018-05-07 13:36:53 UTC (rev 323438)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot 
 
 pkgname=libsoup
-pkgver=2.62.1
+pkgver=2.62.2
 pkgrel=1
 pkgdesc="HTTP client/server library for GNOME"
 url="https://wiki.gnome.org/Projects/libsoup;
@@ -11,13 +11,11 @@
 depends=(glib2 libxml2 glib-networking sqlite krb5)
 makedepends=(intltool gobject-introspection python vala git gtk-doc)
 checkdepends=(apache php-apache)
-_commit=5a62f67afb1457f6d02e8b7269b8477163990fd1  # tags/2.62.1^0
+_commit=17c46764b715bac3bf42a0b3d54d76cd8a4bab0d  # tags/2.62.2^0
 source=("git+https://git.gnome.org/browse/libsoup#commit=$_commit;
-0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch
-0002-xmlrpc-server.php-Don-t-try-to-count-NULL-params.patch)
+0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch)
 sha256sums=('SKIP'
-'7bf5257afb2c248c8ef8709e4aeaaafe9252835887b6944fe143eddc7ce98a8c'
-'9238d9a2deff3ba57fb8ebd03d70564f872f785798750af9a455b616b6e2190e')
+'7bf5257afb2c248c8ef8709e4aeaaafe9252835887b6944fe143eddc7ce98a8c')
 
 pkgver() {
   cd $pkgname
@@ -30,9 +28,6 @@
   # 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
 }

[arch-commits] Commit in libsoup/trunk (2 files)

2017-05-09 Thread Jan Steffens 
Date: Tuesday, May 9, 2017 @ 21:02:09
  Author: heftig
Revision: 295510

Enable XMLRPC tests

Added:
  libsoup/trunk/0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch
Modified:
  libsoup/trunk/PKGBUILD

-+
 0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch |  114 
++
 PKGBUILD|7 
 2 files changed, 119 insertions(+), 2 deletions(-)

Added: 0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch
===
--- 0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch 
(rev 0)
+++ 0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch 
2017-05-09 21:02:09 UTC (rev 295510)
@@ -0,0 +1,114 @@
+From 22fae95aff7073da55b2a79055292d320475439b Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" 
+Date: Tue, 9 May 2017 22:54:16 +0200
+Subject: [PATCH] Configure PHP to load the XMLRPC extension if present
+
+This is needed when the system PHP configuration does not already load
+the extension.
+---
+ configure.ac| 7 ++-
+ tests/Makefile.am   | 8 +++-
+ tests/httpd.conf.in | 2 ++
+ tests/php.ini.in| 1 +
+ 4 files changed, 16 insertions(+), 2 deletions(-)
+ create mode 100644 tests/php.ini.in
+
+diff --git a/configure.ac b/configure.ac
+index 3df131e67d586522..868b00e7f091a70e 100644
+--- a/configure.ac
 b/configure.ac
+@@ -272,22 +272,26 @@ if test "$have_apache" = 1; then
+ 
+ if test "$have_php" = yes; then
+   AC_MSG_CHECKING([for php-xmlrpc])
+-  if $PHP --rf xmlrpc_server_create | grep -q "does not exist"; then
++  if $PHP -d extension=xmlrpc.so --rf xmlrpc_server_create | grep -q 
"does not exist"; then
+   have_php_xmlrpc=no
++  IF_HAVE_PHP_XMLRPC=";"
+   else
+   have_php_xmlrpc=yes
++  IF_HAVE_PHP_XMLRPC=""
+   AC_DEFINE(HAVE_PHP_XMLRPC, 1, [Have php-xmlrpc])
+   fi
+   AC_MSG_RESULT($have_php_xmlrpc)
++  AC_SUBST(IF_HAVE_PHP_XMLRPC)
+ fi
+ 
+ if test -f "$APACHE_MODULE_DIR/mod_unixd.so"; then
+   IF_HAVE_MOD_UNIXD=""
+ else
+   IF_HAVE_MOD_UNIXD="#"
+ fi
+ AC_SUBST(IF_HAVE_MOD_UNIXD)
+ fi
++AM_CONDITIONAL(HAVE_PHP, test "$have_php" = yes)
+ 
+ AC_PATH_PROG(CURL, curl, no)
+ if test "$CURL" != no; then
+@@ -415,6 +419,7 @@ AC_CONFIG_FILES([
+   po/Makefile
+   tests/Makefile
+   tests/httpd.conf
++  tests/php.ini
+   examples/Makefile
+   docs/Makefile
+   docs/reference/Makefile
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 81a72cbc5ffd9739..d2986975be11eca2 100644
+--- a/tests/Makefile.am
 b/tests/Makefile.am
+@@ -73,24 +73,30 @@ test_data +=   \
+   httpd.conf
+ endif
+ 
++if HAVE_PHP
++test_data +=  \
++  php.ini
++endif
++
+ RESOURCES = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) 
--generate-dependencies $(srcdir)/soup-tests.gresource.xml)
+ 
+ soup-tests.gresource: soup-tests.gresource.xml $(RESOURCES)
+   $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) 
$<
+ 
+ EXTRA_DIST +=  \
+   htdigest \
+   htpasswd \
+   httpd.conf.in\
+   index.txt\
+   libsoup.supp \
++  php.ini.in   \
+   soup-tests.gresource.xml \
+   test-cert.pem\
+   test-key.pem \
+   xmlrpc-server.php\
+   $(RESOURCES)
+ 
+-DISTCLEANFILES += soup-tests.gresource httpd.conf
++DISTCLEANFILES += soup-tests.gresource httpd.conf php.ini
+ 
+ TESTS_ENVIRONMENT += SOUP_TESTS_IN_MAKE_CHECK=1
+ 
+diff --git a/tests/httpd.conf.in b/tests/httpd.conf.in
+index b818c12d198e6618..31c36674a9c5d8c2 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
+ LoadModule ssl_module   @APACHE_SSL_MODULE_DIR@/mod_ssl.so
+ @IF_HAVE_MOD_UNIXD@LoadModule unixd_module 
@APACHE_SSL_MODULE_DIR@/mod_unixd.so
+ 
++@IF_HAVE_PHP@PHPIniDir .
++
+ DirectoryIndex index.txt
+ TypesConfig /dev/null
+ AddType application/x-httpd-php .php
+diff --git a/tests/php.ini.in b/tests/php.ini.in
+new file mode 100644
+index ..779c022323b2f55f
+--- /dev/null
 b/tests/php.ini.in
+@@ -0,0 +1 @@
++@IF_HAVE_PHP_XMLRPC@extension=xmlrpc.so
+-- 
+2.12.2
+

Modified: PKGBUILD
===
--- PKGBUILD2017-05-09 20:58:19 UTC (rev 295509)
+++ PKGBUILD2017-05-09 21:02:09 UTC (rev 295510)
@@ -12,8 +12,10 @@
 makedepends=(intltool gobject-introspection python vala git gtk-doc)
 checkdepends=(apache php-apache)
 _commit=d6e006deed3a1f55b7a2bedded613a212fe9a16a  # tags/2.58.1^0