CVS commit: pkgsrc/www/freenginx-devel

["Sergey A. Osokin" <osa%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   osa
Date:           Wed Jul  8 19:34:59 UTC 2026

Modified Files:
        pkgsrc/www/freenginx-devel: Makefile distinfo
Added Files:
        pkgsrc/www/freenginx-devel/patches: extra-patch-ndk_set_var.c

Log Message:
www/freenginx-devel: update from 1.31.2 to 1.31.3

Sponsored by:   tipi.work

<ChangeLog>

*) Feature: additional checks are now used during variable substitution,
   including during execution of the ngx_http_rewrite_module directives,
   to prevent buffer overruns in case of errors in the code.

*) Bugfix: if the "auth_request_set" directive or regular expression
   named captures were used to change prefix variables, such as
   "$http_...", corresponding variables became empty in other parts of
   the configuration.

*) Bugfix: changing the $limit_rate and $args variables with the
   "auth_request_set" directive or regular expression named captures
   worked incorrectly.

*) Bugfix: in error handling in the mail proxy module.
   Thanks to Evan Hellman, Trail of Bits.

*) Bugfix: in error handling when using gzipping.
   Thanks to Evan Hellman, Trail of Bits.

*) Bugfix: in HTTP/3.

*) Bugfix: a segmentation fault might occur in a worker process when
   sending very long request header lines to a gRPC backend.
   Thanks to Evan Hellman, Trail of Bits.

*) Bugfix: a segmentation fault might occur in a worker process if the
   ngx_http_charset_module was used to convert responses from UTF-8.

*) Bugfix: in the ngx_http_perl_module.
   Thanks to Evan Hellman, Trail of Bits and Axel Mierczuk, Keith
   Hoodlet, 1Password's Off-by-1 Labs.

*) Bugfix: in error handling when using the proxy_no_cache directive.
   Thanks to Valentin Bartenev.

</ChangeLog>


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/www/freenginx-devel/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/www/freenginx-devel/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/freenginx-devel/patches/extra-patch-ndk_set_var.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/freenginx-devel/Makefile
diff -u pkgsrc/www/freenginx-devel/Makefile:1.17 pkgsrc/www/freenginx-devel/Makefile:1.18
--- pkgsrc/www/freenginx-devel/Makefile:1.17    Sun Jun 28 17:34:40 2026
+++ pkgsrc/www/freenginx-devel/Makefile Wed Jul  8 19:34:58 2026
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2026/06/28 17:34:40 osa Exp $
+# $NetBSD: Makefile,v 1.18 2026/07/08 19:34:58 osa Exp $
 
-DISTNAME=      freenginx-1.31.2
+DISTNAME=      freenginx-1.31.3
 PKGNAME=       ${DISTNAME:S/-/-devel-/1}
-PKGREVISION=   2
 CATEGORIES=    www
 MASTER_SITES=  https://freenginx.org/download/
 DISTFILES=     ${DEFAULT_DISTFILES}
@@ -114,6 +113,9 @@ post-patch:
        ${SED} -i.bak '308,309s/MSIZE/NAXSI_MSIZE/g' \
                ${WRKSRC}/..${NAXSI_SUBDIR}/libinjection/src/libinjection_sqli.c
 .endif
+.if defined(NEED_NDK)
+       cd ${WRKSRC} && ${PATCH} < ${PATCHDIR}/extra-patch-ndk_set_var.c
+.endif
 .if !empty(PKG_OPTIONS:Mnginx-njs)
        cd ${WRKSRC} && ${PATCH} < ${PATCHDIR}/extra-patch-njs-quickjs
 .endif

Index: pkgsrc/www/freenginx-devel/distinfo
diff -u pkgsrc/www/freenginx-devel/distinfo:1.15 pkgsrc/www/freenginx-devel/distinfo:1.16
--- pkgsrc/www/freenginx-devel/distinfo:1.15    Sun Jun 28 17:34:40 2026
+++ pkgsrc/www/freenginx-devel/distinfo Wed Jul  8 19:34:58 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2026/06/28 17:34:40 osa Exp $
+$NetBSD: distinfo,v 1.16 2026/07/08 19:34:58 osa Exp $
 
 BLAKE2s (array-var-nginx-module-0.06.tar.gz) = fa6ad2a2ce3c3eba3f69287b224e9c01fcaca29a083394ab74f2f655d3e2138b
 SHA512 (array-var-nginx-module-0.06.tar.gz) = bc72158856a1be18a26ee04c6b5b0f0a20bcce688610a493bf31e2a133e7eb12e11f7c18197a09a72b1513f6a08348ee5281b9d5b84cf43603539040ebd23c26
