packages (PHP_5_2): php/php.spec, php/php-svn-281516.patch (NEW) - fix "inv...

glen glen at pld-linux.org
Mon Oct 10 23:01:05 CEST 2011


Author: glen                         Date: Mon Oct 10 21:01:05 2011 GMT
Module: packages                      Tag: PHP_5_2
---- Log message:
- fix "invalid operands to binary -" error caused by missing stpcpy prototype
  on ac in some form of build configuration (not clear how it managed to
  compile before)

---- Files affected:
packages/php:
   php.spec (1.805.2.91 -> 1.805.2.92) , php-svn-281516.patch (NONE -> 1.1.2.1)  (NEW)

---- Diffs:

================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.805.2.91 packages/php/php.spec:1.805.2.92
--- packages/php/php.spec:1.805.2.91	Mon Oct 10 21:36:37 2011
+++ packages/php/php.spec	Mon Oct 10 23:00:59 2011
@@ -191,6 +191,7 @@
 Patch55:	bug-52078-fileinode.patch
 Patch56:	%{name}-krb5.patch
 Patch57:	php-php_dl.patch
+Patch58:	php-svn-281516.patch
 # http://spot.fedorapeople.org/php-5.3.6-libzip.patch
 Patch65:	system-libzip.patch
 # CENTALT patches
@@ -1934,6 +1935,7 @@
 %patch55 -p1
 %patch56 -p1
 %patch57 -p1
+%patch58 -p1
 %patch65 -p1
 
 %patch201 -p1 -b .CVE-2011-2202
@@ -3304,6 +3306,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.805.2.92  2011/10/10 21:00:59  glen
+- fix "invalid operands to binary -" error caused by missing stpcpy prototype
+  on ac in some form of build configuration (not clear how it managed to
+  compile before)
+
 Revision 1.805.2.91  2011/10/10 19:36:37  glen
 - add bunch of bug and cve backports from 5.3 by centalt (php-5.2.17-7.el5.src.rpm)
 

================================================================
Index: packages/php/php-svn-281516.patch
diff -u /dev/null packages/php/php-svn-281516.patch:1.1.2.1
--- /dev/null	Mon Oct 10 23:01:05 2011
+++ packages/php/php-svn-281516.patch	Mon Oct 10 23:00:59 2011
@@ -0,0 +1,32 @@
+fix "invalid operands to binary -" error caused by missing stpcpy prototype:
+
+php-5.2.17/Zend/zend_language_parser.c:2581: error: invalid operands to binary -
+php-5.2.17/Zend/zend_language_parser.c: In function `yysyntax_error':
+php-5.2.17/Zend/zend_language_parser.c:2640: warning: assignment makes pointer from integer without a cast
+php-5.2.17/Zend/zend_language_parser.c:2656: warning: assignment makes pointer from integer without a cast
+make: *** [Zend/zend_language_parser.lo] Error 1
+
+http://llvm.org/bugs/show_bug.cgi?id=3443
+http://news.php.net/php.zend-engine.cvs/7639
+http://svn.php.net/viewvc?view=revision&revision=281516
+
+--- php/php-src/branches/PHP_5_3/Zend/zend.h	2009/06/01 17:35:12	281515
++++ php/php-src/branches/PHP_5_3/Zend/zend.h	2009/06/01 17:51:53	281516
+@@ -34,8 +34,6 @@
+ #define END_EXTERN_C()
+ #endif
+ 
+-#include <stdio.h>
+-
+ /*
+  * general definitions
+  */
+@@ -66,6 +64,8 @@
+ #endif
+ 
+ /* all HAVE_XXX test have to be after the include of zend_config above */
++
++#include <stdio.h>
+ 
+ #ifdef HAVE_UNIX_H
+ # include <unix.h>
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.805.2.91&r2=1.805.2.92&f=u



More information about the pld-cvs-commit mailing list