From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 06 Oct 2026 09:02:00 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1xDzBY-00AOw2-18 for lore@lore.pengutronix.de; Tue, 06 Oct 2026 09:02:00 +0200 Received: from [127.0.0.1] (helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1xDzBX-00029E-55; Tue, 06 Oct 2026 09:01:59 +0200 Received: from mx1.white.stw.pengutronix.de ([2a0a:edc0:0:b01:1d::107]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1xDzB1-0000Rm-K8 for ptxdist@pengutronix.de; Tue, 06 Oct 2026 09:01:27 +0200 Received: from dude05.red.stw.pengutronix.de (dude05.red.stw.4.pengutronix.de [10.17.1.19]) (Authenticated sender: relay-from-dude05.red.stw.pengutronix.de) by mx1.white.stw.pengutronix.de (Postfix) with ESMTPSA id 8C0AF2012A4; Tue, 06 Oct 2026 09:01:27 +0200 (CEST) ARC-Seal: i=1; s=20260414; d=pengutronix.de; t=1791270087; a=rsa-sha256; cv=none; b=F0HW82CgValddFKC82OI30qh6TyIYblKL9hxGuV0jwCsVsAd48ChviCKaBmWIcsN6/hV5g 7Nod13nODVKoAh2dp99etVl/b9g7yqQvF8Wk2PN6usegLqhUg1DDisRJpPztbM3XEKBGCz z7B2MgWTYNYKtfTt2ZEGaa5CJ6po1rhEqffsQG/3FPdQS1l0j4mCQsZAPK3VbrbH+/XUhZ 2cD5Nu62OSnsdpPgJRE8hGaIAXj1V1q4MAmAAOb34ojFwObwx+f5TWPdmqxI9fo400gcF1 iUVVgYTbEfeX0ElPZ+OX4Pjfc/ka79f+oLYJJH37aF49UxyqvCI+GBJOVJiq1g== ARC-Authentication-Results: i=1; ORIGINATING; auth=pass smtp.auth=relay-from-dude05.red.stw.pengutronix.de smtp.mailfrom=mol@pengutronix.de ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=pengutronix.de; s=20260414; t=1791270087; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fz389yh+O0F3/v142jLjjpocXMclDpE977gdcwiP8eQ=; b=fApWVi2W+5ZRa1tkNFVBobbvbRJF1SfRoMqzDjC/RCQaBzpeZuRmFwWuk1KXsviYUUMepX G8dmGb9eLvHdZWHQnvXWjO9af9rSbuFzhOTp1pBzLRe+q/5MMsSs2lv1sktGTz78m9K5sK 9+XpbgmbapTspiDNkFE9uHMdDaz8I7oWzUHYsImabc6MNSLXVEZSlZlD+togJsEsZ7o7Ws As/QnX9rXkIDkH5pz3TuJkFWEPsLvrO+1jjeJ5JdVR4sM7RXbZpvl7vBlOcFqLczNbINsq ORSpAR5Zrfdk232xlE68CRQJv0wXGWIRC+/4+xDCFm0ohuycdPnvpROsHYLFCw== Received: by dude05.red.stw.pengutronix.de (Postfix, from userid 1014) id 7D9CA74014E; Tue, 06 Oct 2026 09:01:27 +0200 (CEST) From: Michael Olbrich To: ptxdist@pengutronix.de Date: Tue, 6 Oct 2026 09:01:27 +0200 Message-ID: <20261006070127.2792526-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260923133315.3178533-1-s.pueschel@pengutronix.de> References: <20260923133315.3178533-1-s.pueschel@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] nginx: version bump 1.29.1 -> 1.31.6 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: =?UTF-8?q?Sven=20P=C3=BCschel?= Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as 9e8ecece398a3c7dacaa8d6041e95d9e42dc51f2. Michael [sent from post-receive hook] On Tue, 06 Oct 2026 09:01:27 +0200, Sven Püschel 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 > Message-Id: <20260923133315.3178533-1-s.pueschel@pengutronix.de> > Signed-off-by: Michael Olbrich > > 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) \