rpms/coreutils
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Resolve: #1335320 - sync /etc/DIR_COLORS with latest upstream

Browse Source
This commit is contained in:
Kamil Dudka 2016-06-17 16:19:35 +02:00
parent 28edec2fbc
commit 50e40c5f2b
4 changed files with 95 additions and 243 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
coreutils-DIR_COLORS
View File

@ -1,34 +1,23 @@
# Configuration file for the color ls utility # Configuration file for dircolors, a utility to help you set the
# Synchronized with coreutils 8.5 dircolors # LS_COLORS environment variable used by GNU ls with the --color option.
# This file goes in the /etc directory, and must be world readable. # This file goes in the /etc directory, and must be world readable.
# You can copy this file to .dir_colors in your $HOME directory to override # You can copy this file to .dir_colors in your $HOME directory to override
# the system defaults. # the system defaults.
# COLOR needs one of these arguments: 'tty' colorizes output to ttys, but not # Copyright (C) 1996-2016 Free Software Foundation, Inc.
# pipes. 'all' adds color characters to all output. 'none' shuts colorization # Copying and distribution of this file, with or without modification,
# off. # are permitted provided the copyright notice and this notice are preserved.
COLOR tty
# Extra command line options for ls go here. # The keywords COLOR, OPTIONS, and EIGHTBIT (honored by the
# Basically these ones are: # slackware version of dircolors) are recognized but ignored.
# -F = show '/' for dirs, '*' for executables, etc.
# -T 0 = don't trust tab spacing when formatting ls output.
OPTIONS -F -T 0
# Below, there should be one TERM entry for each termtype that is colorizable # Below are TERM entries, which can be a glob patterns, to match
# against the TERM environment variable to determine if it is colorizable.
TERM Eterm TERM Eterm
TERM ansi TERM ansi
TERM color-xterm TERM color-xterm
TERM con132x25 TERM con[0-9]*x[0-9]*
TERM con132x30
TERM con132x43
TERM con132x60
TERM con80x25
TERM con80x28
TERM con80x30
TERM con80x43
TERM con80x50
TERM con80x60
TERM cons25 TERM cons25
TERM console TERM console
TERM cygwin TERM cygwin
@ -47,34 +36,14 @@ TERM mach-gnu-color
TERM mlterm TERM mlterm
TERM putty TERM putty
TERM putty-256color TERM putty-256color
TERM rxvt TERM rxvt*
TERM rxvt-256color TERM screen*
TERM rxvt-cygwin
TERM rxvt-cygwin-native
TERM rxvt-unicode
TERM rxvt-unicode-256color
TERM rxvt-unicode256
TERM screen
TERM screen-256color
TERM screen-256color-bce
TERM screen-bce
TERM screen-w
TERM screen.Eterm
TERM screen.rxvt
TERM screen.linux
TERM st TERM st
TERM st-256color TERM st-256color
TERM terminator TERM terminator
TERM tmux*
TERM vt100 TERM vt100
TERM xterm TERM xterm*
TERM xterm-16color
TERM xterm-256color
TERM xterm-88color
TERM xterm-color
TERM xterm-debian
# EIGHTBIT, followed by '1' for on, '0' for off. (8-bit output)
EIGHTBIT 1
# Below are the color init strings for the basic file types. A color init # 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: # string consists of one or more of the following numeric codes:
@ -85,10 +54,10 @@ EIGHTBIT 1
# Background color codes: # Background color codes:
# 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white # 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white
#NORMAL 00 # no color code at all #NORMAL 00 # no color code at all
#FILE 00 # normal file, use no color at all #FILE 00 # regular file: use no color at all
RESET 0 # reset to "normal" color RESET 0 # reset to "normal" color
DIR 01;34 # directory DIR 01;34 # directory
LINK 01;36 # symbolic link (If you set this to 'target' instead of a LINK 01;36 # symbolic link. (If you set this to 'target' instead of a
# numerical value, the color is as for the file pointed to.) # numerical value, the color is as for the file pointed to.)
MULTIHARDLINK 00 # regular file with more than one link MULTIHARDLINK 00 # regular file with more than one link
FIFO 40;33 # pipe FIFO 40;33 # pipe
@ -96,7 +65,7 @@ SOCK 01;35 # socket
DOOR 01;35 # door DOOR 01;35 # door
BLK 40;33;01 # block device driver BLK 40;33;01 # block device driver
CHR 40;33;01 # character device driver CHR 40;33;01 # character device driver
ORPHAN 40;31;01 # symlink to nonexistent file, or non-stat'able file ORPHAN 40;31;01 # symlink to nonexistent file, or non-stat'able file ...
MISSING 01;05;37;41 # ... and the files they point to MISSING 01;05;37;41 # ... and the files they point to
SETUID 37;41 # file that is setuid (u+s) SETUID 37;41 # file that is setuid (u+s)
SETGID 30;43 # file that is setgid (g+s) SETGID 30;43 # file that is setgid (g+s)
@ -111,12 +80,15 @@ EXEC 01;32
# List any file extensions like '.gz' or '.tar' that you would like ls # 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. # to colorize below. Put the extension, a space, and the color init string.
# (and any comments you want to add after a '#') # (and any comments you want to add after a '#')
# executables (bright green)
#.cmd 01;32 # If you use DOS-style suffixes, you may want to uncomment the following:
#.cmd 01;32 # executables (bright green)
#.exe 01;32 #.exe 01;32
#.com 01;32 #.com 01;32
#.btm 01;32 #.btm 01;32
#.bat 01;32 #.bat 01;32
# Or if you want to colorize scripts even if they do not have the
# executable bit actually set.
#.sh 01;32 #.sh 01;32
#.csh 01;32 #.csh 01;32
@ -163,7 +135,7 @@ EXEC 01;32
.rz 01;31 .rz 01;31
.cab 01;31 .cab 01;31
# image formats (magenta) # image formats
.jpg 01;35 .jpg 01;35
.jpeg 01;35 .jpeg 01;35
.gif 01;35 .gif 01;35
@ -214,7 +186,7 @@ EXEC 01;32
.ogv 01;35 .ogv 01;35
.ogx 01;35 .ogx 01;35
# audio formats (cyan) # audio formats
.aac 01;36 .aac 01;36
.au 01;36 .au 01;36
.flac 01;36 .flac 01;36
@ -233,32 +205,3 @@ EXEC 01;32
.opus 01;36 .opus 01;36
.spx 01;36 .spx 01;36
.xspf 01;36 .xspf 01;36
# colorize binary documents (brown)
#.pdf 00;33
#.ps 00;33
#.ps.gz 00;33
#.tex 00;33
#.xls 00;33
#.xlsx 00;33
#.ppt 00;33
#.pptx 00;33
#.rtf 00;33
#.doc 00;33
#.docx 00;33
#.odt 00;33
#.ods 00;33
#.odp 00;33
#.epub 00;33
#.abw 00;33
#.wpd 00;33
#
# colorize text documents (brown)
#.txt 00;33
#.patch 00;33
#.diff 00;33
#.log 00;33
#.htm 00;33
#.html 00;33
#.shtml 00;33
#.xml 00;33

