Created attachment 245877 [details] Update to 1.3.1
Instead of CC_OPT and LD_OPT, check if you can use the standard CFLAGS and LDFLAGS variables. Then, you can just add USES=localbase:ldflags to have them set as you need them.
(In reply to Robert Clausecker from comment #2) Sorry for the such long pause on my side. Unfortunately, this won't work as port's configure/Makefile don't take into account LDFLAGS from the environment (unlike CFLAGS though). The only way to customize LDFLAGS is passing `--with-ld-opt` option on configure invocation. If you prefer, I can update patch to get rid of `--with-cc-opt` but from my perspective it looks more consistent to handle both variables in the same way. Please let me know you opinion.
(In reply to oleg from comment #3) Hi Oleg, Thank you for getting back to me. The point is about using the standard variable names so extra stuff set by the user is taken into account. You could for example do --with-cc-opt="${CFLAGS}" --with-ld-opt="${LDFLAGS}" instead of using variables named CC_OPT and LD_OPT. Then, USES=localbase should do the right thing.
(In reply to Robert Clausecker from comment #4) Sorry for for my misunderstanding. Indeed, this approach should work and looks a way better. I'm attaching new patches (re-worked and splitted for convenience).
Created attachment 246281 [details] [PATCH] www/angie: Update to 1.3.1
Created attachment 246282 [details] [PATCH] www/angie: Remove @sample marker from html
Created attachment 246283 [details] [PATCH] www/angie: passing compiler/linker flags
Created attachment 246284 [details] [PATCH] www/angie: update dependent modules
Thank you for the update. I apologise for the delay and will proceed with additional testing prompty. Are there changelogs for the updates?
(In reply to Robert Clausecker from comment #10) I thought short patch notes were enough, am I wrong? (If so, I can create more detailed commit messages and re-send one more time)
(In reply to oleg from comment #11) No need to resend the commits. What I mean by "changelog" is a changelog for angie and the modules, i.e. what changed from the version currently in ports to 1.3.1. Any new features? Bug fixes? Security issues fixed? Etc. If angie has a changelog, it is sufficient if you just give me the link.
(In reply to Robert Clausecker from comment #12) Got it, sure thing: - angie 1.3.1 changes: https://github.com/webserver-llc/angie/blob/master/CHANGES (fix for CVE-2023-44487) - angie-module-auth-jwt: https://github.com/kjdev/nginx-auth-jwt/commit/1b32c94ecc2ca8d7f2690c7f60a8fff07bee0a25 (fix for the segfault found by our CI) - angie-module-headers-more changelog looks not so nice (unfortunately): https://github.com/openresty/headers-more-nginx-module/releases/tag/v0.35 - angie-module-njs 0.8.2 changes: https://github.com/nginx/njs/blob/master/CHANGES - angie-module-vod 1.32 changes: https://github.com/kaltura/nginx-vod-module/releases/tag/1.32
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=d6840ea3962a42f3e5ec5b8d4f7f861c32b78327 commit d6840ea3962a42f3e5ec5b8d4f7f861c32b78327 Author: Oleg A. Mamontov <oleg@mamontov.net> AuthorDate: 2023-11-13 21:28:22 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2023-11-18 20:20:40 +0000 www/angie*: update dependent modules Changelogs: - https://github.com/kjdev/nginx-auth-jwt/commit/1b32c94ecc2ca8d7f2690c7f60a8fff07bee0a25 - https://github.com/openresty/headers-more-nginx-module/releases/tag/v0.35 - https://github.com/nginx/njs/blob/master/CHANGES - https://github.com/kaltura/nginx-vod-module/releases/tag/1.32 PR: 274728 www/angie-module-auth-jwt/Makefile | 2 +- www/angie-module-headers-more/Makefile | 2 +- www/angie-module-njs/Makefile | 2 +- www/angie-module-vod/Makefile | 2 +- www/angie/distinfo | 18 +++++++++--------- 5 files changed, 13 insertions(+), 13 deletions(-)
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=dc6553d233dc97aa8f39afc72e1096387ef27c12 commit dc6553d233dc97aa8f39afc72e1096387ef27c12 Author: Oleg A. Mamontov <oleg@mamontov.net> AuthorDate: 2023-11-13 21:16:51 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2023-11-18 20:20:40 +0000 www/angie: Update to 1.3.1 - remove @sample marker from html; these files are not supposed to be modified by the end user - obey CFLAGS/LDFLAGS and add USES=localbase. This allows dependent modules to add necessary compiler/linker hints. Changelog: https://github.com/webserver-llc/angie/blob/master/CHANGES PR: 274728 www/angie/Makefile | 10 +++++----- www/angie/distinfo | 6 +++--- www/angie/pkg-plist | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-)
Thank you for your contribution.