Re: [patch] www/nginx: update third-party modules

2024-06-26 Thread Stuart Henderson 
On 2024/06/26 16:04, Sergey A. Osokin wrote:
> Hi Stuart,
> 
> thanks for the update.
> 
> On Wed, Jun 26, 2024 at 04:23:17PM +0100, Stuart Henderson wrote:
> > On 2024/06/01 18:30, Sergey A. Osokin wrote:
> > > 
> > > here's the patch to update www/nginx third-party modules to their
> > compiled as part of nginx itself and not in standalone separate ports).
> 
> [...]
> 
> > - mentions the actual modules used in COMMENT-lua to make it obvious
> > that -lua needs a bump if ngx_devel_kit is changed
> 
> The update of the third-party lua-nginx-module to its recent version
> requires two additional ports to run nginx with the module:
> - lua-resty-core
> - lua-resty-lrucache
> 
> Also, since the third-party lua-nginx-module is the part of the
> OpenResty distribution, it's probably better to build lua-nginx-module
> against luajit2, https://github.com/openresty/luajit2.  That means
> another port is required.  So, I kept that part as is.
> 
> > unless there are objections I'd like to commit in a few days as most
> > of this has been sitting around for ages.  (or earlier if ok'd ;)
> > 
> > Not included in this diff but want looking at sometime;
> > 
> > - LIB_DEPENDS is messed up for njs ("LIB_DEPENDS devel/pcre2 not needed for
> > www/nginx,-njs" which means that pcre2 is stripped from the dependencies
> > for that subpackage - looks like it only uses pcre 1.x?)
> 
> njs module supports both pcre1 and pcre2, possible to allow one of
> those libraries, and disallow another one.  I'd prefer to see pcre2,
> cause pcre1 is out of support for years.

The binary produced by this port is linked against pcre1.

> > - other modules want updates:
> >   - headers-more 0.37
> >   - lua-nginx-module 0.10.26
> >   - naxsi https://github.com/wargio/naxsi 1.6
> >   - ngx_http_hmac_secure_link_module 
> > dc641de6c2ff2dbdaae6c27073f77a3b36fd6d40
> >   - (nginx-auth-ldap 241200eac8e4acae74d353291bd27f79e5ca3dc4 but only 
> > spelling changes)
> 
> Thank you.
> 
> -- 
> Sergey A. Osokin
>

Re: [patch] www/nginx: update third-party modules

2024-06-26 Thread Sergey A. Osokin 
Hi Stuart,

thanks for the update.

On Wed, Jun 26, 2024 at 04:23:17PM +0100, Stuart Henderson wrote:
> On 2024/06/01 18:30, Sergey A. Osokin wrote:
> > 
> > here's the patch to update www/nginx third-party modules to their
> compiled as part of nginx itself and not in standalone separate ports).

[...]

> - mentions the actual modules used in COMMENT-lua to make it obvious
> that -lua needs a bump if ngx_devel_kit is changed

The update of the third-party lua-nginx-module to its recent version
requires two additional ports to run nginx with the module:
- lua-resty-core
- lua-resty-lrucache

Also, since the third-party lua-nginx-module is the part of the
OpenResty distribution, it's probably better to build lua-nginx-module
against luajit2, https://github.com/openresty/luajit2.  That means
another port is required.  So, I kept that part as is.

