diff options
author | jdolecek <jdolecek@pkgsrc.org> | 2003-08-31 19:55:21 +0000 |
---|---|---|
committer | jdolecek <jdolecek@pkgsrc.org> | 2003-08-31 19:55:21 +0000 |
commit | 90c1c1709f137ef730166f682c109e69f84211d9 (patch) | |
tree | 33c9301fff79082d1d83e91e87ace097146292cf /www/php4/patches | |
parent | 5fe36a85b0cab2671cffc7b1c348535a43ce38f7 (diff) | |
download | pkgsrc-90c1c1709f137ef730166f682c109e69f84211d9.tar.gz |
Update PHP to final 4.3.3
Some highlights of changes since 4.2.3:
* PCRE updated to 4.3, GD to 2.0.15
* improved Apache2 support
* much improved stream & URL wrapper support, output compression support
* added CLI (Command Line Interface) SAPI
* debug_backtrace() backported from ZendEngine2
* faster build system
* huge number of other bug fixes and improvements
Packaging changes:
* 'pcre', 'xml', and 'session' modules folded back into main package -
'pcre' and 'xml' is required by PEAR, and 'session' is just too essential
to be separate
* 'gd' module now uses bundled PHP GD library, which is better integrated
* PHP modules use shared distinfo when possible to ease future PHP updates
* ${PREFIX}/bin/php is now CLI version, ${PREFIX}/libexec/cgi-big/php
remains CGI version
Diffstat (limited to 'www/php4/patches')
-rw-r--r-- | www/php4/patches/patch-aa | 13 | ||||
-rw-r--r-- | www/php4/patches/patch-ab | 27 | ||||
-rw-r--r-- | www/php4/patches/patch-ac | 35 | ||||
-rw-r--r-- | www/php4/patches/patch-ae | 8 | ||||
-rw-r--r-- | www/php4/patches/patch-ag | 16 | ||||
-rw-r--r-- | www/php4/patches/patch-ah | 14 | ||||
-rw-r--r-- | www/php4/patches/patch-ai | 16 | ||||
-rw-r--r-- | www/php4/patches/patch-aj | 32 | ||||
-rw-r--r-- | www/php4/patches/patch-ak | 107 |
9 files changed, 42 insertions, 226 deletions
diff --git a/www/php4/patches/patch-aa b/www/php4/patches/patch-aa deleted file mode 100644 index 8c517419aa1..00000000000 --- a/www/php4/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.8 2002/09/04 14:47:40 agc Exp $ - ---- Makefile.in.orig Sat Apr 21 21:09:12 2001 -+++ Makefile.in -@@ -19,7 +19,7 @@ - PROGRAM_NAME = php - PROGRAM_SOURCES = stub.c - PROGRAM_LDADD = libphp4.la $(EXT_PROGRAM_LDADD) --PROGRAM_LDFLAGS = -export-dynamic -+PROGRAM_LDFLAGS = -static ${EXPORT_SYMBOLS_LDFLAGS} $(LINK_LIBGCC_LDFLAGS) - PROGRAM_DEPENDENCIES = $(PROGRAM_LDADD) - - targets = $(LTLIBRARY_NAME) $(PHP_PROGRAM) diff --git a/www/php4/patches/patch-ab b/www/php4/patches/patch-ab index 815a3dd2772..d9ff6b69ab6 100644 --- a/www/php4/patches/patch-ab +++ b/www/php4/patches/patch-ab @@ -1,21 +1,22 @@ -$NetBSD: patch-ab,v 1.11 2003/02/03 23:53:25 jlam Exp $ - ---- pear/scripts/phpize.in.orig Wed Apr 17 06:35:59 2002 -+++ pear/scripts/phpize.in -@@ -25,7 +25,12 @@ sed \ +--- scripts/phpize.in.orig 2003-08-30 22:28:44.000000000 +0200 ++++ scripts/phpize.in 2003-08-30 22:29:39.000000000 +0200 +@@ -54,10 +54,15 @@ touch install-sh mkinstalldirs missing --aclocal --autoconf --autoheader --libtoolize -f -c +-aclocal || exit 1 +-autoconf || exit 1 +-autoheader || exit 1 +-libtoolize -f -c || exit 1 +if [ -z "$ACLOCAL" ]; then ACLOCAL=aclocal; fi +if [ -z "$AUTOCONF" ]; then AUTOCONF=autoconf; fi +if [ -z "$AUTOHEADER" ]; then AUTOHEADER=autoheader; fi +if [ -z "$LIBTOOLIZE" ]; then LIBTOOLIZE=libtoolize; fi + -+$ACLOCAL -+$AUTOCONF -+$AUTOHEADER -+$LIBTOOLIZE -f -c ++$ACLOCAL || exit 1 ++$AUTOCONF || exit 1 ++$AUTOHEADER || exit 1 ++$LIBTOOLIZE -f -c || exit 1 + + # dumping API NOs: + PHP_API_VERSION=`egrep '#define PHP_API_VERSION' $includedir/main/php.h|sed 's/#define PHP_API_VERSION//'` diff --git a/www/php4/patches/patch-ac b/www/php4/patches/patch-ac deleted file mode 100644 index d120f510f29..00000000000 --- a/www/php4/patches/patch-ac +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-ac,v 1.6 2002/10/14 06:21:19 martti Exp $ - ---- acinclude.m4.orig Mon Jul 29 02:15:18 2002 -+++ acinclude.m4 Sat Oct 12 09:25:51 2002 -@@ -364,10 +364,19 @@ - ;; - esac - -+dnl Having php_always_shared=yes override the configure options breaks -+dnl because it's assumed that the answer to every question is yes. We -+dnl really only want just the ext_shared=yes to denote that we'll be -+dnl using outside shared libraries. -+dnl -+dnl if test "$php_always_shared" = "yes"; then -+dnl ext_output="yes, shared" -+dnl ext_shared=yes -+dnl test "[$]$1" = "no" && $1=yes -+dnl fi -+ - if test "$php_always_shared" = "yes"; then -- ext_output="yes, shared" - ext_shared=yes -- test "[$]$1" = "no" && $1=yes - fi - - if test -n "$2"; then -@@ -704,7 +713,7 @@ - if test "$1" != "/usr/lib"; then - PHP_EXPAND_PATH($1, ai_p) - if test "$ext_shared" = "yes" && test -n "$2"; then -- $2="-R$1 -L$1 [$]$2" -+ $2="-L$1 [$]$2" - else - AC_PHP_ONCE(LIBPATH, $ai_p, [ - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" diff --git a/www/php4/patches/patch-ae b/www/php4/patches/patch-ae index f603980eec2..ac3e1f2854e 100644 --- a/www/php4/patches/patch-ae +++ b/www/php4/patches/patch-ae @@ -1,8 +1,6 @@ -$NetBSD: patch-ae,v 1.3 2001/10/16 04:54:24 jlam Exp $ - ---- main/php_open_temporary_file.c.orig Mon Apr 30 08:43:40 2001 -+++ main/php_open_temporary_file.c -@@ -110,7 +110,7 @@ +--- main/php_open_temporary_file.c.orig 2003-08-30 21:45:02.000000000 +0200 ++++ main/php_open_temporary_file.c 2003-08-30 21:45:13.000000000 +0200 +@@ -132,7 +132,7 @@ trailing_slash = "/"; } diff --git a/www/php4/patches/patch-ag b/www/php4/patches/patch-ag index d55e8853186..68ebc075b54 100644 --- a/www/php4/patches/patch-ag +++ b/www/php4/patches/patch-ag @@ -1,20 +1,18 @@ -$NetBSD: patch-ag,v 1.4 2002/10/14 06:21:20 martti Exp $ - ---- php.ini-dist.orig Sat Aug 24 00:57:06 2002 -+++ php.ini-dist Sat Oct 12 09:29:27 2002 -@@ -367,8 +367,9 @@ +--- php.ini-dist.orig 2003-07-10 00:38:36.000000000 +0200 ++++ php.ini-dist 2003-08-30 21:59:51.000000000 +0200 +@@ -424,8 +424,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 +-extension_dir = "./" ++; Directory in which the loadable extensions (modules) reside. If not +; defined, then use the extension directory specified at compile-time. -+;extension_dir = ./ ++; 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 -@@ -396,7 +397,7 @@ +@@ -476,7 +477,7 @@ ; Temporary directory for HTTP uploaded files (will use system default if not ; specified). diff --git a/www/php4/patches/patch-ah b/www/php4/patches/patch-ah index f2b54b1338b..70533cc48a8 100644 --- a/www/php4/patches/patch-ah +++ b/www/php4/patches/patch-ah @@ -1,17 +1,15 @@ -$NetBSD: patch-ah,v 1.5 2002/10/14 06:21:20 martti Exp $ - ---- php.ini-recommended.orig Sat Aug 24 00:57:06 2002 -+++ php.ini-recommended Sat Oct 12 09:29:54 2002 -@@ -373,7 +373,7 @@ +--- php.ini-recommended.orig 2003-07-10 00:38:36.000000000 +0200 ++++ php.ini-recommended 2003-08-30 22:01:36.000000000 +0200 +@@ -440,7 +440,7 @@ user_dir = ; Directory in which the loadable extensions (modules) reside. --extension_dir = ./ -+;extension_dir = ./ +-extension_dir = "./" ++; 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 -@@ -403,7 +403,7 @@ +@@ -491,7 +491,7 @@ ; Temporary directory for HTTP uploaded files (will use system default if not ; specified). diff --git a/www/php4/patches/patch-ai b/www/php4/patches/patch-ai index ba02e6acb5e..ac6b0466ab4 100644 --- a/www/php4/patches/patch-ai +++ b/www/php4/patches/patch-ai @@ -1,13 +1,11 @@ -$NetBSD: patch-ai,v 1.3 2003/01/12 14:29:07 christos Exp $ - ---- ext/standard/filestat.c.orig Tue Aug 20 15:02:59 2002 -+++ ext/standard/filestat.c Sun Jan 12 09:15:21 2003 -@@ -559,7 +559,7 @@ +--- ext/standard/filestat.c.orig 2003-08-30 21:48:56.000000000 +0200 ++++ ext/standard/filestat.c 2003-08-30 21:49:03.000000000 +0200 +@@ -576,7 +576,7 @@ RETURN_FALSE; } -#ifndef PHP_WIN32 -+#ifdef notdef - switch (type) { - case FS_IS_W: - RETURN_BOOL (!access (filename, W_OK)); ++#ifdef notdef + + switch (type) { + case FS_IS_W: diff --git a/www/php4/patches/patch-aj b/www/php4/patches/patch-aj index b1147480f4b..278636ec32e 100644 --- a/www/php4/patches/patch-aj +++ b/www/php4/patches/patch-aj @@ -1,7 +1,5 @@ -$NetBSD: patch-aj,v 1.3 2003/01/14 21:39:38 christos Exp $ - ---- ext/gettext/gettext.c.orig Sat Dec 15 09:22:59 2001 -+++ ext/gettext/gettext.c Tue Jan 14 16:37:25 2003 +--- ext/gettext/gettext.c.orig 2003-08-30 21:56:34.000000000 +0200 ++++ ext/gettext/gettext.c 2003-08-30 21:57:13.000000000 +0200 @@ -58,6 +58,11 @@ }; /* }}} */ @@ -14,23 +12,14 @@ $NetBSD: patch-aj,v 1.3 2003/01/14 21:39:38 christos Exp $ zend_module_entry php_gettext_module_entry = { STANDARD_MODULE_HEADER, "gettext", -@@ -103,7 +108,7 @@ - } +@@ -104,6 +109,7 @@ retval = textdomain(domain_name); -- + + CHECK(retval); RETURN_STRING(retval, 1); } /* }}} */ -@@ -122,6 +127,7 @@ - - msgstr = gettext(Z_STRVAL_PP(msgid)); - -+ CHECK(msgstr); - RETURN_STRING(msgstr, 1); - } - /* }}} */ @@ -141,6 +147,7 @@ msgstr = dgettext(Z_STRVAL_PP(domain_name), Z_STRVAL_PP(msgid)); @@ -47,7 +36,7 @@ $NetBSD: patch-aj,v 1.3 2003/01/14 21:39:38 christos Exp $ RETURN_STRING(msgstr, 1); } /* }}} */ -@@ -186,6 +194,7 @@ +@@ -191,6 +199,7 @@ retval = bindtextdomain(Z_STRVAL_PP(domain_name), dir_name); @@ -55,14 +44,3 @@ $NetBSD: patch-aj,v 1.3 2003/01/14 21:39:38 christos Exp $ RETURN_STRING(retval, 1); } /* }}} */ -@@ -291,6 +300,10 @@ - - retval = bind_textdomain_codeset(Z_STRVAL_PP(domain), Z_STRVAL_PP(codeset)); - -+ CHECK(retval); -+ fprintf(stderr, "%s, %s: (%s, %s) -> %s\n", -+ __FILE__, __LINE__, -+ Z_STRVAL_PP(domain), Z_STRVAL_PP(codeset), retval); - RETURN_STRING(retval, 1); - } - } diff --git a/www/php4/patches/patch-ak b/www/php4/patches/patch-ak deleted file mode 100644 index 3f185c5c488..00000000000 --- a/www/php4/patches/patch-ak +++ /dev/null @@ -1,107 +0,0 @@ -$NetBSD: patch-ak,v 1.1 2003/02/21 05:39:04 lukem Exp $ - ---- ext/standard/string.c.orig Mon Jun 24 18:19:43 2002 -+++ ext/standard/string.c -@@ -616,7 +616,7 @@ PHP_FUNCTION(wordwrap) - { - const char *text, *breakchar = "\n"; - char *newtext; -- int textlen, breakcharlen = 1, newtextlen; -+ int textlen, breakcharlen = 1, newtextlen, alloced, chk; - long current = 0, laststart = 0, lastspace = 0; - long linelength = 75; - zend_bool docut = 0; -@@ -642,38 +642,40 @@ PHP_FUNCTION(wordwrap) - for (current = 0; current < textlen; current++) { - if (text[current] == breakchar[0]) { - laststart = lastspace = current; -- } -- else if (text[current] == ' ') { -+ } else if (text[current] == ' ') { - if (current - laststart >= linelength) { - newtext[current] = breakchar[0]; - laststart = current; - } - lastspace = current; -- } -- else if (current - laststart >= linelength -- && laststart != lastspace) { -+ } else if (current - laststart >= linelength && laststart != lastspace) { - newtext[lastspace] = breakchar[0]; - laststart = lastspace; - } - } - - RETURN_STRINGL(newtext, textlen, 0); -- } -- else { -+ } else { - /* Multiple character line break or forced cut */ - if (linelength > 0) { -- newtextlen = textlen + (textlen/linelength + 1) * breakcharlen + 1; -- } -- else { -- newtextlen = textlen * (breakcharlen + 1) + 1; -+ chk = (int)(textlen/linelength + 1); -+ alloced = textlen + chk * breakcharlen + 1; -+ } else { -+ chk = textlen; -+ alloced = textlen * (breakcharlen + 1) + 1; - } -- newtext = emalloc(newtextlen); -+ newtext = emalloc(alloced); - - /* now keep track of the actual new text length */ - newtextlen = 0; - - laststart = lastspace = 0; - for (current = 0; current < textlen; current++) { -+ if (chk <= 0) { -+ alloced += (int) (((textlen - current + 1)/linelength + 1) * breakcharlen) + 1; -+ newtext = erealloc(newtext, alloced); -+ chk = (int) ((textlen - current)/linelength) + 1; -+ } - /* when we hit an existing break, copy to new buffer, and - * fix up laststart and lastspace */ - if (text[current] == breakchar[0] -@@ -683,6 +685,7 @@ PHP_FUNCTION(wordwrap) - newtextlen += current-laststart+breakcharlen; - current += breakcharlen - 1; - laststart = lastspace = current + 1; -+ chk--; - } - /* if it is a space, check if it is at the line boundary, - * copy and insert a break, or just keep track of it */ -@@ -693,6 +696,7 @@ PHP_FUNCTION(wordwrap) - memcpy(newtext+newtextlen, breakchar, breakcharlen); - newtextlen += breakcharlen; - laststart = current + 1; -+ chk--; - } - lastspace = current; - } -@@ -706,6 +710,7 @@ PHP_FUNCTION(wordwrap) - memcpy(newtext+newtextlen, breakchar, breakcharlen); - newtextlen += breakcharlen; - laststart = lastspace = current; -+ chk--; - } - /* if the current word puts us over the linelength, copy - * back up until the last space, insert a break, and move -@@ -717,6 +722,7 @@ PHP_FUNCTION(wordwrap) - memcpy(newtext+newtextlen, breakchar, breakcharlen); - newtextlen += breakcharlen; - laststart = lastspace = lastspace + 1; -+ chk--; - } - } - -@@ -727,6 +733,8 @@ PHP_FUNCTION(wordwrap) - } - - newtext[newtextlen] = '\0'; -+ /* free unused memory */ -+ newtext = erealloc(newtext, newtextlen+1); - - RETURN_STRINGL(newtext, newtextlen, 0); - } |