- merge DEVEL branch (update to 4.2.1).

Changed files:
    php-apache.ini -> 1.2
    php-cgi.ini -> 1.2
    php-cpdf-fix.patch -> 1.2
    php-fastcgi.patch -> 1.3
    php-hyperwave-fix.patch -> 1.2
    php-java-fix.patch -> 1.2
    php-link-libs.patch -> 1.5
    php-mcal-shared-lib.patch -> 1.2
    php-module-install -> 1.6
    php-msession-shared-lib.patch -> 1.2
    php-mysql-socket.patch -> 1.6
    php-no_php_pcre_in_SAPI_c.patch -> 1.3
    php-openssl-for-ext-only.patch -> 1.2
    php-pldlogo.patch -> 1.26
    php-sapi-ini-file.patch -> 1.2
    php-session-fix-shared.patch -> 1.2
    php-shared.patch -> 1.5
    php-wddx-fix.patch -> 1.2
    php-xmlrpc-includes.patch -> 1.2

diff --git a/php-apache.ini b/php-apache.ini
new file mode 100644 (file)
index 0000000..cb515ec
--- /dev/null
+++ b/php-apache.ini
@@ -0,0 +1,8 @@
+; php-apache.ini - configuration osed only for apache SAPI
+
+[Session]
+session.save_path         = /var/run/php
+                                   ; argument passed to save_handler
+                                    ; in the case of files, this is the
+                                    ; path where data files are stored
+

diff --git a/php-cgi.ini b/php-cgi.ini
new file mode 100644 (file)
index 0000000..92f63e7
--- /dev/null
+++ b/php-cgi.ini
@@ -0,0 +1,8 @@
+; php-cgi.ini - configuration osed only for cgi SAPI
+
+[Session]
+session.save_path         = /tmp    ; argument passed to save_handler
+                                    ; in the case of files, this is the
+                                    ; path where data files are stored
+
+

diff --git a/php-cpdf-fix.patch b/php-cpdf-fix.patch
new file mode 100644 (file)
index 0000000..a9eac2f
--- /dev/null
+++ b/php-cpdf-fix.patch
@@ -0,0 +1,177 @@
+diff -Nur php-4.2.0.orig/ext/cpdf/Makefile.in php-4.2.0/ext/cpdf/Makefile.in
+--- php-4.2.0.orig/ext/cpdf/Makefile.in        Tue May  2 00:35:17 2000
++++ php-4.2.0/ext/cpdf/Makefile.in     Wed May  1 19:01:09 2002
+@@ -1,5 +1,7 @@
+ 
+ LTLIBRARY_NAME    = libcpdf.la
+ LTLIBRARY_SOURCES = cpdf.c
++LTLIBRARY_SHARED_NAME = cpdf.la
++LTLIBRARY_SHARED_LIBADD = $(CPDF_SHARED_LIBADD)
+ 
+ include $(top_srcdir)/build/dynlib.mk
+diff -Nur php-4.2.0.orig/ext/cpdf/config.m4 php-4.2.0/ext/cpdf/config.m4
+--- php-4.2.0.orig/ext/cpdf/config.m4  Fri Nov 30 19:59:27 2001
++++ php-4.2.0/ext/cpdf/config.m4       Wed May  1 19:15:34 2002
+@@ -1,70 +1,100 @@
+ dnl $Id$
+ 
+-AC_MSG_CHECKING(for cpdflib support)
+-AC_ARG_WITH(cpdflib,
+-[  --with-cpdflib[=DIR]    Include cpdflib support (requires cpdflib >= 2).],
+-[
+-  case $withval in
+-    no)
+-      AC_MSG_RESULT(no) ;;
++PHP_ARG_WITH(cpdflib, for cpdflib support,
++[  --with-cpdflib[=DIR]    Include cpdflib support (requires cpdflib >= 2).])
++
++if test "$PHP_CPDFLIB" != "no"; then
++
++      PHP_EXTENSION(cpdf, $ext_shared)
++      PHP_SUBST(CPDF_SHARED_LIBADD)
++
++  dnl # libjpeg
++    
++  PHP_ARG_WITH(jpeg-dir, for the location of libjpeg, 
++  [  --with-jpeg-dir[=DIR]     PDFLIB: define libjpeg install directory. (OPTIONAL for PDFlib v4)])
++
++  if test "$PHP_JPEG_DIR" != "no"; then
++    PHP_CHECK_LIBRARY(jpeg,jpeg_read_header, 
++    [
++      PHP_ADD_LIBRARY_WITH_PATH(jpeg, $PHP_JPEG_DIR/lib, CPDF_SHARED_LIBADD)
++    ],[
++      AC_MSG_ERROR([libjpeg not found!])
++    ],[
++      -L$PHP_JPEG_DIR/lib
++    ])
++  else
++    AC_MSG_WARN([If configure fails, try --with-jpeg-dir=<DIR>])
++  fi
++
++  dnl # libpng
++
++  PHP_ARG_WITH(png-dir, for the location of libpng, 
++  [  --with-png-dir[=DIR]      PDFLIB: define libpng install directory.  (OPTIONAL for PDFlib v4)])
++ 
++  if test "$PHP_PNG_DIR" != "no"; then
++    PHP_CHECK_LIBRARY(png,png_create_info_struct, 
++    [
++      PHP_ADD_LIBRARY_WITH_PATH(png, $PHP_PNG_DIR/lib, CPDF_SHARED_LIBADD)
++    ],[
++      AC_MSG_ERROR([libpng not found!])
++    ],[
++      -L$PHP_PNG_DIR/lib
++    ])
++  else
++    AC_MSG_WARN([If configure fails, try --with-png-dir=<DIR>])
++  fi
++
++  dnl # libtiff
++
++  PHP_ARG_WITH(tiff-dir, for the location of libtiff,
++  [  --with-tiff-dir[=DIR]     PDFLIB: define libtiff install directory. (OPTIONAL for PDFlib v4)])
++
++  if test "$PHP_TIFF_DIR" != "no"; then
++    PHP_CHECK_LIBRARY(tiff,TIFFOpen, 
++    [
++      PHP_ADD_LIBRARY_WITH_PATH(tiff, $PHP_TIFF_DIR/lib, CPDF_SHARED_LIBADD)
++    ],[
++      AC_MSG_ERROR([libtiff not found!])
++    ],[
++      -L$PHP_TIFF_DIR/lib
++    ])
++  else
++    AC_MSG_WARN([If configure fails, try --with-tiff-dir=<DIR>])
++  fi
++
++  dnl # zlib
++ 
++  AC_MSG_CHECKING([for the location of zlib])
++  if test "$PHP_ZLIB_DIR" = "no"; then
++    AC_MSG_RESULT([no. If configure fails, try --with-zlib-dir=<DIR>])
++  else           
++    AC_MSG_RESULT([$PHP_ZLIB_DIR])
++    PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, CPDF_SHARED_LIBADD)
++  fi
++
++  case $PHP_CPDFLIB in
+     yes)
+-      AC_MSG_RESULT(yes)
+-      PHP_EXTENSION(cpdf)
+-      AC_CHECK_LIB(cpdf, cpdf_open, [AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib])],
+-        [AC_MSG_ERROR([Cpdf module requires cpdflib >= 2.])])
+-      PHP_ADD_LIBRARY(cpdf)
+-      PHP_ADD_LIBRARY(tiff)
+-      PHP_ADD_LIBRARY(jpeg)
+-      ;;
++      AC_CHECK_LIB(cpdf, cpdf_open, [
++        AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib])
++      PHP_ADD_LIBRARY(cpdf,, CPDF_SHARED_LIBADD)
++      ],[AC_MSG_ERROR([Cpdf module requires cpdflib >= 2.])])
++    ;;
+     *)
+-      test -f $withval/include/cpdflib.h && CPDFLIB_INCLUDE=$withval/include
+-      if test -n "$CPDFLIB_INCLUDE" ; then
+-        AC_MSG_RESULT(yes)
+-        PHP_EXTENSION(cpdf)
+-        old_LIBS=$LIBS
+-        old_withval=$withval
+-
+-        AC_MSG_CHECKING([for libjpeg (needed by cpdflib 2.x)])
+-        AC_ARG_WITH(jpeg-dir,
+-        [  --with-jpeg-dir[=DIR]   jpeg dir for cpdflib 2.x],[
+-          AC_MSG_RESULT(yes)
+-          if test -z $withval; then
+-            withval=/usr/local
+-          fi
+-          LIBS="$LIBS -L$withval/lib"
+-          AC_CHECK_LIB(jpeg,jpeg_read_header, ,[AC_MSG_RESULT(no)],)
+-          PHP_ADD_LIBRARY_WITH_PATH(jpeg, $withval/lib)
++      if test -f "$PHP_CPDFLIB/include/cpdflib.h" ; then
++
++        PHP_CHECK_LIBRARY(cpdf, cpdf_open, 
++        [
++          AC_DEFINE(HAVE_PDFLIB,1,[ ]) 
++          PHP_ADD_LIBRARY_WITH_PATH(cpdf, $PHP_CPDFLIB/lib, CPDF_SHARED_LIBADD)
++          PHP_ADD_INCLUDE($PHP_CPDFLIB/include)
+         ],[
+-          AC_MSG_RESULT(no)
+-          AC_MSG_WARN(If configure fails try --with-jpeg-dir=<DIR>)
+-        ]) 
+-
+-        AC_MSG_CHECKING([for libtiff (needed by cpdflib 2.x)])
+-        AC_ARG_WITH(tiff-dir,
+-        [  --with-tiff-dir[=DIR]   tiff dir for cpdflib 2.x],[
+-          AC_MSG_RESULT(yes)
+-          if test -z $withval; then
+-            withval=/usr/local
+-          fi
+-          LIBS="$LIBS -L$withval/lib"
+-          AC_CHECK_LIB(tiff,TIFFOpen, ,[AC_MSG_RESULT(no)],)
+-          PHP_ADD_LIBRARY_WITH_PATH(tiff, $withval/lib)
++          AC_MSG_ERROR([Cpdflib module requires cpdflib >= 2.])
+         ],[
+-          AC_MSG_RESULT(no)
+-          AC_MSG_WARN(If configure fails try --with-tiff-dir=<DIR>)
+-        ]) 
+-        withval=$old_withval
+-
+-          LIBS="$LIBS -L$withval/lib"
+-        AC_CHECK_LIB(cpdf, cpdf_open, [AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib])],
+-          [AC_MSG_ERROR([Cpdflib module requires cpdflib >= 2.])])
+-        LIBS=$old_LIBS
+-        PHP_ADD_LIBRARY_WITH_PATH(cpdf, $withval/lib)
+-        PHP_ADD_INCLUDE($CPDFLIB_INCLUDE)
++          -L$PHP_PDFLIB/lib
++        ])
+       else
+-        AC_MSG_RESULT(no)
+-      fi ;;
++        AC_MSG_ERROR([cpdflib.h not found! Check the path passed to --with-cpdflib=<PATH>. PATH should be the install prefix directory.])
++      fi
++    ;;
+   esac
+-],[
+-  AC_MSG_RESULT(no)
+-])
++fi