91
coreutils-DIR_COLORS.256color
View File

@ -1,39 +1,28 @@
# Configuration file for the 256color ls utility # Configuration file for the 256color ls utility
# This file goes in the /etc directory, and must be world readable. # This file goes in the /etc directory, and must be world readable.
# Synchronized with coreutils 8.5 dircolors
# You can copy this file to .dir_colors in your $HOME directory to override # You can copy this file to .dir_colors in your $HOME directory to override
# the system defaults. # the system defaults.
# In the case that you are not satisfied with supplied colors, please
# submit your color configuration or attach your file with colors readable
# on ALL color background schemas (white,gray,black) to RedHat Bugzilla
# ticket on https://bugzilla.redhat.com/show_bug.cgi?id=429121 . TIA.
# Please just keep ls color conventions from 8 color scheme.
# COLOR needs one of these arguments: 'tty' colorizes output to ttys, but not # Copyright (C) 1996-2016 Free Software Foundation, Inc.
# pipes. 'all' adds color characters to all output. 'none' shuts colorization # Copying and distribution of this file, with or without modification,
# off. # are permitted provided the copyright notice and this notice are preserved.
COLOR tty
# Extra command line options for ls go here. # The keywords COLOR, OPTIONS, and EIGHTBIT (honored by the
# Basically these ones are: # slackware version of dircolors) are recognized but ignored.
# -F = show '/' for dirs, '*' for executables, etc.
# -T 0 = don't trust tab spacing when formatting ls output.
OPTIONS -F -T 0
# Below, there should be one TERM entry for each termtype that is colorizable # Below are TERM entries, which can be a glob patterns, to match
# against the TERM environment variable to determine if it is colorizable.
TERM *256color* TERM *256color*
TERM rxvt-unicode256 TERM rxvt-unicode256
# EIGHTBIT, followed by '1' for on, '0' for off. (8-bit output)
EIGHTBIT 1
# Below are the color init strings for the basic file types. A color init # 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: # string consists of one or more of the following numeric codes:
# Attribute codes: # Attribute codes:
# 00=none 01=bold 04=underscore 05=blink 07=reverse 08=concealed # 00=none 01=bold 04=underscore 05=blink 07=reverse 08=concealed
# Text color(8 colors mode) codes: # Text color codes:
# 30=black 31=red 32=green 33=yellow 34=blue 35=magenta 36=cyan 37=white # 30=black 31=red 32=green 33=yellow 34=blue 35=magenta 36=cyan 37=white
# Background color(8 colors mode) codes: # Background color codes:
# 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white # 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white
# Text color(256 colors mode) codes: # Text color(256 colors mode) codes:
# Valid syntax for text 256color is 38;5;<color number> , where color number # Valid syntax for text 256color is 38;5;<color number> , where color number
@ -46,11 +35,11 @@ EIGHTBIT 1
# You may find following command useful to search the best one for you: # You may find following command useful to search the best one for you:
# for ((x=0; x<=255; x++));do echo -e "${x}:\033[48;5;${x}mcolor\033[000m";done # for ((x=0; x<=255; x++));do echo -e "${x}:\033[48;5;${x}mcolor\033[000m";done
#NORMAL 00 # global default, no color code at all #NORMAL 00 # no color code at all
#FILE 00 # normal file, use no color at all #FILE 00 # regular file: use no color at all
RESET 0 # reset to "normal" color RESET 0 # reset to "normal" color
DIR 38;5;33 # directory DIR 38;5;33 # directory
LINK 38;5;51 # symbolic link (If you set this to 'target' instead of a LINK 38;5;51 # symbolic link. (If you set this to 'target' instead of a
# numerical value, the color is as for the file pointed to.) # numerical value, the color is as for the file pointed to.)
MULTIHARDLINK 00 # regular file with more than one link MULTIHARDLINK 00 # regular file with more than one link
FIFO 40;38;5;11 # pipe FIFO 40;38;5;11 # pipe
@ -58,7 +47,7 @@ SOCK 38;5;13 # socket
DOOR 38;5;5 # door DOOR 38;5;5 # door
BLK 48;5;232;38;5;11 # block device driver BLK 48;5;232;38;5;11 # block device driver
CHR 48;5;232;38;5;3 # character device driver CHR 48;5;232;38;5;3 # character device driver
ORPHAN 48;5;232;38;5;9 # symlink to nonexistent file, or non-stat'able file ORPHAN 48;5;232;38;5;9 # symlink to nonexistent file, or non-stat'able file ...
MISSING 01;05;37;41 # ... and the files they point to MISSING 01;05;37;41 # ... and the files they point to
SETUID 48;5;196;38;5;15 # file that is setuid (u+s) SETUID 48;5;196;38;5;15 # file that is setuid (u+s)
SETGID 48;5;11;38;5;16 # file that is setgid (g+s) SETGID 48;5;11;38;5;16 # file that is setgid (g+s)
@ -73,14 +62,17 @@ EXEC 38;5;40
# List any file extensions like '.gz' or '.tar' that you would like ls # 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. # to colorize below. Put the extension, a space, and the color init string.
# (and any comments you want to add after a '#') # (and any comments you want to add after a '#')
# executables (bright green)
#.cmd 38;5;34 # If you use DOS-style suffixes, you may want to uncomment the following:
#.exe 38;5;34 #.cmd 01;32 # executables (bright green)
#.com 38;5;34 #.exe 01;32
#.btm 38;5;34 #.com 01;32
#.bat 38;5;34 #.btm 01;32
#.sh 38;5;34 #.bat 01;32
#.csh 38;5;34 # Or if you want to colorize scripts even if they do not have the
# executable bit actually set.
#.sh 01;32
#.csh 01;32
# archives or compressed (bright red) # archives or compressed (bright red)
.tar 38;5;9 .tar 38;5;9
@ -125,7 +117,7 @@ EXEC 38;5;40
.rz 38;5;9 .rz 38;5;9
.cab 38;5;9 .cab 38;5;9
# image formats (magenta) # image formats
.jpg 38;5;13 .jpg 38;5;13
.jpeg 38;5;13 .jpeg 38;5;13
.gif 38;5;13 .gif 38;5;13
@ -176,7 +168,7 @@ EXEC 38;5;40
.ogv 38;5;13 .ogv 38;5;13
.ogx 38;5;13 .ogx 38;5;13
# audio formats (cyan) # audio formats
.aac 38;5;45 .aac 38;5;45
.au 38;5;45 .au 38;5;45
.flac 38;5;45 .flac 38;5;45
@ -195,32 +187,3 @@ EXEC 38;5;40
.opus 38;5;45 .opus 38;5;45
.spx 38;5;45 .spx 38;5;45
.xspf 38;5;45 .xspf 38;5;45
# colorize binary documents (brown)
#.pdf 00;33
#.ps 00;33
#.ps.gz 00;33
#.tex 00;33
#.xls 00;33
#.xlsx 00;33
#.ppt 00;33
#.pptx 00;33
#.rtf 00;33
#.doc 00;33
#.docx 00;33
#.odt 00;33
#.ods 00;33
#.odp 00;33
#.epub 00;33
#.abw 00;33
#.wpd 00;33
#
# colorize text documents (brown)
#.txt 00;33
#.patch 00;33
#.diff 00;33
#.log 00;33
#.htm 00;33
#.html 00;33
#.shtml 00;33
#.xml 00;33

