summaryrefslogtreecommitdiff
path: root/source/a
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2021-09-25 01:05:55 +0000
committerEric Hameleers <alien@slackware.com>2021-09-25 08:59:58 +0200
commit33d703602d5c2f4d51f5a253fbc3939d30729aaf (patch)
tree4eaf2e003461a6cd41b4c67bb2c7556569b6f7b4 /source/a
parent0f7d38bee156c0926945743e1902ece2b531809f (diff)
downloadcurrent-33d703602d5c2f4d51f5a253fbc3939d30729aaf.tar.gz
Sat Sep 25 01:05:55 UTC 202120210925010555
a/coreutils-9.0-x86_64-1.txz: Upgraded. Thanks to GazL for pointing out where I needed to be looking in the code to stick with the traditional (for us, anyway) ls quoting style. n/ca-certificates-20210924-noarch-1.txz: Upgraded. Removed DST_Root_CA_X3.crt. n/cifs-utils-6.14-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/a')
-rwxr-xr-xsource/a/coreutils/coreutils.SlackBuild2
-rw-r--r--source/a/coreutils/no_ls_quoting.patch52
2 files changed, 12 insertions, 42 deletions
diff --git a/source/a/coreutils/coreutils.SlackBuild b/source/a/coreutils/coreutils.SlackBuild
index 3ba9bebe..7115320b 100755
--- a/source/a/coreutils/coreutils.SlackBuild
+++ b/source/a/coreutils/coreutils.SlackBuild
@@ -24,7 +24,7 @@ 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) "}
diff --git a/source/a/coreutils/no_ls_quoting.patch b/source/a/coreutils/no_ls_quoting.patch
index bfc9d018..b8643c40 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);