Date: Friday, August 10, 2018 @ 09:18:51 Author: heftig Revision: 331328
archrelease: copy trunk to extra-x86_64 Added: libsoup/repos/extra-x86_64/0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch (from rev 331327, libsoup/trunk/0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch) libsoup/repos/extra-x86_64/PKGBUILD (from rev 331327, libsoup/trunk/PKGBUILD) Deleted: libsoup/repos/extra-x86_64/0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch libsoup/repos/extra-x86_64/PKGBUILD -----------------------------------------------------------------+ 0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch | 230 +++++----- PKGBUILD | 100 ++-- 2 files changed, 165 insertions(+), 165 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-08-10 09:18:07 UTC (rev 331327) +++ 0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch 2018-08-10 09:18:51 UTC (rev 331328) @@ -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)" <jan.steff...@gmail.com> -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 00000000..779c0223 ---- /dev/null -+++ b/tests/php.ini.in -@@ -0,0 +1 @@ -+@IF_HAVE_PHP_XMLRPC@extension=xmlrpc.so --- -2.16.2 - Copied: libsoup/repos/extra-x86_64/0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch (from rev 331327, libsoup/trunk/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 2018-08-10 09:18:51 UTC (rev 331328) @@ -0,0 +1,115 @@ +From 437356c457cfeb7b4ab0cdad67f59f431d459536 Mon Sep 17 00:00:00 2001 +Message-Id: <437356c457cfeb7b4ab0cdad67f59f431d459536.1520796778.git.jan.steff...@gmail.com> +From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com> +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 00000000..779c0223 +--- /dev/null ++++ b/tests/php.ini.in +@@ -0,0 +1 @@ ++@IF_HAVE_PHP_XMLRPC@extension=xmlrpc.so +-- +2.16.2 + Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-08-10 09:18:07 UTC (rev 331327) +++ PKGBUILD 2018-08-10 09:18:51 UTC (rev 331328) @@ -1,50 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <j...@archlinux.org> - -pkgname=libsoup -pkgver=2.62.2 -pkgrel=1 -pkgdesc="HTTP client/server library for GNOME" -url="https://wiki.gnome.org/Projects/libsoup" -arch=(x86_64) -license=(LGPL) -depends=(glib2 libxml2 glib-networking sqlite krb5) -makedepends=(intltool gobject-introspection python vala git gtk-doc) -checkdepends=(apache php-apache) -_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) -sha256sums=('SKIP' - '7bf5257afb2c248c8ef8709e4aeaaafe9252835887b6944fe143eddc7ce98a8c') - -pkgver() { - cd $pkgname - git describe --tags | sed 's/-/+/g' -} - -prepare() { - cd $pkgname - - # https://bugzilla.gnome.org/show_bug.cgi?id=782410 - patch -Np1 -i ../0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch - - NOCONFIGURE=1 ./autogen.sh -} - -build() { - cd $pkgname - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --enable-gtk-doc - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - make -} - -check() { - cd $pkgname - make check -} - -package() { - cd $pkgname - make DESTDIR="$pkgdir" install -} Copied: libsoup/repos/extra-x86_64/PKGBUILD (from rev 331327, libsoup/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-08-10 09:18:51 UTC (rev 331328) @@ -0,0 +1,50 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> + +pkgname=libsoup +pkgver=2.62.3 +pkgrel=1 +pkgdesc="HTTP client/server library for GNOME" +url="https://wiki.gnome.org/Projects/libsoup" +arch=(x86_64) +license=(LGPL) +depends=(glib2 libxml2 glib-networking sqlite krb5) +makedepends=(intltool gobject-introspection python vala git gtk-doc) +checkdepends=(apache php-apache) +_commit=578f7d804529761d68b0cc3e4a77089682ded63c # tags/2.62.3^0 +source=("git+https://gitlab.gnome.org/GNOME/libsoup.git#commit=$_commit" + 0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch) +sha256sums=('SKIP' + '7bf5257afb2c248c8ef8709e4aeaaafe9252835887b6944fe143eddc7ce98a8c') + +pkgver() { + cd $pkgname + git describe --tags | sed 's/-/+/g' +} + +prepare() { + cd $pkgname + + # https://bugzilla.gnome.org/show_bug.cgi?id=782410 + patch -Np1 -i ../0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch + + NOCONFIGURE=1 ./autogen.sh +} + +build() { + cd $pkgname + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --enable-gtk-doc + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make +} + +check() { + cd $pkgname + make check +} + +package() { + cd $pkgname + make DESTDIR="$pkgdir" install +}