> unless there are objections I'd like to commit in a few days as most
> of this has been sitting around for ages.  (or earlier if ok'd ;)
> 
> Not included in this diff but want looking at sometime;
> 
> - LIB_DEPENDS is messed up for njs ("LIB_DEPENDS devel/pcre2 not needed for
> www/nginx,-njs" which means that pcre2 is stripped from the dependencies
> for that subpackage - looks like it only uses pcre 1.x?)

njs module supports both pcre1 and pcre2, possible to allow one of
those libraries, and disallow another one.  I'd prefer to see pcre2,
cause pcre1 is out of support for years.

> - other modules want updates:
>   - headers-more 0.37
>   - lua-nginx-module 0.10.26
>   - naxsi https://github.com/wargio/naxsi 1.6
>   - ngx_http_hmac_secure_link_module dc641de6c2ff2dbdaae6c27073f77a3b36fd6d40
>   - (nginx-auth-ldap 241200eac8e4acae74d353291bd27f79e5ca3dc4 but only 
> spelling changes)

Thank you.

-- 
Sergey A. Osokin

Re: [patch] www/nginx: update third-party modules

2024-06-26 Thread Stuart Henderson 
On 2024/06/01 18:30, Sergey A. Osokin wrote:
> Hi,
> 
> here's the patch to update www/nginx third-party modules to their
> recent versions.

It's missing REVISION bumps for various subpackages which use the
third-party modules. (it is quite a nuisance that these have to be
compiled as part of nginx itself and not in standalone separate ports).

Here's a diff which:

- fixes that
- mentions the actual modules used in COMMENT-lua to make it obvious
that -lua needs a bump if ngx_devel_kit is changed
- switches the custom github fetching bits to use DIST_TUPLE

unless there are objections I'd like to commit in a few days as most
of this has been sitting around for ages.  (or earlier if ok'd ;)


Not included in this diff but want looking at sometime;

- LIB_DEPENDS is messed up for njs ("LIB_DEPENDS devel/pcre2 not needed for
www/nginx,-njs" which means that pcre2 is stripped from the dependencies
for that subpackage - looks like it only uses pcre 1.x?)

- other modules want updates:
  - headers-more 0.37
  - lua-nginx-module 0.10.26
  - naxsi https://github.com/wargio/naxsi 1.6
  - ngx_http_hmac_secure_link_module dc641de6c2ff2dbdaae6c27073f77a3b36fd6d40
  - (nginx-auth-ldap 241200eac8e4acae74d353291bd27f79e5ca3dc4 but only spelling 
changes)

Index: Makefile
===
RCS file: /cvs/ports/www/nginx/Makefile,v
diff -u -p -r1.181 Makefile
--- Makefile20 Jun 2024 22:41:25 -  1.181
+++ Makefile26 Jun 2024 14:58:29 -
@@ -10,7 +10,7 @@ COMMENT-mailproxy=nginx mail proxy modu
 COMMENT-stream=nginx TCP/UDP proxy module
 COMMENT-naxsi= nginx web application firewall module
 COMMENT-ldap_auth= nginx LDAP authentication module
-COMMENT-lua=   nginx lua scripting module
+COMMENT-lua=   nginx lua scripting (lua-nginx-module and ngx_devel_kit)
 COMMENT-headers_more=  nginx module for setting/adding/clearing headers
 COMMENT-perl=  nginx perl scripting module
 COMMENT-njs=   nginx javascript scripting module
@@ -21,11 +21,12 @@ COMMENT-securelink= nginx HMAC secure li
 VERSION=   1.26.1
 DISTNAME=  nginx-${VERSION}
 CATEGORIES=www
-REVISION-main= 0
-REVISION-passenger=0
-
-VERSION-njs=   0.8.2
-VERSION-rtmp=  1.2.1
+REVISION-geoip2= 0
+REVISION-lua=  0
+REVISION-main= 1
+REVISION-njs=  0
+REVISION-passenger= 0
+REVISION-rtmp= 0
 
 PKGNAME-main=  ${DISTNAME}
 PKGNAME-image_filter=  nginx-image_filter-${VERSION}
@@ -46,24 +47,19 @@ PKGNAME-securelink= nginx-securelink-${V
 ONLY_FOR_ARCHS-passenger= aarch64 amd64 arm i386
 
 SITES= https://nginx.org/download/
-SITES.a=https://github.com/
 SITES.p=https://raw.githubusercontent.com/rnagy/nginx_chroot_patch/master/ \
https://raw.githubusercontent.com/sthen/nginx_chroot_patch/add_1.20.1/
 
-_GH_MODS=  \
-   openresty   headers-more-nginx-module   v0.34 \
-   openresty   lua-nginx-modulev0.10.11 \
-   nbs-system  naxsi   
d714f1636ea49a9a9f4f06dba14aee003e970834 \
-   kvspb   nginx-auth-ldap 
83c059b73566c2ee9cbda920d91b66657cf120b7 \
-   arutnginx-rtmp-module   v${VERSION-rtmp} \
-   nginx   njs ${VERSION-njs} \
-   simpl   ngx_devel_kit   v0.3.0 \
-   leevngx_http_geoip2_module  3.3 \
-   nginx-modules   ngx_http_hmac_secure_link_module 
48c4625fbbf51ed5a95bfec23fa444f6c3702e50
-
-.for _a _p _c in ${_GH_MODS}
-DISTFILES.a+=  ${_p}-{${_a}/${_p}/archive/}${_c}.tar.gz
-.endfor
+DIST_TUPLE=\
+   github openresty headers-more-nginx-module v0.34 
headers-more-nginx-module \
+   github openresty lua-nginx-module v0.10.11 lua-nginx-module \
+   github nbs-system naxsi d714f1636ea49a9a9f4f06dba14aee003e970834 naxsi \
+   github kvspb nginx-auth-ldap 83c059b73566c2ee9cbda920d91b66657cf120b7 
nginx-auth-ldap \
+   github arut nginx-rtmp-module v1.2.2 nginx-rtmp-module \
+   github nginx njs 0.8.4 njs \
+   github vision5 ngx_devel_kit v0.3.3 ngx_devel_kit \
+   github leev ngx_http_geoip2_module 3.4 ngx_http_geoip2_module \
+   github nginx-modules ngx_http_hmac_secure_link_module 
48c4625fbbf51ed5a95bfec23fa444f6c3702e50 ngx_http_hmac_secure_link_module
 
 HOMEPAGE=  https://nginx.org/
 
@@ -159,7 +155,7 @@ CONFIGURE_ARGS+=--add-dynamic-module=${
 .endif
 
 .if ${BUILD_PACKAGES:M-rtmp}
-CONFIGURE_ARGS+=   
--add-dynamic-module=${WRKDIR}/nginx-rtmp-module-${VERSION-rtmp}/
+CONFIGURE_ARGS+=   --add-dynamic-module=${WRKDIR}/nginx-rtmp-module
 .endif
 
 .if ${BUILD_PACKAGES:M-njs}
@@ -208,13 +204,6 @@ SUBSTFILES=conf/nginx.conf */config
 
 NO_TEST=   Yes
 ALL_TARGET=
-
-pre-patch:
-.for i in headers-more-nginx-module lua-nginx-module naxsi njs \
-   nginx-auth-ldap ngx_devel_kit ngx_http_geoip2_module \
-

Re: [patch] www/nginx: update third-party modules

2024-06-25 Thread Sergey A. Osokin 
On Thu, Jun 20, 2024 at 01:20:49AM +, Sergey A. Osokin wrote:
> On Thu, Jun 13, 2024 at 03:38:11PM +, Sergey A. Osokin wrote:
> > On Fri, Jun 07, 2024 at 01:54:04PM +, Sergey A. Osokin wrote:
> > > On Fri, Jun 07, 2024 at 02:48:36PM +0100, Stuart Henderson wrote:
> > > > On 2024/06/07 13:26, Sergey A. Osokin wrote:
> > > > > 
> > > > > could you please provide an update.
> > > > 
> > > > Update is: There's been no reply from the maintainer yet. But it's
> > > > only been a few days.
> > > 
> > > Yeah, that's exactly what I'm looking for - the maintainer update.
> > > To be honest, it's already 1 week timeout :-)
> > > 
> > > I'm curious - is there "maintainer timeout" rule for such updates?
> > > And if so, that's the timeout time for that?
> > 
> > Could you please provide an update.

Gentle reminder.
Thank you.
 
-- 
Sergey A. Osokin

Re: [patch] www/nginx: update third-party modules

2024-06-19 Thread Sergey A. Osokin 
On Thu, Jun 13, 2024 at 03:38:11PM +, Sergey A. Osokin wrote:
> Hi folks,
> 
> On Fri, Jun 07, 2024 at 01:54:04PM +, Sergey A. Osokin wrote:
> > On Fri, Jun 07, 2024 at 02:48:36PM +0100, Stuart Henderson wrote:
> > > On 2024/06/07 13:26, Sergey A. Osokin wrote:
> > > > 
> > > > could you please provide an update.
> > > 
> > > Update is: There's been no reply from the maintainer yet. But it's
> > > only been a few days.
> > 
> > Yeah, that's exactly what I'm looking for - the maintainer update.
> > To be honest, it's already 1 week timeout :-)
> > 
> > I'm curious - is there "maintainer timeout" rule for such updates?
> > And if so, that's the timeout time for that?
> 
> Could you please provide an update.

Gentle reminder.
Thank you.
 
-- 
Sergey A. Osokin

Re: [patch] www/nginx: update third-party modules

2024-06-13 Thread Sergey A. Osokin 
Hi folks,

On Fri, Jun 07, 2024 at 01:54:04PM +, Sergey A. Osokin wrote:
> On Fri, Jun 07, 2024 at 02:48:36PM +0100, Stuart Henderson wrote:
> > On 2024/06/07 13:26, Sergey A. Osokin wrote:
> > > 
> > > could you please provide an update.
> > 
> > Update is: There's been no reply from the maintainer yet. But it's
> > only been a few days.
> 
> Yeah, that's exactly what I'm looking for - the maintainer update.
> To be honest, it's already 1 week timeout :-)
> 
> I'm curious - is there "maintainer timeout" rule for such updates?
> And if so, that's the timeout time for that?

Could you please provide an update.
Thank you.

-- 
Sergey A. Osokin
>

Re: [patch] www/nginx: update third-party modules

2024-06-07 Thread Sergey A. Osokin 
Hi Stuart,

thank you for the reply.

On Fri, Jun 07, 2024 at 02:48:36PM +0100, Stuart Henderson wrote:
> On 2024/06/07 13:26, Sergey A. Osokin wrote:
> > 
> > could you please provide an update.
> 
> Update is: There's been no reply from the maintainer yet. But it's
> only been a few days.

Yeah, that's exactly what I'm looking for - the maintainer update.
To be honest, it's already 1 week timeout :-)

I'm curious - is there "maintainer timeout" rule for such updates?
And if so, that's the timeout time for that?

Thank you.

-- 
Sergey A. Osokin

Re: [patch] www/nginx: update third-party modules

2024-06-07 Thread Stuart Henderson 
On 2024/06/07 13:26, Sergey A. Osokin wrote:
> Hello,
> 
> could you please provide an update.

Update is: There's been no reply from the maintainer yet. But it's
only been a few days.

> Thank you.
> 
> -- 
> Sergey A. Osokin
> 
> On Sat, Jun 01, 2024 at 06:30:04PM +, Sergey A. Osokin wrote:
> [...]
> > 
> > here's the patch to update www/nginx third-party modules to their
> > recent versions.
> 
> [...]
> 
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/www/nginx/Makefile,v
> > diff -u -p -r1.179 Makefile
> > --- Makefile30 May 2024 12:41:00 -  1.179
> > +++ Makefile1 Jun 2024 18:27:07 -
> > @@ -22,8 +22,8 @@ VERSION=  1.26.1
> >  DISTNAME=  nginx-${VERSION}
> >  CATEGORIES=www
> >  
> > -VERSION-njs=   0.8.2
> > -VERSION-rtmp=  1.2.1
> > +VERSION-njs=   0.8.4
> > +VERSION-rtmp=  1.2.2
> >  
> >  PKGNAME-main=  ${DISTNAME}
> >  PKGNAME-image_filter=  nginx-image_filter-${VERSION}
> > @@ -41,6 +41,8 @@ PKGNAME-passenger=nginx-passenger-${VER
> >  PKGNAME-rtmp=  nginx-rtmp-${VERSION}
> >  PKGNAME-securelink=nginx-securelink-${VERSION}
> >  
> > +REVISION-main= 0
> > +
> >  ONLY_FOR_ARCHS-passenger= aarch64 amd64 arm i386
> >  
> >  SITES= https://nginx.org/download/
> > @@ -55,8 +57,8 @@ _GH_MODS= \
> > kvspb   nginx-auth-ldap 
> > 83c059b73566c2ee9cbda920d91b66657cf120b7 \
> > arutnginx-rtmp-module   v${VERSION-rtmp} \
> > nginx   njs ${VERSION-njs} \
> > -   simpl   ngx_devel_kit   v0.3.0 \
> > -   leevngx_http_geoip2_module  3.3 \
> > +   vision5 ngx_devel_kit   v0.3.3 \
> > +   leevngx_http_geoip2_module  3.4 \
> > nginx-modules   ngx_http_hmac_secure_link_module 
> > 48c4625fbbf51ed5a95bfec23fa444f6c3702e50
> >  
> >  .for _a _p _c in ${_GH_MODS}
> > Index: distinfo
> > ===
> > RCS file: /cvs/ports/www/nginx/distinfo,v
> > diff -u -p -r1.85 distinfo
> > --- distinfo30 May 2024 12:41:00 -  1.85
> > +++ distinfo1 Jun 2024 18:27:07 -
> > @@ -4,19 +4,19 @@ SHA256 (naxsi-d714f1636ea49a9a9f4f06dba1
> >  SHA256 (nginx-1.20.1-chroot.patch) = 
> > SS1TB0j8N4/dn5pUTGT6WvkN3aAUuKz5+R0Nt+MG0gk=
> >  SHA256 (nginx-1.26.1.tar.gz) = +Rh0aP8usVkmC/1Thnwl/44zRyYjes8ie56HDlPT42s=
> >  SHA256 (nginx-auth-ldap-83c059b73566c2ee9cbda920d91b66657cf120b7.tar.gz) = 
> > aQxOW9sq4ZsP7nXNNW0YATRo20cmFrYJeloLvjRshGQ=
> > -SHA256 (nginx-rtmp-module-v1.2.1.tar.gz) = 
> > h6pZdACwtaBSdO4tI9jLgiThJoYiegq+MdeDs6ZF6jc=
> > -SHA256 (ngx_devel_kit-v0.3.0.tar.gz) = 
> > iOBamainQZBm9a51lm+x78QJutRSLRSYbaB0VUrmFhk=
> > -SHA256 (ngx_http_geoip2_module-3.3.tar.gz) = 
> > QTeEOMgz4xOhiGnQxKcnBLSDXDCsr3/WgBOrZzL/eKc=
> > +SHA256 (nginx-rtmp-module-v1.2.2.tar.gz) = 
> > B/Gbe//sXjV7uIIMY+UoHevUX1oubUaxY22SAsPgnXg=
> > +SHA256 (ngx_devel_kit-v0.3.3.tar.gz) = 
> > +qL81RaLEHZNNQgTVlEdX4TbXFJqGqS2rdLblLaFOys=
> > +SHA256 (ngx_http_geoip2_module-3.4.tar.gz) = 
> > rXL8IzSNcVozCZSYRTH6ubNgbhYEgyNnN/mkppV9lFI=
> >  SHA256 
> > (ngx_http_hmac_secure_link_module-48c4625fbbf51ed5a95bfec23fa444f6c3702e50.tar.gz)
> >  = ZXpA2rODS1enIREzlD1OqWwpWcv3NOUXH4eUOgOAmqg=
> > -SHA256 (njs-0.8.2.tar.gz) = bxc4fbjfkLbjOC0oBFWWL/hforGjLZHCzh/Rr1qFTXI=
> > +SHA256 (njs-0.8.4.tar.gz) = /hl+JUIEwV6fHfCs83Wt1XvjQWkB7I17hzGdzLSQ+Q0=
> >  SIZE (headers-more-nginx-module-v0.34.tar.gz) = 28827
> >  SIZE (lua-nginx-module-v0.10.11.tar.gz) = 616653
> >  SIZE (naxsi-d714f1636ea49a9a9f4f06dba14aee003e970834.tar.gz) = 237272
> >  SIZE (nginx-1.20.1-chroot.patch) = 8783
> >  SIZE (nginx-1.26.1.tar.gz) = 1244738
> >  SIZE (nginx-auth-ldap-83c059b73566c2ee9cbda920d91b66657cf120b7.tar.gz) = 
> > 18542
> > -SIZE (nginx-rtmp-module-v1.2.1.tar.gz) = 519919
> > -SIZE (ngx_devel_kit-v0.3.0.tar.gz) = 66455
> > -SIZE (ngx_http_geoip2_module-3.3.tar.gz) = 8509
> > +SIZE (nginx-rtmp-module-v1.2.2.tar.gz) = 519934
> > +SIZE (ngx_devel_kit-v0.3.3.tar.gz) = 66561
> > +SIZE (ngx_http_geoip2_module-3.4.tar.gz) = 8877
> >  SIZE 
> > (ngx_http_hmac_secure_link_module-48c4625fbbf51ed5a95bfec23fa444f6c3702e50.tar.gz)
> >  = 6159
> > -SIZE (njs-0.8.2.tar.gz) = 733916
> > +SIZE (njs-0.8.4.tar.gz) = 743910
>

Re: [patch] www/nginx: update third-party modules

2024-06-07 Thread Sergey A. Osokin 
Hello,

could you please provide an update.

Thank you.

-- 
Sergey A. Osokin

On Sat, Jun 01, 2024 at 06:30:04PM +, Sergey A. Osokin wrote:
[...]
> 
> here's the patch to update www/nginx third-party modules to their
> recent versions.

[...]

> Index: Makefile
> ===
> RCS file: /cvs/ports/www/nginx/Makefile,v
> diff -u -p -r1.179 Makefile
> --- Makefile  30 May 2024 12:41:00 -  1.179
> +++ Makefile  1 Jun 2024 18:27:07 -
> @@ -22,8 +22,8 @@ VERSION=1.26.1
>  DISTNAME=nginx-${VERSION}
>  CATEGORIES=  www
>  
> -VERSION-njs= 0.8.2
> -VERSION-rtmp=1.2.1
> +VERSION-njs= 0.8.4
> +VERSION-rtmp=1.2.2
>  
>  PKGNAME-main=${DISTNAME}
>  PKGNAME-image_filter=nginx-image_filter-${VERSION}
> @@ -41,6 +41,8 @@ PKGNAME-passenger=  nginx-passenger-${VER
>  PKGNAME-rtmp=nginx-rtmp-${VERSION}
>  PKGNAME-securelink=  nginx-securelink-${VERSION}
>  
> +REVISION-main=   0
> +
>  ONLY_FOR_ARCHS-passenger= aarch64 amd64 arm i386
>  
>  SITES=   https://nginx.org/download/
> @@ -55,8 +57,8 @@ _GH_MODS=   \
>   kvspb   nginx-auth-ldap 
> 83c059b73566c2ee9cbda920d91b66657cf120b7 \
>   arutnginx-rtmp-module   v${VERSION-rtmp} \
>   nginx   njs ${VERSION-njs} \
> - simpl   ngx_devel_kit   v0.3.0 \
> - leevngx_http_geoip2_module  3.3 \
> + vision5 ngx_devel_kit   v0.3.3 \
> + leevngx_http_geoip2_module  3.4 \
>   nginx-modules   ngx_http_hmac_secure_link_module 
> 48c4625fbbf51ed5a95bfec23fa444f6c3702e50
>  
>  .for _a _p _c in ${_GH_MODS}
> Index: distinfo
> ===
> RCS file: /cvs/ports/www/nginx/distinfo,v
> diff -u -p -r1.85 distinfo
> --- distinfo  30 May 2024 12:41:00 -  1.85
> +++ distinfo  1 Jun 2024 18:27:07 -
> @@ -4,19 +4,19 @@ SHA256 (naxsi-d714f1636ea49a9a9f4f06dba1
>  SHA256 (nginx-1.20.1-chroot.patch) = 
> SS1TB0j8N4/dn5pUTGT6WvkN3aAUuKz5+R0Nt+MG0gk=
>  SHA256 (nginx-1.26.1.tar.gz) = +Rh0aP8usVkmC/1Thnwl/44zRyYjes8ie56HDlPT42s=
>  SHA256 (nginx-auth-ldap-83c059b73566c2ee9cbda920d91b66657cf120b7.tar.gz) = 
> aQxOW9sq4ZsP7nXNNW0YATRo20cmFrYJeloLvjRshGQ=
> -SHA256 (nginx-rtmp-module-v1.2.1.tar.gz) = 
> h6pZdACwtaBSdO4tI9jLgiThJoYiegq+MdeDs6ZF6jc=
> -SHA256 (ngx_devel_kit-v0.3.0.tar.gz) = 
> iOBamainQZBm9a51lm+x78QJutRSLRSYbaB0VUrmFhk=
> -SHA256 (ngx_http_geoip2_module-3.3.tar.gz) = 
> QTeEOMgz4xOhiGnQxKcnBLSDXDCsr3/WgBOrZzL/eKc=
> +SHA256 (nginx-rtmp-module-v1.2.2.tar.gz) = 
> B/Gbe//sXjV7uIIMY+UoHevUX1oubUaxY22SAsPgnXg=
> +SHA256 (ngx_devel_kit-v0.3.3.tar.gz) = 
> +qL81RaLEHZNNQgTVlEdX4TbXFJqGqS2rdLblLaFOys=
> +SHA256 (ngx_http_geoip2_module-3.4.tar.gz) = 
> rXL8IzSNcVozCZSYRTH6ubNgbhYEgyNnN/mkppV9lFI=
>  SHA256 
> (ngx_http_hmac_secure_link_module-48c4625fbbf51ed5a95bfec23fa444f6c3702e50.tar.gz)
>  = ZXpA2rODS1enIREzlD1OqWwpWcv3NOUXH4eUOgOAmqg=
> -SHA256 (njs-0.8.2.tar.gz) = bxc4fbjfkLbjOC0oBFWWL/hforGjLZHCzh/Rr1qFTXI=
> +SHA256 (njs-0.8.4.tar.gz) = /hl+JUIEwV6fHfCs83Wt1XvjQWkB7I17hzGdzLSQ+Q0=
>  SIZE (headers-more-nginx-module-v0.34.tar.gz) = 28827
>  SIZE (lua-nginx-module-v0.10.11.tar.gz) = 616653
>  SIZE (naxsi-d714f1636ea49a9a9f4f06dba14aee003e970834.tar.gz) = 237272
>  SIZE (nginx-1.20.1-chroot.patch) = 8783
>  SIZE (nginx-1.26.1.tar.gz) = 1244738
>  SIZE (nginx-auth-ldap-83c059b73566c2ee9cbda920d91b66657cf120b7.tar.gz) = 
> 18542
> -SIZE (nginx-rtmp-module-v1.2.1.tar.gz) = 519919
> -SIZE (ngx_devel_kit-v0.3.0.tar.gz) = 66455
> -SIZE (ngx_http_geoip2_module-3.3.tar.gz) = 8509
> +SIZE (nginx-rtmp-module-v1.2.2.tar.gz) = 519934
> +SIZE (ngx_devel_kit-v0.3.3.tar.gz) = 66561
> +SIZE (ngx_http_geoip2_module-3.4.tar.gz) = 8877
>  SIZE 
> (ngx_http_hmac_secure_link_module-48c4625fbbf51ed5a95bfec23fa444f6c3702e50.tar.gz)
>  = 6159
> -SIZE (njs-0.8.2.tar.gz) = 733916
> +SIZE (njs-0.8.4.tar.gz) = 743910

Re: [PATCH] www/nginx: update third-party modules

2022-06-09 Thread Stuart Henderson 
On 2022/06/09 14:10, Sergey A. Osokin wrote:
> On Wed, Jun 08, 2022 at 06:12:56PM +0100, Stuart Henderson wrote:
> > On 2022/06/08 18:57, Omar Polo wrote:
> > > Stuart Henderson  wrote:
> > > > On 2022/06/07 21:11, Omar Polo wrote:
> > > > > 
> > > > > nginx-lua-1.22.0p0(www/nginx,-lua):
> > > > > Missing: luajit-5.1.1 from luajit-2.0.5pl20210608 
> > > > > (/var/www/modules/ngx_http_lua_module.so)
> > > > > WANTLIB += luajit-5.1
> > > > 
> > > > it wouldn't be ideal to restrict building nginx to only archs which 
> > > > have luajit
> > > 
> > > openresty/lua-nginx-module upstream moved to luajit from 0.10.16 onward,
> > > see for e.g.:
> > > 
> > > https://github.com/openresty/lua-nginx-module/commit/d154e5a7c1cbb7810d0224862e577fc8a6b8e3ac
> > 
> > The luajit 2.0 branch in ports is only for 32-bit arm, amd64, i386, powerpc
> > so it misses some important archs.
> > 
> > The upstream 2.1 branch adds arm64 but still not sparc64 and some others.
> > 
> > I think ngx_http_lua_module build will need to be arch-dependent then,
> > we don't really want to block nginx build on arm64 and sparc64.
> > 
> > (Looking at https://github.com/openresty/lua-nginx-module it is probably
> > also best to fetch github.com/openresty/luajit2 as an additional distfile
> > and build with that version instead though that's probably best looked
> > at as an extra step later.)
> 
> Is that possible to check an arch during the build and in case it's
> sparc64 platform use lang/lua and lang/luajit-openresty (yes, another
> port needs to be created) instead?

It looks like newer versions of lua-nginx-module really want luajit and
not lua. So it would probably require not just a different lua dependency
but a different lua-nginx-module version depending on the arch. While it
is _possible_ to do that, it makes it a real pain for handling updates,
so unless someone has a strong need for the lua module on e.g. sparc64
it will be much simpler to disable lua-nginx-module unless an arch is
supported by luajit.

Re: [PATCH] www/nginx: update third-party modules

2022-06-09 Thread Sergey A. Osokin 
On Wed, Jun 08, 2022 at 06:12:56PM +0100, Stuart Henderson wrote:
> On 2022/06/08 18:57, Omar Polo wrote:
> > Stuart Henderson  wrote:
> > > On 2022/06/07 21:11, Omar Polo wrote:
> > > > 
> > > > nginx-lua-1.22.0p0(www/nginx,-lua):
> > > > Missing: luajit-5.1.1 from luajit-2.0.5pl20210608 
> > > > (/var/www/modules/ngx_http_lua_module.so)
> > > > WANTLIB += luajit-5.1
> > > 
> > > it wouldn't be ideal to restrict building nginx to only archs which have 
> > > luajit
> > 
> > openresty/lua-nginx-module upstream moved to luajit from 0.10.16 onward,
> > see for e.g.:
> > 
> > https://github.com/openresty/lua-nginx-module/commit/d154e5a7c1cbb7810d0224862e577fc8a6b8e3ac
> 
> The luajit 2.0 branch in ports is only for 32-bit arm, amd64, i386, powerpc
> so it misses some important archs.
> 
> The upstream 2.1 branch adds arm64 but still not sparc64 and some others.
> 
> I think ngx_http_lua_module build will need to be arch-dependent then,
> we don't really want to block nginx build on arm64 and sparc64.
> 
> (Looking at https://github.com/openresty/lua-nginx-module it is probably
> also best to fetch github.com/openresty/luajit2 as an additional distfile
> and build with that version instead though that's probably best looked
> at as an extra step later.)

Is that possible to check an arch during the build and in case it's
sparc64 platform use lang/lua and lang/luajit-openresty (yes, another
port needs to be created) instead?

-- 
Sergey A. Osokin
 


signature.asc
Description: PGP signature

Re: [PATCH] www/nginx: update third-party modules

2022-06-09 Thread Stuart Henderson 
On 2022/06/08 18:12, Stuart Henderson wrote:
> On 2022/06/08 18:57, Omar Polo wrote:
> > Stuart Henderson  wrote:
> > > On 2022/06/07 21:11, Omar Polo wrote:
> > > > 
> > > > nginx-lua-1.22.0p0(www/nginx,-lua):
> > > > Missing: luajit-5.1.1 from luajit-2.0.5pl20210608 
> > > > (/var/www/modules/ngx_http_lua_module.so)
> > > > WANTLIB += luajit-5.1
> > > 
> > > it wouldn't be ideal to restrict building nginx to only archs which have 
> > > luajit
> > 
> > openresty/lua-nginx-module upstream moved to luajit from 0.10.16 onward,
> > see for e.g.:
> > 
> > https://github.com/openresty/lua-nginx-module/commit/d154e5a7c1cbb7810d0224862e577fc8a6b8e3ac
> > 
> 
> The luajit 2.0 branch in ports is only for 32-bit arm, amd64, i386, powerpc
> so it misses some important archs.
> 
> The upstream 2.1 branch adds arm64 but still not sparc64 and some others.
> 
> I think ngx_http_lua_module build will need to be arch-dependent then,
> we don't really want to block nginx build on arm64 and sparc64.
> 
> (Looking at https://github.com/openresty/lua-nginx-module it is probably
> also best to fetch github.com/openresty/luajit2 as an additional distfile
> and build with that version instead though that's probably best looked
> at as an extra step later.)
> 

Alternatively skip the lua-nginx-module update for now ...

Other issue with that change;

--
 RUN_DEPENDS=   www/nginx,-main=${VERSION}
 RUN_DEPENDS-main=  # blank (override default)
-RUN_DEPENDS-lua=   ${RUN_DEPENDS} \
-   ${_MODLUA_RUN_DEPENDS}
+RUN_DEPENDS-lua=   lang/luajit
--

this loses the ${RUN_DEPENDS} i.e. www/nginx,-main=${VERSION} so that
the -lua subpackage no longer depends on nginx

Re: [PATCH] www/nginx: update third-party modules

2022-06-08 Thread Stuart Henderson 
On 2022/06/08 18:57, Omar Polo wrote:
> Stuart Henderson  wrote:
> > On 2022/06/07 21:11, Omar Polo wrote:
> > > 
> > > nginx-lua-1.22.0p0(www/nginx,-lua):
> > > Missing: luajit-5.1.1 from luajit-2.0.5pl20210608 
> > > (/var/www/modules/ngx_http_lua_module.so)
> > > WANTLIB += luajit-5.1
> > 
> > it wouldn't be ideal to restrict building nginx to only archs which have 
> > luajit
> 
> openresty/lua-nginx-module upstream moved to luajit from 0.10.16 onward,
> see for e.g.:
> 
> https://github.com/openresty/lua-nginx-module/commit/d154e5a7c1cbb7810d0224862e577fc8a6b8e3ac
> 

The luajit 2.0 branch in ports is only for 32-bit arm, amd64, i386, powerpc
so it misses some important archs.

The upstream 2.1 branch adds arm64 but still not sparc64 and some others.

I think ngx_http_lua_module build will need to be arch-dependent then,
we don't really want to block nginx build on arm64 and sparc64.

(Looking at https://github.com/openresty/lua-nginx-module it is probably
also best to fetch github.com/openresty/luajit2 as an additional distfile
and build with that version instead though that's probably best looked
at as an extra step later.)

Re: [PATCH] www/nginx: update third-party modules

2022-06-08 Thread Omar Polo 
Stuart Henderson  wrote:
> On 2022/06/07 21:11, Omar Polo wrote:
> > 
> > nginx-lua-1.22.0p0(www/nginx,-lua):
> > Missing: luajit-5.1.1 from luajit-2.0.5pl20210608 
> > (/var/www/modules/ngx_http_lua_module.so)
> > WANTLIB += luajit-5.1
> 
> it wouldn't be ideal to restrict building nginx to only archs which have 
> luajit

openresty/lua-nginx-module upstream moved to luajit from 0.10.16 onward,
see for e.g.:

https://github.com/openresty/lua-nginx-module/commit/d154e5a7c1cbb7810d0224862e577fc8a6b8e3ac

Re: [PATCH] www/nginx: update third-party modules

2022-06-08 Thread Stuart Henderson 
On 2022/06/07 21:11, Omar Polo wrote:
> 
> nginx-lua-1.22.0p0(www/nginx,-lua):
> Missing: luajit-5.1.1 from luajit-2.0.5pl20210608 
> (/var/www/modules/ngx_http_lua_module.so)
> WANTLIB += luajit-5.1

it wouldn't be ideal to restrict building nginx to only archs which have luajit

Re: [PATCH] www/nginx: update third-party modules

2022-06-07 Thread Omar Polo 
"Sergey A. Osokin"  wrote:
> Hi,
> 
> On Fri, Jun 03, 2022 at 03:47:39PM +, Sergey A. Osokin wrote:
> > Hi,
> > 
> > thanks for your patience.
> 
> [...]
> 
> Could you please provide an update.
> Thank you.

please wait at least a week before pinging a port.

also, the WANTLIBs are not correct:

% make port-lib-depends-check

nginx-lua-1.22.0p0(www/nginx,-lua):
Missing: luajit-5.1.1 from luajit-2.0.5pl20210608 
(/var/www/modules/ngx_http_lua_module.so)
WANTLIB += luajit-5.1

nginx-njs-1.22.0p0(www/nginx,-njs):
Missing: m.10 (/var/www/modules/ngx_stream_js_module.so) (system lib)
WANTLIB += m
*** Error 1 in target 'port-lib-depends-check' (ignored)

(note that you want to change WANTLIB-lua and WANTLIB-njs _not_ WANTLIB
as the output seems to suggest)

Re: [PATCH] www/nginx: update third-party modules

2022-06-07 Thread Sergey A. Osokin 
Hi,

On Fri, Jun 03, 2022 at 03:47:39PM +, Sergey A. Osokin wrote:
> Hi,
> 
> thanks for your patience.

[...]

Could you please provide an update.
Thank you.

-- 
Sergey A. Osokin


signature.asc
Description: PGP signature

Re: [PATCH] www/nginx: update third-party modules

2022-06-03 Thread Sergey A. Osokin 
Hi,

thanks for your patience.

On Fri, Jun 03, 2022 at 03:14:38PM +, Sergey A. Osokin wrote:
> Please disregard this patch, I've just found another issue.
 
And here's another version of the patch with the following changes:
o) remove upstreamed patches
o) add DESCR-njs and PLIST-njs files
o) removed sorting staff, will do that later
o) add patch for njs module

While I'm here I've found a compiling issue with the third-party lua
module, so I've just made some additional changes in that place as well.

Now the port builds and installs just fine.

-- 
Sergey A. Osokin


Index: Makefile
===
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.163
diff -u -p -r1.163 Makefile
--- Makefile	30 May 2022 08:17:34 -	1.163
+++ Makefile	3 Jun 2022 15:43:56 -
@@ -7,6 +7,7 @@ COMMENT-xslt=		nginx XSLT filter module
 COMMENT-mailproxy=	nginx mail proxy module
 COMMENT-stream=		nginx TCP/UDP proxy module
 COMMENT-naxsi=		nginx web application firewall module
+COMMENT-njs=		nginx JavaScript module
 COMMENT-ldap_auth=	nginx LDAP authentication module
 COMMENT-lua=		nginx lua scripting module
 COMMENT-headers_more=	nginx module for setting/adding/clearing headers
@@ -18,8 +19,9 @@ COMMENT-securelink=	nginx HMAC secure li
 VERSION=	1.22.0
 DISTNAME=	nginx-${VERSION}
 CATEGORIES=	www
+REVISION=	0
 
-VERSION-rtmp=	1.2.1
+VERSION-rtmp=	1.2.2
 
 PKGNAME-main=		${DISTNAME}
 PKGNAME-image_filter=	nginx-image_filter-${VERSION}
@@ -35,6 +37,7 @@ PKGNAME-perl=		nginx-perl-${VERSION}
 PKGNAME-passenger=	nginx-passenger-${VERSION}
 PKGNAME-rtmp=		nginx-rtmp-${VERSION}
 PKGNAME-securelink=	nginx-securelink-${VERSION}
+PKGNAME-njs=		nginx-njs-${VERSION}
 
 ONLY_FOR_ARCHS-passenger= aarch64 amd64 arm i386
 
@@ -47,13 +50,14 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 _GH_MODS=	\
 	openresty	headers-more-nginx-module	v0.33 \
-	openresty	lua-nginx-module		v0.10.11 \
+	openresty	lua-nginx-module		v0.10.21 \
 	nbs-system	naxsi1.3 \
 	kvspb		nginx-auth-ldap			83c059b73566c2ee9cbda920d91b66657cf120b7 \
 	arut		nginx-rtmp-module		v${VERSION-rtmp} \
-	simpl		ngx_devel_kit			v0.3.0 \
+	vision5		ngx_devel_kit			v0.3.1 \
 	leev		ngx_http_geoip2_module		3.3 \
-	nginx-modules	ngx_http_hmac_secure_link_module 48c4625fbbf51ed5a95bfec23fa444f6c3702e50
+	nginx-modules	ngx_http_hmac_secure_link_module 8c5449202cd5afd8970f316bd6828d28281dc9bc \
+	nginx		njs0.7.4
 
 .for _a _p _c in ${_GH_MODS}
 DISTFILES+=	${_p}-{${_a}/${_p}/archive/}${_c}.tar.gz:0
@@ -70,7 +74,7 @@ MULTI_PACKAGES =	-main -naxsi -perl ${MO
 
 MODULE_PACKAGES =	-image_filter -geoip2 -xslt -mailproxy -stream \
 			-passenger -headers_more -ldap_auth -lua -rtmp \
-			-securelink
+			-securelink -njs
 
 FLAVOR ?=
 PSEUDO_FLAVORS =	no_lua no_passenger
@@ -93,6 +97,7 @@ WANTLIB-headers_more=
 WANTLIB-perl=		c m perl
 WANTLIB-passenger=	m pthread ${COMPILER_LIBCXX}
 WANTLIB-securelink=	crypto
+WANTLIB-njs=
 
 LIB_DEPENDS-main=	devel/pcre
 LIB_DEPENDS-xslt=	textproc/libxml \
@@ -100,15 +105,14 @@ LIB_DEPENDS-xslt=	textproc/libxml \
 LIB_DEPENDS-image_filter=graphics/gd
 LIB_DEPENDS-geoip2=	net/libmaxminddb
 LIB_DEPENDS-ldap_auth=	databases/openldap
-LIB_DEPENDS-lua=	${MODLUA_LIB_DEPENDS}
+LIB_DEPENDS-lua=	lang/luajit
 LIB_DEPENDS-rtmp=
 LIB_DEPENDS-securelink=
 
 MODLUA_RUNDEP=		No
 RUN_DEPENDS=		www/nginx,-main=${VERSION}
 RUN_DEPENDS-main=	# blank (override default)
-RUN_DEPENDS-lua=	${RUN_DEPENDS} \
-			${_MODLUA_RUN_DEPENDS}
+RUN_DEPENDS-lua=	lang/luajit
 RUN_DEPENDS-passenger=	${RUN_DEPENDS} \
 			ruby*-passenger-*:www/ruby-passenger
 
@@ -132,12 +136,15 @@ CONFIGURE_STYLE=	simple
 MODULES+=		perl
 
 .if ${BUILD_PACKAGES:M-lua}
-MODULES+=		lang/lua
-CONFIGURE_ENV+=		MODLUA_INCL_DIR=${MODLUA_INCL_DIR} \
-			MODLUA_LIB=${MODLUA_LIB}
+CONFIGURE_ENV+=		LUAJIT_INC=${LOCALBASE}/include/luajit-2.0 \
+			LUAJIT_LIB=${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--add-dynamic-module=${WRKSRC}/lua-nginx-module
 .endif
 
+.if ${BUILD_PACKAGES:M-njs}
+CONFIGURE_ARGS+=	--add-dynamic-module=${WRKSRC}/njs/nginx
+.endif
+
 .if ${BUILD_PACKAGES:M-passenger}
 MODULES+=		lang/ruby
 MODRUBY_BUILDDEP=	No
@@ -194,7 +201,7 @@ NO_TEST=		Yes
 ALL_TARGET=
 
 pre-patch:
-.for i in headers-more-nginx-module lua-nginx-module naxsi \
+.for i in headers-more-nginx-module lua-nginx-module naxsi njs \
 	nginx-auth-ldap ngx_devel_kit ngx_http_geoip2_module \
 	ngx_http_hmac_secure_link_module
 	cd ${WRKSRC} && mv ../$i-* $i
Index: distinfo
===
RCS file: /cvs/ports/www/nginx/distinfo,v
retrieving revision 1.79
diff -u -p -r1.79 distinfo
--- distinfo	30 May 2022 08:17:34 -	1.79
+++ distinfo	3 Jun 2022 15:43:56 -
@@ -1,20 +1,22 @@
 SHA256 (headers-more-nginx-module-v0.33.tar.gz) = o9y6sRepwQO8HqUgD8AKe30q+X/3/VJfFvisJjLjD78=
-SHA256 (lua-nginx-module-v0.10.11.tar.gz) = wPuR/P0cbn3sNMpkgm74H/66/e9hdNJURnY284BWZiY=
+SHA256 (lua-nginx-module-v0.10.21.tar.gz) =

Re: [PATCH] www/nginx: update third-party modules

2022-06-03 Thread Sergey A. Osokin 
Please disregard this patch, I've just found another issue.

On Fri, Jun 03, 2022 at 02:54:54PM +, Sergey A. Osokin wrote:
> On Fri, Jun 03, 2022 at 12:52:48PM +0200, Omar Polo wrote:
> > Omar Polo  wrote:
> > > "Sergey A. Osokin"  wrote:
> > > > And here's the patch.
> > > 
> > > (+cc robert@; please put the maintainer in Cc so it's easier for them to
> > > see the mail)
> 
> Thanks for the review, Omar.
> 
> I've just updated the patch:
> o) remove upstreamed patches
> o) add DESCR-njs and PLIST-njs files
> o) removed sorting staff, will do that later
> 
> While I'm here I've found a compiling issue with the third-party lua
> module, so I've just made some additional changes in that place as well.
-- 
Sergey A. Osokin


signature.asc
Description: PGP signature

Re: [PATCH] www/nginx: update third-party modules

2022-06-03 Thread Sergey A. Osokin 
On Fri, Jun 03, 2022 at 12:52:48PM +0200, Omar Polo wrote:
> Omar Polo  wrote:
> > Hello,
> > 
> > "Sergey A. Osokin"  wrote:
> > > And here's the patch.
> > 
> > (+cc robert@; please put the maintainer in Cc so it's easier for them to
> > see the mail)

Thanks for the review, Omar.

I've just updated the patch:
o) remove upstreamed patches
o) add DESCR-njs and PLIST-njs files
o) removed sorting staff, will do that later

