Created attachment 244492 [details] Checksums-for-new-distfiles This is the rest of angie dynamic modules available at the moment.
Created attachment 244493 [details] www/angie-module-auth-spnego
Created attachment 244494 [details] www/angie-module-dav-ext
Created attachment 244495 [details] www/angie-module-echo
Created attachment 244496 [details] www/angie-module-enhanced-memcached
Created attachment 244497 [details] www/angie-module-eval
Created attachment 244498 [details] www/angie-module-headers-more
Created attachment 244499 [details] www/angie-module-lua
Created attachment 244500 [details] www/angie-module-ndk
Created attachment 244501 [details] www/angie-module-postgres
Created attachment 244502 [details] www/angie-module-rtmp
Created attachment 244503 [details] www/angie-module-set-misc
Created attachment 244504 [details] www/angie-module-subs
Created attachment 244505 [details] www/angie-module-upload
Created attachment 244506 [details] www/angie-module-vod
Created attachment 244507 [details] www/Makefile
For future patches, please make sure to tick the "patch" box so they can be viewed in bugzilla's diff viewer.
Also the www/Makefile changes need to go into the individual commits. It would have been nice had you done that, but I'll go ahead and fix this up for you. As for the lua dependency, please unbundle lua and luajit. We have it in the ports collection already. See USES=lua for how to use it. I will no commit attachment #244499 [details] with a bundled lua. Please submit the lua module again in a separate PR once you have unbundled lua.
www/angie-module-dav-ext fails to build due to a missing dependency: checking for libxslt ... not found checking for libxslt in /usr/local/ ... not found checking for libxslt in /usr/pkg/ ... not found checking for libxslt in /opt/local/ ... not found ./configure: error: the HTTP XSLT module requires the libxml2/libxslt libraries. You can either do not enable the module or install the libraries. Please check and resubmit this one. There's also a fetch issue with two other ports, but that one is really weird and I don't quite know what the problem is.
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=42c6d0e54ad9bd941e0b805cab7f70af83139806 commit 42c6d0e54ad9bd941e0b805cab7f70af83139806 Author: Oleg A. Mamontov <oleg@mamontov.net> AuthorDate: 2023-08-30 21:01:36 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2023-09-10 16:13:02 +0000 www/angie-module-upload: Angie upload dynamic module Module parses request body storing all files being uploaded to a directory. The files are then being stripped from body and altered request is then passed to a location specified by upload_pass directive, thus allowing arbitrary handling of uploaded files. PR: 273462 www/Makefile | 1 + www/angie-module-upload/Makefile (new) | 24 ++++++++++++++++++++++ www/angie-module-upload/files/pkg-message.in (new) | 15 ++++++++++++++ www/angie-module-upload/pkg-descr (new) | 4 ++++ www/angie-module-upload/pkg-plist (new) | 3 +++ 5 files changed, 47 insertions(+)
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=ac2a5278212d9967773e769174f42ea430c435a0 commit ac2a5278212d9967773e769174f42ea430c435a0 Author: Oleg A. Mamontov <oleg@mamontov.net> AuthorDate: 2023-08-30 21:01:23 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2023-09-10 16:13:01 +0000 www/angie-module-subs: Angie substitutions filter dynamic module Module performs both regular expression and fixed string substitutions on response bodies. This module is quite different from the native substitution module. It scans the output chains buffer and matches string line by line, just like Apache's mod_substitute. PR: 273462 www/Makefile | 1 + www/angie-module-subs/Makefile (new) | 24 ++++++++++++++++++++++++ www/angie-module-subs/files/pkg-message.in (new) | 15 +++++++++++++++ www/angie-module-subs/pkg-descr (new) | 4 ++++ www/angie-module-subs/pkg-plist (new) | 3 +++ 5 files changed, 47 insertions(+)
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=8b4c54df7d257735b3dd8f33ca9de2e04ff72521 commit 8b4c54df7d257735b3dd8f33ca9de2e04ff72521 Author: Oleg A. Mamontov <oleg@mamontov.net> AuthorDate: 2023-08-30 21:00:22 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2023-09-10 16:13:00 +0000 www/angie-module-headers-more: Angie headers-more dynamic module Module allows to set and clear input and output headers. This is an enhanced version of the standard headers module because it provides more utilities like resetting or clearing "builtin headers" like Content-Type, Content-Length, and Server. PR: 273462 www/Makefile | 1 + www/angie-module-headers-more/Makefile (new) | 24 ++++++++++++++++++++++ .../files/pkg-message.in (new) | 15 ++++++++++++++ www/angie-module-headers-more/pkg-descr (new) | 4 ++++ www/angie-module-headers-more/pkg-plist (new) | 3 +++ 5 files changed, 47 insertions(+)
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=a5ce289590099e32f52a0dc4e57b27244401ea45 commit a5ce289590099e32f52a0dc4e57b27244401ea45 Author: Oleg A. Mamontov <oleg@mamontov.net> AuthorDate: 2023-08-30 20:59:50 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2023-09-10 16:13:00 +0000 www/angie-module-echo: Angie echo dynamic module Module brings "echo", "sleep", "time", "exec" and more shell-style goodies to config file. It provides various utilities that help testing and debugging of other modules by trivially emulating different kinds of faked subrequest locations. PR: 273462 www/Makefile | 1 + www/angie-module-echo/Makefile (new) | 22 ++++++++++++++++++++++ www/angie-module-echo/files/pkg-message.in (new) | 15 +++++++++++++++ www/angie-module-echo/pkg-descr (new) | 4 ++++ www/angie-module-echo/pkg-plist (new) | 3 +++ 5 files changed, 45 insertions(+)
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=2f692bf9576af6cc4b6ce44a7a52b7baccb92ace commit 2f692bf9576af6cc4b6ce44a7a52b7baccb92ace Author: Oleg A. Mamontov <oleg@mamontov.net> AuthorDate: 2023-08-30 21:00:38 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2023-09-10 16:13:01 +0000 www/angie-module-ndk: Angie NDK dynamic module Module is designed to extend the Angie core functionality in a way that can be used as a basis of other modules. It has functions and macros to deal with generic tasks that don't currently have generic code as part of the core distribution. PR: 273462 www/Makefile | 1 + www/angie-module-ndk/Makefile (new) | 24 ++++++++++++++++++++++++ www/angie-module-ndk/files/pkg-message.in (new) | 15 +++++++++++++++ www/angie-module-ndk/pkg-descr (new) | 4 ++++ www/angie-module-ndk/pkg-plist (new) | 3 +++ 5 files changed, 47 insertions(+)
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=ed1ed7c2e968cad24000b6b4f69455ae2dd51684 commit ed1ed7c2e968cad24000b6b4f69455ae2dd51684 Author: Oleg A. Mamontov <oleg@mamontov.net> AuthorDate: 2023-08-30 21:00:06 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2023-09-10 16:13:00 +0000 www/angie-module-eval: Angie eval dynamic module This module captures subrequest response bodies into variables. If you want similar (but more powerful) functionalities, see the www/angie-module-lua instead. PR: 273462 www/Makefile | 1 + www/angie-module-eval/Makefile (new) | 24 ++++++++++++++++++++++++ www/angie-module-eval/files/pkg-message.in (new) | 15 +++++++++++++++ www/angie-module-eval/pkg-descr (new) | 3 +++ www/angie-module-eval/pkg-plist (new) | 3 +++ 5 files changed, 46 insertions(+)
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=b8d28925a9b68ed98a7bbd5b659b86505b0d143a commit b8d28925a9b68ed98a7bbd5b659b86505b0d143a Author: Oleg A. Mamontov <oleg@mamontov.net> AuthorDate: 2023-08-30 21:01:02 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2023-09-10 16:13:01 +0000 www/angie-module-rtmp: Angie RTMP dynamic module Module provides HLS and MPEG-DASH live streaming capabilities for those who want a lightweight solution based on the HTTP protocol. The stream is published in the MPEG-TS format over HTTP. MPEG-TS is a widely adopted, well known and well documented streaming format. PR: 273462 www/Makefile | 1 + www/angie-module-rtmp/Makefile (new) | 22 ++++++++++++++++++++++ www/angie-module-rtmp/files/pkg-message.in (new) | 15 +++++++++++++++ www/angie-module-rtmp/pkg-descr (new) | 4 ++++ www/angie-module-rtmp/pkg-plist (new) | 3 +++ 5 files changed, 45 insertions(+)
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=e2f23b676e5af1287417d0cc670a10fd22efe842 commit e2f23b676e5af1287417d0cc670a10fd22efe842 Author: Oleg A. Mamontov <oleg@mamontov.net> AuthorDate: 2023-08-30 21:01:09 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2023-09-10 16:13:01 +0000 www/angie-module-set-misc: Angie set-misc dynamic module Module extends the standard rewrite's directive set to provide more functionalities like URI escaping and unescaping, JSON quoting, Hexadecimal/MD5/SHA1/Base32/Base64 digest encoding and decoding, random number generator, and more. PR: 273462 www/Makefile | 1 + www/angie-module-set-misc/Makefile (new) | 28 ++++++++++++++++++++++ .../files/pkg-message.in (new) | 16 +++++++++++++ www/angie-module-set-misc/pkg-descr (new) | 4 ++++ www/angie-module-set-misc/pkg-plist (new) | 3 +++ 5 files changed, 52 insertions(+)
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=4f01b389e58948217780305bc7080ea36357c013 commit 4f01b389e58948217780305bc7080ea36357c013 Author: Oleg A. Mamontov <oleg@mamontov.net> AuthorDate: 2023-08-30 20:59:32 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2023-09-10 16:13:00 +0000 www/angie-module-auth-spnego: Angie auth-spnego dynamic module Module adds SPNEGO support to Angie. It currently supports only Kerberos authentication via GSSAPI and does not support NTLMSSP in Negotiate. PR: 273462 www/Makefile | 1 + www/angie-module-auth-spnego/Makefile (new) | 24 ++++++++++++++++++++++ .../files/pkg-message.in (new) | 15 ++++++++++++++ www/angie-module-auth-spnego/pkg-descr (new) | 3 +++ www/angie-module-auth-spnego/pkg-plist (new) | 3 +++ 5 files changed, 46 insertions(+)
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=97683e71b1c2b32fe1ef1f9782e16eab3da4c3f3 commit 97683e71b1c2b32fe1ef1f9782e16eab3da4c3f3 Author: Oleg A. Mamontov <oleg@mamontov.net> AuthorDate: 2023-08-30 20:59:57 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2023-09-10 16:13:00 +0000 www/angie-module-enhanced-memcached: Angie enhanced memcached dynamic module Module is to be used to obtain responses from a memcached server. This module is based on the standard memcached module, with some additional features. Base configuration is identical to the standard module. PR: 273462 www/Makefile | 1 + www/angie-module-enhanced-memcached/Makefile (new) | 24 ++++++++++++++++++++++ .../files/pkg-message.in (new) | 15 ++++++++++++++ .../pkg-descr (new) | 3 +++ .../pkg-plist (new) | 3 +++ 5 files changed, 46 insertions(+)
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=b9f104fee4a89090c49f1a7c73991e94619cab8b commit b9f104fee4a89090c49f1a7c73991e94619cab8b Author: Oleg A. Mamontov <oleg@mamontov.net> AuthorDate: 2023-08-30 20:57:12 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2023-09-10 16:12:59 +0000 www/angie: add checksums for new distfiles In preparation of the following commits. PR: 273462 www/angie/distinfo | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-)
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=b33d841b2e25772ccdaa789ea455c0b636156b57 commit b33d841b2e25772ccdaa789ea455c0b636156b57 Author: Oleg A. Mamontov <oleg@mamontov.net> AuthorDate: 2023-08-30 21:01:43 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2023-09-10 16:13:02 +0000 www/angie-module-vod: VOD dynamic module for Angie Module allows on-the-fly repackaging of MP4 files to DASH, HDS, HLS, MSS. It provides following working modes: - local: serve locally accessible files (local disk/NFS mounted) - remote: serve files accessible via HTTP using range requests - mapped - serve files according to a specification encoded in JSON format PR: 273462 www/Makefile | 1 + www/angie-module-vod/Makefile (new) | 25 +++++++++++++++++++++++++ www/angie-module-vod/files/pkg-message.in (new) | 15 +++++++++++++++ www/angie-module-vod/pkg-descr (new) | 5 +++++ www/angie-module-vod/pkg-plist (new) | 3 +++ 5 files changed, 49 insertions(+)
Thank you for your contribution. Modules www/angie-module-dav-ext and www/angie-module-lua have been omitted from the commits pending resubmission to address the issues raised.
Created attachment 244997 [details] www/angie-module-dav-ext (updated) Sorry for long delay. Good catch, LIB_DEPENDS fixed now. Thank you.
Created attachment 244998 [details] www/angie-module-lua (updated) Actually module requires lang/luajit-openresty fork. So I set the correct LIB_DEPENDS. Thank you.
Please depend on luajit-openresty using USES=luajit. E.g. USES= luajit:openresty Read the file Mk/Uses/luajit.mk for a description of what variables this USES sets. It should be fairly simple to update your patch like that. Your other patch looks ok; I'll now proceed with a build test.
Created attachment 245029 [details] www/angie-module-lua (updated with USES)
Thank you for the update. stage-qa now says: Warning: 'libexec/angie/ngx_http_lua_module-debug.so' is not stripped consider trying INSTALL_TARGET=install-strip or using ${STRIP_CMD} Warning: 'libexec/angie/ngx_stream_lua_module-debug.so' is not stripped consider trying INSTALL_TARGET=install-strip or using ${STRIP_CMD} Warning: you may not need USES=ssl Error: lang/gcc should not be depended upon. Instead, use USE_GCC. Is lang/gcc really needed as a dependency? I removed the two BUILD_DEPENDS and it still builds fine, so perhaps it isn't?
Created attachment 245036 [details] www/angie-module-lua (updated without gcc/gmake)
(In reply to Robert Clausecker from comment #36) Indeed, those are no longer needed after removing bundled luajit. I've just refreshed the patch. Thank you.
Thanks. This should do it.
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=c514bb25ddcd78330d893858605e61d79156acf1 commit c514bb25ddcd78330d893858605e61d79156acf1 Author: Oleg A. Mamontov <oleg@mamontov.net> AuthorDate: 2023-09-19 21:48:14 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2023-09-22 04:54:46 +0000 www/angie-module-lua: Angie Lua dynamic module Module embeds the power of Lua into Angie HTTP and STREAM servers. By leveraging Angie's subrequests, this module allows the integration of the powerful Lua threads (known as "coroutines") into the Angie event model. PR: 273462 www/Makefile | 1 + www/angie-module-lua/Makefile (new) | 45 ++++++++++++++++++++++ www/angie-module-lua/files/patch-lua-config (new) | 26 +++++++++++++ .../files/patch-stream-lua-config (new) | 35 +++++++++++++++++ www/angie-module-lua/files/pkg-message.in (new) | 18 +++++++++ www/angie-module-lua/pkg-descr (new) | 3 ++ www/angie-module-lua/pkg-plist (new) | 6 +++ www/angie/distinfo | 6 ++- 8 files changed, 139 insertions(+), 1 deletion(-)
That should be all of it. Thank you for your contribution.