Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (7cd478d4f040a7e3051d9fe9c6dc9dca7f00b0e1)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (7cd478d4f040a7e3051d9fe9c6dc9dca7f00b0e1)
  • Date: Mon, 6 Nov 2006 21:49:46 -0600

GIT changes to master grimoire by George Sherwood <chat AT sourcemage.org>:

php-pear/php/DETAILS | 8 ++++----
php-pear/php/HISTORY | 5 +++++
php-pear/php/PRE_BUILD | 3 +++
php-pear/php/curl.patch | 47
+++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 59 insertions(+), 4 deletions(-)

New commits:
commit 7cd478d4f040a7e3051d9fe9c6dc9dca7f00b0e1
Author: George Sherwood <chat AT sourcemage.org>
Commit: George Sherwood <chat AT sourcemage.org>

php: Updated to 5.2.0. Added upstream patch to compile with curl 7.16.0.

diff --git a/php-pear/php/DETAILS b/php-pear/php/DETAILS
index 9255210..2f9706c 100755
--- a/php-pear/php/DETAILS
+++ b/php-pear/php/DETAILS
@@ -1,10 +1,10 @@
SPELL=php
if [[ "$PHP_RC" == y ]]; then
- VERSION=5.1.6 # last was 5.1.0RC6
-
SOURCE_HASH=sha512:a648ef6c894ac2b533836ffdd4d0a0c47c15abfe252d8b11cfdc97119500d8b5a5c7c78df27b8079c206ecdda4c02ba95c1dd16708ac839fc261c5d600593572
+ VERSION=5.2.0 # last was 5.1.0RC6
+
SOURCE_HASH=sha512:61d9d50e817f2deeee64f5499cd20c07bf486f6f17cb7039c56dbdb82f4947c54e234198eacc6880d8d3af84499615803946b8c90e749cb7b699e95c4e205ca6
else
- VERSION=5.1.6
-
SOURCE_HASH=sha512:a648ef6c894ac2b533836ffdd4d0a0c47c15abfe252d8b11cfdc97119500d8b5a5c7c78df27b8079c206ecdda4c02ba95c1dd16708ac839fc261c5d600593572
+ VERSION=5.2.0
+
SOURCE_HASH=sha512:61d9d50e817f2deeee64f5499cd20c07bf486f6f17cb7039c56dbdb82f4947c54e234198eacc6880d8d3af84499615803946b8c90e749cb7b699e95c4e205ca6
fi
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.bz2
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index 670441e..56fa93c 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,8 @@
+2006-11-07 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 5.2.0
+ * PRE_BUILD: Added to apply patch
+ * curl.patch: Upstream patch to compile with new curl.
+
2006-10-09 George Sherwood <george AT beernabeer.com>
* CONFIGURE: Added query for usage of GD
* BUILD: Enable internal GD is requested. Fix libXpm directory.
diff --git a/php-pear/php/PRE_BUILD b/php-pear/php/PRE_BUILD
new file mode 100755
index 0000000..4909b5d
--- /dev/null
+++ b/php-pear/php/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SCRIPT_DIRECTORY/curl.patch
diff --git a/php-pear/php/curl.patch b/php-pear/php/curl.patch
new file mode 100644
index 0000000..1ba0930
--- /dev/null
+++ b/php-pear/php/curl.patch
@@ -0,0 +1,47 @@
+diff -ruN php-5.2.0/ext/curl/interface.c
php5.2-200611050930/ext/curl/interface.c
+--- ext/curl/interface.c 2006-10-11 04:12:59.000000000 +0500
++++ ext/curl/interface.c 2006-11-03 19:30:59.000000000 +0400
+@@ -16,7 +16,7 @@
+ +----------------------------------------------------------------------+
+ */
+
+-/* $Id: interface.c,v 1.62.2.14.2.12 2006/10/10 23:12:59 iliaa Exp $ */
++/* $Id: interface.c,v 1.62.2.14.2.13 2006/11/03 14:53:14 iliaa Exp $ */
+
+ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
+
+@@ -369,7 +369,9 @@
+ REGISTER_CURL_CONSTANT(CURLOPT_FTPAPPEND);
+ REGISTER_CURL_CONSTANT(CURLOPT_NETRC);
+ REGISTER_CURL_CONSTANT(CURLOPT_FOLLOWLOCATION);
++#if CURLOPT_FTPASCII != 0
+ REGISTER_CURL_CONSTANT(CURLOPT_FTPASCII);
++#endif
+ REGISTER_CURL_CONSTANT(CURLOPT_PUT);
+ #if CURLOPT_MUTE != 0
+ REGISTER_CURL_CONSTANT(CURLOPT_MUTE);
+@@ -409,7 +411,9 @@
+ REGISTER_CURL_CONSTANT(CURLOPT_FILETIME);
+ REGISTER_CURL_CONSTANT(CURLOPT_WRITEFUNCTION);
+ REGISTER_CURL_CONSTANT(CURLOPT_READFUNCTION);
++#if CURLOPT_PASSWDFUNCTION != 0
+ REGISTER_CURL_CONSTANT(CURLOPT_PASSWDFUNCTION);
++#endif
+ REGISTER_CURL_CONSTANT(CURLOPT_HEADERFUNCTION);
+ REGISTER_CURL_CONSTANT(CURLOPT_MAXREDIRS);
+ REGISTER_CURL_CONSTANT(CURLOPT_MAXCONNECTS);
+@@ -1157,12 +1161,13 @@
+ dupch->handlers->write_header->fp = ch->handlers->write_header->fp;
+ dupch->handlers->read->fp = ch->handlers->read->fp;
+ dupch->handlers->read->fd = ch->handlers->read->fd;
+-
++#if CURLOPT_PASSWDDATA != 0
+ if (ch->handlers->passwd) {
+ zval_add_ref(&ch->handlers->passwd);
+ dupch->handlers->passwd = ch->handlers->passwd;
+ curl_easy_setopt(ch->cp, CURLOPT_PASSWDDATA, (void *) dupch);
+ }
++#endif
+ if (ch->handlers->write->func_name) {
+ zval_add_ref(&ch->handlers->write->func_name);
+ dupch->handlers->write->func_name =
ch->handlers->write->func_name;



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (7cd478d4f040a7e3051d9fe9c6dc9dca7f00b0e1), George Sherwood, 11/06/2006

Archive powered by MHonArc 2.6.24.

Top of Page