diff options
author | George Sherwood | 2007-02-09 07:59:54 +0400 |
---|---|---|
committer | Jeremy Blosser | 2007-02-21 18:27:24 -0600 |
commit | 703cd950c120d047373cbab6c54535db6138658a (patch) | |
tree | cc0fafac0f05f3ba0c197e66a9903eb9568d8e8c | |
parent | 949a8cdd240f80abe8ca537ad97a279c6abfc43b (diff) |
php: Updated to version 5.2.1. SECURITY_PATCH++. Removed PRE_BUILD and
curl.patch. Integrated upstream.
-rwxr-xr-x | php-pear/php/DETAILS | 14 | ||||
-rw-r--r-- | php-pear/php/HISTORY | 5 | ||||
-rwxr-xr-x | php-pear/php/PRE_BUILD | 3 | ||||
-rw-r--r-- | php-pear/php/curl.patch | 47 |
4 files changed, 10 insertions, 59 deletions
diff --git a/php-pear/php/DETAILS b/php-pear/php/DETAILS index 2f9706cdff..36726c5c5d 100755 --- a/php-pear/php/DETAILS +++ b/php-pear/php/DETAILS @@ -1,19 +1,15 @@ SPELL=php if [[ "$PHP_RC" == y ]]; then - VERSION=5.2.0 # last was 5.1.0RC6 - SOURCE_HASH=sha512:61d9d50e817f2deeee64f5499cd20c07bf486f6f17cb7039c56dbdb82f4947c54e234198eacc6880d8d3af84499615803946b8c90e749cb7b699e95c4e205ca6 + VERSION=5.2.1 # last was 5.1.0RC6 + SOURCE_HASH=sha512:5cf13ea4d610ca1c1f05f56433aa86e90b0833a715d40d1f4bbb199d941bf27ae7e0cc43fabc69d1f31576083ed381467db8bfb1788ecb3b42818bf6d3d71bbd else - VERSION=5.2.0 - SOURCE_HASH=sha512:61d9d50e817f2deeee64f5499cd20c07bf486f6f17cb7039c56dbdb82f4947c54e234198eacc6880d8d3af84499615803946b8c90e749cb7b699e95c4e205ca6 + VERSION=5.2.1 + SOURCE_HASH=sha512:5cf13ea4d610ca1c1f05f56433aa86e90b0833a715d40d1f4bbb199d941bf27ae7e0cc43fabc69d1f31576083ed381467db8bfb1788ecb3b42818bf6d3d71bbd fi - SECURITY_PATCH=1 + SECURITY_PATCH=2 SOURCE=$SPELL-$VERSION.tar.bz2 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION -#if [ "${VERSION//RC/}" == "$VERSION" ]; then SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE -#else -# SOURCE_URL[0]=http://downloads.php.net/ilia/$SOURCE -#fi WEB_SITE=http://www.php.net/ ENTERED=20011024 LICENSE[0]=http://www.php.net/license/3_0.txt diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY index 31af3db86a..c0aa2f191a 100644 --- a/php-pear/php/HISTORY +++ b/php-pear/php/HISTORY @@ -1,3 +1,8 @@ +2007-02-09 George Sherwood <george@beernabeer.com> + * DETAILS: Updated to version 5.2.1. SECURITY_PATCH++ + * PRE_BUILD: Removed. + * curl.patch: Removed. Integrated upstream. + 2007-01-11 George Sherwood <george@beernabeer.com> * TRIGGERS: Added for mysql. Bug #7953. diff --git a/php-pear/php/PRE_BUILD b/php-pear/php/PRE_BUILD deleted file mode 100755 index 4909b5d28b..0000000000 --- a/php-pear/php/PRE_BUILD +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index 1ba0930be6..0000000000 --- a/php-pear/php/curl.patch +++ /dev/null @@ -1,47 +0,0 @@ -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; |