From 46ebf91d5fec0925458d6ddd5965d226f09d3797 Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Jun 17 2016 15:14:24 +0000 Subject: Related: #1335320 - maintain downstream DIR_COLOR* files as a patch ... against src/dircolors.hin rather than full copies of the file. There should be no user-visible change introduced by this commit. This is just to ease the maintenance -- the resulting files cannot diverge from upstream without any notice. --- diff --git a/coreutils-8.25-DIR_COLORS.patch b/coreutils-8.25-DIR_COLORS.patch new file mode 100644 index 0000000..546241b --- /dev/null +++ b/coreutils-8.25-DIR_COLORS.patch @@ -0,0 +1,643 @@ +From a13bc34f1eeebdf8b87e4b5a570341bb77a62f76 Mon Sep 17 00:00:00 2001 +From: Kamil Dudka +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(-) + +diff --git a/DIR_COLORS b/DIR_COLORS +index d2ea453..27af9d7 100644 +--- a/DIR_COLORS ++++ b/DIR_COLORS +@@ -1,6 +1,10 @@ + # Configuration file for dircolors, a utility to help you set the + # LS_COLORS environment variable used by GNU ls with the --color option. + ++# 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 ++# the system defaults. ++ + # 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 + 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 ... +-MISSING 00 # ... 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) + SETGID 30;43 # file that is setgid (g+s) + CAPABILITY 30;41 # file with capability +@@ -183,21 +187,21 @@ EXEC 01;32 + .ogx 01;35 + + # audio formats +-.aac 00;36 +-.au 00;36 +-.flac 00;36 +-.m4a 00;36 +-.mid 00;36 +-.midi 00;36 +-.mka 00;36 +-.mp3 00;36 +-.mpc 00;36 +-.ogg 00;36 +-.ra 00;36 +-.wav 00;36 ++.aac 01;36 ++.au 01;36 ++.flac 01;36 ++.m4a 01;36 ++.mid 01;36 ++.midi 01;36 ++.mka 01;36 ++.mp3 01;36 ++.mpc 01;36 ++.ogg 01;36 ++.ra 01;36 ++.wav 01;36 + + # http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions +-.oga 00;36 +-.opus 00;36 +-.spx 00;36 +-.xspf 00;36 ++.oga 01;36 ++.opus 01;36 ++.spx 01;36 ++.xspf 01;36 +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 @@ +-# 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 ++ ++# 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 ++# the system defaults. + + # Copyright (C) 1996-2016 Free Software Foundation, Inc. + # Copying and distribution of this file, with or without modification, +@@ -10,36 +13,8 @@ + + # 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 ansi +-TERM color-xterm +-TERM con[0-9]*x[0-9]* +-TERM cons25 +-TERM console +-TERM cygwin +-TERM dtterm +-TERM eterm-color +-TERM gnome +-TERM gnome-256color +-TERM hurd +-TERM jfbterm +-TERM konsole +-TERM kterm +-TERM linux +-TERM linux-c +-TERM mach-color +-TERM mach-gnu-color +-TERM mlterm +-TERM putty +-TERM putty-256color +-TERM rxvt* +-TERM screen* +-TERM st +-TERM st-256color +-TERM terminator +-TERM tmux* +-TERM vt100 +-TERM xterm* ++TERM *256color* ++TERM rxvt-unicode256 + + # 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* + # 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 ++# Text color(256 colors mode) codes: ++# Valid syntax for text 256color is 38;5; , where color number ++# is number between 0 and 255. ++# You may find following command useful to search the best one for you: ++# for ((x=0; x<=255; x++));do echo -e "${x}:\033[38;5;${x}mcolor\033[000m";done ++# Background color(256 colors mode) codes: ++# Valid syntax for background 256color is 48;5; , where ++# color number is number between 0 and 255. ++# 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 ++ + #NORMAL 00 # no color code at all + #FILE 00 # regular file: use no color at all + RESET 0 # reset to "normal" color +-DIR 01;34 # directory +-LINK 01;36 # symbolic link. (If you set this to 'target' instead of a ++DIR 38;5;33 # directory ++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.) + MULTIHARDLINK 00 # regular file with more than one link +-FIFO 40;33 # pipe +-SOCK 01;35 # socket +-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 ... +-MISSING 00 # ... and the files they point to +-SETUID 37;41 # file that is setuid (u+s) +-SETGID 30;43 # file that is setgid (g+s) +-CAPABILITY 30;41 # file with capability +-STICKY_OTHER_WRITABLE 30;42 # dir that is sticky and other-writable (+t,o+w) +-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 ++FIFO 40;38;5;11 # pipe ++SOCK 38;5;13 # socket ++DOOR 38;5;5 # door ++BLK 48;5;232;38;5;11 # block 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 ... ++MISSING 01;05;37;41 # ... and the files they point to ++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) ++CAPABILITY 48;5;196;38;5;226 # file with capability ++STICKY_OTHER_WRITABLE 48;5;10;38;5;16 # dir that is sticky and other-writable (+t,o+w) ++OTHER_WRITABLE 48;5;10;38;5;21 # dir that is other-writable (o+w) and not sticky ++STICKY 48;5;21;38;5;15 # dir with the sticky bit set (+t) and not other-writable + + # This is for files with execute permission: +-EXEC 01;32 ++EXEC 38;5;40 + + # 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 + #.csh 01;32 + + # archives or compressed (bright red) +-.tar 01;31 +-.tgz 01;31 +-.arc 01;31 +-.arj 01;31 +-.taz 01;31 +-.lha 01;31 +-.lz4 01;31 +-.lzh 01;31 +-.lzma 01;31 +-.tlz 01;31 +-.txz 01;31 +-.tzo 01;31 +-.t7z 01;31 +-.zip 01;31 +-.z 01;31 +-.Z 01;31 +-.dz 01;31 +-.gz 01;31 +-.lrz 01;31 +-.lz 01;31 +-.lzo 01;31 +-.xz 01;31 +-.bz2 01;31 +-.bz 01;31 +-.tbz 01;31 +-.tbz2 01;31 +-.tz 01;31 +-.deb 01;31 +-.rpm 01;31 +-.jar 01;31 +-.war 01;31 +-.ear 01;31 +-.sar 01;31 +-.rar 01;31 +-.alz 01;31 +-.ace 01;31 +-.zoo 01;31 +-.cpio 01;31 +-.7z 01;31 +-.rz 01;31 +-.cab 01;31 ++.tar 38;5;9 ++.tgz 38;5;9 ++.arc 38;5;9 ++.arj 38;5;9 ++.taz 38;5;9 ++.lha 38;5;9 ++.lz4 38;5;9 ++.lzh 38;5;9 ++.lzma 38;5;9 ++.tlz 38;5;9 ++.txz 38;5;9 ++.tzo 38;5;9 ++.t7z 38;5;9 ++.zip 38;5;9 ++.z 38;5;9 ++.Z 38;5;9 ++.dz 38;5;9 ++.gz 38;5;9 ++.lrz 38;5;9 ++.lz 38;5;9 ++.lzo 38;5;9 ++.xz 38;5;9 ++.bz2 38;5;9 ++.bz 38;5;9 ++.tbz 38;5;9 ++.tbz2 38;5;9 ++.tz 38;5;9 ++.deb 38;5;9 ++.rpm 38;5;9 ++.jar 38;5;9 ++.war 38;5;9 ++.ear 38;5;9 ++.sar 38;5;9 ++.rar 38;5;9 ++.alz 38;5;9 ++.ace 38;5;9 ++.zoo 38;5;9 ++.cpio 38;5;9 ++.7z 38;5;9 ++.rz 38;5;9 ++.cab 38;5;9 + + # image formats +-.jpg 01;35 +-.jpeg 01;35 +-.gif 01;35 +-.bmp 01;35 +-.pbm 01;35 +-.pgm 01;35 +-.ppm 01;35 +-.tga 01;35 +-.xbm 01;35 +-.xpm 01;35 +-.tif 01;35 +-.tiff 01;35 +-.png 01;35 +-.svg 01;35 +-.svgz 01;35 +-.mng 01;35 +-.pcx 01;35 +-.mov 01;35 +-.mpg 01;35 +-.mpeg 01;35 +-.m2v 01;35 +-.mkv 01;35 +-.webm 01;35 +-.ogm 01;35 +-.mp4 01;35 +-.m4v 01;35 +-.mp4v 01;35 +-.vob 01;35 +-.qt 01;35 +-.nuv 01;35 +-.wmv 01;35 +-.asf 01;35 +-.rm 01;35 +-.rmvb 01;35 +-.flc 01;35 +-.avi 01;35 +-.fli 01;35 +-.flv 01;35 +-.gl 01;35 +-.dl 01;35 +-.xcf 01;35 +-.xwd 01;35 +-.yuv 01;35 +-.cgm 01;35 +-.emf 01;35 ++.jpg 38;5;13 ++.jpeg 38;5;13 ++.gif 38;5;13 ++.bmp 38;5;13 ++.pbm 38;5;13 ++.pgm 38;5;13 ++.ppm 38;5;13 ++.tga 38;5;13 ++.xbm 38;5;13 ++.xpm 38;5;13 ++.tif 38;5;13 ++.tiff 38;5;13 ++.png 38;5;13 ++.svg 38;5;13 ++.svgz 38;5;13 ++.mng 38;5;13 ++.pcx 38;5;13 ++.mov 38;5;13 ++.mpg 38;5;13 ++.mpeg 38;5;13 ++.m2v 38;5;13 ++.mkv 38;5;13 ++.webm 38;5;13 ++.ogm 38;5;13 ++.mp4 38;5;13 ++.m4v 38;5;13 ++.mp4v 38;5;13 ++.vob 38;5;13 ++.qt 38;5;13 ++.nuv 38;5;13 ++.wmv 38;5;13 ++.asf 38;5;13 ++.rm 38;5;13 ++.rmvb 38;5;13 ++.flc 38;5;13 ++.avi 38;5;13 ++.fli 38;5;13 ++.flv 38;5;13 ++.gl 38;5;13 ++.dl 38;5;13 ++.xcf 38;5;13 ++.xwd 38;5;13 ++.yuv 38;5;13 ++.cgm 38;5;13 ++.emf 38;5;13 + + # http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions +-.ogv 01;35 +-.ogx 01;35 ++.ogv 38;5;13 ++.ogx 38;5;13 + + # audio formats +-.aac 00;36 +-.au 00;36 +-.flac 00;36 +-.m4a 00;36 +-.mid 00;36 +-.midi 00;36 +-.mka 00;36 +-.mp3 00;36 +-.mpc 00;36 +-.ogg 00;36 +-.ra 00;36 +-.wav 00;36 ++.aac 38;5;45 ++.au 38;5;45 ++.flac 38;5;45 ++.m4a 38;5;45 ++.mid 38;5;45 ++.midi 38;5;45 ++.mka 38;5;45 ++.mp3 38;5;45 ++.mpc 38;5;45 ++.ogg 38;5;45 ++.ra 38;5;45 ++.wav 38;5;45 + + # http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions +-.oga 00;36 +-.opus 00;36 +-.spx 00;36 +-.xspf 00;36 ++.oga 38;5;45 ++.opus 38;5;45 ++.spx 38;5;45 ++.xspf 38;5;45 +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 @@ +-# 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 ++ ++# 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 ++# the system defaults. + + # Copyright (C) 1996-2016 Free Software Foundation, Inc. + # Copying and distribution of this file, with or without modification, +@@ -52,17 +55,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 +-DIR 01;34 # directory +-LINK 01;36 # symbolic link. (If you set this to 'target' instead of a ++DIR 00;34 # directory ++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.) + MULTIHARDLINK 00 # regular file with more than one link + FIFO 40;33 # pipe +-SOCK 01;35 # socket +-DOOR 01;35 # door ++SOCK 00;35 # socket ++DOOR 00;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 ... +-MISSING 00 # ... 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) + 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 + STICKY 37;44 # dir with the sticky bit set (+t) and not other-writable + + # This is for files with execute permission: +-EXEC 01;32 ++EXEC 00;32 + + # 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 + #.sh 01;32 + #.csh 01;32 + +- # archives or compressed (bright red) +-.tar 01;31 +-.tgz 01;31 +-.arc 01;31 +-.arj 01;31 +-.taz 01;31 +-.lha 01;31 +-.lz4 01;31 +-.lzh 01;31 +-.lzma 01;31 +-.tlz 01;31 +-.txz 01;31 +-.tzo 01;31 +-.t7z 01;31 +-.zip 01;31 +-.z 01;31 +-.Z 01;31 +-.dz 01;31 +-.gz 01;31 +-.lrz 01;31 +-.lz 01;31 +-.lzo 01;31 +-.xz 01;31 +-.bz2 01;31 +-.bz 01;31 +-.tbz 01;31 +-.tbz2 01;31 +-.tz 01;31 +-.deb 01;31 +-.rpm 01;31 +-.jar 01;31 +-.war 01;31 +-.ear 01;31 +-.sar 01;31 +-.rar 01;31 +-.alz 01;31 +-.ace 01;31 +-.zoo 01;31 +-.cpio 01;31 +-.7z 01;31 +-.rz 01;31 +-.cab 01;31 ++# archives or compressed (red) ++.tar 00;31 ++.tgz 00;31 ++.arc 00;31 ++.arj 00;31 ++.taz 00;31 ++.lha 00;31 ++.lz4 00;31 ++.lzh 00;31 ++.lzma 00;31 ++.tlz 00;31 ++.txz 00;31 ++.tzo 00;31 ++.t7z 00;31 ++.zip 00;31 ++.z 00;31 ++.Z 00;31 ++.dz 00;31 ++.gz 00;31 ++.lrz 00;31 ++.lz 00;31 ++.lzo 00;31 ++.xz 00;31 ++.bz2 00;31 ++.bz 00;31 ++.tbz 00;31 ++.tbz2 00;31 ++.tz 00;31 ++.deb 00;31 ++.rpm 00;31 ++.jar 00;31 ++.war 00;31 ++.ear 00;31 ++.sar 00;31 ++.rar 00;31 ++.alz 00;31 ++.ace 00;31 ++.zoo 00;31 ++.cpio 00;31 ++.7z 00;31 ++.rz 00;31 ++.cab 00;31 + + # image formats +-.jpg 01;35 +-.jpeg 01;35 +-.gif 01;35 +-.bmp 01;35 +-.pbm 01;35 +-.pgm 01;35 +-.ppm 01;35 +-.tga 01;35 +-.xbm 01;35 +-.xpm 01;35 +-.tif 01;35 +-.tiff 01;35 +-.png 01;35 +-.svg 01;35 +-.svgz 01;35 +-.mng 01;35 +-.pcx 01;35 +-.mov 01;35 +-.mpg 01;35 +-.mpeg 01;35 +-.m2v 01;35 +-.mkv 01;35 +-.webm 01;35 +-.ogm 01;35 +-.mp4 01;35 +-.m4v 01;35 +-.mp4v 01;35 +-.vob 01;35 +-.qt 01;35 +-.nuv 01;35 +-.wmv 01;35 +-.asf 01;35 +-.rm 01;35 +-.rmvb 01;35 +-.flc 01;35 +-.avi 01;35 +-.fli 01;35 +-.flv 01;35 +-.gl 01;35 +-.dl 01;35 +-.xcf 01;35 +-.xwd 01;35 +-.yuv 01;35 +-.cgm 01;35 +-.emf 01;35 ++.jpg 00;35 ++.jpeg 00;35 ++.gif 00;35 ++.bmp 00;35 ++.pbm 00;35 ++.pgm 00;35 ++.ppm 00;35 ++.tga 00;35 ++.xbm 00;35 ++.xpm 00;35 ++.tif 00;35 ++.tiff 00;35 ++.png 00;35 ++.svg 00;35 ++.svgz 00;35 ++.mng 00;35 ++.pcx 00;35 ++.mov 00;35 ++.mpg 00;35 ++.mpeg 00;35 ++.m2v 00;35 ++.mkv 00;35 ++.webm 00;35 ++.ogm 00;35 ++.mp4 00;35 ++.m4v 00;35 ++.mp4v 00;35 ++.vob 00;35 ++.qt 00;35 ++.nuv 00;35 ++.wmv 00;35 ++.asf 00;35 ++.rm 00;35 ++.rmvb 00;35 ++.flc 00;35 ++.avi 00;35 ++.fli 00;35 ++.flv 00;35 ++.gl 00;35 ++.dl 00;35 ++.xcf 00;35 ++.xwd 00;35 ++.yuv 00;35 ++.cgm 00;35 ++.emf 00;35 + + # http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions +-.ogv 01;35 +-.ogx 01;35 ++.ogv 00;35 ++.ogx 00;35 + + # audio formats + .aac 00;36 +-- +2.5.5 + diff --git a/coreutils-DIR_COLORS b/coreutils-DIR_COLORS deleted file mode 100644 index 27af9d7..0000000 --- a/coreutils-DIR_COLORS +++ /dev/null @@ -1,207 +0,0 @@ -# Configuration file for dircolors, a utility to help you set the -# LS_COLORS environment variable used by GNU ls with the --color option. - -# 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 -# the system defaults. - -# 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. - -# The keywords COLOR, OPTIONS, and EIGHTBIT (honored by the -# slackware version of dircolors) are recognized but ignored. - -# 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 ansi -TERM color-xterm -TERM con[0-9]*x[0-9]* -TERM cons25 -TERM console -TERM cygwin -TERM dtterm -TERM eterm-color -TERM gnome -TERM gnome-256color -TERM hurd -TERM jfbterm -TERM konsole -TERM kterm -TERM linux -TERM linux-c -TERM mach-color -TERM mach-gnu-color -TERM mlterm -TERM putty -TERM putty-256color -TERM rxvt* -TERM screen* -TERM st -TERM st-256color -TERM terminator -TERM tmux* -TERM vt100 -TERM xterm* - -# 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: -# Attribute codes: -# 00=none 01=bold 04=underscore 05=blink 07=reverse 08=concealed -# Text color codes: -# 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 -#NORMAL 00 # no color code at all -#FILE 00 # regular file: use no color at all -RESET 0 # reset to "normal" color -DIR 01;34 # directory -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.) -MULTIHARDLINK 00 # regular file with more than one link -FIFO 40;33 # pipe -SOCK 01;35 # socket -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 ... -MISSING 01;05;37;41 # ... and the files they point to -SETUID 37;41 # file that is setuid (u+s) -SETGID 30;43 # file that is setgid (g+s) -CAPABILITY 30;41 # file with capability -STICKY_OTHER_WRITABLE 30;42 # dir that is sticky and other-writable (+t,o+w) -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: -EXEC 01;32 - -# 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. -# (and any comments you want to add after a '#') - -# If you use DOS-style suffixes, you may want to uncomment the following: -#.cmd 01;32 # executables (bright green) -#.exe 01;32 -#.com 01;32 -#.btm 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 -#.csh 01;32 - - # archives or compressed (bright red) -.tar 01;31 -.tgz 01;31 -.arc 01;31 -.arj 01;31 -.taz 01;31 -.lha 01;31 -.lz4 01;31 -.lzh 01;31 -.lzma 01;31 -.tlz 01;31 -.txz 01;31 -.tzo 01;31 -.t7z 01;31 -.zip 01;31 -.z 01;31 -.Z 01;31 -.dz 01;31 -.gz 01;31 -.lrz 01;31 -.lz 01;31 -.lzo 01;31 -.xz 01;31 -.bz2 01;31 -.bz 01;31 -.tbz 01;31 -.tbz2 01;31 -.tz 01;31 -.deb 01;31 -.rpm 01;31 -.jar 01;31 -.war 01;31 -.ear 01;31 -.sar 01;31 -.rar 01;31 -.alz 01;31 -.ace 01;31 -.zoo 01;31 -.cpio 01;31 -.7z 01;31 -.rz 01;31 -.cab 01;31 - -# image formats -.jpg 01;35 -.jpeg 01;35 -.gif 01;35 -.bmp 01;35 -.pbm 01;35 -.pgm 01;35 -.ppm 01;35 -.tga 01;35 -.xbm 01;35 -.xpm 01;35 -.tif 01;35 -.tiff 01;35 -.png 01;35 -.svg 01;35 -.svgz 01;35 -.mng 01;35 -.pcx 01;35 -.mov 01;35 -.mpg 01;35 -.mpeg 01;35 -.m2v 01;35 -.mkv 01;35 -.webm 01;35 -.ogm 01;35 -.mp4 01;35 -.m4v 01;35 -.mp4v 01;35 -.vob 01;35 -.qt 01;35 -.nuv 01;35 -.wmv 01;35 -.asf 01;35 -.rm 01;35 -.rmvb 01;35 -.flc 01;35 -.avi 01;35 -.fli 01;35 -.flv 01;35 -.gl 01;35 -.dl 01;35 -.xcf 01;35 -.xwd 01;35 -.yuv 01;35 -.cgm 01;35 -.emf 01;35 - -# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions -.ogv 01;35 -.ogx 01;35 - -# audio formats -.aac 01;36 -.au 01;36 -.flac 01;36 -.m4a 01;36 -.mid 01;36 -.midi 01;36 -.mka 01;36 -.mp3 01;36 -.mpc 01;36 -.ogg 01;36 -.ra 01;36 -.wav 01;36 - -# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions -.oga 01;36 -.opus 01;36 -.spx 01;36 -.xspf 01;36 diff --git a/coreutils-DIR_COLORS.256color b/coreutils-DIR_COLORS.256color deleted file mode 100644 index 74c34ba..0000000 --- a/coreutils-DIR_COLORS.256color +++ /dev/null @@ -1,189 +0,0 @@ -# Configuration file for the 256color ls utility - -# 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 -# the system defaults. - -# 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. - -# The keywords COLOR, OPTIONS, and EIGHTBIT (honored by the -# slackware version of dircolors) are recognized but ignored. - -# 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 rxvt-unicode256 - -# 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: -# Attribute codes: -# 00=none 01=bold 04=underscore 05=blink 07=reverse 08=concealed -# Text color codes: -# 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 -# Text color(256 colors mode) codes: -# Valid syntax for text 256color is 38;5; , where color number -# is number between 0 and 255. -# You may find following command useful to search the best one for you: -# for ((x=0; x<=255; x++));do echo -e "${x}:\033[38;5;${x}mcolor\033[000m";done -# Background color(256 colors mode) codes: -# Valid syntax for background 256color is 48;5; , where -# color number is number between 0 and 255. -# 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 - -#NORMAL 00 # no color code at all -#FILE 00 # regular file: use no color at all -RESET 0 # reset to "normal" color -DIR 38;5;33 # directory -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.) -MULTIHARDLINK 00 # regular file with more than one link -FIFO 40;38;5;11 # pipe -SOCK 38;5;13 # socket -DOOR 38;5;5 # door -BLK 48;5;232;38;5;11 # block 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 ... -MISSING 01;05;37;41 # ... and the files they point to -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) -CAPABILITY 48;5;196;38;5;226 # file with capability -STICKY_OTHER_WRITABLE 48;5;10;38;5;16 # dir that is sticky and other-writable (+t,o+w) -OTHER_WRITABLE 48;5;10;38;5;21 # dir that is other-writable (o+w) and not sticky -STICKY 48;5;21;38;5;15 # dir with the sticky bit set (+t) and not other-writable - -# This is for files with execute permission: -EXEC 38;5;40 - -# 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. -# (and any comments you want to add after a '#') - -# If you use DOS-style suffixes, you may want to uncomment the following: -#.cmd 01;32 # executables (bright green) -#.exe 01;32 -#.com 01;32 -#.btm 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 -#.csh 01;32 - - # archives or compressed (bright red) -.tar 38;5;9 -.tgz 38;5;9 -.arc 38;5;9 -.arj 38;5;9 -.taz 38;5;9 -.lha 38;5;9 -.lz4 38;5;9 -.lzh 38;5;9 -.lzma 38;5;9 -.tlz 38;5;9 -.txz 38;5;9 -.tzo 38;5;9 -.t7z 38;5;9 -.zip 38;5;9 -.z 38;5;9 -.Z 38;5;9 -.dz 38;5;9 -.gz 38;5;9 -.lrz 38;5;9 -.lz 38;5;9 -.lzo 38;5;9 -.xz 38;5;9 -.bz2 38;5;9 -.bz 38;5;9 -.tbz 38;5;9 -.tbz2 38;5;9 -.tz 38;5;9 -.deb 38;5;9 -.rpm 38;5;9 -.jar 38;5;9 -.war 38;5;9 -.ear 38;5;9 -.sar 38;5;9 -.rar 38;5;9 -.alz 38;5;9 -.ace 38;5;9 -.zoo 38;5;9 -.cpio 38;5;9 -.7z 38;5;9 -.rz 38;5;9 -.cab 38;5;9 - -# image formats -.jpg 38;5;13 -.jpeg 38;5;13 -.gif 38;5;13 -.bmp 38;5;13 -.pbm 38;5;13 -.pgm 38;5;13 -.ppm 38;5;13 -.tga 38;5;13 -.xbm 38;5;13 -.xpm 38;5;13 -.tif 38;5;13 -.tiff 38;5;13 -.png 38;5;13 -.svg 38;5;13 -.svgz 38;5;13 -.mng 38;5;13 -.pcx 38;5;13 -.mov 38;5;13 -.mpg 38;5;13 -.mpeg 38;5;13 -.m2v 38;5;13 -.mkv 38;5;13 -.webm 38;5;13 -.ogm 38;5;13 -.mp4 38;5;13 -.m4v 38;5;13 -.mp4v 38;5;13 -.vob 38;5;13 -.qt 38;5;13 -.nuv 38;5;13 -.wmv 38;5;13 -.asf 38;5;13 -.rm 38;5;13 -.rmvb 38;5;13 -.flc 38;5;13 -.avi 38;5;13 -.fli 38;5;13 -.flv 38;5;13 -.gl 38;5;13 -.dl 38;5;13 -.xcf 38;5;13 -.xwd 38;5;13 -.yuv 38;5;13 -.cgm 38;5;13 -.emf 38;5;13 - -# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions -.ogv 38;5;13 -.ogx 38;5;13 - -# audio formats -.aac 38;5;45 -.au 38;5;45 -.flac 38;5;45 -.m4a 38;5;45 -.mid 38;5;45 -.midi 38;5;45 -.mka 38;5;45 -.mp3 38;5;45 -.mpc 38;5;45 -.ogg 38;5;45 -.ra 38;5;45 -.wav 38;5;45 - -# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions -.oga 38;5;45 -.opus 38;5;45 -.spx 38;5;45 -.xspf 38;5;45 diff --git a/coreutils-DIR_COLORS.lightbgcolor b/coreutils-DIR_COLORS.lightbgcolor deleted file mode 100644 index 95d6879..0000000 --- a/coreutils-DIR_COLORS.lightbgcolor +++ /dev/null @@ -1,206 +0,0 @@ -# Configuration file for the color ls utility - modified for lighter backgrounds - -# 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 -# the system defaults. - -# 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. - -# The keywords COLOR, OPTIONS, and EIGHTBIT (honored by the -# slackware version of dircolors) are recognized but ignored. - -# 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 ansi -TERM color-xterm -TERM con[0-9]*x[0-9]* -TERM cons25 -TERM console -TERM cygwin -TERM dtterm -TERM eterm-color -TERM gnome -TERM gnome-256color -TERM hurd -TERM jfbterm -TERM konsole -TERM kterm -TERM linux -TERM linux-c -TERM mach-color -TERM mach-gnu-color -TERM mlterm -TERM putty -TERM putty-256color -TERM rxvt* -TERM screen* -TERM st -TERM st-256color -TERM terminator -TERM tmux* -TERM vt100 -TERM xterm* - -# 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: -# Attribute codes: -# 00=none 01=bold 04=underscore 05=blink 07=reverse 08=concealed -# Text color codes: -# 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 -#NORMAL 00 # no color code at all -#FILE 00 # regular file: use no color at all -RESET 0 # reset to "normal" color -DIR 00;34 # directory -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.) -MULTIHARDLINK 00 # regular file with more than one link -FIFO 40;33 # pipe -SOCK 00;35 # socket -DOOR 00;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 ... -MISSING 01;05;37;41 # ... and the files they point to -SETUID 37;41 # file that is setuid (u+s) -SETGID 30;43 # file that is setgid (g+s) -CAPABILITY 30;41 # file with capability -STICKY_OTHER_WRITABLE 30;42 # dir that is sticky and other-writable (+t,o+w) -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: -EXEC 00;32 - -# 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. -# (and any comments you want to add after a '#') - -# If you use DOS-style suffixes, you may want to uncomment the following: -#.cmd 01;32 # executables (bright green) -#.exe 01;32 -#.com 01;32 -#.btm 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 -#.csh 01;32 - -# archives or compressed (red) -.tar 00;31 -.tgz 00;31 -.arc 00;31 -.arj 00;31 -.taz 00;31 -.lha 00;31 -.lz4 00;31 -.lzh 00;31 -.lzma 00;31 -.tlz 00;31 -.txz 00;31 -.tzo 00;31 -.t7z 00;31 -.zip 00;31 -.z 00;31 -.Z 00;31 -.dz 00;31 -.gz 00;31 -.lrz 00;31 -.lz 00;31 -.lzo 00;31 -.xz 00;31 -.bz2 00;31 -.bz 00;31 -.tbz 00;31 -.tbz2 00;31 -.tz 00;31 -.deb 00;31 -.rpm 00;31 -.jar 00;31 -.war 00;31 -.ear 00;31 -.sar 00;31 -.rar 00;31 -.alz 00;31 -.ace 00;31 -.zoo 00;31 -.cpio 00;31 -.7z 00;31 -.rz 00;31 -.cab 00;31 - -# image formats -.jpg 00;35 -.jpeg 00;35 -.gif 00;35 -.bmp 00;35 -.pbm 00;35 -.pgm 00;35 -.ppm 00;35 -.tga 00;35 -.xbm 00;35 -.xpm 00;35 -.tif 00;35 -.tiff 00;35 -.png 00;35 -.svg 00;35 -.svgz 00;35 -.mng 00;35 -.pcx 00;35 -.mov 00;35 -.mpg 00;35 -.mpeg 00;35 -.m2v 00;35 -.mkv 00;35 -.webm 00;35 -.ogm 00;35 -.mp4 00;35 -.m4v 00;35 -.mp4v 00;35 -.vob 00;35 -.qt 00;35 -.nuv 00;35 -.wmv 00;35 -.asf 00;35 -.rm 00;35 -.rmvb 00;35 -.flc 00;35 -.avi 00;35 -.fli 00;35 -.flv 00;35 -.gl 00;35 -.dl 00;35 -.xcf 00;35 -.xwd 00;35 -.yuv 00;35 -.cgm 00;35 -.emf 00;35 - -# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions -.ogv 00;35 -.ogx 00;35 - -# audio formats -.aac 00;36 -.au 00;36 -.flac 00;36 -.m4a 00;36 -.mid 00;36 -.midi 00;36 -.mka 00;36 -.mp3 00;36 -.mpc 00;36 -.ogg 00;36 -.ra 00;36 -.wav 00;36 - -# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions -.oga 00;36 -.opus 00;36 -.spx 00;36 -.xspf 00;36 diff --git a/coreutils.spec b/coreutils.spec index c181af7..00c5fc6 100644 --- a/coreutils.spec +++ b/coreutils.spec @@ -8,9 +8,6 @@ Url: http://www.gnu.org/software/coreutils/ Source0: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz Source2: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig Source50: supported_utils -Source101: coreutils-DIR_COLORS -Source102: coreutils-DIR_COLORS.lightbgcolor -Source103: coreutils-DIR_COLORS.256color Source105: coreutils-colorls.sh Source106: coreutils-colorls.csh @@ -27,6 +24,8 @@ Source10: coreutils-find-requires.sh Patch100: coreutils-6.10-configuration.patch #add note about no difference between binary/text mode on Linux - md5sum manpage Patch101: coreutils-6.10-manpages.patch +# downstream changes to default DIR_COLORS +Patch102: coreutils-8.25-DIR_COLORS.patch #do display processor type for uname -p/-i based on uname(2) syscall Patch103: coreutils-8.2-uname-processortype.patch #df --direct @@ -166,9 +165,13 @@ including documentation and translations. %prep %setup -q +# will be modified by coreutils-8.25-DIR_COLORS.patch +tee DIR_COLORS{,.256color,.lightbgcolor} < src/dircolors.hin + # Our patches %patch100 -p1 -b .configure %patch101 -p1 -b .manpages +%patch102 -p1 %patch103 -p1 -b .sysinfo %patch104 -p1 -b .dfdirect %patch107 -p1 -b .mkdirmode @@ -272,9 +275,8 @@ fi bzip2 -9f ChangeLog mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d -install -p -c -m644 %SOURCE101 $RPM_BUILD_ROOT%{_sysconfdir}/DIR_COLORS -install -p -c -m644 %SOURCE102 $RPM_BUILD_ROOT%{_sysconfdir}/DIR_COLORS.lightbgcolor -install -p -c -m644 %SOURCE103 $RPM_BUILD_ROOT%{_sysconfdir}/DIR_COLORS.256color +install -p -c -m644 DIR_COLORS{,.256color,.lightbgcolor} \ + $RPM_BUILD_ROOT%{_sysconfdir} install -p -c -m644 %SOURCE105 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/colorls.sh install -p -c -m644 %SOURCE106 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/colorls.csh