diff --git a/php-fastcgi.patch b/php-fastcgi.patch
index 727bce32f0864538ef359954d93e6fc34feaa255..8d12da99e6992a32ade8f0b261dff58210d4b9dd 100644 (file)
--- a/php-fastcgi.patch
+++ b/php-fastcgi.patch
@@ -18,17 +18,4 @@
    EXT_PROGRAM_LDADD="$EXT_PROGRAM_LDADD $FASTCGIPATH/lib/libfcgi.a"
    INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_PROGRAM \$(bindir)/$SAPI_FASTCGI"
    RESULT="yes"
---- php-4.0.6/sapi/fastcgi/fastcgi.c.wiget     Fri May  4 11:49:14 2001
-+++ php-4.0.6/sapi/fastcgi/fastcgi.c   Wed Jul  4 23:09:36 2001
-@@ -200,6 +200,11 @@
-       struct stat st;
-       char *pi = getenv( "PATH_INFO" );
-       char *pt = getenv( "PATH_TRANSLATED" );
-+
-+      if (!pi)
-+              pi = getenv( "SCRIPT_NAME" );
-+      if (!pt)
-+              pt = getenv( "SCRIPT_FILENAME" );
-       path_info = strdup( pi );
- 
-       SG(request_info).request_method = getenv("REQUEST_METHOD");
+

diff --git a/php-hyperwave-fix.patch b/php-hyperwave-fix.patch
new file mode 100644 (file)
index 0000000..88fbf20
--- /dev/null
+++ b/php-hyperwave-fix.patch
@@ -0,0 +1,22 @@
+diff -Nur php-4.2.0/ext/hyperwave.orig/Makefile.in php-4.2.0/ext/hyperwave/Makefile.in
+--- php-4.2.0/ext/hyperwave.orig/Makefile.in   Tue May  2 00:38:28 2000
++++ php-4.2.0/ext/hyperwave/Makefile.in        Wed May  1 22:50:03 2002
+@@ -1,5 +1,6 @@
+ 
+ LTLIBRARY_NAME    = libhyperwave.la
+ LTLIBRARY_SOURCES = hw.c hg_comm.c
++LTLIBRARY_SHARED_NAME = hyperwave.la
+ 
+ include $(top_srcdir)/build/dynlib.mk
+diff -Nur php-4.2.0/ext/hyperwave.orig/config.m4 php-4.2.0/ext/hyperwave/config.m4
+--- php-4.2.0/ext/hyperwave.orig/config.m4     Fri Nov 30 19:59:37 2001
++++ php-4.2.0/ext/hyperwave/config.m4  Wed May  1 22:50:44 2002
+@@ -9,7 +9,7 @@
+   if test "$withval" != "no"; then
+     AC_DEFINE(HYPERWAVE,1,[ ])
+     AC_MSG_RESULT(yes)
+-    PHP_EXTENSION(hyperwave)
++    PHP_EXTENSION(hyperwave, $ext_shared)
+   else
+     AC_DEFINE(HYPERWAVE,0,[ ])
+     AC_MSG_RESULT(no)

diff --git a/php-java-fix.patch b/php-java-fix.patch
new file mode 100644 (file)
index 0000000..8f057d6
--- /dev/null
+++ b/php-java-fix.patch
@@ -0,0 +1,33 @@
+diff -Nur php-4.2.0/ext/java.orig/Makefile.in php-4.2.0/ext/java/Makefile.in
+--- php-4.2.0/ext/java.orig/Makefile.in        Sun Apr 14 02:40:57 2002
++++ php-4.2.0/ext/java/Makefile.in     Thu May  2 00:35:25 2002
+@@ -4,7 +4,7 @@
+ LTLIBRARY_DEPENDENCIES = php_java.jar
+ 
+ LTLIBRARY_LDFLAGS     = $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS)
+-LTLIBRARY_SHARED_LIBADD = $(LTLIBRARY_DEPENDENCIES) $(EXTRA_LIBS)
++LTLIBRARY_SHARED_LIBADD = $(LTLIBRARY_DEPENDENCIES) $(EXTRA_LIBS) $(JAVA_SHARED_LIBADD)
+ 
+ EXTRA_CFLAGS   = $(JAVA_CFLAGS)
+ EXTRA_INCLUDES = $(JAVA_INCLUDE)
+diff -Nur php-4.2.0/ext/java.orig/config.m4 php-4.2.0/ext/java/config.m4
+--- php-4.2.0/ext/java.orig/config.m4  Sun Apr 14 02:40:57 2002
++++ php-4.2.0/ext/java/config.m4       Thu May  2 00:37:36 2002
+@@ -8,6 +8,7 @@
+                           This extension is always built as shared.],
+ [
+   if test "$withval" != "no"; then
++    ext_shared=yes
+     JAVA_SHARED=libphp_java.la
+ 
+     pltform=`uname -s 2>/dev/null`
+@@ -111,7 +111,6 @@
+       PHP_EXTENSION(java, shared)
+ 
+-      if test "$PHP_SAPI" = "cgi"; then
+-        PHP_ADD_LIBRARY($JAVA_LIB)
++        PHP_SUBST(JAVA_SHARED_LIBADD)
++        PHP_ADD_LIBRARY($JAVA_LIB,, JAVA_SHARED_LIBADD)
+-      fi
+ 
+       INSTALL_IT="$INSTALL_IT; \$(srcdir)/build/shtool mkdir -p -f -m 0755 \$(INSTALL_ROOT)\$(libdir)"

diff --git a/php-link-libs.patch b/php-link-libs.patch
index d69e07f0df88ffd2f9f3822fd9cdefd0d7b14cae..5315c5c9cb85f11eddf9c74f57e9b0921f33b664 100644 (file)
--- a/php-link-libs.patch
+++ b/php-link-libs.patch
@@ -1,38 +1,15 @@
---- php-4.0.6/ext/yp/Makefile.in.wiget Tue May  2 03:21:26 2000
-+++ php-4.0.6/ext/yp/Makefile.in       Wed Jul  4 22:44:51 2001
-@@ -2,5 +2,6 @@
- LTLIBRARY_NAME    = libyp.la
- LTLIBRARY_SOURCES = yp.c
- LTLIBRARY_SHARED_NAME = yp.la
-+LTLIBRARY_SHARED_LIBADD = $(NSL_SHARED_LIBADD)
- 
- include $(top_srcdir)/build/dynlib.mk
---- php-4.1.1/ext/yp/config.m4.wiget   Tue May  2 03:21:26 2000
-+++ php-4.1.1/ext/yp/config.m4 Wed Jul  4 22:44:51 2001
-@@ -6,8 +6,11 @@
- [  --enable-yp             Include YP support])
- 
- if test "$PHP_YP" != "no"; then
--  AC_DEFINE(HAVE_YP,1,[ ])
-+  PHP_SUBST(NSL_SHARED_LIBADD)
-+  AC_ADD_LIBRARY_WITH_PATH(nsl, /usr/lib, NSL_SHARED_LIBADD)
-+  AC_CHECK_LIB(nsl, yp_match, [AC_DEFINE(HAVE_YP,1,[ ])], [AC_MSG_ERROR(YP module requires libnsl)],)
-   PHP_EXTENSION(yp, $ext_shared)
-+
-   case $host_alias in
-   *solaris*)
-     AC_DEFINE(SOLARIS_YP,1,[ ]) ;;
---- php-4.0.6/configure.in.wiget       Wed Jun 20 22:12:59 2001
-+++ php-4.0.6/configure.in     Wed Jul  4 22:49:05 2001
-@@ -230,6 +230,7 @@
+diff -urN php-4.2.1RC2.org/configure.in php-4.2.1RC2/configure.in
+--- php-4.2.1RC2.org/configure.in      Sat May 11 20:49:22 2002
++++ php-4.2.1RC2/configure.in  Sat May 11 21:05:41 2002
+@@ -297,6 +297,7 @@
  
  if test "$php_no_nsl_checks" != "yes"; then
  
