[pkgsrc/pkgsrc-2006Q4]: pkgsrc/lang/php5/patches Pullup ticket 2032 - request...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/46bdc97c3240
branches:  pkgsrc-2006Q4
changeset: 523034:46bdc97c3240
user:      ghen <ghen%pkgsrc.org@localhost>
date:      Fri Feb 23 11:58:10 2007 +0000

description:
Pullup ticket 2032 - requested by taca
security update for php5

- pkgsrc/graphics/php-gd/Makefile                       1.15
- pkgsrc/lang/php5/Makefile.common                      1.23
- pkgsrc/lang/php5/Makefile.php                         1.22
- pkgsrc/lang/php5/PLIST                                1.14
- pkgsrc/lang/php5/distinfo                             1.36
- pkgsrc/lang/php5/patches/patch-ac                     removed
- pkgsrc/lang/php5/patches/patch-al                     1.3

   Module Name: pkgsrc
   Committed By:        jdolecek
   Date:                Tue Feb 20 20:46:20 UTC 2007

   Modified Files:
           pkgsrc/graphics/php-gd: Makefile
           pkgsrc/lang/php5: Makefile.common Makefile.php PLIST distinfo
   Added Files:
           pkgsrc/lang/php5/patches: patch-al
   Removed Files:
           pkgsrc/lang/php5/patches: patch-ac

   Log Message:
   Update PHP5 to 5.2.1. Includes several important security fixes and
   large number of other fixes. Update for all users is strongly advised.

diffstat:

 lang/php5/patches/patch-ac |  37 -------------------------------------
 lang/php5/patches/patch-al |  32 ++++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 37 deletions(-)

diffs (77 lines):

diff -r cbf4764f5f79 -r 46bdc97c3240 lang/php5/patches/patch-ac
--- a/lang/php5/patches/patch-ac        Fri Feb 23 11:56:44 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2006/11/07 17:24:39 tron Exp $
-
---- ext/curl/interface.c.orig  2006-10-11 00:12:59.000000000 +0100
-+++ ext/curl/interface.c       2006-11-07 17:17:18.000000000 +0000
-@@ -28,6 +28,18 @@
- 
- #if HAVE_CURL
- 
-+#ifndef CURLOPT_PASSWDDATA
-+#define CURLOPT_PASSWDDATA    0
-+#endif
-+
-+#ifndef       CURLOPT_PASSWDFUNCTION
-+#define       CURLOPT_PASSWDFUNCTION  0
-+#endif
-+
-+#ifndef CURLOPT_FTPASCII
-+#define       CURLOPT_FTPASCII        0
-+#endif
-+
- #include <stdio.h>
- #include <string.h>
- 
-@@ -1158,11 +1170,13 @@
-       dupch->handlers->read->fp = ch->handlers->read->fp;
-       dupch->handlers->read->fd = ch->handlers->read->fd;
- 
-+#if CURLOPT_PASSWDDATA != 0
-       if (ch->handlers->passwd) {
-               zval_add_ref(&ch->handlers->passwd);
-               dupch->handlers->passwd = ch->handlers->passwd;
-               curl_easy_setopt(ch->cp, CURLOPT_PASSWDDATA, (void *) dupch);
-       }
-+#endif
-       if (ch->handlers->write->func_name) {
-               zval_add_ref(&ch->handlers->write->func_name);
-               dupch->handlers->write->func_name = ch->handlers->write->func_name;
diff -r cbf4764f5f79 -r 46bdc97c3240 lang/php5/patches/patch-al
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/php5/patches/patch-al        Fri Feb 23 11:58:10 2007 +0000
@@ -0,0 +1,32 @@
+$NetBSD: patch-al,v 1.2.10.1 2007/02/23 11:58:11 ghen Exp $
+
+--- ext/gd/config.m4.orig      2007-02-20 21:14:31.000000000 +0100
++++ ext/gd/config.m4
+@@ -48,18 +48,7 @@ dnl Checks for the configure options
+ dnl
+ 
+ AC_DEFUN([PHP_GD_ZLIB],[
+-      if test "$PHP_ZLIB_DIR" != "no" && test "$PHP_ZLIB_DIR" != "yes"; then
+-              if test -f "$PHP_ZLIB_DIR/include/zlib/zlib.h"; then
+-                      PHP_ZLIB_DIR="$PHP_ZLIB_DIR"
+-                      PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include/zlib"
+-              elif test -f "$PHP_ZLIB_DIR/include/zlib.h"; then
+-                      PHP_ZLIB_DIR="$PHP_ZLIB_DIR"
+-                      PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include"
+-              else
+-                      AC_MSG_ERROR([Can't find zlib headers under "$PHP_ZLIB_DIR"])
+-              fi
+-      else
+-              for i in /usr/local /usr; do
++              for i in "$PHP_ZLIB_DIR" /usr/local /usr; do
+                       if test -f "$i/include/zlib/zlib.h"; then
+                               PHP_ZLIB_DIR="$i"
+                               PHP_ZLIB_INCDIR="$i/include/zlib"
+@@ -68,7 +57,6 @@ AC_DEFUN([PHP_GD_ZLIB],[
+                               PHP_ZLIB_INCDIR="$i/include"
+                       fi
+               done
+-      fi
+ ])
+ 
+ AC_DEFUN([PHP_GD_JPEG],[