From mboxrd@z Thu Jan  1 00:00:00 1970
From: Matthias Fischer <matthias.fischer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] squidGuard: Fix generating databases with libdb >= 5
Date: Sat, 23 May 2020 12:06:40 +0200
Message-ID: <36a97f3a-5512-339c-35b9-98f0b14b087c@ipfire.org>
In-Reply-To: <8F7ACEB6-518C-44C8-8BCA-87BF7ACC5D22@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4467839033420109043=="
List-Id: <development.lists.ipfire.org>

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

Hi,

JFYI: regarding this update I saw that at that time I forgot to delete a
no longer needed patch while sending it:

src/patches/squidGuard-1.4-db5.patch

Best,
Matthias

On 22.05.2020 14:38, Michael Tremer wrote:
> Hi,
>=20
> Oh yes, I totally forgot.
>=20
> Patchwork only seems to have half of the patch for some reason.
>=20
> But it is here: https://lists.ipfire.org/pipermail/development/2016-Decembe=
r/002829.html
>=20
> @Arne: I would recommend to merge this one then for the next core update. T=
here seem to be some security-related fixes in it.
>=20
> Best,
> -Michael
>=20
>> 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-squ=
id-helper-protocol.patch
>>> +	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/squidGuard-1.4-db=
5.patch
>>> 	cd $(DIR_APP) && ./configure --prefix=3D/usr --datadir=3D/usr/share \
>>> 		--sysconfdir=3D/etc --localstatedir=3D/var --infodir=3D/usr/info --mand=
ir=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/squidGuar=
d-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
>=20


--===============4467839033420109043==--