diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/coreutils/coreutils-8.25/disable-ls-output-quoting.patch | 49 | ||||
-rw-r--r-- | meta/recipes-core/coreutils/coreutils_8.25.bb | 1 |
2 files changed, 50 insertions, 0 deletions
diff --git a/meta/recipes-core/coreutils/coreutils-8.25/disable-ls-output-quoting.patch b/meta/recipes-core/coreutils/coreutils-8.25/disable-ls-output-quoting.patch new file mode 100644 index 0000000000..e68c213550 --- /dev/null +++ b/meta/recipes-core/coreutils/coreutils-8.25/disable-ls-output-quoting.patch | |||
@@ -0,0 +1,49 @@ | |||
1 | Subject: revert inconsistent ls quoting | ||
2 | |||
3 | This is a revert of upstream commit 109b9220cead6e979d22d16327c4d9f8350431cc. | ||
4 | |||
5 | Bug-Debian: https://bugs.debian.org/813164 | ||
6 | |||
7 | Upstream-Status: Submitted | ||
8 | |||
9 | Originally-by: Adam Borowski <kilobyte@angband.pl> | ||
10 | [PG: patch from https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=813164#78 ] | ||
11 | Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> | ||
12 | |||
13 | --- | ||
14 | |||
15 | --- coreutils-8.25.orig/NEWS | ||
16 | +++ coreutils-8.25/NEWS | ||
17 | @@ -71,9 +71,6 @@ GNU coreutils NEWS | ||
18 | df now prefers sources towards the root of a device when | ||
19 | eliding duplicate bind mounted entries. | ||
20 | |||
21 | - ls now quotes file names unambiguously and appropriate for use in a shell, | ||
22 | - when outputting to a terminal. | ||
23 | - | ||
24 | join, sort, uniq with --zero-terminated, now treat '\n' as a field delimiter. | ||
25 | |||
26 | ** Improvements | ||
27 | --- coreutils-8.25.orig/doc/coreutils.texi | ||
28 | +++ coreutils-8.25/doc/coreutils.texi | ||
29 | @@ -7750,8 +7750,8 @@ this"} in the default C locale. This lo | ||
30 | |||
31 | You can specify the default value of the @option{--quoting-style} option | ||
32 | with the environment variable @env{QUOTING_STYLE}@. If that environment | ||
33 | -variable is not set, the default value is @samp{shell-escape} when the | ||
34 | -output is a terminal, and @samp{literal} otherwise. | ||
35 | +variable is not set, the default value is @samp{literal}, but this | ||
36 | +default may change to @samp{shell} in a future version of this package. | ||
37 | |||
38 | @item --show-control-chars | ||
39 | @opindex --show-control-chars | ||
40 | --- coreutils-8.25.orig/src/ls.c | ||
41 | +++ coreutils-8.25/src/ls.c | ||
42 | @@ -1581,7 +1581,6 @@ decode_switches (int argc, char **argv) | ||
43 | if (isatty (STDOUT_FILENO)) | ||
44 | { | ||
45 | format = many_per_line; | ||
46 | - set_quoting_style (NULL, shell_escape_quoting_style); | ||
47 | /* See description of qmark_funny_chars, above. */ | ||
48 | qmark_funny_chars = true; | ||
49 | } | ||
diff --git a/meta/recipes-core/coreutils/coreutils_8.25.bb b/meta/recipes-core/coreutils/coreutils_8.25.bb index 245969d2b4..fc8d061d32 100644 --- a/meta/recipes-core/coreutils/coreutils_8.25.bb +++ b/meta/recipes-core/coreutils/coreutils_8.25.bb | |||
@@ -19,6 +19,7 @@ SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz;name=tarball \ | |||
19 | file://fix-selinux-flask.patch \ | 19 | file://fix-selinux-flask.patch \ |
20 | file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ | 20 | file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ |
21 | file://0001-uname-report-processor-and-hardware-correctly.patch \ | 21 | file://0001-uname-report-processor-and-hardware-correctly.patch \ |
22 | file://disable-ls-output-quoting.patch \ | ||
22 | " | 23 | " |
23 | 24 | ||
24 | SRC_URI[tarball.md5sum] = "070e43ba7f618d747414ef56ab248a48" | 25 | SRC_URI[tarball.md5sum] = "070e43ba7f618d747414ef56ab248a48" |