- added xml-expat-fix patch to fix finding libexpat.so for XML module

- link-libs patch is back (now it only removes -lnsl from libphp4.so)
- wddx patch is back (different fix than before)
- changed xmlrpc-fix patch (different fix than before)
- added one more fix to msession-shared-lib patch
- use system libgd instead of one internal version

Changed files:
    php-link-libs.patch -> 1.8
    php-msession-shared-lib.patch -> 1.3
    php-wddx-fix.patch -> 1.3
    php-xml-expat-fix.patch -> 1.1
    php-xmlrpc-fix.patch -> 1.2
    php.spec -> 1.229

diff --git a/php-link-libs.patch b/php-link-libs.patch
index 0d0c762529dc9b48322a8f3b664364341d25c594..5e9354b0891683b1d9a7f0142ccf23b411611166 100644 (file)
--- a/php-link-libs.patch
+++ b/php-link-libs.patch
@@ -1,53 +1,10 @@
---- ./ext/xslt/config.m4.org   Thu May  2 12:24:03 2002
-+++ ./ext/xslt/config.m4       Sat Sep  7 11:03:45 2002
-@@ -81,7 +81,7 @@
-       found_js=no
-       AC_CHECK_LIB(js, JS_GetRuntime, found_js=yes)
-       if test "$found_js" = "yes"; then
--        PHP_ADD_LIBRARY(js)
-+        PHP_ADD_LIBRARY(js,, XSLT_SHARED_LIBADD)
-       fi
-     fi
- 
---- ./ext/yp/Makefile.in.org   Tue May  2 03:21:26 2000
-+++ ./ext/yp/Makefile.in       Sat Sep  7 11:05:11 2002
-@@ -2,5 +2,6 @@
- LTLIBRARY_NAME    = libyp.la
- LTLIBRARY_SOURCES = yp.c
- LTLIBRARY_SHARED_NAME = yp.la
-+LTLIBRARY_SHARED_LIBADD = $(NSL_SHARED_LIBADD)
- 
- include $(top_srcdir)/build/dynlib.mk
---- ./ext/yp/config.m4.org     Fri Nov 30 20:00:10 2001
-+++ ./ext/yp/config.m4 Sat Sep  7 11:06:31 2002
-@@ -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)],)
-   PHP_EXTENSION(yp, $ext_shared)
-+
-   case $host_alias in
-   *solaris*)
-     AC_DEFINE(SOLARIS_YP,1,[ ]) ;;
---- ./configure.in.org Fri Sep  6 01:20:49 2002
-+++ ./configure.in     Sat Sep  7 11:01:54 2002
-@@ -292,6 +292,7 @@
- 
- if test "$php_no_nsl_checks" != "yes"; then
- 
-+AC_CHECK_FUNC(gethostname,[true], [
- AC_CHECK_LIB(nsl, gethostname, [
-  PHP_ADD_LIBRARY(nsl)
-  AC_DEFINE(HAVE_LIBNSL,1,[ ]) ],[
-@@ -299,6 +300,7 @@
-   PHP_ADD_LIBRARY(nsl)
-   AC_DEFINE(HAVE_LIBNSL,1,[ ]) ], [])
- ])
-+])
- 
- fi
- 
+--- php-4.3.0/configure.in.orig        Fri Dec 27 05:07:18 2002
++++ php-4.3.0/configure.in     Thu Jan  2 20:34:43 2003
+@@ -288,7 +288,6 @@
+ PHP_CHECK_FUNC(htonl, socket)
+ PHP_CHECK_FUNC(gethostname, nsl)
+ PHP_CHECK_FUNC(gethostbyaddr, nsl)
+-PHP_CHECK_FUNC(yp_get_default_domain, nsl)
+ 
+ PHP_CHECK_FUNC(dlopen, dl)
+ if test "$ac_cv_func_dlopen" = "yes"; then

diff --git a/php-msession-shared-lib.patch b/php-msession-shared-lib.patch
index 293f8cdf84d60f6712845e358e0d4afe64d7be7b..dc2fa6071bc6cfc0e582a7fcf04369546c26e200 100644 (file)
--- a/php-msession-shared-lib.patch
+++ b/php-msession-shared-lib.patch
@@ -1,5 +1,5 @@
---- php-4.2.1/ext/msession/config.m4.orig      Fri Nov 30 19:59:44 2001
-+++ php-4.2.1/ext/msession/config.m4   Tue May 14 00:42:05 2002
+--- php-4.3.0/ext/msession/config.m4.orig      Thu Jan  2 20:40:11 2003
++++ php-4.3.0/ext/msession/config.m4   Thu Jan  2 20:42:17 2003
 @@ -6,12 +6,12 @@
  [  --with-msession[=DIR]   Include msession support])
   
