Bug 251887
| Summary: | security/suricata: update to 5.0.5 | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Franco Fichtner <franco> | ||||||
| Component: | Individual Port(s) | Assignee: | Kai Knoblich <kai> | ||||||
| Status: | Closed FIXED | ||||||||
| Severity: | Affects Only Me | CC: | diizzy, fernape, franco, kai | ||||||
| Priority: | --- | Flags: | kai:
maintainer-feedback+
kai: merge-quarterly+ |
||||||
| Version: | Latest | ||||||||
| Hardware: | Any | ||||||||
| OS: | Any | ||||||||
| URL: | https://suricata-ids.org/2020/12/04/suricata-6-0-1-5-0-5-and-4-1-10-released/ | ||||||||
| Attachments: |
|
||||||||
|
Description
Franco Fichtner
2020-12-16 08:47:38 UTC
^Triage: If there is a changelog or release notes URL available for this version, please add it to the URL field. Q/A: Makefile: "LIB_DEPENDS" has to appear earlier. Makefile: "USES" has to appear earlier. /tmp/251887/security/suricata/files/patch-src_suricata-common.h: patch was not generated using ``make makepatch''. It is recommended to use ``make makepatch'' when you need to [re-]generate a patch to ensure proper patch format. ^Triage: Please confirm this change passes QA (portlint, poudriere at least). -- https://www.freebsd.org/doc/en/books/porters-handbook/testing.html Thanks! QA passes on 12.1. I'm not sure why portlint keeps bugging. Maybe I'm stupid for not knowing what it wants while it keeps complaining about any order of LIB_DEPENDS, USES and BUILD_DEPENDS no matter how you arrange them. (In reply to Franco Fichtner from comment #2) Don't sweat, I think it is portlint who is dumb in this case. Tip: if you want to silence the warning, try to remove the blank line between BUILD_DEPENDS and LIB_DEPENDS. portclippy is smart enough to do it right. Thanks for double checking. Aha, so it doesn't like DEPENDS in separate blocks. Thanks for the find. Created attachment 221288 [details] suricata-5.0.5-with-libjansson-as-fixed-dependency.patch (In reply to Franco Fichtner from comment #0) thank you for the patch! A small issue was spotted during the QA builds with default/all/no options set. If all options are unset the build fails because the devel/jansson dependency of the JSON option is mandatory since the 5.0.0 release: > checking jansson.h usability... no > checking jansson.h presence... no > checking for jansson.h... no > checking for json_dump_callback in -ljansson... no > > ERROR: Jansson is now required. Attached is an updated patch with the all parts of the JSON option converted to fixed components. It also contains the style fix for the dependency block as already mentioned in comment #3 and comment #4. P.S.: As this release is a bugfix release it's a candidate for MFH'ing it into the 2021Q1 branch as well. Comment on attachment 221288 [details]
suricata-5.0.5-with-libjansson-as-fixed-dependency.patch
looks good, thank you
Do we really need to use -includes= and -libraries= if USES= localbase or localbase:ldflags is set? (In reply to daniel.engberg.lists from comment #7) USES=localbase should be enough to remove both *-includes and *-libraries (In reply to daniel.engberg.lists from comment #7) (In reply to Fernando Apesteguía from comment #8) Thank you for your inputs, the entire Makefile could be somewhat modernized, indeed. I would, however, appreciate it if these changes are tracked in a separate bug after security/suricata is updated to 5.0.5. IMHO we can then look at the whole changes and test them with enough time and, if necessary, fix/improve/revert things if something doesn't work immediately afterwards. (In reply to Kai Knoblich from comment #9) Sounds ok to me. Thanks! A commit references this bug: Author: kai Date: Thu Jan 7 10:24:04 UTC 2021 New revision: 560700 URL: https://svnweb.freebsd.org/changeset/ports/560700 Log: security/suricata: Update to 5.0.5 [1] * Remove the JSON option and convert the relevant parts into fixed components because devel/jansson has become a mandatory dependency since the 5.0.0 release. [2] Changelog: https://github.com/OISF/suricata/blob/suricata-5.0.5/ChangeLog PR: 251887 Submitted by: Franco Fichtner <franco@opnsense.org> (maintainer) [1] Reviewed by: fernape, daniel.engberg.lists@pyret.net Approved by: maintainer [2] Changes: head/security/suricata/Makefile head/security/suricata/distinfo A commit references this bug: Author: kai Date: Thu Jan 7 10:27:47 UTC 2021 New revision: 560701 URL: https://svnweb.freebsd.org/changeset/ports/560701 Log: MFH: r560700 security/suricata: Update to 5.0.5 [1] * Remove the JSON option and convert the relevant parts into fixed components because devel/jansson has become a mandatory dependency since the 5.0.0 release. [2] Changelog: https://github.com/OISF/suricata/blob/suricata-5.0.5/ChangeLog PR: 251887 Submitted by: Franco Fichtner <franco@opnsense.org> (maintainer) [1] Reviewed by: fernape, daniel.engberg.lists@pyret.net Approved by: maintainer [2] Approved by: ports-secteam (implicit, bugfix blanket) Changes: _U branches/2021Q1/ branches/2021Q1/security/suricata/Makefile branches/2021Q1/security/suricata/distinfo Committed to the /head and 2021Q1 branches, thank you, Franco, for the patch and all of you for the feedback! ^ Triage: Clean up (MFH was done and maintainer-feedback was given in comment #6) |
