[pkgsrc/pkgsrc-2005Q3]: pkgsrc/www Pullup ticket 908 - requested by Manuel Bo...

[salo <salo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9e7f69564bb6
branches:  pkgsrc-2005Q3
changeset: 499684:9e7f69564bb6
user:      salo <salo%pkgsrc.org@localhost>
date:      Tue Nov 15 12:05:21 2005 +0000

description:
Pullup ticket 908 - requested by Manuel Bouyer
php4 bugfix

Revisions pulled up:
- pkgsrc/www/php4/Makefile              1.57
- pkgsrc/www/php4/distinfo              1.49
- pkgsrc/www/php4/patches/patch-ab      1.20
- pkgsrc/www/ap-php/Makefile            1.6

   Module Name:         pkgsrc
   Committed By:        bouyer
   Date:                Tue Nov  8 20:33:55 UTC 2005

   Modified Files:
        pkgsrc/www/ap-php: Makefile
        pkgsrc/www/php4: Makefile distinfo
   Added Files:
        pkgsrc/www/php4/patches: patch-ab

   Log Message:
   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.

diffstat:

 www/ap-php/Makefile       |   4 ++--
 www/php4/Makefile         |   4 ++--
 www/php4/distinfo         |   3 ++-
 www/php4/patches/patch-ab |  15 +++++++++++++++
 4 files changed, 21 insertions(+), 5 deletions(-)

diffs (61 lines):

diff -r 9524c72af5bb -r 9e7f69564bb6 www/ap-php/Makefile
--- a/www/ap-php/Makefile       Tue Nov 15 11:43:07 2005 +0000
+++ b/www/ap-php/Makefile       Tue Nov 15 12:05:21 2005 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3.4.1 2005/10/31 00:06:17 salo Exp $
+# $NetBSD: Makefile,v 1.3.4.2 2005/11/15 12:05:21 salo Exp $
 #
 
 PKGNAME=               ap-php-${PHP_BASE_VERS}
-PKGREVISION=           1
+PKGREVISION=           2
 COMMENT=               Apache (${PKG_APACHE}) module for ${PKG_PHP}
 
 APACHE_MODULE=         YES
diff -r 9524c72af5bb -r 9e7f69564bb6 www/php4/Makefile
--- a/www/php4/Makefile Tue Nov 15 11:43:07 2005 +0000
+++ b/www/php4/Makefile Tue Nov 15 12:05:21 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.52.2.2 2005/11/04 08:07:02 salo Exp $
+# $NetBSD: Makefile,v 1.52.2.3 2005/11/15 12:05:21 salo Exp $
 
 PKGNAME=               php-${PHP_BASE_VERS}
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES+=           lang
 COMMENT=               HTML-embedded scripting language
 
diff -r 9524c72af5bb -r 9e7f69564bb6 www/php4/distinfo
--- a/www/php4/distinfo Tue Nov 15 11:43:07 2005 +0000
+++ b/www/php4/distinfo Tue Nov 15 12:05:21 2005 +0000
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.43.2.2 2005/11/04 08:07:02 salo Exp $
+$NetBSD: distinfo,v 1.43.2.3 2005/11/15 12:05:21 salo 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 -r 9524c72af5bb -r 9e7f69564bb6 www/php4/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/php4/patches/patch-ab Tue Nov 15 12:05:21 2005 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.17.4.3 2005/11/15 12:05:22 salo 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)