diff options
| author |   Alin Năstac <mrness@gentoo.org> | 2006-09-06 20:16:46 +0000 |
|---|---|---|
| committer | Alin Năstac <mrness@gentoo.org> | 2006-09-06 20:16:46 +0000 |
| commit | 20d7eb8bb053acabaa2bac3c348d000ca98a208d (patch) | |
| tree | c52b21d5e7ac6564acf164f8a0402998151e4acf /net-proxy/squidguard/files | |
| parent | Replace old db4* patches with a better one, which fixes broken compilation on... (diff) | |
| download | historical-20d7eb8bb053acabaa2bac3c348d000ca98a208d.tar.gz historical-20d7eb8bb053acabaa2bac3c348d000ca98a208d.tar.bz2 historical-20d7eb8bb053acabaa2bac3c348d000ca98a208d.zip | |
Replace old db4* patches with a better one, which fixes broken compilation on a system with db-4.3 or above (#146460).
Package-Manager: portage-2.1-r2
Diffstat (limited to 'net-proxy/squidguard/files')
| -rw-r--r-- | net-proxy/squidguard/files/squidguard-1.2.0-db41.patch | 24 | ||||
| -rw-r--r-- | net-proxy/squidguard/files/squidguard-1.2.0-db42.patch | 41 |
2 files changed, 0 insertions, 65 deletions
diff --git a/net-proxy/squidguard/files/squidguard-1.2.0-db41.patch b/net-proxy/squidguard/files/squidguard-1.2.0-db41.patch deleted file mode 100644 index 76a57a5f1deb..000000000000 --- a/net-proxy/squidguard/files/squidguard-1.2.0-db41.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- 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-proxy/squidguard/files/squidguard-1.2.0-db42.patch b/net-proxy/squidguard/files/squidguard-1.2.0-db42.patch deleted file mode 100644 index bc7e567ac1a5..000000000000 --- a/net-proxy/squidguard/files/squidguard-1.2.0-db42.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- 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) { |