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

[Pierre Schmitz]

    Date: Sunday, December 14, 2008 @ 08:15:59
  Author: pierre
Revision: 21676

prepare for future rebuilds

Modified:
  php/trunk/PKGBUILD
Deleted:
  php/trunk/filter.patch

--------------+
 PKGBUILD     |   20 ++++++++------------
 filter.patch |   11 -----------
 2 files changed, 8 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-12-14 13:12:19 UTC (rev 21675)
+++ PKGBUILD	2008-12-14 13:15:59 UTC (rev 21676)
@@ -2,9 +2,9 @@
 # Maintainer: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=php
-pkgver=5.2.7
-pkgrel=2
-_suhosinver=0.9.6.3
+pkgver=5.2.8
+pkgrel=1
+_suhosinver=5.2.7-0.9.6.3
 pkgdesc='A high-level scripting language'
 arch=('i686' 'x86_64')
 license=('PHP')
@@ -37,14 +37,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' 'filter.patch')
-md5sums=('9ffc42edbb7faad965699666ddd559bc'
+        "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz" \
+        'php.ini' 'apache.conf' 'db-configure.patch')
+md5sums=('8760a833cf10433d3e72271ab0d0eccf'
          'd455c3dd5b652046dbac2951a58f64fa'
          '0ee1dad48f7d67af3d2c78ca6eed68ba'
          '96ca078be6729b665be8a865535a97bf'
-         '74e5ce5a02488ec91b1c59f539e42936'
-         'b0286fe2fd5f57770cb2d9e15144cd19')
+         '74e5ce5a02488ec91b1c59f539e42936')
 
 build() {
 	phpconfig="--prefix=/usr \
@@ -126,14 +125,11 @@
 
 	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
 
 	# apply suhosin patch
-	patch -p1 -i ${srcdir}/suhosin-patch-${pkgver}-${_suhosinver}.patch || return 1
+	patch -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch || return 1
 
 	# cli
 	./configure ${phpconfig} \

Deleted: filter.patch
===================================================================
--- filter.patch	2008-12-14 13:12:19 UTC (rev 21675)
+++ filter.patch	2008-12-14 13:15:59 UTC (rev 21676)
@@ -1,11 +0,0 @@
---- 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);