Adding db4.2 support, see bug #61578

4 files changed, 54 insertions, 6 deletions

diff --git a/www-proxy/squidguard/ChangeLog b/www-proxy/squidguard/ChangeLog
index c886aff8b226..1dcc02a07d43 100644
--- a/www-proxy/squidguard/ChangeLog
+++ b/www-proxy/squidguard/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-www/squidguard
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-proxy/squidguard/ChangeLog,v 1.2 2004/08/15 23:40:11 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-proxy/squidguard/ChangeLog,v 1.3 2004/08/25 14:49:27 cyfred Exp $
+
+  26 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>;
+  +files/squidguard-1.2.0-db42.patch, squidguard-1.2.0-r1.ebuild:
+  Adding db4.2 support, see bug #61578
 
   16 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>; squidguard-1.2.0-r1.ebuild:
   Changing net-www/squid to www-proxy/squid in depends
diff --git a/www-proxy/squidguard/Manifest b/www-proxy/squidguard/Manifest
index 1a816889b2f0..9565080990c0 100644
--- a/www-proxy/squidguard/Manifest
+++ b/www-proxy/squidguard/Manifest
@@ -1,5 +1,5 @@
-MD5 1f17126d937701a5d7e7f4bdadf189b4 squidguard-1.2.0-r1.ebuild 1869
-MD5 5cd8a8ebb209f5aacf9f19039bfa28c4 ChangeLog 1806
+MD5 53acdc71e26b959d501a0fb33c9f823e squidguard-1.2.0-r1.ebuild 1928
+MD5 1c61a9bcc8052675dd31e4ecd4f0e70c ChangeLog 1962
 MD5 d7dd06078d4f3a44b46709294cc7bc21 metadata.xml 249
 MD5 127270fbe0d0bfbc141ffaf56313f3e6 files/blockedsites 8
 MD5 0c3ba4835c98256ad8ee4bf3336eb277 files/squidGuard.conf.minimal 61
@@ -7,3 +7,4 @@ MD5 5838403ff8fe47285fdc4235a53467ba files/squidguard-1.2.0-db4.patch 685
 MD5 71814cadfec6eed3d7ee2437fdd1f0ab files/squidguard-1.2.0-db41.patch 794
 MD5 bca506ead890af8fe52e0fdf5e73440f files/digest-squidguard-1.2.0-r1 69
 MD5 3e17e52277c56640bb3a9a24da57dae9 files/squidGuard.conf.blocksites 192
+MD5 d639b977d8cfd92f19913f1d9fa12564 files/squidguard-1.2.0-db42.patch 1348
diff --git a/www-proxy/squidguard/files/squidguard-1.2.0-db42.patch b/www-proxy/squidguard/files/squidguard-1.2.0-db42.patch
new file mode 100644
index 000000000000..bc7e567ac1a5
--- /dev/null
+++ b/www-proxy/squidguard/files/squidguard-1.2.0-db42.patch
@@ -0,0 +1,41 @@
+--- squidGuard-1.2.0/configure.in.chris	2004-08-25 02:44:38 +0000
++++ squidGuard-1.2.0/configure.in	2004-08-25 02:46:18 +0000
+@@ -73,7 +73,8 @@
+ 
+ AC_CHECK_LIB(db,db_version,,
+ AC_CHECK_LIB(db,db_version_4000,,
+-AC_CHECK_LIB(db,db_version_4001,,[
++AC_CHECK_LIB(db,db_version_4001,,
++AC_CHECK_LIB(db,db_version_4002,,[
+ 	echo
+ 	echo "** The Berkley DB library is required for squidGuard"
+ 	echo "   to compile. Get it from http://www.sleepycat.com"
+@@ -82,7 +82,7 @@
+ 	echo "   its location. (default is $dbprefix/BerkeleyDB)"
+ 	echo
+ 	exit 1
+-	])))
++	]))))
+ 
+ dnl Checks for header files.
+ AC_HEADER_STDC
+--- squidGuard-1.2.0/src/sgDb.c.chris	2004-08-25 02:46:44 +0000
++++ squidGuard-1.2.0/src/sgDb.c	2004-08-25 02:47:01 +0000
+@@ -98,7 +98,7 @@
+     if(createdb)
+       flag = flag | DB_TRUNCATE;
+     if ((ret = 
+-#if DB_VERSION_MINOR == 1
++#if DB_VERSION_MINOR == 1 || DB_VERSION_MINOR == 2
+ 	 Db->dbp->open(Db->dbp, NULL, dbfile, NULL, DB_BTREE, flag, 0664)) != 0) {
+ #else
+ 	 Db->dbp->open(Db->dbp, dbfile, NULL, DB_BTREE, flag, 0664)) != 0) {
+@@ -108,7 +108,7 @@
+     }
+   } else {
+     if ((ret = 
+-#if DB_VERSION_MINOR == 1
++#if DB_VERSION_MINOR == 1 || DB_VERSION_MINOR == 2
+ 	 Db->dbp->open(Db->dbp, NULL, dbfile, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) {
+ #else
+ 	 Db->dbp->open(Db->dbp, dbfile, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) {
diff --git a/www-proxy/squidguard/squidguard-1.2.0-r1.ebuild b/www-proxy/squidguard/squidguard-1.2.0-r1.ebuild
index d8b237805470..bb51e4a3af07 100644
--- a/www-proxy/squidguard/squidguard-1.2.0-r1.ebuild
+++ b/www-proxy/squidguard/squidguard-1.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-proxy/squidguard/squidguard-1.2.0-r1.ebuild,v 1.2 2004/08/15 23:40:11 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-proxy/squidguard/squidguard-1.2.0-r1.ebuild,v 1.3 2004/08/25 14:49:27 cyfred Exp $
 
 inherit eutils
 
@@ -24,8 +24,10 @@ S="${WORKDIR}/${MY_P}"
 src_unpack() {
 	unpack ${A} || die "unpack problem"
 	cd ${S}
-	epatch ${FILESDIR}/${P}-db4.patch
-	epatch ${FILESDIR}/${P}-db41.patch
+	epatch ${FILESDIR}/${P}-db4.patch  || die
+	epatch ${FILESDIR}/${P}-db41.patch || die
+	epatch ${FILESDIR}/${P}-db42.patch || die
+
 	autoconf || die "autoconf problem"
 }