diff mbox series

suricata: Update to 5.0.6

Message ID 20210303125656.2290-1-matthias.fischer@ipfire.org
State Accepted
Headers
Series suricata: Update to 5.0.6 |

Commit Message

Matthias Fischer March 3, 2021, 12:56 p.m. UTC 
  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@ipfire.org>
---
 config/rootfiles/common/suricata | 8 +++++---
 lfs/suricata                     | 6 +++---
 2 files changed, 8 insertions(+), 6 deletions(-)

Comments

Michael Tremer March 3, 2021, 1:28 p.m. UTC | #1 
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@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@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@ipfire.org>                     #
> +# Copyright (C) 2007-2021  IPFire Team  <info@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
>
Matthias Fischer March 3, 2021, 2:34 p.m. UTC | #2 
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@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@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@ipfire.org>                     #
>> +# Copyright (C) 2007-2021  IPFire Team  <info@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
>> 
>
Michael Tremer March 3, 2021, 2:35 p.m. UTC | #3 
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@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@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@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@ipfire.org>                     #
>>> +# Copyright (C) 2007-2021  IPFire Team  <info@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
>>> 
>> 
>
diff mbox series

Patch

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@ipfire.org>                     #
+# Copyright (C) 2007-2021  IPFire Team  <info@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)