Index | Thread | Search

From:
Landry Breuil <landry@openbsd.org>
Subject:
[wip/post-unlock] nginx 1.30.0
To:
ports@openbsd.org
Date:
Wed, 15 Apr 2026 12:25:09 +0200

Download raw body.

Thread
  • Landry Breuil:

    [wip/post-unlock] nginx 1.30.0

hi,

for people who want to dogfood it, since this new release has some
default changes:
- keepalive on for upstream
- proxy_http_version is now 1.1, and 2 is available
- multipath tcp & sticky sessions are available

cf https://blog.nginx.org/blog/keep-alive-to-upstreams-is-now-default-in-nginx-1-29-7
and https://blog.nginx.org/blog/nginx-open-source-1-29-3-and-1-29-4

testing welcome, this will probably be commited soon after unlock to get
proper testing.

Landry
? nginx-1.18.0.diff
? nginx-mjs.diff
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/nginx/Makefile,v
diff -u -r1.201 Makefile
--- Makefile	25 Mar 2026 13:03:37 -0000	1.201
+++ Makefile	15 Apr 2026 09:14:47 -0000
@@ -19,7 +19,7 @@
 COMMENT-stream=		nginx TCP/UDP proxy module
 COMMENT-xslt=		nginx XSLT filter module
 
-VERSION=	1.28.3
+VERSION=	1.30.0
 DISTNAME=	nginx-${VERSION}
 CATEGORIES=	www
 
@@ -41,8 +41,7 @@
 PKGNAME-xslt=		nginx-xslt-${VERSION}
 
 SITES=	https://nginx.org/download/
-SITES.p=https://raw.githubusercontent.com/rnagy/nginx_chroot_patch/master/ \
-	https://raw.githubusercontent.com/sthen/nginx_chroot_patch/add_1.20.1/
+SITES.p=https://raw.githubusercontent.com/rnagy/nginx_chroot_patch/master/
 
 DIST_TUPLE=	\
 	github FRiCKLE ngx_cache_purge 2.3 ngx_cache_purge \
@@ -149,7 +148,7 @@
 LDFLAGS+=	-L ${LOCALBASE}/lib -L ${X11BASE}/lib
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 
-PATCHFILES.p+=		nginx-1.20.1-chroot.patch
+PATCHFILES.p+=		nginx-1.30.0-chroot.patch
 PATCH_DIST_STRIP=	-p1
 
 CONFIGURE_STYLE=	simple
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/nginx/distinfo,v
diff -u -r1.96 distinfo
--- distinfo	25 Mar 2026 13:03:37 -0000	1.96
+++ distinfo	15 Apr 2026 09:14:47 -0000
@@ -3,8 +3,8 @@
 SHA256 (kvspb-nginx-auth-ldap-83c059b73566c2ee9cbda920d91b66657cf120b7.tar.gz) = aQxOW9sq4ZsP7nXNNW0YATRo20cmFrYJeloLvjRshGQ=
 SHA256 (leev-ngx_http_geoip2_module-3.4.tar.gz) = rXL8IzSNcVozCZSYRTH6ubNgbhYEgyNnN/mkppV9lFI=
 SHA256 (nbs-system-naxsi-d714f1636ea49a9a9f4f06dba14aee003e970834.tar.gz) = 2+IXdBFFfxy6mO5Gc84xh2mUrQa9zl7MDuZjhO8OQg4=
-SHA256 (nginx-1.20.1-chroot.patch) = SS1TB0j8N4/dn5pUTGT6WvkN3aAUuKz5+R0Nt+MG0gk=
-SHA256 (nginx-1.28.3.tar.gz) = LJapRr+wiCohdE7UKXcKISOuGCjHxIZlCSmT3e6RqRg=
+SHA256 (nginx-1.30.0-chroot.patch) = verI7zwpFLZwG4rOIswpPlZUB1if66TDGL3HN2/RUAU=
+SHA256 (nginx-1.30.0.tar.gz) = BYGIxkvyK67KpyuAmmMYpPm6YjiJxVT+qwP3y4U6sxs=
 SHA256 (nginx-modules-ngx_http_hmac_secure_link_module-48c4625fbbf51ed5a95bfec23fa444f6c3702e50.tar.gz) = ZXpA2rODS1enIREzlD1OqWwpWcv3NOUXH4eUOgOAmqg=
 SHA256 (nginx-njs-0.9.1.tar.gz) = YTZe6mnGhi/IpbXfUxUDrklJn2vNWvkySWuEhQooJKQ=
 SHA256 (openresty-headers-more-nginx-module-v0.34.tar.gz) = DA0s7SzolbP0XrKyMM2QUIqyp3MpnxU94UpD5EwSCbM=
