diff options
author | jlam <jlam@pkgsrc.org> | 2001-05-14 14:12:27 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2001-05-14 14:12:27 +0000 |
commit | a457d71ef9bd77577e911b0ab306069620f63f2c (patch) | |
tree | d20c2899fec4797c956fe6dba72e890e43a75af3 /www/php4/patches | |
parent | 31e2a71447e466e681672bed48fbb2ba3ec4f4f1 (diff) | |
download | pkgsrc-a457d71ef9bd77577e911b0ab306069620f63f2c.tar.gz |
Update php4 and modules to 4.0.5. Changes from version 4.0.4.1nb1 include
many general bugfixes, important fixes to the pgsql module to support
PostgreSQL transactions correctly, speedups, and a zlib output compressor.
Diffstat (limited to 'www/php4/patches')
-rw-r--r-- | www/php4/patches/patch-aa | 8 | ||||
-rw-r--r-- | www/php4/patches/patch-ab | 42 | ||||
-rw-r--r-- | www/php4/patches/patch-ad | 82 | ||||
-rw-r--r-- | www/php4/patches/patch-ae | 17 | ||||
-rw-r--r-- | www/php4/patches/patch-af | 6 | ||||
-rw-r--r-- | www/php4/patches/patch-ah | 20 | ||||
-rw-r--r-- | www/php4/patches/patch-ai | 25 | ||||
-rw-r--r-- | www/php4/patches/patch-aj | 13 |
8 files changed, 65 insertions, 148 deletions
diff --git a/www/php4/patches/patch-aa b/www/php4/patches/patch-aa index e4981103204..07ed1518ba5 100644 --- a/www/php4/patches/patch-aa +++ b/www/php4/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.5 2001/03/13 21:34:03 jlam Exp $ +$NetBSD: patch-aa,v 1.6 2001/05/14 14:12:28 jlam Exp $ ---- configure.in.orig Thu Jan 11 13:18:18 2001 +--- configure.in.orig Mon Apr 30 09:37:22 2001 +++ configure.in -@@ -340,7 +340,8 @@ +@@ -353,7 +353,8 @@ dnl Check for IPv6 support AC_CACHE_CHECK([for IPv6 support], ac_cv_ipv6_support, @@ -12,7 +12,7 @@ $NetBSD: patch-aa,v 1.5 2001/03/13 21:34:03 jlam Exp $ #include <netinet/in.h>], [struct sockaddr_in6 s; int i=AF_INET6; s], ac_cv_ipv6_support=yes, ac_cv_ipv6_support=no)]) if test "$ac_cv_ipv6_support" = yes; then -@@ -837,10 +838,6 @@ +@@ -820,10 +821,6 @@ PHP_CONFIGURE_PART(Configuring shared libtool) $SHELL $srcdir/ltconfig --output=shlibtool --disable-static --srcdir=$srcdir --cache-file=./config.cache $srcdir/ltmain.sh SHARED_LIBTOOL='$(SHELL) $(top_builddir)/shlibtool' diff --git a/www/php4/patches/patch-ab b/www/php4/patches/patch-ab index 613a7726326..5e20eefecfa 100644 --- a/www/php4/patches/patch-ab +++ b/www/php4/patches/patch-ab @@ -1,50 +1,24 @@ -$NetBSD: patch-ab,v 1.6 2001/05/01 17:56:46 jlam Exp $ +$NetBSD: patch-ab,v 1.7 2001/05/14 14:12:29 jlam Exp $ ---- configure.orig Thu Jan 11 13:39:29 2001 +--- configure.orig Mon Apr 30 09:47:59 2001 +++ configure -@@ -6336,6 +6336,7 @@ +@@ -6392,6 +6392,7 @@ cat > conftest.$ac_ext <<EOF - #line 6338 "configure" + #line 6394 "configure" #include "confdefs.h" +#include <sys/types.h> #include <sys/socket.h> #include <netinet/in.h> int main() { -@@ -23088,12 +23089,7 @@ - - LIBS=$old_LIBS - LDFLAGS="$old_LDFLAGS" -- if test "$ac_cv_lib_mcrypt_init_mcrypt" = "yes"; then -- cat >> confdefs.h <<\EOF --#define HAVE_LIBMCRYPT22 1 --EOF -- -- elif test "$ac_cv_lib_mcrypt_mcrypt_module_open" = "yes"; then -+ if test "$ac_cv_lib_mcrypt_mcrypt_module_open" = "yes"; then - - case "ltdl" in - c|c_r|pthread*) ;; -@@ -23110,6 +23106,11 @@ - #define HAVE_LIBMCRYPT24 1 - EOF - -+ elif test "$ac_cv_lib_mcrypt_init_mcrypt" = "yes"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBMCRYPT22 1 -+EOF -+ - else - { echo "configure: error: Sorry" 1>&2; exit 1; } - fi -@@ -40176,6 +40177,7 @@ +@@ -43649,6 +43650,7 @@ fi +if false; then echo $ac_n "checking for pam_start in -lpam""... $ac_c" 1>&6 - echo "configure:40181: checking for pam_start in -lpam" >&5 + echo "configure:43654: checking for pam_start in -lpam" >&5 ac_lib_var=`echo pam'_'pam_start | sed 'y%./+-%__p_%'` -@@ -40220,6 +40222,8 @@ +@@ -43693,6 +43695,8 @@ else echo "$ac_t""no" 1>&6 fi @@ -53,7 +27,7 @@ $NetBSD: patch-ab,v 1.6 2001/05/01 17:56:46 jlam Exp $ for ac_func in getcwd getwd -@@ -47325,9 +47329,6 @@ +@@ -51503,9 +51507,6 @@ $SHELL $srcdir/ltconfig --output=shlibtool --disable-static --srcdir=$srcdir --cache-file=./config.cache $srcdir/ltmain.sh SHARED_LIBTOOL='$(SHELL) $(top_builddir)/shlibtool' diff --git a/www/php4/patches/patch-ad b/www/php4/patches/patch-ad index 13b0171952d..8ecc31550f4 100644 --- a/www/php4/patches/patch-ad +++ b/www/php4/patches/patch-ad @@ -1,28 +1,8 @@ -$NetBSD: patch-ad,v 1.3 2001/03/14 00:10:00 jlam Exp $ +$NetBSD: patch-ad,v 1.4 2001/05/14 14:12:29 jlam Exp $ ---- ext/imap/php_imap.c.orig Wed Oct 25 13:43:52 2000 +--- ext/imap/php_imap.c.orig Tue Apr 24 10:17:41 2001 +++ ext/imap/php_imap.c -@@ -183,7 +183,19 @@ - void mail_close_it(zend_rsrc_list_entry *rsrc) - { - pils *imap_le_struct = (pils *)rsrc->ptr; -+ IMAPLS_FETCH(); -+ - mail_close_full(imap_le_struct->imap_stream, imap_le_struct->flags); -+ -+ if (IMAPG(imap_user)) { -+ efree(IMAPG(imap_user)); -+ IMAPG(imap_user) = 0; -+ } -+ if (IMAPG(imap_password)) { -+ efree(IMAPG(imap_password)); -+ IMAPG(imap_password) = 0; -+ } -+ - efree(imap_le_struct); - } - -@@ -392,7 +404,11 @@ +@@ -427,7 +427,11 @@ ZEND_INIT_MODULE_GLOBALS(imap, php_imap_init_globals, NULL) @@ -35,59 +15,3 @@ $NetBSD: patch-ad,v 1.3 2001/03/14 00:10:00 jlam Exp $ #ifndef PHP_WIN32 mail_link(&unixdriver); /* link in the unix driver */ #endif -@@ -633,6 +649,14 @@ - } - } - -+ if (IMAPG(imap_user)) { -+ efree(IMAPG(imap_user)); -+ } -+ -+ if (IMAPG(imap_password)) { -+ efree(IMAPG(imap_password)); -+ } -+ - IMAPG(imap_user) = estrndup(Z_STRVAL_PP(user), Z_STRLEN_PP(user)); - IMAPG(imap_password) = estrndup(Z_STRVAL_PP(passwd), Z_STRLEN_PP(passwd)); - -@@ -712,6 +736,8 @@ - } - } - efree(hashed_details); -+ efree(IMAPG(imap_user)); IMAPG(imap_user) = 0; -+ efree(IMAPG(imap_password)); IMAPG(imap_password) = 0; - RETURN_FALSE; - } - -@@ -721,6 +747,8 @@ - node = malloc(sizeof(pils)); - if (node == NULL) { - efree(hashed_details); -+ efree(IMAPG(imap_user)); IMAPG(imap_user) = 0; -+ efree(IMAPG(imap_password)); IMAPG(imap_password) = 0; - RETURN_FALSE; - } - -@@ -757,6 +785,8 @@ - - free(headp); - efree(hashed_details); -+ efree(IMAPG(imap_user)); IMAPG(imap_user) = 0; -+ efree(IMAPG(imap_password)); IMAPG(imap_password) = 0; - RETURN_FALSE; - } - -@@ -766,11 +796,11 @@ - } else { - #endif - imap_stream = mail_open(NIL, Z_STRVAL_PP(mailbox), flags); -- efree(IMAPG(imap_user)); -- efree(IMAPG(imap_password)); - - if (imap_stream == NIL) { - php_error(E_WARNING, "Couldn't open stream %s\n", (*mailbox)->value.str.val); -+ efree(IMAPG(imap_user)); IMAPG(imap_user) = 0; -+ efree(IMAPG(imap_password)); IMAPG(imap_password) = 0; - RETURN_FALSE; - } - diff --git a/www/php4/patches/patch-ae b/www/php4/patches/patch-ae index 1cd1ab919e9..52bb5830642 100644 --- a/www/php4/patches/patch-ae +++ b/www/php4/patches/patch-ae @@ -1,15 +1,16 @@ -$NetBSD: patch-ae,v 1.1 2000/12/25 21:03:47 jlam Exp $ +$NetBSD: patch-ae,v 1.2 2001/05/14 14:12:29 jlam Exp $ ---- ext/standard/config.m4.orig Wed Jul 19 12:19:40 2000 +--- ext/standard/config.m4.orig Sun Mar 11 05:08:27 2001 +++ ext/standard/config.m4 -@@ -136,10 +136,6 @@ +@@ -187,9 +187,11 @@ AC_CHECK_FUNC(dlopen, [AC_DEFINE(HAVE_LIBDL,1,[ ])]) --AC_CHECK_LIB(pam, pam_start, [ -- EXTRA_LIBS="$EXTRA_LIBS -lpam" -- AC_DEFINE(HAVE_LIBPAM,1,[ ]) ], []) -- ++if false; then + AC_CHECK_LIB(pam, pam_start, [ + EXTRA_LIBS="$EXTRA_LIBS -lpam" + AC_DEFINE(HAVE_LIBPAM,1,[ ]) ], []) ++fi # if false + AC_CHECK_FUNCS(getcwd getwd) - AC_CRYPT_CAP diff --git a/www/php4/patches/patch-af b/www/php4/patches/patch-af index 1d8f0d5bd63..ee2a5a884d0 100644 --- a/www/php4/patches/patch-af +++ b/www/php4/patches/patch-af @@ -1,11 +1,11 @@ -$NetBSD: patch-af,v 1.1 2001/01/25 17:18:08 jlam Exp $ +$NetBSD: patch-af,v 1.2 2001/05/14 14:12:30 jlam Exp $ ---- Makefile.in.orig Sun Jun 11 14:51:17 2000 +--- Makefile.in.orig Tue Mar 20 13:15:10 2001 +++ Makefile.in @@ -19,7 +19,7 @@ PROGRAM_NAME = php PROGRAM_SOURCES = stub.c - PROGRAM_LDADD = libphp4.la + PROGRAM_LDADD = libphp4.la $(EXT_PROGRAM_LDADD) -PROGRAM_LDFLAGS = -export-dynamic +PROGRAM_LDFLAGS = -static -export-dynamic PROGRAM_DEPENDENCIES = $(PROGRAM_LDADD) diff --git a/www/php4/patches/patch-ah b/www/php4/patches/patch-ah deleted file mode 100644 index e7c7a8d78cd..00000000000 --- a/www/php4/patches/patch-ah +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-ah,v 1.1 2001/05/01 17:56:46 jlam Exp $ - ---- ext/mcrypt/config.m4.orig Sat Sep 9 08:24:20 2000 -+++ ext/mcrypt/config.m4 -@@ -27,11 +27,11 @@ - AC_CHECK_LIB(mcrypt, mcrypt_module_open, [LIBS="$LIBS -lltdl"],[ ],) - LIBS=$old_LIBS - LDFLAGS="$old_LDFLAGS" -- if test "$ac_cv_lib_mcrypt_init_mcrypt" = "yes"; then -- AC_DEFINE(HAVE_LIBMCRYPT22,1,[ ]) -- elif test "$ac_cv_lib_mcrypt_mcrypt_module_open" = "yes"; then -+ if test "$ac_cv_lib_mcrypt_mcrypt_module_open" = "yes"; then - AC_ADD_LIBRARY(ltdl) -- AC_DEFINE(HAVE_LIBMCRYPT24,1,[ ]) -+ AC_DEFINE(HAVE_LIBMCRYPT24,1,[ ]) -+ elif test "$ac_cv_lib_mcrypt_init_mcrypt" = "yes"; then -+ AC_DEFINE(HAVE_LIBMCRYPT22,1,[ ]) - else - AC_MSG_ERROR(Sorry, I was not able to diagnose which libmcrypt version you have installed.) - fi diff --git a/www/php4/patches/patch-ai b/www/php4/patches/patch-ai new file mode 100644 index 00000000000..80857e5abbb --- /dev/null +++ b/www/php4/patches/patch-ai @@ -0,0 +1,25 @@ +$NetBSD: patch-ai,v 1.1 2001/05/14 14:12:30 jlam Exp $ + +--- php.ini-dist.orig Sun Apr 22 07:58:49 2001 ++++ php.ini-dist +@@ -318,8 +318,9 @@ + ; if nonempty. + user_dir = + +-; Directory in which the loadable extensions (modules) reside. +-extension_dir = ./ ++; Directory in which the loadable extensions (modules) reside. If not ++; defined, then use the extension directory specified at compile-time. ++;extension_dir = ./ + + ; Whether or not to enable the dl() function. The dl() function does NOT work + ; properly in multithreaded servers, such as IIS or Zeus, and is automatically +@@ -336,7 +337,7 @@ + + ; Temporary directory for HTTP uploaded files (will use system default if not + ; specified). +-;upload_tmp_dir = ++upload_tmp_dir = /tmp + + ; Maximum allowed size for uploaded files. + upload_max_filesize = 2M diff --git a/www/php4/patches/patch-aj b/www/php4/patches/patch-aj new file mode 100644 index 00000000000..804e051cccd --- /dev/null +++ b/www/php4/patches/patch-aj @@ -0,0 +1,13 @@ +$NetBSD: patch-aj,v 1.1 2001/05/14 14:12:30 jlam Exp $ + +--- main/php_open_temporary_file.c.orig Mon Feb 26 01:07:31 2001 ++++ main/php_open_temporary_file.c +@@ -110,7 +110,7 @@ + trailing_slash = "/"; + } + +- (void)snprintf(opened_path, MAXPATHLEN, "%s%s%sXXXXXX", path, trailing_slash, pfx); ++ (void)snprintf(opened_path, MAXPATHLEN, "%s%s%sXXXXXXXXXX", path, trailing_slash, pfx); + + #ifdef PHP_WIN32 + if (GetTempFileName(path, pfx, 0, opened_path)) { |