-+AC_CHECK_FUNC(gethostname, [ ], [
++AC_CHECK_FUNC(gethostname,[true], [
  AC_CHECK_LIB(nsl, gethostname, [
   PHP_ADD_LIBRARY(nsl)
   AC_DEFINE(HAVE_LIBNSL,1,[ ]) ],[
-@@ -237,6 +238,7 @@
+@@ -304,6 +305,7 @@
    PHP_ADD_LIBRARY(nsl)
    AC_DEFINE(HAVE_LIBNSL,1,[ ]) ], [])
  ])
@@ -40,9 +17,10 @@
  
  fi
  
---- php-4.0.6.orig/ext/gmp/config.m4   Tue Mar 27 22:34:27 2001
-+++ php-4.0.6/ext/gmp/config.m4        Fri Aug  3 15:34:22 2001
-@@ -23,5 +23,6 @@
+diff -urN php-4.2.1RC2.org/ext/gmp/config.m4 php-4.2.1RC2/ext/gmp/config.m4
+--- php-4.2.1RC2.org/ext/gmp/config.m4 Sat May 11 20:49:22 2002
++++ php-4.2.1RC2/ext/gmp/config.m4     Sat May 11 21:05:41 2002
+@@ -21,5 +21,6 @@
  
    PHP_EXTENSION(gmp, $ext_shared)
    AC_DEFINE(HAVE_GMP, 1, [ ])
@@ -50,3 +28,41 @@
 +  PHP_ADD_LIBRARY_WITH_PATH(gmp, $GMP_DIR/lib, GMP_SHARED_LIBADD)
  fi
 +PHP_SUBST(GMP_SHARED_LIBADD)
+diff -urN php-4.2.1RC2.org/ext/xslt/config.m4 php-4.2.1RC2/ext/xslt/config.m4
+--- php-4.2.1RC2.org/ext/xslt/config.m4        Sat May 11 20:49:24 2002
++++ php-4.2.1RC2/ext/xslt/config.m4    Sat May 11 21:09:39 2002
+@@ -81,7 +82,7 @@
+       found_js=no
+       AC_CHECK_LIB(js, JS_GetRuntime, found_js=yes)
+       if test "$found_js" = "yes"; then
+-        PHP_ADD_LIBRARY(js)
++        PHP_ADD_LIBRARY(js,, XSLT_SHARED_LIBADD)
+       fi
+     fi
+ 
+diff -urN php-4.2.1RC2.org/ext/yp/Makefile.in php-4.2.1RC2/ext/yp/Makefile.in
+--- php-4.2.1RC2.org/ext/yp/Makefile.in        Sat May 11 20:49:24 2002
++++ php-4.2.1RC2/ext/yp/Makefile.in    Sat May 11 21:05:41 2002
+@@ -2,5 +2,6 @@
+ LTLIBRARY_NAME    = libyp.la
+ LTLIBRARY_SOURCES = yp.c
+ LTLIBRARY_SHARED_NAME = yp.la
++LTLIBRARY_SHARED_LIBADD = $(NSL_SHARED_LIBADD)
+ 
+ include $(top_srcdir)/build/dynlib.mk
+diff -urN php-4.2.1RC2.org/ext/yp/config.m4 php-4.2.1RC2/ext/yp/config.m4
+--- php-4.2.1RC2.org/ext/yp/config.m4  Sat May 11 20:49:24 2002
++++ php-4.2.1RC2/ext/yp/config.m4      Sat May 11 21:05:41 2002
+@@ -6,8 +6,11 @@
+ [  --enable-yp             Include YP support.])
+ 
+ if test "$PHP_YP" != "no"; then
+-  AC_DEFINE(HAVE_YP,1,[ ])
++  PHP_SUBST(NSL_SHARED_LIBADD)
++  AC_ADD_LIBRARY_WITH_PATH(nsl, /usr/lib, NSL_SHARED_LIBADD)
++  AC_CHECK_LIB(nsl, yp_match, [AC_DEFINE(HAVE_YP,1,[ ])], [AC_MSG_ERROR(YP module requires libnsl)],)
+   PHP_EXTENSION(yp, $ext_shared)
++
+   case $host_alias in
+   *solaris*)
+     AC_DEFINE(SOLARIS_YP,1,[ ]) ;;

diff --git a/php-mcal-shared-lib.patch b/php-mcal-shared-lib.patch
new file mode 100644 (file)
index 0000000..1ea548e
--- /dev/null
+++ b/php-mcal-shared-lib.patch
@@ -0,0 +1,27 @@
+--- php-4.2.1/ext/mcal/config.m4.orig  Thu Apr  4 01:04:44 2002
++++ php-4.2.1/ext/mcal/config.m4       Tue May 14 00:26:25 2002
+@@ -20,7 +20,7 @@
+   done
+ 
+   for i in $MCAL_DIR $MCAL_DIR/mcal $MCAL_DIR/mcal/lib $MCAL_DIR/lib/mcal $MCAL_DIR/lib; do
+-    if test -r "$i/libmcal.a"; then
++    if test -r "$i/libmcal.so" -o -r "$i/libmcal.a"; then
+       MCAL_LIBRARY=$i
+     fi
+   done
+@@ -37,12 +37,12 @@
+     AC_MSG_ERROR(Unable to locate your libmcal header files - icalroutines.h should be in the directory you specify or in the include/ subdirectory below it - default search location is $MCAL_DEFAULT_SEARCH)
+   fi
+ 
+-  if test ! -f "$MCAL_LIBRARY/libmcal.a"; then
+-    AC_MSG_ERROR(Unable to locate your libmcal library files - libmcal.a should be in the directory you specify or in the lib/ subdirectory below it - default search location is $MCAL_DEFAULT_SEARCH)
++  if test -z "$MCAL_LIBRARY"; then
++    AC_MSG_ERROR(Unable to locate your libmcal library files - libmcal.* should be in the directory you specify or in the lib/ subdirectory below it - default search location is $MCAL_DEFAULT_SEARCH)
+   fi
+ 
+   PHP_ADD_INCLUDE($MCAL_INCLUDE)
+-  PHP_ADD_LIBRARY_DEFER_WITH_PATH(mcal, $MCAL_LIBRARY, MCAL_SHARED_LIBADD)
++  PHP_ADD_LIBRARY_WITH_PATH(mcal, $MCAL_LIBRARY, MCAL_SHARED_LIBADD)
+   PHP_SUBST(MCAL_SHARED_LIBADD)
+   AC_DEFINE(HAVE_MCAL,1,[ ])
+   PHP_EXTENSION(mcal,$ext_shared)

diff --git a/php-module-install b/php-module-install
index 9a55de1aa68180de0357fc6f0e5e70ba9854ec5d..cdccc398e65c3820024845377ecb462670807784 100644 (file)
--- a/php-module-install
+++ b/php-module-install
@@ -28,7 +28,7 @@ if [ -f ${INIFILE} ] && grep -q "^extension[[:space:]]*=[[:space:]]*${MODNAME}.s
        echo "deactivating module '${MODNAME}.so' in ${INIFILE}" 1>&2
        grep -v "^extension[[:space:]]*=[[:space:]]*${MODNAME}.so" > ${TMPFILE} < ${INIFILE}
        mv ${TMPFILE} ${INIFILE}
-                               
+       chmod 644 ${INIFILE}
 fi
 if [ -f /var/lock/subsys/httpd ]; then
        /etc/rc.d/init.d/httpd restart 1>&2

diff --git a/php-msession-shared-lib.patch b/php-msession-shared-lib.patch
new file mode 100644 (file)
index 0000000..293f8cd
--- /dev/null
+++ b/php-msession-shared-lib.patch
@@ -0,0 +1,17 @@
+--- php-4.2.1/ext/msession/config.m4.orig      Fri Nov 30 19:59:44 2001
++++ php-4.2.1/ext/msession/config.m4   Tue May 14 00:42:05 2002
+@@ -6,12 +6,12 @@
+ [  --with-msession[=DIR]   Include msession support])
+  
+ if test "$PHP_MSESSION" != "no"; then
+-      if test -r $PHP_MSESSION/lib/libphoenix.a; then
++      if test -r $PHP_MSESSION/lib/libphoenix.so -o -r $PHP_MSESSION/lib/libphoenix.a; then
+               PHOENIX_DIR=$PHP_MSESSION
+       else
+               AC_MSG_CHECKING(for msession in default path)
+               for i in /usr/local/phoenix /usr/local /usr; do
+-                      if test -r $i/lib/libphoenix.a; then
++                      if test -r $i/lib/libphoenix.so -o -r $i/lib/libphoenix.a; then
+                               PHOENIX_DIR=$i
+                               AC_MSG_RESULT(found in $i)
+                       fi

