From 84a065293c82e475378811eb98b5345e5ffaeb04 Mon Sep 17 00:00:00 2001 From: cvs2git Date: Sun, 26 Dec 2004 15:35:19 +0000 Subject: [PATCH] This commit was manufactured by cvs2git to create branch 'RA- branch_general'. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Cherrypick from master 2004-06-09 23:38:45 UTC hawk '- cleanup': php-allow-db31.patch -> 1.1 php-cpdf-fix.patch -> 1.6 php-db-shared.patch -> 1.1 php-ini.patch -> 1.9 php-java-norpath.patch -> 1.2 php-lib64.patch -> 1.2 php-libpq_fs_h_path.patch -> 1.4 php-mail.patch -> 1.10 php-mnogosearch-fix.patch -> 1.2 php-mod_php.conf -> 1.4 php-mssql-fix.patch -> 1.1 php-no-metaccld.patch -> 1.1 php-no_pear_install.patch -> 1.2 php-pldlogo.patch -> 1.29 php-qt.patch -> 1.2 php-session-unregister.patch -> 1.2 php-shared.patch -> 1.12 php-sybase-fix.patch -> 1.3 php-threads-acfix.patch -> 1.2 php-xslt-gcc33.patch -> 1.1 php-zlib.patch -> 1.2 Cherrypick from master 2003-12-16 22:43:16 UTC Jakub Bogusz '- prefer db-4.2': php-db42.patch -> 1.1 php-ncurses.patch -> 1.2 php-phpize_fixes.patch -> 1.1 Cherrypick from master 2004-08-12 13:16:03 UTC Paweł Gołaszewski '- temporary, but not fully working... :-/': php-cgi-fcgi.ini -> 1.1 php-gd_imagerotate_enable.patch -> 1.1 Cherrypick from master 2004-12-26 15:35:19 UTC Jakub Bogusz '- use standard header for int32_t/uint32_t': php-uint32_t.patch -> 1.2 --- php-allow-db31.patch | 18 + php-cgi-fcgi.ini | 14 + php-cpdf-fix.patch | 12 + php-db-shared.patch | 40 ++ php-db42.patch | 11 + php-gd_imagerotate_enable.patch | 53 +++ php-ini.patch | 183 ++++++++++ php-java-norpath.patch | 42 +++ php-lib64.patch | 623 ++++++++++++++++++++++++++++++++ php-libpq_fs_h_path.patch | 11 + php-mail.patch | 66 ++++ php-mnogosearch-fix.patch | 15 + php-mod_php.conf | 9 + php-mssql-fix.patch | 13 + php-ncurses.patch | 78 ++++ php-no-metaccld.patch | 31 ++ php-no_pear_install.patch | 12 + php-phpize_fixes.patch | 30 ++ php-pldlogo.patch | 176 +++++++++ php-qt.patch | 21 ++ php-session-unregister.patch | 69 ++++ php-shared.patch | 75 ++++ php-sybase-fix.patch | 10 + php-threads-acfix.patch | 57 +++ php-uint32_t.patch | 12 + php-xslt-gcc33.patch | 11 + php-zlib.patch | 23 ++ 27 files changed, 1715 insertions(+) create mode 100644 php-allow-db31.patch create mode 100644 php-cgi-fcgi.ini create mode 100644 php-cpdf-fix.patch create mode 100644 php-db-shared.patch create mode 100644 php-db42.patch create mode 100644 php-gd_imagerotate_enable.patch create mode 100644 php-ini.patch create mode 100644 php-java-norpath.patch create mode 100644 php-lib64.patch create mode 100644 php-libpq_fs_h_path.patch create mode 100644 php-mail.patch create mode 100644 php-mnogosearch-fix.patch create mode 100644 php-mod_php.conf create mode 100644 php-mssql-fix.patch create mode 100644 php-ncurses.patch create mode 100644 php-no-metaccld.patch create mode 100644 php-no_pear_install.patch create mode 100644 php-phpize_fixes.patch create mode 100644 php-pldlogo.patch create mode 100644 php-qt.patch create mode 100644 php-session-unregister.patch create mode 100644 php-shared.patch create mode 100644 php-sybase-fix.patch create mode 100644 php-threads-acfix.patch create mode 100644 php-uint32_t.patch create mode 100644 php-xslt-gcc33.patch create mode 100644 php-zlib.patch diff --git a/php-allow-db31.patch b/php-allow-db31.patch new file mode 100644 index 0000000..e7fdac5 --- /dev/null +++ b/php-allow-db31.patch @@ -0,0 +1,18 @@ +--- php-4.3.2/ext/dba/config.m4.orig Wed May 21 02:35:29 2003 ++++ php-4.3.2/ext/dba/config.m4 Mon Jun 23 11:53:32 2003 +@@ -176,13 +176,13 @@ + AC_MSG_CHECKING(if db can be used as shared extension) + AC_EGREP_CPP(yes,[ + #include "$THIS_INCLUDE" +-#if DB_VERSION_MAJOR > 3 || (DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR > 2) ++#if DB_VERSION_MAJOR > 3 || (DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR > 0) + yes + #endif + ],[ + AC_MSG_RESULT(yes) + ],[ +- AC_MSG_ERROR(At least version 3.3 is required) ++ AC_MSG_ERROR(At least version 3.1 is required) + ]) + fi + if test -n "$THIS_LIBS"; then diff --git a/php-cgi-fcgi.ini b/php-cgi-fcgi.ini new file mode 100644 index 0000000..1953edd --- /dev/null +++ b/php-cgi-fcgi.ini @@ -0,0 +1,14 @@ +; php-cgi-fcgi.ini - configuration used only for cgi-fcgi 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 = /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 index 0000000..6808681 --- /dev/null +++ b/php-cpdf-fix.patch @@ -0,0 +1,12 @@ +--- php-4.3.3RC3/ext/cpdf/config.m4.orig 2003-06-26 20:06:46.000000000 +0200 ++++ php-4.3.3RC3/ext/cpdf/config.m4 2003-08-16 16:03:49.062764192 +0200 +@@ -53,7 +53,8 @@ + PHP_WITH_SHARED + if test "$withval" != "no"; then + cpdf_withval=$withval +- PHP_NEW_EXTENSION(cpdf, cpdf.c, $ext_shared,, \\$(GDLIB_CFLAGS)) ++ PHP_NEW_EXTENSION(cpdf, cpdf.c, $shared,, \\$(GDLIB_CFLAGS)) ++ ext_shared=$shared + PHP_SUBST(CPDF_SHARED_LIBADD) + CPDF_JPEG_TEST + CPDF_TIFF_TEST diff --git a/php-db-shared.patch b/php-db-shared.patch new file mode 100644 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 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-gd_imagerotate_enable.patch b/php-gd_imagerotate_enable.patch new file mode 100644 index 0000000..f6533eb --- /dev/null +++ b/php-gd_imagerotate_enable.patch @@ -0,0 +1,53 @@ +--- ./ext/gd/gd.c.org Fri May 21 01:38:05 2004 ++++ ./ext/gd/gd.c Thu Aug 12 14:48:38 2004 +@@ -162,8 +162,8 @@ + PHP_FE(imagecopyresampled, NULL) + #endif + +-#ifdef HAVE_GD_BUNDLED + PHP_FE(imagerotate, NULL) ++#ifdef HAVE_GD_BUNDLED + PHP_FE(imageantialias, NULL) + #endif + +@@ -361,11 +361,11 @@ + #ifdef GD2_FMT_COMPRESSED + REGISTER_LONG_CONSTANT("IMG_GD2_COMPRESSED", GD2_FMT_COMPRESSED, CONST_CS | CONST_PERSISTENT); + #endif +-#if HAVE_GD_BUNDLED + REGISTER_LONG_CONSTANT("IMG_EFFECT_REPLACE", gdEffectReplace, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("IMG_EFFECT_ALPHABLEND", gdEffectAlphaBlend, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("IMG_EFFECT_NORMAL", gdEffectNormal, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("IMG_EFFECT_OVERLAY", gdEffectOverlay, CONST_CS | CONST_PERSISTENT); ++#if HAVE_GD_BUNDLED + REGISTER_LONG_CONSTANT("GD_BUNDLED", 1, CONST_CS | CONST_PERSISTENT); + #else + REGISTER_LONG_CONSTANT("GD_BUNDLED", 0, CONST_CS | CONST_PERSISTENT); +@@ -1088,7 +1088,6 @@ + /* }}} */ + #endif + +-#ifdef HAVE_GD_BUNDLED + /* {{{ proto int imagerotate(int src_im, float angle, int bgdcolor) + Rotate an image using a custom angle */ + PHP_FUNCTION(imagerotate) +@@ -1118,7 +1117,6 @@ + } + } + /* }}} */ +-#endif + + #if HAVE_GD_IMAGESETTILE + /* {{{ proto int imagesettile(resource image, resource tile) +--- ./ext/gd/php_gd.h.org Mon Mar 31 10:49:30 2003 ++++ ./ext/gd/php_gd.h Thu Aug 12 14:46:23 2004 +@@ -103,8 +103,8 @@ + PHP_FUNCTION(imagecopyresampled); + #endif + +-#ifdef HAVE_GD_BUNDLED + PHP_FUNCTION(imagerotate); ++#ifdef HAVE_GD_BUNDLED + PHP_FUNCTION(imageantialias); + #endif + diff --git a/php-ini.patch b/php-ini.patch new file mode 100644 index 0000000..958b48d --- /dev/null +++ b/php-ini.patch @@ -0,0 +1,183 @@ +--- php-4.3.0/php.ini-dist Thu Dec 26 14:27:08 2002 ++++ php-4.3.0/php.ini Sat Jan 4 21:01:55 2003 +@@ -3,12 +3,18 @@ + ;;;;;;;;;;; + ; WARNING ; + ;;;;;;;;;;; +-; This is the default settings file for new PHP installations. +-; By default, PHP installs itself with a configuration suitable for +-; development purposes, and *NOT* for production purposes. +-; For several security-oriented considerations that should be taken +-; before going online with your site, please consult php.ini-recommended +-; and http://php.net/manual/en/security.php. ++; This is the default settings file for new PHP installations from ++; PLD Linux Distribution. ++; It's based mainly on php.ini-dist, but with some changes made with ++; security in mind (see below, consult also ++; http://php.net/manual/en/security.php). ++; ++; Please note, that in PLD installations, /etc/php/php.ini file ++; contains GLOBAL settings for all SAPIs (cgi, cli, apache...), ++; and after reading this file, SAPI-specific file (/etc/php/php-cgi.ini, ++; /etc/php/php-cli.ini, /etc/php/php-apache.ini...) is INCLUDED ++; (so you don't need to duplicate whole large file to override only ++; few options). + + + ;;;;;;;;;;;;;;;;;;; +@@ -54,12 +60,70 @@ + ; If you use constants in your value, and these constants belong to a + ; dynamically loaded extension (either a PHP extension or a Zend extension), + ; you may only use these constants *after* the line that loads the extension. +-; +-; All the values in the php.ini-dist file correspond to the builtin +-; defaults (that is, if no php.ini is used, or if you delete these lines, +-; the builtin defaults will be identical). + + ++; Below is the list of settings changed from default as specified in ++; php.ini-recommended. These settings make PHP more secure and encourage ++; cleaner coding. ++; The price is that with these settings, PHP may be incompatible with some old ++; or bad-written applications, and sometimes, more difficult to develop with. ++; Using this settings is warmly recommended for production sites. As all of ++; the changes from the standard settings are thoroughly documented, you can ++; go over each one, and decide whether you want to use it or not. ++; ++; - register_globals = Off [Security, Performance] ++; Global variables are no longer registered for input data (POST, GET, cookies, ++; environment and other server variables). Instead of using $foo, you must use ++; you can use $_REQUEST["foo"] (includes any variable that arrives through the ++; request, namely, POST, GET and cookie variables), or use one of the specific ++; $_GET["foo"], $_POST["foo"], $_COOKIE["foo"] or $_FILES["foo"], depending ++; on where the input originates. Also, you can look at the ++; import_request_variables() function. ++; Note that register_globals = Off is the default setting since PHP 4.2.0. ++; - display_errors = Off [Security] ++; With this directive set to off, errors that occur during the execution of ++; scripts will no longer be displayed as a part of the script output, and thus, ++; will no longer be exposed to remote users. With some errors, the error message ++; content may expose information about your script, web server, or database ++; server that may be exploitable for hacking. Production sites should have this ++; directive set to off. ++; - log_errors = On [Security] ++; This directive complements the above one. Any errors that occur during the ++; execution of your script will be logged (typically, to your server's error log, ++; but can be configured in several ways). Along with setting display_errors to off, ++; this setup gives you the ability to fully understand what may have gone wrong, ++; without exposing any sensitive information to remote users. ++; - error_reporting = E_ALL [Code Cleanliness, Security(?)] ++; By default, PHP surpresses errors of type E_NOTICE. These error messages ++; are emitted for non-critical errors, but that could be a symptom of a bigger ++; problem. Most notably, this will cause error messages about the use ++; of uninitialized variables to be displayed. ++ ++; For completeness, below is list of the rest of changes recommended for ++; performance, but NOT applied in default php.ini in PLD (since they are ++; not needed for security or may cause problems with some applications ++; more likely than above). ++ ++; - output_buffering = 4096 [Performance] ++; Set a 4KB output buffer. Enabling output buffering typically results in less ++; writes, and sometimes less packets sent on the wire, which can often lead to ++; better performance. The gain this directive actually yields greatly depends ++; on which Web server you're working with, and what kind of scripts you're using. ++; - register_argc_argv = Off [Performance] ++; Disables registration of the somewhat redundant $argv and $argc global ++; variables. ++; - magic_quotes_gpc = Off [Performance] ++; Input data is no longer escaped with slashes so that it can be sent into ++; SQL databases without further manipulation. Instead, you should use the ++; function addslashes() on each input element you wish to send to a database. ++; - variables_order = "GPCS" [Performance] ++; The environment variables are not hashed into the $HTTP_ENV_VARS[]. To access ++; environment variables, you can use getenv() instead. ++; - allow_call_time_pass_reference = Off [Code cleanliness] ++; It's not possible to decide to force a variable to be passed by reference ++; when calling a function. The PHP 4 style to do this is by making the ++; function require the relevant argument by reference. ++ + ;;;;;;;;;;;;;;;;;;;; + ; Language Options ; + ;;;;;;;;;;;;;;;;;;;; +@@ -79,7 +143,7 @@ + asp_tags = Off + + ; The number of significant digits displayed in floating point numbers. +-precision = 12 ++precision = 14 + + ; Enforce year 2000 compliance (will cause problems with non-compliant browsers) + y2k_compliance = On +@@ -255,16 +319,16 @@ + ; + ;error_reporting = E_COMPILE_ERROR|E_ERROR|E_CORE_ERROR + ; +-; - Show all errors except for notices ++; - Show all errors + ; +-error_reporting = E_ALL & ~E_NOTICE ++error_reporting = E_ALL + + ; Print out errors (as a part of the output). For production web sites, + ; you're strongly encouraged to turn this feature off, and use error logging + ; instead (see below). Keeping display_errors enabled on a production web site + ; may reveal security information to end users, such as file paths on your Web + ; server, your database schema or other information. +-display_errors = On ++display_errors = Off + + ; Even when display_errors is on, errors that occur during PHP's startup + ; sequence are not displayed. It's strongly recommended to keep +@@ -274,7 +338,7 @@ + ; Log errors into a log file (server-specific log, stderr, or error_log (below)) + ; As stated above, you're strongly advised to use error logging in place of + ; error displaying on production web sites. +-log_errors = Off ++log_errors = On + + ; Set maximum length of log_errors. In error_log information about the source is + ; added. The default is 1024 and 0 allows to not apply any maximum length at all. +@@ -420,7 +484,7 @@ + user_dir = + + ; Directory in which the loadable extensions (modules) reside. +-extension_dir = "./" ++extension_dir = "/usr/lib/php" + + ; 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 +@@ -587,10 +651,10 @@ + ;sendmail_path = + + [Java] +-;java.class.path = .\php_java.jar +-;java.home = c:\jdk +-;java.library = c:\jdk\jre\bin\hotspot\jvm.dll +-;java.library.path = .\ ++java.class.path = /usr/lib/php/php_java.jar ++;java.home = /usr/lib/java ++;java.library = /usr/lib/java/jre/lib/i386/libjava.so ++java.library.path = /usr/lib/php + + [SQL] + sql.safe_mode = Off +@@ -685,6 +749,7 @@ + pgsql.max_links = -1 + + ; Ignore PostgreSQL backends Notice message or not. ++; Notice message logging require a little overheads. + pgsql.ignore_notice = 0 + + ; Log PostgreSQL backends Noitce message or not. +@@ -804,7 +869,9 @@ + ; You can use the script in the ext/session dir for that purpose. + ; NOTE 2: See the section on garbage collection below if you choose to + ; use subdirectories for session storage +-;session.save_path = /tmp ++; NOTE 3: you may need to override this setting for cli or cgi SAPIs, ++; to allow running them as user other than http ++session.save_path = /var/run/php + + ; Whether to use cookies. + session.use_cookies = 1 diff --git a/php-java-norpath.patch b/php-java-norpath.patch new file mode 100644 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-lib64.patch b/php-lib64.patch new file mode 100644 index 0000000..014fdcd --- /dev/null +++ b/php-lib64.patch @@ -0,0 +1,623 @@ +diff -durN -x '*~' -x '*.orig' php-4.3.5.orig/acinclude.m4 php-4.3.5/acinclude.m4 +--- php-4.3.5.orig/acinclude.m4 2004-04-14 11:29:51.000000000 +0200 ++++ php-4.3.5/acinclude.m4 2004-04-14 11:42:40.000000000 +0200 +@@ -1629,6 +1629,9 @@ + if test -r $i/lib/libssl.a -o -r $i/lib/libssl.$SHLIB_SUFFIX_NAME; then + OPENSSL_LIBDIR=$i/lib + fi ++ if test -r $i/lib64/libssl.a -o -r $i/lib64/libssl.$SHLIB_SUFFIX_NAME; then ++ OPENSSL_LIBDIR=$i/lib64 ++ fi + test -n "$OPENSSL_INCDIR" && test -n "$OPENSSL_LIBDIR" && break + done + +diff -durN -x '*~' -x '*.orig' php-4.3.5.orig/ext/cpdf/config.m4 php-4.3.5/ext/cpdf/config.m4 +--- php-4.3.5.orig/ext/cpdf/config.m4 2004-04-14 11:29:51.000000000 +0200 ++++ php-4.3.5/ext/cpdf/config.m4 2004-04-14 11:41:13.000000000 +0200 +@@ -4,7 +4,7 @@ + AC_ARG_WITH(jpeg-dir, + [ --with-jpeg-dir[=DIR] CPDF: Set the path to libjpeg install prefix.],[ + for i in $withval /usr/local /usr; do +- if test -f "$i/lib/libjpeg.$SHLIB_SUFFIX_NAME" -o -f "$i/lib/libjpeg.a"; then ++ if test -f "$i/lib64/libjpeg.$SHLIB_SUFFIX_NAME" -o -f "$i/lib64/libjpeg.a"; then + CPDF_JPEG_DIR=$i + break; + fi +@@ -14,11 +14,11 @@ + AC_MSG_ERROR([libjpeg.(a|so) not found.]) + fi + PHP_CHECK_LIBRARY(jpeg, jpeg_read_header, [ +- PHP_ADD_LIBRARY_WITH_PATH(jpeg, $CPDF_JPEG_DIR/lib, CPDF_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(jpeg, $CPDF_JPEG_DIR/lib64, CPDF_SHARED_LIBADD) + ] ,[ + AC_MSG_ERROR([CPDF: Problem with libjpeg.(a|so). Please check config.log for more information.]) + ], [ +- -L$CPDF_JPEG_DIR/lib ++ -L$CPDF_JPEG_DIR/lib64 + ]) + ],) + ]) +@@ -27,7 +27,7 @@ + AC_ARG_WITH(tiff-dir, + [ --with-tiff-dir[=DIR] CPDF: Set the path to libtiff install prefix.],[ + for i in $withval /usr/local /usr; do +- if test -f "$i/lib/libtiff.$SHLIB_SUFFIX_NAME" -o -f "$i/lib/libtiff.a"; then ++ if test -f "$i/lib64/libtiff.$SHLIB_SUFFIX_NAME" -o -f "$i/lib64/libtiff.a"; then + CPDF_TIFF_DIR=$i + break; + fi +@@ -37,11 +37,11 @@ + AC_MSG_ERROR([libtiff.(a|so) not found.]) + fi + PHP_CHECK_LIBRARY(tiff, TIFFOpen, [ +- PHP_ADD_LIBRARY_WITH_PATH(tiff, $CPDF_TIFF_DIR/lib, CPDF_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(tiff, $CPDF_TIFF_DIR/lib64, CPDF_SHARED_LIBADD) + ] ,[ + AC_MSG_ERROR([CPDF: Problem with libtiff.(a|so). Please check config.log for more information.]) + ], [ +- -L$CPDF_TIFF_DIR/lib ++ -L$CPDF_TIFF_DIR/lib64 + ]) + ],) + ]) +@@ -67,12 +67,12 @@ + + PHP_CHECK_LIBRARY(cpdf, cpdf_open, [ + PHP_ADD_INCLUDE($CPDFLIB_INCLUDE) +- PHP_ADD_LIBRARY_WITH_PATH(cpdf, $i/lib, CPDF_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(cpdf, $i/lib64, CPDF_SHARED_LIBADD) + AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib]) + ], [ + AC_MSG_ERROR([Cpdflib module requires cpdflib >= 2.]) + ], [ +- -L$i/lib $CPDF_SHARED_LIBADD ++ -L$i/lib64 $CPDF_SHARED_LIBADD + ]) + break + fi +diff -durN -x '*~' -x '*.orig' php-4.3.5.orig/ext/crack/config.m4 php-4.3.5/ext/crack/config.m4 +--- php-4.3.5.orig/ext/crack/config.m4 2004-04-14 11:29:51.000000000 +0200 ++++ php-4.3.5/ext/crack/config.m4 2004-04-14 11:41:13.000000000 +0200 +@@ -7,7 +7,7 @@ + + if test "$PHP_CRACK" != "no"; then + +- for i in $PHP_CRACK/lib $PHP_CRACK/cracklib /usr/local/lib /usr/lib; do ++ for i in $PHP_CRACK/lib64 $PHP_CRACK/cracklib /usr/local/lib64 /usr/lib64; do + test -f $i/libcrack.$SHLIB_SUFFIX_NAME -o -f $i/libcrack.a && CRACK_LIBDIR=$i && break + done + +diff -durN -x '*~' -x '*.orig' php-4.3.5.orig/ext/dba/config.m4 php-4.3.5/ext/dba/config.m4 +--- php-4.3.5.orig/ext/dba/config.m4 2004-04-14 11:29:51.000000000 +0200 ++++ php-4.3.5/ext/dba/config.m4 2004-04-14 11:41:13.000000000 +0200 +@@ -18,7 +18,7 @@ + dnl Assign INCLUDE/LFLAGS from PREFIX + AC_DEFUN(PHP_DBA_STD_ASSIGN,[ + if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then +- THIS_LFLAGS=$THIS_PREFIX/lib ++ THIS_LFLAGS=$THIS_PREFIX/lib64 + fi + ]) + +@@ -83,7 +83,7 @@ + AC_DEFINE_UNQUOTED(GDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ]) + AC_DEFINE(DBA_GDBM, 1, [ ]) + THIS_LIBS=gdbm +- ], [], [-L$THIS_PREFIX/lib]) ++ ], [], [-L$THIS_PREFIX/lib64]) + fi + + PHP_DBA_STD_ASSIGN +@@ -115,7 +115,7 @@ + AC_DEFINE_UNQUOTED(NDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ]) + AC_DEFINE(DBA_NDBM, 1, [ ]) + THIS_LIBS=$LIB +- ], [], [-L$THIS_PREFIX/lib]) ++ ], [], [-L$THIS_PREFIX/lib64]) + if test -n "$THIS_LIBS"; then + break + fi +@@ -133,8 +133,8 @@ + dnl parameters(version, library list, function) + AC_DEFUN(PHP_DBA_DB_CHECK,[ + for LIB in $2; do +- if test -f $THIS_PREFIX/lib/lib$LIB.a -o -f $THIS_PREFIX/lib/lib$LIB.$SHLIB_SUFFIX_NAME; then +- PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib -l$LIB,[ ++ if test -f $THIS_PREFIX/lib64/lib$LIB.a -o -f $THIS_PREFIX/lib64/lib$LIB.$SHLIB_SUFFIX_NAME; then ++ PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib64 -l$LIB,[ + AC_TRY_LINK([ + #include "$THIS_INCLUDE" + ],[ +@@ -326,7 +326,7 @@ + fi + AC_DEFINE(DBA_DBM, 1, [ ]) + THIS_LIBS=$LIB +- ], [], [-L$THIS_PREFIX/lib]) ++ ], [], [-L$THIS_PREFIX/lib64]) + if test -n "$THIS_LIBS"; then + break + fi +@@ -368,7 +368,7 @@ + AC_DEFINE_UNQUOTED(CDB_INCLUDE_FILE, "$THIS_INCLUDE", [ ]) + AC_DEFINE(DBA_CDB, 1, [ ]) + THIS_LIBS=$LIB +- ], [], [-L$THIS_PREFIX/lib]) ++ ], [], [-L$THIS_PREFIX/lib64]) + if test -n "$THIS_LIBS"; then + break + fi +diff -durN -x '*~' -x '*.orig' php-4.3.5.orig/ext/gd/config.m4 php-4.3.5/ext/gd/config.m4 +--- php-4.3.5.orig/ext/gd/config.m4 2004-04-14 11:29:51.000000000 +0200 ++++ php-4.3.5/ext/gd/config.m4 2004-04-14 11:41:13.000000000 +0200 +@@ -51,7 +51,7 @@ + if test "$PHP_JPEG_DIR" != "no"; then + + for i in $PHP_JPEG_DIR /usr/local /usr; do +- test -f $i/lib/libjpeg.$SHLIB_SUFFIX_NAME -o -f $i/lib/libjpeg.a && GD_JPEG_DIR=$i && break ++ test -f $i/lib64/libjpeg.$SHLIB_SUFFIX_NAME -o -f $i/lib64/libjpeg.a && GD_JPEG_DIR=$i && break + done + + if test -z "$GD_JPEG_DIR"; then +@@ -61,11 +61,11 @@ + PHP_CHECK_LIBRARY(jpeg,jpeg_read_header, + [ + PHP_ADD_INCLUDE($GD_JPEG_DIR/include) +- PHP_ADD_LIBRARY_WITH_PATH(jpeg, $GD_JPEG_DIR/lib, GD_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(jpeg, $GD_JPEG_DIR/lib64, GD_SHARED_LIBADD) + ],[ + AC_MSG_ERROR([Problem with libjpeg.(a|so). Please check config.log for more information.]) + ],[ +- -L$GD_JPEG_DIR/lib ++ -L$GD_JPEG_DIR/lib64 + ]) + else + AC_MSG_RESULT([If configure fails try --with-jpeg-dir=]) +@@ -76,7 +76,7 @@ + if test "$PHP_PNG_DIR" != "no"; then + + for i in $PHP_PNG_DIR /usr/local /usr; do +- test -f $i/lib/libpng.$SHLIB_SUFFIX_NAME -o -f $i/lib/libpng.a && GD_PNG_DIR=$i && break ++ test -f $i/lib64/libpng.$SHLIB_SUFFIX_NAME -o -f $i/lib64/libpng.a && GD_PNG_DIR=$i && break + done + + if test -z "$GD_PNG_DIR"; then +@@ -94,12 +94,12 @@ + PHP_CHECK_LIBRARY(png,png_write_image, + [ + PHP_ADD_INCLUDE($GD_PNG_DIR/include) +- PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, GD_SHARED_LIBADD) +- PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_DIR/lib, GD_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib64, GD_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_DIR/lib64, GD_SHARED_LIBADD) + ],[ + AC_MSG_ERROR([Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information.]) + ],[ +- -L$PHP_ZLIB_DIR/lib -lz -L$GD_PNG_DIR/lib ++ -L$PHP_ZLIB_DIR/lib64 -lz -L$GD_PNG_DIR/lib64 + ]) + + else +@@ -111,7 +111,7 @@ + if test "$PHP_XPM_DIR" != "no"; then + + for i in $PHP_XPM_DIR /usr/local /usr/X11R6 /usr; do +- test -f $i/lib/libXpm.$SHLIB_SUFFIX_NAME -o -f $i/lib/libXpm.a && GD_XPM_DIR=$i && break ++ test -f $i/lib64/libXpm.$SHLIB_SUFFIX_NAME -o -f $i/lib64/libXpm.a && GD_XPM_DIR=$i && break + done + + if test -z "$GD_XPM_DIR"; then +@@ -129,12 +129,12 @@ + PHP_CHECK_LIBRARY(Xpm,XpmFreeXpmImage, + [ + PHP_ADD_INCLUDE($GD_XPM_INC) +- PHP_ADD_LIBRARY_WITH_PATH(Xpm, $GD_XPM_DIR/lib, GD_SHARED_LIBADD) +- PHP_ADD_LIBRARY_WITH_PATH(X11, $GD_XPM_DIR/lib, GD_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(Xpm, $GD_XPM_DIR/lib64, GD_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(X11, $GD_XPM_DIR/lib64, GD_SHARED_LIBADD) + ],[ + AC_MSG_ERROR([Problem with libXpm.(a|so) or libX11.(a|so). Please check config.log for more information.]) + ],[ +- -L$GD_XPM_DIR/lib -lX11 ++ -L$GD_XPM_DIR/lib64 -lX11 + ]) + else + AC_MSG_RESULT(If configure fails try --with-xpm-dir=) +@@ -163,7 +163,7 @@ + fi + if test -n "$TTF_DIR" ; then + AC_DEFINE(HAVE_LIBTTF,1,[ ]) +- PHP_ADD_LIBRARY_WITH_PATH(ttf, $TTF_DIR/lib, GD_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(ttf, $TTF_DIR/lib64, GD_SHARED_LIBADD) + fi + if test -z "$TTF_INC_DIR"; then + TTF_INC_DIR=$TTF_DIR/include +@@ -187,7 +187,7 @@ + done + + if test -n "$FREETYPE2_DIR" ; then +- PHP_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE2_DIR/lib, GD_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE2_DIR/lib64, GD_SHARED_LIBADD) + PHP_ADD_INCLUDE($FREETYPE2_DIR/include) + PHP_ADD_INCLUDE($FREETYPE2_INC_DIR) + AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ]) +@@ -215,11 +215,11 @@ + [ + AC_DEFINE(HAVE_LIBT1,1,[ ]) + PHP_ADD_INCLUDE($GD_T1_DIR/include) +- PHP_ADD_LIBRARY_WITH_PATH(t1, $GD_T1_DIR/lib, GD_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(t1, $GD_T1_DIR/lib64, GD_SHARED_LIBADD) + ],[ + AC_MSG_ERROR([Problem with libt1.(a|so). Please check config.log for more information.]) + ],[ +- -L$GD_T1_DIR/lib ++ -L$GD_T1_DIR/lib64 + ]) + fi + ]) +@@ -359,7 +359,7 @@ + done + + dnl Library path +- for i in lib/gd1.3 lib/gd lib gd1.3 gd ""; do ++ for i in lib64/gd1.3 lib64/gd lib64 gd1.3 gd ""; do + test -f "$PHP_GD/$i/libgd.$SHLIB_SUFFIX_NAME" -o -f "$PHP_GD/$i/libgd.a" && GD_LIB="$PHP_GD/$i" + done + +diff -durN -x '*~' -x '*.orig' php-4.3.5.orig/ext/imap/config.m4 php-4.3.5/ext/imap/config.m4 +--- php-4.3.5.orig/ext/imap/config.m4 2004-04-14 11:29:51.000000000 +0200 ++++ php-4.3.5/ext/imap/config.m4 2004-04-14 11:41:13.000000000 +0200 +@@ -71,7 +71,7 @@ + fi + + for i in $SEARCH_PATHS; do +- if test -f $i/lib/libkrb5.a || test -f $i/lib/libkrb5.$SHLIB_SUFFIX_NAME; then ++ if test -f $i/lib64/libkrb5.a || test -f $i/lib64/libkrb5.$SHLIB_SUFFIX_NAME; then + PHP_KERBEROS_DIR=$i + break + fi +@@ -84,7 +84,7 @@ + ]) + fi + AC_DEFINE(HAVE_IMAP_KRB,1,[ ]) +- PHP_ADD_LIBPATH($PHP_KERBEROS_DIR/lib, IMAP_SHARED_LIBADD) ++ PHP_ADD_LIBPATH($PHP_KERBEROS_DIR/lib64, IMAP_SHARED_LIBADD) + PHP_ADD_LIBRARY(gssapi_krb5, 1, IMAP_SHARED_LIBADD) + PHP_ADD_LIBRARY(krb5, 1, IMAP_SHARED_LIBADD) + PHP_ADD_LIBRARY(k5crypto, 1, IMAP_SHARED_LIBADD) +@@ -116,11 +116,11 @@ + AC_MSG_CHECKING([whether SSL libraries are needed for c-client]) + + if test "$PHP_IMAP_SSL" != "no"; then +- AC_MSG_RESULT([$PHP_IMAP_SSL/lib]) ++ AC_MSG_RESULT([$PHP_IMAP_SSL/lib64]) + AC_DEFINE(HAVE_IMAP_SSL,1,[ ]) + PHP_ADD_LIBRARY_DEFER(ssl, 1, IMAP_SHARED_LIBADD) + PHP_ADD_LIBRARY_DEFER(crypto, 1, IMAP_SHARED_LIBADD) +- PHP_ADD_LIBPATH($PHP_IMAP_SSL/lib, IMAP_SHARED_LIBADD) ++ PHP_ADD_LIBPATH($PHP_IMAP_SSL/lib64, IMAP_SHARED_LIBADD) + else + AC_MSG_RESULT(no) + fi +@@ -178,13 +178,13 @@ + + if test -r "$IMAP_DIR/c-client/c-client.a"; then + ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1 +- elif test -r "$IMAP_DIR/lib/c-client.a"; then +- ln -s "$IMAP_DIR/lib/c-client.a" "$IMAP_DIR/lib/libc-client.a" >/dev/null 2>&1 ++ elif test -r "$IMAP_DIR/lib64/c-client.a"; then ++ ln -s "$IMAP_DIR/lib64/c-client.a" "$IMAP_DIR/lib64/libc-client.a" >/dev/null 2>&1 + fi + + for lib in c-client4 c-client imap; do + IMAP_LIB=$lib +- IMAP_LIB_CHK(lib) ++ IMAP_LIB_CHK(lib64) + IMAP_LIB_CHK(c-client) + done + +diff -durN -x '*~' -x '*.orig' php-4.3.5.orig/ext/ldap/config.m4 php-4.3.5/ext/ldap/config.m4 +--- php-4.3.5.orig/ext/ldap/config.m4 2004-04-14 11:29:51.000000000 +0200 ++++ php-4.3.5/ext/ldap/config.m4 2004-04-14 11:41:13.000000000 +0200 +@@ -6,15 +6,15 @@ + if test -f $1/include/ldap.h; then + LDAP_DIR=$1 + LDAP_INCDIR=$1/include +- LDAP_LIBDIR=$1/lib ++ LDAP_LIBDIR=$1/lib64 + elif test -f $1/include/umich-ldap/ldap.h; then + LDAP_DIR=$1 + LDAP_INCDIR=$1/include/umich-ldap +- LDAP_LIBDIR=$1/lib ++ LDAP_LIBDIR=$1/lib64 + elif test -f $1/ldap/public/ldap.h; then + LDAP_DIR=$1 + LDAP_INCDIR=$1/ldap/public +- LDAP_LIBDIR=$1/lib ++ LDAP_LIBDIR=$1/lib64 + fi + ]) + +diff -durN -x '*~' -x '*.orig' php-4.3.5.orig/ext/mcal/config.m4 php-4.3.5/ext/mcal/config.m4 +--- php-4.3.5.orig/ext/mcal/config.m4 2004-04-14 11:29:51.000000000 +0200 ++++ php-4.3.5/ext/mcal/config.m4 2004-04-14 11:41:13.000000000 +0200 +@@ -19,7 +19,7 @@ + fi + done + +- for i in $MCAL_DIR $MCAL_DIR/mcal $MCAL_DIR/mcal/lib $MCAL_DIR/lib/mcal $MCAL_DIR/lib; do ++ for i in $MCAL_DIR $MCAL_DIR/mcal $MCAL_DIR/mcal/lib64 $MCAL_DIR/lib64/mcal $MCAL_DIR/lib64; do + if test -r "$i/libmcal.so" -o -r "$i/libmcal.a"; then + MCAL_LIBRARY=$i + fi +diff -durN -x '*~' -x '*.orig' php-4.3.5.orig/ext/ming/config.m4 php-4.3.5/ext/ming/config.m4 +--- php-4.3.5.orig/ext/ming/config.m4 2004-04-14 11:29:51.000000000 +0200 ++++ php-4.3.5/ext/ming/config.m4 2004-04-14 11:41:13.000000000 +0200 +@@ -9,7 +9,7 @@ + AC_CHECK_LIB(m, sin) + + for i in $PHP_MING /usr/local /usr; do +- if test -f $i/lib/libming.$SHLIB_SUFFIX_NAME -o -f $i/lib/libming.a; then ++ if test -f $i/lib64/libming.$SHLIB_SUFFIX_NAME -o -f $i/lib64/libming.a; then + MING_DIR=$i + fi + done +@@ -33,11 +33,11 @@ + ],[ + AC_MSG_ERROR([Ming library 0.2a or greater required.]) + ],[ +- -L$MING_DIR/lib ++ -L$MING_DIR/lib64 + ]) + + PHP_ADD_INCLUDE($MING_INC_DIR) +- PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/lib, MING_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/lib64, MING_SHARED_LIBADD) + + AC_MSG_CHECKING([for destroySWFBlock]) + AC_TRY_RUN([ +diff -durN -x '*~' -x '*.orig' php-4.3.5.orig/ext/mssql/config.m4 php-4.3.5/ext/mssql/config.m4 +--- php-4.3.5.orig/ext/mssql/config.m4 2004-04-14 11:29:51.000000000 +0200 ++++ php-4.3.5/ext/mssql/config.m4 2004-04-14 11:41:13.000000000 +0200 +@@ -32,12 +32,12 @@ + fi + fi + +- if test ! -r "$FREETDS_INSTALLATION_DIR/lib/libtds.so"; then +- AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/lib/libtds.so) ++ if test ! -r "$FREETDS_INSTALLATION_DIR/lib64/libtds.so"; then ++ AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/lib64/libtds.so) + fi + + MSSQL_INCDIR=$FREETDS_INSTALLATION_DIR/include +- MSSQL_LIBDIR=$FREETDS_INSTALLATION_DIR/lib ++ MSSQL_LIBDIR=$FREETDS_INSTALLATION_DIR/lib64 + + PHP_ADD_INCLUDE($MSSQL_INCDIR) + PHP_ADD_LIBRARY_WITH_PATH(sybdb, $MSSQL_LIBDIR, MSSQL_SHARED_LIBADD) +diff -durN -x '*~' -x '*.orig' php-4.3.5.orig/ext/mysql/config.m4 php-4.3.5/ext/mysql/config.m4 +--- php-4.3.5.orig/ext/mysql/config.m4 2004-04-14 11:29:51.000000000 +0200 ++++ php-4.3.5/ext/mysql/config.m4 2004-04-14 11:41:13.000000000 +0200 +@@ -22,7 +22,7 @@ + /var/run/mysqld/mysqld.sock \ + /var/tmp/mysql.sock \ + /var/run/mysql/mysql.sock \ +- /var/lib/mysql/mysql.sock \ ++ /var/lib64/mysql/mysql.sock \ + /var/mysql/mysql.sock \ + /usr/local/mysql/var/mysql.sock \ + /Private/tmp/mysql.sock \ +@@ -115,7 +115,7 @@ + + MYSQL_MODULE_TYPE=external + +- for i in lib lib/mysql; do ++ for i in lib64 lib64/mysql; do + MYSQL_LIB_CHK($i) + done + +@@ -130,9 +130,9 @@ + PHP_CHECK_LIBRARY(mysqlclient, mysql_error, [], [ + AC_MSG_ERROR([mysql configure failed. Please check config.log for more information.]) + ], [ +- -L$PHP_ZLIB_DIR/lib -L$MYSQL_LIB_DIR ++ -L$PHP_ZLIB_DIR/lib64 -L$MYSQL_LIB_DIR + ]) +- MYSQL_LIBS="-L$PHP_ZLIB_DIR/lib -lz" ++ MYSQL_LIBS="-L$PHP_ZLIB_DIR/lib64 -lz" + else + PHP_ADD_LIBRARY(z,, MYSQL_SHARED_LIBADD) + PHP_CHECK_LIBRARY(mysqlclient, mysql_errno, [], [ +diff -durN -x '*~' -x '*.orig' php-4.3.5.orig/ext/pdf/config.m4 php-4.3.5/ext/pdf/config.m4 +--- php-4.3.5.orig/ext/pdf/config.m4 2004-04-14 11:29:51.000000000 +0200 ++++ php-4.3.5/ext/pdf/config.m4 2004-04-14 11:41:13.000000000 +0200 +@@ -40,11 +40,11 @@ + if test "$PHP_JPEG_DIR" != "no"; then + PHP_CHECK_LIBRARY(jpeg,jpeg_read_header, + [ +- PHP_ADD_LIBRARY_WITH_PATH(jpeg, $PHP_JPEG_DIR/lib, PDF_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(jpeg, $PHP_JPEG_DIR/lib64, PDF_SHARED_LIBADD) + ],[ + AC_MSG_ERROR([libjpeg not found!]) + ],[ +- -L$PHP_JPEG_DIR/lib ++ -L$PHP_JPEG_DIR/lib64 + ]) + else + AC_MSG_WARN([If configure fails, try --with-jpeg-dir=]) +@@ -54,11 +54,11 @@ + 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, PDF_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(png, $PHP_PNG_DIR/lib64, PDF_SHARED_LIBADD) + ],[ + AC_MSG_ERROR([libpng not found!]) + ],[ +- -L$PHP_PNG_DIR/lib ++ -L$PHP_PNG_DIR/lib64 + ]) + else + AC_MSG_WARN([If configure fails, try --with-png-dir=]) +@@ -68,11 +68,11 @@ + if test "$PHP_TIFF_DIR" != "no"; then + PHP_CHECK_LIBRARY(tiff,TIFFOpen, + [ +- PHP_ADD_LIBRARY_WITH_PATH(tiff, $PHP_TIFF_DIR/lib, PDF_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(tiff, $PHP_TIFF_DIR/lib64, PDF_SHARED_LIBADD) + ],[ + AC_MSG_ERROR([libtiff not found!]) + ],[ +- -L$PHP_TIFF_DIR/lib ++ -L$PHP_TIFF_DIR/lib64 + ]) + else + AC_MSG_WARN([If configure fails, try --with-tiff-dir=]) +@@ -84,7 +84,7 @@ + AC_MSG_RESULT([no. If configure fails, try --with-zlib-dir=]) + else + AC_MSG_RESULT([$PHP_ZLIB_DIR]) +- PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, PDF_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib64, PDF_SHARED_LIBADD) + fi + + dnl # +@@ -118,7 +118,7 @@ + PHP_CHECK_LIBRARY(pdf, PDF_show_boxed, + [ + AC_DEFINE(HAVE_PDFLIB,1,[ ]) +- PHP_ADD_LIBRARY_WITH_PATH(pdf, $PHP_PDFLIB/lib, PDF_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(pdf, $PHP_PDFLIB/lib64, PDF_SHARED_LIBADD) + PHP_ADD_INCLUDE($PHP_PDFLIB/include) + ],[ + AC_MSG_ERROR([ +@@ -127,7 +127,7 @@ + See config.log for more information. + ]) + ],[ +- -L$PHP_PDFLIB/lib $PDF_SHARED_LIBADD ++ -L$PHP_PDFLIB/lib64 $PDF_SHARED_LIBADD + ]) + else + AC_MSG_ERROR([pdflib.h not found! Check the path passed to --with-pdflib=. PATH should be the install prefix directory.]) +diff -durN -x '*~' -x '*.orig' php-4.3.5.orig/ext/pgsql/config.m4 php-4.3.5/ext/pgsql/config.m4 +--- php-4.3.5.orig/ext/pgsql/config.m4 2004-04-14 11:29:51.000000000 +0200 ++++ php-4.3.5/ext/pgsql/config.m4 2004-04-14 11:41:13.000000000 +0200 +@@ -29,7 +29,7 @@ + fi + done + +- for j in lib lib/pgsql lib/postgres lib/postgresql ""; do ++ for j in lib64 lib64/pgsql lib64/postgres lib64/postgresql ""; do + if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then + PGSQL_LIBDIR=$i/$j + fi +diff -durN -x '*~' -x '*.orig' php-4.3.5.orig/ext/xml/config.m4 php-4.3.5/ext/xml/config.m4 +--- php-4.3.5.orig/ext/xml/config.m4 2004-04-14 11:29:51.000000000 +0200 ++++ php-4.3.5/ext/xml/config.m4 2004-04-14 11:41:13.000000000 +0200 +@@ -31,7 +31,7 @@ + PHP_NEW_EXTENSION(xml, xml.c, $ext_shared) + + 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 ++ if test -f $i/lib64/libexpat.a -o -f $i/lib64/libexpat.$SHLIB_SUFFIX_NAME ; then + EXPAT_DIR=$i + fi + done +@@ -41,7 +41,7 @@ + fi + + PHP_ADD_INCLUDE($EXPAT_DIR/include) +- PHP_ADD_LIBRARY_WITH_PATH(expat, $EXPAT_DIR/lib, XML_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(expat, $EXPAT_DIR/lib64, XML_SHARED_LIBADD) + PHP_SUBST(XML_SHARED_LIBADD) + fi + fi +diff -durN -x '*~' -x '*.orig' php-4.3.5.orig/ext/xmlrpc/config.m4 php-4.3.5/ext/xmlrpc/config.m4 +--- php-4.3.5.orig/ext/xmlrpc/config.m4 2004-04-14 11:29:51.000000000 +0200 ++++ php-4.3.5/ext/xmlrpc/config.m4 2004-04-14 11:41:13.000000000 +0200 +@@ -23,9 +23,9 @@ + + testval=no + for i in $PHP_EXPAT_DIR $XMLRPC_DIR /usr/local /usr; do +- if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME; then ++ if test -f $i/lib64/libexpat.a -o -f $i/lib64/libexpat.$SHLIB_SUFFIX_NAME; then + AC_DEFINE(HAVE_LIBEXPAT2,1,[ ]) +- PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib, XMLRPC_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib64, XMLRPC_SHARED_LIBADD) + PHP_ADD_INCLUDE($i/include) + testval=yes + break +@@ -90,5 +90,5 @@ + PHP_NEW_EXTENSION(xmlrpc,xmlrpc-epi-php.c,$ext_shared) + XMLRPC_MODULE_TYPE=external + PHP_ADD_INCLUDE($XMLRPC_DIR) +- PHP_ADD_LIBRARY_WITH_PATH(xmlrpc, $XMLRPC_DIR/lib, XMLRPC_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(xmlrpc, $XMLRPC_DIR/lib64, XMLRPC_SHARED_LIBADD) + fi +diff -durN -x '*~' -x '*.orig' php-4.3.5.orig/ext/xslt/config.m4 php-4.3.5/ext/xslt/config.m4 +--- php-4.3.5.orig/ext/xslt/config.m4 2004-04-14 11:29:51.000000000 +0200 ++++ php-4.3.5/ext/xslt/config.m4 2004-04-14 11:41:13.000000000 +0200 +@@ -98,10 +98,10 @@ + + found_expat=no + for i in $PHP_EXPAT_DIR $XSLT_DIR /usr/local /usr; do +- if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME; then ++ if test -f $i/lib64/libexpat.a -o -f $i/lib64/libexpat.$SHLIB_SUFFIX_NAME; then + AC_DEFINE(HAVE_LIBEXPAT2, 1, [ ]) + PHP_ADD_INCLUDE($i/include) +- PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib, XSLT_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib64, XSLT_SHARED_LIBADD) + found_expat=yes + break + fi +@@ -125,7 +125,7 @@ + + if test "$PHP_SABLOT_JS" != "no"; then + for i in $PHP_SABLOT_JS /usr/local /usr; do +- if test -f $i/lib/libjs.a -o -f $i/lib/libjs.$SHLIB_SUFFIX_NAME; then ++ if test -f $i/lib64/libjs.a -o -f $i/lib64/libjs.$SHLIB_SUFFIX_NAME; then + PHP_SABLOT_JS_DIR=$i + break + fi +@@ -133,12 +133,12 @@ + + PHP_CHECK_LIBRARY(js, JS_GetRuntime, + [ +- PHP_ADD_LIBRARY_WITH_PATH(js, $PHP_SABLOT_JS_DIR/lib, XSLT_SHARED_LIBADD) +- PHP_SABLOT_JS_LIBS=-L$PHP_SABLOT_JS_DIR/lib -ljs ++ PHP_ADD_LIBRARY_WITH_PATH(js, $PHP_SABLOT_JS_DIR/lib64, XSLT_SHARED_LIBADD) ++ PHP_SABLOT_JS_LIBS=-L$PHP_SABLOT_JS_DIR/lib64 -ljs + ], [ + AC_MSG_ERROR([libjs not found. Please check config.log for more information.]) + ], [ +- -L$PHP_SABLOT_JS_DIR/lib ++ -L$PHP_SABLOT_JS_DIR/lib64 + ]) + fi + +@@ -146,7 +146,7 @@ + [ + AC_DEFINE(HAVE_SABLOT_SET_ENCODING, 1, [ ]) + ], [], [ +- -L$XSLT_DIR/lib $PHP_SABLOT_JS_LIBS ++ -L$XSLT_DIR/lib64 $PHP_SABLOT_JS_LIBS + ]) + + dnl SablotSetOptions implemented in Sablotron CVS > 2002/10/31 +@@ -154,14 +154,14 @@ + [ + AC_DEFINE(HAVE_SABLOT_GET_OPTIONS, 1, [Whether Sablotron supports SablotGetOptions]) + ], [], [ +- -L$XSLT_DIR/lib $PHP_SABLOT_JS_LIBS ++ -L$XSLT_DIR/lib64 $PHP_SABLOT_JS_LIBS + ]) + + AC_DEFINE(HAVE_SABLOT_BACKEND, 1, [ ]) + fi + + PHP_ADD_INCLUDE($XSLT_DIR/include) +- PHP_ADD_LIBRARY_WITH_PATH($XSLT_LIBNAME, $XSLT_DIR/lib, XSLT_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH($XSLT_LIBNAME, $XSLT_DIR/lib64, XSLT_SHARED_LIBADD) + + AC_DEFINE(HAVE_XSLT, 1, [ ]) + fi diff --git a/php-libpq_fs_h_path.patch b/php-libpq_fs_h_path.patch new file mode 100644 index 0000000..37e96eb --- /dev/null +++ b/php-libpq_fs_h_path.patch @@ -0,0 +1,11 @@ +--- php-4.3.0/ext/pgsql/php_pgsql.h~ Mon Feb 25 15:16:28 2002 ++++ php-4.3.0/ext/pgsql/php_pgsql.h Mon Feb 25 15:16:28 2002 +@@ -43,7 +43,7 @@ + #define PHPAPI __declspec(dllimport) + #endif + #else +-#include ++#include + #endif + + #ifdef HAVE_PG_CONFIG_H diff --git a/php-mail.patch b/php-mail.patch new file mode 100644 index 0000000..8748f38 --- /dev/null +++ b/php-mail.patch @@ -0,0 +1,66 @@ +--- php-4.3.0/ext/standard/mail.c.orig Fri Nov 29 12:15:43 2002 ++++ php-4.3.0/ext/standard/mail.c Thu Jan 2 12:37:54 2003 +@@ -21,6 +21,8 @@ + #include + #include + #include ++#include ++#include + #include "php.h" + #include "ext/standard/info.h" + +@@ -36,6 +38,9 @@ + #include "safe_mode.h" + #include "exec.h" + ++#include "zend_operators.h" ++#include "zend_globals.h" ++ + #if HAVE_SENDMAIL + #ifdef PHP_WIN32 + #include "win32/sendmail.h" +@@ -196,8 +201,42 @@ + return 0; + } + #endif +- fprintf(sendmail, "To: %s\n", to); +- fprintf(sendmail, "Subject: %s\n", subject); ++ TSRMLS_FETCH(); ++ ++ if ((to != NULL) && (strlen(to)!=0)) { ++ fprintf(sendmail, "To: %s\n", to); ++ } ++ if ((subject != NULL) && (strlen(subject)!=0)) { ++ fprintf(sendmail, "Subject: %s\n", subject); ++ } ++ ++ if (PG(http_globals)[TRACK_VARS_SERVER]) { ++ zval **remote_addr, **server_name, **server_port, ++ **script_name, **http_user_agent; ++ ++ if (zend_hash_find(PG(http_globals)[TRACK_VARS_SERVER]->value.ht, "REMOTE_ADDR", sizeof("REMOTE_ADDR"), (void **) &remote_addr)==SUCCESS) { ++ convert_to_string_ex(remote_addr); ++ fprintf(sendmail, "HTTP-Posting-Client: %s\n", Z_STRVAL_PP(remote_addr)); ++ } ++ if (zend_hash_find(PG(http_globals)[TRACK_VARS_SERVER]->value.ht, "SERVER_NAME", sizeof("SERVER_NAME"), (void **) &server_name)==SUCCESS) { ++ convert_to_string_ex(server_name); ++ fprintf(sendmail, "HTTP-Posting-URI: %s", Z_STRVAL_PP(server_name)); ++ if (zend_hash_find(PG(http_globals)[TRACK_VARS_SERVER]->value.ht, "SERVER_PORT", sizeof("SERVER_PORT"), (void **) &server_port)==SUCCESS) { ++ convert_to_string_ex(server_port); ++ fprintf(sendmail, ":%s", Z_STRVAL_PP(server_port)); ++ } ++ if (zend_hash_find(PG(http_globals)[TRACK_VARS_SERVER]->value.ht, "SCRIPT_NAME", sizeof("SCRIPT_NAME"), (void **) &script_name)==SUCCESS) { ++ convert_to_string_ex(script_name); ++ fprintf(sendmail, "%s", Z_STRVAL_PP(script_name)); ++ } ++ fprintf(sendmail, "\n"); ++ } ++ if (zend_hash_find(PG(http_globals)[TRACK_VARS_SERVER]->value.ht, "HTTP_USER_AGENT", sizeof("HTTP_USER_AGENT"), (void **) &http_user_agent)==SUCCESS) { ++ convert_to_string_ex(http_user_agent); ++ fprintf(sendmail, "HTTP-Posting-User-Agent: %s\n", Z_STRVAL_PP(http_user_agent)); ++ } ++ } ++ + if (headers != NULL) { + fprintf(sendmail, "%s\n", headers); + } diff --git a/php-mnogosearch-fix.patch b/php-mnogosearch-fix.patch new file mode 100644 index 0000000..c0f82a3 --- /dev/null +++ b/php-mnogosearch-fix.patch @@ -0,0 +1,15 @@ +diff -ur php-4.3.7-orig/ext/mnogosearch/config.m4 php-4.3.7-patched/ext/mnogosearch/config.m4 +--- php-4.3.7-orig/ext/mnogosearch/config.m4 2003-10-03 05:25:38.000000000 +0000 ++++ php-4.3.7-patched/ext/mnogosearch/config.m4 2004-06-09 21:32:04.000000000 +0000 +@@ -46,8 +46,10 @@ + PHP_ADD_INCLUDE($MNOGOSEARCH_INCDIR) + + AC_DEFINE(HAVE_MNOGOSEARCH,1,[ ]) ++ MNOGOSEARCH_CFLAGS="-DNOT_USED_OR_REPLACED" + + PHP_SUBST(MNOGOSEARCH_SHARED_LIBADD) +- PHP_NEW_EXTENSION(mnogosearch, php_mnogo.c, $ext_shared) ++ PHP_SUBST(MNOGOSEARCH_CFLAGS) ++ PHP_NEW_EXTENSION(mnogosearch, php_mnogo.c, $ext_shared,, $MNOGOSEARCH_CFLAGS) + + fi diff --git a/php-mod_php.conf b/php-mod_php.conf new file mode 100644 index 0000000..c112beb --- /dev/null +++ b/php-mod_php.conf @@ -0,0 +1,9 @@ +LoadModule php4_module modules/libphp4.so + + + +AddType application/x-httpd-php .php +AddType application/x-httpd-php .php3 +AddType application/x-httpd-php .php4 + + diff --git a/php-mssql-fix.patch b/php-mssql-fix.patch new file mode 100644 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 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-no-metaccld.patch b/php-no-metaccld.patch new file mode 100644 index 0000000..338ebd5 --- /dev/null +++ b/php-no-metaccld.patch @@ -0,0 +1,31 @@ +--- php-4.3.2/configure.in.orig Fri Jun 13 16:12:24 2003 ++++ php-4.3.2/configure.in Tue Jun 17 17:05:41 2003 +@@ -1053,19 +1053,6 @@ + PHP_SUBST_OLD(YACC) + PHP_SUBST_OLD(SHLIB_SUFFIX_NAME) + +-old_CC=$CC +- +-if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then +- CXXFLAGS="$CXXFLAGS $ac_cv_pthreads_cflags" +- INLINE_CFLAGS="$INLINE_CFLAGS $ac_cv_pthreads_cflags" +- cat >meta_ccld<":"\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("\"PLD\n"); ++ } ++ PUTS("This server is using PLD Linux."); ++ if (!sapi_module.phpinfo_as_text) ++ PUTS("
More information at http://www.pld-linux.org/.
\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 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-session-unregister.patch b/php-session-unregister.patch new file mode 100644 index 0000000..5a7b5d0 --- /dev/null +++ b/php-session-unregister.patch @@ -0,0 +1,69 @@ +--- php-4.3.0/ext/session/php_session.h.orig Thu Oct 3 08:45:15 2002 ++++ php-4.3.0/ext/session/php_session.h Tue Jan 7 12:45:39 2003 +@@ -181,6 +181,7 @@ + int php_get_session_var(char *name, size_t namelen, zval ***state_var TSRMLS_DC); + + PHPAPI int php_session_register_module(ps_module *); ++PHPAPI int php_session_unregister_module(const char *name); + + PHPAPI int php_session_register_serializer(const char *name, + int (*encode)(PS_SERIALIZER_ENCODE_ARGS), +--- php-4.3.0/ext/session/session.c.orig Thu Dec 5 21:42:05 2002 ++++ php-4.3.0/ext/session/session.c Tue Jan 7 12:45:38 2003 +@@ -208,12 +208,33 @@ + ps_modules[i] = ptr; + ret = 0; + break; +- } ++ } else if((ps_modules[i]->s_name != NULL) && (ptr->s_name != NULL) && ++ !strcasecmp(ps_modules[i]->s_name, ptr->s_name)) { ++ /* avoid double registration */ ++ ret = 0; ++ break; ++ } + } + + return ret; + } + ++PHPAPI int php_session_unregister_module(const char *name) ++{ ++ int ret = -1; ++ int i; ++ ++ for (i = 0; i < MAX_MODULES; i++) { ++ if (ps_modules[i] && ps_modules[i]->s_name && !strcasecmp(ps_modules[i]->s_name, name)) { ++ ps_modules[i] = 0; ++ ret = 0; ++ break; ++ } ++ } ++ ++ return ret; ++} ++ + PHP_MINIT_FUNCTION(session); + PHP_RINIT_FUNCTION(session); + PHP_MSHUTDOWN_FUNCTION(session); +--- php-4.3.0/ext/session/mod_mm.c.orig Thu Dec 5 21:42:05 2002 ++++ php-4.3.0/ext/session/mod_mm.c Tue Jan 7 12:46:21 2003 +@@ -291,6 +291,7 @@ + + PHP_MSHUTDOWN_FUNCTION(ps_mm) + { ++ php_session_unregister_module("mm"); + if (ps_mm_instance) { + ps_mm_destroy(ps_mm_instance); + return SUCCESS; +--- php-4.3.0/ext/msession/msession.c.orig Thu Aug 22 15:29:50 2002 ++++ php-4.3.0/ext/msession/msession.c Tue Jan 7 12:46:50 2003 +@@ -188,6 +188,9 @@ + + PHP_MSHUTDOWN_FUNCTION(msession) + { ++#ifdef HAVE_PHP_SESSION ++ php_session_unregister_module("msession"); ++#endif + return SUCCESS; + } + diff --git a/php-shared.patch b/php-shared.patch new file mode 100644 index 0000000..c696de6 --- /dev/null +++ b/php-shared.patch @@ -0,0 +1,75 @@ +diff -burN php-4.3.3RC2.orig/Makefile.global php-4.3.3RC2-shared/Makefile.global +--- php-4.3.3RC2.orig/Makefile.global Thu Jul 24 19:45:15 2003 ++++ php-4.3.3RC2-shared/Makefile.global Sat Aug 2 22:53:18 2003 +@@ -14,9 +14,11 @@ + + build-modules: $(PHP_MODULES) + +-libphp4.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) +- $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ +- -@$(LIBTOOL) --silent --mode=install cp libphp4.la $(phptempdir)/libphp4.la >/dev/null 2>&1 ++libphp_common.la: $(PHP_GLOBAL_OBJS) ++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) -avoid-version $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ -release $(PHP_VERSION) ++ ++libphp4.la: libphp_common.la $(PHP_SAPI_OBJS) ++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ + + libs/libphp4.bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) + $(CC) $(MH_BUNDLE_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_SAPI_OBJS:.lo=.o) $(PHP_FRAMEWORKS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ && cp $@ libs/libphp4.so +@@ -25,11 +27,13 @@ + + install-sapi: $(OVERALL_TARGET) + @echo "Installing PHP SAPI module: $(PHP_SAPI)" ++ -@$(LIBTOOL) --silent --mode=install cp libphp_common.la $(phptempdir)/libphp_common.la >/dev/null 2>&1 ++ -@$(LIBTOOL) --silent --mode=install cp libphp4.la $(phptempdir)/libphp4.la >/dev/null 2>&1 + -@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) +- -@if test ! -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); then \ ++ -@if test ! -r $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME); then \ + for i in 0.0.0 0.0 0; do \ +- if test -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i; then \ +- $(LN_S) $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); \ ++ if test -r $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME).$$i; then \ ++ $(LN_S) $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME).$$i $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME); \ + break; \ + fi; \ + done; \ +diff -burN php-4.3.3RC2.orig/sapi/cgi/Makefile.frag php-4.3.3RC2-shared/sapi/cgi/Makefile.frag +--- php-4.3.3RC2.orig/sapi/cgi/Makefile.frag Wed Jul 2 03:06:29 2003 ++++ php-4.3.3RC2-shared/sapi/cgi/Makefile.frag Sat Aug 2 22:53:38 2003 +@@ -1,2 +1,2 @@ +-$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) ++$(SAPI_CGI_PATH): libphp_common.la $(PHP_SAPI_OBJS) + $(BUILD_CGI) +diff -burN php-4.3.3RC2.orig/sapi/cgi/config9.m4 php-4.3.3RC2-shared/sapi/cgi/config9.m4 +--- php-4.3.3RC2.orig/sapi/cgi/config9.m4 Wed Jul 2 04:48:16 2003 ++++ php-4.3.3RC2-shared/sapi/cgi/config9.m4 Sat Aug 2 22:54:51 2003 +@@ -156,7 +156,7 @@ + BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" + ;; + *) +- BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" ++ BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" + ;; + esac + +diff -burN php-4.3.3RC2.orig/sapi/cli/Makefile.frag php-4.3.3RC2-shared/sapi/cli/Makefile.frag +--- php-4.3.3RC2.orig/sapi/cli/Makefile.frag Wed Feb 12 05:39:30 2003 ++++ php-4.3.3RC2-shared/sapi/cli/Makefile.frag Sat Aug 2 22:53:53 2003 +@@ -1,4 +1,4 @@ +-$(SAPI_CLI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_CLI_OBJS) ++$(SAPI_CLI_PATH): libphp_common.la $(PHP_CLI_OBJS) + $(BUILD_CLI) + + install-cli: $(SAPI_CLI_PATH) +diff -burN php-4.3.3RC2.orig/sapi/cli/config.m4 php-4.3.3RC2-shared/sapi/cli/config.m4 +--- php-4.3.3RC2.orig/sapi/cli/config.m4 Wed Feb 12 05:39:30 2003 ++++ php-4.3.3RC2-shared/sapi/cli/config.m4 Sat Aug 2 22:55:15 2003 +@@ -27,7 +27,7 @@ + BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" + ;; + *) +- BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" ++ BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" + ;; + esac + INSTALL_CLI="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(bindir); \$(INSTALL) -m 0755 \$(SAPI_CLI_PATH) \$(INSTALL_ROOT)\$(bindir)/php" diff --git a/php-sybase-fix.patch b/php-sybase-fix.patch new file mode 100644 index 0000000..d01ac34 --- /dev/null +++ b/php-sybase-fix.patch @@ -0,0 +1,10 @@ +--- php-4.3.3RC3/ext/sybase/config.m4.orig 2002-03-12 17:36:10.000000000 +0100 ++++ php-4.3.3RC3/ext/sybase/config.m4 2003-08-16 16:11:52.854216712 +0200 +@@ -18,6 +18,7 @@ + PHP_ADD_INCLUDE($SYBASE_INCDIR) + PHP_ADD_LIBRARY_WITH_PATH(sybdb, $SYBASE_LIBDIR, SYBASE_SHARED_LIBADD) + PHP_NEW_EXTENSION(sybase, php_sybase_db.c, $ext_shared) ++ PHP_SUBST(SYBASE_SHARED_LIBADD) + AC_CHECK_LIB(dnet_stub, dnet_addr, + [ PHP_ADD_LIBRARY_WITH_PATH(dnet_stub,,SYBASE_SHARED_LIBADD) + AC_DEFINE(HAVE_LIBDNET_STUB,1,[ ]) diff --git a/php-threads-acfix.patch b/php-threads-acfix.patch new file mode 100644 index 0000000..ef06581 --- /dev/null +++ b/php-threads-acfix.patch @@ -0,0 +1,57 @@ +--- php-4.3.1/TSRM/threads.m4.orig Wed Feb 19 15:57:09 2003 ++++ php-4.3.1/TSRM/threads.m4 Wed Feb 19 15:57:42 2003 +@@ -108,7 +108,6 @@ + else + save_CFLAGS=$CFLAGS + save_LIBS=$LIBS +- PTHREADS_ASSIGN_VARS + PTHREADS_CHECK_COMPILE + LIBS=$save_LIBS + CFLAGS=$save_CFLAGS +@@ -126,9 +125,10 @@ + break + fi + done ++ pthreads_working= + fi +-fi + ]) ++fi + + AC_CACHE_CHECK(for pthreads_lib, ac_cv_pthreads_lib,[ + ac_cv_pthreads_lib= +@@ -155,6 +155,7 @@ + dnl + dnl + AC_DEFUN(PTHREADS_ASSIGN_VARS,[ ++if test "$pthreads_assign_done" != "yes" ; then + if test -n "$ac_cv_pthreads_lib"; then + LIBS="$LIBS -l$ac_cv_pthreads_lib" + fi +@@ -163,4 +164,6 @@ + if test -n "$ac_cv_pthreads_cflags"; then + CFLAGS="$CFLAGS $ac_cv_pthreads_cflags" + fi ++pthreads_assign_done="yes" ++fi + ])dnl +--- php-4.3.4/TSRM/tsrm.m4.orig 2003-10-03 07:25:30.000000000 +0200 ++++ php-4.3.4/TSRM/tsrm.m4 2003-12-16 23:36:50.274455176 +0100 +@@ -68,7 +68,6 @@ + ]) + + sinclude(threads.m4) +-sinclude(TSRM/threads.m4) + + AC_DEFUN(TSRM_CHECK_PTHREADS,[ + +--- php-4.3.4/configure.in.orig 2003-12-16 23:38:01.000000000 +0100 ++++ php-4.3.4/configure.in 2003-12-16 23:41:38.479641328 +0100 +@@ -204,6 +204,7 @@ + + sinclude(Zend/acinclude.m4) + sinclude(Zend/Zend.m4) ++sinclude(TSRM/threads.m4) + sinclude(TSRM/tsrm.m4) + + diff --git a/php-uint32_t.patch b/php-uint32_t.patch new file mode 100644 index 0000000..5bd1bf0 --- /dev/null +++ b/php-uint32_t.patch @@ -0,0 +1,12 @@ +adds missing include in zend_strtod.c (caused build to fail on sparc) + +--- php-5.0.3/Zend/zend_strtod.c~ 2004-12-14 09:41:35.000000000 +0100 ++++ php-5.0.3/Zend/zend_strtod.c 2004-12-21 08:45:10.050119856 +0100 +@@ -90,6 +90,7 @@ + */ + + #include ++#include + + #if defined(LIBC_SCCS) && !defined(lint) + static char *rcsid = "$OpenBSD: strtod.c,v 1.19 2004/02/03 16:52:11 drahn Exp $"; diff --git a/php-xslt-gcc33.patch b/php-xslt-gcc33.patch new file mode 100644 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 index 0000000..14cdb25 --- /dev/null +++ b/php-zlib.patch @@ -0,0 +1,23 @@ +--- php/ext/zlib/zlib.c.orig Wed Jul 2 12:30:43 2003 ++++ php/ext/zlib/zlib.c Wed Jul 2 13:23:07 2003 +@@ -1010,6 +1010,8 @@ + /* return the original string */ + *return_value = **zv_string; + zval_copy_ctor(return_value); ++ } else { ++ SG(sapi_headers).send_default_content_type = 0; + } + } + /* }}} */ +@@ -1055,6 +1055,11 @@ + php_ob_set_internal_handler(php_gzip_output_handler, (uint)buffer_size, "zlib output compression", 0 TSRMLS_CC); + 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; + } -- 2.44.0