While I'm here I've found a compiling issue with the third-party lua
module, so I've just made some additional changes in that place as well.

-- 
Sergey A. Osokin
Index: Makefile
===
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.163
diff -u -p -r1.163 Makefile
--- Makefile	30 May 2022 08:17:34 -	1.163
+++ Makefile	3 Jun 2022 14:49:08 -
@@ -7,6 +7,7 @@ COMMENT-xslt=		nginx XSLT filter module
 COMMENT-mailproxy=	nginx mail proxy module
 COMMENT-stream=		nginx TCP/UDP proxy module
 COMMENT-naxsi=		nginx web application firewall module
+COMMENT-njs=		nginx JavaScript module
 COMMENT-ldap_auth=	nginx LDAP authentication module
 COMMENT-lua=		nginx lua scripting module
 COMMENT-headers_more=	nginx module for setting/adding/clearing headers
@@ -18,8 +19,9 @@ COMMENT-securelink=	nginx HMAC secure li
 VERSION=	1.22.0
 DISTNAME=	nginx-${VERSION}
 CATEGORIES=	www
+REVISION=	0
 
-VERSION-rtmp=	1.2.1
+VERSION-rtmp=	1.2.2
 
 PKGNAME-main=		${DISTNAME}
 PKGNAME-image_filter=	nginx-image_filter-${VERSION}