diff --git a/php-mysql-socket.patch b/php-mysql-socket.patch
index 20c96b29545626c9b2fca094425ba7ea6eeec18c..7b1e511434703edd28c64c60b9e23a3b5825ee9e 100644 (file)
--- a/php-mysql-socket.patch
+++ b/php-mysql-socket.patch
@@ -1,40 +1,26 @@
---- php-4.1.1/ext/mysql/config.m4.orig Sat Nov  3 22:26:27 2001
-+++ php-4.1.1/ext/mysql/config.m4      Sat Jan 19 10:20:23 2002
-@@ -16,19 +16,25 @@
+diff -urN php-4.2.1RC2.org/ext/mysql/config.m4 php-4.2.1RC2/ext/mysql/config.m4
+--- php-4.2.1RC2.org/ext/mysql/config.m4       Sat May 11 20:49:23 2002
++++ php-4.2.1RC2/ext/mysql/config.m4   Sat May 11 20:55:42 2002
+@@ -18,6 +18,14 @@
  ])
        
  AC_DEFUN(PHP_MYSQL_SOCK,[
--  AC_MSG_CHECKING(for MySQL UNIX socket)
--  MYSQL_SOCK=/tmp/mysql.sock
--  for i in  \
--      /var/run/mysqld/mysqld.sock \
--      /var/tmp/mysql.sock \
--      /var/lib/mysql/mysql.sock \
--      /var/mysql/mysql.sock \
--      /Private/tmp/mysql.sock \
--      ; do
--    if test -r $i; then
--      MYSQL_SOCK=$i
-+    AC_ARG_WITH(mysql_sock,
-+  [  --with-mysql-socket=PATH 
-+                                Specify location of MySQL UNIX socket,
-+                            defaults search in know locations],[
-+      MYSQL_SOCK=$withval
-+      ],)
-+    if test "$MYSQL_SOCK" = "" -o "$MYSQL_SOCK" = "no" -o "MYSQL_SOCK" = "yes"; then
-+      AC_MSG_CHECKING(for MySQL UNIX socket)
-+      MYSQL_SOCK=/tmp/mysql.sock
-+      for i in  \
-+          /var/run/mysqld/mysqld.sock \
-+          /var/tmp/mysql.sock \
-+          /var/lib/mysql/mysql.sock \
-+          ; do
-+        if test -r $i; then
-+          MYSQL_SOCK=$i
-+        fi
-+      done
++
++  AC_ARG_WITH(mysql_sock,
++  [  --with-mysql-socket=PATH
++                              Specify location of MySQL UNIX socket, 
++                              defaults search in know locations],[
++  MYSQL_SOCK=$withval
++  ],)
++  if test "$MYSQL_SOCK" = "" -o "$MYSQL_SOCK" = "no" -o "MYSQL_SOCK" = "yes"; then
+   AC_MSG_CHECKING(for MySQL UNIX socket)
+   MYSQL_SOCK=/tmp/mysql.sock
+   for i in  \
+@@ -32,6 +40,7 @@
+       MYSQL_SOCK=$i
      fi
--  done
+   done
++  fi
    AC_DEFINE_UNQUOTED(MYSQL_UNIX_ADDR, "$MYSQL_SOCK", [ ])
    AC_MSG_RESULT($MYSQL_SOCK)
  ])

diff --git a/php-no_php_pcre_in_SAPI_c.patch b/php-no_php_pcre_in_SAPI_c.patch
index fed486163100b050874cabe80f1646006492cf1c..2c808d33d58ca65cb2453060658b2a857a560ebd 100644 (file)
--- a/php-no_php_pcre_in_SAPI_c.patch
+++ b/php-no_php_pcre_in_SAPI_c.patch
@@ -1,7 +1,7 @@
-diff -Nur php-4.1.2.orig/main/SAPI.c php-4.1.2/main/SAPI.c
---- php-4.1.2.orig/main/SAPI.c Mon Jan 14 14:43:03 2002
-+++ php-4.1.2/main/SAPI.c      Wed Feb 27 15:21:13 2002
-@@ -25,9 +25,6 @@
+diff -urN php-4_2_0RC3.org/main/SAPI.c php-4_2_0RC3/main/SAPI.c
+--- php-4_2_0RC3.org/main/SAPI.c       Sat Apr 13 01:18:30 2002
++++ php-4_2_0RC3/main/SAPI.c   Sat Apr 13 01:38:42 2002
+@@ -27,9 +27,6 @@
  #include "SAPI.h"
  #include "ext/standard/php_string.h"
  #include "ext/standard/pageinfo.h"
@@ -11,7 +11,7 @@ diff -Nur php-4.1.2.orig/main/SAPI.c php-4.1.2/main/SAPI.c
  #ifdef ZTS
  #include "TSRM.h"
  #endif
-@@ -448,65 +445,8 @@
+@@ -465,65 +462,8 @@
                        } else if (!STRCASECMP(header_line, "WWW-Authenticate")) { /* HTTP Authentication */
                                int newlen;
                                char *result, *newheader;
@@ -55,7 +55,7 @@ diff -Nur php-4.1.2.orig/main/SAPI.c php-4.1.2/main/SAPI.c
 -                                                              efree(result);
 -                                                              conv_len = sprintf(conv_temp," realm=\"%ld\"",myuid);           
 -                                                              result = emalloc(ptr_len+conv_len+1);
--                                                              result_len = ptr_len + conv_len;
+-                                                              result_len = ptr_len+conv_len;
 -                                                              memcpy(result, ptr, ptr_len);   
 -                                                              memcpy(result+ptr_len, conv_temp, conv_len);
 -                                                              *(result+ptr_len+conv_len) = '\0';
@@ -72,12 +72,12 @@ diff -Nur php-4.1.2.orig/main/SAPI.c php-4.1.2/main/SAPI.c
 -                                      efree(result);
 -                                      efree(Z_STRVAL_P(repl_temp));
 -                                      efree(repl_temp);
--                              }
+-                              } 
 -#else
                                if(PG(safe_mode)) {
                                        myuid = php_getuid();
                                        result = emalloc(32);
-@@ -517,7 +457,6 @@
+@@ -534,7 +474,6 @@
                                        sapi_header.header_len = newlen;
                                        efree(result);
                                } 

diff --git a/php-openssl-for-ext-only.patch b/php-openssl-for-ext-only.patch
new file mode 100644 (file)
index 0000000..f096d7e
--- /dev/null
+++ b/php-openssl-for-ext-only.patch
@@ -0,0 +1,72 @@
+--- php-4.2.0/configure.in.orig        Wed May  1 22:39:35 2002
++++ php-4.2.0/configure.in     Wed May  1 22:41:49 2002
+@@ -659,16 +659,6 @@
+       AC_MSG_RESULT([/usr/local/php/bin])
+ ])
+ 
+-PHP_ARG_WITH(openssl,for OpenSSL support,
+-[  --with-openssl[=DIR]    Include OpenSSL support (requires OpenSSL >= 0.9.5) ])
+-if test "$PHP_OPENSSL" = "yes"; then
+-  PHP_OPENSSL="/usr/local/ssl /usr/local /usr /usr/local/openssl"
+-fi
+-
+-if test "$PHP_OPENSSL" != "no"; then
+-  PHP_SETUP_OPENSSL
+-fi
+-
+ PHP_ARG_ENABLE(sigchild,whether to enable PHP's own SIGCHLD handler,
+ [  --enable-sigchild       Enable PHP's own SIGCHLD handler.],no)
+ 
+diff -Nur php-4.2.0/ext/openssl.orig/Makefile.in php-4.2.0/ext/openssl/Makefile.in
+--- php-4.2.0/ext/openssl.orig/Makefile.in     Mon Nov 13 20:47:19 2000
++++ php-4.2.0/ext/openssl/Makefile.in  Wed May  1 23:12:07 2002
+@@ -3,5 +3,6 @@
+ LTLIBRARY_NAME        = libopenssl.la
+ LTLIBRARY_SOURCES     = openssl.c
+ LTLIBRARY_SHARED_NAME = openssl.la
++LTLIBRARY_SHARED_LIBADD = $(OPENSSL_SHARED_LIBADD)
+ 
+ include $(top_srcdir)/build/dynlib.mk
+diff -Nur php-4.2.0/ext/openssl.orig/config.m4 php-4.2.0/ext/openssl/config.m4
+--- php-4.2.0/ext/openssl.orig/config.m4       Fri Nov 30 19:59:48 2001
++++ php-4.2.0/ext/openssl/config.m4    Wed May  1 23:16:39 2002
+@@ -2,6 +2,16 @@
+ dnl $Id$
+ dnl
+ 
++PHP_ARG_WITH(openssl,for OpenSSL support,
++[  --with-openssl[=DIR]    Include OpenSSL support (requires OpenSSL >= 0.9.5) ])
++if test "$PHP_OPENSSL" = "yes"; then
++  PHP_OPENSSL="/usr/local/ssl /usr/local /usr /usr/local/openssl"
++fi
++
++if test "$PHP_OPENSSL" != "no"; then
++  PHP_SETUP_OPENSSL
++fi
++
+ if test "$OPENSSL_DIR"; then
+   PHP_EXTENSION(openssl, $ext_shared)
+   AC_DEFINE(HAVE_OPENSSL_EXT,1,[ ])
+--- php-4.2.0/acinclude.m4.orig        Wed May  1 23:16:39 2002
++++ php-4.2.0/acinclude.m4     Wed May  1 23:18:31 2002
+@@ -85,17 +85,18 @@
+   PHP_ADD_LIBPATH($OPENSSL_DIR/lib)
+ 
+   AC_CHECK_LIB(crypto, CRYPTO_free, [
+-    PHP_ADD_LIBRARY(crypto)
++    PHP_ADD_LIBRARY(crypto,, OPENSSL_SHARED_LIBADD)
+   ],[
+     AC_MSG_ERROR([libcrypto not found!])
+   ])
+ 
+   AC_CHECK_LIB(ssl, SSL_CTX_set_ssl_version, [
+-    PHP_ADD_LIBRARY(ssl)
++    PHP_ADD_LIBRARY(ssl,, OPENSSL_SHARED_LIBADD)
+   ],[
+     AC_MSG_ERROR([libssl not found!])
+   ])
+   PHP_ADD_INCLUDE($OPENSSL_INC)
++  PHP_SUBST(OPENSSL_SHARED_LIBADD)
+ ])
+ 
+ dnl PHP_EVAL_LIBLINE(LINE, SHARED-LIBADD)

