diff options
Diffstat (limited to 'system/coreutils')
-rw-r--r-- | system/coreutils/APKBUILD | 25 | ||||
-rw-r--r-- | system/coreutils/date-debug.patch | 56 | ||||
-rw-r--r-- | system/coreutils/disable-csplit-io-err-test.patch | 11 | ||||
-rw-r--r-- | system/coreutils/disable-mbrtowc-test.patch | 10 | ||||
-rw-r--r-- | system/coreutils/gnulib-test-fixes.patch | 24 | ||||
-rw-r--r-- | system/coreutils/localename-test-fix.patch | 2 | ||||
-rw-r--r-- | system/coreutils/no-doc.patch | 22 | ||||
-rw-r--r-- | system/coreutils/printf-musl.patch | 53 | ||||
-rw-r--r-- | system/coreutils/revert-gnulib-getcwd-speedup-linux.patch | 92 | ||||
-rw-r--r-- | system/coreutils/seq-write-error.patch | 45 | ||||
-rw-r--r-- | system/coreutils/sort-debug-locale.patch | 79 | ||||
-rw-r--r-- | system/coreutils/test-df-symlink-bindmount.patch | 12 |
12 files changed, 110 insertions, 321 deletions
diff --git a/system/coreutils/APKBUILD b/system/coreutils/APKBUILD index 23d96edbd..71dea2518 100644 --- a/system/coreutils/APKBUILD +++ b/system/coreutils/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=coreutils -pkgver=8.31 -pkgrel=4 +pkgver=9.4 +pkgrel=0 pkgdesc="Basic file, shell, and text manipulation utilities" url="https://www.gnu.org/software/coreutils/" arch="all" @@ -15,13 +15,11 @@ subpackages="$pkgname-doc" [ "${CBUILD}" = "${CHOST}" ] && subpackages="$subpackages $pkgname-lang" install="$pkgname.post-deinstall" source="https://ftp.gnu.org/gnu/coreutils/$pkgname-$pkgver.tar.xz - date-debug.patch - disable-csplit-io-err-test.patch - disable-mbrtowc-test.patch gnulib-tests-dont-require-gpg-passphrase.patch gnulib-test-fixes.patch localename-test-fix.patch test-df-symlink-bindmount.patch + revert-gnulib-getcwd-speedup-linux.patch " [ "${CBUILD}" != "${CHOST}" ] && source="$source 051_all_coreutils-mangen.patch @@ -38,7 +36,6 @@ build() { --datarootdir=/usr/share \ --libexecdir=/usr/libexec \ --enable-nls \ - --without-gmp \ --enable-no-install-program=groups,hostname,su,kill,uptime \ --enable-install-program=arch \ --with-packager="Adélie" \ @@ -53,7 +50,9 @@ build() { } check() { - make check + # This prevents 'chgrp' tests from breaking inside APK Foundry. + env COREUTILS_GROUPS='build' make -C tests check + # We can't run gnulb-tests because of multiple chown failures. } package() { @@ -68,14 +67,12 @@ package() { done } -sha512sums="ef8941dae845bbf5ae5838bc49e44554a766302930601aada6fa594e8088f0fbad74e481ee392ff89633e68b99e4da3f761fcb5d31ee3b233d540fe2a2d4e1af coreutils-8.31.tar.xz -bd8b5cecba59eba30458c8afa895877d39a987b989bc06b70cd6836e0ef684677aaadcb4949b58a713779fe1df1e15e3903e9be14e306671b86b69018b75de8b disable-csplit-io-err-test.patch -532ef8210261437855ba3e2fc72ec57b0e0252b2b0f7817990c9629613ece2cdd86cf30aa049f3cff6fbda12ed3bb9a0db3a3642475378ae44ce319bdf005d9b disable-mbrtowc-test.patch -86944e9ea5493c5b21ab62562a63aa134952738297b21cfb2e8f751db4a695ff25ee1592eb231ed1bb80999bc31f7504c7feffde2e93b4e068c05c44ac83cbdf localename-test-fix.patch +sha512sums="7c55ee23b685a0462bbbd118b04d25278c902604a0dcf3bf4f8bf81faa0500dee5a7813cba6f586d676c98e520cafd420f16479619305e94ea6798d8437561f5 coreutils-9.4.tar.xz fd97fccd661befc558b3afb3e32c82dd2cef511a05e6129d49540599297c1b59ab1f109e63a12f585a2348c26c28fb98330c348829d1fe61cf8149d0dd1c989c gnulib-tests-dont-require-gpg-passphrase.patch -08f6de0e4c1615503a276fb7eb8abb3f1a996d3e9e4c789deb1507e9ac66364e3993591e37ee444d239c64bf3b7d61f909c0da5ead3047b75623cd846e9f868f gnulib-test-fixes.patch -aac3a89b27a7854fbf483e155df9133c3d33a0f36bd55d5606559a7781f9d27d5c17779ea427142311749252767097bf92ec22d4cf86b510568c186da84ff16c date-debug.patch -0b90b7721dd01bd22eba50f73bc756930dd4a8bc78ec408ce7f155a02b520375023897b9d12872030735d908208b912ea7adfac9e8b4d055e617873d982eef56 test-df-symlink-bindmount.patch" +eaba7ad1c5b43d25dc96baaf6f01be5976f9f64c26ea55e1c78d6a3f12825f2f0e998aae7f2ad6d9b2637a3d11586ffe21b87fbbd3c1bb6c9898c5963cb2a32c gnulib-test-fixes.patch +b1509e5678a05f24d6e764c047546e5e34a7fbd5edb59c7debedb144a0096d8ac247c7e2722a5f68c90751e5280bec743c9a6ed3e1433c1916294d68d7bca109 localename-test-fix.patch +15a91b343b6c4d6ef31b322cd2787893eacccb81a7e0202aeac17c3aa18130e6feb5ddb32f39187b4cf2a5d6a9a536a0a6f992e4da90d954a72f158d0df6e4ba test-df-symlink-bindmount.patch +84b8c141052a5db99f4d470a0f6f74ca01041f04e573ca0774f69a931bbe061c1b95cf5b09ab5f08f4322e04c6fc124449f368b51ccd6e837dec686b8521d86a revert-gnulib-getcwd-speedup-linux.patch" [ "${CBUILD}" != "${CHOST}" ] && sha512sums=" bae804f057252c25452ac178c545dc2c4b4775cbfbdcfd4775edd1a4ed6507882bfac39e2b11ad01b74230ca48d761bf62f11bde5bcbc35a6e5a61cbe4a46e36 051_all_coreutils-mangen.patch " diff --git a/system/coreutils/date-debug.patch b/system/coreutils/date-debug.patch deleted file mode 100644 index fc4977e72..000000000 --- a/system/coreutils/date-debug.patch +++ /dev/null @@ -1,56 +0,0 @@ ->From 402c3646e19c199130e7a6db5238cf5908e51fb8 Mon Sep 17 00:00:00 2001 -From: Assaf Gordon <assafgordon@gmail.com> -Date: Mon, 13 May 2019 16:37:40 -0600 -Subject: [PATCH] tests: avoid false-positive in date-debug test -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -When debugging an invalid date due to DST switching, the intermediate -'normalized time' should not be checked - its value can differ between -systems (e.g. glibc vs musl). - -Reported by Niklas Hambüchen in -https://lists.gnu.org/r/coreutils/2019-05/msg00031.html -Analyzed by Rich Felker in -https://lists.gnu.org/r/coreutils/2019-05/msg00039.html - -* tests/misc/date-debug.sh: Replace the exact normalized time -with 'XX:XX:XX' so different values would not trigger test failure. ---- - tests/misc/date-debug.sh | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/tests/misc/date-debug.sh b/tests/misc/date-debug.sh -index aa47f1abb..2ce6f4ce8 100755 ---- a/tests/misc/date-debug.sh -+++ b/tests/misc/date-debug.sh -@@ -71,7 +71,7 @@ date: input timezone: TZ="America/Edmonton" in date string - date: using specified time as starting value: '02:30:00' - date: error: invalid date/time value: - date: user provided time: '(Y-M-D) 2006-04-02 02:30:00' --date: normalized time: '(Y-M-D) 2006-04-02 03:30:00' -+date: normalized time: '(Y-M-D) 2006-04-02 XX:XX:XX' - date: -- - date: possible reasons: - date: non-existing due to daylight-saving time; -@@ -81,7 +81,14 @@ date: invalid date 'TZ="America/Edmonton" 2006-04-02 02:30:00' - EOF - - # date should return 1 (error) for invalid date --returns_ 1 date --debug -d "$in2" >out2 2>&1 || fail=1 -+returns_ 1 date --debug -d "$in2" >out2-t 2>&1 || fail=1 -+ -+# The output line of "normalized time" can differ between systems -+# (e.g. glibc vs musl) and should not be checked. -+# See: https://lists.gnu.org/archive/html/coreutils/2019-05/msg00039.html -+sed '/normalized time:/s/ [0-9][0-9]:[0-9][0-9]:[0-9][0-9]/ XX:XX:XX/' \ -+ out2-t > out2 || framework_failure_ -+ - compare exp2 out2 || fail=1 - - ## --- -2.11.0 - - diff --git a/system/coreutils/disable-csplit-io-err-test.patch b/system/coreutils/disable-csplit-io-err-test.patch deleted file mode 100644 index 035d84486..000000000 --- a/system/coreutils/disable-csplit-io-err-test.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/tests/misc/csplit-io-err.sh 2017-09-20 01:17:21.000000000 +0000 -+++ b/tests/misc/csplit-io-err.sh 2018-08-02 09:14:34.897772887 +0000 -@@ -20,6 +20,8 @@ - print_ver_ csplit - require_gcc_shared_ - -+skip_ 'test relies on glibc-specific behavior' -+ - if ! test -w /dev/full || ! test -c /dev/full; then - skip_ '/dev/full is required' - fi diff --git a/system/coreutils/disable-mbrtowc-test.patch b/system/coreutils/disable-mbrtowc-test.patch deleted file mode 100644 index d338e0324..000000000 --- a/system/coreutils/disable-mbrtowc-test.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- coreutils-8.27/gnulib-tests/test-mbrtowc5.sh.old 2016-12-31 13:54:43.000000000 +0000 -+++ coreutils-8.27/gnulib-tests/test-mbrtowc5.sh 2017-07-30 17:29:50.879924130 +0000 -@@ -1,6 +1,2 @@ - #!/bin/sh --# Test whether the POSIX locale has encoding errors. --LC_ALL=C \ --./test-mbrtowc${EXEEXT} 5 || exit --LC_ALL=POSIX \ --./test-mbrtowc${EXEEXT} 5 -+exit 77 diff --git a/system/coreutils/gnulib-test-fixes.patch b/system/coreutils/gnulib-test-fixes.patch index 5455cf7cd..7876e22aa 100644 --- a/system/coreutils/gnulib-test-fixes.patch +++ b/system/coreutils/gnulib-test-fixes.patch @@ -9,30 +9,6 @@ ret = getrusage (RUSAGE_SELF, &before); ASSERT (ret == 0); ---- coreutils-8.31/gnulib-tests/test-parse-datetime.c.old 2019-06-01 07:46:25.716292871 +0000 -+++ coreutils-8.31/gnulib-tests/test-parse-datetime.c 2019-06-01 22:07:59.456653669 +0000 -@@ -432,21 +432,5 @@ - ASSERT ( parse_datetime (&result, "TZ=\"\\\\\"", &now)); - ASSERT ( parse_datetime (&result, "TZ=\"\\\"\"", &now)); - -- /* Outlandishly-long time zone abbreviations should not cause problems. */ -- { -- static char const bufprefix[] = "TZ=\""; -- enum { tzname_len = 2000 }; -- static char const bufsuffix[] = "0\" 1970-01-01 01:02:03.123456789"; -- enum { bufsize = sizeof bufprefix - 1 + tzname_len + sizeof bufsuffix }; -- char buf[bufsize]; -- memcpy (buf, bufprefix, sizeof bufprefix - 1); -- memset (buf + sizeof bufprefix - 1, 'X', tzname_len); -- strcpy (buf + bufsize - sizeof bufsuffix, bufsuffix); -- ASSERT (parse_datetime (&result, buf, &now)); -- LOG (buf, now, result); -- ASSERT (result.tv_sec == 1 * 60 * 60 + 2 * 60 + 3 -- && result.tv_nsec == 123456789); -- } -- - return 0; - } --- coreutils-8.31/gnulib-tests/test-getlogin.h 2019-01-04 10:14:43.000000000 -0600 +++ coreutils-8.31/gnulib-tests/test-getlogin.h 2019-09-11 06:50:47.791580246 -0500 @@ -61,6 +61,9 @@ test_getlogin_result (const char *buf, i diff --git a/system/coreutils/localename-test-fix.patch b/system/coreutils/localename-test-fix.patch index ff89319c7..17aaa226f 100644 --- a/system/coreutils/localename-test-fix.patch +++ b/system/coreutils/localename-test-fix.patch @@ -8,7 +8,7 @@ # if !defined IN_LIBINTL --- coreutils-8.27/gnulib-tests/localename.c.old 2016-12-31 13:54:43.000000000 +0000 +++ coreutils-8.27/gnulib-tests/localename.c 2017-07-30 16:40:47.098541270 +0000 -@@ -2692,16 +2692,19 @@ +@@ -3111,16 +3111,19 @@ locale_t thread_locale = uselocale (NULL); if (thread_locale != LC_GLOBAL_LOCALE) { diff --git a/system/coreutils/no-doc.patch b/system/coreutils/no-doc.patch deleted file mode 100644 index a1d74623b..000000000 --- a/system/coreutils/no-doc.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- coreutils-8.27/Makefile.in.old 2017-03-09 05:24:51.000000000 +0000 -+++ coreutils-8.27/Makefile.in 2017-06-22 03:07:59.568716258 +0000 -@@ -2363,7 +2363,7 @@ - } - man1dir = $(mandir)/man1 - NROFF = nroff --MANS = $(man1_MANS) -+MANS = - HEADERS = $(noinst_HEADERS) - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive ---- coreutils-8.27/Makefile.in.old 2017-06-22 03:08:55.821951666 +0000 -+++ coreutils-8.27/Makefile.in 2017-06-22 03:19:51.770820411 +0000 -@@ -12192,7 +12192,7 @@ - - info-am: $(INFO_DEPS) - --install-data-am: install-info-am install-man -+install-data-am: install-info-am - - install-dvi: install-dvi-recursive - diff --git a/system/coreutils/printf-musl.patch b/system/coreutils/printf-musl.patch deleted file mode 100644 index 28a951635..000000000 --- a/system/coreutils/printf-musl.patch +++ /dev/null @@ -1,53 +0,0 @@ -From ad5c14dcadd4603363e68da960ed0101b61439bd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com> -Date: Sat, 12 Aug 2017 23:53:33 -0700 -Subject: [PATCH] tests: fix false failure with large printf formats - -* tests/misc/printf-surprise.sh: With musl libc the -large printf format does succeed, outputting data. -To avoid SIGPIPE being generated we ignore that signal -and then handle the subsequent EPIPE error. -Reported by A. Wilcox ---- - tests/misc/printf-surprise.sh | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/tests/misc/printf-surprise.sh b/tests/misc/printf-surprise.sh -index 2edd34c..46c0d8f 100755 ---- a/tests/misc/printf-surprise.sh -+++ b/tests/misc/printf-surprise.sh -@@ -50,6 +50,9 @@ vm=$(get_min_ulimit_v_ env $prog %20f 0) \ - - mkfifo_or_skip_ fifo - -+(trap '' PIPE && yes | :) 2>&1 | grep -qF 'Broken pipe' || -+ skip_ 'trapping SIGPIPE is not supported' -+ - # Disable MALLOC_PERTURB_, to avoid triggering this bug - # https://bugs.debian.org/481543#77 - export MALLOC_PERTURB_=0 -@@ -60,11 +63,11 @@ cleanup_() { kill $pid 2>/dev/null && wait $pid; } - head -c 10 fifo > out & pid=$! - - # Trigger large mem allocation failure --( ulimit -v $vm && env $prog %20000000f 0 2>err-msg > fifo ) -+( trap '' PIPE && ulimit -v $vm && env $prog %20000000f 0 2>err-msg > fifo ) - exit=$? - - # Map this longer, and rarer, diagnostic to the common one. --# printf: cannot perform formatted output: Cannot allocate memory" \ -+# printf: cannot perform formatted output: Cannot allocate memory" - sed 's/cannot perform .*/write error/' err-msg > k && mv k err-msg - err_msg=$(tr '\n' : < err-msg) - -@@ -81,6 +84,7 @@ n_out=$(wc -c < out) - - case $n_out:$diagnostic:$exit in - 10:n:0) ;; # ok, succeeds w/no diagnostic: FreeBSD 6.1 -+ 10:y:1) ;; # ok, fails with EPIPE diagnostic: musl libc - 0:y:1) ;; # ok, glibc-2.8 and newer, when printf(3) fails with ENOMEM - - # With MALLOC_PERTURB_=0, this no longer happens. --- -2.9.3 - diff --git a/system/coreutils/revert-gnulib-getcwd-speedup-linux.patch b/system/coreutils/revert-gnulib-getcwd-speedup-linux.patch new file mode 100644 index 000000000..fa8f66395 --- /dev/null +++ b/system/coreutils/revert-gnulib-getcwd-speedup-linux.patch @@ -0,0 +1,92 @@ +From d598f8169bbc9178c59d35f0df95637a70d3377f Mon Sep 17 00:00:00 2001 +From: Zach van Rijn <me@zv.io> +Date: Mon, 10 Apr 2023 04:09:56 -0500 +Subject: [PATCH] Revert "getcwd: Speed up on Linux. Add support for Android." + +This reverts commit 356a414e8c15ef3f8cc7b7157427c8ce9a9f7c1b. + +diff --git a/lib/getcwd.c b/lib/getcwd.c +index 0530630c43..04b8d2df39 100644 +--- a/lib/getcwd.c ++++ b/lib/getcwd.c +@@ -173,9 +173,6 @@ __getcwd_generic (char *buf, size_t size) + #if HAVE_OPENAT_SUPPORT + int fd = AT_FDCWD; + bool fd_needs_closing = false; +-# if defined __linux__ +- bool proc_fs_not_mounted = false; +-# endif + #else + char dots[DEEP_NESTING * sizeof ".." + BIG_FILE_NAME_COMPONENT_LENGTH + 1]; + char *dotlist = dots; +@@ -441,67 +438,6 @@ __getcwd_generic (char *buf, size_t size) + + thisdev = dotdev; + thisino = dotino; +- +-#if HAVE_OPENAT_SUPPORT +- /* On some platforms, a system call returns the directory that FD points +- to. This is useful if some of the ancestor directories of the +- directory are unreadable, because in this situation the loop that +- climbs up the ancestor hierarchy runs into an EACCES error. +- For example, in some Android app, /data/data/com.termux is readable, +- but /data/data and /data are not. */ +-# if defined __linux__ +- /* On Linux, in particular, if /proc is mounted, +- readlink ("/proc/self/fd/<fd>") +- returns the directory, if its length is < 4096. (If the length is +- >= 4096, it fails with error ENAMETOOLONG, even if the buffer that we +- pass to the readlink function would be large enough.) */ +- if (!proc_fs_not_mounted) +- { +- char namebuf[14 + 10 + 1]; +- sprintf (namebuf, "/proc/self/fd/%u", (unsigned int) fd); +- char linkbuf[4096]; +- ssize_t linklen = readlink (namebuf, linkbuf, sizeof linkbuf); +- if (linklen < 0) +- { +- if (errno != ENAMETOOLONG) +- /* If this call was not successful, the next one will likely be +- not successful either. */ +- proc_fs_not_mounted = true; +- } +- else +- { +- dirroom = dirp - dir; +- if (dirroom < linklen) +- { +- if (size != 0) +- { +- __set_errno (ERANGE); +- goto lose; +- } +- else +- { +- char *tmp; +- size_t oldsize = allocated; +- +- allocated += linklen - dirroom; +- if (allocated < oldsize +- || ! (tmp = realloc (dir, allocated))) +- goto memory_exhausted; +- +- /* Move current contents up to the end of the buffer. */ +- dirp = memmove (tmp + dirroom + (allocated - oldsize), +- tmp + dirroom, +- oldsize - dirroom); +- dir = tmp; +- } +- } +- dirp -= linklen; +- memcpy (dirp, linkbuf, linklen); +- break; +- } +- } +-# endif +-#endif + } + + if (dirstream && __closedir (dirstream) != 0) +-- +2.25.1 + diff --git a/system/coreutils/seq-write-error.patch b/system/coreutils/seq-write-error.patch deleted file mode 100644 index 4892a82ec..000000000 --- a/system/coreutils/seq-write-error.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 1e1dbbe0f95c7170009f3ba4d8380c1b98ff53c8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com> -Date: Sun, 13 Aug 2017 00:18:43 -0700 -Subject: [PATCH] seq: produce consistent error messages upon write error - -* src/seq.c (io_error): Use the same error message as would -be generated at exit time when closing the stdout stream. -The inconsistency was added with commit v8.25-26-gc92585b. -This was noticed due to an inconsistency in the expected -error message generated by seq on musl libc. -Reported by A. Wilcox. ---- - src/seq.c | 2 +- - tests/misc/seq-epipe.sh | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/seq.c b/src/seq.c -index bb191ba..5e5b381 100644 ---- a/src/seq.c -+++ b/src/seq.c -@@ -284,7 +284,7 @@ io_error (void) - { - /* FIXME: consider option to silently ignore errno=EPIPE */ - clearerr (stdout); -- die (EXIT_FAILURE, errno, _("standard output")); -+ die (EXIT_FAILURE, errno, _("write error")); - } - - /* Actually print the sequence of numbers in the specified range, with the -diff --git a/tests/misc/seq-epipe.sh b/tests/misc/seq-epipe.sh -index edbd563..69dd75d 100755 ---- a/tests/misc/seq-epipe.sh -+++ b/tests/misc/seq-epipe.sh -@@ -33,7 +33,7 @@ compare exp code || fail=1 - - # The error message must begin with "standard output:" - # (but don't hard-code the strerror text) --grep '^seq: standard output: ' err \ -+grep '^seq: write error: ' err \ - || { warn_ "seq emitted incorrect error on EPIPE"; \ - cat err;\ - fail=1; } --- -2.9.3 - diff --git a/system/coreutils/sort-debug-locale.patch b/system/coreutils/sort-debug-locale.patch deleted file mode 100644 index 27921abbd..000000000 --- a/system/coreutils/sort-debug-locale.patch +++ /dev/null @@ -1,79 +0,0 @@ -From b938d8966c3d1afec9730d403fd6a6eb4d856b85 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com> -Date: Sun, 13 Aug 2017 00:45:32 -0700 -Subject: [PATCH] sort: handle musl locale differences in --debug reporting - -* src/sort.c (main): Don't assume hard_LC_COLLATE implies -a successful setting of the locale as musl defaults to -UTF8 when failing to set the specified locale. -* tests/misc/sort-debug-warn.sh: Adjust for the now -separated locale debug info and map the musl specific -message back to the common case. -Reported by A. Wilcox. ---- - src/sort.c | 17 +++++++++-------- - tests/misc/sort-debug-warn.sh | 9 +++++++-- - 2 files changed, 16 insertions(+), 10 deletions(-) - -diff --git a/src/sort.c b/src/sort.c -index 015e40e..ba6ceac 100644 ---- a/src/sort.c -+++ b/src/sort.c -@@ -4675,18 +4675,19 @@ main (int argc, char **argv) - - /* Always output the locale in debug mode, since this - is such a common source of confusion. */ -+ -+ /* OpenBSD can only set some categories with LC_ALL above, -+ so set LC_COLLATE explicitly to flag errors. */ -+ if (locale_ok) -+ locale_ok = !! setlocale (LC_COLLATE, ""); -+ if (! locale_ok) -+ error (0, 0, "%s", _("failed to set locale")); - if (hard_LC_COLLATE) - error (0, 0, _("using %s sorting rules"), - quote (setlocale (LC_COLLATE, NULL))); - else -- { -- /* OpenBSD can only set some categories with LC_ALL above, -- so set LC_COLLATE explicitly to flag errors. */ -- if (locale_ok) -- locale_ok = !! setlocale (LC_COLLATE, ""); -- error (0, 0, "%s%s", locale_ok ? "" : _("failed to set locale; "), -- _("using simple byte comparison")); -- } -+ error (0, 0, "%s", _("using simple byte comparison")); -+ - key_warnings (&gkey, gkey_only); - } - -diff --git a/tests/misc/sort-debug-warn.sh b/tests/misc/sort-debug-warn.sh -index 3602c84..8119693 100755 ---- a/tests/misc/sort-debug-warn.sh -+++ b/tests/misc/sort-debug-warn.sh -@@ -71,7 +71,8 @@ sort: using simple byte comparison - 17 - sort: using simple byte comparison - 18 --sort: failed to set locale; using simple byte comparison -+sort: failed to set locale -+sort: using simple byte comparison - EOF - - echo 1 >> out -@@ -109,7 +110,11 @@ sort -rM --debug /dev/null 2>>out #no warning - echo 17 >> out - sort -rM -k1,1 --debug /dev/null 2>>out #no warning - echo 18 >> out --LC_ALL=missing sort --debug /dev/null 2>>out -+LC_ALL=missing sort --debug /dev/null 2>>out.t -+# musl libc accepts "missing" and implicitly uses UTF8, -+# so adjust the expected message accordingly. -+sed 's/using .*missing.* sorting rules/using simple byte comparison/' \ -+ out.t >>out - - compare exp out || fail=1 - --- -2.9.3 - diff --git a/system/coreutils/test-df-symlink-bindmount.patch b/system/coreutils/test-df-symlink-bindmount.patch index 34b334ba8..cd44c9066 100644 --- a/system/coreutils/test-df-symlink-bindmount.patch +++ b/system/coreutils/test-df-symlink-bindmount.patch @@ -1,11 +1,11 @@ --- coreutils-8.31/tests/df/df-symlink.sh 2019-01-05 05:36:22.000000000 -0500 +++ coreutils-8.31/tests/df/df-symlink.sh 2019-05-30 23:57:10.260506897 -0400 -@@ -34,7 +34,7 @@ +@@ -35,7 +35,7 @@ # I.e., '.' => /dev/mapper/fedora-home -> /dev/dm-2 # Restrict this test to systems with a 1:1 mapping between # source and target. This excludes for example BTRFS sub-volumes. --if test "$(df --output=source | grep -F "$disk" | wc -l)" = 1; then -+if test "$(df --all --output=source | grep -F "$disk" | wc -l)" = 1; then - df --out=source,target '.' > out || fail=1 - compare exp out || fail=1 - fi +-if test "$(df --output=source | grep -F "$file_system" | wc -l)" = 1; then ++if test "$(df --all --output=source | grep -F "$file_system" | wc -l)" = 1; then + # Restrict to systems with a single file system root (and have findmnt(1)) + if test "$(findmnt -nro FSROOT | uniq | wc -l)" = 1; then + df --out=source,target '.' > out || fail=1 |