@@ -12,9 +12,9 @@ Size (fdintino-nginx-upload-module-96e64
 BLAKE2s (form-input-nginx-module-0.12.tar.gz) = b08fc95c3e15bfdc0846e2d1e8157171954f353bd301f4ac4aca56113620e91d
 SHA512 (form-input-nginx-module-0.12.tar.gz) = 1c5c5ab74156cac09da44a2dcdd84f7c03c9919a23a847e63613e00e3781ecd73d5ad12446174b4fdef9d064257a31570a8dbcccc00d8266f7048e3dcde0362e
 Size (form-input-nginx-module-0.12.tar.gz) = 11090 bytes
-BLAKE2s (freenginx-1.31.2.tar.gz) = dca830c0ecd0b884dc7749c3184baefabf78da7c4b663a116e8fb303050acdec
-SHA512 (freenginx-1.31.2.tar.gz) = 7a7a2f651a6f7ecd105724779b690114a32797c616d23bca1b21d6aedf14c0766b91ebb6d18657073ca022c714506339e6faa249993273ce8b88117756727b63
-Size (freenginx-1.31.2.tar.gz) = 1253159 bytes
+BLAKE2s (freenginx-1.31.3.tar.gz) = 3c6888ed6d89f29f17b8612a413752e0de05390948e1a03731309dfc4fdddcc1
+SHA512 (freenginx-1.31.3.tar.gz) = 2c196e7a6de2a98be833a393e85a34c2089ece70ba4ee1475f4538922a576e3b10e3dbad2c8c3b044b3fc85701c180d5956745c8b5b2bab3700aaee0ff15d111
+Size (freenginx-1.31.3.tar.gz) = 1255777 bytes
 BLAKE2s (google-ngx_brotli-a71f931_GH.tar.gz) = c30d6cbd94abb6f5c1d48275ed964e32f43d9cadd602f95b227a40e62dadbd0d
 SHA512 (google-ngx_brotli-a71f931_GH.tar.gz) = 1cb73a89b53b29d37cbc4d811d5d5cd7b051ec4db98900f593abc8d5b53761b95713212e083334785d9625d4705a78ed476113b244476a9cd5f46dcd9f1177ff
 Size (google-ngx_brotli-a71f931_GH.tar.gz) = 16376 bytes

Added files:

Index: pkgsrc/www/freenginx-devel/patches/extra-patch-ndk_set_var.c
diff -u /dev/null pkgsrc/www/freenginx-devel/patches/extra-patch-ndk_set_var.c:1.1
--- /dev/null   Wed Jul  8 19:34:59 2026
+++ pkgsrc/www/freenginx-devel/patches/extra-patch-ndk_set_var.c        Wed Jul  8 19:34:58 2026
@@ -0,0 +1,31 @@
+--- ../ngx_devel_kit-0.3.4/src/ndk_set_var.c.orig      2026-07-07 14:27:09.629438000 -0400
++++ ../ngx_devel_kit-0.3.4/src/ndk_set_var.c   2026-07-07 14:27:54.282783000 -0400
+@@ -452,7 +452,6 @@
+     ngx_http_variable_t                 *v;
+     ndk_http_rewrite_loc_conf_t         *rlcf;
+     ngx_http_script_var_code_t          *vcode;
+-    ngx_http_script_var_handler_code_t  *vhcode;
+ 
+     v = info->v;
+     cf = info->cf;
+@@ -460,20 +459,6 @@
+ 
+     if (ndk_set_var_filter(cf, rlcf, filter) != NGX_CONF_OK) {
+         return NGX_CONF_ERROR;
+-    }
+-
+-    if (v->set_handler) {
+-        vhcode = ngx_http_script_start_code(cf->pool, &rlcf->codes,
+-                                   sizeof(ngx_http_script_var_handler_code_t));
+-        if (vhcode == NULL) {
+-            return NGX_CONF_ERROR;
+-        }
+-
+-        vhcode->code = ngx_http_script_var_set_handler_code;
+-        vhcode->handler = v->set_handler;
+-        vhcode->data = v->data;
+-
+-        return NGX_CONF_OK;
+     }
+ 
+     vcode = ngx_http_script_start_code(cf->pool, &rlcf->codes,