+++ /dev/null
-diff -Nur php-4.2.0/ext/java.orig/Makefile.in php-4.2.0/ext/java/Makefile.in
---- php-4.2.0/ext/java.orig/Makefile.in Sun Apr 14 02:40:57 2002
-+++ php-4.2.0/ext/java/Makefile.in Thu May 2 00:35:25 2002
-@@ -4,7 +4,7 @@
- LTLIBRARY_DEPENDENCIES = php_java.jar
-
- LTLIBRARY_LDFLAGS = $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS)
--LTLIBRARY_SHARED_LIBADD = $(LTLIBRARY_DEPENDENCIES) $(EXTRA_LIBS)
-+LTLIBRARY_SHARED_LIBADD = $(LTLIBRARY_DEPENDENCIES) $(EXTRA_LIBS) $(JAVA_SHARED_LIBADD)
-
- EXTRA_CFLAGS = $(JAVA_CFLAGS)
- EXTRA_INCLUDES = $(JAVA_INCLUDE)
-diff -Nur php-4.2.0/ext/java.orig/config.m4 php-4.2.0/ext/java/config.m4
---- php-4.2.0/ext/java.orig/config.m4 Sun Apr 14 02:40:57 2002
-+++ php-4.2.0/ext/java/config.m4 Thu May 2 00:37:36 2002
-@@ -8,6 +8,7 @@
- This extension is always built as shared.],
- [
- if test "$withval" != "no"; then
-+ ext_shared=yes
- JAVA_SHARED=libphp_java.la
-
- pltform=`uname -s 2>/dev/null`
-@@ -111,7 +111,6 @@
- PHP_EXTENSION(java, shared)
-
-- if test "$PHP_SAPI" = "cgi"; then
-- PHP_ADD_LIBRARY($JAVA_LIB)
-+ PHP_SUBST(JAVA_SHARED_LIBADD)
-+ PHP_ADD_LIBRARY($JAVA_LIB,, JAVA_SHARED_LIBADD)
-- fi
-
- INSTALL_IT="$INSTALL_IT; \$(srcdir)/build/shtool mkdir -p -f -m 0755 \$(INSTALL_ROOT)\$(libdir)"
--- /dev/null
+--- php-4.3.0/ext/java/config.m4.orig Sat Jan 4 10:51:49 2003
++++ php-4.3.0/ext/java/config.m4 Sat Jan 4 10:54:48 2003
+@@ -58,7 +58,6 @@
+ 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)
+ JAVA_CFLAGS=-DKAFFE
+ JAVA_INCLUDE=-I$PHP_JAVA/include/kaffe
+ JAVA_CLASSPATH=$PHP_JAVA/share/kaffe/Klasses.jar
+@@ -111,10 +110,6 @@
+ JAVA_LIB=java
+ JAVA_LIBPATH=$i
+
+- test -d $i/hotspot && PHP_ADD_LIBPATH($i/hotspot)
+- test -d $i/classic && PHP_ADD_LIBPATH($i/classic)
+- test -d $i/server && PHP_ADD_LIBPATH($i/server)
+- test -d $i/native_threads && PHP_ADD_LIBPATH($i/native_threads)
+ fi
+ done
+
+@@ -160,19 +155,12 @@
+ AC_MSG_ERROR([unable to find Java VM libraries in $PHP_JAVA])
+ fi
+
+- PHP_ADD_LIBPATH($JAVA_LIBPATH)
+ JAVA_CFLAGS="$JAVA_CFLAGS '-DJAVALIB=\"$JAVA_LIBPATH/$java_libext\"'"
+ fi
+
+ if test "$PHP_SAPI" != "servlet"; then
+ PHP_NEW_EXTENSION(java, java.c, shared,, $JAVA_CFLAGS $JAVA_INCLUDE)
+
+- if test "$PHP_SAPI" = "cgi"; then
+- if test "$platform" != "Darwin"; then
+- PHP_ADD_LIBRARY($JAVA_LIB)
+- fi
+- fi
+-
+ INSTALL_IT="$INSTALL_IT; \$(srcdir)/build/shtool mkdir -p -f -m 0755 \$(INSTALL_ROOT)\$(libdir)"
+ INSTALL_IT="$INSTALL_IT; \$(INSTALL) -m 0755 \$(srcdir)/ext/java/php_java.jar \$(INSTALL_ROOT)\$(libdir)"
+ fi
---- php-4.2.1/main/php_ini.c.orig Tue Mar 5 01:21:28 2002
-+++ php-4.2.1/main/php_ini.c Wed Jun 12 18:10:30 2002
-@@ -204,6 +204,8 @@
- char *env_location, *php_ini_search_path;
- int safe_mode_state;
- char *open_basedir;
-+ char *sapi_ini_filename;
-+ char *sapi_ini_opened_path;
- int free_ini_search_path=0;
- zend_file_handle fh;
- TSRMLS_FETCH();
-@@ -264,15 +266,10 @@
- PG(open_basedir) = NULL;
-
- fh.handle.fp = php_fopen_with_path("php.ini", "r", php_ini_search_path, &php_ini_opened_path TSRMLS_CC);
-- if (free_ini_search_path) {
-- efree(php_ini_search_path);
-- }
- PG(safe_mode) = safe_mode_state;
- PG(open_basedir) = open_basedir;
-
-- if (!fh.handle.fp) {
-- return SUCCESS; /* having no configuration file is ok */
-- }
-+ if (fh.handle.fp) {
- fh.type = ZEND_HANDLE_FP;
- fh.filename = php_ini_opened_path;
-
-@@ -288,7 +285,31 @@
- efree(php_ini_opened_path);
- php_ini_opened_path = zend_strndup(Z_STRVAL(tmp), Z_STRLEN(tmp));
+--- php-4.3.0/main/php_ini.c.orig Tue Nov 12 21:56:47 2002
++++ php-4.3.0/main/php_ini.c Sat Jan 4 12:22:39 2003
+@@ -351,6 +351,22 @@
+ }
+ }
+ }
++ /* Search (global) php.ini file in search path */
++ if (!fh.handle.fp) {
++ fh.handle.fp = php_fopen_with_path("php.ini", "r", php_ini_search_path, &php_ini_opened_path TSRMLS_CC);
++ if (fh.handle.fp) {
++ fh.filename = php_ini_opened_path;
++ }
++ PG(safe_mode) = safe_mode_state;
++ PG(open_basedir) = open_basedir;
++ fh.type = ZEND_HANDLE_FP;
++ zend_parse_ini_file(&fh, 1, php_config_ini_parser_cb, &extension_lists);
++ safe_mode_state = PG(safe_mode);
++ open_basedir = PG(open_basedir);
++ PG(safe_mode) = 0;
++ PG(open_basedir) = NULL;
++ fh.handle.fp = NULL;
++ }
+ /* Search php-%sapi-module-name%.ini file in search path */
+ if (!fh.handle.fp) {
+ const char *fmt = "php-%s.ini";
+@@ -361,13 +377,6 @@
+ if (fh.handle.fp) {
+ fh.filename = php_ini_opened_path;
+ }
+- }
+- /* Search php.ini file in search path */
+- if (!fh.handle.fp) {
+- fh.handle.fp = php_fopen_with_path("php.ini", "r", php_ini_search_path, &php_ini_opened_path TSRMLS_CC);
+- if (fh.handle.fp) {
+- fh.filename = php_ini_opened_path;
+- }
+ }
}
--
-+ }
-+
-+ sapi_ini_filename = do_alloca(7+1+strlen(sapi_module.name)+1);
-+ if(sapi_ini_filename == NULL) {
-+ if (free_ini_search_path)
-+ efree(php_ini_search_path);
-+ return SUCCESS;
-+ }
-+ sprintf(sapi_ini_filename,"php-%s.ini",sapi_module.name);
-+ fh.handle.fp = php_fopen_with_path(sapi_ini_filename, "r", php_ini_search_path, &sapi_ini_opened_path TSRMLS_CC);
-+ if (free_ini_search_path) {
-+ efree(php_ini_search_path);
-+ }
-+ if (!fh.handle.fp) {
-+ return SUCCESS; /* having no configuration file is ok */
-+ }
-+ fh.type = ZEND_HANDLE_FP;
-+ fh.filename = sapi_ini_opened_path;
-+
-+ zend_parse_ini_file(&fh, 1, php_config_ini_parser_cb, &extension_lists);
-+
-+ if (sapi_ini_opened_path)
-+ efree(sapi_ini_opened_path);
-+ free_alloca(sapi_ini_filename);
-+
- return SUCCESS;
- }
- /* }}} */
+ if (free_ini_search_path) {
#
# TODO:
# - msession module causes SEGV during phpinfo()
+# (only in Ra? doesn't happen in my environment)
# - pear - isn't built now, what is still needed???
# - fastcgi option in cgi SAPI?
# - add cli SAPI?
# maybe /usr/bin/php.{cli,cgi,fcgi}, but which one should be /usr/bin/php?
-# - what about .ini files?
-# We used (by patch) included php-${SAPI}.ini files beside global php.ini,
-# now php can use php-${SAPI}.ini files, but in place of php.ini...
+# - add notes about different behaviour (global file + included SAPI files)
+# to php*.ini
+# - look at security notes in php.ini-recommended (ugh), update ini patch;
+# set java.{class,library}.path appropriately
# - check/update "experimental" in descriptions
#
# Automatic pear requirements finding:
Patch10: %{name}-hyperwave-fix.patch
Patch11: %{name}-odbc-fix.patch
#Patch11: %{name}-openssl-for-ext-only.patch
-Patch12: %{name}-java-fix.patch
+Patch12: %{name}-java-norpath.patch
Patch13: %{name}-mcal-shared-lib.patch
Patch14: %{name}-msession-shared-lib.patch
Patch15: %{name}-build_modules.patch
-#Patch16: %{name}-sapi-ini-file.patch
+Patch16: %{name}-sapi-ini-file.patch
Patch17: %{name}-dl-zlib.patch
Patch18: %{name}-dl-pcre.patch
#Patch17: %{name}-%{name}_iconv_string_declaration.patch
support to PHP. This extension provides a simple and effective means
for creating and invoking methods on Java objects from PHP.
+Note: it requires setting LD_LIBRARY_PATH to JRE directories
+containing JVM libraries (e.g. libjava.so, libverify.so and libjvm.so
+for Sun's JRE) before starting Apache or PHP interpreter.
+
%description java -l pl
Modu³ PHP dodaj±cy wsparcie dla Javy. Umo¿liwia odwo³ywanie siê do
obiektów Javy z poziomu PHP.
+Uwaga: modu³ wymaga ustawienia LD_LIBRARY_PATH na katalogi JRE
+zawieraj±ce biblioteki JVM (np. libjava.so, libverify.so i libjvm.so
+dla JRE Suna) przed uruchomieniem Apache'a lub interpretera PHP.
+
%package ldap
Summary: LDAP extension module for PHP
Summary(pl): Modu³ LDAP dla PHP
%patch10 -p1
%patch11 -p1
#%patch11 -p1 -- obsolete (openssl used also in common part)
-#%patch12 -p1 -- needs update? to check
+%patch12 -p1
%patch13 -p1
%patch14 -p1
%patch15 -p1
-#%patch16 -p1 -- uhm... php allows _separate_ (not included) php-${SAPI}.ini files now
+%patch16 -p1
%patch17 -p1
%patch18 -p1
#%patch17 -p1 -- obsolete
%{__libtoolize}
%{__aclocal}
autoconf
-#for i in cgi cli fastcgi apxs ; do
PROG_SENDMAIL="/usr/lib/sendmail"; export PROG_SENDMAIL
-for i in cgi apxs ; do
+for i in cgi fcgi cli apxs ; do
%configure \
`[ $i = cgi ] && echo --enable-discard-path` \
`[ $i != cli ] && echo --disable-cli` \
`[ $i = cli ] && echo --disable-cgi` \
- `[ $i = fastcgi ] && --enable-fastcgi --with-fastcgi=/usr` \
+ `[ $i = fcgi ] && echo --enable-fastcgi --with-fastcgi=/usr` \
%if %{_apache2}
`[ $i = apxs ] && echo --with-apxs2=%{apxs}` \
%else
--with-zlib-dir=shared,/usr
cp -f Makefile Makefile.$i
+# for testing:
+cp -f main/php_config.h php_config.h.$i
done
# for now session_mm doesn't work with shared session module...
%{__make} sapi/cgi/php -f Makefile.cgi \
CFLAGS_CLEAN="%{rpmcflags} -DDISCARD_PATH=1"
+%{__make} sapi/cli/php -f Makefile.cli
%install
rm -rf $RPM_BUILD_ROOT
INSTALL_ROOT=$RPM_BUILD_ROOT \
INSTALL_IT="\$(LIBTOOL) --mode=install install libphp_common.la $RPM_BUILD_ROOT%{_libdir} ; \$(LIBTOOL) --mode=install install libphp4.la $RPM_BUILD_ROOT%{_libdir}/apache ; \$(LIBTOOL) --mode=install install sapi/cgi/php $RPM_BUILD_ROOT%{_bindir}"
-%{?_with_java:install ext/java/php_java.jar $RPM_BUILD_ROOT%{_libdir}}
+%{?_with_java:install ext/java/php_java.jar $RPM_BUILD_ROOT%{extensionsdir}}
install php.ini $RPM_BUILD_ROOT%{_sysconfdir}/php.ini
install %{SOURCE6} %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}
%attr(755,root,root) %{_bindir}/phpize
%attr(755,root,root) %{_bindir}/php-config
%attr(755,root,root) %{_libdir}/libphp_common.so
+%{_libdir}/libphp_common.la
%{_includedir}/php
%{_libdir}/php/build
%files java
%defattr(644,root,root,755)
%attr(755,root,root) %{extensionsdir}/java.so
-%{_libdir}/php_java.jar
+%{extensionsdir}/php_java.jar
%endif
%if %{?_without_ldap:0}%{!?_without_ldap:1}
projects / packages / php.git / commitdiff