Fix bug #117767.

(Portage version: 2.0.53)

4 files changed, 25 insertions, 6 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index eba1a6379365..33bb7ce1d0f8 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/php
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.56 2006/01/04 09:24:47 chtekk Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.57 2006/01/05 17:23:22 chtekk Exp $
+
+  05 Jan 2006; Luca Longinotti <chtekk@gentoo.org>
+  +files/5.1.1/php5.1.1-curl-gcry_threads.patch, php-5.1.1.ebuild:
+  Fix bug #117767.
 
 *php-5.1.1 (28 Dec 2005)
 *php-5.0.5-r5 (28 Dec 2005)
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index cf186c7c7853..06c539c91ec0 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,4 +1,4 @@
-MD5 240d0434cf53fea5fa98fc3322e14171 ChangeLog 12720
+MD5 b8863a13c2752761a9236cb5474c6ae7 ChangeLog 12858
 MD5 389638f1d46b6c41cd4d87b471572f4b files/4-any/apache-1.3/70_mod_php.conf 484
 MD5 ee36e31632adb08b7abf70f78b5b2125 files/4-any/apache-2.0/70_mod_php.conf 485
 MD5 f0acca9c6387b8ca139d2849665bd16f files/4-any/php4-fastbuild.patch 9012
@@ -50,6 +50,7 @@ MD5 2a1f695fb5ff9959ed634e5a361fc46f files/5.1-any/php5-iodbc-config.diff 527
 MD5 058042718bc876bf27ab902673919ca9 files/5.1-any/php5-prefork.patch 850
 MD5 273799e60d5a41a1e6f5ac53781a152f files/5.1-any/php5-soap_persistence_session.diff 1976
 MD5 f2ab14c7be0482a4f25fc438fa6f5399 files/5.1-any/php5-with-iodbc.diff 443
+MD5 442a1c67483c8692f08a4960690c7715 files/5.1.1/php5.1.1-curl-gcry_threads.patch 326
 MD5 b2efb209e465415427bce146acac51cf files/5.1.1/php5.1.1-ming-config.patch 672
 MD5 ad1808326ee0e0fdcb843d8c3cd5efa9 files/5.1.1/php5.1.1-multilib-search-path.patch 10285
 MD5 ed010745cb9455e21309eae5409242d1 files/digest-php-4.3.11-r5 229
@@ -60,4 +61,4 @@ MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
 MD5 d7a463a0d91060881509adc142347561 php-4.3.11-r5.ebuild 9595
 MD5 e2e42f58f760c070c501612f987b4151 php-4.4.1-r3.ebuild 8588
 MD5 59d674522ef0955912a606869b0834af php-5.0.5-r5.ebuild 6036
-MD5 33de3bc04263b0adbf6db6a18161711c php-5.1.1.ebuild 8021
+MD5 cd54374b1267934f76619b47903aa43a php-5.1.1.ebuild 8126
diff --git a/dev-lang/php/files/5.1.1/php5.1.1-curl-gcry_threads.patch b/dev-lang/php/files/5.1.1/php5.1.1-curl-gcry_threads.patch
new file mode 100644
index 000000000000..486006aebbe7
--- /dev/null
+++ b/dev-lang/php/files/5.1.1/php5.1.1-curl-gcry_threads.patch
@@ -0,0 +1,11 @@
+--- ext/curl/interface.c	2006-01-05 13:50:45.000000000 +0100
++++ ext/curl/interface.c	2006-01-05 13:51:03.000000000 +0100
+@@ -1673,7 +1673,7 @@
+ }
+ 
+ static struct gcry_thread_cbs php_curl_gnutls_tsl = {
+-	GCRY_THREAD_OPTIONS_USER,
++	GCRY_THREAD_OPTION_USER,
+ 	NULL,
+ 	php_curl_ssl_mutex_create,
+ 	php_curl_ssl_mutex_destroy,
diff --git a/dev-lang/php/php-5.1.1.ebuild b/dev-lang/php/php-5.1.1.ebuild
index 1bd3fabb8eda..128c32043caa 100644
--- a/dev-lang/php/php-5.1.1.ebuild
+++ b/dev-lang/php/php-5.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.1.1.ebuild,v 1.1 2006/01/04 09:24:47 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.1.1.ebuild,v 1.2 2006/01/05 17:23:22 chtekk Exp $
 
 IUSE="cgi cli discard-path force-cgi-redirect"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
@@ -83,6 +83,9 @@ src_unpack() {
 	# fix PHP branding
 	sed -e 's|^EXTRA_VERSION=""|EXTRA_VERSION="-gentoo"|g' -i configure.in
 
+	# fix CURL compilation error, bug #117767
+	epatch "${FILESDIR}/${PV}/php${PV}-curl-gcry_threads.patch"
+
 	# fix ming error in configure
 	epatch "${FILESDIR}/${PV}/php${PV}-ming-config.patch"