diff --git a/php-pldlogo.patch b/php-pldlogo.patch
index 256629eda6a820a523f7c2d659c98ab7e20a1f13..34748f03e117ffd1a5454cda93995a037f0dd145 100644 (file)
--- a/php-pldlogo.patch
+++ b/php-pldlogo.patch
@@ -1,9 +1,9 @@
-diff -uar php-4.0.6orig/ext/standard/info.c php-4.0.6/ext/standard/info.c
---- php-4.0.6orig/ext/standard/info.c  Tue Nov 13 12:07:48 2001
-+++ php-4.0.6/ext/standard/info.c      Tue Nov 13 22:49:55 2001
-@@ -220,7 +220,20 @@
-               zend_html_puts(zend_version, strlen(zend_version));
-               php_printf("</BR>\n");
+diff -urN php-4.2.1RC2.org/ext/standard/info.c php-4.2.1RC2/ext/standard/info.c
+--- php-4.2.1RC2.org/ext/standard/info.c       Sat May 11 20:49:24 2002
++++ php-4.2.1RC2/ext/standard/info.c   Sat May 11 20:49:40 2002
+@@ -229,7 +229,20 @@
+               php_printf("This program makes use of the Zend Scripting Language Engine:<br />");
+               php_html_puts(zend_version, strlen(zend_version) TSRMLS_CC);
                php_info_print_box_end();
 -              efree(php_uname);
 +              /* PLD Linux */
