OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 01-Jul-2003 12:13:38
Branch: HEAD Handle: 2003070111133701
Added files:
openpkg-src/apache php.patch
Modified files:
openpkg-src/apache apache.spec
openpkg-web news.txt
Log:
php oci8 driver: don't use OCI_SHARED_MODE by default
Summary:
Revision Changes Path
1.141 +4 -2 openpkg-src/apache/apache.spec
1.2 +10 -0 openpkg-src/apache/php.patch
1.5116 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.140 -r1.141 apache.spec
--- openpkg-src/apache/apache.spec 27 Jun 2003 09:24:04 -0000 1.140
+++ openpkg-src/apache/apache.spec 1 Jul 2003 10:13:38 -0000 1.141
@@ -60,7 +60,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 20030627
+Release: 20030701
# package options (suexec related)
%option with_suexec yes
@@ -186,6 +186,7 @@
Source23: apache.pl
Source24: rc.apache
Patch0: apache.patch
+Patch1: php.patch
# build information
Prefix: %{l_prefix}
@@ -312,7 +313,7 @@
%prep
# unpack Apache distribution
%setup0 -q -c
- %patch -p0
+ %patch0 -p0
# unpack optional extension modules
%if "%{with_mod_ssl}" == "yes"
@@ -323,6 +324,7 @@
%endif
%if "%{with_mod_php}" == "yes"
%setup3 -q -T -D -a 3
+ %patch1 -p0
%endif
%if "%{with_mod_dav}" == "yes"
%setup4 -q -T -D -a 4
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/php.patch
============================================================================
$ cvs diff -u -r0 -r1.2 php.patch
--- /dev/null 2003-07-01 12:13:38.000000000 +0200
+++ php.patch 2003-07-01 12:13:38.000000000 +0200
@@ -0,0 +1,10 @@
+--- php-4.3.2/ext/oci8/config.m4.dist 2003-07-01 09:55:33.000000000 +0200
++++ php-4.3.2/ext/oci8/config.m4 2003-07-01 0:56:01.000000000 +0200
+@@ -100,7 +100,6 @@
+ PHP_ADD_LIBRARY(clntsh, 1, OCI8_SHARED_LIBADD)
+ PHP_ADD_LIBPATH($OCI8_DIR/lib, OCI8_SHARED_LIBADD)
+ AC_DEFINE(HAVE_OCI8_ATTR_STATEMENT,1,[ ])
+- AC_DEFINE(HAVE_OCI8_SHARED_MODE,1,[ ])
+
+ dnl These functions are only available in version >= 9.2
+ PHP_CHECK_LIBRARY(clntsh, OCIEnvNlsCreate,
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5115 -r1.5116 news.txt
--- openpkg-web/news.txt 1 Jul 2003 10:13:03 -0000 1.5115
+++ openpkg-web/news.txt 1 Jul 2003 10:13:37 -0000 1.5116
@@ -1,3 +1,4 @@
+01-Jul-2003: Upgraded package: P<apache-1.3.27-20030701>
01-Jul-2003: Upgraded package: P<php-4.3.2-20030701>
01-Jul-2003: Upgraded package: P<ntp-4.1.1b-20030701>
01-Jul-2003: Upgraded package: P<perl-dbi-20030701-20030701>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
