diff options
Diffstat (limited to 'source/a/coreutils')
| -rw-r--r-- | source/a/coreutils/DIR_COLORS | 6 | ||||
| -rwxr-xr-x | source/a/coreutils/coreutils.SlackBuild | 23 | ||||
| -rw-r--r-- | source/a/coreutils/coreutils.uname.diff | 37 | ||||
| -rw-r--r-- | source/a/coreutils/coreutils.wc.noavx2.diff | 11 | ||||
| -rw-r--r-- | source/a/coreutils/no_ls_quoting.patch | 52 |
5 files changed, 67 insertions, 62 deletions
diff --git a/source/a/coreutils/DIR_COLORS b/source/a/coreutils/DIR_COLORS index 17120ec63..5b97e4a45 100644 --- a/source/a/coreutils/DIR_COLORS +++ b/source/a/coreutils/DIR_COLORS @@ -130,10 +130,12 @@ EXEC 01;32 # This is for files with execute permission: .txz 01;31 .tz 01;31 .tz2 01;31 +.tzst 01;31 .xz 01;31 .z 01;31 .zip 01;31 .zoo 01;31 +.zst 01;31 # multimedia (video/image/sound) file formats .aac 01;35 @@ -146,11 +148,13 @@ EXEC 01;32 # This is for files with execute permission: .bmp 01;35 .divx 01;35 .flac 01;35 +.flv 01;35 .gif 01;35 .ico 01;35 .jpg 01;35 .jpeg 01;35 .m2a 01;35 +.m2t 01;35 .m2v 01;35 .m4a 01;35 .m4p 01;35 @@ -188,6 +192,8 @@ EXEC 01;32 # This is for files with execute permission: .tiff 01;35 .vob 01;35 .wav 01;35 +.webm 01;35 +.webp 01;35 .wma 01;35 .wmv 01;35 .xbm 01;35 diff --git a/source/a/coreutils/coreutils.SlackBuild b/source/a/coreutils/coreutils.SlackBuild index 3ba9bebe9..4805aa315 100755 --- a/source/a/coreutils/coreutils.SlackBuild +++ b/source/a/coreutils/coreutils.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2005-2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2005-2023 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,10 +24,17 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=coreutils VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} +# "wc" seems to be the only thing used by pkgtools that can make use of AVX2, +# and since the kernel has added a mitigation that makes AVX2 seem to be +# available when it really isn't, it is not reliable. Even the author of this +# wc optimization questioned how useful it really was... and for us, it isn't +# worth it to have by default. But feel free to enable/recompile if you like. +DISABLE_USE_AVX2_WC_LINECOUNT=${DISABLE_USE_AVX2_WC_LINECOUNT:-true} + # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -93,6 +100,10 @@ zcat $CWD/$PKGNAM.uname.diff.gz | patch -p1 --verbose --backup --suffix=.orig || # Revert change to ls quoting style introduced in coreutils-8.25: zcat $CWD/no_ls_quoting.patch.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 +if [ "$DISABLE_USE_AVX2_WC_LINECOUNT" = "true" ]; then + zcat $CWD/coreutils.wc.noavx2.diff.gz | patch -p1 --verbose || exit 1 +fi + # Compilation with glibc version later than 2.3.2 needs the environment # variable DEFAULT_POSIX2_VERSION set to 199209. # Without that line, the coreutils will start complaining about 'obsolete' @@ -101,6 +112,11 @@ zcat $CWD/no_ls_quoting.patch.gz | patch -p1 --verbose --backup --suffix=.orig | # too commonly used to disregard them. Better to stick with the older more # widely accepted standards until things begin to demand the new way. +# Don't use the openssl crypto library, otherwise /bin/sort ends up linked +# against openssl's libcrypto which creates problems for upgradepkg. +# It is also possible to use --with-linux-crypto to enable the Linux kernel +# crypto routines, but we'll skip this for now. + FORCE_UNSAFE_CONFIGURE=1 \ CFLAGS="$SLKCFLAGS" \ DEFAULT_POSIX2_VERSION=199209 \ @@ -111,8 +127,9 @@ DEFAULT_POSIX2_VERSION=199209 \ --infodir=/usr/info \ --sysconfdir=/etc \ --libdir=/usr/lib${LIBDIRSUFFIX} \ - --without-gmp \ --enable-install-program=arch \ + --with-openssl=no \ + --enable-year2038 \ --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 diff --git a/source/a/coreutils/coreutils.uname.diff b/source/a/coreutils/coreutils.uname.diff index 699110318..3aec5e5f6 100644 --- a/source/a/coreutils/coreutils.uname.diff +++ b/source/a/coreutils/coreutils.uname.diff @@ -1,8 +1,7 @@ -diff -Nur coreutils-7.6.orig/src/uname.c coreutils-7.6/src/uname.c ---- coreutils-7.6.orig/src/uname.c 2009-09-01 06:01:16.000000000 -0500 -+++ coreutils-7.6/src/uname.c 2009-09-15 08:55:26.239452858 -0500 -@@ -50,6 +50,11 @@ - # include <mach-o/arch.h> +--- ./src/uname.c.orig 2022-04-08 06:22:18.000000000 -0500 ++++ ./src/uname.c 2022-04-17 13:30:46.550023254 -0500 +@@ -44,6 +44,11 @@ + # endif #endif +#if defined (__linux__) @@ -11,9 +10,9 @@ diff -Nur coreutils-7.6.orig/src/uname.c coreutils-7.6/src/uname.c +#endif + #include "system.h" + #include "die.h" #include "error.h" - #include "quote.h" -@@ -155,6 +160,106 @@ +@@ -149,6 +154,106 @@ exit (status); } @@ -120,23 +119,25 @@ diff -Nur coreutils-7.6.orig/src/uname.c coreutils-7.6/src/uname.c /* Print ELEMENT, preceded by a space if something has already been printed. */ -@@ -302,10 +407,14 @@ - if (toprint & PRINT_PROCESSOR) - { - char const *element = unknown; +@@ -323,11 +428,16 @@ + element = "powerpc"; + # endif + #endif -#if HAVE_SYSINFO && defined SI_ARCHITECTURE +#if ( HAVE_SYSINFO && defined SI_ARCHITECTURE ) || defined(USE_PROCINFO) - { - static char processor[257]; + if (element == unknown) + { + static char processor[257]; +#if defined(USE_PROCINFO) -+ if (0 <= __linux_procinfo (PROCINFO_PROCESSOR, processor, sizeof processor)) ++ if (0 <= __linux_procinfo (PROCINFO_PROCESSOR, processor, sizeof processor)) +#else - if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor)) ++ + if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor)) +#endif - element = processor; - } + element = processor; + } #endif -@@ -358,9 +467,13 @@ +@@ -360,9 +470,13 @@ if (element == unknown) { static char hardware_platform[257]; diff --git a/source/a/coreutils/coreutils.wc.noavx2.diff b/source/a/coreutils/coreutils.wc.noavx2.diff new file mode 100644 index 000000000..ccae18bb8 --- /dev/null +++ b/source/a/coreutils/coreutils.wc.noavx2.diff @@ -0,0 +1,11 @@ +--- ./src/wc.c.orig 2023-08-29 06:39:27.000000000 -0500 ++++ ./src/wc.c 2023-08-29 13:24:53.642035314 -0500 +@@ -147,7 +147,7 @@ + static bool + avx2_supported (void) + { +- bool avx_enabled = 0 < __builtin_cpu_supports ("avx2"); ++ bool avx_enabled = 0; + + if (debug) + error (0, 0, (avx_enabled diff --git a/source/a/coreutils/no_ls_quoting.patch b/source/a/coreutils/no_ls_quoting.patch index bfc9d0187..b8643c40f 100644 --- a/source/a/coreutils/no_ls_quoting.patch +++ b/source/a/coreutils/no_ls_quoting.patch @@ -1,41 +1,11 @@ -Description: revert inconsistent ls quoting - This is a revert of upstream commit 109b9220cead6e979d22d16327c4d9f8350431cc. - Info changed to reflect current upstream intentions. - -Bug-Debian: https://bugs.debian.org/813164 - ---- coreutils-8.25.orig/NEWS -+++ coreutils-8.25/NEWS -@@ -71,9 +71,6 @@ GNU coreutils NEWS - df now prefers sources towards the root of a device when - eliding duplicate bind mounted entries. - -- ls now quotes file names unambiguously and appropriate for use in a shell, -- when outputting to a terminal. -- - join, sort, uniq with --zero-terminated, now treat '\n' as a field delimiter. - - ** Improvements ---- coreutils-8.25.orig/doc/coreutils.texi -+++ coreutils-8.25/doc/coreutils.texi -@@ -7750,8 +7750,8 @@ this"} in the default C locale. This lo - - You can specify the default value of the @option{--quoting-style} option - with the environment variable @env{QUOTING_STYLE}@. If that environment --variable is not set, the default value is @samp{shell-escape} when the --output is a terminal, and @samp{literal} otherwise. -+variable is not set, the default value is @samp{literal}, but this -+default may change to @samp{shell-escape} in a future version of this package. - - @item --show-control-chars - @opindex --show-control-chars ---- coreutils-8.25.orig/src/ls.c -+++ coreutils-8.25/src/ls.c -@@ -1581,7 +1581,6 @@ decode_switches (int argc, char **argv) - if (isatty (STDOUT_FILENO)) - { - format = many_per_line; -- set_quoting_style (NULL, shell_escape_quoting_style); - /* See description of qmark_funny_chars, above. */ - qmark_funny_chars = true; - } +--- ./src/ls.c.orig 2021-09-24 06:31:05.000000000 -0500 ++++ ./src/ls.c 2021-09-24 19:47:32.230001419 -0500 +@@ -2342,7 +2342,7 @@ + qs = getenv_quoting_style (); + if (qs < 0) + qs = (ls_mode == LS_LS +- ? (stdout_isatty () ? shell_escape_quoting_style : -1) ++ ? (stdout_isatty () ? escape_quoting_style : -1) + : escape_quoting_style); + if (0 <= qs) + set_quoting_style (NULL, qs); |