php7-pecl-http: upgrade to 3.1.0

Signed-off-by: Michael Heimpold <mhei@heimpold.de>

diff --git a/lang/php7-pecl-http/Makefile b/lang/php7-pecl-http/Makefile
index 4166d2c5e07e9cb43458336fb5625ab1ab039d03..df9056dfd44aba71a6073790b7adf800f5d10f8e 100644 (file)
--- a/lang/php7-pecl-http/Makefile
+++ b/lang/php7-pecl-http/Makefile
@@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk
 PECL_NAME:=pecl_http
 PECL_LONGNAME:=Extended HTTP Support
 
-PKG_VERSION:=3.0.1
-PKG_RELEASE:=2
-PKG_MD5SUM:=042c97314c180f6473338f0c5d35fabd
+PKG_VERSION:=3.1.0
+PKG_RELEASE:=1
+PKG_MD5SUM:=e3de67b156e7d5f6c2e5eb1e2b5f0acceb7004f1260d68c9f8b2c0f9629aabf0
 
 PKG_NAME:=php7-pecl-http
 PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz
@@ -34,6 +34,17 @@ include ../php7/pecl.mk
 CONFIGURE_VARS+= \
        PHP_PROPRO=yes \
        PHP_RAPHF=yes \
+       PECL_cv_HAVE_LIBCURL_ARES=no \
+       PECL_cv_HAVE_LIBCURL_OpenSSL=$(if $(CONFIG_LIBCURL_OPENSSL),yes,no) \
+       PECL_cv_HAVE_LIBCURL_GnuTLS=$(if $(CONFIG_LIBCURL_GNUTLS),yes,no) \
+       PECL_cv_HAVE_LIBCURL_NSS=no \
+       PECL_cv_HAVE_LIBCURL_SecureTransport=no \
+       PECL_cv_HAVE_LIBCURL_GSKit=no \
+       PECL_cv_HAVE_LIBCURL_PolarSSL=$(if $(CONFIG_LIBCURL_POLARSSL),yes,no) \
+       PECL_cv_HAVE_LIBCURL_WolfSSL=$(if $(CONFIG_LIBCURL_CYASSL),yes,no) \
+       PECL_cv_HAVE_LIBCURL_mbedTLS=$(if $(CONFIG_LIBCURL_MBEDTLS),yes,no) \
+       PECL_cv_HAVE_LIBCURL_axTLS=no \
+       PECL_cv_LIBCURL_TLSAUTH_SRP=$(if $(CONFIG_LIBCURL_TLS_SRP),yes,no) \
 
 CONFIGURE_ARGS+= \
        --with-http \
@@ -42,5 +53,5 @@ CONFIGURE_ARGS+= \
        --with-http-libevent-dir="$(STAGING_DIR)/usr" \
        --with-http-libidn-dir="$(STAGING_DIR)/usr"
 
-$(eval $(call PECLPackage,http,$(PECL_LONGNAME),+libcurl +librt +libevent2 +libidn +php7-mod-iconv +php7-mod-session +php7-pecl-raphf +php7-pecl-propro,30))
+$(eval $(call PECLPackage,http,$(PECL_LONGNAME),+icu +libcurl +librt +libevent2 +libidn +php7-mod-iconv +php7-mod-session +php7-pecl-raphf +php7-pecl-propro,30))
 $(eval $(call BuildPackage,$(PKG_NAME)))

diff --git a/lang/php7-pecl-http/patches.old/100_config9-m4.patch b/lang/php7-pecl-http/patches.old/100_config9-m4.patch
new file mode 100644 (file)
index 0000000..304a1df
--- /dev/null
+++ b/lang/php7-pecl-http/patches.old/100_config9-m4.patch
@@ -0,0 +1,22 @@
+--- a/config9.m4       2016-09-08 21:39:18.000000000 +0200
++++ b/config9.m4       2016-09-08 21:42:35.066903251 +0200
+@@ -71,18 +71,7 @@
+               extname=$1
+               haveext=$[PHP_]translit($1,a-z_-,A-Z__)
+               AC_MSG_CHECKING([for ext/$extname support])
+-              if test -x "$PHP_EXECUTABLE"; then
+-                      grepext=`$PHP_EXECUTABLE -m | $EGREP ^$extname\$`
+-                      if test "$grepext" = "$extname"; then
+-                              [PHP_HTTP_HAVE_EXT_]translit($1,a-z_-,A-Z__)=1
+-                              AC_MSG_RESULT([yes])
+-                              $2
+-                      else
+-                              [PHP_HTTP_HAVE_EXT_]translit($1,a-z_-,A-Z__)=
+-                              AC_MSG_RESULT([no])
+-                              $3
+-                      fi
+-              elif test "$haveext" != "no" && test "x$haveext" != "x"; then
++              if test "$haveext" != "no" && test "x$haveext" != "x"; then
+                       [PHP_HTTP_HAVE_EXT_]translit($1,a-z_-,A-Z__)=1
+                       AC_MSG_RESULT([yes])
+                       $2

diff --git a/lang/php7-pecl-http/patches/100_config9-m4.patch b/lang/php7-pecl-http/patches/100_config9-m4.patch
deleted file mode 100644 (file)
index 304a1df..0000000
--- a/lang/php7-pecl-http/patches/100_config9-m4.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/config9.m4       2016-09-08 21:39:18.000000000 +0200
-+++ b/config9.m4       2016-09-08 21:42:35.066903251 +0200
-@@ -71,18 +71,7 @@
-               extname=$1
-               haveext=$[PHP_]translit($1,a-z_-,A-Z__)
-               AC_MSG_CHECKING([for ext/$extname support])
--              if test -x "$PHP_EXECUTABLE"; then
--                      grepext=`$PHP_EXECUTABLE -m | $EGREP ^$extname\$`
--                      if test "$grepext" = "$extname"; then
--                              [PHP_HTTP_HAVE_EXT_]translit($1,a-z_-,A-Z__)=1
--                              AC_MSG_RESULT([yes])
--                              $2
--                      else
--                              [PHP_HTTP_HAVE_EXT_]translit($1,a-z_-,A-Z__)=
--                              AC_MSG_RESULT([no])
--                              $3
--                      fi
--              elif test "$haveext" != "no" && test "x$haveext" != "x"; then
-+              if test "$haveext" != "no" && test "x$haveext" != "x"; then
-                       [PHP_HTTP_HAVE_EXT_]translit($1,a-z_-,A-Z__)=1
-                       AC_MSG_RESULT([yes])
-                       $2