这是indexloc提供的服务，不要输入任何密码
Skip to content

bump(main/coreutils): 9.9 #27259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 16, 2025
+47 −74
Merged

bump(main/coreutils): 9.9 #27259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 0 additions & 48 deletions packages/coreutils/backport-914972e-tail-regression.patch
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions packages/coreutils/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/coreutils/
TERMUX_PKG_DESCRIPTION="Basic file, shell and text manipulation utilities from the GNU project"
TERMUX_PKG_LICENSE="GPL-3.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=9.8
TERMUX_PKG_REVISION=1
TERMUX_PKG_VERSION=9.9
TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/coreutils/coreutils-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=e6d4fd2d852c9141a1c2a18a13d146a0cd7e45195f72293a4e4c044ec6ccca15
TERMUX_PKG_SHA256=19bcb6ca867183c57d77155eae946c5eced88183143b45ca51ad7d26c628ca75
TERMUX_PKG_DEPENDS="libandroid-selinux, libandroid-support, libgmp, libiconv, openssl (>= 1:3.5.0-1)"
TERMUX_PKG_BREAKS="chroot, busybox (<< 1.30.1-4)"
TERMUX_PKG_REPLACES="chroot, busybox (<< 1.30.1-4)"
Expand Down
68 changes: 45 additions & 23 deletions packages/coreutils/fix-paths.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
diff -uNr coreutils-9.2/lib/tmpdir.c coreutils-9.2.mod/lib/tmpdir.c
--- coreutils-9.2/lib/tmpdir.c 2023-03-13 18:12:12.000000000 +0000
+++ coreutils-9.2.mod/lib/tmpdir.c 2023-03-23 06:56:30.519517214 +0000
diff --git coreutils-9.9/lib/tmpdir.c coreutils-9.9/lib/tmpdir.c
index db1f1e4..36a8541 100644
--- coreutils-9.9/lib/tmpdir.c
+++ coreutils-9.9/lib/tmpdir.c
@@ -35,7 +35,7 @@
# ifdef _P_tmpdir /* native Windows */
# define P_tmpdir _P_tmpdir
Expand All @@ -10,7 +11,7 @@ diff -uNr coreutils-9.2/lib/tmpdir.c coreutils-9.2.mod/lib/tmpdir.c
# endif
#endif

@@ -135,8 +135,8 @@
@@ -135,8 +135,8 @@ path_search (char *tmpl, size_t tmpl_len, const char *dir, const char *pfx,
#endif
if (direxists (P_tmpdir))
dir = P_tmpdir;
Expand All @@ -21,31 +22,51 @@ diff -uNr coreutils-9.2/lib/tmpdir.c coreutils-9.2.mod/lib/tmpdir.c
else
{
__set_errno (ENOENT);
diff -uNr coreutils-8.32/src/mktemp.c coreutils-8.32.mod/src/mktemp.c
--- coreutils-8.32/src/mktemp.c 2020-01-01 16:13:12.000000000 +0200
+++ coreutils-8.32.mod/src/mktemp.c 2020-05-05 14:13:10.984279966 +0300
@@ -270,7 +270,7 @@
diff --git coreutils-9.9/src/mktemp.c coreutils-9.9/src/mktemp.c
index 706c651..4004876 100644
--- coreutils-9.9/src/mktemp.c
+++ coreutils-9.9/src/mktemp.c
@@ -83,7 +83,7 @@ Files are created u+rw, and directories u+rwx, minus umask restrictions.\n\
"), stdout);
fputs (_("\
-p DIR, --tmpdir[=DIR] interpret TEMPLATE relative to DIR; if DIR is not\n\
- specified, use $TMPDIR if set, else /tmp. With\n\
+ specified, use $TMPDIR if set, else @TERMUX_PREFIX@/tmp. With\n\
this option, TEMPLATE must not be an absolute name;\n\
unlike with -t, TEMPLATE may contain slashes, but\n\
mktemp creates only the final component\n\
@@ -91,7 +91,7 @@ Files are created u+rw, and directories u+rwx, minus umask restrictions.\n\
fputs (_("\
-t interpret TEMPLATE as a single file name component,\n\
relative to a directory: $TMPDIR, if set; else the\n\
- directory specified via -p; else /tmp [deprecated]\n\
+ directory specified via -p; else @TERMUX_PREFIX@/tmp [deprecated]\n\
"), stdout);
fputs (HELP_OPTION_DESCRIPTION, stdout);
fputs (VERSION_OPTION_DESCRIPTION, stdout);
@@ -273,7 +273,7 @@ main (int argc, char **argv)
else if (dest_dir_arg && *dest_dir_arg)
dest_dir = dest_dir_arg;
else
- dest_dir = "/tmp";
+ dest_dir = "@TERMUX_PREFIX@/tmp";

if (last_component (template) != template)
die (EXIT_FAILURE, 0,
@@ -284,7 +284,7 @@
error (EXIT_FAILURE, 0,
@@ -287,7 +287,7 @@ main (int argc, char **argv)
else
{
char *env = getenv ("TMPDIR");
- dest_dir = (env && *env ? env : "/tmp");
+ dest_dir = (env && *env ? env : "@TERMUX_PREFIX@/tmp");
}
if (IS_ABSOLUTE_FILE_NAME (template))
die (EXIT_FAILURE, 0,
diff -uNr coreutils-8.32/src/sort.c coreutils-8.32.mod/src/sort.c
--- coreutils-8.32/src/sort.c 2020-01-01 16:33:34.000000000 +0200
+++ coreutils-8.32.mod/src/sort.c 2020-05-05 14:14:09.200728018 +0300
@@ -92,9 +92,7 @@
error (EXIT_FAILURE, 0,
diff --git coreutils-9.9/src/sort.c coreutils-9.9/src/sort.c
index 05d00cc..dec6516 100644
--- coreutils-9.9/src/sort.c
+++ coreutils-9.9/src/sort.c
@@ -93,9 +93,7 @@ struct rlimit { size_t rlim_cur; };

#define UCHAR_LIM (UCHAR_MAX + 1)

Expand All @@ -56,15 +77,16 @@ diff -uNr coreutils-8.32/src/sort.c coreutils-8.32.mod/src/sort.c

/* Maximum number of lines to merge every time a NODE is taken from
the merge queue. Node is at LEVEL in the binary merge tree,
diff -uNr coreutils-9.4/src/split.c coreutils-9.4.mod/src/split.c
--- coreutils-9.4/src/split.c 2023-08-29 12:39:27.000000000 +0100
+++ coreutils-9.4.mod/src/split.c 2023-09-12 17:50:37.186340314 +0100
@@ -503,7 +503,7 @@
pid_t child_pid;
diff --git coreutils-9.9/src/split.c coreutils-9.9/src/split.c
index 3d15091..eea9cbd 100644
--- coreutils-9.9/src/split.c
+++ coreutils-9.9/src/split.c
@@ -551,7 +551,7 @@ create (char const *name)

char const *shell_prog = getenv ("SHELL");
if (shell_prog == nullptr)
- shell_prog = "/bin/sh";
+ shell_prog = "@TERMUX_PREFIX@/bin/sh";
if (setenv ("FILE", name, 1) != 0)
error (EXIT_FAILURE, errno,
_("failed to set FILE environment variable"));
char const *const argv[] = { last_component (shell_prog), "-c",
filter_command, nullptr };