@@ -15,3 +15,15 @@
                                PHOENIX_DIR=$i
                                AC_MSG_RESULT(found in $i)
                        fi
+@@ -25,9 +25,9 @@
+ 
+ 
+       AC_DEFINE(HAVE_MSESSION, 1, [ ])
+-      PHP_ADD_LIBRARY_WITH_PATH(phoenix, "$PHOENIX_DIR/lib", PHOENIX_LIB)
++      PHP_ADD_LIBRARY_WITH_PATH(phoenix, "$PHOENIX_DIR/lib", MSESSION_SHARED_LIBADD)
+       PHOENIX_INCLUDE="-I$PHOENIX_DIR"
+-      PHP_SUBST(PHOENIX_LIB)
++      PHP_SUBST(MSESSION_SHARED_LIBADD)
+ 
+       PHP_NEW_EXTENSION(msession, msession.c, $ext_shared)
+ fi

diff --git a/php-wddx-fix.patch b/php-wddx-fix.patch
index c74fca821b1b6317e14e0178431f547fa2c921e9..6757b0caad78ddcad2d2992f07d6a0878c9c61fe 100644 (file)
--- a/php-wddx-fix.patch
+++ b/php-wddx-fix.patch
@@ -1,25 +1,9 @@
---- php-4.2.0/ext/wddx/Makefile.in.orig        Wed May  1 17:42:43 2002
-+++ php-4.2.0/ext/wddx/Makefile.in     Wed May  1 17:53:04 2002
-@@ -1,5 +1,9 @@
- 
- LTLIBRARY_NAME    = libwddx.la
- LTLIBRARY_SOURCES = wddx.c
-+LTLIBRARY_DEPENDENCIES  = $(EXPAT_INTERNAL_LIBADD)
-+LTLIBRARY_LIBADD        = $(LTLIBRARY_DEPENDENCIES)
-+LTLIBRARY_SHARED_NAME = wddx.la
-+LTLIBRARY_SHARED_LIBADD = $(EXPAT_SHARED_LIBADD)
- 
- include $(top_srcdir)/build/dynlib.mk
---- php-4.2.0/ext/wddx/wddx.c.orig     Thu May  2 03:21:31 2002
-+++ php-4.2.0/ext/wddx/wddx.c  Thu May  2 03:21:17 2002
-@@ -124,6 +124,10 @@
- };
- /* }}} */
- 
-+#ifdef COMPILE_DL_WDDX
-+ZEND_GET_MODULE(wddx)
-+#endif
-+
- /* {{{ wddx_stack_init
-  */   
- static int wddx_stack_init(wddx_stack *stack)
+--- php-4.3.0/ext/wddx/config.m4.orig  Tue Mar 12 17:37:42 2002
++++ php-4.3.0/ext/wddx/config.m4       Thu Jan  2 21:00:50 2003
+@@ -12,4 +12,6 @@
+   fi
+   AC_DEFINE(HAVE_WDDX, 1, [ ])
+   PHP_NEW_EXTENSION(wddx, wddx.c, $ext_shared)
++  WDDX_SHARED_LIBADD="-lexpat"
++  PHP_SUBST(WDDX_SHARED_LIBADD)
+ fi

diff --git a/php-xml-expat-fix.patch b/php-xml-expat-fix.patch
new file mode 100644 (file)
index 0000000..41c4088
--- /dev/null
+++ b/php-xml-expat-fix.patch
@@ -0,0 +1,11 @@
+--- php-4.3.0/ext/xml/config.m4.orig   Thu Nov  7 20:31:08 2002
++++ php-4.3.0/ext/xml/config.m4        Thu Jan  2 19:54:39 2003
+@@ -27,7 +27,7 @@
+   else
+     PHP_NEW_EXTENSION(xml, xml.c, $ext_shared)
+ 
+-    for i in $PHP_XML $PHP_EXPAT_DIR; do
++    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
+         EXPAT_DIR=$i
+       fi

