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] suricata: Update to 5.0.6
Date: Wed, 03 Mar 2021 14:35:11 +0000
Message-ID: <6E12770D-CEAA-42AE-BC93-ABF498DD31FE@ipfire.org>
In-Reply-To: <3fdbf887-501b-f760-4359-8964b88bee54@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3472564284165805485=="
List-Id: <development.lists.ipfire.org>

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

Hello,

No problem. I caught it and just thought I would let you know :)

-Michael

> On 3 Mar 2021, at 14:34, Matthias Fischer <matthias.fischer(a)ipfire.org> w=
rote:
>=20
> On 03.03.2021 14:28, Michael Tremer wrote:
>> Hello,
>>=20
>> This patch looks okay, but there are two directories that are no longer in=
cluded:
>>=20
>> * /etc/suricata
>> * /var/lib/suricata
>>=20
>> The latter has different ownership and not including it in the root file w=
ould result in not copying this into the installed IPFire system.
>=20
> Sorry, I overlooked the ownerships - I just wondered and thought it
> would be sufficient to include the contained files together with the
> directory entries...
>=20
>> I changed the patch so that they are included again and merged it.
>>=20
>> Thank you.
>=20
> Dto.! ;-)
>=20
> Best,
> Matthias
>=20
>>=20
>> -Michael
>>=20
>>> On 3 Mar 2021, at 12:56, Matthias Fischer <matthias.fischer(a)ipfire.org>=
 wrote:
>>>=20
>>> For details see:
>>> https://forum.suricata.io/t/suricata-6-0-2-and-5-0-6-released/1170
>>>=20
>>> and
>>>=20
>>> https://redmine.openinfosecfoundation.org/versions/164
>>>=20
>>> Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
>>> ---
>>> config/rootfiles/common/suricata | 8 +++++---
>>> lfs/suricata                     | 6 +++---
>>> 2 files changed, 8 insertions(+), 6 deletions(-)
>>>=20
>>> diff --git a/config/rootfiles/common/suricata b/config/rootfiles/common/s=
uricata
>>> index f891fa449..5a1b22204 100644
>>> --- a/config/rootfiles/common/suricata
>>> +++ b/config/rootfiles/common/suricata
>>> @@ -1,9 +1,8 @@
>>> -etc/suricata
>>> +#etc/suricata
>>> etc/suricata/suricata.yaml
>>> #root/.cargo
>>> #root/.cargo/.package-cache
>>> usr/bin/suricata
>>> -#usr/include/suricata-plugin.h
>>> #usr/share/doc/suricata
>>> #usr/share/doc/suricata/AUTHORS
>>> #usr/share/doc/suricata/Basic_Setup.txt
>>> @@ -17,7 +16,10 @@ usr/bin/suricata
>>> #usr/share/doc/suricata/TODO
>>> #usr/share/doc/suricata/Third_Party_Installation_Guides.txt
>>> #usr/share/man/man1/suricata.1
>>> -var/lib/suricata
>>> +#usr/share/man/man1/suricatactl-filestore.1
>>> +#usr/share/man/man1/suricatactl.1
>>> +#usr/share/man/man1/suricatasc.1
>>> +#var/lib/suricata
>>> var/lib/suricata/classification.config
>>> var/lib/suricata/reference.config
>>> var/lib/suricata/threshold.config
>>> diff --git a/lfs/suricata b/lfs/suricata
>>> index c5dc46af4..522cdc440 100644
>>> --- a/lfs/suricata
>>> +++ b/lfs/suricata
>>> @@ -1,7 +1,7 @@
>>> #########################################################################=
######
>>> #                                                                        =
     #
>>> # IPFire.org - A linux based firewall                                    =
     #
>>> -# Copyright (C) 2007-2020  IPFire Team  <info(a)ipfire.org>             =
        #
>>> +# Copyright (C) 2007-2021  IPFire Team  <info(a)ipfire.org>             =
        #
>>> #                                                                        =
     #
>>> # This program is free software: you can redistribute it and/or modify   =
     #
>>> # it under the terms of the GNU General Public License as published by   =
     #
>>> @@ -24,7 +24,7 @@
>>>=20
>>> include Config
>>>=20
>>> -VER        =3D 5.0.5
>>> +VER        =3D 5.0.6
>>>=20
>>> THISAPP    =3D suricata-$(VER)
>>> DL_FILE    =3D $(THISAPP).tar.gz
>>> @@ -44,7 +44,7 @@ objects =3D $(DL_FILE)
>>>=20
>>> $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
>>>=20
>>> -$(DL_FILE)_MD5 =3D fe039cc4571eb56828874ddc0b71dc51
>>> +$(DL_FILE)_MD5 =3D 82d80b4b3179315bf6f5695c6437ee1f
>>>=20
>>> install : $(TARGET)
>>>=20
>>> --=20
>>> 2.18.0
>>>=20
>>=20
>=20


--===============3472564284165805485==--