rpms/php/devel php-5.0.4-gd.patch,NONE,1.1 php.spec,1.78,1.79

[fedora-cvs-commits redhat com]

Author: jorton

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

Modified Files:
	php.spec 
Added Files:
	php-5.0.4-gd.patch 
Log Message:
- fix imagettftext et al (upstream, #161001)


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;


Index: php.spec
===================================================================
RCS file: /cvs/dist/rpms/php/devel/php.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- php.spec	14 Sep 2005 14:46:57 -0000	1.78
+++ php.spec	14 Sep 2005 14:53:26 -0000	1.79
@@ -13,13 +13,12 @@
 URL: http://www.php.net/
 
 Source0: http://www.php.net/distributions/php-%{version}.tar.gz
-Source10: pear-RunTest.php
 Source20: http://pear.php.net/get/DB-1.7.6.tgz
 Source21: http://pear.php.net/get/HTTP-1.3.6.tgz
 Source22: http://pear.php.net/get/Mail-1.1.8.tgz
 Source23: http://pear.php.net/get/XML_Parser-1.2.6.tgz
 Source24: http://pear.php.net/get/Net_Socket-1.0.6.tgz
-Source25: http://pear.php.net/get/Net_SMTP-1.2.6.tgz
+Source25: http://pear.php.net/get/Net_SMTP-1.2.7.tgz
 Source26: http://pear.php.net/get/XML_RPC-1.4.1.tgz
 Source50: php.conf
 
@@ -344,6 +343,7 @@
 %patch22 -p1 -b .shutdown
 %patch24 -p1 -b .xmldom
 %patch25 -p1 -b .ldap
+%patch26 -p1 -b .gd
 
 %patch30 -p1 -b .dlopen
 %patch31 -p1 -b .easter
@@ -647,6 +647,7 @@
 - add fix for upstream #34435
 - devel: require autoconf, automake (#159283)
 - pear: update to HTTP-1.3.6, Mail-1.1.8, Net_SMTP-1.2.7, XML_RPC-1.4.1
+- fix imagettftext et al (upstream, #161001)
 
 * Thu Jun 16 2005 Joe Orton <jorton redhat com> 5.0.4-11
 - ldap: restore ldap_start_tls() function