From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] squidGuard: Fix generating databases with libdb >= 5
Date: Fri, 22 May 2020 13:38:50 +0100
Message-ID: <8F7ACEB6-518C-44C8-8BCA-87BF7ACC5D22@ipfire.org>
In-Reply-To: <9d9081d8-9880-2f5a-16a5-908aa078bf4a@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5602147893036953208=="
List-Id: <development.lists.ipfire.org>

--===============5602147893036953208==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Hi,

Oh yes, I totally forgot.

Patchwork only seems to have half of the patch for some reason.

But it is here: https://lists.ipfire.org/pipermail/development/2016-December/=
002829.html

@Arne: I would recommend to merge this one then for the next core update. The=
re seem to be some security-related fixes in it.

Best,
-Michael

> On 22 May 2020, at 13:33, Matthias Fischer <matthias.fischer(a)ipfire.org> =
wrote:
>=20
> Hi,
>=20
> just saw this patch (and couldn't help but smile a bit):
>=20
> =3D> https://patchwork.ipfire.org/patch/947/
>=20
> I don't know why, but I can't find this one on GIT anymore.
>=20
> But:
> Interested?
>=20
> Best,
> Matthias
>=20
> On 22.05.2020 13:49, Michael Tremer wrote:
>> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
>> ---
>> lfs/squidguard                       |  1 +
>> src/patches/squidGuard-1.4-db5.patch | 12 ++++++++++++
>> 2 files changed, 13 insertions(+)
>> create mode 100644 src/patches/squidGuard-1.4-db5.patch
>>=20
>> diff --git a/lfs/squidguard b/lfs/squidguard
>> index f627a27d8..38efab0ee 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-squi=
d-helper-protocol.patch
>> +	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/squidGuard-1.4-db5=
.patch
>> 	cd $(DIR_APP) && ./configure --prefix=3D/usr --datadir=3D/usr/share \
>> 		--sysconfdir=3D/etc --localstatedir=3D/var --infodir=3D/usr/info --mandi=
r=3D/usr/man  \
>> 		--with-sg-config=3D/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
>> index 000000000..733fbad2e
>> --- /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 =3D=3D 4
>> ++#if DB_VERSION_MAJOR >=3D 4
>> +   if(globalUpdate || createdb || (dbfile !=3D NULL && stat(dbfile,&st))){
>> +     flag =3D DB_CREATE;
>> +     if(createdb)
>> \ No newline at end of file
>>=20
>=20


--===============5602147893036953208==--