Bug 277719
| Summary: | www/nginx: Add support for 3rd party stream-lua-nginx-module | ||
|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Eirik Oeverby <ltning-freebsd> |
| Component: | Individual Port(s) | Assignee: | Mateusz Piotrowski <0mp> |
| Status: | Closed FIXED | ||
| Severity: | Affects Some People | CC: | 0mp, joneum, kiwi, ltning-freebsd, osa |
| Priority: | --- | Flags: | 0mp:
maintainer-feedback-
|
| Version: | Latest | ||
| Hardware: | Any | ||
| OS: | Any | ||
| See Also: | https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=278951 | ||
| Attachments: | |||
Suggest considering this for www/nginx-devel as well. Created attachment 249187 [details]
Patch for www/nginx
Hi !
Here is an updated patch for Eirik work's.
Also notice the ports has been successfully built on poudriere (with and without options).
Kind regards,
Xavier
Created attachment 249188 [details]
Poudriere nginx log with defaut options.
Created attachment 249189 [details]
Poudriere nginx log with luastream option activated.
Created attachment 249190 [details]
nginx-devel patch
nginx-devel patch (tested also in poudriere).
Created attachment 249191 [details]
Poudriere nginx-devel log with defaut options.
Created attachment 249192 [details]
Poudriere nginx-devel log with luastream option activated.
Thanks for working on this. Any ETA on getting the port updated? @osa: what is your opinion on this PR as nginx-devel maintainer? Hmm, I wonder if there is a need for one more change in this patch, look at line 249 in the Makefile:
```
.if empty(PORT_OPTIONS:MLUA) && empty(PORT_OPTIONS:MMODSECURITY3) && \
empty(PORT_OPTIONS:MPASSENGER)
CONFIGURE_ARGS+= --with-ld-opt="-L ${LOCALBASE}/lib"
.else
CONFIGURE_ARGS+= --with-ld-opt="-L ${LOCALBASE}/lib -lpcre"
LIB_DEPENDS+= libpcre.so:devel/pcre
.endif
```
I suspect that LUASTREAM requires similar treatment to LUA, and so the if statement should check for empty(PORT_OPTIONS:MLUASTREAM) as well.
(In reply to Mateusz Piotrowski from comment #10) Modern versions of the third-party lua module are working fine with the devel/pcre2 port, so this module building needs to be tested. (In reply to Jochen Neumeister from comment #9) Jochen, there're several commits into master branch have been made after the recent 0.0.14 release, so I'd prefer to see recent snapshot of the module for the www/nginx-devel port. (In reply to Sergey A. Osokin from comment #12) Well I think the more sensitive part is www/nginx, not www/nginx-devel that needs some more tests. If we can push the nginx one ? Since this is more than one month this patch has been submitted ? Kind regards, Xavier (In reply to Xavier Beaudouin from comment #13) The www/nginx ports has a maintainer, by the laws in case of a maintainer's timeout another committer can commit changes to the port. (In reply to Xavier Beaudouin from comment #13) In case of the update of www/nginx-devel please see my https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=277719#c12 comment. Also, www/nginx-devel has been updated to 1.26.0 recently, so the patch may need to be rebased against new version. Thank you. (In reply to Xavier Beaudouin from comment #13) Yes please - it's becoming painful to wait for this relatively simple addition. A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=5f61eef0e8bbaffff7fd816aaf0befc364e8245b commit 5f61eef0e8bbaffff7fd816aaf0befc364e8245b Author: Eirik Oeverby <ltning-freebsd@anduin.net> AuthorDate: 2024-05-13 09:48:03 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-05-13 10:28:23 +0000 www/nginx: Add support for 3rd party stream-lua-nginx-module PR: 277719 Approved by: maintainer timeout Reported by: Eirik Oeverby <ltning-freebsd@anduin.net> Sponsored by: Modirum MDPay Sponsored by: Klara, Inc. Co-authored-by: Xavier Beaudouin <kiwi@oav.net> (cherry picked from commit edac05fd7cb3fa2f9c794165b8ffcfc9e32c20c4) www/nginx/Makefile | 2 +- www/nginx/Makefile.extmod | 10 +++++++++- www/nginx/Makefile.options.desc | 1 + www/nginx/distinfo | 2 ++ www/nginx/pkg-plist | 1 + 5 files changed, 14 insertions(+), 2 deletions(-) I opened PR 278951 to track the patch for the devel port. |
Created attachment 249185 [details] Recursive diff to add stream-lua-nginx-module This patch adds support for the lua module for streams; this is in addition to (or instead of) the existing lua module for http.