From: Artur Frysiak Date: Fri, 6 Jul 2001 15:50:41 +0000 (+0000) Subject: updated to 4.0.6 X-Git-Tag: php-4_0_6-1~12 X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=f161d428775ebb13ea4cc6b161d252d1fd6c0d18;p=packages%2Fphp.git updated to 4.0.6 Changed files: php-fastcgi.patch -> 1.2 php-link-libs.patch -> 1.2 php-shared.patch -> 1.2 --- diff --git a/php-fastcgi.patch b/php-fastcgi.patch index 7068c06..727bce3 100644 --- a/php-fastcgi.patch +++ b/php-fastcgi.patch @@ -1,21 +1,26 @@ ---- php-4.0.5/sapi/fastcgi/config.m4~ Tue Mar 20 19:13:20 2001 -+++ php-4.0.5/sapi/fastcgi/config.m4 Sun May 6 19:40:08 2001 -@@ -7,10 +7,10 @@ +--- php-4.0.6/sapi/fastcgi/config.m4.wiget Tue Mar 27 22:34:45 2001 ++++ php-4.0.6/sapi/fastcgi/config.m4 Wed Jul 4 23:14:00 2001 +@@ -7,10 +7,15 @@ FASTCGIPATH=$withval fi test -f "$FASTCGIPATH/lib/libfcgi.a" || AC_MSG_ERROR(Unable to find libfcgi.a in $FASTCGIPATH/lib) - test -f "$FASTCGIPATH/include/fastcgi.h" || AC_MSG_ERROR(Unable to find fastcgi.h in $FASTCGIPATH/include) -+ test -f "$FASTCGIPATH/include/fastcgi/fastcgi.h" || AC_MSG_ERROR(Unable to find fastcgi.h in $FASTCGIPATH/include) ++ if test -f "$FASTCGIPATH/include/fastcgi.h" ; then ++ PHP_ADD_INCLUDE($FASTCGIPATH/include) ++ elif test -f "$FASTCGIPATH/include/fastcgi/fastcgi.h" ; then ++ PHP_ADD_INCLUDE($FASTCGIPATH/fastcgi/include) ++ else ++ AC_MSG_ERROR(Unable to find fastcgi.h in $FASTCGIPATH/include) ++ fi PHP_SAPI=fastcgi PHP_LIBS=$FASTCGIPATH/lib/libfcgi.a -- AC_ADD_INCLUDE($FASTCGIPATH/include) -+ AC_ADD_INCLUDE($FASTCGIPATH/include/fastcgi) +- PHP_ADD_INCLUDE($FASTCGIPATH/include) EXT_PROGRAM_LDADD="$EXT_PROGRAM_LDADD $FASTCGIPATH/lib/libfcgi.a" INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_PROGRAM \$(bindir)/$SAPI_FASTCGI" RESULT="yes" ---- php-4.0.5/sapi/fastcgi/fastcgi.c~ Tue Mar 27 18:29:45 2001 -+++ php-4.0.5/sapi/fastcgi/fastcgi.c Sun May 6 22:21:50 2001 -@@ -197,6 +197,11 @@ +--- php-4.0.6/sapi/fastcgi/fastcgi.c.wiget Fri May 4 11:49:14 2001 ++++ php-4.0.6/sapi/fastcgi/fastcgi.c Wed Jul 4 23:09:36 2001 +@@ -200,6 +200,11 @@ struct stat st; char *pi = getenv( "PATH_INFO" ); char *pt = getenv( "PATH_TRANSLATED" ); diff --git a/php-link-libs.patch b/php-link-libs.patch index bd10f06..fe2250c 100644 --- a/php-link-libs.patch +++ b/php-link-libs.patch @@ -1,29 +1,5 @@ -diff -ur php-4.0.5/configure.in php-4.0.5.lib/configure.in ---- php-4.0.5/configure.in Sun May 20 04:22:15 2001 -+++ php-4.0.5.lib/configure.in Sun May 20 03:37:26 2001 -@@ -230,12 +230,14 @@ - - if test "$php_no_nsl_checks" != "yes"; then - --AC_CHECK_LIB(nsl, gethostname, [ -- AC_ADD_LIBRARY(nsl) -- AC_DEFINE(HAVE_LIBNSL,1,[ ]) ],[ -- AC_CHECK_LIB(nsl, gethostbyaddr, [ -+AC_CHECK_FUNC(gethostname, [ ], [ -+ AC_CHECK_LIB(nsl, gethostname, [ - AC_ADD_LIBRARY(nsl) -- AC_DEFINE(HAVE_LIBNSL,1,[ ]) ], []) -+ AC_DEFINE(HAVE_LIBNSL,1,[ ]) ],[ -+ AC_CHECK_LIB(nsl, gethostbyaddr, [ -+ AC_ADD_LIBRARY(nsl) -+ AC_DEFINE(HAVE_LIBNSL,1,[ ]) ], []) -+ ]) - ]) - - fi -diff -ur php-4.0.5/ext/bz2/Makefile.in php-4.0.5.lib/ext/bz2/Makefile.in ---- php-4.0.5/ext/bz2/Makefile.in Wed Oct 18 20:32:21 2000 -+++ php-4.0.5.lib/ext/bz2/Makefile.in Sun May 20 04:08:29 2001 +--- php-4.0.6/ext/bz2/Makefile.in.wiget Wed Oct 18 20:32:21 2000 ++++ php-4.0.6/ext/bz2/Makefile.in Wed Jul 4 22:44:51 2001 @@ -3,5 +3,6 @@ LTLIBRARY_NAME = libbz2.la LTLIBRARY_SOURCES = bz2.c @@ -31,9 +7,8 @@ diff -ur php-4.0.5/ext/bz2/Makefile.in php-4.0.5.lib/ext/bz2/Makefile.in +LTLIBRARY_SHARED_LIBADD = $(BZ2_SHARED_LIBADD) include $(top_srcdir)/build/dynlib.mk -diff -ur php-4.0.5/ext/yp/Makefile.in php-4.0.5.lib/ext/yp/Makefile.in ---- php-4.0.5/ext/yp/Makefile.in Tue May 2 03:21:26 2000 -+++ php-4.0.5.lib/ext/yp/Makefile.in Sun May 20 04:05:18 2001 +--- php-4.0.6/ext/yp/Makefile.in.wiget Tue May 2 03:21:26 2000 ++++ php-4.0.6/ext/yp/Makefile.in Wed Jul 4 22:44:51 2001 @@ -2,5 +2,6 @@ LTLIBRARY_NAME = libyp.la LTLIBRARY_SOURCES = yp.c @@ -41,19 +16,36 @@ diff -ur php-4.0.5/ext/yp/Makefile.in php-4.0.5.lib/ext/yp/Makefile.in +LTLIBRARY_SHARED_LIBADD = $(NSL_SHARED_LIBADD) include $(top_srcdir)/build/dynlib.mk -diff -ur php-4.0.5/ext/yp/config.m4 php-4.0.5.lib/ext/yp/config.m4 ---- php-4.0.5/ext/yp/config.m4 Tue May 2 03:21:26 2000 -+++ php-4.0.5.lib/ext/yp/config.m4 Sun May 20 04:18:43 2001 +--- php-4.0.6/ext/yp/config.m4.wiget Tue May 2 03:21:26 2000 ++++ php-4.0.6/ext/yp/config.m4 Wed Jul 4 22:44:51 2001 @@ -6,8 +6,11 @@ [ --enable-yp Include YP support]) if test "$PHP_YP" != "no"; then +- AC_DEFINE(HAVE_YP,1,[ ]) + PHP_SUBST(NSL_SHARED_LIBADD) + AC_ADD_LIBRARY_WITH_PATH(nsl, /usr/lib, NSL_SHARED_LIBADD) + AC_CHECK_LIB(nsl, yp_match, [AC_DEFINE(HAVE_YP,1,[ ])], [AC_MSG_ERROR(YP module requires libnsl)],) -- AC_DEFINE(HAVE_YP,1,[ ]) PHP_EXTENSION(yp, $ext_shared) + case "$host_alias" in *solaris*) AC_DEFINE(SOLARIS_YP,1,[ ]) ;; +--- php-4.0.6/configure.in.wiget Wed Jun 20 22:12:59 2001 ++++ php-4.0.6/configure.in Wed Jul 4 22:49:05 2001 +@@ -230,6 +230,7 @@ + + if test "$php_no_nsl_checks" != "yes"; then + ++AC_CHECK_FUNC(gethostname, [ ], [ + AC_CHECK_LIB(nsl, gethostname, [ + PHP_ADD_LIBRARY(nsl) + AC_DEFINE(HAVE_LIBNSL,1,[ ]) ],[ +@@ -237,6 +238,7 @@ + PHP_ADD_LIBRARY(nsl) + AC_DEFINE(HAVE_LIBNSL,1,[ ]) ], []) + ]) ++]) + + fi + diff --git a/php-shared.patch b/php-shared.patch index c7d3020..18ac086 100644 --- a/php-shared.patch +++ b/php-shared.patch @@ -1,7 +1,6 @@ -diff -ur php-4.0.5.orig/Makefile.in php-4.0.5/Makefile.in ---- php-4.0.5.orig/Makefile.in Sun May 6 23:07:47 2001 -+++ php-4.0.5/Makefile.in Mon May 7 03:25:53 2001 -@@ -2,41 +2,68 @@ +--- php-4.0.6/Makefile.in.wiget Sun Apr 22 03:09:12 2001 ++++ php-4.0.6/Makefile.in Wed Jul 4 23:21:35 2001 +@@ -2,40 +2,68 @@ ZEND_DIR = $(srcdir)/Zend SUBDIRS = Zend main ext sapi $(TSRM_DIR) $(REGEX_DIR) . $(PEAR_DIR) @@ -18,6 +17,7 @@ diff -ur php-4.0.5.orig/Makefile.in php-4.0.5/Makefile.in + sapi/$(PHP_SAPI)/libsapi.la -LTLIBRARY_DEPENDENCIES = \ ++ +libphp_common_la_DEPENDENCIES = \ Zend/libZend.la \ - sapi/$(PHP_SAPI)/libsapi.la \ @@ -37,7 +37,7 @@ diff -ur php-4.0.5.orig/Makefile.in php-4.0.5/Makefile.in PROGRAM_NAME = php PROGRAM_SOURCES = stub.c -PROGRAM_LDADD = libphp4.la $(EXT_PROGRAM_LDADD) -+PROGRAM_LDADD = libphp_common.la sapi/cgi/libsapi.la $(EXT_PROGRAM_LDADD) ++PROGRAM_LDADD = libphp_common.la sapi/cgi/libsapi.la libphp4.la $(EXT_PROGRAM_LDADD) PROGRAM_LDFLAGS = -export-dynamic PROGRAM_DEPENDENCIES = $(PROGRAM_LDADD) @@ -64,11 +64,10 @@ diff -ur php-4.0.5.orig/Makefile.in php-4.0.5/Makefile.in - @$(LIBTOOL) --silent --mode=install cp libphp4.la $(phptempdir)/libphp4.la >/dev/null 2>&1 + @$(LIBTOOL) --silent --mode=install cp libphp_common.la $(phptempdir)/libphp_common.la + @$(LIBTOOL) --silent --mode=install cp libphp4.la $(phptempdir)/libphp4.la - -@$(mkinstalldirs) $(DESTDIR)$(bindir) + -@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) -@if test ! -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); then \ for i in 0.0.0 0.0 0; do \ if test -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i; then \ - $(LN_S) $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); \ + break; \ + fi; \ + done; \ @@ -77,6 +76,6 @@ diff -ur php-4.0.5.orig/Makefile.in php-4.0.5/Makefile.in + for i in 0.0.0 0.0 0; do \ + 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); \ + $(LN_S) $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); \ break; \ fi; \ - done; \