115
coreutils-DIR_COLORS.lightbgcolor
View File

@ -1,34 +1,22 @@
# Configuration file for the color ls utility - modified for lighter backgrounds # Configuration file for the color ls utility - modified for lighter backgrounds
# Synchronized with coreutils 8.5 dircolors
# This file goes in the /etc directory, and must be world readable. # This file goes in the /etc directory, and must be world readable.
# You can copy this file to .dir_colors in your $HOME directory to override # You can copy this file to .dir_colors in your $HOME directory to override
# the system defaults. # the system defaults.
# COLOR needs one of these arguments: 'tty' colorizes output to ttys, but not # Copyright (C) 1996-2016 Free Software Foundation, Inc.
# pipes. 'all' adds color characters to all output. 'none' shuts colorization # Copying and distribution of this file, with or without modification,
# off. # are permitted provided the copyright notice and this notice are preserved.
COLOR tty
# Extra command line options for ls go here. # The keywords COLOR, OPTIONS, and EIGHTBIT (honored by the
# Basically these ones are: # slackware version of dircolors) are recognized but ignored.
# -F = show '/' for dirs, '*' for executables, etc.
# -T 0 = don't trust tab spacing when formatting ls output.
OPTIONS -F -T 0
# Below, there should be one TERM entry for each termtype that is colorizable # Below are TERM entries, which can be a glob patterns, to match
# against the TERM environment variable to determine if it is colorizable.
TERM Eterm TERM Eterm
TERM ansi TERM ansi
TERM color-xterm TERM color-xterm
TERM con132x25 TERM con[0-9]*x[0-9]*
TERM con132x30
TERM con132x43
TERM con132x60
TERM con80x25
TERM con80x28
TERM con80x30
TERM con80x43
TERM con80x50
TERM con80x60
TERM cons25 TERM cons25
TERM console TERM console
TERM cygwin TERM cygwin
@ -47,34 +35,14 @@ TERM mach-gnu-color
TERM mlterm TERM mlterm
TERM putty TERM putty
TERM putty-256color TERM putty-256color
TERM rxvt TERM rxvt*
TERM rxvt-256color TERM screen*
TERM rxvt-cygwin
TERM rxvt-cygwin-native
TERM rxvt-unicode
TERM rxvt-unicode-256color
TERM rxvt-unicode256
TERM screen
TERM screen-256color
TERM screen-256color-bce
TERM screen-bce
TERM screen-w
TERM screen.Eterm
TERM screen.rxvt
TERM screen.linux
TERM st TERM st
TERM st-256color TERM st-256color
TERM terminator TERM terminator
TERM tmux*
TERM vt100 TERM vt100
TERM xterm TERM xterm*
TERM xterm-16color
TERM xterm-256color
TERM xterm-88color
TERM xterm-color
TERM xterm-debian
# EIGHTBIT, followed by '1' for on, '0' for off. (8-bit output)
EIGHTBIT 1
# Below are the color init strings for the basic file types. A color init # 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: # string consists of one or more of the following numeric codes:
@ -85,10 +53,10 @@ EIGHTBIT 1
# Background color codes: # Background color codes:
# 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white # 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white
#NORMAL 00 # no color code at all #NORMAL 00 # no color code at all
#FILE 00 # normal file, use no color at all #FILE 00 # regular file: use no color at all
RESET 0 # reset to "normal" color RESET 0 # reset to "normal" color
DIR 00;34 # directory DIR 00;34 # directory
LINK 00;36 # symbolic link (If you set this to 'target' instead of a LINK 00;36 # symbolic link. (If you set this to 'target' instead of a
# numerical value, the color is as for the file pointed to.) # numerical value, the color is as for the file pointed to.)
MULTIHARDLINK 00 # regular file with more than one link MULTIHARDLINK 00 # regular file with more than one link
FIFO 40;33 # pipe FIFO 40;33 # pipe
@ -96,7 +64,7 @@ SOCK 00;35 # socket
DOOR 00;35 # door DOOR 00;35 # door
BLK 40;33;01 # block device driver BLK 40;33;01 # block device driver
CHR 40;33;01 # character device driver CHR 40;33;01 # character device driver
ORPHAN 40;31;01 # symlink to nonexistent file, or non-stat'able file ORPHAN 40;31;01 # symlink to nonexistent file, or non-stat'able file ...
MISSING 01;05;37;41 # ... and the files they point to MISSING 01;05;37;41 # ... and the files they point to
SETUID 37;41 # file that is setuid (u+s) SETUID 37;41 # file that is setuid (u+s)
SETGID 30;43 # file that is setgid (g+s) SETGID 30;43 # file that is setgid (g+s)
@ -111,13 +79,17 @@ EXEC 00;32
# List any file extensions like '.gz' or '.tar' that you would like ls # 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. # to colorize below. Put the extension, a space, and the color init string.
# (and any comments you want to add after a '#') # (and any comments you want to add after a '#')
#.cmd 00;32 # executables (green)
#.exe 00;32 # If you use DOS-style suffixes, you may want to uncomment the following:
#.com 00;32 #.cmd 01;32 # executables (bright green)
#.btm 00;32 #.exe 01;32
#.bat 00;32 #.com 01;32
#.sh 00;32 #.btm 01;32
#.csh 00;32 #.bat 01;32
# Or if you want to colorize scripts even if they do not have the
# executable bit actually set.
#.sh 01;32
#.csh 01;32
# archives or compressed (red) # archives or compressed (red)
.tar 00;31 .tar 00;31
@ -162,7 +134,7 @@ EXEC 00;32
.rz 00;31 .rz 00;31
.cab 00;31 .cab 00;31
# image formats (magenta) # image formats
.jpg 00;35 .jpg 00;35
.jpeg 00;35 .jpeg 00;35
.gif 00;35 .gif 00;35
@ -213,7 +185,7 @@ EXEC 00;32
.ogv 00;35 .ogv 00;35
.ogx 00;35 .ogx 00;35
# audio formats (cyan) # audio formats
.aac 00;36 .aac 00;36
.au 00;36 .au 00;36
.flac 00;36 .flac 00;36
@ -232,32 +204,3 @@ EXEC 00;32
.opus 00;36 .opus 00;36
.spx 00;36 .spx 00;36
.xspf 00;36 .xspf 00;36
# colorize binary documents (brown)
#.pdf 00;33
#.ps 00;33
#.ps.gz 00;33
#.tex 00;33
#.xls 00;33
#.xlsx 00;33
#.ppt 00;33
#.pptx 00;33
#.rtf 00;33
#.doc 00;33
#.docx 00;33
#.odt 00;33
#.ods 00;33
#.odp 00;33
#.epub 00;33
#.abw 00;33
#.wpd 00;33
#
# colorize text documents (brown)
#.txt 00;33
#.patch 00;33
#.diff 00;33
#.log 00;33
#.htm 00;33
#.html 00;33
#.shtml 00;33
#.xml 00;33

5
coreutils.spec
View File

@ -1,7 +1,7 @@
Summary: A set of basic GNU tools commonly used in shell scripts Summary: A set of basic GNU tools commonly used in shell scripts
Name: coreutils Name: coreutils
Version: 8.25 Version: 8.25
Release: 7%{?dist} Release: 8%{?dist}
License: GPLv3+ License: GPLv3+
Group: System Environment/Base Group: System Environment/Base
Url: http://www.gnu.org/software/coreutils/ Url: http://www.gnu.org/software/coreutils/
@ -347,6 +347,9 @@ fi
%license COPYING %license COPYING
%changelog %changelog
* Fri Jun 17 2016 Kamil Dudka <kdudka@redhat.com> - 8.25-8
- sync /etc/DIR_COLORS with latest upstream (#1335320)
* Wed Jun 15 2016 Kamil Dudka <kdudka@redhat.com> - 8.25-7 * Wed Jun 15 2016 Kamil Dudka <kdudka@redhat.com> - 8.25-7
- handle info doc in RPM scriptlets of coreutils-common, which provides it - handle info doc in RPM scriptlets of coreutils-common, which provides it
- make sure that the license file is installed, even if coreutils-common is not - make sure that the license file is installed, even if coreutils-common is not