mirror of
https://git.yoctoproject.org/poky
synced 2026-02-06 00:38:45 +01:00
4415c5e23e
CVEs addressed in this release: CVE-2024-12084 CVE-2024-12085 CVE-2024-12086 CVE-2024-12087 CVE-2024-12088 CVE-2024-12747 Refreshed below patches: makefile-no-rebuild.patch determism.patch 0001-Add-missing-prototypes-to-function-declarations.patch Changelog: https://github.com/RsyncProject/rsync/blob/v3.4.1/NEWS.md https://github.com/RsyncProject/rsync/blob/v3.4.0/NEWS.md (From OE-Core rev: 25e139d8b2a52c85cf1353c8da246aedaedb40d1) Signed-off-by: Archana Polampalli <archana.polampalli@windriver.com> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
43 lines
1.4 KiB
Diff
43 lines
1.4 KiB
Diff
From 41b859a9df9611b7b3f6cbe28af47118d947080f Mon Sep 17 00:00:00 2001
|
|
From: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
Date: Sun, 21 Feb 2021 09:45:48 +0000
|
|
Subject: [PATCH] rsync: Fix a file sorting determinism issue
|
|
|
|
The Makefile calls awk on a "*.c" glob. The results of this glob are sorted
|
|
but the order depends on the locale settings, particularly whether
|
|
"util.c" and "util2.c" sort before or after each other. In en_US.UTF-8
|
|
they sort one way, in C, they sort the other. The sorting order changes
|
|
the output binaries. The behaviour also changes dependning on whether
|
|
SHELL (/bin/sh) is dash or bash.
|
|
|
|
Specify a C locale setting to be deterministic.
|
|
|
|
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
Submitted: https://github.com/WayneD/rsync/pull/155
|
|
|
|
Upstream-Status: Backport [ish, see below]
|
|
|
|
After discussion upstream renamed util.c to util1.c which avoids the problem
|
|
in a different way. This patch can be dropped when we upgrade to include:
|
|
https://github.com/WayneD/rsync/commit/d3085f7add38a5cf833a0b31cb0637ff46c80f8d
|
|
---
|
|
Makefile.in | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
diff --git a/Makefile.in b/Makefile.in
|
|
index 1d13e8c..2c5cf99 100644
|
|
--- a/Makefile.in
|
|
+++ b/Makefile.in
|
|
@@ -27,6 +27,11 @@ MKDIR_P=@MKDIR_P@
|
|
VPATH=$(srcdir)
|
|
SHELL=/bin/sh
|
|
|
|
+# We use globbing in commands, need to be deterministic
|
|
+unexport LC_ALL
|
|
+LC_COLLATE=C
|
|
+export LC_COLLATE
|
|
+
|
|
.SUFFIXES:
|
|
.SUFFIXES: .c .o
|
|
|