Skip to contentSkip to conversation

package/nginx: security update to 1.26.1

PATCH Applied Waldemar Brodkorb 3 participants 3 messages Aug 5, 2024 – Sep 3, 2024

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 package/nginx: security update to 1.26.1

See here for a Changelog and CVE's:
http://nginx.org/en/CHANGES-1.26

Patch 0006 is no longer required as the openssl library is found without this patch, which does not apply anymore.

Patch 0009 is no longer required as it was fixed in another way upstream:
https://hg.nginx.org/nginx/rev/fb989e24c60a

Patch 0011 is upstream:
https://hg.nginx.org/nginx/rev/f58b6f636238

Reorder the remaining patches and update .checkpackageignore accordingly.

The LICENSE file is changed, the year changed from 2022 to 2024.

---
v1->v2:
- forgot to update LICENSE file hash and information about the changes (requested by Thomas P.)

---
 .checkpackageignore                           |   8 +-
 ...-auto-lib-libgd-conf-use-pkg-config.patch} |   0
 ...auto-lib-openssl-conf-use-pkg-config.patch | 251 ------------------
 ...inux_config.h-only-include-dlfcn.h-.patch} |   0
 ...of-endianness-for-cross-compilation.patch} |   0
 ...to-os-linux-fix-build-with-libxcrypt.patch |  38 ---
 ...ix-compile-error-in-configure-script.patch |  33 ---
 package/nginx/nginx.hash                      |   4 +-
 package/nginx/nginx.mk                        |   2 +-
 9 files changed, 6 insertions(+), 330 deletions(-)
 rename package/nginx/{0007-auto-lib-libgd-conf-use-pkg-config.patch => 0006-auto-lib-libgd-conf-use-pkg-config.patch} (100%)
 delete mode 100644 package/nginx/0006-auto-lib-openssl-conf-use-pkg-config.patch
 rename package/nginx/{0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch => 0007-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch} (100%)
 rename package/nginx/{0010-Allow-forcing-of-endianness-for-cross-compilation.patch => 0008-Allow-forcing-of-endianness-for-cross-compilation.patch} (100%)
 delete mode 100644 package/nginx/0009-auto-os-linux-fix-build-with-libxcrypt.patch
 delete mode 100644 package/nginx/0011-Fix-compile-error-in-configure-script.patch
.checkpackageignore +3 -5
index 10662bb11e..290eb2cbf5 100644
@@ -959,11 +959,9 @@ package/nginx/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch li
 package/nginx/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch lib_patch.Upstream
 package/nginx/0004-auto-lib-libxslt-conf-use-pkg-config.patch lib_patch.Upstream
 package/nginx/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch lib_patch.Upstream
-package/nginx/0006-auto-lib-openssl-conf-use-pkg-config.patch lib_patch.Upstream
-package/nginx/0007-auto-lib-libgd-conf-use-pkg-config.patch lib_patch.Upstream
-package/nginx/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch lib_patch.Upstream
-package/nginx/0009-auto-os-linux-fix-build-with-libxcrypt.patch lib_patch.Upstream
-package/nginx/0010-Allow-forcing-of-endianness-for-cross-compilation.patch lib_patch.Upstream
+package/nginx/0006-auto-lib-libgd-conf-use-pkg-config.patch lib_patch.Upstream
+package/nginx/0007-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch lib_patch.Upstream
+package/nginx/0008-Allow-forcing-of-endianness-for-cross-compilation.patch lib_patch.Upstream
 package/nginx/S50nginx lib_sysv.Indent lib_sysv.Variables
 package/nilfs-utils/0001-nilfs_cleanerd-link-dynamically.patch lib_patch.Upstream
 package/nmap/0001-libdnet-always-build-a-static-library.patch lib_patch.Upstream
package/nginx/0006-auto-lib-libgd-conf-use-pkg-config.patch renamed from package/nginx/0007-auto-lib-libgd-conf-use-pkg-config.patch +0 -0
similarity index 100%
rename from package/nginx/0007-auto-lib-libgd-conf-use-pkg-config.patch
rename to package/nginx/0006-auto-lib-libgd-conf-use-pkg-config.patch
package/nginx/0006-auto-lib-openssl-conf-use-pkg-config.patch deleted +0 -251

251 lines not on this page · raw message

