packages: php52/php52.spec, php52/bug-60986.patch (NEW)=?UTF-8?Q?=20?=- rel 3; fix build ...

[arekm]

Author: arekm                        Date: Sun Apr  1 06:54:36 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3; fix build with new pcre

---- Files affected:
packages/php52:
   php52.spec (1.980 -> 1.981) , bug-60986.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/php52/php52.spec
diff -u packages/php52/php52.spec:1.980 packages/php52/php52.spec:1.981
--- packages/php52/php52.spec:1.980	Wed Mar 28 09:24:33 2012
+++ packages/php52/php52.spec	Sun Apr  1 08:54:31 2012
@@ -115,7 +115,7 @@
 Summary(uk.UTF-8):	PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері
 Name:		php52
 Version:	5.2.17
-Release:	2
+Release:	3
 Epoch:		4
 License:	PHP
 Group:		Libraries
@@ -195,6 +195,7 @@
 Patch57:	php-php_dl.patch
 Patch58:	php-svn-281516.patch
 Patch59:	%{orgname}-systzdata.patch
+Patch60:	bug-60986.patch
 # http://spot.fedorapeople.org/php-5.3.6-libzip.patch
 Patch65:	system-libzip.patch
 Patch66:	bug-47930.patch
@@ -1974,6 +1975,7 @@
 %patch57 -p1
 %patch58 -p4
 %patch59 -p1
+%patch60 -p4
 %{?with_system_libzip:%patch65 -p1}
 %patch66 -p2
 
@@ -3386,6 +3388,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.981  2012/04/01 06:54:31  arekm
+- rel 3; fix build with new pcre
+
 Revision 1.980  2012/03/28 07:24:33  arekm
 - release 2
 

================================================================
Index: packages/php52/bug-60986.patch
diff -u /dev/null packages/php52/bug-60986.patch:1.1
--- /dev/null	Sun Apr  1 08:54:36 2012
+++ packages/php52/bug-60986.patch	Sun Apr  1 08:54:31 2012
@@ -0,0 +1,44 @@
+--- php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.c	2012/02/06 17:57:47	323095
++++ php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.c	2012/02/06 18:11:56	323096
+@@ -252,10 +252,10 @@
+ 	   back the compiled pattern, otherwise go on and compile it. */
+ 	if (zend_hash_find(&PCRE_G(pcre_cache), regex, regex_len+1, (void **)&pce) == SUCCESS) {
+ 		/*
+-		 * We use a quick pcre_info() check to see whether cache is corrupted, and if it
++		 * We use a quick pcre_fullinfo() check to see whether cache is corrupted, and if it
+ 		 * is, we flush it and compile the pattern from scratch.
+ 		 */
+-		if (pcre_info(pce->re, NULL, NULL) == PCRE_ERROR_BADMAGIC) {
++		if (pcre_fullinfo(pce->re, NULL, NULL, NULL) == PCRE_ERROR_BADMAGIC) {
+ 			zend_hash_clean(&PCRE_G(pcre_cache));
+ 		} else {
+ #if HAVE_SETLOCALE
+--- php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.def	2012/02/06 17:57:47	323095
++++ php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.def	2012/02/06 18:11:56	323096
+@@ -4,7 +4,6 @@
+ php_pcre_exec
+ php_pcre_get_substring
+ php_pcre_get_substring_list
+-php_pcre_info
+ php_pcre_maketables
+ php_pcre_study
+ php_pcre_version
+--- php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.c	2012/02/06 18:11:56	323096
++++ php/php-src/branches/PHP_5_3/ext/pcre/php_pcre.c	2012/02/06 18:18:53	323097
+@@ -241,6 +241,7 @@
+ 	char				*pattern;
+ 	int					 do_study = 0;
+ 	int					 poptions = 0;
++	int				count = 0;
+ 	unsigned const char *tables = NULL;
+ #if HAVE_SETLOCALE
+ 	char				*locale = setlocale(LC_CTYPE, NULL);
+@@ -255,7 +256,7 @@
+ 		 * We use a quick pcre_fullinfo() check to see whether cache is corrupted, and if it
+ 		 * is, we flush it and compile the pattern from scratch.
+ 		 */
+-		if (pcre_fullinfo(pce->re, NULL, NULL, NULL) == PCRE_ERROR_BADMAGIC) {
++		if (pcre_fullinfo(pce->re, NULL, PCRE_INFO_CAPTURECOUNT, &count) == PCRE_ERROR_BADMAGIC) {
+ 			zend_hash_clean(&PCRE_G(pcre_cache));
+ 		} else {
+ #if HAVE_SETLOCALE
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/php52/php52.spec?r1=1.980&r2=1.981