rpms/php/devel php-5.0.3-gcc4.patch,1.3,1.4 php.spec,1.63,1.64

[fedora-cvs-commits at redhat.com]

Update of /cvs/dist/rpms/php/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26180

Modified Files:
	php-5.0.3-gcc4.patch php.spec 
Log Message:
- better gcc4 fix for libxmlrpc
- fix PEAR installation, hopefully


php-5.0.3-gcc4.patch:
 xml_element.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

Index: php-5.0.3-gcc4.patch
===================================================================
RCS file: /cvs/dist/rpms/php/devel/php-5.0.3-gcc4.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-5.0.3-gcc4.patch	1 Apr 2005 12:01:20 -0000	1.3
+++ php-5.0.3-gcc4.patch	1 Apr 2005 13:26:21 -0000	1.4
@@ -1,8 +1,8 @@
 
 Fix compile errors with GCC 4 due to bad C.  
 
---- php-5.0.3/ext/xmlrpc/libxmlrpc/xml_element.c.gcc4
-+++ php-5.0.3/ext/xmlrpc/libxmlrpc/xml_element.c
+--- php-5.0.4/ext/xmlrpc/libxmlrpc/xml_element.c.gcc4
++++ php-5.0.4/ext/xmlrpc/libxmlrpc/xml_element.c
 @@ -113,7 +113,7 @@
  #include "expat.h"
  #include "encodings.h"
@@ -12,13 +12,15 @@
  
  #define XML_DECL_START                 "<?xml"
  #define XML_DECL_START_LEN             sizeof(XML_DECL_START) - 1
-@@ -189,7 +189,8 @@
+@@ -189,7 +189,10 @@
  
        Q_Destroy(&root->children);
        Q_Destroy(&root->attrs);
 -      my_free((char*)root->name);
-+      free((char *)root->name);
-+      root->name = NULL;
++      if (root->name) {
++          free((char *)root->name);
++          root->name = NULL;
++      }
        simplestring_free(&root->text);
        my_free(root);
     }


Index: php.spec
===================================================================
RCS file: /cvs/dist/rpms/php/devel/php.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- php.spec	1 Apr 2005 12:01:20 -0000	1.63
+++ php.spec	1 Apr 2005 13:26:21 -0000	1.64
@@ -14,6 +14,8 @@
 
 Source0: http://www.php.net/distributions/php-%{version}.tar.gz
 
+Source10: pear-RunTest.php
+
 Source50: php.conf
 
 Patch2: php-5.0.1-config.patch
@@ -331,6 +333,9 @@
 rm -f ext/standard/tests/file/bug22414.phpt \
       ext/iconv/tests/bug16069.phpt
 
+# Missing file in 5.0.4 PEAR bundle:
+cp $RPM_SOURCE_DIR/pear-RunTest.php pear/PEAR/RunTest.php
+
 : Build for oci8=%{with_oci8} mssql=%{with_mssql} mhash=%{with_mhash} ibase=%{with_ibase}
 
 %build
@@ -589,6 +594,7 @@
 * Fri Apr  1 2005 Joe Orton <jorton at redhat.com> 5.0.4-1
 - update to 5.0.4 (#153068)
 - add .phps AddType to php.conf (#152973)
+- better gcc4 fix for libxmlrpc
 
 * Wed Mar 30 2005 Joe Orton <jorton at redhat.com> 5.0.3-5
 - BuildRequire mysql-devel >= 4.1