diff options
Diffstat (limited to 'www/mod_php4/files')
| -rw-r--r-- | www/mod_php4/files/patch-Makefile.in | 14 | ||||
| -rw-r--r-- | www/mod_php4/files/patch-as | 17 | ||||
| -rw-r--r-- | www/mod_php4/files/patch-ext_domxml_config.m4 | 34 | ||||
| -rw-r--r-- | www/mod_php4/files/patch-ext_gd_config.m4 | 13 | ||||
| -rw-r--r-- | www/mod_php4/files/patch-ext_gd_gd.c | 81 | ||||
| -rw-r--r-- | www/mod_php4/files/patch-ext_imap_config.m4 | 11 | ||||
| -rw-r--r-- | www/mod_php4/files/patch-ext_readline_readline.c | 38 | ||||
| -rw-r--r-- | www/mod_php4/files/patch-ext_sybase_ct_config.m4 | 41 |
8 files changed, 43 insertions, 206 deletions
diff --git a/www/mod_php4/files/patch-Makefile.in b/www/mod_php4/files/patch-Makefile.in new file mode 100644 index 000000000000..05bf9df10f97 --- /dev/null +++ b/www/mod_php4/files/patch-Makefile.in @@ -0,0 +1,14 @@ +--- Makefile.in.orig Sun Apr 22 03:09:12 2001 ++++ Makefile.in Wed Dec 19 20:38:06 2001 +@@ -24,7 +24,11 @@ + + targets = $(LTLIBRARY_NAME) $(PHP_PROGRAM) + ++.if defined(STANDALONE) ++install_targets = install-sapi ++.else + install_targets = install-sapi install-modules ++.endif + + include $(top_srcdir)/build/rules.mk + include $(top_srcdir)/build/library.mk diff --git a/www/mod_php4/files/patch-as b/www/mod_php4/files/patch-as deleted file mode 100644 index 755a0dc0e411..000000000000 --- a/www/mod_php4/files/patch-as +++ /dev/null @@ -1,17 +0,0 @@ ---- Makefile.in.orig Wed May 3 06:51:11 2000 -+++ Makefile.in Wed May 17 23:42:28 2000 -@@ -1,4 +1,4 @@ -- -+ - ZEND_DIR = $(srcdir)/Zend - SUBDIRS = Zend ext sapi $(TSRM_DIR) $(REGEX_DIR) . $(PEAR_DIR) - -@@ -29,7 +29,7 @@ - - targets = $(LTLIBRARY_NAME) $(PROGRAM_NAME) - --install_targets = install-sapi install-modules -+install_targets = install-sapi - - include $(top_srcdir)/build/rules.mk - include $(top_srcdir)/build/library.mk diff --git a/www/mod_php4/files/patch-ext_domxml_config.m4 b/www/mod_php4/files/patch-ext_domxml_config.m4 index 736fe2957f41..f55ba83f2e72 100644 --- a/www/mod_php4/files/patch-ext_domxml_config.m4 +++ b/www/mod_php4/files/patch-ext_domxml_config.m4 @@ -1,29 +1,11 @@ ---- ext/domxml/config.m4.orig Sun May 27 11:37:40 2001 -+++ ext/domxml/config.m4 Sun Nov 18 23:20:57 2001 -@@ -3,7 +3,7 @@ +--- ext/domxml/config.m4.orig Wed Dec 19 18:40:15 2001 ++++ ext/domxml/config.m4 Wed Dec 19 18:42:15 2001 +@@ -53,6 +53,8 @@ - AC_DEFUN(PHP_DOM_CHECK_VERSION,[ - old_CPPFLAGS=$CPPFLAGS -- CPPFLAGS=-I$DOMXML_DIR/include -+ CPPFLAGS=-I$DOMXML_DIR/include/libxml2 - AC_MSG_CHECKING(for libxml version) - AC_EGREP_CPP(yes,[ - #include <libxml/xmlversion.h> -@@ -25,7 +25,7 @@ - - if test "$PHP_DOM" != "no"; then - -- if test -r $PHP_DOM/include/libxml/tree.h; then -+ if test -r $PHP_DOM/include/libxml2/libxml/tree.h; then - DOMXML_DIR=$PHP_DOM - else - AC_MSG_CHECKING(for DOM in default path) -@@ -44,6 +44,8 @@ - - PHP_DOM_CHECK_VERSION - -+ PHP_ADD_INCLUDE($DOMXML_DIR/include/libxml2) + PHP_ADD_LIBRARY_WITH_PATH($DOM_LIBNAME, $DOMXML_DIR/lib, DOMXML_SHARED_LIBADD) + PHP_ADD_INCLUDE($DOMXML_DIR/include$DOMXML_DIR_ADD) +dnl next line is for giconv.h - PHP_ADD_INCLUDE($DOMXML_DIR/include) ++ PHP_ADD_INCLUDE($DOMXML_DIR/include) - if test -f $DOMXML_DIR/lib/libxml2.a -o -f $DOMXML_DIR/lib/libxml2.s? ; then + if test "$PHP_ZLIB_DIR" = "no"; then + AC_MSG_ERROR(DOMXML requires ZLIB. Use --with-zlib-dir=<DIR>) diff --git a/www/mod_php4/files/patch-ext_gd_config.m4 b/www/mod_php4/files/patch-ext_gd_config.m4 deleted file mode 100644 index ee6d54937268..000000000000 --- a/www/mod_php4/files/patch-ext_gd_config.m4 +++ /dev/null @@ -1,13 +0,0 @@ ---- ext/gd/config.m4.orig Mon Jun 4 10:36:47 2001 -+++ ext/gd/config.m4 Fri Oct 26 20:30:41 2001 -@@ -174,7 +174,9 @@ - AC_CHECK_LIB(gd, gdImageString16, [AC_DEFINE(HAVE_LIBGD13, 1, [ ])]) - AC_CHECK_LIB(gd, gdImagePaletteCopy, [AC_DEFINE(HAVE_LIBGD15, 1, [ ])]) - AC_CHECK_LIB(gd, gdImageCreateFromPng, [AC_DEFINE(HAVE_GD_PNG, 1, [ ])]) -- AC_CHECK_LIB(gd, gdImageCreateFromGif, [AC_DEFINE(HAVE_GD_GIF, 1, [ ])]) -+ AC_CHECK_LIB(gd, gdImageCreateFromGif, [AC_DEFINE(HAVE_GD_GIF_READ, 1, [ ])]) -+ AC_CHECK_LIB(gd, gdImageGif, [AC_DEFINE(HAVE_GD_GIF_CREATE, 1, [ ])]) -+ AC_CHECK_LIB(gd, gdImageCreateFromGd2, [AC_DEFINE(HAVE_GD_GD2, 1, [ ])]) - AC_CHECK_LIB(gd, gdImageWBMP, [AC_DEFINE(HAVE_GD_WBMP, 1, [ ])]) - AC_CHECK_LIB(gd, gdImageCreateFromJpeg, [AC_DEFINE(HAVE_GD_JPG, 1, [ ])]) - AC_CHECK_LIB(gd, gdImageCreateFromXpm, [AC_DEFINE(HAVE_GD_XPM, 1, [ ])]) diff --git a/www/mod_php4/files/patch-ext_gd_gd.c b/www/mod_php4/files/patch-ext_gd_gd.c deleted file mode 100644 index 336a12257153..000000000000 --- a/www/mod_php4/files/patch-ext_gd_gd.c +++ /dev/null @@ -1,81 +0,0 @@ ---- ext/gd/gd.c.orig Mon Jun 11 17:22:10 2001 -+++ ext/gd/gd.c Fri Nov 30 10:14:50 2001 -@@ -335,8 +335,11 @@ - - /* this next part is stupid ... if I knew better, I'd put them all on one row (cmv) */ - --#ifdef HAVE_GD_GIF -- php_info_print_table_row(2, "GIF Support", "enabled"); -+#ifdef HAVE_GD_GIF_READ -+ php_info_print_table_row(2, "GIF Read Support", "enabled"); -+#endif -+#ifdef(HAVE_GD_GID_CREATE) -+ php_info_print_table_row(2, "GIF Create Support", "enabled"); - #endif - #ifdef HAVE_GD_JPG - php_info_print_table_row(2, "JPG Support", "enabled"); -@@ -1088,7 +1091,7 @@ - break; - - case PHP_GDIMG_TYPE_GIF: --#ifdef HAVE_GD_GIF -+#ifdef HAVE_GD_GIF_READ - im = _php_image_create_from_string (data, "GIF", gdImageCreateFromGifCtx); - #else - php_error(E_WARNING, "No GIF support in this PHP build"); -@@ -1205,9 +1208,9 @@ - Create a new image from GIF file or URL */ - PHP_FUNCTION(imagecreatefromgif) - { --#ifdef HAVE_GD_GIF -+#ifdef HAVE_GD_GIF_READ - _php_image_create_from(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_GIF, "GIF", gdImageCreateFromGif,gdImageCreateFromGifCtx); --#else /* HAVE_GD_GIF */ -+#else /* HAVE_GD_GIF_READ */ - php_error(E_WARNING, "ImageCreateFromGif: No GIF support in this PHP build"); - RETURN_FALSE; - #endif /* HAVE_GD_GIF */ -@@ -1397,14 +1400,14 @@ - Output GIF image to browser or file */ - PHP_FUNCTION(imagegif) - { --#ifdef HAVE_GD_GIF -+#ifdef HAVE_GD_GIF_CREATE - #ifdef HAVE_GD_GIF_CTX - _php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_GIF, "GIF", gdImageGifCtx); - #else - _php_image_output(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_GIF, "GIF", gdImageGif); - #endif - #else /* HAVE_GD_GIF */ -- php_error(E_WARNING, "ImageGif: No GIF support in this PHP build"); -+ php_error(E_WARNING, "ImageGif: No GIF create support in this PHP build"); - RETURN_FALSE; - #endif /* HAVE_GD_GIF */ - } -@@ -2662,7 +2665,7 @@ - fontname = (unsigned char *) Z_STRVAL_PP(FONTNAME); - - #ifdef USE_GD_IMGSTRTTF --# if HAVE_LIBGD20 & HAVE_LIBFREETYPE -+# if HAVE_LIBFREETYPE - error = gdImageStringFT(im, brect, col, fontname, ptsize, angle, x, y, str); - # else - error = gdImageStringTTF(im, brect, col, fontname, ptsize, angle, x, y, str); -@@ -3356,7 +3359,7 @@ - } - - switch (image_type) { --#ifdef HAVE_GD_GIF -+#ifdef HAVE_GD_GIF_READ - case PHP_GDIMG_TYPE_GIF: - im_org = gdImageCreateFromGif (org); - if (im_org == NULL) { -@@ -3364,7 +3367,7 @@ - RETURN_FALSE; - } - break; --#endif /* HAVE_GD_GIF */ -+#endif /* HAVE_GD_GIF_READ */ - - #ifdef HAVE_GD_JPG - case PHP_GDIMG_TYPE_JPG: diff --git a/www/mod_php4/files/patch-ext_imap_config.m4 b/www/mod_php4/files/patch-ext_imap_config.m4 deleted file mode 100644 index ccdfb4c947e2..000000000000 --- a/www/mod_php4/files/patch-ext_imap_config.m4 +++ /dev/null @@ -1,11 +0,0 @@ ---- ext/imap/config.m4.orig Tue May 22 02:38:46 2001 -+++ ext/imap/config.m4 Fri Nov 23 19:40:39 2001 -@@ -53,7 +53,7 @@ - PHP_ADD_LIBRARY_DEFER(ssl) - - old_LIBS=$LIBS -- LIBS="$LIBS -lc-client" -+ LIBS="$LIBS -lc-client4" - if test $PHP_KERBEROS != "no"; then - LIBS="$LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err" - fi diff --git a/www/mod_php4/files/patch-ext_readline_readline.c b/www/mod_php4/files/patch-ext_readline_readline.c deleted file mode 100644 index a757f740e64a..000000000000 --- a/www/mod_php4/files/patch-ext_readline_readline.c +++ /dev/null @@ -1,38 +0,0 @@ ---- ext/readline/readline.c.orig Thu May 24 14:42:05 2001 -+++ ext/readline/readline.c Tue Dec 4 08:14:49 2001 -@@ -57,7 +57,7 @@ - PHP_FE(readline_info, NULL) - PHP_FE(readline_add_history, NULL) - PHP_FE(readline_clear_history, NULL) --#ifdef HAVE_READLINE -+#ifdef HAVE_LIBREADLINE - PHP_FE(readline_list_history, NULL) - #else - PHP_FALIAS(readline_list_history, warn_not_available, NULL) -@@ -147,7 +147,7 @@ - add_assoc_string(return_value,"line_buffer",SAFE_STRING(rl_line_buffer),1); - add_assoc_long(return_value,"point",rl_point); - add_assoc_long(return_value,"end",rl_end); --#ifdef HAVE_READLINE -+#ifdef HAVE_LIBREADLINE - add_assoc_long(return_value,"mark",rl_mark); - add_assoc_long(return_value,"done",rl_done); - add_assoc_long(return_value,"pending_input",rl_pending_input); -@@ -174,7 +174,7 @@ - RETVAL_LONG(rl_point); - } else if (! strcasecmp((*what)->value.str.val,"end")) { - RETVAL_LONG(rl_end); --#ifdef HAVE_READLINE -+#ifdef HAVE_LIBREADLINE - } else if (! strcasecmp((*what)->value.str.val,"mark")) { - RETVAL_LONG(rl_mark); - } else if (! strcasecmp((*what)->value.str.val,"done")) { -@@ -256,7 +256,7 @@ - /* }}} */ - /* {{{ proto array readline_list_history(void) - Lists the history */ --#ifdef HAVE_READLINE -+#ifdef HAVE_LIBREADLINE - PHP_FUNCTION(readline_list_history) - { - HIST_ENTRY **history; diff --git a/www/mod_php4/files/patch-ext_sybase_ct_config.m4 b/www/mod_php4/files/patch-ext_sybase_ct_config.m4 index 8b4692e3c98d..0c5f32e997d0 100644 --- a/www/mod_php4/files/patch-ext_sybase_ct_config.m4 +++ b/www/mod_php4/files/patch-ext_sybase_ct_config.m4 @@ -1,20 +1,21 @@ ---- ext/sybase_ct/config.m4.orig Wed Mar 28 05:34:43 2001 -+++ ext/sybase_ct/config.m4 Fri Oct 26 21:35:50 2001 -@@ -20,16 +20,12 @@ - fi - PHP_ADD_INCLUDE($SYBASE_CT_INCDIR) - PHP_ADD_LIBPATH($SYBASE_CT_LIBDIR) -- PHP_ADD_LIBRARY(cs) - PHP_ADD_LIBRARY(ct) -- PHP_ADD_LIBRARY(comn) -- PHP_ADD_LIBRARY(intl) -- SYBASE_CT_LIBS="-lcs -lct -lcomn -lintl" -+ SYBASE_CT_LIBS="-lct" - old_LDFLAGS=$LDFLAGS - LDFLAGS="$LDFLAGS -L$SYBASE_CT_LIBDIR" - AC_CHECK_LIB(tcl, netg_errstr, - [ PHP_ADD_LIBRARY(tcl) ], -- [ PHP_ADD_LIBRARY(sybtcl) ], - [ $SYBASE_CT_LIBS ]) - AC_CHECK_LIB(insck, insck__getVdate, - [ PHP_ADD_LIBRARY(insck) ]) +--- ext/sybase_ct/config.m4.orig Wed Dec 19 19:36:23 2001 ++++ ext/sybase_ct/config.m4 Wed Dec 19 19:38:08 2001 +@@ -19,17 +19,12 @@ + + PHP_ADD_INCLUDE($SYBASE_CT_INCDIR) + PHP_ADD_LIBPATH($SYBASE_CT_LIBDIR, SYBASE_CT_SHARED_LIBADD) +- PHP_ADD_LIBRARY(cs,, SYBASE_CT_SHARED_LIBADD) + PHP_ADD_LIBRARY(ct,, SYBASE_CT_SHARED_LIBADD) +- PHP_ADD_LIBRARY(comn,, SYBASE_CT_SHARED_LIBADD) +- PHP_ADD_LIBRARY(intl,, SYBASE_CT_SHARED_LIBADD) + +- SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lcs -lct -lcomn -lintl" ++ SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct" + + AC_CHECK_LIB(tcl, netg_errstr, [ + PHP_ADD_LIBRARY(tcl,,SYBASE_CT_SHARED_LIBADD) +- ],[ +- PHP_ADD_LIBRARY(sybtcl,,SYBASE_CT_SHARED_LIBADD) + ],[ + $SYBASE_CT_LIBS + ]) |