summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-proxy/squidguard/files/squidguard-1.2.0-db4.patch')
-rw-r--r--net-proxy/squidguard/files/squidguard-1.2.0-db4.patch51
1 files changed, 0 insertions, 51 deletions
diff --git a/net-proxy/squidguard/files/squidguard-1.2.0-db4.patch b/net-proxy/squidguard/files/squidguard-1.2.0-db4.patch
deleted file mode 100644
index 1519a3bbb536..000000000000
--- a/net-proxy/squidguard/files/squidguard-1.2.0-db4.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-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 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;
- if ((ret =
-+#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && 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_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && 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));
- }
- }