- updated to 4.3.4RC1

Changed files:
    php-cpdf-fix.patch -> 1.6
    php-pear-install.patch -> 1.2
    php-shared.patch -> 1.12

diff --git a/php-cpdf-fix.patch b/php-cpdf-fix.patch
index bfd7f284508a566050ec11f4890cfd4a72da35a8..6808681268075080270a576ad3ae7b2bc5c14221 100644 (file)
--- a/php-cpdf-fix.patch
+++ b/php-cpdf-fix.patch
@@ -4,8 +4,8 @@
    PHP_WITH_SHARED
    if test "$withval" != "no"; then
      cpdf_withval=$withval
--    PHP_NEW_EXTENSION(cpdf, cpdf.c, $ext_shared)
-+    PHP_NEW_EXTENSION(cpdf, cpdf.c, $shared)
+-    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

diff --git a/php-pear-install.patch b/php-pear-install.patch
index f46571d128a548ec771e1687ed0791ff9e44e166..910d36b5fef1afdf5cb323479f5c2709f82b6a4e 100644 (file)
--- a/php-pear-install.patch
+++ b/php-pear-install.patch
@@ -1,16 +1,11 @@
---- php/pear/php.ini.orig      Wed Jun 18 14:11:24 2003
-+++ php/pear/php.ini   Wed Jun 18 14:04:21 2003
-@@ -0,0 +1,2 @@
-+extension_dir=modules
-+extension=pcre.so
 --- php/pear/Makefile.frag.orig        Wed Jun 18 14:15:02 2003
 +++ php/pear/Makefile.frag     Wed Jun 18 14:15:07 2003
 @@ -3,7 +3,7 @@
  peardir=$(PEAR_INSTALLDIR)
  
  # Skip all php.ini files altogether
--PEAR_INSTALL_FLAGS = -n -dsafe_mode=0
-+PEAR_INSTALL_FLAGS = -c $(top_builddir)/pear -dsafe_mode=0
+-PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0
++PEAR_INSTALL_FLAGS = -c $(top_builddir)/pear -dshort_open_tag=0 -dsafe_mode=0
  
  install-pear-installer: $(top_builddir)/sapi/cli/php
        @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) $(srcdir)/install-pear.php $(srcdir)/package-*.xml

diff --git a/php-shared.patch b/php-shared.patch
index 3aa307452f6f51e19009b3d086de5faeeda1cf60..c696de666caeb61dd9de6a0f8152c2597ae6f641 100644 (file)
--- a/php-shared.patch
+++ b/php-shared.patch
@@ -47,8 +47,8 @@ diff -burN php-4.3.3RC2.orig/sapi/cgi/config9.m4 php-4.3.3RC2-shared/sapi/cgi/co
          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) \$(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) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(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) \$(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
  
@@ -68,8 +68,8 @@ diff -burN php-4.3.3RC2.orig/sapi/cli/config.m4 php-4.3.3RC2-shared/sapi/cli/con
      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) \$(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) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(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"