diff --git a/php-xmlrpc-fix.patch b/php-xmlrpc-fix.patch
index e3f85bf53755cf261cb8ddf45a8e04606e151310..52e699bd4ac4ead82e93891c144f26decc08901f 100644 (file)
--- a/php-xmlrpc-fix.patch
+++ b/php-xmlrpc-fix.patch
@@ -1,21 +1,11 @@
---- php-4.2.3/ext/xmlrpc/config.m4.orig        Sat Sep  7 20:49:15 2002
-+++ php-4.2.3/ext/xmlrpc/config.m4     Sat Sep  7 21:05:25 2002
-@@ -29,6 +29,7 @@
-   for i in /usr /usr/local $PHP_EXPAT_DIR $XMLRPC_DIR; do
-     if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME; then
-       AC_DEFINE(HAVE_LIBEXPAT2,1,[ ])
-+      ext_shared=$xmlrpc_ext_shared
-       PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib, XMLRPC_SHARED_LIBADD)
-       PHP_ADD_INCLUDE($i/include)
-       testval=yes
-@@ -87,8 +87,9 @@
+--- php-4.3.0/ext/xmlrpc/config.m4.orig        Wed Sep  4 20:47:25 2002
++++ php-4.3.0/ext/xmlrpc/config.m4     Thu Jan  2 21:29:53 2003
+@@ -85,6 +85,8 @@
      AC_MSG_ERROR(Please reinstall the XMLRPC-EPI distribution)
    fi
  
-+  ext_shared=$xmlrpc_ext_shared
++  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, $PHP_XMLRPC/lib, XMLRPC_SHARED_LIBADD)
+   PHP_ADD_LIBRARY_WITH_PATH(xmlrpc, $XMLRPC_DIR/lib, XMLRPC_SHARED_LIBADD)
    
- fi
- 

diff --git a/php.spec b/php.spec
index 8f8034483f44ddbb87f561c4c68ba29a2106b63b..7f9f2d3eb20c6ff596247a9cb51cd050480fa7b5 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -1,11 +1,10 @@
 #
 # TODO:
-# - cannot find libexpat for XML module,
-#   with --with-expat-dir=/usr finds, but xmlrpc is built as static
-# - libphp4.so is linked with -lnsl
-# - msession.so isn't linked with -lphoenix
-# - odbc.so isn't linked with -lodbc*
-# - wddx.so isn't linked with anything except libc
+# - odbc.so isn't linked with -lodbc* (shared odbc is broken in config.m4)
+# - BUILD!!! (shared patch, libphp_common, SAPIs)
+# - fastcgi option in cgi SAPI?
+# - add cli SAPI?
+# - check/update "experimental" in descriptions
 #
 # Automatic pear requirements finding:
 %include       /usr/lib/rpm/macros.php
@@ -77,9 +76,10 @@ Source6:     %{name}-cgi.ini
 Source7:       %{name}-apache.ini
 Patch0:                %{name}-shared.patch
 Patch1:                %{name}-pldlogo.patch
+Patch2:                %{name}-xml-expat-fix.patch
 #Patch2:               %{name}-mysql-socket.patch
 Patch3:                %{name}-mail.patch
-#Patch4:               %{name}-link-libs.patch
+Patch4:                %{name}-link-libs.patch
 #Patch5:               %{name}-fastcgi.patch
 Patch6:                %{name}-libpq_fs_h_path.patch
 Patch7:                %{name}-wddx-fix.patch
@@ -1219,6 +1219,7 @@ Summary(pl):      Modu
 Group:         Libraries
 Requires(post,preun):%{name}-common = %{version}
 Requires:      %{name}-common = %{version}
+Requires:      yaz >= 1.9
 
 %description yaz
 This is a dynamic shared object (DSO) for Apache that will add yaz
@@ -1326,11 +1327,12 @@ Repozytorium Aplikacji. Ten pakiet zawiera aplikacje potrzebne do
 #%patch0 -p1   -- needs update!
 %patch1 -p1
 #%patch2 -p1   -- obsolete
+%patch2 -p1
 %patch3 -p1
-#%patch4 -p1   -- seems obsolete
-#%patch5 -p1   -- obsolete (fastcgi SAPI removed)
+%patch4 -p1
+#%patch5 -p1   -- obsolete (fastcgi interface changed)
 %patch6 -p1
-#%patch7 -p1   -- partially obsolete, the rest to check (too many changes)
+%patch7 -p1
 %patch8 -p1
 #%patch9 -p1   -- obsolete
 %patch10 -p1
@@ -1422,7 +1424,7 @@ for i in cgi apxs ; do
        --with-filepro=shared \
        --with-freetype-dir=shared \
        --with-gettext=shared \
-       --with-gd=shared \
+       --with-gd=shared,/usr \
        --with-gdbm \
        --with-gmp=shared \
        --with-hyperwave=shared \