@@ -35,6 +37,7 @@ PKGNAME-perl=		nginx-perl-${VERSION}
 PKGNAME-passenger=	nginx-passenger-${VERSION}
 PKGNAME-rtmp=		nginx-rtmp-${VERSION}
 PKGNAME-securelink=	nginx-securelink-${VERSION}
+PKGNAME-njs=		nginx-njs-${VERSION}
 
 ONLY_FOR_ARCHS-passenger= aarch64 amd64 arm i386
 
@@ -47,13 +50,14 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 _GH_MODS=	\
 	openresty	headers-more-nginx-module	v0.33 \
-	openresty	lua-nginx-module		v0.10.11 \
+	openresty	lua-nginx-module		v0.10.21 \
 	nbs-system	naxsi1.3 \
 	kvspb		nginx-auth-ldap			83c059b73566c2ee9cbda920d91b66657cf120b7 \
 	arut		nginx-rtmp-module		v${VERSION-rtmp} \
-	simpl		ngx_devel_kit			v0.3.0 \
+	vision5		ngx_devel_kit			v0.3.1 \
 	leev		ngx_http_geoip2_module		3.3 \
-	nginx-modules	ngx_http_hmac_secure_link_module 48c4625fbbf51ed5a95bfec23fa444f6c3702e50
+	nginx-modules	ngx_http_hmac_secure_link_module 8c5449202cd5afd8970f316bd6828d28281dc9bc \
+	nginx		njs0.7.4
 
 .for _a _p _c in ${_GH_MODS}
 DISTFILES+=	${_p}-{${_a}/${_p}/archive/}${_c}.tar.gz:0
