summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChuck Short <zul@gentoo.org>2004-04-23 18:53:20 +0000
committerChuck Short <zul@gentoo.org>2004-04-23 18:53:20 +0000
commit5e4be4b4439b177874638825ed79ba8c24e26f4c (patch)
treeba3321e76fd1fe860d049490fce4940f1a9f3fa0 /net-www/apache
parentVersion bump (Manifest recommit) (diff)
downloadgentoo-2-5e4be4b4439b177874638825ed79ba8c24e26f4c.tar.gz
gentoo-2-5e4be4b4439b177874638825ed79ba8c24e26f4c.tar.bz2
gentoo-2-5e4be4b4439b177874638825ed79ba8c24e26f4c.zip
Updated db4 patch to support db4.1. Damn berkdb. Closes #49795.
Diffstat (limited to 'net-www/apache')
-rw-r--r--net-www/apache/ChangeLog6
-rw-r--r--net-www/apache/files/apache-1.3.27_db4_gentoo.patch11
2 files changed, 13 insertions, 4 deletions
diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog
index ca7bbb2b23ef..30fdd3bd9f5f 100644
--- a/net-www/apache/ChangeLog
+++ b/net-www/apache/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-www/apache
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.131 2004/04/22 01:54:00 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.132 2004/04/23 18:53:20 zul Exp $
+
+ 23 Apr 2004; Chuck Short <zul@gentoo.org>
+ files/apache-1.3.27_db4_gentoo.patch:
+ Updated 1.3.29 db4 patch to support db4.1. Closes #48795.
22 Apr 2004; Chuck Short <zul@gentoo.org> files/apachesplitlogfile:
Fixed error message in apachesplitlogfiles to make it more understandable.
diff --git a/net-www/apache/files/apache-1.3.27_db4_gentoo.patch b/net-www/apache/files/apache-1.3.27_db4_gentoo.patch
index ae7b54cb1c78..d4d973ed2cec 100644
--- a/net-www/apache/files/apache-1.3.27_db4_gentoo.patch
+++ b/net-www/apache/files/apache-1.3.27_db4_gentoo.patch
@@ -1,10 +1,11 @@
-diff -ur apache_1.3.27.orig/src/modules/standard/mod_auth_db.module apache_1.3.27/src/modules/standard/mod_auth_db.module--- apache_1.3.27.orig/src/modules/standard/mod_auth_db.module 2001-10-16 11:12:02.000000000 +0200
-+++ apache_1.3.27/src/modules/standard/mod_auth_db.module 2003-06-22 20:22:02.000000000 +0200
-@@ -2,7 +2,15 @@
+--- apache_1.3.29/src/modules/standard/mod_auth_db.module 2001-10-16 05:12:02.000000000 -0400
++++ apache_1.3.29-roninds/src/modules/standard/mod_auth_db.module 2004-04-23 10:50:09.000000000 -0400
+@@ -2,7 +2,20 @@
ConfigStart
DB_VERSION=''
DB_LIB=''
- if ./helpers/TestCompile func db_create; then
++
+ if ./helpers/TestCompile lib db-4 db_create_4000; then
+ DB_VERSION='Berkeley-DB/4.x'
+ DB_LIB='-ldb-4'
@@ -13,6 +14,10 @@ diff -ur apache_1.3.27.orig/src/modules/standard/mod_auth_db.module apache_1.3.2
+ DB_VERSION='Berkeley-DB/4.x'
+ DB_LIB='-ldb-4.0'
+ CFLAGS="$CFLAGS -I/usr/include/db4"
++ elif ./helpers/TestCompile lib db-4.1 db_create_4001; then
++ DB_VERSION='Berkeley-DB/4.1'
++ DB_LIB='-ldb-4.1'
++ CFLAGS="$CFLAGS -I/usr/include/db4.1"
+ elif ./helpers/TestCompile func db_create; then
DB_VERSION='Berkeley-DB/3.x'
elif ./helpers/TestCompile lib db db_create; then