Adding support for DB 4.1, closing bugs #34152 and #44546

6 files changed, 35 insertions, 58 deletions

diff --git a/net-www/squidguard/ChangeLog b/net-www/squidguard/ChangeLog
index 5b2e223ae9a2..e28f78321071 100644
--- a/net-www/squidguard/ChangeLog
+++ b/net-www/squidguard/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/squidguard
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/squidguard/ChangeLog,v 1.9 2004/06/25 01:12:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/squidguard/ChangeLog,v 1.10 2004/07/15 04:10:51 cyfred Exp $
+
+  15 Jul 2004; Andrew Bevitt <cyfred@gentoo.org>;
+  +files/squidguard-1.2.0-db41.patch, squidguard-1.2.0-r1.ebuild,
+  -squidguard-1.2.0.ebuild:
+  Adding support for DB 4.1, closing bugs #34154 and #44546; removing old
+  version.
 
   23 Jun 2004; Andrew Bevitt <cyfred@gentoo.org>; +metadata.xml:
   Adding metadata.xml
diff --git a/net-www/squidguard/Manifest b/net-www/squidguard/Manifest
index 2ccf69f147d3..b195ed7581e9 100644
--- a/net-www/squidguard/Manifest
+++ b/net-www/squidguard/Manifest
@@ -1,10 +1,11 @@
 MD5 0a99510760d8b64e101f15f85567adf3 squidguard-1.2.0.ebuild 1388
-MD5 8ede8264f9125f5d18b136cc4ee82970 squidguard-1.2.0-r1.ebuild 1831
+MD5 cad7c1597d06b5c4f140d8993dd9f5e4 squidguard-1.2.0-r1.ebuild 1867
 MD5 aaadcbe03ef8db5b58de3a8f01162cbe ChangeLog 1089
 MD5 d7dd06078d4f3a44b46709294cc7bc21 metadata.xml 249
 MD5 127270fbe0d0bfbc141ffaf56313f3e6 files/blockedsites 8
 MD5 0c3ba4835c98256ad8ee4bf3336eb277 files/squidGuard.conf.minimal 61
 MD5 bca506ead890af8fe52e0fdf5e73440f files/digest-squidguard-1.2.0 69
 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
diff --git a/net-www/squidguard/files/digest-squidguard-1.2.0 b/net-www/squidguard/files/digest-squidguard-1.2.0
deleted file mode 100644
index d941cb9c00f7..000000000000
--- a/net-www/squidguard/files/digest-squidguard-1.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c6e2e9112fdbda0602656f94c1ce31fd squidGuard-1.2.0.tar.gz 1852737
diff --git a/net-www/squidguard/files/squidguard-1.2.0-db41.patch b/net-www/squidguard/files/squidguard-1.2.0-db41.patch
new file mode 100644
index 000000000000..76a57a5f1deb
--- /dev/null
+++ b/net-www/squidguard/files/squidguard-1.2.0-db41.patch
@@ -0,0 +1,24 @@
+--- src/sgDb.c	2004-07-04 11:36:19.020675285 +0100
++++ src/sgDb.ok.c	2004-07-04 11:40:25.011222369 +0100
+@@ -98,13 +98,21 @@
+     if(createdb)
+       flag = flag | DB_TRUNCATE;
+     if ((ret = 
++#if DB_VERSION_MINOR == 1
++	 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) {
++#endif
+       (void) Db->dbp->close(Db->dbp, 0);
+       sgLogFatalError("Error db_open: %s", strerror(ret));
+     }
+   } else {
+     if ((ret = 
++#if DB_VERSION_MINOR == 1
++	 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) {
++#endif
+       sgLogFatalError("Error db_open: %s", strerror(ret));
+     }
+   }
diff --git a/net-www/squidguard/squidguard-1.2.0-r1.ebuild b/net-www/squidguard/squidguard-1.2.0-r1.ebuild
index 675307b501ac..ad268cd3acc8 100644
--- a/net-www/squidguard/squidguard-1.2.0-r1.ebuild
+++ b/net-www/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/net-www/squidguard/squidguard-1.2.0-r1.ebuild,v 1.3 2004/06/25 01:12:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/squidguard/squidguard-1.2.0-r1.ebuild,v 1.4 2004/07/15 04:10:51 cyfred Exp $
 
 inherit eutils
 
@@ -25,6 +25,7 @@ src_unpack() {
 	unpack ${A} || die "unpack problem"
 	cd ${S}
 	epatch ${FILESDIR}/${P}-db4.patch
+	epatch ${FILESDIR}/${P}-db41.patch
 	autoconf || die "autoconf problem"
 }
 
diff --git a/net-www/squidguard/squidguard-1.2.0.ebuild b/net-www/squidguard/squidguard-1.2.0.ebuild
deleted file mode 100644
index 6314b5a73fa7..000000000000
--- a/net-www/squidguard/squidguard-1.2.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/squidguard/squidguard-1.2.0.ebuild,v 1.8 2004/06/25 01:12:53 agriffis Exp $
-
-DESCRIPTION="Combined filter, redirector and access controller plugin for Squid."
-HOMEPAGE="http://www.squidguard.org"
-SRC_URI="http://ftp.teledanmark.no/pub/www/proxy/squidGuard/squidGuard-${PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~sparc"
-IUSE=""
-
-RDEPEND="net-www/squid
-	>=sys-libs/db-2"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex"
-
-S="${WORKDIR}/squidGuard-${PV}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	patch -p1 <${FILESDIR}/${P}-db4.patch
-	autoconf
-}
-
-src_compile() {
-	econf || die "configure problem"
-	emake || die "compile problem"
-}
-
-src_install() {
-	make prefix=${D}/usr install
-
-	insinto /etc/squidGuard/sample
-	doins ${FILESDIR}/squidGuard.conf.*
-	insinto /etc/squidGuard/sample/db
-	doins ${FILESDIR}/blockedsites
-
-	dodoc ANNOUNCE CHANGELOG COPYING GPL README
-	dohtml doc/*.html
-	docinto text
-	dodoc doc/*.txt
-}
-
-pkg_postinst() {
-	ewarn "You must add the following line to your /etc/squid/squid.conf:"
-	ewarn ""
-	ewarn "\tredirect_program /usr/bin/squidGuard -c /etc/squidGuard/squidGuard.conf"
-	ewarn ""
-	ewarn "Remember to edit /etc/squidGuard/squidGuard.conf first!"
-	ewarn "Examples can be found in /etc/squidGuard/sample/"
-}