diff options
| author |   Andrew Bevitt <cyfred@gentoo.org> | 2004-08-25 14:49:27 +0000 |
|---|---|---|
| committer | Andrew Bevitt <cyfred@gentoo.org> | 2004-08-25 14:49:27 +0000 |
| commit | 02cea022695029100e05d3085d4289c8e95b9501 (patch) | |
| tree | 80b4ffff53030661d99a45d2d8a0f11801cbae3f /www-proxy/squidguard | |
| parent | Version bumped. Closes #51324. (Manifest recommit) (diff) | |
| download | gentoo-2-02cea022695029100e05d3085d4289c8e95b9501.tar.gz gentoo-2-02cea022695029100e05d3085d4289c8e95b9501.tar.bz2 gentoo-2-02cea022695029100e05d3085d4289c8e95b9501.zip | |
Adding db4.2 support, see bug #61578
Diffstat (limited to 'www-proxy/squidguard')
| -rw-r--r-- | www-proxy/squidguard/ChangeLog | 6 | ||||
| -rw-r--r-- | www-proxy/squidguard/files/squidguard-1.2.0-db42.patch | 41 | ||||
| -rw-r--r-- | www-proxy/squidguard/squidguard-1.2.0-r1.ebuild | 8 |
3 files changed, 51 insertions, 4 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/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" } |