diff options
Diffstat (limited to 'source/a/coreutils')
| -rwxr-xr-x | source/a/coreutils/coreutils.SlackBuild | 17 | ||||
| -rw-r--r-- | source/a/coreutils/doinst.sh | 3 | ||||
| -rw-r--r-- | source/a/coreutils/no_ls_quoting.patch | 41 |
3 files changed, 56 insertions, 5 deletions
diff --git a/source/a/coreutils/coreutils.SlackBuild b/source/a/coreutils/coreutils.SlackBuild index 3bd8e5211..a085e605f 100755 --- a/source/a/coreutils/coreutils.SlackBuild +++ b/source/a/coreutils/coreutils.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2012 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2005-2016 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,14 +22,14 @@ PKGNAM=coreutils VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:--j6} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -40,8 +40,8 @@ CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" @@ -88,6 +88,9 @@ find . \ # Patch uname to correctly display CPU information: zcat $CWD/$PKGNAM.uname.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 +# 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 + # 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' @@ -107,6 +110,7 @@ DEFAULT_POSIX2_VERSION=199209 \ --sysconfdir=/etc \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --without-gmp \ + --enable-install-program=arch \ --build=$ARCH-slackware-linux make $NUMJOBS || make || exit 1 @@ -131,6 +135,9 @@ mv $PKG/usr/man/man1/mktemp.1 $PKG/usr/man/man1/mktemp-gnu.1 # Oh well, this is what we've done for years, and nobody's complained... rm -rf $PKG/usr/share/locale/*/LC_TIME +# Move "arch" to /bin +mv $PKG/usr/bin/arch $PKG/bin + # These are important enough that they should probably all go into /bin at this # point... Having some of them unavailable when /usr isn't mounted is just a # source of unending bug reports for various third party applications. diff --git a/source/a/coreutils/doinst.sh b/source/a/coreutils/doinst.sh index b1a6112ff..73403aa5b 100644 --- a/source/a/coreutils/doinst.sh +++ b/source/a/coreutils/doinst.sh @@ -11,3 +11,6 @@ config() { } config etc/DIR_COLORS.new +# This is needed to prevent installpkg from trippping over itself: +PATH=/bin:$PATH + diff --git a/source/a/coreutils/no_ls_quoting.patch b/source/a/coreutils/no_ls_quoting.patch new file mode 100644 index 000000000..bfc9d0187 --- /dev/null +++ b/source/a/coreutils/no_ls_quoting.patch @@ -0,0 +1,41 @@ +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; + } |