Fix db-4.1 issues

4 files changed, 25 insertions, 18 deletions

diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog
index cdb1eb4ab181..338264fa7fcc 100644
--- a/net-www/apache/ChangeLog
+++ b/net-www/apache/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/apache
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.72 2003/10/06 20:32:13 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.73 2003/10/16 13:15:08 pauldv Exp $
+
+  16 Oct 2003; Paul de Vrieze <pauldv@gentoo.org> apache-1.3.28-r1.ebuild,
+  files/apache-1.3.27_db4_gentoo.patch:
+  Make sure that a db version lower than 4.1 is installed and fix the checking
+  script to get the right headers.
 
   06 Oct 2003; Jason Wever <weeve@gentoo.org> apache-1.3.28.ebuild:
   Marked stable for sparc.
diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index c7598e2a32da..8c387a87a89d 100644
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -1,19 +1,14 @@
-MD5 53b88e07a843e12dbad29cad2ffb5136 ChangeLog 14441
+MD5 7a6efc73287f505ec5678c3a7de0355e ChangeLog 14672
+MD5 c8e565da1b91536d92e4e2a3001400a5 apache-1.3.28.ebuild 9135
 MD5 246f3d374581e892615e2e5c8cb59e2a apache-1.3.27-r3.ebuild 7884
 MD5 d4bfc120696457a6084e949b99d045ac apache-1.3.27-r4.ebuild 8913
-MD5 61f4bc626b916e84ea7a1adee665ba4c apache-1.3.28-r1.ebuild 7902
-MD5 c8e565da1b91536d92e4e2a3001400a5 apache-1.3.28.ebuild 9135
-MD5 2785b7e11adc2c240c5fca3d2d4cfb67 apache-2.0.46.ebuild 11012
-MD5 235d2261cabdf2fbf72bee4b0ddd519f apache-2.0.47-r1.ebuild 10711
 MD5 92e6b6685c2875cdab6ada6a7324d92b apache-2.0.47.ebuild 11437
+MD5 09fa626c00f029bdfb266b1e5d16193e apache-1.3.28-r1.ebuild 7905
+MD5 235d2261cabdf2fbf72bee4b0ddd519f apache-2.0.47-r1.ebuild 10711
 MD5 bd80c41f0d8d92374c3712c4cac4d2ff metadata.xml 503
-MD5 998b4b7df08eb15641e0b9132443b365 files/apache-1.3.27-apachectl.patch 1328
-MD5 7f6973376101a01076d579aab3bd2dce files/apache-1.3.27_db4_gentoo.patch 868
-MD5 399e3c15e2afa45a732faed0df6b1a30 files/apache-1.3.28-zombie-cgi.patch 940
+MD5 2785b7e11adc2c240c5fca3d2d4cfb67 apache-2.0.46.ebuild 11012
 MD5 f2c60b199c12729b25716ed451a24e38 files/apache-2.0.44-gentoo.diff 4895
 MD5 9dc40e1918a2d30a578ebf1653f7182c files/apache-2.0.45-gentoo.diff 5448
-MD5 c8c70224d0f41de7f02387f13911e539 files/apache-2.0.46-gentoo.diff 3963
-MD5 86dc760b13645d25565a874a6d3b890e files/apache-2.0.47-gentoo.diff 3609
 MD5 97c7a2efed7a3fd05614167426c495d9 files/apache-builtin-mods 2465
 MD5 df1290566bb25603dbe5a649daec5185 files/apache.confd 1012
 MD5 b852201630b63bb1e578ba13889b534a files/apache.rc6 1032
@@ -21,16 +16,21 @@ MD5 02db12f0d91e1f89e0b173fea6c5151d files/apacheaddmod 5977
 MD5 bae4b9d941cd38a32943533e958aa1b3 files/apachedelmod 3185
 MD5 8d790bf68c47c08951c761815cd66a1c files/apachelogserverstatus 4763
 MD5 a90bef6fb0fb6d05f74c36eaf26285d6 files/apachesplitlogfile 4959
+MD5 f11a5046372c128afa033b7fbc787dd9 files/digest-apache-1.3.28 211
+MD5 78ec0e944bbdb4246ed75478e6d8e52a files/digest-apache-2.0.47 65
+MD5 86dc760b13645d25565a874a6d3b890e files/apache-2.0.47-gentoo.diff 3609
 MD5 10be9409287dd5848fd675c1d96d0f7c files/digest-apache-1.3.27-r3 211
 MD5 21c6ed7e53ea9fc80f4634cbf37b2bc6 files/digest-apache-1.3.27-r4 303
