rpms/php/devel php-5.2.2-pdosym.patch, NONE, 1.1 php.spec, 1.138, 1.139
Joe Orton (jorton)
fedora-extras-commits at redhat.com
Wed May 9 16:42:56 UTC 2007
- Previous message (by thread): rpms/kernel/devel/configs config-generic, 1.311, 1.312 config-nodebug, 1.6, 1.7
- Next message (by thread): rpms/ntp/devel ntp-4.2.4p0-sleep.patch, NONE, 1.1 ntp.spec, 1.65, 1.66 ntp-4.2.4-sleep.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jorton
Update of /cvs/extras/rpms/php/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20482
Modified Files:
php.spec
Added Files:
php-5.2.2-pdosym.patch
Log Message:
* Wed May 9 2007 Joe Orton <jorton at redhat.com> 5.2.2-4
- fix php-pdo *_arg_force_ref global symbol abuse (#216125)
php-5.2.2-pdosym.patch:
--- NEW FILE php-5.2.2-pdosym.patch ---
--- 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) { \
Index: php.spec
===================================================================
RCS file: /cvs/extras/rpms/php/devel/php.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- php.spec 8 May 2007 12:06:37 -0000 1.138
+++ php.spec 9 May 2007 16:42:21 -0000 1.139
@@ -6,7 +6,7 @@
Summary: The PHP HTML-embedded scripting language
Name: php
Version: 5.2.2
-Release: 3
+Release: 4
License: The PHP License v3.01
Group: Development/Languages
URL: http://www.php.net/
@@ -25,6 +25,7 @@
# Fixes for extension modules
Patch21: php-4.3.1-odbc.patch
Patch22: php-4.3.11-shutdown.patch
+Patch23: php-5.2.2-pdosym.patch
# Functional changes
Patch30: php-5.0.4-dlopen.patch
@@ -108,7 +109,7 @@
Group: Development/Languages
Requires: php-common = %{version}-%{release}
Obsoletes: mod_php3-imap, stronghold-php-imap
-BuildRequires: krb5-devel, openssl-devel, uw-imap-devel
+BuildRequires: krb5-devel, openssl-devel, libc-client-devel
%description imap
The php-imap package contains a dynamic shared object (DSO) for the
@@ -298,6 +299,7 @@
%patch21 -p1 -b .odbc
%patch22 -p1 -b .shutdown
+%patch23 -p1 -b .pdosym
%patch30 -p1 -b .dlopen
%patch31 -p1 -b .easter
@@ -631,6 +633,9 @@
%files pdo -f files.pdo
%changelog
+* Wed May 9 2007 Joe Orton <jorton at redhat.com> 5.2.2-4
+- fix php-pdo *_arg_force_ref global symbol abuse (#216125)
+
* Tue May 8 2007 Joe Orton <jorton at redhat.com> 5.2.2-3
- rebuild against uw-imap-devel
- Previous message (by thread): rpms/kernel/devel/configs config-generic, 1.311, 1.312 config-nodebug, 1.6, 1.7
- Next message (by thread): rpms/ntp/devel ntp-4.2.4p0-sleep.patch, NONE, 1.1 ntp.spec, 1.65, 1.66 ntp-4.2.4-sleep.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list