@@ -16,8 +16,8 @@
 SIZE (kvspb-nginx-auth-ldap-83c059b73566c2ee9cbda920d91b66657cf120b7.tar.gz) = 18542
 SIZE (leev-ngx_http_geoip2_module-3.4.tar.gz) = 8877
 SIZE (nbs-system-naxsi-d714f1636ea49a9a9f4f06dba14aee003e970834.tar.gz) = 237272
-SIZE (nginx-1.20.1-chroot.patch) = 8783
-SIZE (nginx-1.28.3.tar.gz) = 1284562
+SIZE (nginx-1.30.0-chroot.patch) = 8217
+SIZE (nginx-1.30.0.tar.gz) = 1324188
 SIZE (nginx-modules-ngx_http_hmac_secure_link_module-48c4625fbbf51ed5a95bfec23fa444f6c3702e50.tar.gz) = 6159
 SIZE (nginx-njs-0.9.1.tar.gz) = 966480
 SIZE (openresty-headers-more-nginx-module-v0.34.tar.gz) = 28827
Index: patches/patch-conf_nginx_conf
===================================================================
RCS file: /cvs/ports/www/nginx/patches/patch-conf_nginx_conf,v
diff -u -r1.10 patch-conf_nginx_conf
--- patches/patch-conf_nginx_conf	16 May 2024 19:07:27 -0000	1.10
+++ patches/patch-conf_nginx_conf	15 Apr 2026 09:14:47 -0000
@@ -41,7 +41,7 @@
      #tcp_nopush     on;
  
      #keepalive_timeout  0;
-@@ -32,41 +37,49 @@ http {
+@@ -32,39 +37,47 @@ http {
  
      #gzip  on;
  
@@ -53,8 +53,6 @@
          server_name  localhost;
 +        root         /var/www/htdocs;
  
-         #charset koi8-r;
- 
          #access_log  logs/host.access.log  main;
  
 -        location / {
@@ -69,7 +67,7 @@
          error_page   500 502 503 504  /50x.html;
          location = /50x.html {
 -            root   html;
-+            root  /var/www/htdocs;
++            root   /var/www/htdocs;
          }
  
 +        # FastCGI to CGI wrapper server
@@ -101,7 +99,7 @@
          #    include        fastcgi_params;
          #}
  
-@@ -85,11 +98,7 @@ http {
+@@ -83,11 +96,7 @@ http {
      #    listen       8000;
      #    listen       somename:8080;
      #    server_name  somename  alias  another.alias;
@@ -114,7 +112,7 @@
      #}
  
  
-@@ -98,20 +107,16 @@ http {
+@@ -96,20 +105,16 @@ http {
      #server {
      #    listen       443 ssl;
      #    server_name  localhost;
Index: patches/patch-man_nginx_8
===================================================================
RCS file: /cvs/ports/www/nginx/patches/patch-man_nginx_8,v
diff -u -r1.7 patch-man_nginx_8
--- patches/patch-man_nginx_8	11 Mar 2022 20:10:10 -0000	1.7
+++ patches/patch-man_nginx_8	15 Apr 2026 09:14:47 -0000
@@ -1,10 +1,10 @@
 Index: man/nginx.8
 --- man/nginx.8.orig
 +++ man/nginx.8
-@@ -99,6 +99,23 @@ Do not run, just test the configuration file.
- .Nm
+@@ -100,6 +100,23 @@ Do not run, just test the configuration file.
  checks the configuration file syntax and then tries to open files
- referenced in the configuration file.
+ referenced in the configuration file, including binding to configured
+ listen addresses.
 +.It Fl u
 +By default
 +.Nm