rpms/php/FC-4 php-5.0.4-domexport.patch, NONE, 1.1 php-5.0.4-gd.patch, NONE, 1.1 php-5.0.4-ldap.patch, NONE, 1.1 php.spec, 1.76, 1.77
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Jun 23 15:27:19 UTC 2005
Author: jorton
Update of /cvs/dist/rpms/php/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv29326
Modified Files:
php.spec
Added Files:
php-5.0.4-domexport.patch php-5.0.4-gd.patch
php-5.0.4-ldap.patch
Log Message:
* Tue Jun 21 2005 Joe Orton <jorton at redhat.com> 5.0.4-10.1
- fix imports from dom module (Rob Richards, #161447)
- fix detection and support for ldap_start_tls (#160527)
- fix imagettftext et al (upstream, #161001)
- mark php.ini and php.conf as noreplace again for updates
php-5.0.4-domexport.patch:
dom_ce.h | 62 +++++++++++++++++++++++++++++------------------------------
php_dom.c | 34 ++++++++++++++++++++++++++++++++
xml_common.h | 10 ++++-----
3 files changed, 70 insertions(+), 36 deletions(-)
--- NEW FILE php-5.0.4-domexport.patch ---
rrichards Wed Jun 22 15:56:32 2005 EDT
Modified files:
/php-src/ext/dom xml_common.h php_dom.c dom_ce.h
Log:
- Fix bug #33299 (php:function no longer handles returned dom objects)
- maybe fix #33431/33432
--- php-5.0.4/ext/dom/xml_common.h.domexport
+++ php-5.0.4/ext/dom/xml_common.h
@@ -54,12 +54,12 @@
#endif /* DOM_EXPORTS */
#endif /* PHP_WIN32 */
-#define PHP_DOM_EXPORT(__type) PHPAPI __type
+#define PHP_DOM_EXPORT PHPAPI
-PHP_DOM_EXPORT(zend_class_entry *) dom_node_class_entry;
-PHP_DOM_EXPORT(dom_object *) php_dom_object_get_data(xmlNodePtr obj);
-PHP_DOM_EXPORT(zval *) php_dom_create_object(xmlNodePtr obj, int *found, zval *in, zval* return_value, dom_object *domobj TSRMLS_DC);
-PHP_DOM_EXPORT(xmlNodePtr) dom_object_get_node(dom_object *obj);
+PHP_DOM_EXPORT extern zend_class_entry *dom_node_class_entry;
+PHP_DOM_EXPORT dom_object *php_dom_object_get_data(xmlNodePtr obj);
+PHP_DOM_EXPORT zval *php_dom_create_object(xmlNodePtr obj, int *found, zval *in, zval* return_value, dom_object *domobj TSRMLS_DC);
+PHP_DOM_EXPORT xmlNodePtr dom_object_get_node(dom_object *obj);
#define DOM_XMLNS_NAMESPACE \
(const xmlChar *) "http://www.w3.org/2000/xmlns/"
--- php-5.0.4/ext/dom/php_dom.c.domexport
+++ php-5.0.4/ext/dom/php_dom.c
@@ -34,6 +34,40 @@
#define PHP_XPATH 1
#define PHP_XPTR 2
+zend_class_entry *dom_node_class_entry;
+zend_class_entry *dom_domexception_class_entry;
+zend_class_entry *dom_domstringlist_class_entry;
+zend_class_entry *dom_namelist_class_entry;
+zend_class_entry *dom_domimplementationlist_class_entry;
+zend_class_entry *dom_domimplementationsource_class_entry;
+zend_class_entry *dom_domimplementation_class_entry;
+zend_class_entry *dom_documentfragment_class_entry;
+zend_class_entry *dom_document_class_entry;
+zend_class_entry *dom_nodelist_class_entry;
+zend_class_entry *dom_namednodemap_class_entry;
+zend_class_entry *dom_characterdata_class_entry;
+zend_class_entry *dom_attr_class_entry;
+zend_class_entry *dom_element_class_entry;
+zend_class_entry *dom_text_class_entry;
+zend_class_entry *dom_comment_class_entry;
+zend_class_entry *dom_typeinfo_class_entry;
+zend_class_entry *dom_userdatahandler_class_entry;
+zend_class_entry *dom_domerror_class_entry;
+zend_class_entry *dom_domerrorhandler_class_entry;
+zend_class_entry *dom_domlocator_class_entry;
+zend_class_entry *dom_domconfiguration_class_entry;
+zend_class_entry *dom_cdatasection_class_entry;
+zend_class_entry *dom_documenttype_class_entry;
+zend_class_entry *dom_notation_class_entry;
+zend_class_entry *dom_entity_class_entry;
+zend_class_entry *dom_entityreference_class_entry;
+zend_class_entry *dom_processinginstruction_class_entry;
+zend_class_entry *dom_string_extend_class_entry;
+#if defined(LIBXML_XPATH_ENABLED)
+zend_class_entry *dom_xpath_class_entry;
+#endif
+zend_class_entry *dom_namespace_node_class_entry;
+
zend_object_handlers dom_object_handlers;
zend_object_handlers dom_ze1_object_handlers;
--- php-5.0.4/ext/dom/dom_ce.h.domexport
+++ php-5.0.4/ext/dom/dom_ce.h
@@ -17,41 +17,41 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dom_ce.h,v 1.6 2004/01/08 17:32:03 sniper Exp $ */
+/* $Id: dom_ce.h,v 1.7 2005/06/22 19:56:30 rrichards Exp $ */
#ifndef DOM_CE_H
#define DOM_CE_H
-zend_class_entry *dom_domexception_class_entry;
-zend_class_entry *dom_domstringlist_class_entry;
-zend_class_entry *dom_namelist_class_entry;
-zend_class_entry *dom_domimplementationlist_class_entry;
-zend_class_entry *dom_domimplementationsource_class_entry;
-zend_class_entry *dom_domimplementation_class_entry;
-zend_class_entry *dom_documentfragment_class_entry;
-zend_class_entry *dom_document_class_entry;
-zend_class_entry *dom_nodelist_class_entry;
-zend_class_entry *dom_namednodemap_class_entry;
-zend_class_entry *dom_characterdata_class_entry;
-zend_class_entry *dom_attr_class_entry;
-zend_class_entry *dom_element_class_entry;
-zend_class_entry *dom_text_class_entry;
-zend_class_entry *dom_comment_class_entry;
-zend_class_entry *dom_typeinfo_class_entry;
-zend_class_entry *dom_userdatahandler_class_entry;
-zend_class_entry *dom_domerror_class_entry;
-zend_class_entry *dom_domerrorhandler_class_entry;
-zend_class_entry *dom_domlocator_class_entry;
-zend_class_entry *dom_domconfiguration_class_entry;
-zend_class_entry *dom_cdatasection_class_entry;
-zend_class_entry *dom_documenttype_class_entry;
-zend_class_entry *dom_notation_class_entry;
-zend_class_entry *dom_entity_class_entry;
-zend_class_entry *dom_entityreference_class_entry;
-zend_class_entry *dom_processinginstruction_class_entry;
-zend_class_entry *dom_string_extend_class_entry;
+extern zend_class_entry *dom_domexception_class_entry;
+extern zend_class_entry *dom_domstringlist_class_entry;
+extern zend_class_entry *dom_namelist_class_entry;
+extern zend_class_entry *dom_domimplementationlist_class_entry;
+extern zend_class_entry *dom_domimplementationsource_class_entry;
+extern zend_class_entry *dom_domimplementation_class_entry;
+extern zend_class_entry *dom_documentfragment_class_entry;
+extern zend_class_entry *dom_document_class_entry;
+extern zend_class_entry *dom_nodelist_class_entry;
+extern zend_class_entry *dom_namednodemap_class_entry;
+extern zend_class_entry *dom_characterdata_class_entry;
+extern zend_class_entry *dom_attr_class_entry;
+extern zend_class_entry *dom_element_class_entry;
+extern zend_class_entry *dom_text_class_entry;
+extern zend_class_entry *dom_comment_class_entry;
+extern zend_class_entry *dom_typeinfo_class_entry;
+extern zend_class_entry *dom_userdatahandler_class_entry;
+extern zend_class_entry *dom_domerror_class_entry;
+extern zend_class_entry *dom_domerrorhandler_class_entry;
+extern zend_class_entry *dom_domlocator_class_entry;
+extern zend_class_entry *dom_domconfiguration_class_entry;
+extern zend_class_entry *dom_cdatasection_class_entry;
+extern zend_class_entry *dom_documenttype_class_entry;
+extern zend_class_entry *dom_notation_class_entry;
+extern zend_class_entry *dom_entity_class_entry;
+extern zend_class_entry *dom_entityreference_class_entry;
+extern zend_class_entry *dom_processinginstruction_class_entry;
+extern zend_class_entry *dom_string_extend_class_entry;
#if defined(LIBXML_XPATH_ENABLED)
-zend_class_entry *dom_xpath_class_entry;
+extern zend_class_entry *dom_xpath_class_entry;
#endif
-zend_class_entry *dom_namespace_node_class_entry;
+extern zend_class_entry *dom_namespace_node_class_entry;
#endif /* DOM_CE_H */
php-5.0.4-gd.patch:
gd.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletion(-)
--- NEW FILE php-5.0.4-gd.patch ---
pajoye Mon May 2 05:39:28 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/gd gd.c
Log:
- MFH (#32893, imagettf crashes)
uses long for zval
--- php-5.0.4/ext/gd/gd.c.gd
+++ php-5.0.4/ext/gd/gd.c
@@ -3109,7 +3109,8 @@
{
zval *IM, *EXT = NULL;
gdImagePtr im=NULL;
- int col = -1, x = -1, y = -1, str_len, fontname_len, i, brect[8];
+ long col = -1, x = -1, y = -1;
+ int str_len, fontname_len, i, brect[8];
double ptsize, angle;
unsigned char *str = NULL, *fontname = NULL;
char *error = NULL;
php-5.0.4-ldap.patch:
config.m4 | 1 +
1 files changed, 1 insertion(+)
--- NEW FILE php-5.0.4-ldap.patch ---
--- php-5.0.4/ext/ldap/config.m4.ldap
+++ php-5.0.4/ext/ldap/config.m4
@@ -169,6 +169,7 @@
dnl Solaris 2.8 claims to be 2004 API, but doesn't have
dnl ldap_parse_reference() nor ldap_start_tls_s()
+ LDFLAGS="$LDFLAGS $LDAP_SHARED_LIBADD"
AC_CHECK_FUNCS([ldap_parse_reference ldap_start_tls_s])
LDFLAGS=$_SAVE_LDFLAGS
Index: php.spec
===================================================================
RCS file: /cvs/dist/rpms/php/FC-4/php.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- php.spec 9 May 2005 15:16:50 -0000 1.76
+++ php.spec 23 Jun 2005 15:27:17 -0000 1.77
@@ -4,10 +4,12 @@
%define with_mhash %{?_with_mhash:1}%{!?_with_mhash:0}
%define with_ibase %{?_with_ibase:1}%{!?_with_ibase:0}
+ExclusiveArch: %{x86} ppc x86_64
+
Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
Name: php
Version: 5.0.4
-Release: 10
+Release: 10.1
License: The PHP License
Group: Development/Languages
URL: http://www.php.net/
@@ -42,6 +44,9 @@
Patch22: php-4.3.11-shutdown.patch
Patch23: php-5.0.4-bug32282.patch
Patch24: php-5.0.4-xmldom.patch
+Patch25: php-5.0.4-domexport.patch
+Patch26: php-5.0.4-ldap.patch
+Patch27: php-5.0.4-gd.patch
# Functional changes
Patch30: php-5.0.4-dlopen.patch
@@ -344,6 +349,9 @@
%patch22 -p1 -b .shutdown
%patch23 -p1 -b .bug32282
%patch24 -p1 -b .xmldom
+%patch25 -p1 -b .domexport
+%patch26 -p1 -b .ldap
+%patch27 -p1 -b .gd
%patch30 -p1 -b .dlopen
%patch31 -p1 -b .easter
@@ -392,7 +400,7 @@
# Regenerate configure scripts (patches change config.m4's)
./buildconf --force
-CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"; export CFLAGS
+CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -Wall -Wno-pointer-sign"; export CFLAGS
# Install extension modules in %{_libdir}/php/modules.
EXTENSION_DIR=%{_libdir}/php/modules; export EXTENSION_DIR
@@ -586,8 +594,8 @@
%defattr(-,root,root)
%doc CODING_STANDARDS CREDITS EXTENSIONS INSTALL LICENSE NEWS README*
%doc Zend/ZEND_* gd_README TSRM_LICENSE regex_COPYRIGHT
-%config %{_sysconfdir}/php.ini
-%config %{_sysconfdir}/pear.conf
+%config(noreplace) %{_sysconfdir}/php.ini
+%config(noreplace) %{_sysconfdir}/pear.conf
%{_bindir}/php
%{_bindir}/php-cgi
%{_mandir}/man?/*
@@ -596,7 +604,7 @@
%dir %{_localstatedir}/lib/php
%attr(0770,root,apache) %dir %{_localstatedir}/lib/php/session
%{_libdir}/httpd/modules/libphp5.so
-%config %{_sysconfdir}/httpd/conf.d/php.conf
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/php.conf
%dir %{_sysconfdir}/php.d
%{contentdir}/icons/php.gif
@@ -642,6 +650,12 @@
%endif
%changelog
+* Tue Jun 21 2005 Joe Orton <jorton at redhat.com> 5.0.4-10.1
+- fix imports from dom module (Rob Richards, #161447)
+- fix detection and support for ldap_start_tls (#160527)
+- fix imagettftext et al (upstream, #161001)
+- mark php.ini and php.conf as noreplace again for updates
+
* Fri May 6 2005 Joe Orton <jorton at redhat.com> 5.0.4-10
- disable RPATHs in shared extensions (#156974)
More information about the fedora-cvs-commits
mailing list