diff --git a/apache/apache-php-db4.patch b/apache/apache-php-db4.patch deleted file mode 100644 index 682a67685b..0000000000 --- a/apache/apache-php-db4.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- php-4.2.3/ext/dba/dba_db3.c.orig Thu Apr 18 14:31:19 2002 -+++ php-4.2.3/ext/dba/dba_db3.c Fri Nov 22 10:30:24 2002 -@@ -74,7 +74,11 @@ - } - - if (db_create(&dbp, NULL, 0) == 0 && -+#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) -+ dbp->open(dbp, 0, info->path, NULL, type, gmode, filemode) == 0) { -+#else - dbp->open(dbp, info->path, NULL, type, gmode, filemode) == 0) { -+#endif - dba_db3_data *data; - - data = malloc(sizeof(*data)); diff --git a/apache/apache.spec b/apache/apache.spec index 61c425d179..55edcced64 100644 --- a/apache/apache.spec +++ b/apache/apache.spec @@ -118,7 +118,7 @@ exit 1 %define V_apache 1.3.27 %define V_mod_ssl 2.8.12-1.3.27 %define V_mod_perl 1.27 -%define V_mod_php 4.2.3 +%define V_mod_php 4.3.0 %define V_mod_php3 3.0.18 %define V_mod_dav 1.0.3-1.3.6 %define V_mod_layout 3.2 @@ -141,7 +141,7 @@ Distribution: OpenPKG [BASE] Group: Web License: ASF Version: %{V_apache} -Release: 20021129 +Release: 20021228 # list of sources Source0: http://www.apache.org/dist/httpd/apache_%{V_apache}.tar.gz @@ -163,7 +163,6 @@ Source20: apache.conf Source21: apache.base Source22: apache.vhost Source23: rc.apache -Patch0: apache-php-db4.patch # build information Prefix: %{l_prefix} @@ -324,7 +323,6 @@ AutoReqProv: no %endif %if "%{with_mod_php}" == "yes" %setup3 -q -T -D -a 3 - %patch0 -p0 %endif %if "%{with_mod_dav}" == "yes" %setup4 -q -T -D -a 4