package/nginx/0007-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch renamed from package/nginx/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch +0 -0
similarity index 100%
rename from package/nginx/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch
rename to package/nginx/0007-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch
package/nginx/0008-Allow-forcing-of-endianness-for-cross-compilation.patch renamed from package/nginx/0010-Allow-forcing-of-endianness-for-cross-compilation.patch +0 -0
similarity index 100%
rename from package/nginx/0010-Allow-forcing-of-endianness-for-cross-compilation.patch
rename to package/nginx/0008-Allow-forcing-of-endianness-for-cross-compilation.patch
package/nginx/0009-auto-os-linux-fix-build-with-libxcrypt.patch deleted +0 -38
deleted file mode 100644
index 8b368d946f..0000000000
@@ -1,38 +0,0 @@
-From 79f1fe5251afc4e22a138b0c8f44fc9c94093b8b Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <[email protected]>
-Date: Fri, 2 Apr 2021 09:18:26 +0200
-Subject: [PATCH] auto/os/linux: fix build with libxcrypt
-
-If crypt_r is found in libcrypt, add -lcrypt to CORE_LIBS to avoid the
-following build failure with libxcrypt:
-
-objs/ngx_modules.o \
--lpcre -L/home/giuliobenetti/autobuild/run/instance-3/output-1/host/bin/../xtensa-buildroot-linux-uclibc/sysroot/usr/lib -lssl -lcrypto -L/home/giuliobenetti/autobuild/run/instance-3/output-1/host/bin/../xtensa-buildroot-linux-uclibc/sysroot/usr/lib -lxslt -lxml2 -lGeoIP \
--Wl,-E
-/home/giuliobenetti/autobuild/run/instance-3/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/9.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: objs/src/os/unix/ngx_user.o:/home/giuliobenetti/autobuild/run/instance-3/output-1/build/nginx-1.18.0/src/os/unix/ngx_user.c:18: undefined reference to `crypt_r'
-
-Fixes:
- - http://autobuild.buildroot.org/results/79a51b0d348e756517b5c9ce815a67f5c657e7e6
-
-Signed-off-by: Fabrice Fontaine <[email protected]>
----
- auto/os/linux | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/auto/os/linux b/auto/os/linux
-index 5e280eca..04682812 100644
---- a/auto/os/linux
-+++ b/auto/os/linux
-@@ -232,6 +232,9 @@ ngx_feature_test="struct crypt_data  cd;
-                   crypt_r(\"key\", \"salt\", &cd);"
- . auto/feature
- 
-+if [ $ngx_found = yes ]; then
-+    CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
-+fi
- 
- ngx_include="sys/vfs.h";     . auto/include
- 
--- 
-2.30.2
-
package/nginx/0011-Fix-compile-error-in-configure-script.patch deleted +0 -33
deleted file mode 100644
index 672162759e..0000000000
@@ -1,33 +0,0 @@
-From e1bcac837f6aeabc4ddece06ecbcf2bcca8dd651 Mon Sep 17 00:00:00 2001
-From: Edgar Bonet <[email protected]>
-Date: Thu, 16 May 2024 11:15:10 +0200
-Subject: [PATCH] Configure: fixed building libatomic test.
-
-Using "long *" instead of "AO_t *" leads either to -Wincompatible-pointer-types
-or -Wpointer-sign warnings, depending on whether long and size_t are compatible
-types (e.g., ILP32 versus LP64 data models).  Notably, -Wpointer-sign warnings
-are enabled by default in Clang only, and -Wincompatible-pointer-types is an
-error starting from GCC 14.
-
-Signed-off-by: Edgar Bonet <[email protected]>
-Upstream: https://hg.nginx.org/nginx/rev/f58b6f636238
----
- auto/lib/libatomic/conf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/auto/lib/libatomic/conf b/auto/lib/libatomic/conf
-index d1e484a..0f12b9c 100644
---- a/auto/lib/libatomic/conf
-+++ b/auto/lib/libatomic/conf
-@@ -20,7 +20,7 @@ else
-                       #include <atomic_ops.h>"
-     ngx_feature_path=
-     ngx_feature_libs="-latomic_ops"
--    ngx_feature_test="long  n = 0;
-+    ngx_feature_test="AO_t  n = 0;
-                       if (!AO_compare_and_swap(&n, 0, 1))
-                           return 1;
-                       if (AO_fetch_and_add(&n, 1) != 1)
--- 
-2.34.1
-
package/nginx/nginx.hash +2 -2
index 24bc588d85..0b45f96a45 100644
@@ -1,4 +1,4 @@
 # Locally calculated after checking pgp signature
-sha256  77a2541637b92a621e3ee76776c8b7b40cf6d707e69ba53a940283e30ff2f55d  nginx-1.24.0.tar.gz
+sha256  f9187468ff2eb159260bfd53867c25ff8e334726237acf227b9e870e53d3e36b  nginx-1.26.1.tar.gz
 # License files, locally calculated
-sha256  ececed0b0e7243a4766cbc62b26df4bd3513b41de3a07425da1679c836d06320  LICENSE
+sha256  f19c4caea60247490199c5a6d0134281e3fb20b3d7577e6873c628597f5381d9  LICENSE
package/nginx/nginx.mk +1 -1
index 7bd2173b48..e63acc7b16 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-NGINX_VERSION = 1.24.0
+NGINX_VERSION = 1.26.1
 NGINX_SITE = https://nginx.org/download
 NGINX_LICENSE = BSD-2-Clause
 NGINX_LICENSE_FILES = LICENSE
Signature · 6 lines
2.39.2

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw
Quoted 30 lines · On Mon, 5 Aug 2024 16:16:01 +0200 Waldemar Brodkorb <[email protected]> wrote:

See here for a Changelog and CVE's:
http://nginx.org/en/CHANGES-1.26

Patch 0006 is no longer required as the openssl library is found without this patch, which does not apply anymore.

Patch 0009 is no longer required as it was fixed in another way upstream:
https://hg.nginx.org/nginx/rev/fb989e24c60a

Patch 0011 is upstream:
https://hg.nginx.org/nginx/rev/f58b6f636238

Reorder the remaining patches and update .checkpackageignore accordingly.

The LICENSE file is changed, the year changed from 2022 to 2024.

---
v1->v2:
- forgot to update LICENSE file hash and information about the changes (requested by Thomas P.)

---
 .checkpackageignore                           |   8 +-
 ...-auto-lib-libgd-conf-use-pkg-config.patch} |   0
 ...auto-lib-openssl-conf-use-pkg-config.patch | 251 ------------------
 ...inux_config.h-only-include-dlfcn.h-.patch} |   0
 ...of-endianness-for-cross-compilation.patch} |   0
 ...to-os-linux-fix-build-with-libxcrypt.patch |  38 ---
 ...ix-compile-error-in-configure-script.patch |  33 ---
 package/nginx/nginx.hash                      |   4 +-
Quoted 8 lines
 package/nginx/nginx.mk                        |   2 +-
 9 files changed, 6 insertions(+), 330 deletions(-)
 rename package/nginx/{0007-auto-lib-libgd-conf-use-pkg-config.patch => 0006-auto-lib-libgd-conf-use-pkg-config.patch} (100%)
 delete mode 100644 package/nginx/0006-auto-lib-openssl-conf-use-pkg-config.patch
 rename package/nginx/{0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch => 0007-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch} (100%)
 rename package/nginx/{0010-Allow-forcing-of-endianness-for-cross-compilation.patch => 0008-Allow-forcing-of-endianness-for-cross-compilation.patch} (100%)
 delete mode 100644 package/nginx/0009-auto-os-linux-fix-build-with-libxcrypt.patch
 delete mode 100644 package/nginx/0011-Fix-compile-error-in-configure-script.patch

Applied to master, thanks.

Thomas

Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#2 lore raw
In reply to Waldemar Brodkorb
Quoted 16 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Waldemar" == Waldemar Brodkorb <[email protected]> writes:

See here for a Changelog and CVE's:
http://nginx.org/en/CHANGES-1.26

Patch 0006 is no longer required as the openssl library is found without this patch, which does not apply anymore.

Patch 0009 is no longer required as it was fixed in another way upstream:
https://hg.nginx.org/nginx/rev/fb989e24c60a

Patch 0011 is upstream:
https://hg.nginx.org/nginx/rev/f58b6f636238

Reorder the remaining patches and update .checkpackageignore accordingly.

Quoted 7 lines

The LICENSE file is changed, the year changed from 2022 to 2024.

---
v1-> v2:
- forgot to update LICENSE file hash and information about the changes (requested by Thomas P.)

Committed to 2024.02.x and 2024.05.x, thanks.

Signature · 5 lines
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot