pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/www
Module Name: pkgsrc
Committed By: adam
Date: Wed Mar 4 05:56:31 UTC 2026
Modified Files:
pkgsrc/www/nginx: Makefile distinfo options.mk
pkgsrc/www/nginx-devel: Makefile distinfo options.mk
pkgsrc/www/nginx-devel/patches: patch-conf_nginx.conf
Removed Files:
pkgsrc/www/nginx/patches: patch-src_mail_ngx__mail__handler.c
Log Message:
nginx nginx-devel: updated to 1.28.2 and 1.29.5
nginx-1.28.2 stable and nginx-1.29.5 mainline versions have been released, with
a fix for the SSL upstream injection vulnerability (CVE-2026-1642).
To generate a diff of this commit:
cvs rdiff -u -r1.188 -r1.189 pkgsrc/www/nginx/Makefile
cvs rdiff -u -r1.138 -r1.139 pkgsrc/www/nginx/distinfo
cvs rdiff -u -r1.122 -r1.123 pkgsrc/www/nginx/options.mk
cvs rdiff -u -r1.165 -r1.166 pkgsrc/www/nginx-devel/Makefile
cvs rdiff -u -r1.130 -r1.131 pkgsrc/www/nginx-devel/distinfo
cvs rdiff -u -r1.48 -r1.49 pkgsrc/www/nginx-devel/options.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/nginx-devel/patches/patch-conf_nginx.conf
cvs rdiff -u -r1.1 -r0 \
pkgsrc/www/nginx/patches/patch-src_mail_ngx__mail__handler.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/nginx/Makefile
diff -u pkgsrc/www/nginx/Makefile:1.188 pkgsrc/www/nginx/Makefile:1.189
--- pkgsrc/www/nginx/Makefile:1.188 Wed Jan 7 08:49:23 2026
+++ pkgsrc/www/nginx/Makefile Wed Mar 4 05:56:31 2026
@@ -1,15 +1,10 @@
-# $NetBSD: Makefile,v 1.188 2026/01/07 08:49:23 wiz Exp $
+# $NetBSD: Makefile,v 1.189 2026/03/04 05:56:31 adam Exp $
-DISTNAME= nginx-1.28.0
-PKGREVISION= 11
+DISTNAME= nginx-1.28.2
CATEGORIES= www
MASTER_SITES= https://nginx.org/download/
DISTFILES= ${DEFAULT_DISTFILES}
-PATCH_SITES= https://github.com/freenginx/nginx/commit/
-PATCHFILES= 1ac658f44afc9240f13e9d6c1c9d5a7816299e8e.patch
-PATCH_DIST_ARGS= -d ${WRKSRC} -p1
-
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://nginx.org/
COMMENT= Lightweight HTTP server and mail proxy server
Index: pkgsrc/www/nginx/distinfo
diff -u pkgsrc/www/nginx/distinfo:1.138 pkgsrc/www/nginx/distinfo:1.139
--- pkgsrc/www/nginx/distinfo:1.138 Sun Sep 28 20:17:16 2025
+++ pkgsrc/www/nginx/distinfo Wed Mar 4 05:56:31 2026
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.138 2025/09/28 20:17:16 osa Exp $
+$NetBSD: distinfo,v 1.139 2026/03/04 05:56:31 adam Exp $
-BLAKE2s (1ac658f44afc9240f13e9d6c1c9d5a7816299e8e.patch) = 6c3880dc781886fb1f4190fa9b8f1459246cc5d157aaed3b9a24cc7abaf7c5a1
-SHA512 (1ac658f44afc9240f13e9d6c1c9d5a7816299e8e.patch) = b780bea19736f5db844f11b0b407c159cc6ba7326b50177cefde6f8ee875238d3618e50d29b132a66fe98103cb5656f33895e5989d98d4cdc26cfeaa7f12865f
-Size (1ac658f44afc9240f13e9d6c1c9d5a7816299e8e.patch) = 2453 bytes
BLAKE2s (array-var-nginx-module-0.06.tar.gz) = fa6ad2a2ce3c3eba3f69287b224e9c01fcaca29a083394ab74f2f655d3e2138b
SHA512 (array-var-nginx-module-0.06.tar.gz) = bc72158856a1be18a26ee04c6b5b0f0a20bcce688610a493bf31e2a133e7eb12e11f7c18197a09a72b1513f6a08348ee5281b9d5b84cf43603539040ebd23c26
Size (array-var-nginx-module-0.06.tar.gz) = 12005 bytes
@@ -21,18 +18,18 @@ Size (google-ngx_brotli-a71f931_GH.tar.g
BLAKE2s (headers-more-nginx-module-0.39.tar.gz) = 29c90cc57f236c5e9ff69e0a39522ba3ec0d42d23d1592b730f5e1336aa14d64
SHA512 (headers-more-nginx-module-0.39.tar.gz) = b73099bc1d088afc2ccb13e97ad8dd2210cdb6c8355b348007042f23c4bb3ec239e9521f29cb4e82d09b930d8b6a46ccdc7fb75438bf180342d8c53727971c1e
Size (headers-more-nginx-module-0.39.tar.gz) = 29616 bytes
-BLAKE2s (lua-nginx-module-0.10.28.tar.gz) = 0e8b2e8ee0d43905385ca90bf9233e213c78f131ae90f16e64555679c01776e5
-SHA512 (lua-nginx-module-0.10.28.tar.gz) = 176d7516bebbdb3a5d3bb3ee627a7d63d59f23a7df8dcaef2195edb875ce438700ae97fb2ad1d17a30519bbbc6d6ee8c742dbc1b37d3e4f4da2187acb9c16aaa
-Size (lua-nginx-module-0.10.28.tar.gz) = 869217 bytes
+BLAKE2s (lua-nginx-module-0.10.29.tar.gz) = ac29ff6eec96f1ce2038b0590fc63419d3777b0124fd03558f56df44d5fe04aa
+SHA512 (lua-nginx-module-0.10.29.tar.gz) = c2afd85ec7e16089b01c310b0df45d6d87a47438c470efe25eaef455a4d4acbfb16aa74c4cbbfe1091098345f0ae81a8a0315cc6de03ed0c5fbda33164ce7514
+Size (lua-nginx-module-0.10.29.tar.gz) = 892502 bytes
BLAKE2s (naxsi-1.7-src-with-deps.tar.gz) = 9283a2193c536ba4ef4b28389313623729e4c0c343f62c8a4d683bf377e0fe4a
SHA512 (naxsi-1.7-src-with-deps.tar.gz) = 78db1b06e4956854af0e31037db4607c4cc3d06316300af026c1e4349475c85e375bf963718c2def505396d30766f008182128060f0cfc4bb37f06896689fdd2
Size (naxsi-1.7-src-with-deps.tar.gz) = 3366176 bytes
BLAKE2s (nchan-1.3.7.tar.gz) = 27da0a52c9123186a321a01b02cb004eed0623110aafa6737dd43ceeff766010
SHA512 (nchan-1.3.7.tar.gz) = 585c6f9107b84354e7f6c587f85cf554dd5c213b1e3baa75e0aee0b28520afb9cffff1812c32e81541a1f25773fc58d1b92ce6bd9d85accc12f37841633eb79b
Size (nchan-1.3.7.tar.gz) = 665133 bytes
-BLAKE2s (nginx-1.28.0.tar.gz) = 0cc61c40ca7d17bffc6de6a9132a2cecdc0b3d0d9da70290500284a3e35b1fcf
-SHA512 (nginx-1.28.0.tar.gz) = 07d1ef078a73009c2aff0a5729a57f58f26512b71377715ef72cecdb249ef2ff69dd44df3d755a1de2a2721ee604e8a6cfac30a4cf8a45f0890b1746b68ee4d5
-Size (nginx-1.28.0.tar.gz) = 1280111 bytes
+BLAKE2s (nginx-1.28.2.tar.gz) = 8b0063a06851dab60f51b046633cecfb70d5ec397ce21b3c8f4b3af56303b9a1
+SHA512 (nginx-1.28.2.tar.gz) = 914aeaa816e1bb30d346015c7ac4998461fb4fca37df7a7b565b6e5583f21872b28ba41353f2caf620cf9fae71c6890fafb76b57cc4c79e8c949b221da204476
+Size (nginx-1.28.2.tar.gz) = 1282351 bytes
BLAKE2s (nginx-dav-ext-module-3.0.0.tar.gz) = 8e823ffd605d4fca00eb3ca92a0954ca35fb178397e0b990fea7d47580ee582f
SHA512 (nginx-dav-ext-module-3.0.0.tar.gz) = d0193ba90f1ef46c4e470630c4394bdf99d94fd2e3bd8be6cb2ba1655ec59944b1269025f032b79dc2c6dad366e54389ef6a6da2ddeb91d535a4027f2162fbde
Size (nginx-dav-ext-module-3.0.0.tar.gz) = 14558 bytes
@@ -72,4 +69,3 @@ Size (vozlt-nginx-module-vts-bdb2699_GH.
SHA1 (patch-auto_cc_conf) = 5e6a479ba419cd16dedeb3b4c47dc685d126ef6a
SHA1 (patch-auto_install) = 3b3a0f9f4c005b707664554fa57a58c9e3b7de60
SHA1 (patch-conf_nginx.conf) = d2ca1954e9682b9d0007cc02e5841e3986ecf5c1
-SHA1 (patch-src_mail_ngx__mail__handler.c) = 701c274ad5405484bb07ab5996d0f2afd1b8773a
Index: pkgsrc/www/nginx/options.mk
diff -u pkgsrc/www/nginx/options.mk:1.122 pkgsrc/www/nginx/options.mk:1.123
--- pkgsrc/www/nginx/options.mk:1.122 Sun Sep 28 20:17:16 2025
+++ pkgsrc/www/nginx/options.mk Wed Mar 4 05:56:31 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.122 2025/09/28 20:17:16 osa Exp $
+# $NetBSD: options.mk,v 1.123 2026/03/04 05:56:31 adam Exp $
CODELOAD_SITE_GITHUB= https://codeload.github.com/
@@ -207,7 +207,7 @@ DISTFILES+= ${NDK_DISTFILE}
.endif
.if !empty(PKG_OPTIONS:Mnginx-luajit) || make(makesum) || make(mdi) || make(distclean)
-LUA_VERSION= 0.10.28
+LUA_VERSION= 0.10.29
LUA_DISTNAME= lua-nginx-module-${LUA_VERSION}
LUA_DISTFILE= ${LUA_DISTNAME}.tar.gz
SITES.${LUA_DISTFILE}= -${MASTER_SITE_GITHUB:=openresty/lua-nginx-module/archive/}v${LUA_VERSION}.tar.gz
Index: pkgsrc/www/nginx-devel/Makefile
diff -u pkgsrc/www/nginx-devel/Makefile:1.165 pkgsrc/www/nginx-devel/Makefile:1.166
--- pkgsrc/www/nginx-devel/Makefile:1.165 Wed Jan 7 08:49:23 2026
+++ pkgsrc/www/nginx-devel/Makefile Wed Mar 4 05:56:31 2026
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.165 2026/01/07 08:49:23 wiz Exp $
+# $NetBSD: Makefile,v 1.166 2026/03/04 05:56:31 adam Exp $
-DISTNAME= nginx-1.29.1
+DISTNAME= nginx-1.29.5
PKGNAME= ${DISTNAME:S/-/-devel-/1}
-PKGREVISION= 6
CATEGORIES= www
MASTER_SITES= https://nginx.org/download/
DISTFILES= ${DEFAULT_DISTFILES}
Index: pkgsrc/www/nginx-devel/distinfo
diff -u pkgsrc/www/nginx-devel/distinfo:1.130 pkgsrc/www/nginx-devel/distinfo:1.131
--- pkgsrc/www/nginx-devel/distinfo:1.130 Mon Sep 15 11:36:12 2025
+++ pkgsrc/www/nginx-devel/distinfo Wed Mar 4 05:56:31 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.130 2025/09/15 11:36:12 osa Exp $
+$NetBSD: distinfo,v 1.131 2026/03/04 05:56:31 adam Exp $
BLAKE2s (array-var-nginx-module-0.06.tar.gz) = fa6ad2a2ce3c3eba3f69287b224e9c01fcaca29a083394ab74f2f655d3e2138b
SHA512 (array-var-nginx-module-0.06.tar.gz) = bc72158856a1be18a26ee04c6b5b0f0a20bcce688610a493bf31e2a133e7eb12e11f7c18197a09a72b1513f6a08348ee5281b9d5b84cf43603539040ebd23c26
@@ -18,18 +18,18 @@ Size (google-ngx_brotli-a71f931_GH.tar.g
BLAKE2s (headers-more-nginx-module-0.39.tar.gz) = 29c90cc57f236c5e9ff69e0a39522ba3ec0d42d23d1592b730f5e1336aa14d64
SHA512 (headers-more-nginx-module-0.39.tar.gz) = b73099bc1d088afc2ccb13e97ad8dd2210cdb6c8355b348007042f23c4bb3ec239e9521f29cb4e82d09b930d8b6a46ccdc7fb75438bf180342d8c53727971c1e
Size (headers-more-nginx-module-0.39.tar.gz) = 29616 bytes
-BLAKE2s (lua-nginx-module-0.10.28.tar.gz) = 0e8b2e8ee0d43905385ca90bf9233e213c78f131ae90f16e64555679c01776e5
-SHA512 (lua-nginx-module-0.10.28.tar.gz) = 176d7516bebbdb3a5d3bb3ee627a7d63d59f23a7df8dcaef2195edb875ce438700ae97fb2ad1d17a30519bbbc6d6ee8c742dbc1b37d3e4f4da2187acb9c16aaa
-Size (lua-nginx-module-0.10.28.tar.gz) = 869217 bytes
+BLAKE2s (lua-nginx-module-0.10.29.tar.gz) = ac29ff6eec96f1ce2038b0590fc63419d3777b0124fd03558f56df44d5fe04aa
+SHA512 (lua-nginx-module-0.10.29.tar.gz) = c2afd85ec7e16089b01c310b0df45d6d87a47438c470efe25eaef455a4d4acbfb16aa74c4cbbfe1091098345f0ae81a8a0315cc6de03ed0c5fbda33164ce7514
+Size (lua-nginx-module-0.10.29.tar.gz) = 892502 bytes
BLAKE2s (naxsi-1.7-src-with-deps.tar.gz) = 9283a2193c536ba4ef4b28389313623729e4c0c343f62c8a4d683bf377e0fe4a
SHA512 (naxsi-1.7-src-with-deps.tar.gz) = 78db1b06e4956854af0e31037db4607c4cc3d06316300af026c1e4349475c85e375bf963718c2def505396d30766f008182128060f0cfc4bb37f06896689fdd2
Size (naxsi-1.7-src-with-deps.tar.gz) = 3366176 bytes
BLAKE2s (nchan-1.3.7.tar.gz) = 27da0a52c9123186a321a01b02cb004eed0623110aafa6737dd43ceeff766010
SHA512 (nchan-1.3.7.tar.gz) = 585c6f9107b84354e7f6c587f85cf554dd5c213b1e3baa75e0aee0b28520afb9cffff1812c32e81541a1f25773fc58d1b92ce6bd9d85accc12f37841633eb79b
Size (nchan-1.3.7.tar.gz) = 665133 bytes
-BLAKE2s (nginx-1.29.1.tar.gz) = 4094c4f42bcdda91b47284cc7e471a16c37a80c225fa96813e7263dc4e3ad46c
-SHA512 (nginx-1.29.1.tar.gz) = 06ce3caca5acdaea6c6b7254681bbc50ba46f4bd99f1d4edbbf0be0ef3af4b5222e75c16fc52990decb773898fe47c647e8dfb0dabcf1793a870808866ea69d1
-Size (nginx-1.29.1.tar.gz) = 1285529 bytes
+BLAKE2s (nginx-1.29.5.tar.gz) = 8e92da491bed67ce10b7e666dbcc19ea9dc9ec469a9513f96d7ed589cb18f58d
+SHA512 (nginx-1.29.5.tar.gz) = 721b5f8d5484b4508c3fffc5aa8239212266ad8635ea9e5b2c3d5f0349e0846ab9dd3c1e1409435b30989aa83d4b65113a8ab8854fff725c55b9043f17435235
+Size (nginx-1.29.5.tar.gz) = 1310203 bytes
BLAKE2s (nginx-dav-ext-module-3.0.0.tar.gz) = 8e823ffd605d4fca00eb3ca92a0954ca35fb178397e0b990fea7d47580ee582f
SHA512 (nginx-dav-ext-module-3.0.0.tar.gz) = d0193ba90f1ef46c4e470630c4394bdf99d94fd2e3bd8be6cb2ba1655ec59944b1269025f032b79dc2c6dad366e54389ef6a6da2ddeb91d535a4027f2162fbde
Size (nginx-dav-ext-module-3.0.0.tar.gz) = 14558 bytes
@@ -68,4 +68,4 @@ SHA512 (vozlt-nginx-module-vts-bdb2699_G
Size (vozlt-nginx-module-vts-bdb2699_GH.tar.gz) = 185041 bytes
SHA1 (patch-auto_cc_conf) = 5e6a479ba419cd16dedeb3b4c47dc685d126ef6a
SHA1 (patch-auto_install) = 3b3a0f9f4c005b707664554fa57a58c9e3b7de60
-SHA1 (patch-conf_nginx.conf) = d2ca1954e9682b9d0007cc02e5841e3986ecf5c1
+SHA1 (patch-conf_nginx.conf) = 8e2c360711a01dc83db3e831e0fb350391e52e85
Index: pkgsrc/www/nginx-devel/options.mk
diff -u pkgsrc/www/nginx-devel/options.mk:1.48 pkgsrc/www/nginx-devel/options.mk:1.49
--- pkgsrc/www/nginx-devel/options.mk:1.48 Mon Sep 15 11:36:12 2025
+++ pkgsrc/www/nginx-devel/options.mk Wed Mar 4 05:56:31 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.48 2025/09/15 11:36:12 osa Exp $
+# $NetBSD: options.mk,v 1.49 2026/03/04 05:56:31 adam Exp $
CODELOAD_SITE_GITHUB= https://codeload.github.com/
@@ -207,7 +207,7 @@ DISTFILES+= ${NDK_DISTFILE}
.endif
.if !empty(PKG_OPTIONS:Mnginx-luajit) || make(makesum) || make(mdi) || make(distclean)
-LUA_VERSION= 0.10.28
+LUA_VERSION= 0.10.29
LUA_DISTNAME= lua-nginx-module-${LUA_VERSION}
LUA_DISTFILE= ${LUA_DISTNAME}.tar.gz
SITES.${LUA_DISTFILE}= -${MASTER_SITE_GITHUB:=openresty/lua-nginx-module/archive/}v${LUA_VERSION}.tar.gz
Index: pkgsrc/www/nginx-devel/patches/patch-conf_nginx.conf
diff -u pkgsrc/www/nginx-devel/patches/patch-conf_nginx.conf:1.3 pkgsrc/www/nginx-devel/patches/patch-conf_nginx.conf:1.4
--- pkgsrc/www/nginx-devel/patches/patch-conf_nginx.conf:1.3 Wed Feb 19 16:54:31 2025
+++ pkgsrc/www/nginx-devel/patches/patch-conf_nginx.conf Wed Mar 4 05:56:31 2026
@@ -1,8 +1,8 @@
-$NetBSD: patch-conf_nginx.conf,v 1.3 2025/02/19 16:54:31 wiz Exp $
+$NetBSD: patch-conf_nginx.conf,v 1.4 2026/03/04 05:56:31 adam Exp $
Adapt config file for pkgsrc.
---- conf/nginx.conf.orig 2014-04-24 12:52:24.000000000 +0000
+--- conf/nginx.conf.orig 2025-12-09 18:28:10.000000000 +0000
+++ conf/nginx.conf
@@ -1,28 +1,29 @@
@@ -15,8 +15,8 @@ Adapt config file for pkgsrc.
-#error_log logs/error.log info;
-
-#pid logs/nginx.pid;
-+#error_log %%NGINX_LOGDIR%%/error.log;
-+#error_log %%NGINX_LOGDIR%%/error.log notice;
++#error_log %%NGINX_LOGDIR%%/error.log;
++#error_log %%NGINX_LOGDIR%%/error.log notice;
+#error_log %%NGINX_LOGDIR%%/error.log info;
+#pid %%NGINX_PIDDIR%%/nginx.pid;
@@ -42,9 +42,9 @@ Adapt config file for pkgsrc.
sendfile on;
#tcp_nopush on;
-@@ -38,10 +39,10 @@ http {
-
- #charset koi8-r;
+@@ -36,10 +37,10 @@ http {
+ listen 80;
+ server_name localhost;
- #access_log logs/host.access.log main;
+ #access_log %%NGINX_LOGDIR%%/host.access.log main;
@@ -55,7 +55,7 @@ Adapt config file for pkgsrc.
index index.html index.htm;
}
-@@ -51,7 +52,7 @@ http {
+@@ -49,7 +50,7 @@ http {
#
error_page 500 502 503 504 /50x.html;
location = /50x.html {
@@ -64,7 +64,7 @@ Adapt config file for pkgsrc.
}
# proxy the PHP scripts to Apache listening on 127.0.0.1:80
-@@ -67,7 +68,7 @@ http {
+@@ -65,7 +66,7 @@ http {
# fastcgi_pass 127.0.0.1:9000;
# fastcgi_index index.php;
# fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name;
@@ -73,7 +73,7 @@ Adapt config file for pkgsrc.
#}
# deny access to .htaccess files, if Apache's document root
-@@ -87,7 +88,7 @@ http {
+@@ -85,7 +86,7 @@ http {
# server_name somename alias another.alias;
# location / {
@@ -82,7 +82,7 @@ Adapt config file for pkgsrc.
# index index.html index.htm;
# }
#}
-@@ -109,7 +110,7 @@ http {
+@@ -107,7 +108,7 @@ http {
# ssl_prefer_server_ciphers on;
# location / {
Home |
Main Index |
Thread Index |
Old Index