[arch-commits] Commit in php/repos (3 files)

[Pierre Schmitz]

    Date: Saturday, December 6, 2008 @ 13:26:56
  Author: pierre
Revision: 20787

Merged revisions 20786 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/php/trunk

........
  r20786 | pierre | 2008-12-06 19:26:23 +0100 (Sa, 06 Dez 2008) | 1 line
  
  upgpkg: php 5.2.7-2
........

Added:
  php/repos/extra-x86_64/filter.patch
    (from rev 20786, php/trunk/filter.patch)
Modified:
  php/repos/extra-x86_64/	(properties)
  php/repos/extra-x86_64/PKGBUILD

--------------+
 PKGBUILD     |   10 +++++++---
 filter.patch |   11 +++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)


Property changes on: php/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /php/trunk:1-20468
   + /php/trunk:1-20786

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-12-06 18:26:23 UTC (rev 20786)
+++ extra-x86_64/PKGBUILD	2008-12-06 18:26:56 UTC (rev 20787)
@@ -3,7 +3,7 @@
 
 pkgname=php
 pkgver=5.2.7
-pkgrel=1
+pkgrel=2
 _suhosinver=0.9.6.3
 pkgdesc='A high-level scripting language'
 arch=('i686' 'x86_64')
@@ -38,12 +38,13 @@
 options=('emptydirs')
 source=("http://www.php.net/distributions/${pkgname}-${pkgver}.tar.bz2" \
         "http://download.suhosin.org/suhosin-patch-${pkgver}-${_suhosinver}.patch.gz" \
-        'php.ini' 'apache.conf' 'db-configure.patch')
+        'php.ini' 'apache.conf' 'db-configure.patch' 'filter.patch')
 md5sums=('9ffc42edbb7faad965699666ddd559bc'
          'd455c3dd5b652046dbac2951a58f64fa'
          '0ee1dad48f7d67af3d2c78ca6eed68ba'
          '96ca078be6729b665be8a865535a97bf'
-         '74e5ce5a02488ec91b1c59f539e42936')
+         '74e5ce5a02488ec91b1c59f539e42936'
+         'b0286fe2fd5f57770cb2d9e15144cd19')
 
 build() {
 	phpconfig="--prefix=/usr \
@@ -125,6 +126,9 @@
 
 	cd ${srcdir}/${pkgname}-${pkgver}
 
+	# fix magic_quotes_gpc; see http://bugs.php.net/bug.php?id=46759
+	patch -p0 -i ${srcdir}/filter.patch || return 1
+
 	# avoid linking against old db version
 	patch -p0 -i ${srcdir}/db-configure.patch || return 1
 

Copied: php/repos/extra-x86_64/filter.patch (from rev 20786, php/trunk/filter.patch)
===================================================================
--- extra-x86_64/filter.patch	                        (rev 0)
+++ extra-x86_64/filter.patch	2008-12-06 18:26:56 UTC (rev 20787)
@@ -0,0 +1,11 @@
+--- ext/filter/filter.c	2008/11/02 22:04:40	1.52.2.43
++++ ext/filter/filter.c	2008/12/06 17:16:36	1.52.2.44
+@@ -403,7 +403,7 @@
+ 		Z_STRLEN(new_var) = val_len;
+ 		Z_TYPE(new_var) = IS_STRING;
+ 
+-		if (IF_G(default_filter) != FILTER_UNSAFE_RAW || IF_G(default_filter_flags) != 0) {
++		if (IF_G(default_filter) != FILTER_UNSAFE_RAW) {
+ 			zval *tmp_new_var = &new_var;
+ 			Z_STRVAL(new_var) = estrndup(*val, val_len);
+ 			INIT_PZVAL(tmp_new_var);