From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 4/6] squidguard: Fix build with db6 Date: Wed, 15 Jul 2015 15:40:59 +0200 Message-ID: <1436967661-17353-5-git-send-email-michael.tremer@ipfire.org> In-Reply-To: <1436967661-17353-1-git-send-email-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1750407120181688632==" List-Id: --===============1750407120181688632== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Erik Kapfer Signed-off-by: Michael Tremer --- 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.p= atch cd $(DIR_APP) && ./configure --prefix=3D/usr --datadir=3D/usr/share \ --sysconfdir=3D/etc --localstatedir=3D/var --infodir=3D/usr/info --mandir= =3D/usr/man \ --with-sg-config=3D/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 - 1.4-16 +https://bugzilla.redhat.com/attachment.cgi?id=3D684010 +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 =3D=3D 4 ++#if DB_VERSION_MAJOR >=3D 4 + if(globalUpdate || createdb || (dbfile !=3D NULL && stat(dbfile,&st))){ + flag =3D DB_CREATE; + if(createdb) --=20 2.4.3 --===============1750407120181688632==--