Created attachment 235497 [details] patch for crowdsec 1.4.1 Performance improvements, TLS support and more. Full changelog: https://github.com/crowdsecurity/crowdsec/releases/tag/v1.4.1
Maintainer informed via mail
Hi, Maintainer e-mail address differs from bugzilla. Would you like to update bugzilla email? Cheers
(In reply to Nuno Teixeira from comment #2) done, thanks
Created attachment 235632 [details] crowdsec-1.4.1 variables fixed v1 Sugestion: 1. switch to DISTVERSION --- PORTNAME= crowdsec -PORTVERSION= 1.3.4 # NOTE: change BUILD_VERSION and BUILD_TAG as well -PORTREVISION= 2 DISTVERSIONPREFIX= v +DISTVERSION= 1.4.1 # NOTE: change _BUILD_TAG as well CATEGORIES= security --- 2. remove #GH_TAGNAME comment add user varialble _BUILD_TAG (short hash) --- -GH_TAGNAME= v1.3.4-freebsd -#GH_TAGNAME is automatically set from DISTVERSION +GH_TAGNAME= v1.4.1-freebsd +_BUILD_TAG= 527995f --- 3. substitute BUILD_VERSION variable substitute BUILD_VERSION variable --- -MAKE_ENV= BUILD_VERSION="v1.3.4" \ - BUILD_TAG="c196ed45b62c12d9c6549da927c37c64bd08c642" \ +MAKE_ENV= BUILD_VERSION="${DISTVERSIONFULL}" \ + BUILD_TAG="${_BUILD_TAG}" \ --- Question: since GH_TAGNAME could be a hash of a commit id to do a snapshot, in this example a commit id, why it is needed to mention hash in BUILD_TAG? IMO, BUILD_TAG=${GH_TAGNAME} will be sufficient Could you test it? Cheers
Hi, thanks for suggestion! Long story short: I have tested, I agree and also GH_TAGNAME= ${DISTVERSIONFULL}-freebsd do you need a new patch? Now the long story. I need the freebsd release tags because I include vendored dependencies, which are not used in the other builds. But if I reference only the commit hash in GH_TAGNAME then I would have nothing, anywhere, that references the tag name. I could remove the 1.3.4-freebsd and its packages would still accidentally build while taking the code from the 1.4.1-freebsd history... I don't like that. On the other hand the (misnamed) BUILD_TAG variable is used by the "cscli" command to display the version number. The makefile calls "git rev-parse HEAD" under Linux but I can't do that while building from a zip file. If I set it to the tag name it would render as "v1.4.1-v1.4.1-freebsd". Ideally, I should be able to avoid a separate release tag by retrieving the dependencies before the build step, but I have not been able to replicate the functionality provided by go:modules, or configure it for my case.
(In reply to marco from comment #5) Hi Marco, Ok, please upload a new patch so I can commit. Cheers
Created attachment 235676 [details] patch for crowdsec 1.4.1 v2 done. thanks!
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=3dac205de1896cb1e3362d2b74a672ef94d10654 commit 3dac205de1896cb1e3362d2b74a672ef94d10654 Author: Marco <marco@crowdsec.net> AuthorDate: 2022-08-04 18:32:44 +0000 Commit: Nuno Teixeira <eduardo@FreeBSD.org> CommitDate: 2022-08-04 18:34:51 +0000 security/crowdsec: Update to 1.4.1 - Performance improvements, TLS support and more. ChangeLog: https://github.com/crowdsecurity/crowdsec/releases/tag/v1.4.1 PR: 265462 security/crowdsec/Makefile | 17 +++++++++-------- security/crowdsec/distinfo | 6 +++--- 2 files changed, 12 insertions(+), 11 deletions(-)
Committed, thanks!