@@ -23,9 +23,9 @@ diff -uar php-4.0.6orig/ext/standard/info.c php-4.0.6/ext/standard/info.c
        }
  
        if ((flag & PHP_INFO_CREDITS) && expose_php) {  
-diff -uar php-4.0.6orig/ext/standard/info.h php-4.0.6/ext/standard/info.h
---- php-4.0.6orig/ext/standard/info.h  Tue Nov 13 12:07:48 2001
-+++ php-4.0.6/ext/standard/info.h      Tue Nov 13 22:44:22 2001
+diff -urN php-4.2.1RC2.org/ext/standard/info.h php-4.2.1RC2/ext/standard/info.h
+--- php-4.2.1RC2.org/ext/standard/info.h       Sat May 11 20:49:24 2002
++++ php-4.2.1RC2/ext/standard/info.h   Sat May 11 20:49:40 2002
 @@ -54,6 +54,7 @@
  #define PHP_EGG_LOGO_GUID     "PHPE9568F36-D428-11d2-A769-00AA001ACF42"
  #define ZEND_LOGO_GUID                "PHPE9568F35-D428-11d2-A769-00AA001ACF42"
@@ -34,147 +34,145 @@ diff -uar php-4.0.6orig/ext/standard/info.h php-4.0.6/ext/standard/info.h
  
  PHP_FUNCTION(phpversion);
  PHP_FUNCTION(phpinfo);
-diff -uar php-4.0.6orig/main/logos.h php-4.0.6/main/logos.h
---- php-4.0.6orig/main/logos.h Tue Nov 13 12:07:50 2001
-+++ php-4.0.6/main/logos.h     Tue Nov 13 22:44:22 2001
+diff -urN php-4.2.1RC2.org/main/logos.h php-4.2.1RC2/main/logos.h
+--- php-4.2.1RC2.org/main/logos.h      Sat May 11 20:49:24 2002
++++ php-4.2.1RC2/main/logos.h  Sat May 11 20:50:32 2002
 @@ -1057,3 +1057,127 @@
          4,   0,  59,   0  };
  
  
 +unsigned char pld_logo[] = {
-+      137,  80,  78,  71,  13,  10,  26,  10,   0,   0,
-+        0,  13,  73,  72,  68,  82,   0,   0,   0,  80,
-+        0,   0,   0,  50,   8,   3,   0,   0,   0, 252,
-+      243, 172, 206,   0,   0,   2,  46,  80,  76,  84,
-+       69, 192, 192, 192,   0,   0,  99,   0,   0,  97,
-+        0,   0,  96,   0,   0,  95,   0,   0,  94,   0,
-+        0,  93,   0,   0,  91,   2,   2,  98,   6,   6,
-+      102,   6,   6, 101,  11,  11, 101,  14,  14, 111,
-+       15,  15, 103,  16,  16, 107,  21,  21, 111,  26,
-+       26, 111,  27,  27, 112,  28,  28, 115,  27,  27,
-+      109,  29,  29, 114,  30,  30, 114,  31,  31, 115,
-+       34,  34, 119,  36,  36, 120,  35,  35, 117,  36,
-+       36, 119,  36,  36, 117,  38,  38, 120,  40,  40,
-+      121,  42,  42, 123,  42,  42, 122,  41,  41, 118,
-+       42,  42, 120,  44,  44, 125,  47,  47, 128,  46,
-+       46, 120,  49,  49, 124,  53,  53, 130,  55,  55,
-+      133,  59,  59, 133,  63,  63, 138,  61,  61, 134,
-+       60,  60, 131,  58,  58, 125,  64,  64, 137,  63,
-+       63, 135,  60,  60, 129,  61,  61, 129,  65,  65,
-+      135,  67,  67, 138,  64,  64, 131,  69,  69, 140,
-+       71,  71, 141,  70,  70, 139,  70,  70, 137,  70,
-+       70, 136,  71,  71, 137,  68,  68, 131,  76,  76,
-+      142,  79,  79, 146,  78,  78, 143,  79,  79, 144,
-+       79,  79, 143,  74,  74, 134,  74,  74, 133,  83,
-+       83, 147,  89,  89, 154,  82,  82, 141,  90,  90,
-+      154,  90,  90, 153,  88,  88, 150,  91,  91, 153,
-+       90,  90, 151,  93,  93, 152,  98,  98, 159,  96,
-+       96, 156,  91,  91, 148,  96,  96, 155,  94,  94,
-+      152,  88,  88, 142,  89,  89, 143, 100, 100, 160,
-+       93,  93, 147, 103, 103, 162, 101, 101, 159,  92,
-+       92, 144,  96,  96, 149, 106, 106, 164,  98,  98,
-+      152,  96,  96, 148, 108, 108, 165, 106, 106, 162,
-+      101, 101, 154, 102, 102, 155, 103, 103, 156, 111,
-+      111, 167, 103, 103, 155, 112, 112, 167, 104, 104,
-+      155, 112, 112, 164, 116, 116, 168, 109, 109, 156,
-+      118, 118, 168, 127, 127, 177, 125, 125, 174, 125,
-+      125, 173, 111, 111, 154, 127, 127, 175, 124, 124,
-+      171, 128, 128, 176, 137, 137, 184, 137, 137, 183,
-+      128, 128, 171, 125, 125, 166, 140, 140, 185, 126,
-+      126, 167, 137, 137, 180, 143, 143, 185, 141, 141,
-+      183, 146, 146, 188, 144, 144, 185, 148, 148, 189,
-+      138, 138, 175, 137, 137, 174, 148, 148, 187, 149,
-+      149, 185, 158, 158, 195, 157, 157, 193, 153, 153,
-+      187, 164, 164, 199, 166, 166, 201, 165, 165, 200,
-+      156, 156, 188, 155, 155, 187, 160, 160, 192, 171,
-+      171, 204, 169, 169, 202, 170, 170, 202, 177, 177,
-+      209, 158, 158, 187, 174, 174, 205, 166, 166, 195,
-+      173, 173, 203, 173, 173, 202, 169, 169, 197, 167,
-+      167, 194, 168, 168, 194, 184, 184, 212, 173, 173,
-+      198, 187, 187, 213, 185, 185, 210, 183, 183, 208,
-+      189, 189, 214, 194, 194, 218, 189, 189, 213, 184,
-+      184, 207, 183, 183, 206, 195, 195, 218, 199, 199,
-+      222, 200, 200, 222, 196, 196, 217, 198, 198, 218,
-+      194, 194, 214, 188, 188, 207, 204, 204, 224, 197,
-+      197, 215, 209, 209, 227, 208, 208, 226, 207, 207,
-+      225, 206, 206, 224, 205, 205, 223, 208, 208, 225,
-+      205, 205, 222, 196, 196, 212, 211, 211, 227, 206,
-+      206, 222, 213, 213, 229, 209, 209, 224, 216, 216,
-+      231, 212, 212, 227, 202, 202, 216, 219, 219, 233,
-+      217, 217, 231, 204, 204, 217, 226, 226, 235, 152,
-+       38, 201, 129,   0,   0,   0,   1, 116,  82,  78,
-+       83,   0,  64, 230, 216, 102,   0,   0,   0,   1,
-+       98,  75,  71,  68, 185,  58, 184,  22,  96,   0,
-+        0,   2,  57,  73,  68,  65,  84, 120, 218,  99,
-+       96,  24, 156,  32, 195, 207,  92, 180, 159, 138,
-+      230,  21, 123, 173, 101,   8, 148, 164, 158, 121,
-+      249, 210,  64,  98, 134,  10, 245,  12, 228,   9,
-+        3,  18, 157, 217, 212,  51,  16, 236, 217, 164,
-+       30, 170, 153, 167,  92,   2,  36,  58, 100, 168,
-+      102, 158, 115,  20, 136, 204,  76, 161, 150, 121,
-+      221, 198,  32, 114, 150, 236,  60, 106,  25,  40,
-+       54,  29,  68,  26,  53,  80, 203,  60, 241,  62,
-+       16,  25, 212,  70,  45, 243,  52, 107,  64, 100,
-+      179,  22, 181, 204, 155, 239,   2, 166, 148, 106,
-+      169, 101, 160,   4, 152,  76,  42, 164, 150, 121,
-+      222, 213,  96, 202, 140,  90, 230, 109, 115,   7,
-+       83, 174, 147, 168, 101,  96, 197,  22,  16,  57,
-+      197,   2,  72, 180,  80, 197, 192, 157,  96,  82,
-+       61, 145, 129,  97,  38, 187,  19, 181,  92, 201,
-+       16, 193, 217,  10,  36, 125, 217,  52, 168, 100,
-+      222,  10, 249, 180,  34,  16,  29, 206,  42,  69,
-+       29,   3, 155,  96, 229, 106,  48, 155,  53,  85,
-+       12,  12, 113, 128, 177,  84,  89, 230,  82, 195,
-+      192, 232,   0,  24, 107,  29, 179,  28,  53,  12,
-+       76,  48, 128,  51,  35,  89, 167,  82, 193, 192,
-+       82,  94,   4, 155, 195, 146,  10,   6,  78,  96,
-+      222,   1, 103, 219,  50,  81, 195, 207,  76, 241,
-+      112, 230,  68, 150, 201,  84,  48, 208, 159, 101,
-+       25, 156, 205, 149,  76,  13,  39,  10, 240,  65,
-+       25,  11,  54, 120,  10,  18, 171, 137,  17,  78,
-+       96, 130, 173, 220, 252,  43, 193, 140, 133, 113,
-+      237,  28,  32, 101,  64,  64, 145, 129,  12,  12,
-+      142,  58, 149,  27,  65, 180,  97, 163,  16,  84,
-+       25,  65,  19, 241,  27,   8,   4,  75,  64,  68,
-+      110, 172,  30, 220,  64, 176,  51,  17,   8,  76,
-+       65,  25, 112,  63,  48, 194,  20,  97,  49, 122,
-+      209, 108,  32, 177,  88, 209,  30, 102,  32, 212,
++      137,  80,  78,  71,  13,  10,  26,  10,   0,   0,
++        0,  13,  73,  72,  68,  82,   0,   0,   0,  80,
++        0,   0,   0,  50,   8,   3,   0,   0,   0, 252,
++      243, 172, 206,   0,   0,   2,  46,  80,  76,  84,
++       69, 192, 192, 192,   0,   0,  99,   0,   0,  97,
++        0,   0,  96,   0,   0,  95,   0,   0,  94,   0,
++        0,  93,   0,   0,  91,   2,   2,  98,   6,   6,
++      102,   6,   6, 101,  11,  11, 101,  14,  14, 111,
++       15,  15, 103,  16,  16, 107,  21,  21, 111,  26,
++       26, 111,  27,  27, 112,  28,  28, 115,  27,  27,
++      109,  29,  29, 114,  30,  30, 114,  31,  31, 115,
++       34,  34, 119,  36,  36, 120,  35,  35, 117,  36,
++       36, 119,  36,  36, 117,  38,  38, 120,  40,  40,
++      121,  42,  42, 123,  42,  42, 122,  41,  41, 118,
++       42,  42, 120,  44,  44, 125,  47,  47, 128,  46,
++       46, 120,  49,  49, 124,  53,  53, 130,  55,  55,
++      133,  59,  59, 133,  63,  63, 138,  61,  61, 134,
++       60,  60, 131,  58,  58, 125,  64,  64, 137,  63,
++       63, 135,  60,  60, 129,  61,  61, 129,  65,  65,
++      135,  67,  67, 138,  64,  64, 131,  69,  69, 140,
++       71,  71, 141,  70,  70, 139,  70,  70, 137,  70,
++       70, 136,  71,  71, 137,  68,  68, 131,  76,  76,
++      142,  79,  79, 146,  78,  78, 143,  79,  79, 144,
++       79,  79, 143,  74,  74, 134,  74,  74, 133,  83,
++       83, 147,  89,  89, 154,  82,  82, 141,  90,  90,
++      154,  90,  90, 153,  88,  88, 150,  91,  91, 153,
++       90,  90, 151,  93,  93, 152,  98,  98, 159,  96,
++       96, 156,  91,  91, 148,  96,  96, 155,  94,  94,
++      152,  88,  88, 142,  89,  89, 143, 100, 100, 160,
++       93,  93, 147, 103, 103, 162, 101, 101, 159,  92,
++       92, 144,  96,  96, 149, 106, 106, 164,  98,  98,
++      152,  96,  96, 148, 108, 108, 165, 106, 106, 162,
++      101, 101, 154, 102, 102, 155, 103, 103, 156, 111,
++      111, 167, 103, 103, 155, 112, 112, 167, 104, 104,
++      155, 112, 112, 164, 116, 116, 168, 109, 109, 156,
++      118, 118, 168, 127, 127, 177, 125, 125, 174, 125,
++      125, 173, 111, 111, 154, 127, 127, 175, 124, 124,
++      171, 128, 128, 176, 137, 137, 184, 137, 137, 183,
++      128, 128, 171, 125, 125, 166, 140, 140, 185, 126,
++      126, 167, 137, 137, 180, 143, 143, 185, 141, 141,
++      183, 146, 146, 188, 144, 144, 185, 148, 148, 189,
++      138, 138, 175, 137, 137, 174, 148, 148, 187, 149,
++      149, 185, 158, 158, 195, 157, 157, 193, 153, 153,
++      187, 164, 164, 199, 166, 166, 201, 165, 165, 200,
++      156, 156, 188, 155, 155, 187, 160, 160, 192, 171,
++      171, 204, 169, 169, 202, 170, 170, 202, 177, 177,
++      209, 158, 158, 187, 174, 174, 205, 166, 166, 195,
++      173, 173, 203, 173, 173, 202, 169, 169, 197, 167,
++      167, 194, 168, 168, 194, 184, 184, 212, 173, 173,
++      198, 187, 187, 213, 185, 185, 210, 183, 183, 208,
++      189, 189, 214, 194, 194, 218, 189, 189, 213, 184,
++      184, 207, 183, 183, 206, 195, 195, 218, 199, 199,
++      222, 200, 200, 222, 196, 196, 217, 198, 198, 218,
++      194, 194, 214, 188, 188, 207, 204, 204, 224, 197,
++      197, 215, 209, 209, 227, 208, 208, 226, 207, 207,
++      225, 206, 206, 224, 205, 205, 223, 208, 208, 225,
++      205, 205, 222, 196, 196, 212, 211, 211, 227, 206,
++      206, 222, 213, 213, 229, 209, 209, 224, 216, 216,
++      231, 212, 212, 227, 202, 202, 216, 219, 219, 233,
++      217, 217, 231, 204, 204, 217, 226, 226, 235, 152,
++       38, 201, 129,   0,   0,   0,   1, 116,  82,  78,
++       83,   0,  64, 230, 216, 102,   0,   0,   0,   1,
++       98,  75,  71,  68, 185,  58, 184,  22,  96,   0,
++        0,   2,  57,  73,  68,  65,  84, 120, 218,  99,
++       96,  24, 156,  32, 195, 207,  92, 180, 159, 138,
++      230,  21, 123, 173, 101,   8, 148, 164, 158, 121,
++      249, 210,  64,  98, 134,  10, 245,  12, 228,   9,
++        3,  18, 157, 217, 212,  51,  16, 236, 217, 164,
++       30, 170, 153, 167,  92,   2,  36,  58, 100, 168,
++      102, 158, 115,  20, 136, 204,  76, 161, 150, 121,
++      221, 198,  32, 114, 150, 236,  60, 106,  25,  40,
++       54,  29,  68,  26,  53,  80, 203,  60, 241,  62,
++       16,  25, 212,  70,  45, 243,  52, 107,  64, 100,
++      179,  22, 181, 204, 155, 239,   2, 166, 148, 106,
++      169, 101, 160,   4, 152,  76,  42, 164, 150, 121,
++      222, 213,  96, 202, 140,  90, 230, 109, 115,   7,
++       83, 174, 147, 168, 101,  96, 197,  22,  16,  57,
++      197,   2,  72, 180,  80, 197, 192, 157,  96,  82,
++       61, 145, 129,  97,  38, 187,  19, 181,  92, 201,
++       16, 193, 217,  10,  36, 125, 217,  52, 168, 100,
++      222,  10, 249, 180,  34,  16,  29, 206,  42,  69,
++       29,   3, 155,  96, 229, 106,  48, 155,  53,  85,
++       12,  12, 113, 128, 177,  84,  89, 230,  82, 195,
++      192, 232,   0,  24, 107,  29, 179,  28,  53,  12,
++       76,  48, 128,  51,  35,  89, 167,  82, 193, 192,
++       82,  94,   4, 155, 195, 146,  10,   6,  78,  96,
++      222,   1, 103, 219,  50,  81, 195, 207,  76, 241,
++      112, 230,  68, 150, 201,  84,  48, 208, 159, 101,
++       25, 156, 205, 149,  76,  13,  39,  10, 240,  65,
++       25,  11,  54, 120,  10,  18, 171, 137,  17,  78,
++       96, 130, 173, 220, 252,  43, 193, 140, 133, 113,
++      237,  28,  32, 101,  64,  64, 145, 129,  12,  12,
++      142,  58, 149,  27,  65, 180,  97, 163,  16,  84,
++       25,  65,  19, 241,  27,   8,   4,  75,  64,  68,
++      110, 172,  30, 220,  64, 176,  51,  17,   8,  76,
++       65,  25, 112,  63,  48, 194,  20,  97,  49, 122,
++      209, 108,  32, 177,  88, 209,  30, 102,  32, 212,
 +       84, 168, 129,  16,   2, 137, 135, 112,  33,  92,
-+        4,  13, 212, 167, 130,  72,  17, 109, 152, 189,
-+       48,   3, 161,  16,  46, 132, 144,  35,  96,  96,
-+      153,   9, 136, 180, 211,  71,  87,  11, 119,  24,
-+        3, 134,  57, 248,  13, 172,  50,   5, 145, 233,
-+       10, 240, 240,  96, 100, 100,  68, 210,  11, 115,
-+       24,  52, 104,  81, 194,  16, 123, 228, 116, 197,
-+      128, 200, 114,  97, 130, 233,   5, 103, 148, 163,
-+      129, 222,  80,  16,  57, 221, 138,  90, 230,  49,
-+      172, 206,   2,  83,  53, 100, 185,  16,  27,  88,
-+      227,   6, 166, 230,  64,  67, 134,  17, 150, 228,
-+      144, 248,  48, 247,  48,  34,  83,  56, 193,  52,
-+       31,  48, 181, 137,   1, 158, 118, 145,  12,  68,
-+      209,  79,  68, 190,   4, 129, 149,  57, 168,  78,
-+       64,  55,  16,  97,  14, 146,  11, 225, 110,  71,
-+      214,   2, 149, 223, 236,  65, 158, 129,  12,   8,
-+       67, 144,  19,  20,   3, 195, 246,  60, 178,  12,
-+      100, 192, 105, 224, 230,   2,  36,   3, 209,  35,
-+      133, 120,   3,  17, 202, 150, 235,  46,  69,  15,
-+      117, 202,  92, 184, 202,   6, 191, 129,  24, 177,
-+      140,  97,  32,  35, 170, 129,  12, 106,  29, 152,
-+        6,  50,  50, 162, 196,  37, 138,  48, 186,  79,
-+       81,   5,  25,  24, 214, 215,  17, 149, 186, 200,
-+        0,   0, 218,  35,  72, 230, 144,   1,  81,  42,
-+        0,   0,   0,   0,  73,  69,  78,  68, 174,  66,
-+       96, 130 };
-diff -uar php-4.0.6orig/main/php_logos.c php-4.0.6/main/php_logos.c
---- php-4.0.6orig/main/php_logos.c     Tue Nov 13 12:07:50 2001
-+++ php-4.0.6/main/php_logos.c Tue Nov 13 22:44:22 2001
-@@ -56,7 +56,8 @@
++        4,  13, 212, 167, 130,  72,  17, 109, 152, 189,
++       48,   3, 161,  16,  46, 132, 144,  35,  96,  96,
++      153,   9, 136, 180, 211,  71,  87,  11, 119,  24,
++        3, 134,  57, 248,  13, 172,  50,   5, 145, 233,
++       10, 240, 240,  96, 100, 100,  68, 210,  11, 115,
++       24,  52, 104,  81, 194,  16, 123, 228, 116, 197,
++      128, 200, 114,  97, 130, 233,   5, 103, 148, 163,
++      129, 222,  80,  16,  57, 221, 138,  90, 230,  49,
++      172, 206,   2,  83,  53, 100, 185,  16,  27,  88,
++      227,   6, 166, 230,  64,  67, 134,  17, 150, 228,
++      144, 248,  48, 247,  48,  34,  83,  56, 193,  52,
++       31,  48, 181, 137,   1, 158, 118, 145,  12,  68,
++      209,  79,  68, 190,   4, 129, 149,  57, 168,  78,
++       64,  55,  16,  97,  14, 146,  11, 225, 110,  71,
++      214,   2, 149, 223, 236,  65, 158, 129,  12,   8,
++       67, 144,  19,  20,   3, 195, 246,  60, 178,  12,
++      100, 192, 105, 224, 230,   2,  36,   3, 209,  35,
++      133, 120,   3,  17, 202, 150, 235,  46,  69,  15,
++      117, 202,  92, 184, 202,   6, 191, 129,  24, 177,
++      140,  97,  32,  35, 170, 129,  12, 106,  29, 152,
++        6,  50,  50, 162, 196,  37, 138,  48, 186,  79,
++       81,   5,  25,  24, 214, 215,  17, 149, 186, 200,
++        0,   0, 218,  35,  72, 230, 144,   1,  81,  42,
++        0,   0,   0,   0,  73,  69,  78,  68, 174,  66,
++       96, 130 };
+diff -urN php-4.2.1RC2.org/main/php_logos.c php-4.2.1RC2/main/php_logos.c
+--- php-4.2.1RC2.org/main/php_logos.c  Sat May 11 20:49:24 2002
++++ php-4.2.1RC2/main/php_logos.c      Sat May 11 20:51:05 2002
+@@ -56,6 +56,7 @@
        php_register_info_logo(PHP_LOGO_GUID    , "image/gif", php_logo    , sizeof(php_logo));
        php_register_info_logo(PHP_EGG_LOGO_GUID, "image/gif", php_egg_logo, sizeof(php_egg_logo));
        php_register_info_logo(ZEND_LOGO_GUID   , "image/gif", zend_logo   , sizeof(zend_logo));
