commit: 3c42bb6d9828e2e9ffb4d4cf2d0c5511a80e8a55 Author: Brian Evans <grknight <AT> gentoo <DOT> org> AuthorDate: Thu Dec 5 18:59:01 2019 +0000 Commit: Brian Evans <grknight <AT> gentoo <DOT> org> CommitDate: Thu Dec 5 19:01:59 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c42bb6d
dev-php/pecl-http: Mark 3.2.1 stable on amd64/x86 Maintainer tested. One Test failed but has in past. client ssl [tests/client012.phpt] Current stable fails required deps, dropped. Closes: https://bugs.gentoo.org/667080 Package-Manager: Portage-2.3.80, Repoman-2.3.19 Signed-off-by: Brian Evans <grknight <AT> gentoo.org> dev-php/pecl-http/Manifest | 1 - dev-php/pecl-http/files/pecl-http-gnutls.patch | 24 --------- dev-php/pecl-http/pecl-http-3.1.0-r1.ebuild | 69 ------------------------ dev-php/pecl-http/pecl-http-3.1.0-r2.ebuild | 75 -------------------------- dev-php/pecl-http/pecl-http-3.1.0.ebuild | 57 -------------------- dev-php/pecl-http/pecl-http-3.2.1.ebuild | 4 +- 6 files changed, 2 insertions(+), 228 deletions(-) diff --git a/dev-php/pecl-http/Manifest b/dev-php/pecl-http/Manifest index 9bd5d5c37b8..5815a02fe4a 100644 --- a/dev-php/pecl-http/Manifest +++ b/dev-php/pecl-http/Manifest @@ -1,5 +1,4 @@ DIST pecl_http-2.6.0.tgz 217673 BLAKE2B a7147924cfc018c3e273d85666d9792ea614955d0aa20ac43171266d91d139dccdbf2472dec4d145b798ce99a541dba48f7bed6009fbdf2a7ad81ab322963788 SHA512 12d18049411a4133008449a1e7458a3055322dc337f421e0e2be126ec965f15b0189af6fccd9ca4537c48819c763b9e020906ac6d09d87ead92f4436fac595ad -DIST pecl_http-3.1.0.tgz 214166 BLAKE2B 2f84fc9f5f7d465142e3482a9ee46b9dd80dd2b5ec58ad1d8d4fb18a665ebe70e4f872b8915c3a84484a3b1cd0709b39bf6170c6f1c6175aef7d43bac44aa3df SHA512 1c272aa476106bb61848f175f0ba6715b3d8928f70cdac1a673cc87c2dc780dff5434a3bc595d5e8a1ef7b847a1d2e214f9e9ae80b8b5d1f80a299febc85b0ea DIST pecl_http-3.2.0.tgz 218829 BLAKE2B bbd6f9fe8afb4324d928496e1fbcdd455e8bff5e45312ba65e5e9263719b098763203de055ea8a8ff6202ae4a434d37db25bb0975faacc956af4a0c6e8bfe8a1 SHA512 59738ee52370c68f7e74349d52738da845cfb83ae27b51a2caf3b048ba0b37c897702d7f5f8e0517df5612fd2e904d02e8e24c9e649a9e7cfdcdc04e9d19b113 DIST pecl_http-3.2.1.tgz 221244 BLAKE2B b6581829fb8a800e24ccedd4d0f3efbaf558850bdc356d27a6e1d1097a8e2cfc61963a1daccd1d0f269a7cef5b243d45cdfaff5138321fe20df615dde44d19e3 SHA512 e67d4b32ba6f524e3fcf65f5497b94275e1a4a14fce97c57afe366369f368b3acdbedf364ed73cf983fb2c5f57f498adaa1100e7c936f11cbc5de1caedad7b51 DIST pecl_http-3.2.3.tgz 220204 BLAKE2B 2a712dc8f69a8a80f6f8c306883df580fdff4a0d4cb0ac06cc004f8622b30b8e2f5d373276381fd3ad67657a80cc929be81745f200a98b6ed5e475de5639dfc5 SHA512 e955e3246db9a9172081dd9a077154139c585bfce546e91839052bbab4d0db9d0695122574a66891ceba5c0b7e8a8f0768274e1516521ccb95cd19504dc13666 diff --git a/dev-php/pecl-http/files/pecl-http-gnutls.patch b/dev-php/pecl-http/files/pecl-http-gnutls.patch deleted file mode 100644 index 4b58805946d..00000000000 --- a/dev-php/pecl-http/files/pecl-http-gnutls.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -aurN a/autoconf/pecl/libcurl.m4 b/autoconf/pecl/libcurl.m4 ---- a/autoconf/pecl/libcurl.m4 2016-12-12 04:04:21.000000000 -0500 -+++ b/autoconf/pecl/libcurl.m4 2017-01-06 09:07:17.575660038 -0500 -@@ -87,7 +87,7 @@ - AC_REQUIRE([PECL_HAVE_LIBCURL_CA])dnl - PECL_HAVE_LIBCURL_FEATURE([SSL], [ - PECL_HAVE_LIBCURL_SSLLIB([OpenSSL], [openssl/ssl.h openssl/crypto.h], [ssl crypto]) -- PECL_HAVE_LIBCURL_SSLLIB([GnuTLS], [gnutls.h gcrypt.h], [gnutls gcrypt]) -+ PECL_HAVE_LIBCURL_SSLLIB([GnuTLS], [gnutls/gnutls.h gcrypt.h], [gnutls gcrypt]) - PECL_HAVE_LIBCURL_SSLLIB([NSS]) - PECL_HAVE_LIBCURL_SSLLIB([SecureTransport]) - PECL_HAVE_LIBCURL_SSLLIB([GSKit]) -diff -aurN a/src/php_http_client_curl.c b/src/php_http_client_curl.c ---- a/src/php_http_client_curl.c 2016-12-12 04:04:21.000000000 -0500 -+++ b/src/php_http_client_curl.c 2017-01-06 09:09:01.631772852 -0500 -@@ -21,7 +21,7 @@ - # include <openssl/ssl.h> - #endif - #if PHP_HTTP_HAVE_LIBCURL_GNUTLS --# include <gnutls.h> -+# include <gnutls/gnutls.h> - #endif - - typedef struct php_http_client_curl_handler { diff --git a/dev-php/pecl-http/pecl-http-3.1.0-r1.ebuild b/dev-php/pecl-http/pecl-http-3.1.0-r1.ebuild deleted file mode 100644 index df1e34b5a7e..00000000000 --- a/dev-php/pecl-http/pecl-http-3.1.0-r1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -PHP_EXT_NAME="http" -PHP_EXT_PECL_PKG="pecl_http" -PHP_EXT_INI="yes" -PHP_EXT_ZENDEXT="no" - -USE_PHP="php5-6 php7-0 php7-1" - -inherit php-ext-pecl-r3 - -USE_PHP="php7-0 php7-1" - -KEYWORDS="~amd64 ~x86" - -DESCRIPTION="Extended HTTP Support for PHP" -LICENSE="BSD-2 MIT" -SLOT="7" -IUSE="ssl curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl" - -DEPEND="dev-libs/libevent - dev-php/pecl-propro:7[php_targets_php5-6?,php_targets_php7-0?,php_targets_php7-1?] - dev-php/pecl-raphf:7[php_targets_php5-6?,php_targets_php7-0?,php_targets_php7-1?] - net-dns/libidn - sys-libs/zlib - ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] ) - !ssl? ( net-misc/curl[-ssl] ) - php_targets_php7-0? ( dev-lang/php:7.0[hash,session,iconv] ) - php_targets_php7-1? ( dev-lang/php:7.1[hash,session,iconv] )" -RDEPEND="${DEPEND} - php_targets_php5-6? ( dev-php/pecl-http:2[php_targets_php5-6] )" - -PHP_EXT_ECONF_ARGS=( --with-http --without-http-shared-deps --without-http-libidn2-dir ) - -PATCHES=( "${FILESDIR}/pecl-http-gnutls.patch" ) - -src_prepare() { - if use php_targets_php7-0 || use php_targets_php7-1 ; then - php-ext-source-r3_src_prepare - else - default_src_prepare - fi -} - -src_install() { - if use php_targets_php7-0 || use php_targets_php7-1 ; then - php-ext-pecl-r3_src_install - - # Ensure that the http extension is loaded after its - # dependencies raphf and propro (bug 612054). Some day - # this should be possible through the eclass (bug 586446). - local slot, file, oldname, newname - for slot in $(php_get_slots); do - php_init_slot_env "${slot}" - for file in $(php_slot_ini_files "${slot}") ; do - # Prepend "zz" to the ini symlink name. This is sadly - # coupled to the naming convention in the eclass. - oldname="${ED}/${file/ext/ext-active}" - newname="${oldname/${PHP_EXT_NAME}.ini/zz${PHP_EXT_NAME}.ini}" - mv "${oldname}" "${newname}" \ - || die "failed to rename ${oldname} to ${newname}" - einfo "renamed ${oldname} to ${newname}" - done - done - fi -} diff --git a/dev-php/pecl-http/pecl-http-3.1.0-r2.ebuild b/dev-php/pecl-http/pecl-http-3.1.0-r2.ebuild deleted file mode 100644 index 3cdfdc24b15..00000000000 --- a/dev-php/pecl-http/pecl-http-3.1.0-r2.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -PHP_EXT_NAME="http" -PHP_EXT_PECL_PKG="pecl_http" -PHP_EXT_INI="yes" -PHP_EXT_ZENDEXT="no" -PHP_INI_NAME="50-http" - -USE_PHP="php5-6 php7-1 php7-2" - -inherit php-ext-pecl-r3 - -USE_PHP="php7-1 php7-2" - -KEYWORDS="~amd64 ~x86" - -DESCRIPTION="Extended HTTP Support for PHP" -LICENSE="BSD-2 MIT" -SLOT="7" -IUSE="ssl curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl" - -DEPEND="dev-libs/libevent - dev-php/pecl-propro:7[php_targets_php7-1?,php_targets_php7-2?] - dev-php/pecl-raphf:7[php_targets_php7-1?,php_targets_php7-2?] - net-dns/libidn2 - sys-libs/zlib - ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] ) - !ssl? ( net-misc/curl[-ssl] ) - php_targets_php7-1? ( dev-lang/php:7.1[hash,session,iconv] ) - php_targets_php7-2? ( dev-lang/php:7.2[hash,session,iconv] )" -RDEPEND="${DEPEND} - php_targets_php5-6? ( dev-php/pecl-http:2[php_targets_php5-6] )" - -PHP_EXT_ECONF_ARGS=( --with-http --without-http-shared-deps --without-http-libidn-dir ) - -PATCHES=( "${FILESDIR}/pecl-http-gnutls.patch" ) - -src_prepare() { - if use php_targets_php7-1 || use php_targets_php7-2 ; then - php-ext-source-r3_src_prepare - else - default_src_prepare - fi -} - -src_install() { - if use php_targets_php7-1 || use php_targets_php7-2 ; then - php-ext-pecl-r3_src_install - fi -} - -src_test() { - # Cannot use eclass function due to required modules - # All tests SKIP otherwise - for slot in $(php_get_slots); do - php_init_slot_env "${slot}" - # Link in required modules for testing - ln -s "${EXT_DIR}/propro.so" "modules/propro.so" || die - ln -s "${EXT_DIR}/raphf.so" "modules/raphf.so" || die - sed -i \ - 's/PHP_TEST_SHARED_EXTENSIONS)/PHP_TEST_SHARED_EXTENSIONS) -d extension=propro.so -d extension=raphf.so/' \ - Makefile || die - NO_INTERACTION="yes" emake test - # Clean up testing links - rm modules/propro.so modules/raphf.so || die - done -} - -pkg_postinst() { - ewarn "This API has drastically changed and is not compatible with the 1.x syntax." - ewarn "Please review the documentation and update your code." -} diff --git a/dev-php/pecl-http/pecl-http-3.1.0.ebuild b/dev-php/pecl-http/pecl-http-3.1.0.ebuild deleted file mode 100644 index c262cbac854..00000000000 --- a/dev-php/pecl-http/pecl-http-3.1.0.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -PHP_EXT_NAME="http" -PHP_EXT_PECL_PKG="pecl_http" -PHP_EXT_INI="yes" -PHP_EXT_ZENDEXT="no" - -USE_PHP="php5-6 php7-0 php7-1" - -inherit php-ext-pecl-r3 - -USE_PHP="php7-0 php7-1" - -KEYWORDS="amd64 x86" - -DESCRIPTION="Extended HTTP Support for PHP" -LICENSE="BSD-2 MIT" -SLOT="7" -IUSE="ssl curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl" - -DEPEND="dev-libs/libevent - dev-php/pecl-propro:7[php_targets_php5-6?,php_targets_php7-0?,php_targets_php7-1?] - dev-php/pecl-raphf:7[php_targets_php5-6?,php_targets_php7-0?,php_targets_php7-1?] - net-dns/libidn - sys-libs/zlib - ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] ) - !ssl? ( net-misc/curl[-ssl] ) - php_targets_php7-0? ( dev-lang/php:7.0[hash,session,iconv] ) - php_targets_php7-1? ( dev-lang/php:7.1[hash,session,iconv] )" -RDEPEND="${DEPEND} - php_targets_php5-6? ( dev-php/pecl-http:2[php_targets_php5-6] )" - -PHP_EXT_ECONF_ARGS=( --with-http --without-http-shared-deps --without-http-libidn2-dir ) - -PATCHES=( "${FILESDIR}/pecl-http-gnutls.patch" ) - -src_prepare() { - if use php_targets_php7-0 || use php_targets_php7-1 ; then - php-ext-source-r3_src_prepare - else - default_src_prepare - fi -} - -src_install() { - if use php_targets_php7-0 || use php_targets_php7-1 ; then - php-ext-pecl-r3_src_install - fi -} - -pkg_postinst() { - ewarn "This API has drastically changed and is not compatible with the 1.x syntax." - ewarn "Please review the documentation and update your code." -} diff --git a/dev-php/pecl-http/pecl-http-3.2.1.ebuild b/dev-php/pecl-http/pecl-http-3.2.1.ebuild index 564462685ed..bb652b2134f 100644 --- a/dev-php/pecl-http/pecl-http-3.2.1.ebuild +++ b/dev-php/pecl-http/pecl-http-3.2.1.ebuild @@ -15,7 +15,7 @@ inherit php-ext-pecl-r3 USE_PHP="php7-1 php7-2 php7-3" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" DESCRIPTION="Extended HTTP Support for PHP" LICENSE="BSD-2 MIT" @@ -63,7 +63,7 @@ src_test() { sed -i \ 's/PHP_TEST_SHARED_EXTENSIONS)/PHP_TEST_SHARED_EXTENSIONS) -d extension=propro.so -d extension=raphf.so/' \ Makefile || die - NO_INTERACTION="yes" emake test + SKIP_ONLINE_TESTS="yes" NO_INTERACTION="yes" emake test # Clean up testing links rm modules/propro.so modules/raphf.so || die done
