mirror of
https://github.com/openwrt/packages.git
synced 2026-05-31 06:51:51 +08:00
coreutils: update to 9.11
Release notes: https://lists.gnu.org/archive/html/coreutils-announce/2026-02/msg00000.html https://lists.gnu.org/archive/html/coreutils-announce/2026-04/msg00000.html - Add --enable-install-program=kill,uptime since 9.10 these programs are no longer built by default. - Drop upstream backported patch and refresh remaining patches. Signed-off-by: Wei-Ting Yang <williamatcg@gmail.com>
This commit is contained in:
committed by
Hannu Nyman
parent
3af9ba9afa
commit
819342e694
@@ -8,12 +8,12 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=coreutils
|
PKG_NAME:=coreutils
|
||||||
PKG_VERSION:=9.9
|
PKG_VERSION:=9.11
|
||||||
PKG_RELEASE:=2
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
||||||
PKG_SOURCE_URL:=@GNU/coreutils
|
PKG_SOURCE_URL:=@GNU/coreutils
|
||||||
PKG_HASH:=19bcb6ca867183c57d77155eae946c5eced88183143b45ca51ad7d26c628ca75
|
PKG_HASH:=394024eda0a5955217ceda9cd1201e65dc8fa3aa29c2951135a49521d57c3cc3
|
||||||
|
|
||||||
PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
|
PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
|
||||||
PKG_LICENSE:=GPL-3.0-or-later
|
PKG_LICENSE:=GPL-3.0-or-later
|
||||||
@@ -124,6 +124,7 @@ CONFIGURE_ARGS += \
|
|||||||
--disable-assert \
|
--disable-assert \
|
||||||
--disable-rpath \
|
--disable-rpath \
|
||||||
--disable-libsmack \
|
--disable-libsmack \
|
||||||
|
--enable-install-program=kill,uptime \
|
||||||
--enable-libcap \
|
--enable-libcap \
|
||||||
--without-linux-crypto \
|
--without-linux-crypto \
|
||||||
--without-openssl \
|
--without-openssl \
|
||||||
|
|||||||
@@ -1,26 +0,0 @@
|
|||||||
From bd528f923482223649aa84be7d131e69356149da Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
|
|
||||||
Date: Sun, 4 Jan 2026 12:45:46 +0000
|
|
||||||
Subject: [PATCH] copy: fix possible infinite loop with SEEK_HOLE
|
|
||||||
|
|
||||||
Commit v9.8-95-g4c0cf3864 intended to initialize
|
|
||||||
ext_start to src_pos, as was described at:
|
|
||||||
https://lists.gnu.org/r/coreutils/2025-11/msg00035.html
|
|
||||||
However ipos was inadvertently used, which is only
|
|
||||||
valid the first time through the loop.
|
|
||||||
|
|
||||||
* src/copy-file-data.c (lseek_copy): Use scan_inference->hole_start
|
|
||||||
only with the initial offset passed to lseek_copy().
|
|
||||||
Reported at https://github.com/coreutils/coreutils/issues/159
|
|
||||||
|
|
||||||
--- a/src/copy-file-data.c
|
|
||||||
+++ b/src/copy-file-data.c
|
|
||||||
@@ -338,7 +338,7 @@ lseek_copy (int src_fd, int dest_fd, cha
|
|
||||||
for (off_t ext_start = scan_inference->ext_start;
|
|
||||||
0 <= ext_start && ext_start < max_ipos; )
|
|
||||||
{
|
|
||||||
- off_t ext_end = (ext_start == ipos
|
|
||||||
+ off_t ext_end = (ext_start == src_pos
|
|
||||||
? scan_inference->hole_start
|
|
||||||
: lseek (src_fd, ext_start, SEEK_HOLE));
|
|
||||||
if (0 <= ext_end)
|
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
.mailmap \
|
.mailmap \
|
||||||
@@ -209,6 +209,3 @@ AM_CPPFLAGS = -Ilib -I$(top_srcdir)/lib
|
@@ -212,6 +212,3 @@ AM_CPPFLAGS = -Ilib -I$(top_srcdir)/lib
|
||||||
include $(top_srcdir)/gl/local.mk
|
include $(top_srcdir)/gl/local.mk
|
||||||
include $(top_srcdir)/lib/local.mk
|
include $(top_srcdir)/lib/local.mk
|
||||||
include $(top_srcdir)/src/local.mk
|
include $(top_srcdir)/src/local.mk
|
||||||
@@ -18,7 +18,7 @@
|
|||||||
-include $(top_srcdir)/tests/local.mk
|
-include $(top_srcdir)/tests/local.mk
|
||||||
--- a/Makefile.in
|
--- a/Makefile.in
|
||||||
+++ b/Makefile.in
|
+++ b/Makefile.in
|
||||||
@@ -4701,11 +4701,7 @@ RECURSIVE_TARGETS = all-recursive check-
|
@@ -4720,11 +4720,7 @@ RECURSIVE_TARGETS = all-recursive check-
|
||||||
install-ps-recursive install-recursive installcheck-recursive \
|
install-ps-recursive install-recursive installcheck-recursive \
|
||||||
installdirs-recursive pdf-recursive ps-recursive \
|
installdirs-recursive pdf-recursive ps-recursive \
|
||||||
tags-recursive uninstall-recursive
|
tags-recursive uninstall-recursive
|
||||||
@@ -31,7 +31,7 @@
|
|||||||
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
|
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
|
||||||
am__vpath_adj = case $$p in \
|
am__vpath_adj = case $$p in \
|
||||||
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
|
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
|
||||||
@@ -4960,11 +4956,10 @@ am__DIST_COMMON = $(doc_coreutils_TEXINF
|
@@ -4976,11 +4972,10 @@ am__DIST_COMMON = $(doc_coreutils_TEXINF
|
||||||
$(top_srcdir)/build-aux/missing \
|
$(top_srcdir)/build-aux/missing \
|
||||||
$(top_srcdir)/build-aux/test-driver \
|
$(top_srcdir)/build-aux/test-driver \
|
||||||
$(top_srcdir)/build-aux/texinfo.tex \
|
$(top_srcdir)/build-aux/texinfo.tex \
|
||||||
@@ -46,7 +46,7 @@
|
|||||||
$(top_srcdir)/tests/local.mk ABOUT-NLS AUTHORS COPYING \
|
$(top_srcdir)/tests/local.mk ABOUT-NLS AUTHORS COPYING \
|
||||||
ChangeLog INSTALL NEWS README THANKS TODO build-aux/compile \
|
ChangeLog INSTALL NEWS README THANKS TODO build-aux/compile \
|
||||||
build-aux/config.guess build-aux/config.rpath \
|
build-aux/config.guess build-aux/config.rpath \
|
||||||
@@ -5085,7 +5080,7 @@ ERRNO_H = @ERRNO_H@
|
@@ -5101,7 +5096,7 @@ ERRNO_H = @ERRNO_H@
|
||||||
ETAGS = @ETAGS@
|
ETAGS = @ETAGS@
|
||||||
EUIDACCESS_LIBGEN = @EUIDACCESS_LIBGEN@
|
EUIDACCESS_LIBGEN = @EUIDACCESS_LIBGEN@
|
||||||
EXEEXT = @EXEEXT@
|
EXEEXT = @EXEEXT@
|
||||||
@@ -55,7 +55,7 @@
|
|||||||
FDATASYNC_LIB = @FDATASYNC_LIB@
|
FDATASYNC_LIB = @FDATASYNC_LIB@
|
||||||
FILE_HAS_ACL_LIB = @FILE_HAS_ACL_LIB@
|
FILE_HAS_ACL_LIB = @FILE_HAS_ACL_LIB@
|
||||||
FLOAT_H = @FLOAT_H@
|
FLOAT_H = @FLOAT_H@
|
||||||
@@ -7185,7 +7180,7 @@ localedir_c_make = @localedir_c_make@
|
@@ -7220,7 +7215,7 @@ localedir_c_make = @localedir_c_make@
|
||||||
localstatedir = @localstatedir@
|
localstatedir = @localstatedir@
|
||||||
localstatedir_c = @localstatedir_c@
|
localstatedir_c = @localstatedir_c@
|
||||||
localstatedir_c_make = @localstatedir_c_make@
|
localstatedir_c_make = @localstatedir_c_make@
|
||||||
@@ -64,7 +64,7 @@
|
|||||||
mandir = @mandir@
|
mandir = @mandir@
|
||||||
mandir_c = @mandir_c@
|
mandir_c = @mandir_c@
|
||||||
mandir_c_make = @mandir_c_make@
|
mandir_c_make = @mandir_c_make@
|
||||||
@@ -7234,7 +7229,7 @@ top_build_prefix = @top_build_prefix@
|
@@ -7269,7 +7264,7 @@ top_build_prefix = @top_build_prefix@
|
||||||
top_builddir = @top_builddir@
|
top_builddir = @top_builddir@
|
||||||
top_srcdir = @top_srcdir@
|
top_srcdir = @top_srcdir@
|
||||||
ALL_RECURSIVE_TARGETS = distcheck-hook check-root
|
ALL_RECURSIVE_TARGETS = distcheck-hook check-root
|
||||||
@@ -73,8 +73,8 @@
|
|||||||
EXTRA_DIST = .mailmap .prev-version .version .vg-suppressions \
|
EXTRA_DIST = .mailmap .prev-version .version .vg-suppressions \
|
||||||
README-install THANKS.in THANKS-to-translators THANKStt.in \
|
README-install THANKS.in THANKS-to-translators THANKStt.in \
|
||||||
bootstrap bootstrap.conf build-aux/gen-lists-of-programs.sh \
|
bootstrap bootstrap.conf build-aux/gen-lists-of-programs.sh \
|
||||||
@@ -9633,7 +9628,7 @@ all: $(BUILT_SOURCES)
|
@@ -9736,7 +9731,7 @@ all: $(BUILT_SOURCES)
|
||||||
.SUFFIXES: .1 .c .dvi .log .o .obj .pl .pl$(EXEEXT) .ps .sh .sh$(EXEEXT) .trs .x .xpl .xpl$(EXEEXT) .y
|
.SUFFIXES: .1 .c .dvi .log .o .obj .pl .pl$(EXEEXT) .ps .sh .sh$(EXEEXT) .trs .x .y
|
||||||
am--refresh: Makefile
|
am--refresh: Makefile
|
||||||
@:
|
@:
|
||||||
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/gl/local.mk $(top_srcdir)/lib/local.mk $(srcdir)/lib/gnulib.mk $(top_srcdir)/src/local.mk $(srcdir)/src/cu-progs.mk $(top_srcdir)/src/single-binary.mk $(top_srcdir)/doc/local.mk $(top_srcdir)/man/local.mk $(top_srcdir)/tests/local.mk $(am__configure_deps)
|
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/gl/local.mk $(top_srcdir)/lib/local.mk $(srcdir)/lib/gnulib.mk $(top_srcdir)/src/local.mk $(srcdir)/src/cu-progs.mk $(top_srcdir)/src/single-binary.mk $(top_srcdir)/doc/local.mk $(top_srcdir)/man/local.mk $(top_srcdir)/tests/local.mk $(am__configure_deps)
|
||||||
@@ -82,7 +82,7 @@
|
|||||||
@for dep in $?; do \
|
@for dep in $?; do \
|
||||||
case '$(am__configure_deps)' in \
|
case '$(am__configure_deps)' in \
|
||||||
*$$dep*) \
|
*$$dep*) \
|
||||||
@@ -9655,7 +9650,7 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
|
@@ -9758,7 +9753,7 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
|
||||||
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
|
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
|
||||||
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
|
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
|
||||||
esac;
|
esac;
|
||||||
|
|||||||
Reference in New Issue
Block a user