From 9b5e1c59502f621c0767ecf1c3d6e88b0a54ffd3 Mon Sep 17 00:00:00 2001 From: jorton Date: Wed, 5 Dec 2007 15:49:24 +0000 Subject: [PATCH] * Wed Dec 5 2007 Joe Orton 5.2.5-2 - update to 5.2.5 --- .cvsignore | 3 ++- php-5.2.2-pdosym.patch | 41 ----------------------------------------- php.spec | 9 +++++---- sources | 2 +- 4 files changed, 8 insertions(+), 47 deletions(-) delete mode 100644 php-5.2.2-pdosym.patch diff --git a/.cvsignore b/.cvsignore index e85274d..c5d4dab 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,4 @@ php-5.2.3 clog -php-5.2.4.tar.gz +*.tar.gz +*.rpm diff --git a/php-5.2.2-pdosym.patch b/php-5.2.2-pdosym.patch deleted file mode 100644 index 1a9aca7..0000000 --- a/php-5.2.2-pdosym.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- php-5.2.2/ext/pdo/pdo_stmt.c.pdosym -+++ php-5.2.2/ext/pdo/pdo_stmt.c -@@ -37,38 +37,6 @@ - #include "zend_interfaces.h" - #include "php_memory_streams.h" - --#if COMPILE_DL_PDO --/* {{{ content from zend_arg_defs.c: -- * since it is a .c file, it won't be installed for use by PECL extensions, so we include it here. */ --ZEND_BEGIN_ARG_INFO(first_arg_force_ref, 0) -- ZEND_ARG_PASS_INFO(1) --ZEND_END_ARG_INFO() -- -- --ZEND_BEGIN_ARG_INFO(second_arg_force_ref, 0) -- ZEND_ARG_PASS_INFO(0) -- ZEND_ARG_PASS_INFO(1) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO(third_arg_force_ref, 0) -- ZEND_ARG_PASS_INFO(0) -- ZEND_ARG_PASS_INFO(0) -- ZEND_ARG_PASS_INFO(1) --ZEND_END_ARG_INFO() -- -- --ZEND_BEGIN_ARG_INFO(fourth_arg_force_ref, 0) -- ZEND_ARG_PASS_INFO(0) -- ZEND_ARG_PASS_INFO(0) -- ZEND_ARG_PASS_INFO(0) -- ZEND_ARG_PASS_INFO(1) --ZEND_END_ARG_INFO() -- --ZEND_BEGIN_ARG_INFO(all_args_by_ref, 1) --ZEND_END_ARG_INFO() --/* }}} */ --#endif -- - #define PHP_STMT_GET_OBJ \ - pdo_stmt_t *stmt = (pdo_stmt_t*)zend_object_store_get_object(getThis() TSRMLS_CC); \ - if (!stmt->dbh) { \ diff --git a/php.spec b/php.spec index 47072f3..bcd438e 100644 --- a/php.spec +++ b/php.spec @@ -5,8 +5,8 @@ Summary: The PHP HTML-embedded scripting language Name: php -Version: 5.2.4 -Release: 3 +Version: 5.2.5 +Release: 2 License: PHP Group: Development/Languages URL: http://www.php.net/ @@ -26,7 +26,6 @@ Patch9: php-5.2.4-embed.patch # Fixes for extension modules Patch21: php-5.2.4-odbc.patch Patch22: php-4.3.11-shutdown.patch -Patch23: php-5.2.2-pdosym.patch Patch24: php-5.2.3-macropen.patch Patch25: php-4.3.9-metaphone.patch @@ -356,7 +355,6 @@ into applications to provide PHP scripting language support. %patch21 -p1 -b .odbc %patch22 -p1 -b .shutdown -%patch23 -p1 -b .pdosym %patch24 -p1 -b .macropen %patch25 -p1 -b .metaphone @@ -720,6 +718,9 @@ rm files.* macros.php %files mssql -f files.mssql %changelog +* Wed Dec 5 2007 Joe Orton 5.2.5-2 +- update to 5.2.5 + * Mon Oct 15 2007 Joe Orton 5.2.4-3 - correct pcre BR version (#333021) - restore metaphone fix (#205714) diff --git a/sources b/sources index 767c2a6..8e4330e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0826e231c3148b29fd039d7a8c893ad3 php-5.2.4.tar.gz +61a0e1661b70760acc77bc4841900b7a php-5.2.5.tar.gz