- updated to 5.0.4RC1

- updated -lib64, -libtool, -sybase-fix and -threads-acfix patches
- dropped -phpize patch (already applied)
- release 0.1

Changed files:
    php-lib64.patch -> 1.10
    php-libtool.patch -> 1.4
    php-phpize.patch -> 1.2
    php-sybase-fix.patch -> 1.5
    php-threads-acfix.patch -> 1.3
    php.spec -> 1.418

diff --git a/php-lib64.patch b/php-lib64.patch
index 6916d9f469b81ac663c2f657835fc985e9e61df7..156bfa875d7b0615cdfc6b44cb04bd7b39efd6b6 100644 (file)
--- a/php-lib64.patch
+++ b/php-lib64.patch
@@ -1,7 +1,7 @@
-diff -burN php-5.0.3RC2.orig/acinclude.m4 php-5.0.3RC2/acinclude.m4
---- php-5.0.3RC2.orig/acinclude.m4     2004-12-13 11:25:23.854667632 +0100
-+++ php-5.0.3RC2/acinclude.m4  2004-12-13 11:26:08.477883872 +0100
-@@ -1625,6 +1625,9 @@
+diff -burN php-5.0.4RC1.orig/acinclude.m4 php-5.0.4RC1/acinclude.m4
+--- php-5.0.4RC1.orig/acinclude.m4     2005-03-15 18:21:05.158404416 +0100
++++ php-5.0.4RC1/acinclude.m4  2005-03-15 18:22:03.101595712 +0100
+@@ -1723,6 +1723,9 @@
        if test -r $i/lib/libssl.a -o -r $i/lib/libssl.$SHLIB_SUFFIX_NAME; then
          OPENSSL_LIBDIR=$i/lib
        fi
@@ -11,9 +11,9 @@ diff -burN php-5.0.3RC2.orig/acinclude.m4 php-5.0.3RC2/acinclude.m4
        test -n "$OPENSSL_INCDIR" && test -n "$OPENSSL_LIBDIR" && break
      done
  
-diff -burN php-5.0.3RC2.orig/ext/cpdf/config.m4 php-5.0.3RC2/ext/cpdf/config.m4
---- php-5.0.3RC2.orig/ext/cpdf/config.m4       2004-12-13 11:25:21.724991392 +0100
-+++ php-5.0.3RC2/ext/cpdf/config.m4    2004-12-13 11:26:08.485882656 +0100
+diff -burN php-5.0.4RC1.orig/ext/cpdf/config.m4 php-5.0.4RC1/ext/cpdf/config.m4
+--- php-5.0.4RC1.orig/ext/cpdf/config.m4       2005-03-15 18:21:04.537498808 +0100
++++ php-5.0.4RC1/ext/cpdf/config.m4    2005-03-15 18:23:06.693928208 +0100
 @@ -4,7 +4,7 @@
    AC_ARG_WITH(jpeg-dir,
    [  --with-jpeg-dir[=DIR]     CPDF: Set the path to libjpeg install prefix.],[
@@ -60,34 +60,36 @@ diff -burN php-5.0.3RC2.orig/ext/cpdf/config.m4 php-5.0.3RC2/ext/cpdf/config.m4
      ])
    ],)
  ])
-@@ -59,12 +59,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.])
+@@ -65,13 +65,13 @@
+         ], [
+           AC_MSG_ERROR([Cpdflib module requires cpdflib >= 2.])
+         ], [
+-          -L$i/lib $CPDF_SHARED_LIBADD
++          -L$i/lib64 $CPDF_SHARED_LIBADD
+         ])
        ], [
 -        -L$i/lib $CPDF_SHARED_LIBADD
 +        -L$i/lib64 $CPDF_SHARED_LIBADD
        ])
+ 
+-      PHP_ADD_LIBRARY_WITH_PATH($cpdf_libname, $i/lib, CPDF_SHARED_LIBADD)
++      PHP_ADD_LIBRARY_WITH_PATH($cpdf_libname, $i/lib64, CPDF_SHARED_LIBADD)
+       PHP_ADD_INCLUDE($CPDFLIB_INCLUDE)
+       AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib])
        break
