Comment 1 commit-hook 2021-09-07 21:59:16 UTC

A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b0c4eaac2a3aa9bc422c21b9d398e4dbfea18736

commit b0c4eaac2a3aa9bc422c21b9d398e4dbfea18736
Author:     Craig Leres <leres@FreeBSD.org>
AuthorDate: 2021-09-07 21:55:24 +0000
Commit:     Craig Leres <leres@FreeBSD.org>
CommitDate: 2021-09-07 21:55:24 +0000

    security/suricata: Add patch for upstream locking fix

        https://redmine.openinfosecfoundation.org/issues/4478

     - Suricata 6 may stop forwarding traffic due to lock/unlock executed
       between CPUs, which is undetermined behaviour.

    PR:             258335
    Approved by:    Franco Fichtner (maintainer)

 security/suricata/Makefile                    |  1 +
 security/suricata/files/patch-3c53a1601 (new) | 78 +++++++++++++++++++++++++++
 2 files changed, 79 insertions(+)

Comment 2 commit-hook 2021-09-07 22:29:22 UTC

A commit in branch 2021Q3 references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3c50e5f92ad40b4a917de1ecb99cd73068d761c7

commit 3c50e5f92ad40b4a917de1ecb99cd73068d761c7
Author:     Craig Leres <leres@FreeBSD.org>
AuthorDate: 2021-09-07 21:55:24 +0000
Commit:     Craig Leres <leres@FreeBSD.org>
CommitDate: 2021-09-07 22:27:27 +0000

    security/suricata: Add patch for upstream locking fix

        https://redmine.openinfosecfoundation.org/issues/4478

     - Suricata 6 may stop forwarding traffic due to lock/unlock executed
       between CPUs, which is undetermined behaviour.

    PR:             258335
    Approved by:    Franco Fichtner (maintainer)

    (cherry picked from commit b0c4eaac2a3aa9bc422c21b9d398e4dbfea18736)

 security/suricata/Makefile                    |  6 +--
 security/suricata/distinfo                    |  6 +--
 security/suricata/files/patch-3c53a1601 (new) | 78 +++++++++++++++++++++++++++
 security/suricata/pkg-plist                   |  3 +-
 4 files changed, 86 insertions(+), 7 deletions(-)

Comment 3 Craig Leres 2021-09-08 03:47:46 UTC

Committed (HEAD+2021Q3), thanks for the patch!

Thanks for the quick commit!

Craig, 2021Q3 build is currently broken: obsolete rust files haven't been removed since commit included bump to 6.0.3.  Could you take care of that please? :)


Thanks,
Franco

Comment 6 commit-hook 2021-09-16 23:00:04 UTC

A commit in branch 2021Q3 references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ec577d019bdb488915a648adc5d511192d94b77f

commit ec577d019bdb488915a648adc5d511192d94b77f
Author:     Craig Leres <leres@FreeBSD.org>
AuthorDate: 2021-09-16 20:49:12 +0000
Commit:     Craig Leres <leres@FreeBSD.org>
CommitDate: 2021-09-16 20:49:12 +0000

    security/suricata: Remove obsolete patches and unbreak 2021Q3 build

    Remove patches that should have been removed with 3c50e5f92ad4.

    PR:             258335
    Reported by:    Franco Fichtner (maintainer)

 ...exical-core_src_atof_algorithm_bhcomp.rs (gone) |  11 --
 ...xical-core_src_atof_algorithm_bigcomp.rs (gone) |  39 ----
 ..._lexical-core_src_atof_algorithm_math.rs (gone) | 211 ---------------------
 .../files/patch-src_suricata-common.h (gone)       |  11 --
 4 files changed, 272 deletions(-)

Comment 7 Craig Leres 2021-09-16 23:02:44 UTC

(In reply to Franco Fichtner from comment #5)
Sorry about that. I find quarterly branch merges much more challenging with git... 2021Q3 should be good now.

Yay, thank you :)