OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 27-Jan-2004 13:32:24
Branch: HEAD Handle: 2004012712322201
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
get Apache/mod_php running with the OCI8 API provided by
oracle-barebone
Summary:
Revision Changes Path
1.202 +6 -1 openpkg-src/apache/apache.spec
1.8326 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.201 -r1.202 apache.spec
--- openpkg-src/apache/apache.spec 24 Jan 2004 13:15:56 -0000 1.201
+++ openpkg-src/apache/apache.spec 27 Jan 2004 12:32:23 -0000 1.202
@@ -61,7 +61,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 20040124
+Release: 20040127
# package options (suexec related)
%option with_suexec yes
@@ -517,6 +517,9 @@
%if "%{with_mod_php_oci7}" == "yes" || "%{with_mod_php_oci8}" == "yes"
ORACLE_HOME="`%{l_prefix}/etc/rc --query oracle_home`"
export ORACLE_HOME
+ %{l_shtool} subst \
+ -e 's;OCI8_DIR/lib;OCI8_DIR/lib32;' \
+ configure
%endif
PROG_SENDMAIL="%{l_prefix}/sbin/sendmail"
export PROG_SENDMAIL
@@ -597,6 +600,7 @@
%endif
%if "%{with_mod_php_oci8}" == "yes"
--with-oci8 \
+ --enable-sigchld \
%endif
%if "%{with_mod_php_gettext}" == "yes"
--with-gettext=%{l_prefix} \
@@ -833,6 +837,7 @@
%endif
%if "%{with_mod_php_oci7}" == "yes" || "%{with_mod_php_oci8}" == "yes"
# workaround Oracle inter-library depencency by explicitly linking in all
libraries
+ ldflags="$ldflags `%{l_prefix}/etc/rc --query oracle_ldflags`"
libs="$libs `%{l_prefix}/etc/rc --query oracle_libs`"
%endif
%if "%{with_suphp}" == "yes"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.8325 -r1.8326 news.txt
--- openpkg-web/news.txt 27 Jan 2004 11:48:58 -0000 1.8325
+++ openpkg-web/news.txt 27 Jan 2004 12:32:22 -0000 1.8326
@@ -1,3 +1,4 @@
+27-Jan-2004: Upgraded package: P<apache-1.3.29-20040127>
27-Jan-2004: Upgraded package: P<bochs-2.1-20040127>
27-Jan-2004: Upgraded package: P<oracle-20040127-20040127>
27-Jan-2004: Upgraded package: P<vim-6.2.211-20040127>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]