Преглед изворни кода

add support for DB 4.1.24 to Apache's PHP

Ralf S. Engelschall пре 23 година
родитељ
комит
3365498dc5
2 измењених фајлова са 17 додато и 1 уклоњено
  1. 14 0
      apache/apache-php-db4.patch
  2. 3 1
      apache/apache.spec

+ 14 - 0
apache/apache-php-db4.patch

@@ -0,0 +1,14 @@
+--- 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));

+ 3 - 1
apache/apache.spec

@@ -143,7 +143,7 @@ Distribution: OpenPKG [BASE]
 Group:        Web
 License:      ASF
 Version:      %{V_apache}
-Release:      20021120
+Release:      20021122
 
 #   list of sources
 Source0:      http://www.apache.org/dist/httpd/apache_%{V_apache}.tar.gz
@@ -166,6 +166,7 @@ Source20:     apache.conf
 Source21:     apache.base
 Source22:     apache.vhost
 Source23:     rc.apache
+Patch0:       apache-php-db4.patch
 
 #   build information
 Prefix:       %{l_prefix}
@@ -327,6 +328,7 @@ 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