mirror of
https://git.yoctoproject.org/poky
synced 2026-09-19 09:49:33 +02:00
coreutils: upgrade 9.4 -> 9.5
0001-posixtm-pacify-clang-18.patch CVE-2024-0684.patch removed since they're included in 9.5 0001-local.mk-fix-cross-compiling-problem.patch remove-usr-local-lib-from-m4.patch refreshed for 9.5 License-Update: Copyright updatedto 2024. (From OE-Core rev: ac2b8134bed1abdb485aa2826d07b430dc6b5f00) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
ef993615b7
commit
2d462158d5
@@ -1,4 +1,7 @@
|
|||||||
Subject: local.mk: fix cross compiling problem
|
From 7cb2d20cfa2a27191255031d231cd41917dcffe8 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Chen Qi <Qi.Chen@windriver.com>
|
||||||
|
Date: Mon, 26 Dec 2016 16:10:35 +0800
|
||||||
|
Subject: [PATCH] local.mk: fix cross compiling problem
|
||||||
|
|
||||||
We meet the following error when cross compiling.
|
We meet the following error when cross compiling.
|
||||||
| Makefile:3418: *** Recursive variable 'INSTALL' references itself (eventually). Stop.
|
| Makefile:3418: *** Recursive variable 'INSTALL' references itself (eventually). Stop.
|
||||||
@@ -12,15 +15,12 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
|
|||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/src/local.mk b/src/local.mk
|
diff --git a/src/local.mk b/src/local.mk
|
||||||
index 36dfa4e..c5898cc 100644
|
index 96ee941..cdd47d6 100644
|
||||||
--- a/src/local.mk
|
--- a/src/local.mk
|
||||||
+++ b/src/local.mk
|
+++ b/src/local.mk
|
||||||
@@ -649,4 +649,4 @@ cu_install_program = @INSTALL_PROGRAM@
|
@@ -704,4 +704,4 @@ cu_install_program = @INSTALL@
|
||||||
else
|
else
|
||||||
cu_install_program = src/ginstall
|
cu_install_program = src/ginstall
|
||||||
endif
|
endif
|
||||||
-INSTALL = $(cu_install_program) -c
|
-INSTALL = $(cu_install_program) -c
|
||||||
+INSTALL_PROGRAM = $(cu_install_program)
|
+INSTALL_PROGRAM = $(cu_install_program)
|
||||||
--
|
|
||||||
2.1.0
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,38 +0,0 @@
|
|||||||
From 67c298c36f69b6906840b7584be06b7b5f33f829 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
|
||||||
Date: Tue, 16 Jan 2024 17:21:08 -0800
|
|
||||||
Subject: [PATCH] posixtm: pacify clang 18
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
Problem reported by Khem Raj in:
|
|
||||||
https://lists.gnu.org/r/bug-gnulib/2024-01/msg00045.html
|
|
||||||
* lib/posixtm.c (posixtime): Pacify clang 18 by converting bool to int.
|
|
||||||
Arguably this is a bug in draft C2x, since the non-pointer args to
|
|
||||||
ckd_add should promote just like any other expressions do;
|
|
||||||
but that’s not clang’s fault.
|
|
||||||
|
|
||||||
Upstream-Status: Submitted [https://lists.gnu.org/archive/html/bug-gnulib/2024-01/msg00046.html]
|
|
||||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
||||||
---
|
|
||||||
ChangeLog | 10 ++++++++++
|
|
||||||
lib/posixtm.c | 2 +-
|
|
||||||
2 files changed, 11 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/lib/posixtm.c b/lib/posixtm.c
|
|
||||||
index ef9f55f873..a072c7cad0 100644
|
|
||||||
--- a/lib/posixtm.c
|
|
||||||
+++ b/lib/posixtm.c
|
|
||||||
@@ -191,7 +191,7 @@ posixtime (time_t *p, const char *s, unsigned int syntax_bits)
|
|
||||||
| (tm0.tm_min ^ tm1.tm_min)
|
|
||||||
| (tm0.tm_sec ^ tm1.tm_sec)))
|
|
||||||
{
|
|
||||||
- if (ckd_add (&t, t, leapsec))
|
|
||||||
+ if (ckd_add (&t, t, +leapsec))
|
|
||||||
return false;
|
|
||||||
*p = t;
|
|
||||||
return true;
|
|
||||||
--
|
|
||||||
2.43.0
|
|
||||||
|
|
||||||
@@ -1,39 +0,0 @@
|
|||||||
From c4c5ed8f4e9cd55a12966d4f520e3a13101637d9 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
|
||||||
Date: Tue, 16 Jan 2024 13:48:32 -0800
|
|
||||||
Subject: [PATCH 1/1] split: do not shrink hold buffer
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=utf8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
* src/split.c (line_bytes_split): Do not shrink hold buffer.
|
|
||||||
If it’s large for this batch it’s likely to be large for the next
|
|
||||||
batch, and for ‘split’ it’s not worth the complexity/CPU hassle to
|
|
||||||
shrink it. Do not assume hold_size can be bufsize.
|
|
||||||
|
|
||||||
CVE: CVE-2024-0684
|
|
||||||
Upstream-Status: Backport [https://github.com/coreutils/coreutils/commit/c4c5ed8f4e9cd55a12966d4f520e3a13101637d9]
|
|
||||||
Signed-off-by: Simone Weiß <simone.p.weiss@posteo.com>
|
|
||||||
---
|
|
||||||
src/split.c | 3 ---
|
|
||||||
1 file changed, 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/split.c b/src/split.c
|
|
||||||
index 64020c859..037960a59 100644
|
|
||||||
--- a/src/split.c
|
|
||||||
+++ b/src/split.c
|
|
||||||
@@ -809,10 +809,7 @@ line_bytes_split (intmax_t n_bytes, char *buf, idx_t bufsize)
|
|
||||||
{
|
|
||||||
cwrite (n_out == 0, hold, n_hold);
|
|
||||||
n_out += n_hold;
|
|
||||||
- if (n_hold > bufsize)
|
|
||||||
- hold = xirealloc (hold, bufsize);
|
|
||||||
n_hold = 0;
|
|
||||||
- hold_size = bufsize;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Output to eol if present. */
|
|
||||||
--
|
|
||||||
2.11.4.GIT
|
|
||||||
|
|
||||||
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
From a26530083a29eeee910bfd606ecc621acecd547a Mon Sep 17 00:00:00 2001
|
From f53ffb5b27ab7d4a4c62df00ebd6a1a6936d1709 Mon Sep 17 00:00:00 2001
|
||||||
From: Khem Raj <raj.khem@gmail.com>
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
Date: Wed, 3 Aug 2011 14:12:30 -0700
|
Date: Wed, 3 Aug 2011 14:12:30 -0700
|
||||||
Subject: [PATCH] coreutils: Fix build on uclibc
|
Subject: [PATCH] coreutils: Fix build on uclibc
|
||||||
@@ -12,16 +12,15 @@ and make life easier for cross compilation process.
|
|||||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
|
||||||
Upstream-Status: Inappropriate [Upstream does care for AIX while we may not]
|
Upstream-Status: Inappropriate [Upstream does care for AIX while we may not]
|
||||||
|
|
||||||
---
|
---
|
||||||
m4/getloadavg.m4 | 12 ------------
|
m4/getloadavg.m4 | 12 ------------
|
||||||
1 file changed, 12 deletions(-)
|
1 file changed, 12 deletions(-)
|
||||||
|
|
||||||
diff --git a/m4/getloadavg.m4 b/m4/getloadavg.m4
|
diff --git a/m4/getloadavg.m4 b/m4/getloadavg.m4
|
||||||
index 8e96965..63782a2 100644
|
index 9d0236f..68f7c52 100644
|
||||||
--- a/m4/getloadavg.m4
|
--- a/m4/getloadavg.m4
|
||||||
+++ b/m4/getloadavg.m4
|
+++ b/m4/getloadavg.m4
|
||||||
@@ -41,18 +41,6 @@ AC_CHECK_FUNC([getloadavg], [],
|
@@ -46,18 +46,6 @@ if test $ac_cv_func_getloadavg != yes; then
|
||||||
[LIBS="-lutil $LIBS" gl_func_getloadavg_done=yes])
|
[LIBS="-lutil $LIBS" gl_func_getloadavg_done=yes])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ HOMEPAGE = "http://www.gnu.org/software/coreutils/"
|
|||||||
BUGTRACKER = "http://debbugs.gnu.org/coreutils"
|
BUGTRACKER = "http://debbugs.gnu.org/coreutils"
|
||||||
LICENSE = "GPL-3.0-or-later"
|
LICENSE = "GPL-3.0-or-later"
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \
|
LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \
|
||||||
file://src/ls.c;beginline=1;endline=15;md5=b720a8b317035d66c555fc6d89e3674c \
|
file://src/ls.c;beginline=1;endline=15;md5=9ac94aaed7fd46fd8df7147a9e3410cb \
|
||||||
"
|
"
|
||||||
DEPENDS = "gmp libcap"
|
DEPENDS = "gmp libcap"
|
||||||
DEPENDS:class-native = ""
|
DEPENDS:class-native = ""
|
||||||
@@ -16,11 +16,9 @@ inherit autotools gettext texinfo
|
|||||||
SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \
|
SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \
|
||||||
file://remove-usr-local-lib-from-m4.patch \
|
file://remove-usr-local-lib-from-m4.patch \
|
||||||
file://0001-local.mk-fix-cross-compiling-problem.patch \
|
file://0001-local.mk-fix-cross-compiling-problem.patch \
|
||||||
file://0001-posixtm-pacify-clang-18.patch \
|
|
||||||
file://CVE-2024-0684.patch \
|
|
||||||
file://run-ptest \
|
file://run-ptest \
|
||||||
"
|
"
|
||||||
SRC_URI[sha256sum] = "ea613a4cf44612326e917201bbbcdfbd301de21ffc3b59b6e5c07e040b275e52"
|
SRC_URI[sha256sum] = "cd328edeac92f6a665de9f323c93b712af1858bc2e0d88f3f7100469470a1b8a"
|
||||||
|
|
||||||
# http://git.savannah.gnu.org/cgit/coreutils.git/commit/?id=v8.27-101-gf5d7c0842
|
# http://git.savannah.gnu.org/cgit/coreutils.git/commit/?id=v8.27-101-gf5d7c0842
|
||||||
#
|
#
|
||||||
Reference in New Issue
Block a user