packages: php4/php4.spec, php4/php4-pcre.patch (NEW)=?UTF-8?Q?=20?=- rel 42; no pcre_info...

[arekm]

Author: arekm                        Date: Mon Jul  2 12:20:40 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 42; no pcre_info anymore

---- Files affected:
packages/php4:
   php4.spec (1.670 -> 1.671) , php4-pcre.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/php4/php4.spec
diff -u packages/php4/php4.spec:1.670 packages/php4/php4.spec:1.671
--- packages/php4/php4.spec:1.670	Sat Jun 30 22:53:38 2012
+++ packages/php4/php4.spec	Mon Jul  2 14:20:35 2012
@@ -73,7 +73,7 @@
 %undefine	with_msession
 %endif
 
-%define		rel 42
+%define		rel 43
 Summary:	PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):	Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):	Język skryptowy PHP
@@ -151,6 +151,7 @@
 Patch54:	%{name}-m4-divert.patch
 Patch55:	%{name}-libpng.patch
 Patch56:	%{name}-gmp.patch
+Patch57:	%{name}-pcre.patch
 URL:		http://www.php.net/
 %{?with_interbase:%{!?with_interbase_inst:BuildRequires:	Firebird-devel >= 1.0.2.908-2}}
 %{?with_pspell:BuildRequires:	aspell-devel >= 2:0.50.0}
@@ -1627,6 +1628,7 @@
 %patch54 -p1
 %patch55 -p1
 %patch56 -p1
+%patch57 -p1
 
 %if %{with hardening}
 zcat %{SOURCE8} | patch -p1
@@ -3174,6 +3176,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.671  2012/07/02 12:20:35  arekm
+- rel 42; no pcre_info anymore
+
 Revision 1.670  2012/06/30 20:53:38  arekm
 - rel 42
 

================================================================
Index: packages/php4/php4-pcre.patch
diff -u /dev/null packages/php4/php4-pcre.patch:1.1
--- /dev/null	Mon Jul  2 14:20:40 2012
+++ packages/php4/php4-pcre.patch	Mon Jul  2 14:20:35 2012
@@ -0,0 +1,24 @@
+diff -ur php-4.4.9.org/ext/pcre/php_pcre.c php-4.4.9/ext/pcre/php_pcre.c
+--- php-4.4.9.org/ext/pcre/php_pcre.c	2007-12-31 08:22:50.000000000 +0100
++++ php-4.4.9/ext/pcre/php_pcre.c	2012-07-02 14:17:54.974558709 +0200
+@@ -141,6 +141,7 @@
+ 	int				 	 regex_len;
+ 	int				 	 do_study = 0;
+ 	int					 poptions = 0;
++	int				count = 0;
+ 	unsigned const char *tables = NULL;
+ #if HAVE_SETLOCALE
+ 	char				*locale = setlocale(LC_CTYPE, NULL);
+@@ -154,10 +155,10 @@
+ 	regex_len = strlen(regex);
+ 	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, 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/php4/php4.spec?r1=1.670&r2=1.671