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
--- Makefile 20 Jun 2024 22:41:25 -0000 1.181
+++ Makefile 26 Jun 2024 14:58:29 -0000
@@ -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-module v0.10.11 \
- nbs-system naxsi
d714f1636ea49a9a9f4f06dba14aee003e970834 \
- kvspb nginx-auth-ldap
83c059b73566c2ee9cbda920d91b66657cf120b7 \
- arut nginx-rtmp-module v${VERSION-rtmp} \
- nginx njs ${VERSION-njs} \
- simpl ngx_devel_kit v0.3.0 \
- leev ngx_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 \
- ngx_http_hmac_secure_link_module
- cd ${WRKSRC} && mv ../$i-* $i
-.endfor
pre-configure:
@cd ${WRKSRC} && ${SUBST_CMD} ${SUBSTFILES}
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/nginx/distinfo,v
diff -u -p -r1.85 distinfo
--- distinfo 30 May 2024 12:41:00 -0000 1.85
+++ distinfo 26 Jun 2024 14:58:29 -0000
@@ -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
