From: Erik Kapfer erik.kapfer@ipfire.org
Signed-off-by: Michael Tremer michael.tremer@ipfire.org --- lfs/squidguard | 1 + src/patches/squidguard-1.4.1-db6.patch | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 src/patches/squidguard-1.4.1-db6.patch
diff --git a/lfs/squidguard b/lfs/squidguard index a48c25cbe2d2..ae872a17cd96 100644 --- 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 < $(DIR_SRC)/src/patches/squidguard-1.4.1-db6.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.1-db6.patch b/src/patches/squidguard-1.4.1-db6.patch new file mode 100644 index 000000000000..214f89caf86b --- /dev/null +++ b/src/patches/squidguard-1.4.1-db6.patch @@ -0,0 +1,15 @@ +Patch from Mon Jan 21 2013 Bojan Smojver bojan@rexursive.com - 1.4-16 +https://bugzilla.redhat.com/attachment.cgi?id=684010 +Fix for Berkeley DB 6 + +--- squidGuard-1.4.1.orig/src/sgDb.c 2008-07-14 20:29:41.000000000 +0200 ++++ squidGuard-1.4.1/src/sgDb.c 2015-06-25 09:44:24.009793986 +0200 +@@ -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)