diff options
| author | bouyer <bouyer> | 2005-11-08 20:33:55 +0000 |
|---|---|---|
| committer | bouyer <bouyer> | 2005-11-08 20:33:55 +0000 |
| commit | a29130b101eeaa66b28b52e61537f0ddbf6a2fe6 (patch) | |
| tree | 127d0a26c636f126a187236a7477a9171fb7fe7f | |
| parent | 14dfa23232d4d77435d86f40b4b8a7903f5a8bcd (diff) | |
| download | pkgsrc-a29130b101eeaa66b28b52e61537f0ddbf6a2fe6.tar.gz | |
php 4.4.1 has a bug which cause squirrelmail's sort function to misbehave:
(endless loop):
http://bugs.php.net/bug.php?id=35067
Pull in a patch from the php CVS repository to fix this, as suggested a
squirrelmail mailing list:
http://cvs.php.net/diff.php/php-src/ext/standard/basic_functions.c?r1=1.543.2.51.2.3&r2=1.543.2.51.2.4&ty=u
OK'd by Jaromir Dolecek, tested on apache-1 and apache-2 servers.
Bump pkgrevision.
| -rw-r--r-- | www/ap-php/Makefile | 4 | ||||
| -rw-r--r-- | www/php4/Makefile | 4 | ||||
| -rw-r--r-- | www/php4/distinfo | 3 | ||||
| -rw-r--r-- | www/php4/patches/patch-ab | 15 |
4 files changed, 21 insertions, 5 deletions
diff --git a/www/ap-php/Makefile b/www/ap-php/Makefile index c29dbb4eb28..8fa055f52a1 100644 --- a/www/ap-php/Makefile +++ b/www/ap-php/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.5 2005/10/08 16:49:36 jdolecek Exp $ +# $NetBSD: Makefile,v 1.6 2005/11/08 20:33:55 bouyer Exp $ # PKGNAME= ap-php-${PHP_BASE_VERS} -PKGREVISION= 2 +PKGREVISION= 3 COMMENT= Apache (${PKG_APACHE}) module for ${PKG_PHP} APACHE_MODULE= YES diff --git a/www/php4/Makefile b/www/php4/Makefile index 6b98a7e494e..e572b4bf1e9 100644 --- a/www/php4/Makefile +++ b/www/php4/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.56 2005/11/02 10:48:01 tron Exp $ +# $NetBSD: Makefile,v 1.57 2005/11/08 20:33:55 bouyer Exp $ PKGNAME= php-${PHP_BASE_VERS} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES+= lang COMMENT= HTML-embedded scripting language diff --git a/www/php4/distinfo b/www/php4/distinfo index 1873e32884d..23b34cd9847 100644 --- a/www/php4/distinfo +++ b/www/php4/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.48 2005/11/02 09:47:23 tron Exp $ +$NetBSD: distinfo,v 1.49 2005/11/08 20:33:55 bouyer Exp $ SHA1 (php-4.4.1.tar.bz2) = 61fe43719c707e1163eaaab33b65907733e34a1f RMD160 (php-4.4.1.tar.bz2) = fb7f5b90d05a2efa8f0122740e2c27a29f28574e Size (php-4.4.1.tar.bz2) = 4157749 bytes SHA1 (patch-aa) = feb064407950d0fc732b7240e65cac84420d2407 +SHA1 (patch-ab) = 75463903cf9b3d276556b83e0d422b146c105852 SHA1 (patch-ad) = 9ca5d2f59bfeea77a98cd0e727546d11669114cd SHA1 (patch-ag) = 1ded1d7f4daac6806f41864c783f16d3403315e4 SHA1 (patch-ah) = 0ac37bd35c4594cb58f1ea85ef811154b644a931 diff --git a/www/php4/patches/patch-ab b/www/php4/patches/patch-ab new file mode 100644 index 00000000000..dd9a1d16673 --- /dev/null +++ b/www/php4/patches/patch-ab @@ -0,0 +1,15 @@ +$NetBSD: patch-ab,v 1.20 2005/11/08 20:33:55 bouyer Exp $ + +--- ext/standard/basic_functions.c.orig Tue Nov 8 18:08:58 2005 ++++ ext/standard/basic_functions.c Tue Nov 8 18:08:28 2005 +@@ -802,8 +802,8 @@ + PHP_FE(prev, first_arg_force_ref) + PHP_FE(next, first_arg_force_ref) + PHP_FE(reset, first_arg_force_ref) +- PHP_FE(current, NULL) +- PHP_FE(key, NULL) ++ PHP_FE(current, first_arg_force_ref) ++ PHP_FE(key, first_arg_force_ref) + PHP_FE(min, NULL) + PHP_FE(max, NULL) + PHP_FE(in_array, NULL) |