-MD5 f11a5046372c128afa033b7fbc787dd9 files/digest-apache-1.3.28 211
+MD5 399e3c15e2afa45a732faed0df6b1a30 files/apache-1.3.28-zombie-cgi.patch 940
 MD5 f11a5046372c128afa033b7fbc787dd9 files/digest-apache-1.3.28-r1 211
-MD5 b1b73cd67ed116ce0f9c973eeff9fbdf files/digest-apache-2.0.46 65
-MD5 78ec0e944bbdb4246ed75478e6d8e52a files/digest-apache-2.0.47 65
-MD5 78ec0e944bbdb4246ed75478e6d8e52a files/digest-apache-2.0.47-r1 65
 MD5 df54361aa8754197cf3bafe99d32c7ec files/robots.txt 340
 MD5 d3626a1e31a675c60d066c111d552adf files/suexec.pam 59
 MD5 161245c7aa1eb785db53b34d6a10be43 files/suexec_pam_gentoo.patch 2149
+MD5 c8c70224d0f41de7f02387f13911e539 files/apache-2.0.46-gentoo.diff 3963
+MD5 b1b73cd67ed116ce0f9c973eeff9fbdf files/digest-apache-2.0.46 65
+MD5 5dbbb01b1f4e39ff052a49389caa76ed files/apache-1.3.27_db4_gentoo.patch 956
+MD5 998b4b7df08eb15641e0b9132443b365 files/apache-1.3.27-apachectl.patch 1328
+MD5 78ec0e944bbdb4246ed75478e6d8e52a files/digest-apache-2.0.47-r1 65
 MD5 14aebf386646fe7ab2623dad993a32fa files/2.0.40/40_mod_ssl.conf 3420
 MD5 1d10cc98714a34ddc38525743c2989f9 files/2.0.40/41_mod_ssl.default-vhost.conf 8053
 MD5 819ee444395cf42ccc8009529a94af37 files/2.0.40/45_mod_dav.conf 583
diff --git a/net-www/apache/apache-1.3.28-r1.ebuild b/net-www/apache/apache-1.3.28-r1.ebuild
index 523c63c7a29d..1db9f60ee563 100644
--- a/net-www/apache/apache-1.3.28-r1.ebuild
+++ b/net-www/apache/apache-1.3.28-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.28-r1.ebuild,v 1.1 2003/09/27 04:47:17 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.28-r1.ebuild,v 1.2 2003/10/16 13:15:08 pauldv Exp $
 
 #IUSE="ipv6 pam"
 IUSE="pam"
@@ -18,7 +18,7 @@ SRC_URI="http://httpd.apache.org/dist/httpd/apache_${PV}.tar.gz
 # The mod_ssl archive is only for providing the EAPI patch in here.
 # You should install the net-www/mod_ssl package for the actual DSO.
 
-DEPEND="dev-lang/perl sys-libs/db
+DEPEND="dev-lang/perl <sys-libs/db-4.1
 	>=dev-libs/mm-1.1.3
 	>=sys-libs/gdbm-1.8
 	>=dev-libs/expat-1.95.2"
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 525df767706c..ae7b54cb1c78 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,6 +1,6 @@
 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,13 @@
+@@ -2,7 +2,15 @@
  ConfigStart
      DB_VERSION=''
      DB_LIB=''
@@ -8,9 +8,11 @@ diff -ur apache_1.3.27.orig/src/modules/standard/mod_auth_db.module apache_1.3.2
 +    if ./helpers/TestCompile lib db-4 db_create_4000; then
 +       DB_VERSION='Berkeley-DB/4.x'
 +       DB_LIB='-ldb-4'
++       CFLAGS="$CFLAGS -I/usr/include/db4"
 +    elif ./helpers/TestCompile lib db-4.0 db_create_4000; then
 +       DB_VERSION='Berkeley-DB/4.x'
 +       DB_LIB='-ldb-4.0'
++       CFLAGS="$CFLAGS -I/usr/include/db4"
 +    elif ./helpers/TestCompile func db_create; then
          DB_VERSION='Berkeley-DB/3.x'
      elif ./helpers/TestCompile lib db db_create; then