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 <[email protected]> --- ...e-sizeof-rework-autotest-to-be-cross-compila.patch | 0 ...ture-add-mechanism-allowing-to-force-feature.patch | 0 ...-ngx_feature_run_force_result-for-each-featu.patch | 0 .../0004-auto-lib-libxslt-conf-use-pkg-config.patch | 0 ...o-unix-make-sys_nerr-guessing-cross-friendly.patch | 0 .../0006-auto-lib-openssl-conf-use-pkg-config.patch | 0 .../0007-auto-lib-libgd-conf-use-pkg-config.patch | 0 ...nix-ngx_linux_config.h-only-include-dlfcn.h-.patch | 0 .../0009-auto-os-linux-fix-build-with-libxcrypt.patch | 0 ...-forcing-of-endianness-for-cross-compilation.patch | 0 ...o-unix-allow-overriding-the-IPv6-build-tests.patch | 0 patches/{nginx-1.29.1 => nginx-1.31.6}/series | 0 rules/nginx.make | 11 ++++++++--- 13 files changed, 8 insertions(+), 3 deletions(-) rename patches/{nginx-1.29.1 => nginx-1.31.6}/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch (100%) rename patches/{nginx-1.29.1 => nginx-1.31.6}/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch (100%) rename patches/{nginx-1.29.1 => nginx-1.31.6}/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch (100%) rename patches/{nginx-1.29.1 => nginx-1.31.6}/0004-auto-lib-libxslt-conf-use-pkg-config.patch (100%) rename patches/{nginx-1.29.1 => nginx-1.31.6}/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch (100%) rename patches/{nginx-1.29.1 => nginx-1.31.6}/0006-auto-lib-openssl-conf-use-pkg-config.patch (100%) rename patches/{nginx-1.29.1 => nginx-1.31.6}/0007-auto-lib-libgd-conf-use-pkg-config.patch (100%) rename patches/{nginx-1.29.1 => nginx-1.31.6}/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch (100%) rename patches/{nginx-1.29.1 => nginx-1.31.6}/0009-auto-os-linux-fix-build-with-libxcrypt.patch (100%) rename patches/{nginx-1.29.1 => nginx-1.31.6}/0010-Allow-forcing-of-endianness-for-cross-compilation.patch (100%) rename patches/{nginx-1.29.1 => nginx-1.31.6}/0100-auto-unix-allow-overriding-the-IPv6-build-tests.patch (100%) rename patches/{nginx-1.29.1 => nginx-1.31.6}/series (100%) 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 5760cb653..9d9a47972 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) \ -- 2.47.3