--
-+      php_register_info_logo(PLD_LOGO_GUID    , "image/png", pld_logo    , sizeof(pld_logo));
-+      
++      php_register_info_logo(PLD_LOGO_GUID    , "image/png", pld_logo    , sizeof(pld_logo));
+ 
        return SUCCESS;
  }
- 

diff --git a/php-sapi-ini-file.patch b/php-sapi-ini-file.patch
new file mode 100644 (file)
index 0000000..ea6ff86
--- /dev/null
+++ b/php-sapi-ini-file.patch
@@ -0,0 +1,61 @@
+--- php-4.2.1/main/php_ini.c.orig      Tue Mar  5 01:21:28 2002
++++ php-4.2.1/main/php_ini.c   Wed Jun 12 18:10:30 2002
+@@ -204,6 +204,8 @@
+       char *env_location, *php_ini_search_path;
+       int safe_mode_state;
+       char *open_basedir;
++      char *sapi_ini_filename;
++      char *sapi_ini_opened_path;
+       int free_ini_search_path=0;
+       zend_file_handle fh;
+       TSRMLS_FETCH();
+@@ -264,15 +266,10 @@
+       PG(open_basedir) = NULL;
+       
+       fh.handle.fp = php_fopen_with_path("php.ini", "r", php_ini_search_path, &php_ini_opened_path TSRMLS_CC);
+-      if (free_ini_search_path) {
+-              efree(php_ini_search_path);
+-      }
+       PG(safe_mode) = safe_mode_state;
+       PG(open_basedir) = open_basedir;
+ 
+-      if (!fh.handle.fp) {
+-              return SUCCESS;  /* having no configuration file is ok */
+-      }
++  if (fh.handle.fp) {
+       fh.type = ZEND_HANDLE_FP;
+       fh.filename = php_ini_opened_path;
+ 
+@@ -288,7 +285,31 @@
+               efree(php_ini_opened_path);
+               php_ini_opened_path = zend_strndup(Z_STRVAL(tmp), Z_STRLEN(tmp));
+       }
+-      
++  }
++
++    sapi_ini_filename = do_alloca(7+1+strlen(sapi_module.name)+1);
++      if(sapi_ini_filename == NULL) {
++              if (free_ini_search_path)
++                      efree(php_ini_search_path);
++              return SUCCESS;
++      }
++      sprintf(sapi_ini_filename,"php-%s.ini",sapi_module.name);
++      fh.handle.fp = php_fopen_with_path(sapi_ini_filename, "r", php_ini_search_path, &sapi_ini_opened_path TSRMLS_CC);
++      if (free_ini_search_path) {
++              efree(php_ini_search_path);
++      }
++      if (!fh.handle.fp) {
++              return SUCCESS;  /* having no configuration file is ok */
++      }
++      fh.type = ZEND_HANDLE_FP;
++      fh.filename = sapi_ini_opened_path;
++
++      zend_parse_ini_file(&fh, 1, php_config_ini_parser_cb, &extension_lists);
++
++      if (sapi_ini_opened_path)
++              efree(sapi_ini_opened_path);
++      free_alloca(sapi_ini_filename);
++
+       return SUCCESS;
+ }
+ /* }}} */

