summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul de Vrieze <pauldv@gentoo.org>2003-05-28 08:05:34 +0000
committerPaul de Vrieze <pauldv@gentoo.org>2003-05-28 08:05:34 +0000
commit5d3acd384f6542b67881d4ee8cce5acae48865bb (patch)
tree7309ec32a9165aeb66e2733ac0c48d0d4fcab78f
parentFix bug #21565. Also ensure makefile doesn't ask the interactive question f... (diff)
downloadgentoo-2-5d3acd384f6542b67881d4ee8cce5acae48865bb.tar.gz
gentoo-2-5d3acd384f6542b67881d4ee8cce5acae48865bb.tar.bz2
gentoo-2-5d3acd384f6542b67881d4ee8cce5acae48865bb.zip
Fix squidguard + db4
-rw-r--r--net-www/squidguard/ChangeLog5
-rw-r--r--net-www/squidguard/Manifest5
-rw-r--r--net-www/squidguard/files/squidguard-1.2.0-db4.patch23
-rw-r--r--net-www/squidguard/squidguard-1.2.0.ebuild9
4 files changed, 38 insertions, 4 deletions
diff --git a/net-www/squidguard/ChangeLog b/net-www/squidguard/ChangeLog
index 4aa75cec3a48..4772a2a0a261 100644
--- a/net-www/squidguard/ChangeLog
+++ b/net-www/squidguard/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-www/squidguard
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/squidguard/ChangeLog,v 1.3 2003/04/13 19:28:38 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/squidguard/ChangeLog,v 1.4 2003/05/28 08:05:25 pauldv Exp $
+
+ 28 May 2003; Paul de Vrieze <pauldv@gentoo.org> squidguard-1.2.0.ebuild:
+ Fix squidguard to properly recognize db4's versioned symbols.
*squidguard-1.2.0 (23 Oct 2002)
diff --git a/net-www/squidguard/Manifest b/net-www/squidguard/Manifest
index 4a0b8f8ef8fa..b8b8848cfd2a 100644
--- a/net-www/squidguard/Manifest
+++ b/net-www/squidguard/Manifest
@@ -1,6 +1,7 @@
-MD5 2b15795a2d9fc37760fe16f5f1b513a3 ChangeLog 470
-MD5 d9d82c75eb7a37cd0a204abd71c46d73 squidguard-1.2.0.ebuild 1301
+MD5 8251dee08fd1f6cf2f789de1034e328b ChangeLog 609
+MD5 29feaaf4d3ad89dbab42fbe95791efdc squidguard-1.2.0.ebuild 1389
MD5 127270fbe0d0bfbc141ffaf56313f3e6 files/blockedsites 8
MD5 bca506ead890af8fe52e0fdf5e73440f files/digest-squidguard-1.2.0 69
MD5 3e17e52277c56640bb3a9a24da57dae9 files/squidGuard.conf.blocksites 192
MD5 0c3ba4835c98256ad8ee4bf3336eb277 files/squidGuard.conf.minimal 61
+MD5 5838403ff8fe47285fdc4235a53467ba files/squidguard-1.2.0-db4.patch 685
diff --git a/net-www/squidguard/files/squidguard-1.2.0-db4.patch b/net-www/squidguard/files/squidguard-1.2.0-db4.patch
new file mode 100644
index 000000000000..37da3f1bfded
--- /dev/null
+++ b/net-www/squidguard/files/squidguard-1.2.0-db4.patch
@@ -0,0 +1,23 @@
+diff -urN squidGuard-1.2.0.orig/configure.in squidGuard-1.2.0/configure.in
+--- squidGuard-1.2.0.orig/configure.in 2001-12-18 11:16:36.000000000 +0100
++++ squidGuard-1.2.0/configure.in 2003-05-28 09:57:42.000000000 +0200
+@@ -71,7 +71,9 @@
+
+ dnl Checks for libraries.
+
+-AC_CHECK_LIB(db,db_version,,[
++AC_CHECK_LIB(db,db_version,,
++AC_CHECK_LIB(db,db_version_4000,,
++AC_CHECK_LIB(db,db_version_4001,,[
+ echo
+ echo "** The Berkley DB library is required for squidGuard"
+ echo " to compile. Get it from http://www.sleepycat.com"
+@@ -79,7 +81,7 @@
+ echo " its location. (default is $dbprefix/BerkeleyDB)"
+ echo
+ exit 1
+- ])
++ ])))
+
+ dnl Checks for header files.
+ AC_HEADER_STDC
diff --git a/net-www/squidguard/squidguard-1.2.0.ebuild b/net-www/squidguard/squidguard-1.2.0.ebuild
index b1d4d6bef329..df1dc30daeb3 100644
--- a/net-www/squidguard/squidguard-1.2.0.ebuild
+++ b/net-www/squidguard/squidguard-1.2.0.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/squidguard/squidguard-1.2.0.ebuild,v 1.3 2003/04/13 19:28:38 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/squidguard/squidguard-1.2.0.ebuild,v 1.4 2003/05/28 08:05:25 pauldv Exp $
DESCRIPTION="Combined filter, redirector and access controller plugin for Squid."
HOMEPAGE="http://www.squidguard.org"
@@ -18,6 +18,13 @@ DEPEND="${RDEPEND}
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"