* update coreutils to 9.6-2

This commit is contained in:
Alexander Baldeck 2025-02-03 21:21:50 +01:00
parent df36a81cee
commit 1463b3b069
3 changed files with 17 additions and 76 deletions

View File

@ -1,13 +1,19 @@
pkgbase = coreutils
pkgdesc = The basic file, shell and text manipulation utilities of the GNU operating system
pkgver = 9.5
pkgver = 9.6
pkgrel = 2
url = https://www.gnu.org/software/coreutils/
arch = x86_64
arch = powerpc64le
arch = powerpc64
arch = powerpc
arch = espresso
arch = riscv64
license = GPL-3.0-or-later
license = GFDL-1.3-or-later
makedepends = git
makedepends = gperf
makedepends = python
makedepends = wget
depends = acl
depends = attr
@ -15,10 +21,10 @@ pkgbase = coreutils
depends = gmp
depends = libcap
depends = openssl
source = git+https://git.savannah.gnu.org/git/coreutils.git?signed#tag=v9.5
source = gcc14-gnulib-lto.patch
source = git+https://git.savannah.gnu.org/git/coreutils.git?signed#tag=v9.6
source = 915004f403cb25fadb207ddfdbe6a2f43bd44fac.patch::https://git.savannah.gnu.org/gitweb/?p=coreutils.git;a=patch;h=915004f403cb25fadb207ddfdbe6a2f43bd44fac
validpgpkeys = 6C37DC12121A5006BC1DB804DF6FD971306037D9
b2sums = 7b48eaa372037f1162335dacbc6460a1455e7b6c73badefd631b1a47cfab6072db938a25ce9bdba68c2b3ac13e9c64df06fef6f135d2979199cb09f41f83454a
b2sums = 1264b815101ebf98ce846ac96a649cc7964624ae0c140f23d41f2d2e8292f67b0c0cad3d66f6329a2d21c530b1cfbff65ef378abd8e49f3a1ac972a1cf88366d
b2sums = 8d8ee559af5401564314c87e6b2affb670d6de59546b23dab3fa5235d6d3c71f841f91dcb6daf9bf38db25ebc3c21db4f9a536568744fabe3d02bcf9430c90ca
b2sums = 27302e9b2ba68f0e8b06c24e985f03c6a40418a0b09ee053583683d1305a9b172556e06773dbf23e279773514fdafe311f8da91aba444135a3ed2a99b0aa0edc
pkgname = coreutils

View File

@ -6,8 +6,8 @@
# Contributor: judd <jvinet@zeroflux.org>
pkgname=coreutils
pkgver=9.5
pkgrel=2.1
pkgver=9.6
pkgrel=2
pkgdesc='The basic file, shell and text manipulation utilities of the GNU operating system'
arch=(x86_64 powerpc64le powerpc64 powerpc espresso riscv64)
license=(
@ -26,18 +26,18 @@ depends=(
makedepends=(
git
gperf
# python enable for upcoming 9.6
python
wget
)
source=(
git+https://git.savannah.gnu.org/git/coreutils.git?signed#tag=v${pkgver}
gcc14-gnulib-lto.patch
915004f403cb25fadb207ddfdbe6a2f43bd44fac.patch::https://git.savannah.gnu.org/gitweb/"?p=coreutils.git;a=patch;h=915004f403cb25fadb207ddfdbe6a2f43bd44fac"
)
validpgpkeys=(
6C37DC12121A5006BC1DB804DF6FD971306037D9 # Pádraig Brady
)
b2sums=('7b48eaa372037f1162335dacbc6460a1455e7b6c73badefd631b1a47cfab6072db938a25ce9bdba68c2b3ac13e9c64df06fef6f135d2979199cb09f41f83454a'
'1264b815101ebf98ce846ac96a649cc7964624ae0c140f23d41f2d2e8292f67b0c0cad3d66f6329a2d21c530b1cfbff65ef378abd8e49f3a1ac972a1cf88366d')
b2sums=('8d8ee559af5401564314c87e6b2affb670d6de59546b23dab3fa5235d6d3c71f841f91dcb6daf9bf38db25ebc3c21db4f9a536568744fabe3d02bcf9430c90ca'
'd365086f33ffd770c8f457348561ed4120919c84f1bd4126495cd339f85a1fbf99845e1b17032a4ea579a93986f45ad71add1cd997e6a43235852087eac1279d')
prepare() {
cd "${pkgname}"

View File

@ -1,65 +0,0 @@
From 4602765093f04e597f87d78cf29d21eea03b6fa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
Date: Wed, 28 Aug 2024 12:10:43 +0100
Subject: avoid GCC -Wmaybe-uninitialized false positives with LTO
Avoids false warnings with GCC 14.2.1 with -flto
* lib/canonicalize.c: Initialize END_IDX.
* lib/getndelim2.c: Initialize C.
---
ChangeLog | 8 ++++++++
lib/canonicalize.c | 9 ++++++++-
lib/getndelim2.c | 8 +++++---
3 files changed, 21 insertions(+), 4 deletions(-)
--- a/gnulib/lib/canonicalize.c
+++ b/gnulib/lib/canonicalize.c
@@ -34,6 +34,13 @@
#include "hash-triple.h"
#include "xalloc.h"
+/* Suppress bogus GCC -Wmaybe-uninitialized warnings. */
+#if defined GCC_LINT || defined lint
+# define IF_LINT(Code) Code
+#else
+# define IF_LINT(Code) /* empty */
+#endif
+
#ifndef DOUBLE_SLASH_IS_DISTINCT_ROOT
# define DOUBLE_SLASH_IS_DISTINCT_ROOT false
#endif
@@ -367,7 +374,7 @@ canonicalize_filename_mode_stk (const char *name, canonicalize_mode_t can_mode,
buf[n] = '\0';
char *extra_buf = bufs->extra.data;
- idx_t end_idx;
+ idx_t end_idx IF_LINT (= 0);
if (end_in_extra_buffer)
end_idx = end - extra_buf;
size_t len = strlen (end);
diff --git a/lib/getndelim2.c b/lib/getndelim2.c
index 89989ae..db61e2a 100644
--- a/gnulib/lib/getndelim2.c
+++ b/gnulib/lib/getndelim2.c
@@ -47,8 +47,10 @@
#include "memchr2.h"
/* Avoid false GCC warning "'c' may be used uninitialized". */
-#if __GNUC__ + (__GNUC_MINOR__ >= 7) > 4
-# pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#if defined GCC_LINT || defined lint
+# define IF_LINT(Code) Code
+#else
+# define IF_LINT(Code) /* empty */
#endif
/* The maximum value that getndelim2 can return without suffering from
@@ -102,7 +104,7 @@ getndelim2 {
/* Here always ptr + size == read_pos + nbytes_avail.
Also nbytes_avail > 0 || size < nmax. */
- int c;
+ int c IF_LINT (= EOF);
const char *buffer;
size_t buffer_len;