diff --git a/php-session-fix-shared.patch b/php-session-fix-shared.patch
new file mode 100644 (file)
index 0000000..3d18498
--- /dev/null
+++ b/php-session-fix-shared.patch
@@ -0,0 +1,12 @@
+--- php-4.2.0/ext/session/config.m4.orig       Fri Nov 30 19:59:56 2001
++++ php-4.2.0/ext/session/config.m4    Wed May  1 22:25:30 2002
+@@ -22,7 +22,9 @@
+   PHP_ADD_LIBRARY_WITH_PATH(mm, $MM_DIR/lib, SESSION_SHARED_LIBADD)
+   PHP_ADD_INCLUDE($MM_DIR/include)
+   AC_DEFINE(HAVE_LIBMM, 1, [Whether you have libmm])
++  if test "$ext_shared" = "no"; then
+   PHP_MODULE_PTR(phpext_ps_mm_ptr)
++  fi
+ fi
+ 
+ if test "$PHP_SESSION" != "no"; then

diff --git a/php-shared.patch b/php-shared.patch
index 28927bb5cb23558ebff2184a750adb1bea4b6cd0..db51f989e1d8ef6bf33bc4008487c1117e9be6ba 100644 (file)
--- a/php-shared.patch
+++ b/php-shared.patch
@@ -1,12 +1,14 @@
-diff -ur php-4.1.2/Makefile.in php-4.1.2.x/Makefile.in
---- php-4.1.2/Makefile.in      Sun Apr 22 03:09:12 2001
-+++ php-4.1.2.x/Makefile.in    Sat Mar  2 23:05:56 2002
-@@ -2,40 +2,68 @@
+diff -urN php-4_2_0RC3.org/Makefile.in php-4_2_0RC3/Makefile.in
+--- php-4_2_0RC3.org/Makefile.in       Sat Apr 13 01:18:28 2002
++++ php-4_2_0RC3/Makefile.in   Sat Apr 13 01:56:27 2002
+@@ -2,40 +2,67 @@
  ZEND_DIR = $(srcdir)/Zend
- SUBDIRS = Zend main ext sapi $(TSRM_DIR) $(REGEX_DIR) . $(PEAR_DIR)
+ SUBDIRS = Zend main ext sapi $(TSRM_DIR) $(REGEX_DIR) $(CLI_DIR) . $(PEAR_DIR)
  
 -LTLIBRARY_NAME = libphp4.la
 -LTLIBRARY_SOURCES = stub.c
+-
+-LTLIBRARY_DEPENDENCIES = \
 +libexec_LTLIBRARIES = libphp_common.la libphp4.la
 +libphp4_la_NAME = libphp4.la
 +libphp_common_la_NAME = libphp_common.la
@@ -16,9 +18,7 @@ diff -ur php-4.1.2/Makefile.in php-4.1.2.x/Makefile.in
 +libphp4_la_DEPENDENCIES = \
 +              libphp_common.la \
 +              sapi/$(PHP_SAPI)/libsapi.la
- 
--LTLIBRARY_DEPENDENCIES = \
-+
++              
 +libphp_common_la_DEPENDENCIES = \
                Zend/libZend.la \
 -              sapi/$(PHP_SAPI)/libsapi.la \
@@ -28,7 +28,7 @@ diff -ur php-4.1.2/Makefile.in php-4.1.2.x/Makefile.in
                $(TSRM_LIB)
  
 -LTLIBRARY_LDFLAGS = -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS)
--LTLIBRARY_LIBADD = $(LTLIBRARY_DEPENDENCIES) $(EXTRA_LIBS)
+-LTLIBRARY_LIBADD = $(LTLIBRARY_DEPENDENCIES) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS)
 +libphp4_la_LDFLAGS = -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS)
 +libphp4_la_LIBADD = $(libphp4_la_DEPENDENCIES) $(EXTRA_LIBS)
  
@@ -69,7 +69,7 @@ diff -ur php-4.1.2/Makefile.in php-4.1.2.x/Makefile.in
        -@if test ! -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); then \
                for i in 0.0.0 0.0 0; do \
                        if test -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i; then \
-+                              break; \
++                              break;  \
 +                      fi; \
 +              done; \
 +      fi

diff --git a/php-wddx-fix.patch b/php-wddx-fix.patch
new file mode 100644 (file)
index 0000000..c74fca8
--- /dev/null
+++ b/php-wddx-fix.patch
@@ -0,0 +1,25 @@
+--- php-4.2.0/ext/wddx/Makefile.in.orig        Wed May  1 17:42:43 2002
++++ php-4.2.0/ext/wddx/Makefile.in     Wed May  1 17:53:04 2002
+@@ -1,5 +1,9 @@
+ 
+ LTLIBRARY_NAME    = libwddx.la
+ LTLIBRARY_SOURCES = wddx.c
++LTLIBRARY_DEPENDENCIES  = $(EXPAT_INTERNAL_LIBADD)
++LTLIBRARY_LIBADD        = $(LTLIBRARY_DEPENDENCIES)
++LTLIBRARY_SHARED_NAME = wddx.la
++LTLIBRARY_SHARED_LIBADD = $(EXPAT_SHARED_LIBADD)
+ 
+ include $(top_srcdir)/build/dynlib.mk
+--- php-4.2.0/ext/wddx/wddx.c.orig     Thu May  2 03:21:31 2002
++++ php-4.2.0/ext/wddx/wddx.c  Thu May  2 03:21:17 2002
+@@ -124,6 +124,10 @@
+ };
+ /* }}} */
+ 
++#ifdef COMPILE_DL_WDDX
++ZEND_GET_MODULE(wddx)
++#endif
++
+ /* {{{ wddx_stack_init
+  */   
+ static int wddx_stack_init(wddx_stack *stack)

diff --git a/php-xmlrpc-includes.patch b/php-xmlrpc-includes.patch
new file mode 100644 (file)
index 0000000..8f83821
--- /dev/null
+++ b/php-xmlrpc-includes.patch
@@ -0,0 +1,30 @@
+--- php-4.2.1/ext/xmlrpc/config.m4.orig        Tue Mar 26 01:15:29 2002
++++ php-4.2.1/ext/xmlrpc/config.m4     Tue May 14 17:48:54 2002
+@@ -57,12 +57,18 @@
+ 
+   if test -r $PHP_XMLRPC/include/xmlrpc.h; then
+     XMLRPC_DIR=$PHP_XMLRPC
++    XMLRPC_INC=$$XMLRPC_DIR/include
+   else
+     AC_MSG_CHECKING(for XMLRPC-EPI in default path)
+     for i in /usr/local /usr; do
+       if test -r $i/include/xmlrpc.h; then
+         XMLRPC_DIR=$i
++      XMLRPC_INC=$i/include
+         AC_MSG_RESULT(found in $i)
++      elif test -r $i/include/xmlrpc-epi/xmlrpc.h; then
++      XMLRPC_DIR=$i
++      XMLRPC_INC=$i/include/xmlrpc-epi
++      AC_MSG_RESULT([found in $i, includes in $i/include/xmlrpc-epi])
+       fi
+     done
+   fi
+@@ -72,7 +78,7 @@
+     AC_MSG_ERROR(Please reinstall the XMLRPC-EPI distribution)
+   fi
+ 
+-  PHP_ADD_INCLUDE($XMLRPC_DIR/include)
++  PHP_ADD_INCLUDE($XMLRPC_INC)
+   PHP_ADD_LIBRARY_WITH_PATH(xmlrpc, $XMLRPC_DIR/lib, XMLRPC_SHARED_LIBADD)
+   
+ fi