* [PATCH] suricata: Update to 5.0.6
@ 2021-03-03 12:56 Matthias Fischer
2021-03-03 13:28 ` Michael Tremer
0 siblings, 1 reply; 4+ messages in thread
From: Matthias Fischer @ 2021-03-03 12:56 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 2450 bytes --]
For details see:
https://forum.suricata.io/t/suricata-6-0-2-and-5-0-6-released/1170
and
https://redmine.openinfosecfoundation.org/versions/164
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(-)
diff --git a/config/rootfiles/common/suricata b/config/rootfiles/common/suricata
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 @@
include Config
-VER = 5.0.5
+VER = 5.0.6
THISAPP = suricata-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = fe039cc4571eb56828874ddc0b71dc51
+$(DL_FILE)_MD5 = 82d80b4b3179315bf6f5695c6437ee1f
install : $(TARGET)
--
2.18.0
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] suricata: Update to 5.0.6
2021-03-03 12:56 [PATCH] suricata: Update to 5.0.6 Matthias Fischer
@ 2021-03-03 13:28 ` Michael Tremer
2021-03-03 14:34 ` Matthias Fischer
0 siblings, 1 reply; 4+ messages in thread
From: Michael Tremer @ 2021-03-03 13:28 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 3028 bytes --]
Hello,
This patch looks okay, but there are two directories that are no longer included:
* /etc/suricata
* /var/lib/suricata
The latter has different ownership and not including it in the root file would result in not copying this into the installed IPFire system.
I changed the patch so that they are included again and merged it.
Thank you.
-Michael
> On 3 Mar 2021, at 12:56, Matthias Fischer <matthias.fischer(a)ipfire.org> wrote:
>
> For details see:
> https://forum.suricata.io/t/suricata-6-0-2-and-5-0-6-released/1170
>
> and
>
> https://redmine.openinfosecfoundation.org/versions/164
>
> 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(-)
>
> diff --git a/config/rootfiles/common/suricata b/config/rootfiles/common/suricata
> 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 @@
>
> include Config
>
> -VER = 5.0.5
> +VER = 5.0.6
>
> THISAPP = suricata-$(VER)
> DL_FILE = $(THISAPP).tar.gz
> @@ -44,7 +44,7 @@ objects = $(DL_FILE)
>
> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>
> -$(DL_FILE)_MD5 = fe039cc4571eb56828874ddc0b71dc51
> +$(DL_FILE)_MD5 = 82d80b4b3179315bf6f5695c6437ee1f
>
> install : $(TARGET)
>
> --
> 2.18.0
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] suricata: Update to 5.0.6
2021-03-03 13:28 ` Michael Tremer
@ 2021-03-03 14:34 ` Matthias Fischer
2021-03-03 14:35 ` Michael Tremer
0 siblings, 1 reply; 4+ messages in thread
From: Matthias Fischer @ 2021-03-03 14:34 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 3377 bytes --]
On 03.03.2021 14:28, Michael Tremer wrote:
> Hello,
>
> This patch looks okay, but there are two directories that are no longer included:
>
> * /etc/suricata
> * /var/lib/suricata
>
> The latter has different ownership and not including it in the root file would result in not copying this into the installed IPFire system.
Sorry, I overlooked the ownerships - I just wondered and thought it
would be sufficient to include the contained files together with the
directory entries...
> I changed the patch so that they are included again and merged it.
>
> Thank you.
Dto.! ;-)
Best,
Matthias
>
> -Michael
>
>> On 3 Mar 2021, at 12:56, Matthias Fischer <matthias.fischer(a)ipfire.org> wrote:
>>
>> For details see:
>> https://forum.suricata.io/t/suricata-6-0-2-and-5-0-6-released/1170
>>
>> and
>>
>> https://redmine.openinfosecfoundation.org/versions/164
>>
>> 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(-)
>>
>> diff --git a/config/rootfiles/common/suricata b/config/rootfiles/common/suricata
>> 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 @@
>>
>> include Config
>>
>> -VER = 5.0.5
>> +VER = 5.0.6
>>
>> THISAPP = suricata-$(VER)
>> DL_FILE = $(THISAPP).tar.gz
>> @@ -44,7 +44,7 @@ objects = $(DL_FILE)
>>
>> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>>
>> -$(DL_FILE)_MD5 = fe039cc4571eb56828874ddc0b71dc51
>> +$(DL_FILE)_MD5 = 82d80b4b3179315bf6f5695c6437ee1f
>>
>> install : $(TARGET)
>>
>> --
>> 2.18.0
>>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] suricata: Update to 5.0.6
2021-03-03 14:34 ` Matthias Fischer
@ 2021-03-03 14:35 ` Michael Tremer
0 siblings, 0 replies; 4+ messages in thread
From: Michael Tremer @ 2021-03-03 14:35 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 3674 bytes --]
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> wrote:
>
> On 03.03.2021 14:28, Michael Tremer wrote:
>> Hello,
>>
>> This patch looks okay, but there are two directories that are no longer included:
>>
>> * /etc/suricata
>> * /var/lib/suricata
>>
>> The latter has different ownership and not including it in the root file would result in not copying this into the installed IPFire system.
>
> Sorry, I overlooked the ownerships - I just wondered and thought it
> would be sufficient to include the contained files together with the
> directory entries...
>
>> I changed the patch so that they are included again and merged it.
>>
>> Thank you.
>
> Dto.! ;-)
>
> Best,
> Matthias
>
>>
>> -Michael
>>
>>> On 3 Mar 2021, at 12:56, Matthias Fischer <matthias.fischer(a)ipfire.org> wrote:
>>>
>>> For details see:
>>> https://forum.suricata.io/t/suricata-6-0-2-and-5-0-6-released/1170
>>>
>>> and
>>>
>>> https://redmine.openinfosecfoundation.org/versions/164
>>>
>>> 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(-)
>>>
>>> diff --git a/config/rootfiles/common/suricata b/config/rootfiles/common/suricata
>>> 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 @@
>>>
>>> include Config
>>>
>>> -VER = 5.0.5
>>> +VER = 5.0.6
>>>
>>> THISAPP = suricata-$(VER)
>>> DL_FILE = $(THISAPP).tar.gz
>>> @@ -44,7 +44,7 @@ objects = $(DL_FILE)
>>>
>>> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>>>
>>> -$(DL_FILE)_MD5 = fe039cc4571eb56828874ddc0b71dc51
>>> +$(DL_FILE)_MD5 = 82d80b4b3179315bf6f5695c6437ee1f
>>>
>>> install : $(TARGET)
>>>
>>> --
>>> 2.18.0
>>>
>>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-03-03 14:35 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-03 12:56 [PATCH] suricata: Update to 5.0.6 Matthias Fischer
2021-03-03 13:28 ` Michael Tremer
2021-03-03 14:34 ` Matthias Fischer
2021-03-03 14:35 ` Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox