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: 11-Jan-2003 09:51:53
Branch: HEAD Handle: 2003011108515101
Added files:
openpkg-src/apache2 apache2.patch
Modified files:
openpkg-src/apache2 apache2.spec
openpkg-web news.txt
Log:
resolve file conflict by using external Expat; fix DB 4.1 building
Summary:
Revision Changes Path
1.1 +49 -0 openpkg-src/apache2/apache2.patch
1.12 +5 -2 openpkg-src/apache2/apache2.spec
1.2642 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache2/apache2.patch
============================================================================
$ cvs diff -u -r0 -r1.1 apache2.patch
--- /dev/null 2003-01-11 09:51:52.000000000 +0100
+++ apache2.patch 2003-01-11 09:51:52.000000000 +0100
@@ -0,0 +1,49 @@
+--- srclib/apr-util/dbm/apr_dbm_berkeleydb.c.orig Wed Mar 13 21:40:47 2002
++++ srclib/apr-util/dbm/apr_dbm_berkeleydb.c Sat Jan 11 09:42:45 2003
+@@ -73,9 +73,14 @@
+ */
+
+ #if defined(DB_VERSION_MAJOR) && (DB_VERSION_MAJOR == 4)
+-/* At this time, there are no differences from our perspective between
+- * DB3 and DB4. */
++/* We will treat anything greater than 4.1 as DB4.
++ * We can treat 4.0 as DB3.
++ */
++#if defined(DB_VERSION_MINOR) && (DB_VERSION_MINOR >= 1)
++#define DB_VER 4
++#else
+ #define DB_VER 3
++#endif
+ #elif defined(DB_VERSION_MAJOR) && (DB_VERSION_MAJOR == 3)
+ #define DB_VER 3
+ #elif defined(DB_VERSION_MAJOR) && (DB_VERSION_MAJOR == 2)
+@@ -193,9 +198,13 @@
+ {
+ int dberr;
+
+-#if DB_VER == 3
++#if DB_VER >= 3
+ if ((dberr = db_create(&file.bdb, NULL, 0)) == 0) {
+- if ((dberr = (*file.bdb->open)(file.bdb, pathname, NULL,
++ if ((dberr = (*file.bdb->open)(file.bdb,
++#if DB_VER == 4
++ NULL,
++#endif
++ pathname, NULL,
+ DB_HASH, dbmode,
+ apr_posix_perms2mode(perm))) != 0) {
+ /* close the DB handler */
+@@ -339,11 +348,8 @@
+ dberr = (*f->bdb->seq)(f->bdb, &first, &data, R_FIRST);
+ #else
+ if ((dberr = (*f->bdb->cursor)(f->bdb, NULL, &f->curs
+-#if DB_VER == 3
+- , 0
+-#elif (DB_VERSION_MAJOR == 2) && (DB_VERSION_MINOR > 5)
+- , 0
+-
++#if DB_VER >= 3 || ((DB_VERSION_MAJOR == 2) && (DB_VERSION_MINOR > 5))
++ , 0
+ #endif
+ )) == 0) {
+ dberr = (*f->curs->c_get)(f->curs, &first, &data, DB_FIRST);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache2/apache2.spec
============================================================================
$ cvs diff -u -r1.11 -r1.12 apache2.spec
--- openpkg-src/apache2/apache2.spec 3 Jan 2003 10:51:03 -0000 1.11
+++ openpkg-src/apache2/apache2.spec 11 Jan 2003 08:51:52 -0000 1.12
@@ -33,15 +33,16 @@
Group: Web
License: ASF
Version: 2.0.43
-Release: 20021004
+Release: 20030111
# list of sources
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
+Patch0: apache2.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020206, perl, make
+BuildPreReq: OpenPKG, openpkg >= 20020206, perl, make, expat
PreReq: OpenPKG, openpkg >= 20020206, perl
AutoReq: no
AutoReqProv: no
@@ -64,6 +65,7 @@
%prep
%setup -q -n httpd-%{version}
+ %patch -p0
%build
CC="%{l_cc}" \
@@ -72,6 +74,7 @@
--enable-layout=GNU \
--prefix=%{l_prefix} \
--sysconfdir=%{l_prefix}/etc/apache2 \
+ --with-expat=%{l_prefix} \
--with-mpm=prefork \
--disable-shared
%{l_make} %{l_mflags}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.2641 -r1.2642 news.txt
--- openpkg-web/news.txt 11 Jan 2003 08:32:53 -0000 1.2641
+++ openpkg-web/news.txt 11 Jan 2003 08:51:51 -0000 1.2642
@@ -1,3 +1,4 @@
+11-Jan-2003: Upgraded package: P<apache2-2.0.43-20030111>
11-Jan-2003: Upgraded package: P<treecc-0.2.0-20030111>
11-Jan-2003: Upgraded package: P<as-gui-0.5.10-20030111>
10-Jan-2003: Upgraded package: P<mico-2.3.7-20030110>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
