Hello,Here is a diff which updates nginx to 1.25.0 like tb@ did and also changes the repository for naxsi to an up to date maintained version (https://github.com/wargio/naxsi) which is compatible with nginx 1.25.0.
Works for me on amd64 with the newer default naxsi rules. Best Regards
? patch Index: Makefile =================================================================== RCS file: /cvs/ports/www/nginx/Makefile,v retrieving revision 1.165 diff -u -p -r1.165 Makefile --- Makefile 17 Apr 2023 17:36:58 -0000 1.165 +++ Makefile 26 May 2023 11:17:30 -0000 @@ -15,7 +15,7 @@ COMMENT-passenger= nginx passenger (ruby COMMENT-rtmp= nginx module for RTMP streaming COMMENT-securelink= nginx HMAC secure link module -VERSION= 1.24.0 +VERSION= 1.25.0 DISTNAME= nginx-${VERSION} CATEGORIES= www @@ -38,17 +38,19 @@ PKGNAME-securelink= nginx-securelink-${V ONLY_FOR_ARCHS-passenger= aarch64 amd64 arm i386 +NAXSI_VERSION= 1.4 + MASTER_SITES= https://nginx.org/download/ MASTER_SITES0= https://github.com/ MASTER_SITES1= https://raw.githubusercontent.com/rnagy/nginx_chroot_patch/master/ \ https://raw.githubusercontent.com/sthen/nginx_chroot_patch/add_1.20.1/ +MASTER_SITES2= https://github.com/wargio/naxsi/releases/download/${NAXSI_VERSION}/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} _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} \ simpl ngx_devel_kit v0.3.0 \ @@ -58,6 +60,7 @@ _GH_MODS= \ .for _a _p _c in ${_GH_MODS} DISTFILES+= ${_p}-{${_a}/${_p}/archive/}${_c}.tar.gz:0 .endfor +DISTFILES+= naxsi-${NAXSI_VERSION}-src-with-deps.tar.gz:2 HOMEPAGE= https://nginx.org/ @@ -175,6 +178,7 @@ CONFIGURE_ARGS+= --prefix=${NGINX_DIR} \ --with-http_ssl_module \ --with-http_stub_status_module \ --with-http_v2_module \ + --with-http_v3_module \ --with-http_xslt_module=dynamic \ --with-mail=dynamic \ --with-stream=dynamic \ @@ -193,11 +197,12 @@ 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 \ nginx-auth-ldap ngx_devel_kit ngx_http_geoip2_module \ ngx_http_hmac_secure_link_module cd ${WRKSRC} && mv ../$i-* $i .endfor + cd ${WRKSRC} && mkdir naxsi && mv ../naxsi_* naxsi/ pre-configure: @cd ${WRKSRC} && ${SUBST_CMD} ${SUBSTFILES} @@ -210,7 +215,7 @@ do-install: fastcgi_params scgi_params uwsgi_params ${INSTALL_DATA} ${WRKSRC}/conf/${i} ${PREFIX}/share/nginx/ .endfor - ${INSTALL_DATA} ${WRKSRC}/naxsi/naxsi_config/naxsi_core.rules \ + ${INSTALL_DATA} ${WRKSRC}/naxsi/naxsi_rules/naxsi_core.rules \ ${PREFIX}/share/nginx/ ${INSTALL_DATA_DIR} ${PREFIX}/share/nginx/html/ ${INSTALL_DATA} ${WRKSRC}/html/* ${PREFIX}/share/nginx/html/ Index: distinfo =================================================================== RCS file: /cvs/ports/www/nginx/distinfo,v retrieving revision 1.80 diff -u -p -r1.80 distinfo --- distinfo 17 Apr 2023 17:36:58 -0000 1.80 +++ distinfo 26 May 2023 11:17:30 -0000 @@ -1,8 +1,8 @@ SHA256 (headers-more-nginx-module-v0.34.tar.gz) = DA0s7SzolbP0XrKyMM2QUIqyp3MpnxU94UpD5EwSCbM= SHA256 (lua-nginx-module-v0.10.11.tar.gz) = wPuR/P0cbn3sNMpkgm74H/66/e9hdNJURnY284BWZiY= -SHA256 (naxsi-d714f1636ea49a9a9f4f06dba14aee003e970834.tar.gz) = 2+IXdBFFfxy6mO5Gc84xh2mUrQa9zl7MDuZjhO8OQg4= +SHA256 (naxsi-1.4-src-with-deps.tar.gz) = xLnXUvu3D6QPzBeqrvbg8ZBxoOd/90ysSz2lemeGhoQ= SHA256 (nginx-1.20.1-chroot.patch) = SS1TB0j8N4/dn5pUTGT6WvkN3aAUuKz5+R0Nt+MG0gk= -SHA256 (nginx-1.24.0.tar.gz) = d6JUFje5KmIePudndsi3tAz21wfmm6U6lAKD4w/y9V0= +SHA256 (nginx-1.25.0.tar.gz) = XtRNRZQycqTopbz0Q0I3IQ8t4xuQP8peOBwbvX7uHow= 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= @@ -10,9 +10,9 @@ SHA256 (ngx_http_geoip2_module-3.3.tar.g SHA256 (ngx_http_hmac_secure_link_module-48c4625fbbf51ed5a95bfec23fa444f6c3702e50.tar.gz) = ZXpA2rODS1enIREzlD1OqWwpWcv3NOUXH4eUOgOAmqg= 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 (naxsi-1.4-src-with-deps.tar.gz) = 2274095 SIZE (nginx-1.20.1-chroot.patch) = 8783 -SIZE (nginx-1.24.0.tar.gz) = 1112471 +SIZE (nginx-1.25.0.tar.gz) = 1217579 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
smime.p7s
Description: S/MIME Cryptographic Signature