commit 32192ed5dfc850b04f4c26e044d3fd9f93568ce4 Author: Adam Gołębiowski <ad...@pld-linux.org> Date: Sat Jul 3 11:53:19 2021 +0000
- rediffed php4-acam.patch | 6 +++--- php4-allow-db31.patch | 2 +- php4-apache24.patch | 4 ++-- php4-both-apxs.patch | 2 +- php4-hyperwave-fix.patch | 2 +- php4-ini-search-path.patch | 2 +- php4-java-norpath.patch | 2 +- php4-lib64.patch | 10 +++++----- php4-m4-divert.patch | 4 ++-- php4-mail.patch | 2 +- php4-mcal-shared-lib.patch | 4 ++-- php4-pldlogo.patch | 8 ++++---- php4-sapi-ini-file.patch | 2 +- php4-shared.patch | 6 +++--- php4-threads-acfix.patch | 2 +- php4-uint32_t.patch | 4 ++-- php4-xmlrpc-fix.patch | 2 +- 17 files changed, 32 insertions(+), 32 deletions(-) --- diff --git a/php4-acam.patch b/php4-acam.patch index 5369ac7..c7c717c 100644 --- a/php4-acam.patch +++ b/php4-acam.patch @@ -1,10 +1,10 @@ --- php-4.2.2/ext/mysql/config.m4.orig Fri Aug 9 23:49:00 2002 +++ php-4.2.2/ext/mysql/config.m4 Sat Aug 10 00:05:40 2002 @@ -49,6 +49,7 @@ - [ --with-mysql[=DIR] Include MySQL support. DIR is the MySQL base directory. - If unspecified, the bundled MySQL library will be used.], yes) + [ --with-zlib-dir[=DIR] MySQL: Set the path to libz install prefix.], no, no) + fi +PHP_REQUIRE_CXX + if test "$PHP_MYSQL" != "no"; then AC_DEFINE(HAVE_MYSQL, 1, [Whether you have MySQL]) - if test "$PHP_SAFE_MODE" = "yes"; then diff --git a/php4-allow-db31.patch b/php4-allow-db31.patch index f715330..c0658a6 100644 --- a/php4-allow-db31.patch +++ b/php4-allow-db31.patch @@ -1,7 +1,7 @@ --- 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_MSG_CHECKING(if dba 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) diff --git a/php4-apache24.patch b/php4-apache24.patch index f61536a..4fd21db 100644 --- a/php4-apache24.patch +++ b/php4-apache24.patch @@ -78,7 +78,7 @@ diff -ur -x configure -x aclocal.m4 -x config.guess -x config.sub -x '*.orig' -x APU_BINDIR=`$APXS -q APU_BINDIR` APR_BINDIR=`$APXS -q APR_BINDIR` -@@ -114,8 +113,16 @@ +@@ -114,8 +114,16 @@ ;; esac @@ -96,7 +96,7 @@ diff -ur -x configure -x aclocal.m4 -x config.guess -x config.sub -x '*.orig' -x + fi fi AC_MSG_RESULT(yes) - + --- php-4.4.9/sapi.org/apache2handler/php_functions.c 2007-12-31 08:22:55.000000000 +0100 +++ php-4.4.9/sapi/apache2handler/php_functions.c 2014-08-11 13:09:01.932246720 +0200 @@ -324,7 +324,11 @@ diff --git a/php4-both-apxs.patch b/php4-both-apxs.patch index 9b467df..a90fb88 100644 --- a/php4-both-apxs.patch +++ b/php4-both-apxs.patch @@ -2,7 +2,7 @@ +++ ./Makefile.global 2005-06-16 23:10:40.000000000 +0300 @@ -20,6 +20,11 @@ libphp4.la: libphp_common.la $(PHP_SAPI_OBJS) - $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(phptempdir)/libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ + $(LIBTOOL) --mode=link $(CC) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(phptempdir)/libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ +$(LIBTOOL_SAPI): libphp_common.la $(PHP_SAPI_OBJS) + $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(phptempdir)/libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ diff --git a/php4-hyperwave-fix.patch b/php4-hyperwave-fix.patch index 1b622a9..ccde575 100644 --- a/php4-hyperwave-fix.patch +++ b/php4-hyperwave-fix.patch @@ -1,7 +1,7 @@ --- php-4.3.0/ext/hyperwave/config.m4.orig Thu Jan 2 23:17:53 2003 +++ php-4.3.0/ext/hyperwave/config.m4 Thu Jan 2 23:19:42 2003 @@ -2,19 +2,12 @@ - dnl $Id$ + dnl $Id: config.m4,v 1.4 2002/03/12 16:47:14 sas Exp $ dnl -AC_MSG_CHECKING(for Hyperwave support) diff --git a/php4-ini-search-path.patch b/php4-ini-search-path.patch index 2c8499e..50fda9b 100644 --- a/php4-ini-search-path.patch +++ b/php4-ini-search-path.patch @@ -2,7 +2,7 @@ see also http://bugs.php.net/bug.php?id=34793 --- php-4.4.2/main/php_ini.c~ 2006-01-17 19:02:09.000000000 +0200 +++ php-4.4.2/main/php_ini.c 2006-01-17 19:26:46.000000000 +0200 @@ -19,7 +19,7 @@ - /* $Id$ */ + /* $Id: php_ini.c,v 1.106.2.15.2.5 2007/12/31 07:22:54 sebastian Exp $ */ /* Check CWD for php.ini */ -#define INI_CHECK_CWD diff --git a/php4-java-norpath.patch b/php4-java-norpath.patch index b6553c6..472495a 100644 --- a/php4-java-norpath.patch +++ b/php4-java-norpath.patch @@ -2,7 +2,7 @@ diff -burN php-4.3.2/ext/java/config.m4 php-4.3.2-java-norpath/ext/java/config.m --- 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_DEFUN([JAVA_CHECK_LIB], [ AC_MSG_CHECKING([Checking for libjava]) if test -d $PHP_JAVA/lib/kaffe; then - PHP_ADD_LIBPATH($PHP_JAVA/lib) diff --git a/php4-lib64.patch b/php4-lib64.patch index f2525e0..670c432 100644 --- a/php4-lib64.patch +++ b/php4-lib64.patch @@ -423,7 +423,7 @@ diff -urbB php-4.4.0.org/ext/ming/config.m4 php-4.4.0/ext/ming/config.m4 + PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/lib64, MING_SHARED_LIBADD) AC_MSG_CHECKING([for destroySWFBlock]) - AC_TRY_RUN([ + old_CPPFLAGS=$CPPFLAGS diff -urbB php-4.4.0.org/ext/mssql/config.m4 php-4.4.0/ext/mssql/config.m4 --- php-4.4.0.org/ext/mssql/config.m4 2004-12-08 19:59:11.000000000 +0100 +++ php-4.4.0/ext/mssql/config.m4 2005-07-11 21:44:33.635262496 +0200 @@ -456,8 +456,8 @@ diff -urbB php-4.4.0.org/ext/mysql/config.m4 php-4.4.0/ext/mysql/config.m4 /usr/local/mysql/var/mysql.sock \ /Private/tmp/mysql.sock \ @@ -115,7 +115,7 @@ - - MYSQL_MODULE_TYPE=external + ;; + esac - for i in lib lib/mysql; do + for i in lib64 lib64/mysql; do @@ -465,7 +465,7 @@ diff -urbB php-4.4.0.org/ext/mysql/config.m4 php-4.4.0/ext/mysql/config.m4 done @@ -130,9 +130,9 @@ - PHP_CHECK_LIBRARY(mysqlclient, mysql_error, [], [ + PHP_CHECK_LIBRARY($MY_LIBNAME, mysql_error, [], [ AC_MSG_ERROR([mysql configure failed. Please check config.log for more information.]) ], [ - -L$PHP_ZLIB_DIR/lib -L$MYSQL_LIB_DIR @@ -475,7 +475,7 @@ diff -urbB php-4.4.0.org/ext/mysql/config.m4 php-4.4.0/ext/mysql/config.m4 + MYSQL_LIBS="-L$PHP_ZLIB_DIR/lib64 -lz" else PHP_ADD_LIBRARY(z,, MYSQL_SHARED_LIBADD) - PHP_CHECK_LIBRARY(mysqlclient, mysql_errno, [], [ + PHP_CHECK_LIBRARY($MY_LIBNAME, mysql_errno, [], [ diff -urbB php-4.4.0.org/ext/xml/config.m4 php-4.4.0/ext/xml/config.m4 --- php-4.4.0.org/ext/xml/config.m4 2005-07-11 21:44:02.598980000 +0200 +++ php-4.4.0/ext/xml/config.m4 2005-07-11 21:44:33.637262192 +0200 diff --git a/php4-m4-divert.patch b/php4-m4-divert.patch index e9c928c..5bab171 100644 --- a/php4-m4-divert.patch +++ b/php4-m4-divert.patch @@ -2,7 +2,7 @@ diff -ur php-4.4.9.org/configure.in php-4.4.9/configure.in --- php-4.4.9.org/configure.in 2008-08-06 10:32:30.000000000 +0200 +++ php-4.4.9/configure.in 2009-08-18 12:24:17.574051486 +0200 @@ -1,7 +1,7 @@ - dnl ## $Id$ -*- sh -*- + dnl ## $Id: configure.in,v 1.396.2.164.2.53 2008/08/06 08:32:30 derick Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. -divert(1) @@ -50,7 +50,7 @@ diff -ur php-4.4.9.org/ext/standard/config.m4 php-4.4.9/ext/standard/config.m4 --- php-4.4.9.org/ext/standard/config.m4 2007-01-22 20:59:21.000000000 +0100 +++ php-4.4.9/ext/standard/config.m4 2009-08-18 12:24:17.576968996 +0200 @@ -1,6 +1,6 @@ - dnl $Id$ -*- sh -*- + dnl $Id: config.m4,v 1.47.2.16.2.1 2007/01/22 19:59:21 derick Exp $ -*- sh -*- -divert(3)dnl +divert(1003)dnl diff --git a/php4-mail.patch b/php4-mail.patch index 60d1768..809c83a 100644 --- a/php4-mail.patch +++ b/php4-mail.patch @@ -21,7 +21,7 @@ diff -ur php-5.2.0.org/ext/standard/mail.c php-5.2.0/ext/standard/mail.c #ifdef PHP_WIN32 #include "win32/sendmail.h" @@ -104,6 +109,18 @@ - return; + MAIL_ASCIIZ_CHECK(extra_cmd, extra_cmd_len); } + /* search for To: and Subject: headers which should be specified in proper mail() parameters, not in additional headers */ diff --git a/php4-mcal-shared-lib.patch b/php4-mcal-shared-lib.patch index a39ae73..e7be64c 100644 --- a/php4-mcal-shared-lib.patch +++ b/php4-mcal-shared-lib.patch @@ -10,8 +10,8 @@ fi done @@ -37,8 +37,8 @@ - AC_MSG_ERROR(Unable to locate your libmcal header files - icalroutines.h should be in the directory you specify or in the include/ subdirectory below it - default search location is $MCAL_DEFAULT_SEARCH) - fi + fi + done - if test ! -f "$MCAL_LIBRARY/libmcal.a"; then - AC_MSG_ERROR(Unable to locate your libmcal library files - libmcal.a should be in the directory you specify or in the lib/ subdirectory below it - default search location is $MCAL_DEFAULT_SEARCH) diff --git a/php4-pldlogo.patch b/php4-pldlogo.patch index 2b67aac..40e971b 100644 --- a/php4-pldlogo.patch +++ b/php4-pldlogo.patch @@ -35,10 +35,10 @@ diff -urN php-4.2.1RC2.org/ext/standard/info.h php-4.2.1RC2/ext/standard/info.h 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 }; -+ -+ +@@ -1392,3 +1392,127 @@ + 164, 85, 35, 68, 221, 218, 245, 107, 216, 174, + 3, 2, 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, diff --git a/php4-sapi-ini-file.patch b/php4-sapi-ini-file.patch index 8cf6922..0cbdfda 100644 --- a/php4-sapi-ini-file.patch +++ b/php4-sapi-ini-file.patch @@ -36,7 +36,7 @@ - } - } } - if (free_ini_search_path) { + @@ -431,9 +440,13 @@ * parse any .ini files found in this directory. */ if (!sapi_module.php_ini_ignore && strlen(PHP_CONFIG_FILE_SCAN_DIR)) { diff --git a/php4-shared.patch b/php4-shared.patch index 0fe5377..3f79cf3 100644 --- a/php4-shared.patch +++ b/php4-shared.patch @@ -52,7 +52,7 @@ diff -u php-4.4.2/Makefile.global php-4.4.2/Makefile.global --- 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="\$(CC) \$(EXTRA_LDFLAGS_PROGRAM) \$(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 \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" @@ -71,11 +71,11 @@ diff -u php-4.4.2/Makefile.global php-4.4.2/Makefile.global --- 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 \$(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 \$(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 \$(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" + INSTALL_CLI="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(bindir); \$(INSTALL) -m 0755 \$(SAPI_CLI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)" diff --git a/php4-threads-acfix.patch b/php4-threads-acfix.patch index d5d8570..37ce866 100644 --- a/php4-threads-acfix.patch +++ b/php4-threads-acfix.patch @@ -43,7 +43,7 @@ sinclude(threads.m4) -sinclude(TSRM/threads.m4) - AC_DEFUN(TSRM_CHECK_PTHREADS,[ + 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 diff --git a/php4-uint32_t.patch b/php4-uint32_t.patch index 052ed71..2457163 100644 --- a/php4-uint32_t.patch +++ b/php4-uint32_t.patch @@ -7,5 +7,5 @@ diff -burN php-4.3.10.orig/Zend/zend_strtod.c php-4.3.10/Zend/zend_strtod.c #include <zend_strtod.h> +#include <stdint.h> - #if defined(LIBC_SCCS) && !defined(lint) - static char *rcsid = "$OpenBSD: strtod.c,v 1.19 2004/02/03 16:52:11 drahn Exp $"; + #ifdef HAVE_SYS_TYPES_H + #include <sys/types.h> diff --git a/php4-xmlrpc-fix.patch b/php4-xmlrpc-fix.patch index 52e699b..7579f2d 100644 --- a/php4-xmlrpc-fix.patch +++ b/php4-xmlrpc-fix.patch @@ -8,4 +8,4 @@ + XMLRPC_MODULE_TYPE=external PHP_ADD_INCLUDE($XMLRPC_DIR) PHP_ADD_LIBRARY_WITH_PATH(xmlrpc, $XMLRPC_DIR/lib, XMLRPC_SHARED_LIBADD) - + fi ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/php4.git/commitdiff/e05065994b18a3fe0545f368e769a3b093745054 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit