squidGuard: Fix generating databases with libdb >= 5

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/lfs/squidguard b/lfs/squidguard
index f627a27d81ddb3af8726bd7e9513582b31b96398..38efab0ee4410199815d92b106bc65a749329da9 100644 (file)
--- a/lfs/squidguard
+++ b/lfs/squidguard
@@ -71,6 +71,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/squidguard-1.4-squid-helper-protocol.patch
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/squidGuard-1.4-db5.patch
        cd $(DIR_APP) && ./configure --prefix=/usr --datadir=/usr/share \
                --sysconfdir=/etc --localstatedir=/var --infodir=/usr/info --mandir=/usr/man  \
                --with-sg-config=/var/ipfire/urlfilter/squidGuard.conf \

diff --git a/src/patches/squidGuard-1.4-db5.patch b/src/patches/squidGuard-1.4-db5.patch
new file mode 100644 (file)
index 0000000..733fbad
--- /dev/null
+++ b/src/patches/squidGuard-1.4-db5.patch
@@ -0,0 +1,12 @@
+diff -ruN squidGuard-1.4-vanilla/src/sgDb.c squidGuard-1.4/src/sgDb.c
+--- squidGuard-1.4-vanilla/src/sgDb.c  2008-07-15 04:29:41.000000000 +1000
++++ squidGuard-1.4/src/sgDb.c  2013-01-21 12:47:41.049325756 +1100
+@@ -114,7 +114,7 @@
+     }
+   }
+ #endif
+-#if DB_VERSION_MAJOR == 4
++#if DB_VERSION_MAJOR >= 4
+   if(globalUpdate || createdb || (dbfile != NULL && stat(dbfile,&st))){
+     flag = DB_CREATE;
+     if(createdb)
\ No newline at end of file