[arch-commits] Commit in php/trunk (PKGBUILD pcre_info.patch suhosin.patch)

[Pierre Schmitz]

    Date: Thursday, April 26, 2012 @ 06:10:31
  Author: pierre
Revision: 157228

upgpkg: php 5.3.11-1

upstream update

Added:
  php/trunk/suhosin.patch
Modified:
  php/trunk/PKGBUILD
Deleted:
  php/trunk/pcre_info.patch

-----------------+
 PKGBUILD        |   17 +++++++++--------
 pcre_info.patch |   43 -------------------------------------------
 suhosin.patch   |   13 +++++++++++++
 3 files changed, 22 insertions(+), 51 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-04-26 08:49:24 UTC (rev 157227)
+++ PKGBUILD	2012-04-26 10:10:31 UTC (rev 157228)
@@ -21,9 +21,9 @@
          'php-sqlite'
          'php-tidy'
          'php-xsl')
-pkgver=5.3.10
+pkgver=5.3.11
 _suhosinver=5.3.9-0.9.10
-pkgrel=5
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('PHP')
 url='http://www.php.net'
@@ -35,8 +35,8 @@
         "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz"
         "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz.sig"
         'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch'
-        'logrotate.d.php-fpm' 'pcre_info.patch')
-md5sums=('816259e5ca7d0a7e943e56a3bb32b17f'
+        'logrotate.d.php-fpm' 'suhosin.patch')
+md5sums=('94709f6e7c920cbe26e19fa991d9975d'
          'c099b3d7eac95018ababd41ded7f3066'
          'c15d18f846be1d69144a5d0056ee6506'
          'ffc338e8ce2a990f6f2a486355bbab65'
@@ -44,7 +44,7 @@
          'b01be5f816988fcee7e78225836e5e27'
          '740ec5fe2ecfd9d7febd4081c90ec65b'
          '07c4e412909ac65a44ec90e7a2c4bade'
-         '8d3806bbb19e390f9b32ccf21611d937')
+         '07ca7da608553b4cb92797e655eb94f1')
 
 build() {
 	phpconfig="--srcdir=../${pkgbase}-${pkgver} \
@@ -135,12 +135,13 @@
 	PEAR_INSTALLDIR=/usr/share/pear
 	export PEAR_INSTALLDIR
 
+	# fix the suhosin patch
+	patch -i ${srcdir}/suhosin.patch
+
 	cd ${srcdir}/${pkgbase}-${pkgver}
 
-	patch -p1 -i ${srcdir}/pcre_info.patch
-
 	# apply suhosin patch
-	patch -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch
+	patch -F3 -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch
 
 	# adjust paths
 	patch -p0 -i ${srcdir}/php.ini.patch

Deleted: pcre_info.patch
===================================================================
--- pcre_info.patch	2012-04-26 08:49:24 UTC (rev 157227)
+++ pcre_info.patch	2012-04-26 10:10:31 UTC (rev 157228)
@@ -1,43 +0,0 @@
---- php-5.3.10/ext/pcre/php_pcre.c	2012-01-01 14:15:04.000000000 +0100
-+++ php-5.3.10/ext/pcre/php_pcre.c	2012-02-06 13:31:36.198935107 +0100
-@@ -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);
-@@ -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, PCRE_INFO_CAPTURECOUNT, &count) == PCRE_ERROR_BADMAGIC) {
- 			zend_hash_clean(&PCRE_G(pcre_cache));
- 		} else {
- #if HAVE_SETLOCALE
---- php-5.3.10/ext/pcre/php_pcre.def	2009-01-11 14:59:00.000000000 +0100
-+++ php-5.3.10/ext/pcre/php_pcre.def	2012-02-06 13:31:47.775299315 +0100
-@@ -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-5.3.10/main/php_compat.h	2012-01-01 14:15:04.000000000 +0100
-+++ php-5.3.10/main/php_compat.h	2012-02-06 13:26:59.272834580 +0100
-@@ -34,7 +34,6 @@
- #define pcre_exec			php_pcre_exec
- #define pcre_get_substring		php_pcre_get_substring
- #define pcre_get_substring_list		php_pcre_get_substring_list
--#define pcre_info			php_pcre_info
- #define pcre_maketables			php_pcre_maketables
- #define pcre_study			php_pcre_study
- #define pcre_version			php_pcre_version

Added: suhosin.patch
===================================================================
--- suhosin.patch	                        (rev 0)
+++ suhosin.patch	2012-04-26 10:10:31 UTC (rev 157228)
@@ -0,0 +1,13 @@
+--- suhosin-patch-5.3.9-0.9.10.patch	2012-04-01 11:55:46.699676255 +0200
++++ suhosin-patch-5.3.9-0.9.10.patch	2012-04-01 11:56:19.322146479 +0200
+@@ -4515,8 +4515,8 @@
+ +#define SUHOSIN_PATCH 1
+ +EOF
+  
+-   echo $ac_n "checking for declared timezone""... $ac_c" 1>&6
+- echo "configure:19377: checking for declared timezone" >&5
++   echo "$as_me:$LINENO: checking for declared timezone" >&5
++ echo $ECHO_N "checking for declared timezone... $ECHO_C" >&6
+ @@ -115830,7 +115833,7 @@
+         php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \
+         strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c \