diff options
| author | mandree <mandree@FreeBSD.org> | 2011-05-26 19:59:53 +0800 |
|---|---|---|
| committer | mandree <mandree@FreeBSD.org> | 2011-05-26 19:59:53 +0800 |
| commit | 6a7a8ea3cdb942b567ac350bca452812067e583d (patch) | |
| tree | a026c828c56132200b01bce5ae388b42f309754d /www | |
| parent | 1fd4980ce1b59ef2dc57ee2566ccf0edd48dbbea (diff) | |
| download | freebsd-ports-gnome-6a7a8ea3cdb942b567ac350bca452812067e583d.tar.gz freebsd-ports-gnome-6a7a8ea3cdb942b567ac350bca452812067e583d.tar.zst freebsd-ports-gnome-6a7a8ea3cdb942b567ac350bca452812067e583d.zip | |
Fix to build with db4.0. Needs revision before db60.
Submitted by: Guido Falsi (maintainer)
PR: ports/157340
PR: ports/157343 (partially)
Reported by: pointyhat
Diffstat (limited to 'www')
| -rw-r--r-- | www/squidguard/files/patch-src_sgDB.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/www/squidguard/files/patch-src_sgDB.c b/www/squidguard/files/patch-src_sgDB.c index 6044fd221b4d..d1e88ef8394c 100644 --- a/www/squidguard/files/patch-src_sgDB.c +++ b/www/squidguard/files/patch-src_sgDB.c @@ -1,27 +1,27 @@ ---- src/sgDb.c.orig Mon May 14 08:40:12 2001 -+++ src/sgDb.c Thu Dec 29 23:31:32 2005 -@@ -97,14 +97,20 @@ +--- src/sgDb.c.orig 2008-07-14 20:29:41.000000000 +0200 ++++ src/sgDb.c 2011-05-26 11:04:22.106201692 +0200 +@@ -119,14 +119,20 @@ flag = DB_CREATE; if(createdb) flag = flag | DB_TRUNCATE; -- if ((ret = -- Db->dbp->open(Db->dbp, dbfile, NULL, DB_BTREE, flag, 0664)) != 0) { +- if ((ret = +- Db->dbp->open(Db->dbp, NULL, dbfile, NULL, DB_BTREE, flag, 0664)) != 0) { + if ((ret = Db->dbp->open(Db->dbp, -+#if DB_VERSION_MAJOR * 10 + DB_VERSION_MINOR >= 41 -+ NULL, ++#if DB_VERSION_MINOR >= 1 ++ NULL, +#endif -+ dbfile, NULL, DB_BTREE, flag, 0664)) != 0) { ++ dbfile, NULL, DB_BTREE, flag, 0664)) != 0) { (void) Db->dbp->close(Db->dbp, 0); sgLogFatalError("Error db_open: %s", strerror(ret)); } } else { -- if ((ret = -- Db->dbp->open(Db->dbp, dbfile, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) { +- if ((ret = +- Db->dbp->open(Db->dbp, NULL, dbfile, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) { + if ((ret = Db->dbp->open(Db->dbp, -+#if DB_VERSION_MAJOR * 10 + DB_VERSION_MINOR >= 41 -+ NULL, ++#if DB_VERSION_MINOR >= 1 ++ NULL, +#endif -+ dbfile, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) { ++ dbfile, NULL, DB_BTREE, DB_CREATE, 0664)) != 0) { sgLogFatalError("Error db_open: %s", strerror(ret)); } } |