From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 81E1F139085 for ; Fri, 6 Jan 2017 14:21:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C84A9E0CAB; Fri, 6 Jan 2017 14:21:43 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A6C87E0CAB for ; Fri, 6 Jan 2017 14:21:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6A6B53415D2 for ; Fri, 6 Jan 2017 14:21:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0AEAB2601 for ; Fri, 6 Jan 2017 14:21:41 +0000 (UTC) From: "Brian Evans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" Message-ID: <1483712483.4b7abacb9f6acf9e4ac48ff3991290a9ef54abfe.grknight@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-http/, dev-php/pecl-http/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-php/pecl-http/files/pecl-http-gnutls.patch dev-php/pecl-http/pecl-http-3.1.0.ebuild X-VCS-Directories: dev-php/pecl-http/files/ dev-php/pecl-http/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 4b7abacb9f6acf9e4ac48ff3991290a9ef54abfe X-VCS-Branch: master Date: Fri, 6 Jan 2017 14:21:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d4da04e6-72b6-46c8-b43f-3c5e50b5b4a2 X-Archives-Hash: 12416c945b9a0a335afbd9f0ffd26a2c commit: 4b7abacb9f6acf9e4ac48ff3991290a9ef54abfe Author: Brian Evans gentoo org> AuthorDate: Fri Jan 6 14:21:23 2017 +0000 Commit: Brian Evans gentoo org> CommitDate: Fri Jan 6 14:21:23 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b7abacb dev-php/pecl-http: Fix build failure with curl_ssl_gnutls USE Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-php/pecl-http/files/pecl-http-gnutls.patch | 24 ++++++++++++++++++++++++ dev-php/pecl-http/pecl-http-3.1.0.ebuild | 4 +++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dev-php/pecl-http/files/pecl-http-gnutls.patch b/dev-php/pecl-http/files/pecl-http-gnutls.patch new file mode 100644 index 00000000..4b58805 --- /dev/null +++ b/dev-php/pecl-http/files/pecl-http-gnutls.patch @@ -0,0 +1,24 @@ +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 + #endif + #if PHP_HTTP_HAVE_LIBCURL_GNUTLS +-# include ++# include + #endif + + typedef struct php_http_client_curl_handler { diff --git a/dev-php/pecl-http/pecl-http-3.1.0.ebuild b/dev-php/pecl-http/pecl-http-3.1.0.ebuild index d74da59..3c43ba0 100644 --- a/dev-php/pecl-http/pecl-http-3.1.0.ebuild +++ b/dev-php/pecl-http/pecl-http-3.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -36,6 +36,8 @@ RDEPEND="${DEPEND} PHP_EXT_ECONF_ARGS=( --with-http --without-http-shared-deps ) +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