@@ -70,7 +74,7 @@ MULTI_PACKAGES =	-main -naxsi -perl ${MO
 
 MODULE_PACKAGES =	-image_filter -geoip2 -xslt -mailproxy -stream \
 			-passenger -headers_more -ldap_auth -lua -rtmp \
-			-securelink
+			-securelink -njs
 
 FLAVOR ?=
 PSEUDO_FLAVORS =	no_lua no_passenger
@@ -93,6 +97,7 @@ WANTLIB-headers_more=
 WANTLIB-perl=		c m perl
 WANTLIB-passenger=	m pthread ${COMPILER_LIBCXX}
 WANTLIB-securelink=	crypto
+WANTLIB-njs=
 
 LIB_DEPENDS-main=	devel/pcre
 LIB_DEPENDS-xslt=	textproc/libxml \
@@ -132,9 +137,8 @@ CONFIGURE_STYLE=	simple
 MODULES+=		perl
 
 .if ${BUILD_PACKAGES:M-lua}
-MODULES+=		lang/lua
-CONFIGURE_ENV+=		MODLUA_INCL_DIR=${MODLUA_INCL_DIR} \
-			MODLUA_LIB=${MODLUA_LIB}
+CONFIGURE_ENV+=		LUAJIT_INC=${LOCALBASE}/include/luajit-2.0 \
+			LUAJIT_LIB=${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--add-dynamic-module=${WRKSRC}/lua-nginx-module
 .endif
 
Index: distinfo
===
RCS file: /cvs/ports/www/nginx/distinfo,v
retrieving revision 1.79
diff -u -p -r1.79 distinfo
--- distinfo	30 May 2022 08:17:34 -	1.79
+++ distinfo	3 Jun 2022 14:49:08 -
@@ -1,20 +1,22 @@
 SHA256 (headers-more-nginx-module-v0.33.tar.gz) = o9y6sRepwQO8HqUgD8AKe30q+X/3/VJfFvisJjLjD78=
-SHA256 (lua-nginx-module-v0.10.11.tar.gz) = wPuR/P0cbn3sNMpkgm74H/66/e9hdNJURnY284BWZiY=
+SHA256 (lua-nginx-module-v0.10.21.tar.gz) = nbdWAAV4767LQ76k/Gz2MaqoCYjYb/5dOv65kniV/60=
 SHA256 (naxsi-1.3.tar.gz) = Q5yGdzctJZe0Ngu8wQvIZJDeH8dWlbGTrV3xVKIU1ig=
 SHA256 (nginx-1.20.1-chroot.patch) = SS1TB0j8N4/dn5pUTGT6WvkN3aAUuKz5+R0Nt+MG0gk=
 SHA256 (nginx-1.22.0.tar.gz) = sz1Wmm8RoBQzpXzhfoOTXpU61Nx3zdTUD4lsiKwm61M=
 SHA256 (nginx-auth-ldap-83c059b73566c2ee9cbda920d91b66657cf120b7.tar.gz) = aQxOW9sq4ZsP7nXNNW0YATRo20cmFrYJeloLvjRshGQ=
-SHA256 (nginx-rtmp-module-v1.2.1.tar.gz) = h6pZdACwtaBSdO4tI9jLgiThJoYiegq+MdeDs6ZF6jc=
-SHA256 (ngx_devel_kit-v0.3.0.tar.gz) = iOBamainQZBm9a51lm+x78QJutRSLRSYbaB0VUrmFhk=
+SHA256 (nginx-rtmp-module-v1.2.2.tar.gz) = B/Gbe//sXjV7uIIMY+UoHevUX1oubUaxY22SAsPgnXg=
+SHA256 (ngx_devel_kit-v0.3.1.tar.gz) = DpcRBeIQ0nKkl1Z/ouLCVvTjm4RaW6gNNz4muhq/vYU=
 SHA256 (ngx_http_geoip2_module-3.3.tar.gz) = QTeEOMgz4xOhiGnQxKcnBLSDXDCsr3/WgBOrZzL/eKc=
-SHA256 (ngx_http_hmac_secure_link_module-48c4625fbbf51ed5a95bfec23fa444f6c3702e50.tar.gz) = ZXpA2rODS1enIREzlD1OqWwpWcv3NOUXH4eUOgOAmqg=
+SHA256 (ngx_http_hmac_secure_link_module-8c5449202cd5afd8970f316bd6828d28281dc9bc.tar.gz) =

Re: [PATCH] www/nginx: update third-party modules

2022-06-03 Thread Omar Polo 
Omar Polo  wrote:
> Hello,
> 
> "Sergey A. Osokin"  wrote:
> > And here's the patch.
> > 
> > Thank you.
> 
> (+cc robert@; please put the maintainer in Cc so it's easier for them to
> see the mail)
> 
> the diff it doesn't build here:
> patch-lua-nginx-module_src_ngx_http_lua_ssl_certby_c was upstreamed and
> needs to be removed, and then other two patches fails to apply:
> 
> ===>   Failed patches:
> patch-lua-nginx-module_src_ngx_http_lua_ssl_ocsp_c
> patch-lua-nginx-module_src_ngx_http_lua_ssl_session_storeby_c
> 
> (forgot to 'cvs add' the patches/ before generating the diff?)

(i meant 'cvs rm'...)

> Then, some comments on the diff:
> 
>  - it's REVISION and not PORTREVISION here :P
>(also, it's generally closer to the DISTNAME/PKGNAME line, but YMMV)
> 
>  - even if it probably makes more sense to sort the PKGNAMESs, WANTLIBs
>and whatnot, it makes more difficoult to understand the changes when
>looking at the diff, so i'd postpone the matter for later.

and i forgot probably the most obvious thing: the diff is lacking the
DESCR and PLIST for the new njs subpackage (forgot a 'cvs add'?).  you
also need to add njs to MODULE_PACKAGES.

> i'm attaching an updated diff without the sorting and with the
> upstreamed patch removed, but it still needs some work on the two
> failing patches.
> 
> Cheers,
> 
> Omar Polo
> 
> Index: Makefile
> ===
> RCS file: /home/cvs/ports/www/nginx/Makefile,v
> retrieving revision 1.163
> diff -u -p -r1.163 Makefile
> --- Makefile  30 May 2022 08:17:34 -  1.163
> +++ Makefile  3 Jun 2022 10:11:45 -
> @@ -7,6 +7,7 @@ COMMENT-xslt= nginx XSLT filter module
>  COMMENT-mailproxy=   nginx mail proxy module
>  COMMENT-stream=  nginx TCP/UDP proxy module
>  COMMENT-naxsi=   nginx web application firewall module
> +COMMENT-njs= nginx JavaScript module
>  COMMENT-ldap_auth=   nginx LDAP authentication module
>  COMMENT-lua= nginx lua scripting module
>  COMMENT-headers_more=nginx module for setting/adding/clearing headers
> @@ -17,9 +18,10 @@ COMMENT-securelink=nginx HMAC secure li
>  
>  VERSION= 1.22.0
>  DISTNAME=nginx-${VERSION}
> +REVISION=0
>  CATEGORIES=  www
>  
> -VERSION-rtmp=1.2.1
> +VERSION-rtmp=1.2.2
>  
>  PKGNAME-main=${DISTNAME}
>  PKGNAME-image_filter=nginx-image_filter-${VERSION}
> @@ -47,13 +49,14 @@ DISTFILES=${DISTNAME}${EXTRACT_SUFX}
>  
>  _GH_MODS=\
>   openresty   headers-more-nginx-module   v0.33 \
> - openresty   lua-nginx-modulev0.10.11 \
> + openresty   lua-nginx-modulev0.10.21 \
>   nbs-system  naxsi   1.3 \
>   kvspb   nginx-auth-ldap 
> 83c059b73566c2ee9cbda920d91b66657cf120b7 \
>   arutnginx-rtmp-module   v${VERSION-rtmp} \
> - simpl   ngx_devel_kit   v0.3.0 \
>   leevngx_http_geoip2_module  3.3 \
> - nginx-modules   ngx_http_hmac_secure_link_module 
> 48c4625fbbf51ed5a95bfec23fa444f6c3702e50
> + nginx-modules   ngx_http_hmac_secure_link_module 
> 8c5449202cd5afd8970f316bd6828d28281dc9bc \
> + nginx   njs 0.7.4 \
> + vision5 ngx_devel_kit   v0.3.1
>  
>  .for _a _p _c in ${_GH_MODS}
>  DISTFILES+=  ${_p}-{${_a}/${_p}/archive/}${_c}.tar.gz:0
> @@ -68,9 +71,9 @@ PERMIT_PACKAGE= Yes
>  
>  MULTI_PACKAGES = -main -naxsi -perl ${MODULE_PACKAGES}
>  
> -MODULE_PACKAGES =-image_filter -geoip2 -xslt -mailproxy -stream \
> - -passenger -headers_more -ldap_auth -lua -rtmp \
> - -securelink
> +MODULE_PACKAGES =-headers_more -geoip2 -image_filter \
> + -ldap_auth -lua -mailproxy -passenger \
> + -rtmp -securelink -stream -xslt
>  
>  FLAVOR ?=
>  PSEUDO_FLAVORS = no_lua no_passenger
> @@ -93,6 +96,7 @@ WANTLIB-headers_more=
>  WANTLIB-perl=c m perl
>  WANTLIB-passenger=   m pthread ${COMPILER_LIBCXX}
>  WANTLIB-securelink=  crypto
> +WANTLIB-njs=
>  
>  LIB_DEPENDS-main=devel/pcre
>  LIB_DEPENDS-xslt=textproc/libxml \
> @@ -194,7 +198,7 @@ NO_TEST=  Yes
>  ALL_TARGET=
>  
>  pre-patch:
> -.for i in headers-more-nginx-module lua-nginx-module naxsi \
> +.for i in headers-more-nginx-module lua-nginx-module naxsi njs \
>   nginx-auth-ldap ngx_devel_kit ngx_http_geoip2_module \
>   ngx_http_hmac_secure_link_module
>   cd ${WRKSRC} && mv ../$i-* $i
> Index: distinfo
> ===
> RCS file: /home/cvs/ports/www/nginx/distinfo,v
> retrieving revision 1.79
> diff -u -p -r1.79 distinfo
> --- distinfo  30 May 2022 08:17:34 -  1.79
> +++ distinfo  3 Jun 2022 10:04:28 -
>

Re: [PATCH] www/nginx: update third-party modules

2022-06-03 Thread Omar Polo 
Hello,

"Sergey A. Osokin"  wrote:
> And here's the patch.
> 
> Thank you.

(+cc robert@; please put the maintainer in Cc so it's easier for them to
see the mail)

the diff it doesn't build here:
patch-lua-nginx-module_src_ngx_http_lua_ssl_certby_c was upstreamed and
needs to be removed, and then other two patches fails to apply:

===>   Failed patches:
patch-lua-nginx-module_src_ngx_http_lua_ssl_ocsp_c
patch-lua-nginx-module_src_ngx_http_lua_ssl_session_storeby_c

(forgot to 'cvs add' the patches/ before generating the diff?)

Then, some comments on the diff:

 - it's REVISION and not PORTREVISION here :P
   (also, it's generally closer to the DISTNAME/PKGNAME line, but YMMV)

 - even if it probably makes more sense to sort the PKGNAMESs, WANTLIBs
   and whatnot, it makes more difficoult to understand the changes when
   looking at the diff, so i'd postpone the matter for later.

i'm attaching an updated diff without the sorting and with the
upstreamed patch removed, but it still needs some work on the two
failing patches.

Cheers,

Omar Polo

Index: Makefile
===
RCS file: /home/cvs/ports/www/nginx/Makefile,v
retrieving revision 1.163
diff -u -p -r1.163 Makefile
--- Makefile30 May 2022 08:17:34 -  1.163
+++ Makefile3 Jun 2022 10:11:45 -
@@ -7,6 +7,7 @@ COMMENT-xslt=   nginx XSLT filter module
 COMMENT-mailproxy= nginx mail proxy module
 COMMENT-stream=nginx TCP/UDP proxy module
 COMMENT-naxsi= nginx web application firewall module
+COMMENT-njs=   nginx JavaScript module
 COMMENT-ldap_auth= nginx LDAP authentication module
 COMMENT-lua=   nginx lua scripting module
 COMMENT-headers_more=  nginx module for setting/adding/clearing headers
@@ -17,9 +18,10 @@ COMMENT-securelink=  nginx HMAC secure li
 
 VERSION=   1.22.0
 DISTNAME=  nginx-${VERSION}
+REVISION=  0
 CATEGORIES=www
 
-VERSION-rtmp=  1.2.1
+VERSION-rtmp=  1.2.2
 
 PKGNAME-main=  ${DISTNAME}
 PKGNAME-image_filter=  nginx-image_filter-${VERSION}
@@ -47,13 +49,14 @@ DISTFILES=  ${DISTNAME}${EXTRACT_SUFX}
 
 _GH_MODS=  \
openresty   headers-more-nginx-module   v0.33 \
-   openresty   lua-nginx-modulev0.10.11 \
+   openresty   lua-nginx-modulev0.10.21 \
nbs-system  naxsi   1.3 \
kvspb   nginx-auth-ldap 
83c059b73566c2ee9cbda920d91b66657cf120b7 \
arutnginx-rtmp-module   v${VERSION-rtmp} \
-   simpl   ngx_devel_kit   v0.3.0 \
leevngx_http_geoip2_module  3.3 \
-   nginx-modules   ngx_http_hmac_secure_link_module 
48c4625fbbf51ed5a95bfec23fa444f6c3702e50
+   nginx-modules   ngx_http_hmac_secure_link_module 
8c5449202cd5afd8970f316bd6828d28281dc9bc \
+   nginx   njs 0.7.4 \
+   vision5 ngx_devel_kit   v0.3.1
 
 .for _a _p _c in ${_GH_MODS}
 DISTFILES+=${_p}-{${_a}/${_p}/archive/}${_c}.tar.gz:0
@@ -68,9 +71,9 @@ PERMIT_PACKAGE=   Yes
 
 MULTI_PACKAGES =   -main -naxsi -perl ${MODULE_PACKAGES}
 
-MODULE_PACKAGES =  -image_filter -geoip2 -xslt -mailproxy -stream \
-   -passenger -headers_more -ldap_auth -lua -rtmp \
-   -securelink
+MODULE_PACKAGES =  -headers_more -geoip2 -image_filter \
+   -ldap_auth -lua -mailproxy -passenger \
+   -rtmp -securelink -stream -xslt
 
 FLAVOR ?=
 PSEUDO_FLAVORS =   no_lua no_passenger
@@ -93,6 +96,7 @@ WANTLIB-headers_more=
 WANTLIB-perl=  c m perl
 WANTLIB-passenger= m pthread ${COMPILER_LIBCXX}
 WANTLIB-securelink=crypto
+WANTLIB-njs=
 
 LIB_DEPENDS-main=  devel/pcre
 LIB_DEPENDS-xslt=  textproc/libxml \
@@ -194,7 +198,7 @@ NO_TEST=Yes
 ALL_TARGET=
 
 pre-patch:
-.for i in headers-more-nginx-module lua-nginx-module naxsi \
+.for i in headers-more-nginx-module lua-nginx-module naxsi njs \
nginx-auth-ldap ngx_devel_kit ngx_http_geoip2_module \
ngx_http_hmac_secure_link_module
cd ${WRKSRC} && mv ../$i-* $i
Index: distinfo
===
RCS file: /home/cvs/ports/www/nginx/distinfo,v
retrieving revision 1.79
diff -u -p -r1.79 distinfo
--- distinfo30 May 2022 08:17:34 -  1.79
+++ distinfo3 Jun 2022 10:04:28 -
@@ -1,20 +1,22 @@
 SHA256 (headers-more-nginx-module-v0.33.tar.gz) = 
o9y6sRepwQO8HqUgD8AKe30q+X/3/VJfFvisJjLjD78=
-SHA256 (lua-nginx-module-v0.10.11.tar.gz) = 
wPuR/P0cbn3sNMpkgm74H/66/e9hdNJURnY284BWZiY=
+SHA256 (lua-nginx-module-v0.10.21.tar.gz) = 
nbdWAAV4767LQ76k/Gz2MaqoCYjYb/5dOv65kniV/60=
 SHA256 (naxsi-1.3.tar.gz) = Q5yGdzctJZe0Ngu8wQvIZJDeH8dWlbGTrV3xVKIU1ig=
 SHA256 (nginx-1.20.1-chroot.patch) =

Re: [PATCH] www/nginx: update third-party modules

2022-06-02 Thread Sergey A. Osokin 
And here's the patch.

Thank you.

-- 
Sergey A. Osokin
Index: Makefile
===
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.163
diff -u -p -r1.163 Makefile
--- Makefile	30 May 2022 08:17:34 -	1.163
+++ Makefile	2 Jun 2022 19:38:52 -
@@ -7,6 +7,7 @@ COMMENT-xslt=		nginx XSLT filter module
 COMMENT-mailproxy=	nginx mail proxy module
 COMMENT-stream=		nginx TCP/UDP proxy module
 COMMENT-naxsi=		nginx web application firewall module
+COMMENT-njs=		nginx JavaScript module
 COMMENT-ldap_auth=	nginx LDAP authentication module
 COMMENT-lua=		nginx lua scripting module
 COMMENT-headers_more=	nginx module for setting/adding/clearing headers
@@ -19,22 +20,24 @@ VERSION=	1.22.0
 DISTNAME=	nginx-${VERSION}
 CATEGORIES=	www
 
-VERSION-rtmp=	1.2.1
+PORTREVISION=	0
+
+VERSION-rtmp=	1.2.2
 
 PKGNAME-main=		${DISTNAME}
-PKGNAME-image_filter=	nginx-image_filter-${VERSION}
 PKGNAME-geoip2=		nginx-geoip2-${VERSION}
-PKGNAME-xslt=		nginx-xslt-${VERSION}
+PKGNAME-headers_more=	nginx-headers-more-${VERSION}
+PKGNAME-image_filter=	nginx-image_filter-${VERSION}
 PKGNAME-mailproxy=	nginx-mailproxy-${VERSION}
-PKGNAME-stream=		nginx-stream-${VERSION}
-PKGNAME-naxsi=		nginx-naxsi-${VERSION}
 PKGNAME-ldap_auth=	nginx-ldap_auth-${VERSION}
 PKGNAME-lua=		nginx-lua-${VERSION}
-PKGNAME-headers_more=	nginx-headers-more-${VERSION}
-PKGNAME-perl=		nginx-perl-${VERSION}
+PKGNAME-naxsi=		nginx-naxsi-${VERSION}
 PKGNAME-passenger=	nginx-passenger-${VERSION}
+PKGNAME-perl=		nginx-perl-${VERSION}
 PKGNAME-rtmp=		nginx-rtmp-${VERSION}
 PKGNAME-securelink=	nginx-securelink-${VERSION}
+PKGNAME-stream=		nginx-stream-${VERSION}
+PKGNAME-xslt=		nginx-xslt-${VERSION}
 
 ONLY_FOR_ARCHS-passenger= aarch64 amd64 arm i386
 
@@ -46,14 +49,15 @@ MASTER_SITES1=	https://raw.githubusercon
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 _GH_MODS=	\
-	openresty	headers-more-nginx-module	v0.33 \
-	openresty	lua-nginx-module		v0.10.11 \
-	nbs-system	naxsi1.3 \
-	kvspb		nginx-auth-ldap			83c059b73566c2ee9cbda920d91b66657cf120b7 \
 	arut		nginx-rtmp-module		v${VERSION-rtmp} \
-	simpl		ngx_devel_kit			v0.3.0 \
+	kvspb		nginx-auth-ldap			83c059b73566c2ee9cbda920d91b66657cf120b7 \
 	leev		ngx_http_geoip2_module		3.3 \
-	nginx-modules	ngx_http_hmac_secure_link_module 48c4625fbbf51ed5a95bfec23fa444f6c3702e50
+	nbs-system	naxsi1.3 \
+	nginx		njs0.7.4 \
+	nginx-modules	ngx_http_hmac_secure_link_module 8c5449202cd5afd8970f316bd6828d28281dc9bc \
+	openresty	headers-more-nginx-module	v0.33 \
+	openresty	lua-nginx-module		v0.10.21 \
+	vision5		ngx_devel_kit			v0.3.1
 
 .for _a _p _c in ${_GH_MODS}
 DISTFILES+=	${_p}-{${_a}/${_p}/archive/}${_c}.tar.gz:0
@@ -68,9 +72,9 @@ PERMIT_PACKAGE=	Yes
 
 MULTI_PACKAGES =	-main -naxsi -perl ${MODULE_PACKAGES}
 
-MODULE_PACKAGES =	-image_filter -geoip2 -xslt -mailproxy -stream \
-			-passenger -headers_more -ldap_auth -lua -rtmp \
-			-securelink
+MODULE_PACKAGES =	-headers_more -geoip2 -image_filter \
+			-ldap_auth -lua -mailproxy -passenger \
+			-rtmp -securelink -stream -xslt
 
 FLAVOR ?=
 PSEUDO_FLAVORS =	no_lua no_passenger
@@ -80,29 +84,30 @@ COMPILER =		base-clang ports-gcc base-gc
 .include 
 
 WANTLIB-main=		c z pcre ssl crypto
-WANTLIB-mailproxy=
-WANTLIB-stream=
-WANTLIB-image_filter=	gd
+WANTLIB-headers_more=
 WANTLIB-geoip2=		maxminddb
-WANTLIB-rtmp=
-WANTLIB-xslt=		exslt xml2 xslt
-WANTLIB-naxsi=
+WANTLIB-image_filter=	gd
 WANTLIB-ldap_auth=	ldap
+WANTLIB-mailproxy=
+WANTLIB-naxsi=
+WANTLIB-njs=
 WANTLIB-lua=		${MODLUA_WANTLIB} m
-WANTLIB-headers_more=
 WANTLIB-perl=		c m perl
 WANTLIB-passenger=	m pthread ${COMPILER_LIBCXX}
+WANTLIB-rtmp=
 WANTLIB-securelink=	crypto
+WANTLIB-stream=
+WANTLIB-xslt=		exslt xml2 xslt
 
 LIB_DEPENDS-main=	devel/pcre
-LIB_DEPENDS-xslt=	textproc/libxml \
-			textproc/libxslt
-LIB_DEPENDS-image_filter=graphics/gd
 LIB_DEPENDS-geoip2=	net/libmaxminddb
+LIB_DEPENDS-image_filter=graphics/gd
 LIB_DEPENDS-ldap_auth=	databases/openldap
 LIB_DEPENDS-lua=	${MODLUA_LIB_DEPENDS}
 LIB_DEPENDS-rtmp=
 LIB_DEPENDS-securelink=
+LIB_DEPENDS-xslt=	textproc/libxml \
+			textproc/libxslt
 
 MODLUA_RUNDEP=		No
 RUN_DEPENDS=		www/nginx,-main=${VERSION}
@@ -194,7 +199,7 @@ NO_TEST=		Yes
 ALL_TARGET=
 
 pre-patch:
-.for i in headers-more-nginx-module lua-nginx-module naxsi \
+.for i in headers-more-nginx-module lua-nginx-module naxsi njs \
 	nginx-auth-ldap ngx_devel_kit ngx_http_geoip2_module \
 	ngx_http_hmac_secure_link_module
 	cd ${WRKSRC} && mv ../$i-* $i
Index: distinfo
===
RCS file: /cvs/ports/www/nginx/distinfo,v
retrieving revision 1.79
diff -u -p -r1.79 distinfo
--- distinfo	30 May 2022 08:17:34 -	1.79
+++ distinfo	2 Jun 2022 19:38:52 -
@@ -1,20 +1,22 @@
 SHA256 (headers-more-nginx-module-v0.33.tar.gz) = o9y6sRepwQO8HqUgD8AKe30q+X/3/VJfFvisJjLjD78=
-SHA256 (lua-nginx-module-v0.10.11.tar.gz) = wPuR/P0cbn3sNMpkgm74H/66/e9hdNJURnY284BWZiY=
+SHA256