-     fi
-diff -burN php-5.0.3RC2.orig/ext/dba/config.m4 php-5.0.3RC2/ext/dba/config.m4
---- php-5.0.3RC2.orig/ext/dba/config.m4        2004-12-13 11:25:21.641004160 +0100
-+++ php-5.0.3RC2/ext/dba/config.m4     2004-12-13 11:26:08.493881440 +0100
+diff -burN php-5.0.4RC1.orig/ext/dba/config.m4 php-5.0.4RC1/ext/dba/config.m4
+--- php-5.0.4RC1.orig/ext/dba/config.m4        2005-03-15 18:21:04.484506864 +0100
++++ php-5.0.4RC1/ext/dba/config.m4     2005-03-15 18:22:03.103595408 +0100
 @@ -21,7 +21,7 @@
  dnl Assign INCLUDE/LFLAGS from PREFIX
- AC_DEFUN(PHP_DBA_STD_ASSIGN,[
+ 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
  ])
  
-@@ -121,7 +121,7 @@
+@@ -120,7 +120,7 @@
          AC_DEFINE_UNQUOTED(GDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
          AC_DEFINE(DBA_GDBM, 1, [ ]) 
          THIS_LIBS=gdbm
@@ -96,7 +98,7 @@ diff -burN php-5.0.3RC2.orig/ext/dba/config.m4 php-5.0.3RC2/ext/dba/config.m4
      fi
      
      PHP_DBA_STD_ASSIGN
-@@ -153,7 +153,7 @@
+@@ -152,7 +152,7 @@
            AC_DEFINE_UNQUOTED(NDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
            AC_DEFINE(DBA_NDBM, 1, [ ]) 
            THIS_LIBS=$LIB
@@ -105,9 +107,9 @@ diff -burN php-5.0.3RC2.orig/ext/dba/config.m4 php-5.0.3RC2/ext/dba/config.m4
          if test -n "$THIS_LIBS"; then
            break
          fi
-@@ -171,8 +171,8 @@
+@@ -170,8 +170,8 @@
  dnl parameters(version, library list, function)
- AC_DEFUN(PHP_DBA_DB_CHECK,[
+ 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,[
@@ -116,7 +118,7 @@ diff -burN php-5.0.3RC2.orig/ext/dba/config.m4 php-5.0.3RC2/ext/dba/config.m4
          AC_TRY_LINK([
  #include "$THIS_INCLUDE"
          ],[
-@@ -367,7 +367,7 @@
+@@ -366,7 +366,7 @@
            fi
            AC_DEFINE(DBA_DBM, 1, [ ]) 
            THIS_LIBS=$LIB
@@ -125,7 +127,7 @@ diff -burN php-5.0.3RC2.orig/ext/dba/config.m4 php-5.0.3RC2/ext/dba/config.m4
          if test -n "$THIS_LIBS"; then
            break
          fi
-@@ -409,7 +409,7 @@
+@@ -408,7 +408,7 @@
            AC_DEFINE_UNQUOTED(CDB_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
            AC_DEFINE(DBA_CDB, 1, [ ]) 
            THIS_LIBS=$LIB
@@ -134,9 +136,9 @@ diff -burN php-5.0.3RC2.orig/ext/dba/config.m4 php-5.0.3RC2/ext/dba/config.m4
          if test -n "$THIS_LIBS"; then
            break
          fi
-diff -burN php-5.0.3RC2.orig/ext/gd/config.m4 php-5.0.3RC2/ext/gd/config.m4
---- php-5.0.3RC2.orig/ext/gd/config.m4 2004-12-13 11:25:21.629005984 +0100
-+++ php-5.0.3RC2/ext/gd/config.m4      2004-12-13 11:26:08.497880832 +0100
+diff -burN php-5.0.4RC1.orig/ext/gd/config.m4 php-5.0.4RC1/ext/gd/config.m4
+--- php-5.0.4RC1.orig/ext/gd/config.m4 2005-03-15 18:21:04.469509144 +0100
++++ php-5.0.4RC1/ext/gd/config.m4      2005-03-15 18:22:03.104595256 +0100
 @@ -51,7 +51,7 @@
    if test "$PHP_JPEG_DIR" != "no"; then
  
@@ -242,7 +244,7 @@ diff -burN php-5.0.3RC2.orig/ext/gd/config.m4 php-5.0.3RC2/ext/gd/config.m4
      ])
    fi
  ])
-@@ -363,7 +363,7 @@
+@@ -365,7 +365,7 @@
    done
  
  dnl Library path
@@ -251,42 +253,10 @@ diff -burN php-5.0.3RC2.orig/ext/gd/config.m4 php-5.0.3RC2/ext/gd/config.m4
      test -f "$PHP_GD/$i/libgd.$SHLIB_SUFFIX_NAME" -o -f "$PHP_GD/$i/libgd.a" && GD_LIB="$PHP_GD/$i"
    done
  
-diff -burN php-5.0.3RC2.orig/ext/imap/config.m4 php-5.0.3RC2/ext/imap/config.m4
---- php-5.0.3RC2.orig/ext/imap/config.m4       2004-12-13 11:25:21.735989720 +0100
-+++ php-5.0.3RC2/ext/imap/config.m4    2004-12-13 11:26:08.503879920 +0100
-@@ -59,7 +59,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
-@@ -72,7 +72,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)
-@@ -104,11 +104,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
-@@ -166,13 +166,13 @@
+diff -burN php-5.0.4RC1.orig/ext/imap/config.m4 php-5.0.4RC1/ext/imap/config.m4
+--- php-5.0.4RC1.orig/ext/imap/config.m4       2005-03-15 18:21:04.545497592 +0100
++++ php-5.0.4RC1/ext/imap/config.m4    2005-03-15 18:22:03.105595104 +0100
+@@ -148,13 +148,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
@@ -303,9 +273,9 @@ diff -burN php-5.0.3RC2.orig/ext/imap/config.m4 php-5.0.3RC2/ext/imap/config.m4
        IMAP_LIB_CHK(c-client)
      done
  
-diff -burN php-5.0.3RC2.orig/ext/ldap/config.m4 php-5.0.3RC2/ext/ldap/config.m4
---- php-5.0.3RC2.orig/ext/ldap/config.m4       2004-12-13 11:25:21.741988808 +0100
-+++ php-5.0.3RC2/ext/ldap/config.m4    2004-12-13 11:26:08.506879464 +0100
+diff -burN php-5.0.4RC1.orig/ext/ldap/config.m4 php-5.0.4RC1/ext/ldap/config.m4
+--- php-5.0.4RC1.orig/ext/ldap/config.m4       2005-03-15 18:21:04.551496680 +0100
++++ php-5.0.4RC1/ext/ldap/config.m4    2005-03-15 18:22:03.107594800 +0100
 @@ -6,15 +6,15 @@
    if test -f $1/include/ldap.h; then
      LDAP_DIR=$1
@@ -325,9 +295,9 @@ diff -burN php-5.0.3RC2.orig/ext/ldap/config.m4 php-5.0.3RC2/ext/ldap/config.m4
    fi
  ])
  
-diff -burN php-5.0.3RC2.orig/ext/ming/config.m4 php-5.0.3RC2/ext/ming/config.m4
---- php-5.0.3RC2.orig/ext/ming/config.m4       2004-12-13 11:25:21.747987896 +0100
-+++ php-5.0.3RC2/ext/ming/config.m4    2004-12-13 11:26:08.519877488 +0100
+diff -burN php-5.0.4RC1.orig/ext/ming/config.m4 php-5.0.4RC1/ext/ming/config.m4
+--- php-5.0.4RC1.orig/ext/ming/config.m4       2005-03-15 18:21:04.555496072 +0100
++++ php-5.0.4RC1/ext/ming/config.m4    2005-03-15 18:22:03.108594648 +0100
 @@ -9,7 +9,7 @@
    AC_CHECK_LIB(m, sin)
  
@@ -335,9 +305,9 @@ diff -burN php-5.0.3RC2.orig/ext/ming/config.m4 php-5.0.3RC2/ext/ming/config.m4
 -    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
+       break
      fi
-   done
-@@ -33,11 +33,11 @@
+@@ -34,11 +34,11 @@
    ],[
      AC_MSG_ERROR([Ming library 0.2a or greater required.])
    ],[
@@ -351,9 +321,9 @@ diff -burN php-5.0.3RC2.orig/ext/ming/config.m4 php-5.0.3RC2/ext/ming/config.m4
  
    AC_MSG_CHECKING([for destroySWFBlock])
    AC_TRY_RUN([
-diff -burN php-5.0.3RC2.orig/ext/mssql/config.m4 php-5.0.3RC2/ext/mssql/config.m4
---- php-5.0.3RC2.orig/ext/mssql/config.m4      2004-12-13 11:25:21.898964944 +0100
-+++ php-5.0.3RC2/ext/mssql/config.m4   2004-12-13 11:26:58.696249520 +0100
+diff -burN php-5.0.4RC1.orig/ext/mssql/config.m4 php-5.0.4RC1/ext/mssql/config.m4
+--- php-5.0.4RC1.orig/ext/mssql/config.m4      2005-03-15 18:21:04.646482240 +0100
++++ php-5.0.4RC1/ext/mssql/config.m4   2005-03-15 18:22:03.108594648 +0100
 @@ -32,12 +32,12 @@
      fi
    fi  
@@ -370,9 +340,9 @@ diff -burN php-5.0.3RC2.orig/ext/mssql/config.m4 php-5.0.3RC2/ext/mssql/config.m
  
    PHP_ADD_INCLUDE($MSSQL_INCDIR)
    PHP_ADD_LIBRARY_WITH_PATH(sybdb, $MSSQL_LIBDIR, MSSQL_SHARED_LIBADD)
-diff -burN php-5.0.3RC2.orig/ext/mysql/config.m4 php-5.0.3RC2/ext/mysql/config.m4
---- php-5.0.3RC2.orig/ext/mysql/config.m4      2004-12-13 11:25:21.901964488 +0100
-+++ php-5.0.3RC2/ext/mysql/config.m4   2004-12-13 11:26:08.524876728 +0100
+diff -burN php-5.0.4RC1.orig/ext/mysql/config.m4 php-5.0.4RC1/ext/mysql/config.m4
+--- php-5.0.4RC1.orig/ext/mysql/config.m4      2005-03-15 18:21:04.649481784 +0100
++++ php-5.0.4RC1/ext/mysql/config.m4   2005-03-15 18:22:03.109594496 +0100
 @@ -17,7 +17,7 @@
      /var/run/mysqld/mysqld.sock \
      /var/tmp/mysql.sock \
@@ -403,9 +373,9 @@ diff -burN php-5.0.3RC2.orig/ext/mysql/config.m4 php-5.0.3RC2/ext/mysql/config.m
      else
        PHP_ADD_LIBRARY(z,, MYSQL_SHARED_LIBADD)
        PHP_CHECK_LIBRARY(mysqlclient, mysql_errno, [], [
-diff -burN php-5.0.3RC2.orig/ext/pgsql/config.m4 php-5.0.3RC2/ext/pgsql/config.m4
---- php-5.0.3RC2.orig/ext/pgsql/config.m4      2004-12-13 11:25:21.913962664 +0100
-+++ php-5.0.3RC2/ext/pgsql/config.m4   2004-12-13 11:26:08.526876424 +0100
+diff -burN php-5.0.4RC1.orig/ext/pgsql/config.m4 php-5.0.4RC1/ext/pgsql/config.m4
+--- php-5.0.4RC1.orig/ext/pgsql/config.m4      2005-03-15 18:21:04.658480416 +0100
++++ php-5.0.4RC1/ext/pgsql/config.m4   2005-03-15 18:22:03.109594496 +0100
 @@ -44,7 +44,7 @@
          fi
        done
@@ -415,9 +385,9 @@ diff -burN php-5.0.3RC2.orig/ext/pgsql/config.m4 php-5.0.3RC2/ext/pgsql/config.m
          if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then 
            PGSQL_LIBDIR=$i/$j
          fi
-diff -burN php-5.0.3RC2.orig/ext/xml/config.m4 php-5.0.3RC2/ext/xml/config.m4
---- php-5.0.3RC2.orig/ext/xml/config.m4        2004-12-13 11:25:21.716992608 +0100
-+++ php-5.0.3RC2/ext/xml/config.m4     2004-12-13 11:26:08.528876120 +0100
+diff -burN php-5.0.4RC1.orig/ext/xml/config.m4 php-5.0.4RC1/ext/xml/config.m4
+--- php-5.0.4RC1.orig/ext/xml/config.m4        2005-03-15 18:21:04.530499872 +0100
++++ php-5.0.4RC1/ext/xml/config.m4     2005-03-15 18:22:03.110594344 +0100
 @@ -30,7 +30,7 @@
    dnl
    if test "$PHP_LIBEXPAT_DIR" != "no"; then
@@ -436,9 +406,9 @@ diff -burN php-5.0.3RC2.orig/ext/xml/config.m4 php-5.0.3RC2/ext/xml/config.m4
      AC_DEFINE(HAVE_LIBEXPAT, 1, [ ])
    fi
  
-diff -burN php-5.0.3RC2.orig/ext/xmlrpc/config.m4 php-5.0.3RC2/ext/xmlrpc/config.m4
---- php-5.0.3RC2.orig/ext/xmlrpc/config.m4     2004-12-13 11:25:22.261909768 +0100
-+++ php-5.0.3RC2/ext/xmlrpc/config.m4  2004-12-13 11:26:08.532875512 +0100
+diff -burN php-5.0.4RC1.orig/ext/xmlrpc/config.m4 php-5.0.4RC1/ext/xmlrpc/config.m4
+--- php-5.0.4RC1.orig/ext/xmlrpc/config.m4     2005-03-15 18:21:04.902443328 +0100
++++ php-5.0.4RC1/ext/xmlrpc/config.m4  2005-03-15 18:22:03.110594344 +0100
 @@ -23,9 +23,9 @@
  
    testval=no
@@ -459,9 +429,9 @@ diff -burN php-5.0.3RC2.orig/ext/xmlrpc/config.m4 php-5.0.3RC2/ext/xmlrpc/config
 +  PHP_ADD_LIBRARY_WITH_PATH(xmlrpc, $XMLRPC_DIR/lib64, XMLRPC_SHARED_LIBADD)
  fi
  
-diff -burN php-5.0.3RC2.orig/php.ini php-5.0.3RC2/php.ini
---- php-5.0.3RC2.orig/php.ini  2004-12-13 11:25:23.870665200 +0100
-+++ php-5.0.3RC2/php.ini       2004-12-13 11:26:08.538874600 +0100
+diff -burN php-5.0.4RC1.orig/php.ini php-5.0.4RC1/php.ini
+--- php-5.0.4RC1.orig/php.ini  2005-03-15 18:21:05.162403808 +0100
++++ php-5.0.4RC1/php.ini       2005-03-15 18:22:03.111594192 +0100
 @@ -514,7 +514,7 @@
  user_dir =
  
@@ -471,9 +441,9 @@ diff -burN php-5.0.3RC2.orig/php.ini php-5.0.3RC2/php.ini
  
  ; 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
-diff -burN php-5.0.3RC2.orig/scripts/Makefile.frag php-5.0.3RC2/scripts/Makefile.frag
---- php-5.0.3RC2.orig/scripts/Makefile.frag    2004-12-13 11:25:23.782678576 +0100
-+++ php-5.0.3RC2/scripts/Makefile.frag 2004-12-13 11:26:08.544873688 +0100
+diff -burN php-5.0.4RC1.orig/scripts/Makefile.frag php-5.0.4RC1/scripts/Makefile.frag
+--- php-5.0.4RC1.orig/scripts/Makefile.frag    2005-03-15 18:21:05.145406392 +0100
++++ php-5.0.4RC1/scripts/Makefile.frag 2005-03-15 18:22:03.112594040 +0100
 @@ -4,7 +4,7 @@
  #
  

diff --git a/php-libtool.patch b/php-libtool.patch
index 0a06d48aa844ccbb5c2b15fe8cda563c1a80de11..f085be46f17d048e32e0f52d50c57c4fad8e6e7d 100644 (file)
--- a/php-libtool.patch
+++ b/php-libtool.patch
@@ -1,6 +1,7 @@
---- php-4.3.0/acinclude.m4.orig        Sun Nov 17 20:28:57 2002
-+++ php-4.3.0/acinclude.m4     Fri Jan  3 09:59:15 2003
-@@ -838,13 +838,13 @@
+diff -burN php-5.0.4RC1.orig/acinclude.m4 php-5.0.4RC1/acinclude.m4
+--- php-5.0.4RC1.orig/acinclude.m4     2005-03-15 18:02:27.869258184 +0100
++++ php-5.0.4RC1/acinclude.m4  2005-03-15 18:04:34.037077760 +0100
+@@ -779,13 +779,13 @@
  dnl
  AC_DEFUN([PHP_BUILD_PROGRAM],[
    OVERALL_TARGET=[]ifelse($1,,php,$1)
@@ -9,13 +10,13 @@
    php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
 -  php_c_post=' && echo > $[@]'
 -  php_cxx_pre='$(CXX)'
-+  php_c_post=
++  php_c_post=''
 +  php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
    php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
 -  php_cxx_post=' && echo > $[@]'
 -  php_lo=o
-+  php_cxx_post=
++  php_cxx_post=''
 +  php_lo=lo
-   
-   shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-   shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) -prefer-pic'
+ 
+   case $with_pic in
+     yes) pic_setting='-prefer-pic';;

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

diff --git a/php-sybase-fix.patch b/php-sybase-fix.patch
index 519c1006d309603a216b70d366de3ae62047c0d8..7125297a31dfb5997f85ee954418d179b1b95d20 100644 (file)
--- a/php-sybase-fix.patch
+++ b/php-sybase-fix.patch
@@ -1,6 +1,6 @@
-diff -ur php-5.0.2.orig/ext/sybase/config.m4 php-5.0.2/ext/sybase/config.m4
---- php-5.0.2.orig/ext/sybase/config.m4        2004-11-16 23:02:23.000000000 +0100
-+++ php-5.0.2/ext/sybase/config.m4     2004-11-16 23:01:42.000000000 +0100
+diff -burN php-5.0.4RC1.orig/ext/sybase/config.m4 php-5.0.4RC1/ext/sybase/config.m4
+--- php-5.0.4RC1.orig/ext/sybase/config.m4     2005-03-15 18:02:27.502313968 +0100
++++ php-5.0.4RC1/ext/sybase/config.m4  2005-03-15 18:09:18.738796520 +0100
 @@ -18,6 +18,7 @@
    PHP_ADD_INCLUDE($SYBASE_INCDIR)
    PHP_ADD_LIBRARY_WITH_PATH(sybdb, $SYBASE_LIBDIR, SYBASE_SHARED_LIBADD)
@@ -9,21 +9,3 @@ diff -ur php-5.0.2.orig/ext/sybase/config.m4 php-5.0.2/ext/sybase/config.m4
    AC_CHECK_LIB(dnet_stub, dnet_addr,
       [ PHP_ADD_LIBRARY_WITH_PATH(dnet_stub,,SYBASE_SHARED_LIBADD)
          AC_DEFINE(HAVE_LIBDNET_STUB,1,[ ])
-diff -ur php-5.0.2.orig/ext/sybase/php_sybase_db.c php-5.0.2/ext/sybase/php_sybase_db.c
---- php-5.0.2.orig/ext/sybase/php_sybase_db.c  2004-07-10 09:46:08.000000000 +0200
-+++ php-5.0.2/ext/sybase/php_sybase_db.c       2004-11-16 23:04:25.000000000 +0100
-@@ -1108,9 +1108,11 @@
- {
-       php_sybase_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-       if (Z_TYPE_P(return_value)==IS_ARRAY) {
--              Z_TYPE_P(return_value)=IS_OBJECT;
--              Z_OBJPROP_P(return_value) = Z_ARRVAL_P(return_value);
--              Z_OBJCE_P(return_value) = ZEND_STANDARD_CLASS_DEF_PTR;
-+              object_and_properties_init(
-+                  return_value, 
-+                  ZEND_STANDARD_CLASS_DEF_PTR, 
-+                  Z_ARRVAL_P(return_value)
-+                  );
-       }
- }
- /* }}} */

diff --git a/php-threads-acfix.patch b/php-threads-acfix.patch
index ef065818380e2131b8355b2657c9c3c5ba3cdb91..12e770f0d4829c18f62cfe69ac2d6bdc8b3163c1 100644 (file)
--- a/php-threads-acfix.patch
+++ b/php-threads-acfix.patch
@@ -1,6 +1,7 @@
---- 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 @@
+diff -burN php-5.0.4RC1.orig/TSRM/threads.m4 php-5.0.4RC1/TSRM/threads.m4
+--- php-5.0.4RC1.orig/TSRM/threads.m4  2005-03-15 18:02:27.630294512 +0100
++++ php-5.0.4RC1/TSRM/threads.m4       2005-03-15 18:07:05.301082136 +0100
+@@ -116,7 +116,6 @@
  else
    save_CFLAGS=$CFLAGS
    save_LIBS=$LIBS
@@ -8,7 +9,7 @@
    PTHREADS_CHECK_COMPILE
    LIBS=$save_LIBS
    CFLAGS=$save_CFLAGS
-@@ -126,9 +125,10 @@
+@@ -134,9 +133,10 @@
          break
        fi
      done
@@ -20,34 +21,36 @@
  
  AC_CACHE_CHECK(for pthreads_lib, ac_cv_pthreads_lib,[
  ac_cv_pthreads_lib=
-@@ -155,6 +155,7 @@
+@@ -163,6 +163,7 @@
  dnl
  dnl
- AC_DEFUN(PTHREADS_ASSIGN_VARS,[
+ 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 @@
+@@ -170,4 +171,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
+diff -burN php-5.0.4RC1.orig/TSRM/tsrm.m4 php-5.0.4RC1/TSRM/tsrm.m4
+--- php-5.0.4RC1.orig/TSRM/tsrm.m4     2005-03-15 18:02:27.627294968 +0100
++++ php-5.0.4RC1/TSRM/tsrm.m4  2005-03-15 18:05:32.858135600 +0100
 @@ -68,7 +68,6 @@
  ])
  
  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
-@@ -204,6 +204,7 @@
+diff -burN php-5.0.4RC1.orig/configure.in php-5.0.4RC1/configure.in
+--- php-5.0.4RC1.orig/configure.in     2005-03-15 18:02:27.857260008 +0100
++++ php-5.0.4RC1/configure.in  2005-03-15 18:05:32.858135600 +0100
+@@ -226,6 +226,7 @@
  
  sinclude(Zend/acinclude.m4)
  sinclude(Zend/Zend.m4)

diff --git a/php.spec b/php.spec
index db6c22bc5f82a57512a22065258bc6376ae1572e..ba53b0092d03899c1ee289280e664d65befeb301 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -13,6 +13,7 @@
 # - enabling sybase+sybase_ct+mssql together causes SEGV beside warnings
 # - mime_magic can't handle new "string/*" entries in magic.mime
 # - make additional headers added by mail patch configurable
+# - apply -hardened patch by default ?
 #
 # Conditional build:
 %bcond_with    db3             # use db3 packages instead of db (4.x) for Berkeley DB support
@@ -74,13 +75,15 @@ Summary(pt_BR):     A linguagem de script PHP
 Summary(ru):   PHP ÷ÅÒÓÉÉ 5 - ÑÚÙË ÐÒÅÐÒÏÃÅÓÓÉÒÏ×ÁÎÉÑ HTML-ÆÁÊÌÏ×, ×ÙÐÏÌÎÑÅÍÙÊ ÎÁ ÓÅÒ×ÅÒÅ
 Summary(uk):   PHP ÷ÅÒÓ¦§ 5 - ÍÏ×Á ÐÒÅÐÒÏÃÅÓÕ×ÁÎÎÑ HTML-ÆÁÊ̦×, ×ÉËÏÎÕ×ÁÎÁ ÎÁ ÓÅÒ×ÅÒ¦
 Name:          php
-Version:       5.0.3
-Release:       4.3%{?with_hardened:hardened}
+Version:       5.0.4
+%define                _suf    RC1
+Release:       0.%{_suf}.1%{?with_hardened:hardened}
 Epoch:         4
 Group:         Libraries
 License:       PHP
-Source0:       http://www.php.net/distributions/%{name}-%{version}.tar.bz2
-# Source0-md5: fd26455febdddee0977ce226b9108d9c
+##Source0:     http://www.php.net/distributions/%{name}-%{version}.tar.bz2
+Source0:       http://downloads.php.net/zeev/%{name}-%{version}%{_suf}.tar.bz2
+# Source0-md5: 909ed6a29bb45ba663795773821a6aef
 Source1:       FAQ.%{name}
 Source2:       zend.gif
 Source3:       %{name}-module-install
@@ -89,7 +92,7 @@ Source5:      %{name}-cgi-fcgi.ini
 Source6:       %{name}-cgi.ini
 Source7:       %{name}-apache.ini
 Source8:       %{name}-cli.ini
-Source9:       http://www.hardened-php.net/hardened-php-%{version}-0.2.5.patch.gz
+Source9:       http://www.hardened-php.net/hardened-php-5.0.3-0.2.5.patch.gz
 # Source9-md5: cc91bb34a066135f1ef7cb1d4ba00b0d
 Patch0:                %{name}-shared.patch
 Patch1:                %{name}-pldlogo.patch
@@ -115,12 +118,11 @@ Patch20:  %{name}-sybase-fix.patch
 Patch21:       %{name}-mnogosearch-fix.patch
 Patch22:       %{name}-nohttpd.patch
 Patch23:       %{name}-lib64.patch
-Patch24:       %{name}-phpize.patch
-Patch25:       %{name}-gd_imagerotate_enable.patch
-Patch26:       %{name}-uint32_t.patch
-Patch27:       %{name}-hwapi-link.patch
-Patch28:       %{name}-dba-link.patch
-Patch29:       %{name}-install_gd_headers.patch
+Patch24:       %{name}-gd_imagerotate_enable.patch
+Patch25:       %{name}-uint32_t.patch
+Patch26:       %{name}-hwapi-link.patch
+Patch27:       %{name}-dba-link.patch
+Patch28:       %{name}-install_gd_headers.patch
 Icon:          php.gif
 URL:           http://www.php.net/
 %{?with_interbase:%{!?with_interbase_inst:BuildRequires:       Firebird-devel >= 1.0.2.908-2}}
@@ -1382,7 +1384,7 @@ compression support to PHP.
 Modu³ PHP umo¿liwiaj±cy u¿ywanie kompresji zlib.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{_suf}
 # this patch is broken by design, breaks --enable-versioning for example
 %patch0 -p1
 %patch1 -p1
@@ -1418,7 +1420,6 @@ cp php.ini-dist php.ini
 %patch26 -p1
 %patch27 -p1
 %patch28 -p1
-%patch29 -p1
 
 %{?with_hardened:zcat %{SOURCE9} | patch -p1}