Update coreutils to 9.4

2026-03-13 14:55:24 +01:00 · 2023-12-29 11:53:31 +11:00 · 2023-12-29 11:53:31 +11:00 · c750c6f002
commit c750c6f002
parent 241f5431b0
10 changed files with 361 additions and 361 deletions
--- a/steps/coreutils-9.4/import-gnulib.sh
+++ b/steps/coreutils-9.4/import-gnulib.sh
@ -0,0 +1,327 @@
+#!/bin/sh
+
+# SPDX-FileCopyrightText: 2021 Melg Eight <public.melg8@gmail.com>
+# SPDX-FileCopyrightText: 2023 fosslinux <fosslinux@aussies.space>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+# Regenerate unicode files
+pushd ../gnulib-bb5bb43/lib
+gcc -Iunictype -o gen-uni-tables gen-uni-tables.c
+mv ../../*.txt .
+./gen-uni-tables UnicodeData-15.0.0.txt PropList-15.0.0.txt DerivedCoreProperties-15.0.0.txt emoji-data-15.0.0.txt ArabicShaping-15.0.0.txt Scripts-15.0.0.txt Blocks-15.0.0.txt PropList-3.0.1.txt EastAsianWidth-15.0.0.txt LineBreak-15.0.0.txt WordBreakProperty-15.0.0.txt GraphemeBreakProperty-15.0.0.txt CompositionExclusions-15.0.0.txt SpecialCasing-15.0.0.txt CaseFolding-15.0.0.txt 15.0
+popd
+
+../gnulib-bb5bb43/gnulib-tool --import --local-dir=gl \
+ --lib=libcoreutils \
+ --source-base=lib \
+ --m4-base=m4 \
+ --doc-base=doc \
+ --tests-base=gnulib-tests \
+ --aux-dir=build-aux \
+ --with-tests \
+ --makefile-name=gnulib.mk \
+ --automake-subdir \
+ --no-conditional-dependencies \
+ --no-libtool \
+ --macro-prefix=gl \
+ --avoid=canonicalize-lgpl \
+ --avoid=dummy \
+ acl \
+ alignalloc \
+ alignasof \
+ alloca \
+ announce-gen \
+ areadlink-with-size \
+ areadlinkat-with-size \
+ argmatch \
+ argv-iter \
+ assert \
+ assert-h \
+ assure \
+ attribute \
+ autobuild \
+ backup-rename \
+ backupfile \
+ base32 \
+ base64 \
+ btowc \
+ buffer-lcm \
+ byteswap \
+ c-strcase \
+ calloc-gnu \
+ canon-host \
+ canonicalize \
+ chmodat \
+ chown \
+ chownat \
+ cl-strtod \
+ cl-strtold \
+ cloexec \
+ closein \
+ closeout \
+ config-h \
+ configmake \
+ copy-file-range \
+ count-leading-zeros \
+ crypto/md5 \
+ crypto/sha1 \
+ crypto/sha256 \
+ crypto/sha512 \
+ crypto/sm3 \
+ cycle-check \
+ d-ino \
+ d-type \
+ di-set \
+ dirfd \
+ dirname \
+ do-release-commit-and-tag \
+ dtoastr \
+ dup2 \
+ environ \
+ error \
+ euidaccess \
+ exclude \
+ exitfail \
+ explicit_bzero \
+ faccessat \
+ fadvise \
+ fchdir \
+ fchmodat \
+ fchownat \
+ fclose \
+ fcntl \
+ fcntl-safer \
+ fd-reopen \
+ fdatasync \
+ fdopen \
+ fdutimensat \
+ file-has-acl \
+ file-type \
+ fileblocks \
+ filemode \
+ filenamecat \
+ filevercmp \
+ flexmember \
+ fnmatch-gnu \
+ fopen-safer \
+ fprintftime \
+ fpurge \
+ free-posix \
+ freopen \
+ freopen-safer \
+ fseeko \
+ fstatat \
+ fsusage \
+ fsync \
+ ftoastr \
+ ftruncate \
+ fts \
+ full-read \
+ full-write \
+ getgroups \
+ gethrxtime \
+ getline \
+ getloadavg \
+ getlogin \
+ getndelim2 \
+ getopt-gnu \
+ getpagesize \
+ getpass-gnu \
+ gettext-h \
+ gettime \
+ gettime-res \
+ getugroups \
+ getusershell \
+ git-version-gen \
+ gitlog-to-changelog \
+ gnu-make \
+ gnu-web-doc-update \
+ gnumakefile \
+ gnupload \
+ group-member \
+ hard-locale \
+ hash \
+ hash-triple \
+ heap \
+ host-os \
+ human \
+ idcache \
+ idx \
+ ignore-value \
+ inttostr \
+ inttypes \
+ isapipe \
+ isatty \
+ isblank \
+ largefile \
+ lchmod \
+ lchown \
+ ldtoastr \
+ lib-ignore \
+ libgmp \
+ linebuffer \
+ link \
+ link-follow \
+ linkat \
+ long-options \
+ lstat \
+ maintainer-makefile \
+ malloc-gnu \
+ manywarnings \
+ mbrlen \
+ mbrtowc \
+ mbsalign \
+ mbschr \
+ mbslen \
+ mbswidth \
+ memcasecmp \
+ memchr \
+ memcmp2 \
+ mempcpy \
+ memrchr \
+ mgetgroups \
+ minmax \
+ mkancesdirs \
+ mkdir \
+ mkdir-p \
+ mkdirat \
+ mkfifo \
+ mkfifoat \
+ mknod \
+ mkostemp \
+ mkstemp \
+ mktime \
+ modechange \
+ mountlist \
+ mpsort \
+ netinet_in \
+ nproc \
+ nstrftime \
+ nullptr \
+ obstack \
+ open \
+ openat-safer \
+ parse-datetime \
+ parse-datetime2 \
+ pathmax \
+ perl \
+ physmem \
+ pipe-posix \
+ pipe2 \
+ posix-shell \
+ posixtm \
+ posixver \
+ priv-set \
+ progname \
+ propername-lite \
+ pthread-cond \
+ pthread-mutex \
+ pthread-thread \
+ pthread_sigmask \
+ putenv \
+ quote \
+ quotearg \
+ randint \
+ randperm \
+ rawmemchr \
+ read-file \
+ readlink \
+ readtokens \
+ readtokens0 \
+ readutmp \
+ realloc-gnu \
+ regex \
+ remove \
+ rename \
+ renameat \
+ renameatu \
+ rmdir \
+ root-dev-ino \
+ rpmatch \
+ safe-read \
+ same \
+ save-cwd \
+ savedir \
+ savewd \
+ select \
+ selinux-at \
+ setenv \
+ settime \
+ sig2str \
+ sigaction \
+ smack \
+ ssize_t \
+ stat-macros \
+ stat-size \
+ stat-time \
+ stdbool \
+ stdckdint \
+ stdlib-safer \
+ stpcpy \
+ stpncpy \
+ strdup-posix \
+ strncat \
+ strnumcmp \
+ strsignal \
+ strtoimax \
+ strtoumax \
+ symlinkat \
+ sys_ioctl \
+ sys_resource \
+ sys_stat \
+ sys_wait \
+ targetdir \
+ tempname \
+ termios \
+ time_rz \
+ timer-time \
+ timespec \
+ tmpdir \
+ tzset \
+ uname \
+ unicodeio \
+ unistd-safer \
+ unlink-busy \
+ unlinkat \
+ unlinkdir \
+ unlocked-io \
+ unsetenv \
+ update-copyright \
+ useless-if-before-free \
+ userspec \
+ utimecmp \
+ utimens \
+ utimensat \
+ vasprintf-posix \
+ vc-list-files \
+ verify \
+ verror \
+ version-etc-fsf \
+ wchar-single \
+ wcswidth \
+ wcwidth \
+ winsz-ioctl \
+ winsz-termios \
+ write-any-file \
+ xalignalloc \
+ xalloc \
+ xbinary-io \
+ xdectoint \
+ xfts \
+ xgetcwd \
+ xgetgroups \
+ xgethostname \
+ xmemcoll \
+ xnanosleep \
+ xprintf \
+ xprintf-posix \
+ xreadlink \
+ xstrtod \
+ xstrtoimax \
+ xstrtol \
+ xstrtol-error \
+ xstrtold \
+ xstrtoumax \
+ year2038-recommended \
+ yesno
--- a/steps/coreutils-9.4/pass1.sh
+++ b/steps/coreutils-9.4/pass1.sh
@ -0,0 +1,56 @@
+# SPDX-FileCopyrightText: 2021 Melg Eight <public.melg8@gmail.com>
+# SPDX-FileCopyrightText: 2022 Andrius Štikonas <andrius@stikonas.eu>
+# SPDX-FileCopyrightText: 2023 fosslinux <fosslinux@aussies.space>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+regenerate_files() {
+    build-aux/gen-lists-of-programs.sh --autoconf > m4/cu-progs.m4
+    build-aux/gen-lists-of-programs.sh --automake > src/cu-progs.mk
+    build-aux/gen-single-binary.sh src/local.mk > src/single-binary.mk
+    touch ChangeLog
+    cp ../gnulib-bb5bb43/build-aux/po/Makefile.in.in po/Makefile.in.in
+
+    # Remove pregenerated gnulib files
+    pushd ../gnulib-bb5bb43
+    rm lib/uniwidth/width*.h
+    rm lib/unictype/ctype*.h
+    rm lib/unicase/tolower.h
+    popd
+
+    . ../../import-gnulib.sh
+
+    VERSION=$(basename "${BASH_SOURCE[0]}" .sh | sed 's/coreutils-//')
+    echo "$VERSION" > .tarball-version
+
+    # We don't have autopoint from gettext yet.
+    AUTOPOINT=true AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 autoreconf-2.69 -fi
+}
+
+src_prepare() {
+    default
+    regenerate_files
+}
+
+src_configure() {
+    # FORCE_UNSAFE_CONFIGURE disables "you should not run configure as root"
+    # error from configuration system of coreutils.
+    # gl_cv_func_getcwd_path_max is set to improve reproducibility.
+    # In some environments, the configure script would set it to
+    # "no, but it is partly working", and in others it would set it
+    # to "yes", producing different build outputs.
+    # Also, tell coreutils we don't have perl, which disables help2man
+    FORCE_UNSAFE_CONFIGURE=1 ./configure CFLAGS="-static" \
+        --prefix="${PREFIX}" \
+        --build=i386-unknown-linux-musl \
+        gl_cv_func_getcwd_path_max="no, but it is partly working" \
+        gl_cv_prog_perl="no"
+}
+
+src_compile() {
+    make "${MAKEJOBS}" PREFIX="${PREFIX}" MAKEINFO="true" GPERF="true"
+}
+
+src_install() {
+    make install PREFIX="${PREFIX}" MAKEINFO="true" DESTDIR="${DESTDIR}"
+}
--- a/steps/coreutils-9.4/patches/force_to_use_nanosleep.patch
+++ b/steps/coreutils-9.4/patches/force_to_use_nanosleep.patch
@ -0,0 +1,38 @@
+SPDX-FileCopyrightText: 2021 Melg Eight <public.melg8@gmail.com>
+
+SPDX-License-Identifier: GPL-3.0-or-later
+
+Replace test for support of correct values produced by nanosleep.
+We always assume that kernel doesn't have correct implementation and
+instead use function from gnulib with fix. That fixes reproducibility
+problem across different kernels.
+
+--- ../gnulib-bb5bb43/m4/nanosleep.m4
+++ ../gnulib-bb5bb43/m4/nanosleep.m4
+@@ -85,23 +85,9 @@ AC_DEFUN([gl_FUNC_NANOSLEEP],
+             ts_sleep.tv_nsec = 1;
+             #if HAVE_DECL_ALARM
+             {
+-              static struct sigaction act;
+-              act.sa_handler = check_for_SIGALRM;
+-              sigemptyset (&act.sa_mask);
+-              sigaction (SIGALRM, &act, NULL);
+-              alarm (1);
+-              if (nanosleep (&ts_sleep, NULL) != 0)
+-                return 3;
+-              /* Test for a minor problem: the handling of large arguments.  */
+-              ts_sleep.tv_sec = TYPE_MAXIMUM (time_t);
+-              ts_sleep.tv_nsec = 999999999;
+-              alarm (1);
+-              if (nanosleep (&ts_sleep, &ts_remaining) != -1)
+-                return 4;
+-              if (errno != EINTR)
+-                return 5;
+-              if (ts_remaining.tv_sec <= TYPE_MAXIMUM (time_t) - 10)
+-                return 6;
+              /* Force to use HAVE_BUG_BIG_NANOSLEEP 1 across kernels even
+                 if it correctly handles big nanosleeps. */
+              return 6;
+             }
+             #else /* A simpler test for native Windows.  */
+             if (nanosleep (&ts_sleep, &ts_remaining) < 0)
--- a/steps/coreutils-9.4/patches/remove_gettext.patch
+++ b/steps/coreutils-9.4/patches/remove_gettext.patch
@ -0,0 +1,31 @@
+SPDX-FileCopyrightText: 2021 Melg Eight <public.melg8@gmail.com>
+
+SPDX-License-Identifier: GPL-3.0-or-later
+
+Remove dependency on gettext, because we don't have it at this stage
+of the build.
+
+--- ./configure.ac
+++ ./configure.ac
+@@ -624,8 +624,8 @@ AM_CONDITIONAL([CROSS_COMPILING], [test "$cross_compiling" = yes])
+ 
+ # As long as "grep 'PRI[diouxX]' po/*.pot" reports matches in
+ # translatable strings, we must use need-formatstring-macros here.
+-AM_GNU_GETTEXT([external], [need-formatstring-macros])
+-AM_GNU_GETTEXT_VERSION([0.19.2])
+# AM_GNU_GETTEXT([external], [need-formatstring-macros])
+# AM_GNU_GETTEXT_VERSION([0.19.2])
+ 
+ # For a test of uniq: it uses the $LOCALE_FR envvar.
+ gt_LOCALE_FR
+--- ./Makefile.am
+++ ./Makefile.am
+@@ -17,7 +17,7 @@
+ 
+ ALL_RECURSIVE_TARGETS =
+ 
+-SUBDIRS = po . gnulib-tests
+SUBDIRS = . gnulib-tests
+ 
+ EXTRA_DIST =				\
+   .mailmap				\
--- a/steps/coreutils-9.4/sources
+++ b/steps/coreutils-9.4/sources
@ -0,0 +1,17 @@
+http://git.savannah.gnu.org/cgit/coreutils.git/snapshot/coreutils-9.4.tar.xz 8fb56810310253300b3d6f84e68dc97eb2d74e1f4f78e05776831d9d82e4f2d7
+http://git.savannah.gnu.org/cgit/gnulib.git/snapshot/gnulib-bb5bb43.tar.gz b8aa1ac1b18c67f081486069e6a7a5564f20431c2313a94c20a46dcfb904be2a
+http://ftp.unicode.org/Public/15.0.0/ucd/UnicodeData.txt 806e9aed65037197f1ec85e12be6e8cd870fc5608b4de0fffd990f689f376a73 UnicodeData-15.0.0.txt
+http://ftp.unicode.org/Public/15.0.0/ucd/PropList.txt e05c0a2811d113dae4abd832884199a3ea8d187ee1b872d8240a788a96540bfd PropList-15.0.0.txt
+http://ftp.unicode.org/Public/15.0.0/ucd/DerivedCoreProperties.txt d367290bc0867e6b484c68370530bdd1a08b6b32404601b8c7accaf83e05628d DerivedCoreProperties-15.0.0.txt
+http://ftp.unicode.org/Public/15.0.0/ucd/emoji/emoji-data.txt 29071dba22c72c27783a73016afb8ffaeb025866740791f9c2d0b55cc45a3470 emoji-data-15.0.0.txt
+http://ftp.unicode.org/Public/15.0.0/ucd/ArabicShaping.txt eb840f36e0a7446293578c684a54c6d83d249abde7bdd4dfa89794af1d7fe9e9 ArabicShaping-15.0.0.txt
+http://ftp.unicode.org/Public/15.0.0/ucd/Scripts.txt cca85d830f46aece2e7c1459ef1249993dca8f2e46d51e869255be140d7ea4b0 Scripts-15.0.0.txt
+http://ftp.unicode.org/Public/15.0.0/ucd/Blocks.txt 529dc5d0f6386d52f2f56e004bbfab48ce2d587eea9d38ba546c4052491bd820 Blocks-15.0.0.txt
+http://ftp.unicode.org/Public/3.0-Update1/PropList-3.0.1.txt 909eef4adbeddbdddcd9487c856fe8cdbb8912aa8eb315ed7885b6ef65f4dc4c
+http://ftp.unicode.org/Public/15.0.0/ucd/EastAsianWidth.txt 743e7bc435c04ab1a8459710b1c3cad56eedced5b806b4659b6e69b85d0adf2a EastAsianWidth-15.0.0.txt
+http://ftp.unicode.org/Public/15.0.0/ucd/LineBreak.txt 012bca868e2c4e59a5a10a7546baf0c6fb1b2ef458c277f054915c8a49d292bf LineBreak-15.0.0.txt
+http://ftp.unicode.org/Public/15.0.0/ucd/auxiliary/WordBreakProperty.txt 5188a56e91593467c2e912601ebc78750e6adc9b04541b8c5becb5441e388ce2 WordBreakProperty-15.0.0.txt
+http://ftp.unicode.org/Public/15.0.0/ucd/auxiliary/GraphemeBreakProperty.txt 5a0f8748575432f8ff95e1dd5bfaa27bda1a844809e17d6939ee912bba6568a1 GraphemeBreakProperty-15.0.0.txt
+http://ftp.unicode.org/Public/15.0.0/ucd/CompositionExclusions.txt 3b019c0a33c3140cbc920c078f4f9af2680ba4f71869c8d4de5190667c70b6a3 CompositionExclusions-15.0.0.txt
+http://ftp.unicode.org/Public/15.0.0/ucd/SpecialCasing.txt 78b29c64b5840d25c11a9f31b665ee551b8a499eca6c70d770fcad7dd710f494 SpecialCasing-15.0.0.txt
+http://ftp.unicode.org/Public/15.0.0/ucd/CaseFolding.txt cdd49e55eae3bbf1f0a3f6580c974a0263cb86a6a08daa10fbf705b4808a56f7 CaseFolding-15.0.0.txt