diff options
| author |   Alin Năstac <mrness@gentoo.org> | 2006-09-17 18:04:45 +0000 |
|---|---|---|
| committer | Alin Năstac <mrness@gentoo.org> | 2006-09-17 18:04:45 +0000 |
| commit | 36a0ed792961661214d3f0f2e7d25d23f1e93bd1 (patch) | |
| tree | 5838715de35b443d1afd98804e60bb13ca313fa7 /net-proxy/squidguard | |
| parent | Add a patch to fix compilation with newer openssl versions. Fixes bug #147923... (diff) | |
| download | gentoo-2-36a0ed792961661214d3f0f2e7d25d23f1e93bd1.tar.gz gentoo-2-36a0ed792961661214d3f0f2e7d25d23f1e93bd1.tar.bz2 gentoo-2-36a0ed792961661214d3f0f2e7d25d23f1e93bd1.zip | |
Fix configure.in db detection (#147940).
(Portage version: 2.1.1)
Diffstat (limited to 'net-proxy/squidguard')
| -rw-r--r-- | net-proxy/squidguard/ChangeLog | 6 | ||||
| -rw-r--r-- | net-proxy/squidguard/files/squidguard-1.2.0-db4.patch | 30 | ||||
| -rw-r--r-- | net-proxy/squidguard/squidguard-1.2.0-r1.ebuild | 8 |
3 files changed, 38 insertions, 6 deletions
diff --git a/net-proxy/squidguard/ChangeLog b/net-proxy/squidguard/ChangeLog index 811b9ada804b..965a1b47e3d5 100644 --- a/net-proxy/squidguard/ChangeLog +++ b/net-proxy/squidguard/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-proxy/squidguard # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/ChangeLog,v 1.4 2006/09/06 20:16:12 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/ChangeLog,v 1.5 2006/09/17 18:04:44 mrness Exp $ + + 17 Sep 2006; Alin Nastac <mrness@gentoo.org> + files/squidguard-1.2.0-db4.patch, squidguard-1.2.0-r1.ebuild: + Fix configure.in db detection (#147940). 06 Sep 2006; Alin Nastac <mrness@gentoo.org> files/squidguard-1.2.0-db4.patch, -files/squidguard-1.2.0-db41.patch, diff --git a/net-proxy/squidguard/files/squidguard-1.2.0-db4.patch b/net-proxy/squidguard/files/squidguard-1.2.0-db4.patch index d5ef5540fa66..1519a3bbb536 100644 --- a/net-proxy/squidguard/files/squidguard-1.2.0-db4.patch +++ b/net-proxy/squidguard/files/squidguard-1.2.0-db4.patch @@ -1,6 +1,32 @@ +diff -Nru squidGuard-1.2.0.orig/configure.in squidGuard-1.2.0/configure.in +--- squidGuard-1.2.0.orig/configure.in 2006-09-17 20:52:13.000000000 +0300 ++++ squidGuard-1.2.0/configure.in 2006-09-17 20:52:52.219168250 +0300 +@@ -65,21 +65,7 @@ + AC_DEFINE(ACDBHOME) + fi + +-CFLAGS="$CFLAGS $db_inc" +-CPPFLAGS="$CPPFLAGS $db_inc" +-LDFLAGS="$LDFLAGS $db_lib" +- +-dnl Checks for libraries. +- +-AC_CHECK_LIB(db,db_version,,[ +- echo +- echo "** The Berkley DB library is required for squidGuard" +- echo " to compile. Get it from http://www.sleepycat.com" +- echo " use --with-db=DIR or --with-db-lib=DIR to specify" +- echo " its location. (default is $dbprefix/BerkeleyDB)" +- echo +- exit 1 +- ]) ++LIBS="$LIBS -ldb" + + dnl Checks for header files. + AC_HEADER_STDC diff -Nru squidGuard-1.2.0.orig/src/sgDb.c squidGuard-1.2.0/src/sgDb.c ---- squidGuard-1.2.0.orig/src/sgDb.c 2001-05-14 16:40:12.000000000 +0300 -+++ squidGuard-1.2.0/src/sgDb.c 2006-09-06 23:07:49.756347000 +0300 +--- squidGuard-1.2.0.orig/src/sgDb.c 2006-09-17 20:52:13.000000000 +0300 ++++ squidGuard-1.2.0/src/sgDb.c 2006-09-17 20:52:25.685510000 +0300 @@ -98,13 +98,21 @@ if(createdb) flag = flag | DB_TRUNCATE; diff --git a/net-proxy/squidguard/squidguard-1.2.0-r1.ebuild b/net-proxy/squidguard/squidguard-1.2.0-r1.ebuild index f2b292e2db77..49256c0d3d9e 100644 --- a/net-proxy/squidguard/squidguard-1.2.0-r1.ebuild +++ b/net-proxy/squidguard/squidguard-1.2.0-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/squidguard-1.2.0-r1.ebuild,v 1.4 2006/09/06 20:16:12 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/squidguard-1.2.0-r1.ebuild,v 1.5 2006/09/17 18:04:44 mrness Exp $ -inherit eutils +inherit eutils autotools DESCRIPTION="Combined filter, redirector and access controller plugin for Squid." HOMEPAGE="http://www.squidguard.org" @@ -23,8 +23,10 @@ S="${WORKDIR}/squidGuard-${PV}" src_unpack() { unpack ${A} || die "unpack problem" - +#die + cd "${S}" epatch "${FILESDIR}/${P}-db4.patch" + eautoconf } src_compile() { |