Browse Source

upgrade php 4.3.2 -> 4.3.3 ; vendor rolled in equivalent patches

Michael van Elst 23 years ago
parent
commit
572caa47dd
2 changed files with 2 additions and 27 deletions
  1. 0 23
      apache/apache.patch.php
  2. 2 4
      apache/apache.spec

+ 0 - 23
apache/apache.patch.php

@@ -1,23 +0,0 @@
---- 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,
---- php-4.3.2/configure.dist	2003-07-01 13:52:41.000000000 +0200
-+++ php-4.3.2/configure	2003-07-01 13:53:15.000000000 +0200
-@@ -51349,10 +51349,6 @@
- #define HAVE_OCI8_ATTR_STATEMENT 1
- EOF
- 
--      cat >> confdefs.h <<\EOF
--#define HAVE_OCI8_SHARED_MODE 1
--EOF
--
- 
-             
-   save_old_LDFLAGS=$LDFLAGS

+ 2 - 4
apache/apache.spec

@@ -36,7 +36,7 @@
 %define       V_apache             1.3.28
 %define       V_mod_ssl            2.8.15-1.3.28
 %define       V_mod_perl           1.28
-%define       V_mod_php            4.3.2
+%define       V_mod_php            4.3.3
 %define       V_mod_php3           3.0.18
 %define       V_mod_dav            1.0.3-1.3.6
 %define       V_mod_layout         3.2
@@ -60,7 +60,7 @@ Distribution: OpenPKG [BASE]
 Group:        Web
 License:      ASF
 Version:      %{V_apache}
-Release:      20030812
+Release:      20030828
 
 #   package options (suexec related)
 %option       with_suexec               yes
@@ -193,7 +193,6 @@ Source22:     apache.vhost
 Source23:     apache.pl
 Source24:     rc.apache
 Patch0:       apache.patch
-Patch1:       apache.patch.php
 
 #   build information
 Prefix:       %{l_prefix}
@@ -365,7 +364,6 @@ AutoReqProv:  no
 %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