This commit was manufactured by cvs2git to create branch 'DEVEL'.

Cherrypick from master 2003-12-16 22:43:16 UTC Jakub Bogusz <qboosh@pld-linux.org> '- prefer db-4.2':
    php-apache.ini -> 1.3
    php-build_modules.patch -> 1.2
    php-db-shared.patch -> 1.1
    php-db42.patch -> 1.1
    php-java-norpath.patch -> 1.2
    php-module-install -> 1.6
    php-mssql-fix.patch -> 1.1
    php-ncurses.patch -> 1.2
    php-pldlogo.patch -> 1.29
    php-qt.patch -> 1.2
    php-wddx-fix.patch -> 1.3
    php-xml-expat-fix.patch -> 1.1
    php-xslt-gcc33.patch -> 1.1
Cherrypick from master 2004-08-07 19:12:39 UTC Adam Gołębiowski <adamg@pld-linux.org> '- new':
    php-phpize.patch -> 1.1
    php-zlib.patch -> 1.3
Cherrypick from master 2002-06-21 10:12:36 UTC Artur Frysiak <artur@frysiak.net> 'use AP_MODULE_MAGIC_AT_LEAST to compile with new apache2':
    php-apache2_broken_macro.patch -> 1.1

diff --git a/php-apache.ini b/php-apache.ini
new file mode 100644 (file)
index 0000000..3b335f6
--- /dev/null
+++ b/php-apache.ini
@@ -0,0 +1,15 @@
+; php-apache.ini - configuration used only for apache SAPI
+;
+; Please note that, unlikely in original php distributions, this file
+; is read AFTER (not instead of) reading global /etc/php/php.ini.
+;
+; It allows you to control global settings for all SAPIs in one place
+; and override some settings in SAPI-specific files without need of
+; copying whole large php.ini.
+
+[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-apache2_broken_macro.patch b/php-apache2_broken_macro.patch
new file mode 100644 (file)
index 0000000..3f79b97
--- /dev/null
+++ b/php-apache2_broken_macro.patch
@@ -0,0 +1,11 @@
+--- php-4.2.1/sapi/apache2filter/php_functions.c.wiget Fri Jun 21 11:12:06 2002
++++ php-4.2.1/sapi/apache2filter/php_functions.c       Fri Jun 21 11:12:38 2002
+@@ -90,7 +90,7 @@
+               ADD_STRING(method);
+               ADD_LONG(mtime);
+               ADD_LONG(clength);
+-#if !MODULE_MAGIC_AT_LEAST(20020506,0)
++#if !AP_MODULE_MAGIC_AT_LEAST(20020506,0)
+               ADD_STRING(boundary);
+ #endif
+               ADD_STRING(range);

diff --git a/php-build_modules.patch b/php-build_modules.patch
new file mode 100644 (file)
index 0000000..cf222ec
--- /dev/null
+++ b/php-build_modules.patch
@@ -0,0 +1,9 @@
+diff -Naur php-4.1.2.orig/ext/skeleton/create_stubs php-4.1.2/ext/skeleton/create_stubs
+--- php-4.1.2.orig/ext/skeleton/create_stubs   Fri May 31 11:50:08 2002
++++ php-4.1.2/ext/skeleton/create_stubs        Fri May 31 11:52:00 2002
+@@ -1,4 +1,4 @@
+-#!/usr/bin/awk -f
++#!/bin/awk -f
+ 
+ function gobble(s, x)
+ {

diff --git a/php-db-shared.patch b/php-db-shared.patch
new file mode 100644 (file)
index 0000000..dfeb72a
--- /dev/null
+++ b/php-db-shared.patch
@@ -0,0 +1,40 @@
+--- php-4.3.3RC3/ext/db/config.m4.orig 2002-11-15 17:37:51.000000000 +0100
++++ php-4.3.3RC3/ext/db/config.m4      2003-08-16 16:08:12.152768432 +0200
+@@ -5,10 +5,10 @@
+ # Checks for libraries.
+ # Prefer gdbm, Berkeley DB and ndbm/dbm, in that order
+ AC_DEFUN(AC_PREFERRED_DB_LIB,[
+-  AC_CHECK_LIB(gdbm, gdbm_open,[AC_DEFINE(GDBM,1, [Whether you have GDBM]) DBM_TYPE=gdbm; DBM_LIB=-lgdbm],
++  AC_CHECK_LIB(gdbm, gdbm_open,[AC_DEFINE(GDBM,1, [Whether you have GDBM]) DBM_TYPE=gdbm; DBM_LIB=gdbm],
+   [AC_CHECK_LIB(c, dbm_open,[AC_DEFINE(NDBM,1,[ ]) DBM_TYPE=ndbm; DBM_LIB=],
+-   [AC_CHECK_LIB(dbm, dbm_open,[AC_DEFINE(NDBM,1,[ ]) DBM_TYPE=ndbm; DBM_LIB=-ldbm],
+-    [AC_CHECK_LIB(db, dbm_open,[AC_DEFINE(NDBM,1, [Whether you have NDBM]) DBM_TYPE=ndbm; DBM_LIB=-ldb],
++   [AC_CHECK_LIB(dbm, dbm_open,[AC_DEFINE(NDBM,1,[ ]) DBM_TYPE=ndbm; DBM_LIB=dbm],
++    [AC_CHECK_LIB(db, dbm_open,[AC_DEFINE(NDBM,1, [Whether you have NDBM]) DBM_TYPE=ndbm; DBM_LIB=db],
+      [DBM_TYPE=""])
+     ])
+    ])
+@@ -32,7 +32,7 @@
+ 
+   AC_PREFERRED_DB_LIB
+ 
+-  if test "$DBM_LIB" = "-lgdbm"; then
++  if test "$DBM_LIB" = "gdbm"; then
+     AC_CHECK_HEADER(gdbm.h, [ GDBM_INCLUDE="" ], [ 
+       AC_MSG_RESULT("Try /usr/local/include/gdbm.h"); 
+       AC_CHECK_HEADER(/usr/local/include/gdbm.h, [ GDBM_INCLUDE=-I/usr/local/include ],[
+@@ -49,10 +49,11 @@
+     ])
+   fi
+ 
++  PHP_NEW_EXTENSION(db, db.c, $ext_shared)
++  PHP_SUBST(DB_SHARED_LIBADD)
+   if test -n "$DBM_LIB"; then
+-    INCLUDES="$INCLUDES $GDBM_INCLUDE"
+-    EXTRA_LIBS="$EXTRA_LIBS $DBM_LIB"
++    PHP_ADD_INCLUDE($GDBM_INCLUDE)
++    PHP_ADD_LIBRARY_WITH_PATH($DBM_LIB, , DB_SHARED_LIBADD)
+   fi
+ 
+-  PHP_NEW_EXTENSION(db, db.c)
+ fi

diff --git a/php-db42.patch b/php-db42.patch
new file mode 100644 (file)
index 0000000..1263ebc
--- /dev/null
+++ b/php-db42.patch
@@ -0,0 +1,11 @@
+--- php-4.3.4/ext/dba/config.m4.orig   2003-12-16 23:38:01.000000000 +0100
++++ php-4.3.4/ext/dba/config.m4        2003-12-16 23:40:19.327674256 +0100
+@@ -221,7 +221,7 @@
+         break
+       fi
+     done
+-    PHP_DBA_DB_CHECK(4, db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
++    PHP_DBA_DB_CHECK(4, db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
+   fi
+ ])
+ AC_DBA_STD_RESULT(db4,Berkeley DB4)

diff --git a/php-java-norpath.patch b/php-java-norpath.patch
new file mode 100644 (file)
index 0000000..b6553c6
--- /dev/null
+++ b/php-java-norpath.patch
@@ -0,0 +1,42 @@
+diff -burN php-4.3.2/ext/java/config.m4 php-4.3.2-java-norpath/ext/java/config.m4
+--- php-4.3.2/ext/java/config.m4       Fri Apr  4 19:43:13 2003
++++ php-4.3.2-java-norpath/ext/java/config.m4  Wed Jun 11 09:38:23 2003
+@@ -58,7 +58,6 @@
+ AC_DEFUN(JAVA_CHECK_LIB, [
+  AC_MSG_CHECKING([Checking for libjava])
+  if test -d $PHP_JAVA/lib/kaffe; then
+-   PHP_ADD_LIBPATH($PHP_JAVA/lib)
+    JAVA_CFLAGS=-DKAFFE
+    JAVA_INCLUDE=-I$PHP_JAVA/include/kaffe
+    JAVA_CLASSPATH=$PHP_JAVA/share/kaffe/Klasses.jar
+@@ -111,10 +110,6 @@
+        JAVA_LIB=java
+        JAVA_LIBPATH=$i
+ 
+-       test -d $i/hotspot && PHP_ADD_LIBPATH($i/hotspot)
+-       test -d $i/classic && PHP_ADD_LIBPATH($i/classic)
+-       test -d $i/server  && PHP_ADD_LIBPATH($i/server)
+-       test -d $i/native_threads && PHP_ADD_LIBPATH($i/native_threads)
+      fi
+    done
+ 
+@@ -160,19 +155,12 @@
+       AC_MSG_ERROR([unable to find Java VM libraries in $PHP_JAVA])
+     fi
+ 
+-    PHP_ADD_LIBPATH($JAVA_LIBPATH)
+     JAVA_CFLAGS="$JAVA_CFLAGS '-DJAVALIB=\"$JAVA_LIBPATH/$java_libext\"'"
+   fi
+ 
+   if test "$PHP_SAPI" != "servlet"; then
+     PHP_NEW_EXTENSION(java, java.c, shared,, $JAVA_CFLAGS $JAVA_INCLUDE)
+ 
+-    if test "$PHP_SAPI" = "cgi"; then
+-      if test "$platform" != "Darwin"; then
+-        PHP_ADD_LIBRARY($JAVA_LIB)
+-      fi
+-    fi
+-
+     if test -n "$INSTALL_IT"; then
+       INSTALL_IT="$INSTALL_IT ;"
+     fi

diff --git a/php-module-install b/php-module-install
new file mode 100644 (file)
index 0000000..cdccc39
--- /dev/null
+++ b/php-module-install
@@ -0,0 +1,64 @@
+#!/bin/sh
+
+VERSION="$0 V 0.1 (C) 2001 Artur Frysiak"
+COMMAND=usage
+VERBOSE=""
+MODNAME=""
+INIFILE=""
+
+install ()
+{
+if [ -f ${INIFILE} ] && ! grep -q "^extension[[:space:]]*=[[:space:]]*${MODNAME}.so" ${INIFILE} ; then
+       echo "activating module '${MODNAME}.so' in ${INIFILE}" 1>&2
+       echo "extension=${MODNAME}.so" >> ${INIFILE}
+fi
+if [ -f /var/lock/subsys/httpd ]; then
+       /etc/rc.d/init.d/httpd restart 1>&2
+fi
+}
+
+deinstall()
+{
+if [ -f ${INIFILE} ] && grep -q "^extension[[:space:]]*=[[:space:]]*${MODNAME}.so" ${INIFILE} ; then
+       TMPFILE=`mktemp -q /tmp/php-module-install.XXXXXX`
+       if [ $? -ne 0 ]; then
+               echo "$0: Can't create temp file, exiting..."
+               exit 1
+       fi
+       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
+fi
+}
+
+usage()
+{
+       echo $VERSION
+       echo "Usage:"
+       echo " $0 install MODNAME INIFILE"
+       echo " $0 remove  MODNAME INIFILE"
+}
+
+if [ "$#" = 3 ]; then
+       MODNAME="$2"
+       INIFILE="$3"
+
+       if [ "$1" = "install" ]; then
+               install
+       else
+               if [ "$1" = "remove" ]; then
+                       deinstall
+               else
+                       usage
+               fi
+       fi
+else
+       usage
+       exit 1
+fi
+
+exit 0

diff --git a/php-mssql-fix.patch b/php-mssql-fix.patch
new file mode 100644 (file)
index 0000000..bf961e9
--- /dev/null
+++ b/php-mssql-fix.patch
@@ -0,0 +1,13 @@
+--- php-4.3.4RC2/ext/mssql/config.m4.old       2003-10-29 02:26:59.000000000 +0100
++++ php-4.3.4RC2/ext/mssql/config.m4   2003-10-29 02:26:36.000000000 +0100
+@@ -32,8 +32,8 @@
+     fi
+   fi  
+ 
+-  if test ! -r "$FREETDS_INSTALLATION_DIR/lib/libtds.a"; then
+-     AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/lib/libtds.a)
++  if test ! -r "$FREETDS_INSTALLATION_DIR/lib/libtds.so"; then
++     AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/lib/libtds.so)
+   fi
+ 
+   MSSQL_INCDIR=$FREETDS_INSTALLATION_DIR/include

diff --git a/php-ncurses.patch b/php-ncurses.patch
new file mode 100644 (file)
index 0000000..bb50f8d
--- /dev/null
+++ b/php-ncurses.patch
@@ -0,0 +1,78 @@
+diff -urN php-4.3.4RC2.orig/ext/ncurses/config.m4 php-4.3.4RC2/ext/ncurses/config.m4
+--- php-4.3.4RC2.orig/ext/ncurses/config.m4    2003-10-22 11:15:33.000000000 +0200
++++ php-4.3.4RC2/ext/ncurses/config.m4 2003-10-22 13:11:00.000000000 +0200
+@@ -11,24 +11,29 @@
+ 
+    for i in $SEARCH_PATH ; do
+      if test -d $i/include; then
++       NCURSES_DIR=$i
+        if test -r $i/include/ncurses.h; then
+-         NCURSES_DIR=$i
++       NCURSES_INC=$i/include
++         AC_DEFINE(HAVE_NCURSES_H,1,[ ])
++         break
++       elif test -r $i/include/ncurses/ncurses.h; then
++       NCURSES_INC=$i/include/ncurses;
+          AC_DEFINE(HAVE_NCURSES_H,1,[ ])
+          break
+        elif test -r $i/include/curses.h; then
+-         NCURSES_DIR=$i
++         NCURSES_INC=$i/include
+          break
+        fi
+      fi
+    done
+   
+-   if test -z "$NCURSES_DIR"; then
++   if test -z "$NCURSES_INC"; then
+      AC_MSG_RESULT(not found)
+      AC_MSG_ERROR(Please reinstall the ncurses distribution)
+    fi
+ 
+    # --with-ncurses -> add include path
+-   PHP_ADD_INCLUDE($NCURSES_DIR/include)
++   PHP_ADD_INCLUDE($NCURSES_INC)
+ 
+    # --with-ncurses -> chech for lib and symbol presence
+    LIBNAME=ncurses 
+diff -urN php-4.3.4RC2.orig/ext/readline/config.m4 php-4.3.4RC2/ext/readline/config.m4
+--- php-4.3.4RC2.orig/ext/readline/config.m4   2003-10-22 11:15:34.000000000 +0200
++++ php-4.3.4RC2/ext/readline/config.m4        2003-10-22 13:12:04.000000000 +0200
+@@ -19,6 +19,10 @@
+ 
+   PHP_ADD_INCLUDE($READLINE_DIR/include)
+ 
++  AC_CHECK_LIB(tinfo, tgetent,
++  [
++    PHP_ADD_LIBRARY(tinfo,,READLINE_SHARED_LIBADD)
++  ],[
+   AC_CHECK_LIB(ncurses, tgetent,
+   [
+     PHP_ADD_LIBRARY(ncurses,,READLINE_SHARED_LIBADD)
+@@ -28,6 +32,7 @@
+       PHP_ADD_LIBRARY(termcap,,READLINE_SHARED_LIBADD)
+     ])
+   ])
++  ])
+ 
+   PHP_CHECK_LIBRARY(readline, readline,
+   [
+@@ -63,6 +68,10 @@
+ 
+   PHP_ADD_INCLUDE($LIBEDIT_DIR/include)
+ 
++  AC_CHECK_LIB(tinfo, tgetent,
++  [
++    PHP_ADD_LIBRARY(tinfo,,READLINE_SHARED_LIBADD)
++  ],[
+   AC_CHECK_LIB(ncurses, tgetent,
+   [
+     PHP_ADD_LIBRARY(ncurses,,READLINE_SHARED_LIBADD)
+@@ -72,6 +81,7 @@
+       PHP_ADD_LIBRARY(termcap,,READLINE_SHARED_LIBADD)
+     ])
+   ])
++  ])
+ 
+   PHP_CHECK_LIBRARY(edit, readline,
+   [

diff --git a/php-phpize.patch b/php-phpize.patch
new file mode 100644 (file)
index 0000000..88bb5a3
--- /dev/null
+++ b/php-phpize.patch
@@ -0,0 +1,17 @@
+--- php-5.0.0/scripts/phpize.m4~       2003-09-03 08:08:12.000000000 +0000
++++ php-5.0.0/scripts/phpize.m4        2004-08-07 19:08:40.369661968 +0000
+@@ -29,10 +29,10 @@
+   AC_MSG_RESULT($EXTENSION_DIR)
+ ])
+ dnl
+-AC_DEFUN(PHP_EXT_BUILDDIR,[.])dnl
+-AC_DEFUN(PHP_EXT_DIR,[""])dnl
+-AC_DEFUN(PHP_EXT_SRCDIR,[$abs_srcdir])dnl
+-AC_DEFUN(PHP_ALWAYS_SHARED,[
++AC_DEFUN([PHP_EXT_BUILDDIR],[.])dnl
++AC_DEFUN([PHP_EXT_DIR],[""])dnl
++AC_DEFUN([PHP_EXT_SRCDIR],[$abs_srcdir])dnl
++AC_DEFUN([PHP_ALWAYS_SHARED],[
+   ext_output="yes, shared"
+   ext_shared=yes
+   test "[$]$1" = "no" && $1=yes

diff --git a/php-pldlogo.patch b/php-pldlogo.patch
new file mode 100644 (file)
index 0000000..2b67aac
--- /dev/null
+++ b/php-pldlogo.patch
@@ -0,0 +1,176 @@
+--- php-4.3.3RC3/ext/standard/info.c.orig      2003-06-19 18:43:41.000000000 +0200
++++ php-4.3.3RC3/ext/standard/info.c   2003-08-16 21:37:18.705836072 +0200
+@@ -518,6 +518,21 @@
+               PUTS(!sapi_module.phpinfo_as_text?"<br />":"\n");
+               PUTS(zend_version);
+               php_info_print_box_end();
++              /* PLD Linux */
++              php_info_print_box_start(0);
++              if (expose_php && !sapi_module.phpinfo_as_text) {
++                      PUTS("<a href=\"http://www.pld-linux.org/\"><img src=\"");
++                      if (SG(request_info).request_uri) {
++                              PUTS(SG(request_info).request_uri);
++                      }
++                      PUTS("?="PLD_LOGO_GUID"\" border=\"0\" align=\"right\" alt=\"PLD logo\"></a>\n");
++              }
++              PUTS("This server is using PLD Linux.");
++              if (!sapi_module.phpinfo_as_text)
++                      PUTS("<br />More information at <a href=\"http://www.pld-linux.org/\">http://www.pld-linux.org/</a>.<br />\n");
++              else
++                      PUTS("\nMore information at http://www.pld-linux.org/.\n");
++              php_info_print_box_end();
+               efree(php_uname);
+       }
+ 
+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"
+ #define PHP_CREDITS_GUID  "PHPB8B5F2A0-3C92-11d3-A3A9-4C7B08C10000"
++#define PLD_LOGO_GUID "PHPE9568F40-D428-11d2-A769-00AA001ACF42"
+ 
+ PHP_FUNCTION(phpversion);
+ PHP_FUNCTION(phpinfo);
+--- php-4.3.0.org/main/logos.h Sat May 11 20:49:24 2002
++++ php-4.3.0/main/logos.h     Sat May 11 20:50:32 2002
+@@ -1503,1 +1503,127 @@
+       249, 249, 207, 233,   5,   4,   0,  59 };
++
++
++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,
++       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 -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));
+ 
+       return SUCCESS;
+ }

diff --git a/php-qt.patch b/php-qt.patch
new file mode 100644 (file)
index 0000000..aaf9471
--- /dev/null
+++ b/php-qt.patch
@@ -0,0 +1,21 @@
+--- php-4.3.3RC3/ext/qtdom/config.m4~  2002-11-18 06:06:37.000000000 +0100
++++ php-4.3.3RC3/ext/qtdom/config.m4   2003-08-17 11:40:07.000000000 +0200
+@@ -11,6 +11,9 @@
+       if test -f $QTDIR/include/qdom.h; then
+         QTDOM_LIBDIR=$QTDIR/lib
+         QTDOM_INCDIR=$QTDIR/include
++      elif test -f /usr/include/qt/qdom.h; then
++        QTDOM_LIBDIR=/usr/lib
++        QTDOM_INCDIR=/usr/include/qt
+       elif test -f /usr/lib/qt2/include/qdom.h; then
+         QTDOM_LIBDIR=/usr/lib
+         QTDOM_INCDIR=/usr/lib/qt2/include
+@@ -28,7 +31,7 @@
+     AC_MSG_ERROR([qdom.h not found.])
+   fi
+ 
+-  PHP_ADD_LIBRARY_WITH_PATH(qt, $QTDOM_LIBDIR, QTDOM_SHARED_LIBADD)
++  PHP_ADD_LIBRARY_WITH_PATH(qt-mt, $QTDOM_LIBDIR, QTDOM_SHARED_LIBADD)
+   PHP_ADD_INCLUDE($QTDOM_INCDIR)
+   PHP_NEW_EXTENSION(qtdom, qtdom.c qtdom_qt.cpp, $ext_shared)
+   PHP_SUBST(QTDOM_SHARED_LIBADD)

diff --git a/php-wddx-fix.patch b/php-wddx-fix.patch
new file mode 100644 (file)
index 0000000..6757b0c
--- /dev/null
+++ b/php-wddx-fix.patch
@@ -0,0 +1,9 @@
+--- php-4.3.0/ext/wddx/config.m4.orig  Tue Mar 12 17:37:42 2002
++++ php-4.3.0/ext/wddx/config.m4       Thu Jan  2 21:00:50 2003
+@@ -12,4 +12,6 @@
+   fi
+   AC_DEFINE(HAVE_WDDX, 1, [ ])
+   PHP_NEW_EXTENSION(wddx, wddx.c, $ext_shared)
++  WDDX_SHARED_LIBADD="-lexpat"
++  PHP_SUBST(WDDX_SHARED_LIBADD)
+ fi

diff --git a/php-xml-expat-fix.patch b/php-xml-expat-fix.patch
new file mode 100644 (file)
index 0000000..41c4088
--- /dev/null
+++ b/php-xml-expat-fix.patch
@@ -0,0 +1,11 @@
+--- php-4.3.0/ext/xml/config.m4.orig   Thu Nov  7 20:31:08 2002
++++ php-4.3.0/ext/xml/config.m4        Thu Jan  2 19:54:39 2003
+@@ -27,7 +27,7 @@
+   else
+     PHP_NEW_EXTENSION(xml, xml.c, $ext_shared)
+ 
+-    for i in $PHP_XML $PHP_EXPAT_DIR; do
++    for i in /usr /usr/local $PHP_XML `echo $PHP_EXPAT_DIR | sed -e s/shared,//` ; do
+       if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME ; then
+         EXPAT_DIR=$i
+       fi

diff --git a/php-xslt-gcc33.patch b/php-xslt-gcc33.patch
new file mode 100644 (file)
index 0000000..c09e2db
--- /dev/null
+++ b/php-xslt-gcc33.patch
@@ -0,0 +1,11 @@
+--- php-4.3.2/ext/xslt/config.m4.orig  Wed Apr 23 08:55:00 2003
++++ php-4.3.2/ext/xslt/config.m4       Fri Jun 13 13:08:17 2003
+@@ -66,7 +66,7 @@
+        SABINF_CFLAGS=`$XSLT_DIR/bin/sablot-config --cflags`
+        SABINF_LIBS=`$XSLT_DIR/bin/sablot-config --libs`
+        SABINF_PREFIX=`$XSLT_DIR/bin/sablot-config --prefix`
+-       SABINF_ALL="\"Cflags: $SABINF_CFLAGS\nLibs: $SABINF_LIBS\nPrefix: $SABINF_PREFIX\""
++       SABINF_ALL="\"Cflags: $SABINF_CFLAGS\\\\nLibs: $SABINF_LIBS\\\\nPrefix: $SABINF_PREFIX\""
+        PHP_DEFINE(SAB_INFO, "$SABINF_ALL")
+     else
+        AC_MSG_RESULT(not found)

diff --git a/php-zlib.patch b/php-zlib.patch
new file mode 100644 (file)
index 0000000..1ee4b30
--- /dev/null
+++ b/php-zlib.patch
@@ -0,0 +1,15 @@
+diff -burN php-5.0.0b3/ext/zlib/zlib.c php-5.0.0b3-zlib/ext/zlib/zlib.c
+--- php-5.0.0b3/ext/zlib/zlib.c        2003-09-26 10:09:53.000000000 +0200
++++ php-5.0.0b3-zlib/ext/zlib/zlib.c   2003-12-27 00:40:53.000000000 +0100
+@@ -979,6 +979,11 @@
+ 
+       if (ZLIBG(output_handler) && strlen(ZLIBG(output_handler))) {
+               php_start_ob_buffer_named(ZLIBG(output_handler), 0, 1 TSRMLS_CC);
++              if (sapi_add_header("Content-Encoding: gzip", sizeof("Content-Encoding: gzip") - 1        , 1)!=FAILURE) {
++                      if (sapi_add_header("Vary: Accept-Encoding", sizeof("Vary: Accept-Encoding") - 1, 1)==FAILURE) {
++                              SG(sapi_headers).send_default_content_type = 0;
++                      }
++              }
+       }
+       return SUCCESS;
+ }