diff --git a/coreutils-8.25-DIR_COLORS.patch b/coreutils-8.25-DIR_COLORS.patch index 546241b..54a96eb 100644 --- a/coreutils-8.25-DIR_COLORS.patch +++ b/coreutils-8.25-DIR_COLORS.patch @@ -4,16 +4,16 @@ Date: Fri, 17 Jun 2016 16:58:18 +0200 Subject: [PATCH] downstream changes to default DIR_COLORS --- - DIR_COLORS | 38 ++++--- - DIR_COLORS.256color | 290 +++++++++++++++++++++++------------------------- - DIR_COLORS.lightbgcolor | 197 ++++++++++++++++---------------- - 3 files changed, 259 insertions(+), 266 deletions(-) + DIR_COLORS | 44 +++---- + DIR_COLORS.256color | 296 +++++++++++++++++++++++------------------------- + DIR_COLORS.lightbgcolor | 203 +++++++++++++++++---------------- + 3 files changed, 271 insertions(+), 272 deletions(-) diff --git a/DIR_COLORS b/DIR_COLORS index d2ea453..27af9d7 100644 --- a/DIR_COLORS +++ b/DIR_COLORS -@@ -1,6 +1,10 @@ +@@ -1,12 +1,18 @@ # Configuration file for dircolors, a utility to help you set the # LS_COLORS environment variable used by GNU ls with the --color option. @@ -24,7 +24,17 @@ index d2ea453..27af9d7 100644 # Copyright (C) 1996-2016 Free Software Foundation, Inc. # Copying and distribution of this file, with or without modification, # are permitted provided the copyright notice and this notice are preserved. -@@ -62,7 +66,7 @@ DOOR 01;35 # door + +-# The keywords COLOR, OPTIONS, and EIGHTBIT (honored by the +-# slackware version of dircolors) are recognized but ignored. ++# The keywords OPTIONS and EIGHTBIT (honored by the slackware version of ++# dircolors) are recognized but ignored. For compatibility reasons, the ++# pattern "^COLOR.*none" is recognized as a way to disable colorization. ++# See https://bugzilla.redhat.com/1349579 for details. + + # Below are TERM entries, which can be a glob patterns, to match + # against the TERM environment variable to determine if it is colorizable. +@@ -62,7 +68,7 @@ DOOR 01;35 # door BLK 40;33;01 # block device driver CHR 40;33;01 # character device driver ORPHAN 40;31;01 # symlink to nonexistent file, or non-stat'able file ... @@ -33,7 +43,7 @@ index d2ea453..27af9d7 100644 SETUID 37;41 # file that is setuid (u+s) SETGID 30;43 # file that is setgid (g+s) CAPABILITY 30;41 # file with capability -@@ -183,21 +187,21 @@ EXEC 01;32 +@@ -183,21 +189,21 @@ EXEC 01;32 .ogx 01;35 # audio formats @@ -75,7 +85,7 @@ diff --git a/DIR_COLORS.256color b/DIR_COLORS.256color index d2ea453..74c34ba 100644 --- a/DIR_COLORS.256color +++ b/DIR_COLORS.256color -@@ -1,5 +1,8 @@ +@@ -1,45 +1,22 @@ -# Configuration file for dircolors, a utility to help you set the -# LS_COLORS environment variable used by GNU ls with the --color option. +# Configuration file for the 256color ls utility @@ -86,7 +96,14 @@ index d2ea453..74c34ba 100644 # Copyright (C) 1996-2016 Free Software Foundation, Inc. # Copying and distribution of this file, with or without modification, -@@ -10,36 +13,8 @@ + # are permitted provided the copyright notice and this notice are preserved. + +-# The keywords COLOR, OPTIONS, and EIGHTBIT (honored by the +-# slackware version of dircolors) are recognized but ignored. ++# The keywords OPTIONS and EIGHTBIT (honored by the slackware version of ++# dircolors) are recognized but ignored. For compatibility reasons, the ++# pattern "^COLOR.*none" is recognized as a way to disable colorization. ++# See https://bugzilla.redhat.com/1349579 for details. # Below are TERM entries, which can be a glob patterns, to match # against the TERM environment variable to determine if it is colorizable. @@ -125,7 +142,7 @@ index d2ea453..74c34ba 100644 # Below are the color init strings for the basic file types. A color init # string consists of one or more of the following numeric codes: -@@ -49,29 +24,40 @@ TERM xterm* +@@ -49,29 +26,40 @@ TERM xterm* # 30=black 31=red 32=green 33=yellow 34=blue 35=magenta 36=cyan 37=white # Background color codes: # 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white @@ -182,7 +199,7 @@ index d2ea453..74c34ba 100644 # List any file extensions like '.gz' or '.tar' that you would like ls # to colorize below. Put the extension, a space, and the color init string. -@@ -89,115 +75,115 @@ EXEC 01;32 +@@ -89,115 +77,115 @@ EXEC 01;32 #.csh 01;32 # archives or compressed (bright red) @@ -406,7 +423,7 @@ diff --git a/DIR_COLORS.lightbgcolor b/DIR_COLORS.lightbgcolor index d2ea453..95d6879 100644 --- a/DIR_COLORS.lightbgcolor +++ b/DIR_COLORS.lightbgcolor -@@ -1,5 +1,8 @@ +@@ -1,12 +1,17 @@ -# Configuration file for dircolors, a utility to help you set the -# LS_COLORS environment variable used by GNU ls with the --color option. +# Configuration file for the color ls utility - modified for lighter backgrounds @@ -417,7 +434,18 @@ index d2ea453..95d6879 100644 # Copyright (C) 1996-2016 Free Software Foundation, Inc. # Copying and distribution of this file, with or without modification, -@@ -52,17 +55,17 @@ TERM xterm* + # are permitted provided the copyright notice and this notice are preserved. + +-# The keywords COLOR, OPTIONS, and EIGHTBIT (honored by the +-# slackware version of dircolors) are recognized but ignored. ++# The keywords OPTIONS and EIGHTBIT (honored by the slackware version of ++# dircolors) are recognized but ignored. For compatibility reasons, the ++# pattern "^COLOR.*none" is recognized as a way to disable colorization. ++# See https://bugzilla.redhat.com/1349579 for details. + + # Below are TERM entries, which can be a glob patterns, to match + # against the TERM environment variable to determine if it is colorizable. +@@ -52,17 +57,17 @@ TERM xterm* #NORMAL 00 # no color code at all #FILE 00 # regular file: use no color at all RESET 0 # reset to "normal" color @@ -440,7 +468,7 @@ index d2ea453..95d6879 100644 SETUID 37;41 # file that is setuid (u+s) SETGID 30;43 # file that is setgid (g+s) CAPABILITY 30;41 # file with capability -@@ -71,7 +74,7 @@ OTHER_WRITABLE 34;42 # dir that is other-writable (o+w) and not sticky +@@ -71,7 +76,7 @@ OTHER_WRITABLE 34;42 # dir that is other-writable (o+w) and not sticky STICKY 37;44 # dir with the sticky bit set (+t) and not other-writable # This is for files with execute permission: @@ -449,7 +477,7 @@ index d2ea453..95d6879 100644 # List any file extensions like '.gz' or '.tar' that you would like ls # to colorize below. Put the extension, a space, and the color init string. -@@ -88,99 +91,99 @@ EXEC 01;32 +@@ -88,99 +93,99 @@ EXEC 01;32 #.sh 01;32 #.csh 01;32 diff --git a/coreutils.spec b/coreutils.spec index b9801ec..e4b0f45 100644 --- a/coreutils.spec +++ b/coreutils.spec @@ -1,7 +1,7 @@ Summary: A set of basic GNU tools commonly used in shell scripts Name: coreutils Version: 8.25 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv3+ Group: System Environment/Base Url: http://www.gnu.org/software/coreutils/ @@ -354,6 +354,9 @@ fi %license COPYING %changelog +* Mon Jul 11 2016 Kamil Dudka - 8.25-12 +- clarify recognition of "^COLOR.*none" in /etc/DIR_COLORS (#1349579) + * Thu Jul 07 2016 Jakub Martisko - 8.25-11 - switch to UTF8 locale when (un)expand input contains BOM header (#1158494)