[packages/coreutils] up to 9.9
atler
atler at pld-linux.org
Tue Nov 11 01:11:40 CET 2025
commit cefc090e84ec7d8383ccdf5673bc7fced6f9be66
Author: Jan Palus <atler at pld-linux.org>
Date: Tue Nov 11 01:11:28 2025 +0100
up to 9.9
coreutils-fmt-wchars.patch | 14 +++++---
coreutils.spec | 8 ++---
link.patch | 10 ------
tail-large-nr.patch | 79 ----------------------------------------------
tests.patch | 2 +-
5 files changed, 12 insertions(+), 101 deletions(-)
---
diff --git a/coreutils.spec b/coreutils.spec
index 8ec8fb8..b5ca1ff 100644
--- a/coreutils.spec
+++ b/coreutils.spec
@@ -8,12 +8,12 @@
Summary: GNU Core-utils - basic command line utilities
Summary(pl.UTF-8): GNU Core-utils - podstawowe narzędzia działające z linii poleceń
Name: coreutils
-Version: 9.8
+Version: 9.9
Release: 1
License: GPL v3+
Group: Applications/System
Source0: https://ftp.gnu.org/gnu/coreutils/%{name}-%{version}.tar.xz
-# Source0-md5: b2e687b6e664b9dd76581836c5c3e782
+# Source0-md5: ce613d0dae179f4171966ecd0a898ec4
Source1: %{name}-non-english-man-pages.tar.bz2
# Source1-md5: f7c986ebc74ccb8d08ed70141063f14c
Source2: DIR_COLORS
@@ -32,8 +32,6 @@ Patch7: %{name}-sparc64.patch
# https://github.com/jarun/advcpmv
Patch9: %{name}-advcopy.patch
Patch10: tests.patch
-Patch11: link.patch
-Patch12: tail-large-nr.patch
URL: http://www.gnu.org/software/coreutils/
BuildRequires: acl-devel
BuildRequires: attr-devel
@@ -123,8 +121,6 @@ Programy zawarte w tym pakiecie to:
%patch -P9 -p1
%endif
%patch -P10 -p1
-%patch -P11 -p1
-%patch -P12 -p1
%{__mv} man/pt_BR man/pt
diff --git a/coreutils-fmt-wchars.patch b/coreutils-fmt-wchars.patch
index 9890bee..b2d6ad3 100644
--- a/coreutils-fmt-wchars.patch
+++ b/coreutils-fmt-wchars.patch
@@ -521,14 +521,18 @@
w->paren = isopen (*start);
w->punct = !! ispunct (fin);
-@@ -805,7 +845,9 @@
+@@ -805,10 +845,10 @@
if (word_limit == word)
{
-- fwrite (parabuf, sizeof *parabuf, wptr - parabuf, stdout);
+- size_t to_write = wptr - parabuf;
+- if (fwrite (parabuf, 1, to_write, stdout) != to_write)
+- write_error ();
+-
+ wchar_t *outptr;
+ for (outptr = parabuf; outptr < wptr; outptr++)
-+ putwchar (*outptr);
++ if (putwchar (*outptr) == WEOF)
++ write_error ();
wptr = parabuf;
return;
}
@@ -671,9 +675,9 @@
- putchar ('\n');
+ last_line_width = out_column;
+ putwchar (L'\n');
- }
- /* Output to stdout the word W. */
+ if (ferror (stdout))
+ write_error ();
@@ -1007,13 +1050,13 @@
static void
put_word (WORD *w)
diff --git a/link.patch b/link.patch
deleted file mode 100644
index a1f6d03..0000000
--- a/link.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- coreutils-9.8/src/local.mk.orig 2025-09-24 01:50:01.142487707 +0200
-+++ coreutils-9.8/src/local.mk 2025-09-24 02:09:51.672636099 +0200
-@@ -238,6 +238,7 @@
-
- # for selinux use
- copy_ldadd += $(LIB_SELINUX)
-+copy_ldadd += $(LIB_SMACK)
- src_chcon_LDADD += $(LIB_SELINUX)
- src_ginstall_LDADD += $(LIB_SELINUX)
- src_id_LDADD += $(LIB_SELINUX)
diff --git a/tail-large-nr.patch b/tail-large-nr.patch
deleted file mode 100644
index daf1ffa..0000000
--- a/tail-large-nr.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 914972e80dbf82aac9ffe3ff1f67f1028e1a788b Mon Sep 17 00:00:00 2001
-From: Hannes Braun <hannes at hannesbraun.net>
-Date: Wed, 24 Sep 2025 21:20:49 +0200
-Subject: [PATCH] tail: fix tailing larger number of lines in regular files
-
-* src/tail.c (file_lines): Seek to the previous block instead of the
-beginning (or a little before) of the block that was just scanned.
-Otherwise, the same block is read and scanned (at least partially)
-again. This bug was introduced by commit v9.7-219-g976f8abc1.
-* tests/tail/basic-seek.sh: Add a new test.
-* tests/local.mk: Reference the new test.
-* NEWS: mention the bug fix.
----
- NEWS | 4 ++++
- src/tail.c | 2 +-
- tests/local.mk | 1 +
- tests/tail/basic-seek.sh | 28 ++++++++++++++++++++++++++++
- 4 files changed, 34 insertions(+), 1 deletion(-)
- create mode 100755 tests/tail/basic-seek.sh
-
-diff --git a/src/tail.c b/src/tail.c
-index b8bef1d91c..c7779c77df 100644
---- a/src/tail.c
-+++ b/src/tail.c
-@@ -596,7 +596,7 @@ file_lines (char const *prettyname, int fd, struct stat const *sb,
- goto free_buffer;
- }
-
-- pos = xlseek (fd, -bufsize, SEEK_CUR, prettyname);
-+ pos = xlseek (fd, -(bufsize + bytes_read), SEEK_CUR, prettyname);
- bytes_read = read (fd, buffer, bufsize);
- if (bytes_read < 0)
- {
-diff --git a/tests/local.mk b/tests/local.mk
-index ff5727f745..9663ee2da1 100644
---- a/tests/local.mk
-+++ b/tests/local.mk
-@@ -179,6 +179,7 @@ all_tests = \
- tests/cp/no-ctx.sh \
- tests/misc/read-errors.sh \
- tests/misc/write-errors.sh \
-+ tests/tail/basic-seek.sh \
- tests/tail/inotify-hash-abuse.sh \
- tests/tail/inotify-hash-abuse2.sh \
- tests/tail/F-vs-missing.sh \
-diff --git a/tests/tail/basic-seek.sh b/tests/tail/basic-seek.sh
-new file mode 100755
-index 0000000000..307ed667ea
---- /dev/null
-+++ b/tests/tail/basic-seek.sh
-@@ -0,0 +1,28 @@
-+#!/bin/sh
-+# Verify that tail works when seeking within a file
-+
-+# Copyright (C) 2025 Free Software Foundation, Inc.
-+
-+# This program is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation, either version 3 of the License, or
-+# (at your option) any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program. If not, see <https://www.gnu.org/licenses/>.
-+
-+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
-+print_ver_ tail
-+
-+yes '=================================' |
-+ head -n1K > file.in || framework_failure_
-+
-+# This returned 139 in coreutils v9.8
-+test $(tail -n200 file.in | wc -l) = 200 || fail=1
-+
-+Exit $fail
diff --git a/tests.patch b/tests.patch
index c87e846..c653f26 100644
--- a/tests.patch
+++ b/tests.patch
@@ -115,7 +115,7 @@ diff -ruN coreutils-8.27.orig/tests/local.mk coreutils-8.27/tests/local.mk
- tests/tty/tty-eof.pl \
tests/misc/read-errors.sh \
tests/misc/write-errors.sh \
- tests/tail/inotify-hash-abuse.sh \
+ tests/tail/basic-seek.sh \
@@ -364,7 +363,6 @@
tests/sort/sort-unique-segv.sh \
tests/sort/sort-version.sh \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/coreutils.git/commitdiff/cefc090e84ec7d8383ccdf5673bc7fced6f9be66
More information about the pld-cvs-commit
mailing list