From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: "Sven Püschel" <s.pueschel@pengutronix.de>
Subject: Re: [ptxdist] [APPLIED] nginx: version bump 1.29.1 -> 1.31.6
Date: Tue, 6 Oct 2026 09:01:27 +0200 [thread overview]
Message-ID: <20261006070127.2792526-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20260923133315.3178533-1-s.pueschel@pengutronix.de>
Thanks, applied as 9e8ecece398a3c7dacaa8d6041e95d9e42dc51f2.
Michael
[sent from post-receive hook]
On Tue, 06 Oct 2026 09:01:27 +0200, Sven Püschel <s.pueschel@pengutronix.de> wrote:
> The license file only had a change in the year.
>
> Also add the corresponding CVE_PRODUCT variable.
> The release notes also mention a bunch of CVEs that got fixed in the
> releases since 1.29.1.
>
> Also disabled all newly features.
>
> Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
> Message-Id: <20260923133315.3178533-1-s.pueschel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/patches/nginx-1.29.1/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch b/patches/nginx-1.31.6/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch
> similarity index 100%
> rename from patches/nginx-1.29.1/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch
> rename to patches/nginx-1.31.6/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch
> diff --git a/patches/nginx-1.29.1/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch b/patches/nginx-1.31.6/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch
> similarity index 100%
> rename from patches/nginx-1.29.1/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch
> rename to patches/nginx-1.31.6/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch
> diff --git a/patches/nginx-1.29.1/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch b/patches/nginx-1.31.6/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch
> similarity index 100%
> rename from patches/nginx-1.29.1/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch
> rename to patches/nginx-1.31.6/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch
> diff --git a/patches/nginx-1.29.1/0004-auto-lib-libxslt-conf-use-pkg-config.patch b/patches/nginx-1.31.6/0004-auto-lib-libxslt-conf-use-pkg-config.patch
> similarity index 100%
> rename from patches/nginx-1.29.1/0004-auto-lib-libxslt-conf-use-pkg-config.patch
> rename to patches/nginx-1.31.6/0004-auto-lib-libxslt-conf-use-pkg-config.patch
> diff --git a/patches/nginx-1.29.1/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch b/patches/nginx-1.31.6/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch
> similarity index 100%
> rename from patches/nginx-1.29.1/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch
> rename to patches/nginx-1.31.6/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch
> diff --git a/patches/nginx-1.29.1/0006-auto-lib-openssl-conf-use-pkg-config.patch b/patches/nginx-1.31.6/0006-auto-lib-openssl-conf-use-pkg-config.patch
> similarity index 100%
> rename from patches/nginx-1.29.1/0006-auto-lib-openssl-conf-use-pkg-config.patch
> rename to patches/nginx-1.31.6/0006-auto-lib-openssl-conf-use-pkg-config.patch
> diff --git a/patches/nginx-1.29.1/0007-auto-lib-libgd-conf-use-pkg-config.patch b/patches/nginx-1.31.6/0007-auto-lib-libgd-conf-use-pkg-config.patch
> similarity index 100%
> rename from patches/nginx-1.29.1/0007-auto-lib-libgd-conf-use-pkg-config.patch
> rename to patches/nginx-1.31.6/0007-auto-lib-libgd-conf-use-pkg-config.patch
> diff --git a/patches/nginx-1.29.1/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch b/patches/nginx-1.31.6/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch
> similarity index 100%
> rename from patches/nginx-1.29.1/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch
> rename to patches/nginx-1.31.6/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch
> diff --git a/patches/nginx-1.29.1/0009-auto-os-linux-fix-build-with-libxcrypt.patch b/patches/nginx-1.31.6/0009-auto-os-linux-fix-build-with-libxcrypt.patch
> similarity index 100%
> rename from patches/nginx-1.29.1/0009-auto-os-linux-fix-build-with-libxcrypt.patch
> rename to patches/nginx-1.31.6/0009-auto-os-linux-fix-build-with-libxcrypt.patch
> diff --git a/patches/nginx-1.29.1/0010-Allow-forcing-of-endianness-for-cross-compilation.patch b/patches/nginx-1.31.6/0010-Allow-forcing-of-endianness-for-cross-compilation.patch
> similarity index 100%
> rename from patches/nginx-1.29.1/0010-Allow-forcing-of-endianness-for-cross-compilation.patch
> rename to patches/nginx-1.31.6/0010-Allow-forcing-of-endianness-for-cross-compilation.patch
> diff --git a/patches/nginx-1.29.1/0100-auto-unix-allow-overriding-the-IPv6-build-tests.patch b/patches/nginx-1.31.6/0100-auto-unix-allow-overriding-the-IPv6-build-tests.patch
> similarity index 100%
> rename from patches/nginx-1.29.1/0100-auto-unix-allow-overriding-the-IPv6-build-tests.patch
> rename to patches/nginx-1.31.6/0100-auto-unix-allow-overriding-the-IPv6-build-tests.patch
> diff --git a/patches/nginx-1.29.1/series b/patches/nginx-1.31.6/series
> similarity index 100%
> rename from patches/nginx-1.29.1/series
> rename to patches/nginx-1.31.6/series
> diff --git a/rules/nginx.make b/rules/nginx.make
> index 5760cb653a63..9d9a479729ab 100644
> --- a/rules/nginx.make
> +++ b/rules/nginx.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_NGINX) += nginx
> #
> # Paths and names
> #
> -NGINX_VERSION := 1.29.1
> -NGINX_SHA256 := c589f7e7ed801ddbd904afbf3de26ae24eb0cce27c7717a2e94df7fb12d6ad27
> +NGINX_VERSION := 1.31.6
> +NGINX_SHA256 := 974ed5298a5e398e008704ed5db284e655fc270c596493dbccada452448fc9f1
> NGINX := nginx-$(NGINX_VERSION)
> NGINX_SUFFIX := tar.gz
> NGINX_URL := https://nginx.org/download/$(NGINX).$(NGINX_SUFFIX)
> @@ -24,7 +24,8 @@ NGINX_SOURCE := $(SRCDIR)/$(NGINX).$(NGINX_SUFFIX)
> NGINX_DIR := $(BUILDDIR)/$(NGINX)
> NGINX_LICENSE := BSD-2-Clause
> NGINX_LICENSE_FILES := \
> - file://LICENSE;md5=3dc49537b08b14c8b66ad247bb4c4593
> + file://LICENSE;md5=79da1c70d587d3a199af9255ad393f99
> +NGINX_CVE_PRODUCT := f5:nginx_open_source
>
> # ----------------------------------------------------------------------------
> # Prepare
> @@ -86,6 +87,7 @@ NGINX_CONF_OPT := \
> $(call ptx/ifdef, PTXCONF_NGINX_HTTP_UWSGI_MODULE,,--without-http_uwsgi_module) \
> $(call ptx/ifdef, PTXCONF_NGINX_HTTP_SCGI_MODULE,,--without-http_scgi_module) \
> $(call ptx/ifdef, PTXCONF_NGINX_HTTP_GRPC_MODULE,,--without-http_grpc_module) \
> + --without-http_tunnel_module \
> --without-http_memcached_module \
> $(call ptx/ifdef, PTXCONF_NGINX_HTTP_LIMIT_CON_MODULE,,--without-http_limit_conn_module) \
> $(call ptx/ifdef, PTXCONF_NGINX_HTTP_LIMIT_REQ_MODULE,,--without-http_limit_req_module) \
> @@ -94,9 +96,11 @@ NGINX_CONF_OPT := \
> --without-http_upstream_hash_module \
> --without-http_upstream_ip_hash_module \
> --without-http_upstream_least_conn_module \
> + --without-http_upstream_least_time_module \
> --without-http_upstream_random_module \
> --without-http_upstream_keepalive_module \
> --without-http_upstream_zone_module \
> + --without-http_upstream_sticky_module \
> --http-log-path=/var/log/nginx \
> --http-client-body-temp-path=/var/tmp/nginx/client-body \
> --http-proxy-temp-path=/var/tmp/nginx/proxy \
> @@ -116,6 +120,7 @@ NGINX_CONF_OPT := \
> --without-stream_set_module \
> --without-stream_upstream_hash_module \
> --without-stream_upstream_least_conn_module \
> + --without-stream_upstream_least_time_module \
> --without-stream_upstream_random_module \
> --without-stream_upstream_zone_module \
> --with-cc=$(CROSS_CC) \
prev parent reply other threads:[~2026-10-06 7:02 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-23 13:33 [ptxdist] [PATCH] " Sven Püschel
2026-10-06 7:01 ` Michael Olbrich [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261006070127.2792526-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=ptxdist@pengutronix.de \
--cc=s.pueschel@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox