From 3a4af246d1a88034ee9be13b8cef3ac60b3a5f86 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Mon, 21 Jul 2014 05:50:13 +0000 Subject: [PATCH] - merged update to 8.23 from PLD --- DIR_COLORS | 295 +++++++++++++++++++++++++++-------------- DIR_COLORS.256color | 272 +++++++++++++++++++++++++++++++++++++ colorls.csh | 32 +++++ colorls.sh | 28 ++++ coreutils-getgid.patch | 44 ++---- coreutils-info.patch | 294 ++++++++++++++++++++++------------------ coreutils.spec | 40 ++++-- fileutils.csh | 32 ----- fileutils.sh | 22 --- tests.patch | 20 ++- 10 files changed, 749 insertions(+), 330 deletions(-) create mode 100644 DIR_COLORS.256color create mode 100644 colorls.csh create mode 100644 colorls.sh delete mode 100644 fileutils.csh delete mode 100644 fileutils.sh diff --git a/DIR_COLORS b/DIR_COLORS index 2cf430a..2d40403 100644 --- a/DIR_COLORS +++ b/DIR_COLORS @@ -1,22 +1,24 @@ # Configuration file for the color ls utility -# This file goes in the /etc directory and must be world readable. +# Synchronized with coreutils 8.5 dircolors +# 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. -# NOTE: -# The keywords COLOR, OPTIONS and EIGHTBIT (honored by the slackware version -# of dircolors) are recognized but ignored. - -# COLOR keyword is recognized by PLD fileutils.(c)sh script (which is located -# in /etc/shrc.d directory and needs one of these arguments: -# 'auto', 'tty', 'if-tty' - colorizes output to ttys, but not pipes, -# 'always', 'yes', 'force' - adds color characters to all output, -# 'never', 'no', 'none' - shuts colorization off. +# COLOR needs one of these arguments: 'tty' colorizes output to ttys, but not +# pipes. 'all' adds color characters to all output. 'none' shuts colorization +# off. COLOR tty +# Extra command line options for ls go here. +# Basically these ones are: +# -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 -TERM linux -TERM console +TERM Eterm +TERM ansi +TERM color-xterm TERM con132x25 TERM con132x30 TERM con132x43 @@ -28,13 +30,49 @@ TERM con80x43 TERM con80x50 TERM con80x60 TERM cons25 +TERM console +TERM cygwin +TERM dtterm +TERM eterm-color +TERM gnome +TERM gnome-256color +TERM jfbterm +TERM konsole +TERM kterm +TERM linux +TERM linux-c +TERM mach-color +TERM mlterm +TERM putty +TERM putty-256color TERM rxvt +TERM rxvt-256color +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-256color +TERM terminator +TERM vt100 TERM xterm +TERM xterm-16color +TERM xterm-256color +TERM xterm-88color TERM xterm-color -TERM color-xterm -TERM color_xterm -TERM vt100 -TERM dtterm +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 # string consists of one or more of the following numeric codes: @@ -46,54 +84,82 @@ TERM dtterm # 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white NORMAL 00 # global default, although everything should be something. FILE 00 # normal file +RESET 0 # reset to "normal" color DIR 01;34 # directory -LINK 01;36 # symbolic link -FIFO 33 # pipe +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 -BLK 01;33 # block device driver -CHR 01;33 # character device driver -ORPHAN 01;05;37;41 # orphaned symlinks +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 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. # (and any comments you want to add after a '#') # executables (bright green) - -.sh 01;32 -.csh 01;32 .bat 01;32 .btm 01;32 .cmd 01;32 .com 01;32 +.csh 01;32 .exe 01;32 +.sh 01;32 # archives or compressed (bright red) - .7z 01;31 .7zip 01;31 +.ace 01;31 +.alz 01;31 +.arc 01;31 .arj 01;31 .bz 01;31 .bz2 01;31 +.cab 01;31 .cpio 01;31 .deb 01;31 +.dz 01;31 +.ear 01;31 .gz 01;31 .img 01;31 +.jar 01;31 .lha 01;31 +.lrz 01;31 +.lz 01;31 +.lz4 01;31 .lzh 01;31 .lzma 01;31 +.lzo 01;31 .rar 01;31 .rpm 01;31 +.rz 01;31 +.sar 01;31 +.t7z 01;31 .tar 01;31 .taz 01;31 +.tbz 01;31 +.tbz2 01;31 .tgz 01;31 +.tlz 01;31 .tpz 01;31 .trpm 01;31 +.txz 01;31 .tz 01;31 +.tzo 01;31 +.war 01;31 .xz 01;31 .z 01;31 .Z 01;31 @@ -101,108 +167,141 @@ EXEC 32 .zoo 01;31 # image formats (bright magenta) - +.asf 01;35 +.avi 01;35 .bmp 01;35 .cdr 01;35 +.cgm 01;35 +.dl 01;35 +.emf 01;35 +.flc 01;35 +.fli 01;35 +.flv 01;35 .gif 01;35 +.gl 01;35 .jpeg 01;35 .jpg 01;35 .JPG 01;35 +.m2v 01;35 +.m4v 01;35 +.mkv 01;35 .mng 01;35 +.mov 01;35 +.mp4 01;35 +.mp4v 01;35 +.mpeg 01;35 +.mpg 01;35 +.nuv 01;35 +.ogm 01;35 .pbm 01;35 .pcx 01;35 .pgm 01;35 .png 01;35 .ppm 01;35 +.qt 01;35 +.rm 01;35 +.rmvb 01;35 .svg 01;35 +.svgz 01;35 .tga 01;35 .tif 01;35 .tiff 01;35 +.vob 01;35 +.webm 01;35 +.wmv 01;35 .xbm 01;35 .xcf 01;35 .xpm 01;35 +.xwd 01;35 +.yuv 01;35 -# multimedia files (bright white) +# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions +.axv 01;35 +.anx 01;35 +.ogv 01;35 +.ogx 01;35 -.asf 01;37 -.asx 01;37 +# audio formats (white) +.aac 01;37 .au 01;37 -.avi 01;37 -.m1v 01;37 +.flac 01;37 .mid 01;37 -.mkv 01;37 +.midi 01;37 +.mka 01;37 .mp3 01;37 -.mp4 01;37 -.mpg 01;37 -.mpe 01;37 -.mpeg 01;37 -.mod 01;37 -.mov 01;37 +.mpc 01;37 .ogg 01;37 -.qt 01;37 -.rm 01;37 -.rmvb 01;37 -.ram 01;37 -.s3m 01;37 -.vob 01;37 -.voc 01;37 +.ra 01;37 .wav 01;37 -.wma 01;37 -.wmv 01;37 -.xm 01;37 + +# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions +.axa 01;37 +.oga 01;37 +.spx 01;37 +.xspf 01;37 # documents (cyan) -.abw 36 -.bib 36 -.doc 36 -.dot 36 -.dvi 36 -.eps 36 -.info 36 -.kpr 36 -.me 36 -.ms 36 -.ods 36 -.odt 36 -.ps 36 -.pdf 36 -.pps 36 -.ppt 36 -.rtf 36 -.stw 36 -.sxc 36 -.sxw 36 -.tex 36 -.texi 36 -.texinfo 36 -.tm 36 -.txt 36 -.wri 36 -.xls 36 -.xlw 36 +.abw 00;36 +.bib 00;36 +.doc 00;36 +.docx 00;36 +.dot 00;36 +.dvi 00;36 +.eps 00;36 +.epub 00;36 +.info 00;36 +.kpr 00;36 +.me 00;36 +.ms 00;36 +.odp 00;36 +.ods 00;36 +.odt 00;36 +.ps 00;36 +.ps.gz 00;36 +.pdf 00;36 +.pps 00;36 +.ppt 00;36 +.pptx 00;36 +.rtf 00;36 +.stw 00;36 +.sxc 00;36 +.sxw 00;36 +.tex 00;36 +.texi 00;36 +.texinfo 00;36 +.tm 00;36 +.txt 00;36 +.wri 00;36 +.wpd 00;36 +.xls 00;36 +.xlsx 00;36 +.xlw 00;36 # web (yellow) -.cgi 33 -.css 33 -.htm 33 -.html 33 -.php 33 -.phtml 33 +.cgi 00;33 +.css 00;33 +.htm 00;33 +.html 00;33 +.php 00;33 +.phtml 00;33 +.shtml 00;33 +.xml 00;33 # devel (bright yellow) - -.ac 01;33 -.am 01;33 -.c 01;33 -.cc 01;33 -.cpp 01;33 -.diff 01;33 -.f 01;33 -.h 01;33 -.in 01;33 -.o 01;33 +.ac 01;33 +.am 01;33 +.c 01;33 +.C 01;33 +.cc 01;33 +.cpp 01;33 +.diff 01;33 +.f 01;33 +.h 01;33 +.in 01;33 +.o 01;33 .patch 01;33 -.po 01;33 -.pot 01;33 -.s 01;33 -.spec 01;33 +.pm 01;33 +.po 01;33 +.pot 01;33 +.s 01;33 +.spec 01;33 diff --git a/DIR_COLORS.256color b/DIR_COLORS.256color new file mode 100644 index 0000000..b05c036 --- /dev/null +++ b/DIR_COLORS.256color @@ -0,0 +1,272 @@ +# Configuration file for the color ls utility +# Synchronized with coreutils 8.5 dircolors +# 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. + +# COLOR needs one of these arguments: 'tty' colorizes output to ttys, but not +# pipes. 'all' adds color characters to all output. 'none' shuts colorization +# off. +COLOR tty + +# Extra command line options for ls go here. +# Basically these ones are: +# -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 +TERM putty-256color +TERM rxvt-256color +TERM rxvt-unicode-256color +TERM rxvt-unicode256 +TERM screen-256color +TERM xterm-256color +TERM gnome-256color +TERM st-256color + +# 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 +# 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 # global default, although everything should be something. +FILE 00 # normal file +RESET 0 # reset to "normal" color +DIR 38;5;27 # 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 44;38;5;15 # regular file with more than one link +FIFO 40;38;5;214 # pipe +SOCK 38;5;13 # socket +DOOR 38;5;5 # door +BLK 48;5;232;38;5;226 # block device driver +CHR 48;5;232;38;5;3 # character device driver +ORPHAN 48;5;232;38;5;196 # symlink to nonexistent file, or non-stat'able file +MISSING 05;48;5;232;38;5;196 # ... and the files they point to +SETUID 48;5;196;38;5;15 # file that is setuid (u+s) +SETGID 48;5;130;38;5;16 # file that is setgid (g+s) +CAPABILITY 48;5;196;38;5;226 # file with capability +STICKY_OTHER_WRITABLE 48;5;40;38;5;16 # dir that is sticky and other-writable (+t,o+w) +OTHER_WRITABLE 48;5;40;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;82 + +# 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 '#') + +# executables (bright green) +.bat 38;5;34 +.btm 38;5;34 +.cmd 38;5;34 +.com 38;5;34 +.csh 38;5;34 +.exe 38;5;34 +.sh 38;5;34 + +# archives or compressed (bright red) +.7z 38;5;196 +.7zip 38;5;196 +.ace 38;5;196 +.alz 38;5;196 +.arc 38;5;196 +.arj 38;5;196 +.bz 38;5;196 +.bz2 38;5;196 +.cab 38;5;196 +.cpio 38;5;196 +.deb 38;5;196 +.dz 38;5;196 +.ear 38;5;196 +.gz 38;5;196 +.img 38;5;196 +.jar 38;5;196 +.lha 38;5;196 +.lrz 38;5;196 +.lz 38;5;196 +.lz4 38;5;196 +.lzh 38;5;196 +.lzma 38;5;196 +.lzo 38;5;196 +.rar 38;5;196 +.rpm 38;5;196 +.rz 38;5;196 +.sar 38;5;196 +.t7z 38;5;196 +.tar 38;5;196 +.taz 38;5;196 +.tbz 38;5;196 +.tbz2 38;5;196 +.tgz 38;5;196 +.tlz 38;5;196 +.tpz 38;5;196 +.trpm 38;5;196 +.txz 38;5;196 +.tz 38;5;196 +.tzo 38;5;196 +.war 38;5;196 +.xz 38;5;196 +.z 38;5;196 +.Z 38;5;196 +.zip 38;5;196 +.zoo 38;5;196 + +# image formats (bright magenta) +.asf 38;5;13 +.avi 38;5;13 +.bmp 38;5;13 +.cdr 38;5;13 +.cgm 38;5;13 +.dl 38;5;13 +.emf 38;5;13 +.flc 38;5;13 +.fli 38;5;13 +.flv 38;5;13 +.gif 38;5;13 +.gl 38;5;13 +.jpeg 38;5;13 +.jpg 38;5;13 +.JPG 38;5;13 +.m2v 38;5;13 +.m4v 38;5;13 +.mkv 38;5;13 +.mng 38;5;13 +.mov 38;5;13 +.mp4 38;5;13 +.mp4v 38;5;13 +.mpeg 38;5;13 +.mpg 38;5;13 +.nuv 38;5;13 +.ogm 38;5;13 +.pbm 38;5;13 +.pcx 38;5;13 +.pgm 38;5;13 +.png 38;5;13 +.ppm 38;5;13 +.qt 38;5;13 +.rm 38;5;13 +.rmvb 38;5;13 +.svg 38;5;13 +.svgz 38;5;13 +.tga 38;5;13 +.tif 38;5;13 +.tiff 38;5;13 +.vob 38;5;13 +.webm 38;5;13 +.wmv 38;5;13 +.xbm 38;5;13 +.xcf 38;5;13 +.xpm 38;5;13 +.xwd 38;5;13 +.yuv 38;5;13 + +# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions +.axv 38;5;13 +.anx 38;5;13 +.ogv 38;5;13 +.ogx 38;5;13 + +# audio formats (white) +.aac 01;37 +.au 01;37 +.flac 01;37 +.mid 01;37 +.midi 01;37 +.mka 01;37 +.mp3 01;37 +.mpc 01;37 +.ogg 01;37 +.ra 01;37 +.wav 01;37 + +# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions +.axa 01;37 +.oga 01;37 +.spx 01;37 +.xspf 01;37 + +# documents (cyan) +.abw 38;5;44 +.bib 38;5;44 +.doc 38;5;44 +.docx 38;5;44 +.dot 38;5;44 +.dvi 38;5;44 +.eps 38;5;44 +.epub 38;5;44 +.info 38;5;44 +.kpr 38;5;44 +.me 38;5;44 +.ms 38;5;44 +.odp 38;5;44 +.ods 38;5;44 +.odt 38;5;44 +.ps 38;5;44 +.ps.gz 38;5;44 +.pdf 38;5;44 +.pps 38;5;44 +.ppt 38;5;44 +.pptx 38;5;44 +.rtf 38;5;44 +.stw 38;5;44 +.sxc 38;5;44 +.sxw 38;5;44 +.tex 38;5;44 +.texi 38;5;44 +.texinfo 38;5;44 +.tm 38;5;44 +.txt 38;5;44 +.wri 38;5;44 +.wpd 38;5;44 +.xls 38;5;44 +.xlsx 38;5;44 +.xlw 38;5;44 + +# web (yellow) +.cgi 38;5;3 +.css 38;5;3 +.htm 38;5;3 +.html 38;5;3 +.php 38;5;3 +.phtml 38;5;3 +.shtml 38;5;3 +.xml 38;5;3 + +# devel (bright yellow) +.ac 38;5;226 +.am 38;5;226 +.c 38;5;226 +.C 38;5;226 +.cc 38;5;226 +.cpp 38;5;226 +.diff 38;5;226 +.f 38;5;226 +.h 38;5;226 +.in 38;5;226 +.o 38;5;226 +.patch 38;5;226 +.pm 38;5;226 +.po 38;5;226 +.pot 38;5;226 +.s 38;5;226 +.spec 38;5;226 diff --git a/colorls.csh b/colorls.csh new file mode 100644 index 0000000..267470e --- /dev/null +++ b/colorls.csh @@ -0,0 +1,32 @@ +# skip everything for non-interactive shells +if (! $?prompt) exit + +if ( "`tty -s && tput colors 2>/dev/null`" == "256" ) then + set RC_FILE="/etc/DIR_COLORS.256color" +else + set RC_FILE="/etc/DIR_COLORS" +endif +set USER_RC_FILE=$HOME/.dir_colors +set DEF_COLOR_MODE=auto + +set COLOR_MODE=`awk '/^COLOR/{c=$2} END{print c}' $SYS_RC_FILE` + +if ( -r $USER_RC_FILE ) then + set COLOR_MODE=`awk '/^COLOR/{c=$2} END{print c}' $USER_RC_FILE` + set RC_FILE=$USER_RC_FILE +endif + +# 'all' argument for 'ls --color=' is no longer valid +if ( "$COLOR_MODE" == "all" ) then + set COLOR_MODE=always +endif + +if ( "$COLOR_MODE" == '') then + set COLOR_MODE=$DEF_COLOR_MODE +endif + +alias ls "ls --color=$COLOR_MODE" + +eval `/usr/bin/dircolors -c $RC_FILE` + +unset RC_FILE USER_RC_FILE DEF_COLOR_MODE COLOR_MODE diff --git a/colorls.sh b/colorls.sh new file mode 100644 index 0000000..32d3cd3 --- /dev/null +++ b/colorls.sh @@ -0,0 +1,28 @@ +# Skip all for noninteractive shells. +[ -z "$PS1" ] && return + +if [ "`tty -s && tput colors 2>/dev/null`" = "256" ]; then + RC_FILE="/etc/DIR_COLORS.256color" +else + RC_FILE="/etc/DIR_COLORS" +fi +USER_RC_FILE=$HOME/.dir_colors +DEF_COLOR_MODE=auto + +COLOR_MODE=`awk '/^COLOR/{c=$2} END{print c}' $RC_FILE` + +if [ -r $USER_RC_FILE ]; then + COLOR_MODE=`awk '/^COLOR/{c=$2} END{print c}' $USER_RC_FILE` + RC_FILE=$USER_RC_FILE +fi + +# 'all' argument for 'ls --color=' is no longer valid +[ "$COLOR_MODE" = all ] && COLOR_MODE=always + +[ -z "$COLOR_MODE" ] && COLOR_MODE=$DEF_COLOR_MODE + +alias ls="ls --color=$COLOR_MODE" + +eval `/usr/bin/dircolors -b $RC_FILE` + +unset RC_FILE USER_RC_FILE DEF_COLOR_MODE COLOR_MODE diff --git a/coreutils-getgid.patch b/coreutils-getgid.patch index a7a5b57..138ee4a 100644 --- a/coreutils-getgid.patch +++ b/coreutils-getgid.patch @@ -1,27 +1,15 @@ -diff -urN coreutils-8.16.orig//README coreutils-8.16/README ---- coreutils-8.16.orig//README 2012-03-24 18:22:13.000000000 +0000 -+++ coreutils-8.16/README 2012-04-18 09:07:17.417662632 +0000 +--- coreutils-8.23/README.orig 2014-07-20 18:31:49.574517705 +0200 ++++ coreutils-8.23/README 2014-07-20 18:32:59.324514778 +0200 @@ -9,7 +9,7 @@ - [ arch base64 basename cat chcon chgrp chmod chown chroot cksum comm cp - csplit cut date dd df dir dircolors dirname du echo env expand expr -- factor false fmt fold groups head hostid hostname id install join kill -+ factor false fmt fold getgid groups head hostid hostname id install join kill - link ln logname ls md5sum mkdir mkfifo mknod mktemp mv nice nl nohup - nproc od paste pathchk pinky pr printenv printf ptx pwd readlink realpath - rm rmdir runcon seq sha1sum sha224sum sha256sum sha384sum sha512sum shred ---- coreutils-8.20/man/local.mk.orig 2012-11-18 07:54:05.958535288 +0100 -+++ coreutils-8.20/man/local.mk 2012-11-18 07:55:01.678534127 +0100 -@@ -87,6 +87,7 @@ - man/false.1: src/false - man/fmt.1: src/fmt - man/fold.1: src/fold -+man/getgid.1: src/getgid - man/groups.1: src/groups - man/head.1: src/head - man/hostid.1: src/hostid -diff -urN coreutils-8.16.orig//man/getgid.1 coreutils-8.16/man/getgid.1 ---- coreutils-8.16.orig//man/getgid.1 1970-01-01 00:00:00.000000000 +0000 + [ arch base64 basename cat chcon chgrp chmod chown chroot cksum comm + coreutils cp csplit cut date dd df dir dircolors dirname du echo env +- expand expr factor false fmt fold groups head hostid hostname id install ++ expand expr factor false fmt fold getgid groups head hostid hostname id install + join kill link ln logname ls md5sum mkdir mkfifo mknod mktemp mv nice nl + nohup nproc numfmt od paste pathchk pinky pr printenv printf ptx pwd + readlink realpath rm rmdir runcon seq sha1sum sha224sum sha256sum sha384sum +--- coreutils-8.16.orig/man/getgid.1 1970-01-01 00:00:00.000000000 +0000 +++ coreutils-8.16/man/getgid.1 2012-04-18 09:07:17.410850573 +0000 @@ -0,0 +1,22 @@ +.TH GETGID "1" "October 2002" "getgid (coreutils) 4.5.3" "User Commands" @@ -54,8 +42,7 @@ diff -urN coreutils-8.16.orig//man/getgid.x coreutils-8.16/man/getgid.x +getgid \- print ID of given group +[DESCRIPTION] +.\" Add any additional description here -diff -urN coreutils-8.16.orig//man/pl/getgid.1 coreutils-8.16/man/pl/getgid.1 ---- coreutils-8.16.orig//man/pl/getgid.1 1970-01-01 00:00:00.000000000 +0000 +--- coreutils-8.16.orig/man/pl/getgid.1 1970-01-01 00:00:00.000000000 +0000 +++ coreutils-8.16/man/pl/getgid.1 2012-04-18 09:07:17.410850573 +0000 @@ -0,0 +1,22 @@ +.TH GETGID "1" "Pa¼dziernik 2002" "getgid (coreutils) 4.5.3" "Polecenia u¿ytkownika" @@ -80,8 +67,7 @@ diff -urN coreutils-8.16.orig//man/pl/getgid.1 coreutils-8.16/man/pl/getgid.1 +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +.SH ZOBACZ TAK¯E +.BR id (1) -diff -urN coreutils-8.16.orig//po/POTFILES.in coreutils-8.16/po/POTFILES.in ---- coreutils-8.16.orig//po/POTFILES.in 2012-03-24 18:22:13.000000000 +0000 +--- coreutils-8.16.orig/po/POTFILES.in 2012-03-24 18:22:13.000000000 +0000 +++ coreutils-8.16/po/POTFILES.in 2012-04-18 09:07:17.412850440 +0000 @@ -66,6 +66,7 @@ src/find-mount-point.c @@ -91,8 +77,7 @@ diff -urN coreutils-8.16.orig//po/POTFILES.in coreutils-8.16/po/POTFILES.in src/getlimits.c src/group-list.c src/groups.c -diff -urN coreutils-8.16.orig//po/pl.po coreutils-8.16/po/pl.po ---- coreutils-8.16.orig//po/pl.po 2012-03-26 12:08:45.000000000 +0000 +--- coreutils-8.16.orig/po/pl.po 2012-03-26 12:08:45.000000000 +0000 +++ coreutils-8.16/po/pl.po 2012-04-18 09:07:17.417662632 +0000 @@ -4109,6 +4109,15 @@ " \\0NNN znak o kodzie ASCII wynoszącym NNN (ósemkowo, 1 do 3 cyfr)\n" @@ -120,8 +105,7 @@ diff -urN coreutils-8.16.orig//po/pl.po coreutils-8.16/po/pl.po src_getlimits_LDADD = $(LDADD) src_ginstall_LDADD = $(LDADD) src_groups_LDADD = $(LDADD) -diff -urN coreutils-8.16.orig//src/getgid.c coreutils-8.16/src/getgid.c ---- coreutils-8.16.orig//src/getgid.c 1970-01-01 00:00:00.000000000 +0000 +--- coreutils-8.16.orig/src/getgid.c 1970-01-01 00:00:00.000000000 +0000 +++ coreutils-8.16/src/getgid.c 2012-04-18 09:44:16.000000000 +0000 @@ -0,0 +1,88 @@ +/* getgid - print GID of given group diff --git a/coreutils-info.patch b/coreutils-info.patch index fd167b1..a136949 100644 --- a/coreutils-info.patch +++ b/coreutils-info.patch @@ -1,6 +1,6 @@ ---- coreutils-8.22/doc/coreutils.texi.orig 2013-12-13 03:43:10.000000000 +0100 -+++ coreutils-8.22/doc/coreutils.texi 2013-12-14 12:02:04.754108101 +0100 -@@ -20,120 +20,109 @@ +--- coreutils-8.23/doc/coreutils.texi.orig 2014-07-14 00:09:52.000000000 +0200 ++++ coreutils-8.23/doc/coreutils.texi 2014-07-20 18:30:37.001187417 +0200 +@@ -22,121 +22,110 @@ @syncodeindex pg cp @syncodeindex vr cp @@ -32,6 +32,7 @@ -* chroot: (coreutils)chroot invocation. Specify the root directory. -* cksum: (coreutils)cksum invocation. Print POSIX CRC checksum. -* comm: (coreutils)comm invocation. Compare sorted files by line. +-* coreutils: (coreutils)coreutils invocation. Multi-call program. -* cp: (coreutils)cp invocation. Copy files. -* csplit: (coreutils)csplit invocation. Split by context. -* cut: (coreutils)cut invocation. Print selected parts of lines. @@ -55,7 +56,7 @@ -* hostid: (coreutils)hostid invocation. Print numeric host identifier. -* hostname: (coreutils)hostname invocation. Print or set system name. -* id: (coreutils)id invocation. Print user identity. --* install: (coreutils)install invocation. Copy and change attributes. +-* install: (coreutils)install invocation. Copy files and set attributes. -* join: (coreutils)join invocation. Join lines on a common field. -* kill: (coreutils)kill invocation. Send a signal to processes. -* link: (coreutils)link invocation. Make hard links between files. @@ -82,7 +83,7 @@ -* ptx: (coreutils)ptx invocation. Produce permuted indexes. -* pwd: (coreutils)pwd invocation. Print working directory. -* readlink: (coreutils)readlink invocation. Print referent of a symlink. --* realpath: (coreutils)readpath invocation. Print resolved file names. +-* realpath: (coreutils)realpath invocation. Print resolved file names. -* rm: (coreutils)rm invocation. Remove files. -* rmdir: (coreutils)rmdir invocation. Remove empty directories. -* runcon: (coreutils)runcon invocation. Run in specified SELinux CTX. @@ -132,6 +133,7 @@ +* chroot: (coreutils)chroot. Specify the root directory +* cksum: (coreutils)cksum. Print POSIX CRC checksum +* comm: (coreutils)comm. Compare sorted files by line ++* coreutils: (coreutils)coreutils. Multi-call program +* cp: (coreutils)cp. Copy files +* csplit: (coreutils)csplit. Split by context +* cut: (coreutils)cut. Print selected parts of lines @@ -154,7 +156,7 @@ +* head: (coreutils)head. Output the first part of files +* hostid: (coreutils)hostid. Print numeric host identifier +* id: (coreutils)id. Print user identity -+* install: (coreutils)install. Copy and change attributes ++* install: (coreutils)install. Copy files and set attributes +* join: (coreutils)join. Join lines on a common field +* link: (coreutils)link. Make hard links between files +* ln: (coreutils)ln. Make links between files @@ -180,13 +182,13 @@ +* ptx: (coreutils)ptx. Produce permuted indexes +* pwd: (coreutils)pwd. Print working directory +* readlink: (coreutils)readlink. Print referent of a symlink -+* realpath: (coreutils)readpath. Print resolved file names ++* realpath: (coreutils)realpath. Print resolved file names +* rm: (coreutils)rm. Remove files +* rmdir: (coreutils)rmdir. Remove empty directories +* runcon: (coreutils)runcon. Run in specified SELinux CTX +* seq: (coreutils)seq. Print numeric sequences +* sha1sum: (coreutils)sha1sum. Print or check SHA-1 digests -+* sha2: (coreutils)sha2 utilities. Print or check SHA-2 digests ++* sha2: (coreutils)sha2 Print or check SHA-2 digests +* shred: (coreutils)shred. Remove files more securely +* shuf: (coreutils)shuf. Shuffling text files +* sleep: (coreutils)sleep. Delay for a specified time @@ -221,7 +223,7 @@ @end direntry @copying -@@ -198,10 +187,9 @@ +@@ -201,10 +190,9 @@ * File name manipulation:: dirname basename pathchk mktemp realpath * Working context:: pwd stty printenv tty * User information:: id logname whoami groups users who @@ -233,7 +235,12 @@ * Delaying:: sleep * Numeric operations:: factor seq * File permissions:: Access modes -@@ -230,43 +218,43 @@ +@@ -230,47 +218,47 @@ + * Traversing symlinks:: Traversing symlinks to directories + * Treating / specially:: Treating / specially + * Standards conformance:: Standards conformance +-* coreutils invocation:: Multi-call binary invocation ++* coreutils:: Multi-call binary invocation Output of entire files @@ -301,7 +308,7 @@ @command{ptx}: Produce permuted indexes -@@ -278,15 +266,15 @@ +@@ -282,15 +270,15 @@ Operating on fields @@ -323,7 +330,7 @@ @command{tr}: Translate, squeeze, and/or delete characters -@@ -296,10 +284,10 @@ +@@ -300,10 +288,10 @@ Directory listing @@ -338,7 +345,7 @@ @command{ls}: List directory contents -@@ -312,51 +300,51 @@ +@@ -316,51 +304,51 @@ Basic operations @@ -420,7 +427,7 @@ @command{test}: Check file types and compare values -@@ -375,22 +363,22 @@ +@@ -379,22 +367,22 @@ Redirection @@ -453,7 +460,7 @@ @command{stty}: Print or change terminal characteristics -@@ -404,22 +392,20 @@ +@@ -408,22 +396,20 @@ User information @@ -487,7 +494,7 @@ @command{date}: Print or set system date and time -@@ -434,30 +420,26 @@ +@@ -438,30 +424,26 @@ SELinux context @@ -529,7 +536,25 @@ File permissions -@@ -1477,14 +1459,14 @@ +@@ -773,7 +755,7 @@ + * Treating / specially:: --preserve-root and --no-preserve-root. + * Special built-in utilities:: @command{break}, @command{:}, @dots{} + * Standards conformance:: Conformance to the POSIX standard. +-* coreutils invocation:: Multi-call binary invocation. ++* coreutils:: Multi-call binary invocation. + @end menu + + +@@ -1497,7 +1479,7 @@ + or @samp{tail +10}, you can work around any compatibility problems by setting + @samp{_POSIX2_VERSION=199209} in your environment. + +-@node coreutils invocation ++@node coreutils + @section @command{coreutils}: Multi-call binary + + @pindex multicall +@@ -1523,14 +1505,14 @@ in some way. @menu @@ -550,7 +575,7 @@ @section @command{cat}: Concatenate and write files @pindex cat -@@ -1584,7 +1566,7 @@ +@@ -1630,7 +1612,7 @@ @end smallexample @@ -559,7 +584,7 @@ @section @command{tac}: Concatenate and write files in reverse @pindex tac -@@ -1640,7 +1622,7 @@ +@@ -1686,7 +1668,7 @@ @end example @@ -568,7 +593,7 @@ @section @command{nl}: Number lines and write files @pindex nl -@@ -1803,7 +1785,7 @@ +@@ -1849,7 +1831,7 @@ @exitstatus @@ -577,7 +602,7 @@ @section @command{od}: Write files in octal or other formats @pindex od -@@ -2058,7 +2040,7 @@ +@@ -2114,7 +2096,7 @@ @exitstatus @@ -586,7 +611,7 @@ @section @command{base64}: Transform data into printable data @pindex base64 -@@ -2126,14 +2108,14 @@ +@@ -2182,14 +2164,14 @@ These commands reformat the contents of files. @menu @@ -606,7 +631,7 @@ @section @command{fmt}: Reformat paragraph text @pindex fmt -@@ -2237,7 +2219,7 @@ +@@ -2293,7 +2275,7 @@ @exitstatus @@ -615,7 +640,7 @@ @section @command{numfmt}: Reformat numbers @pindex numfmt -@@ -2557,7 +2539,7 @@ +@@ -2615,7 +2597,7 @@ == 2,14,74,83,648== @end example @@ -624,7 +649,7 @@ @section @command{pr}: Paginate or columnate files for printing @pindex pr -@@ -2667,7 +2649,7 @@ +@@ -2725,7 +2707,7 @@ @cindex time formats @cindex formatting times Format header dates using @var{format}, using the same conventions as @@ -633,7 +658,7 @@ Except for directives, which start with @samp{%}, characters in @var{format} are printed unchanged. You can use this option to specify an arbitrary string in place of the header date, -@@ -2894,7 +2876,7 @@ +@@ -2955,7 +2937,7 @@ @exitstatus @@ -642,7 +667,7 @@ @section @command{fold}: Wrap input lines to fit in specified width @pindex fold -@@ -2961,13 +2943,13 @@ +@@ -3022,13 +3004,13 @@ These commands output pieces of the input. @menu @@ -661,7 +686,7 @@ @section @command{head}: Output the first part of files @pindex head -@@ -3044,7 +3026,7 @@ +@@ -3105,7 +3087,7 @@ @exitstatus @@ -670,7 +695,7 @@ @section @command{tail}: Output the last part of files @pindex tail -@@ -3282,7 +3264,7 @@ +@@ -3343,7 +3325,7 @@ @exitstatus @@ -679,7 +704,7 @@ @section @command{split}: Split a file into pieces. @pindex split -@@ -3511,7 +3493,7 @@ +@@ -3572,7 +3554,7 @@ @end example @@ -688,7 +713,7 @@ @section @command{csplit}: Split a file into context-determined pieces @pindex csplit -@@ -3727,16 +3709,16 @@ +@@ -3788,16 +3770,16 @@ contents of files. @menu @@ -711,7 +736,7 @@ @section @command{wc}: Print newline, word, and byte counts @pindex wc -@@ -3854,7 +3836,7 @@ +@@ -3915,7 +3897,7 @@ @exitstatus @@ -720,7 +745,7 @@ @section @command{sum}: Print checksum and block counts @pindex sum -@@ -3905,7 +3887,7 @@ +@@ -3966,7 +3948,7 @@ @exitstatus @@ -729,7 +754,7 @@ @section @command{cksum}: Print CRC checksum and byte counts @pindex cksum -@@ -3939,7 +3921,7 @@ +@@ -4000,7 +3982,7 @@ @exitstatus @@ -738,7 +763,7 @@ @section @command{md5sum}: Print or check MD5 digests @pindex md5sum -@@ -4085,7 +4067,7 @@ +@@ -4146,7 +4128,7 @@ @exitstatus @@ -747,7 +772,7 @@ @section @command{sha1sum}: Print or check SHA-1 digests @pindex sha1sum -@@ -4097,7 +4079,7 @@ +@@ -4158,7 +4140,7 @@ @command{sha1sum} computes a 160-bit checksum for each specified @var{file}. The usage and options of this command are precisely the @@ -756,7 +781,7 @@ Note: The SHA-1 digest is more secure than MD5, and no collisions of it are known (different files having the same fingerprint). However, -@@ -4137,7 +4119,7 @@ +@@ -4198,7 +4180,7 @@ various lengths (respectively 224, 256, 384 and 512 bits), collectively known as the SHA-2 hashes. The usage and options of these commands are precisely the same as for @command{md5sum}. @@ -765,7 +790,7 @@ Note: The SHA384 and SHA512 digests are considerably slower to compute, especially on 32-bit computers, than SHA224 or SHA256. -@@ -4152,16 +4134,16 @@ +@@ -4213,16 +4195,16 @@ These commands work with (or produce) sorted files. @menu @@ -789,7 +814,7 @@ @section @command{sort}: Sort text files @pindex sort -@@ -4450,7 +4432,7 @@ +@@ -4511,7 +4493,7 @@ Sort by hashing the input keys and then sorting the hash values. Choose the hash function at random, ensuring that it is free of collisions so that differing keys have differing hash values. This is @@ -798,7 +823,7 @@ except that keys with the same value sort together. If multiple random sort fields are specified, the same random hash -@@ -4638,7 +4620,7 @@ +@@ -4699,7 +4681,7 @@ @var{n} is set to the number of available processors, but limited to 8, as there are diminishing performance gains after that. Note also that using @var{n} threads increases the memory usage by @@ -807,16 +832,16 @@ @item -u @itemx --unique -@@ -4656,7 +4638,7 @@ +@@ -4717,7 +4699,7 @@ this equivalence does not extend to arbitrary @command{sort} options. For example, @code{sort -n -u} inspects only the value of the initial numeric string when checking for uniqueness, whereas @code{sort -n | -uniq} inspects the entire line. @xref{uniq invocation}. +uniq} inspects the entire line. @xref{uniq}. - @macro zeroTerminatedOption - @item -z -@@ -4879,7 +4861,7 @@ + @optZeroTerminated + +@@ -4926,7 +4908,7 @@ @end itemize @@ -825,7 +850,7 @@ @section @command{shuf}: Shuffling text @pindex shuf -@@ -5035,7 +5017,7 @@ +@@ -5082,7 +5064,7 @@ @exitstatus @@ -834,7 +859,7 @@ @section @command{uniq}: Uniquify files @pindex uniq -@@ -5057,7 +5039,7 @@ +@@ -5104,7 +5086,7 @@ The input need not be sorted, but repeated input lines are detected only if they are adjacent. If you want to discard non-adjacent duplicate lines, perhaps you want to use @code{sort -u}. @@ -843,7 +868,7 @@ @vindex LC_COLLATE Comparisons honor the rules specified by the @env{LC_COLLATE} -@@ -5218,7 +5200,7 @@ +@@ -5266,7 +5248,7 @@ @exitstatus @@ -852,7 +877,7 @@ @section @command{comm}: Compare two sorted files line by line @pindex comm -@@ -5300,7 +5282,7 @@ +@@ -5348,7 +5330,7 @@ @end table @@ -861,7 +886,7 @@ @section @command{ptx}: Produce permuted indexes @pindex ptx -@@ -5759,7 +5741,7 @@ +@@ -5807,7 +5789,7 @@ @end itemize @@ -870,7 +895,7 @@ @section @command{tsort}: Topological sort @pindex tsort -@@ -5921,13 +5903,13 @@ +@@ -5969,13 +5951,13 @@ @chapter Operating on fields @menu @@ -888,7 +913,7 @@ @section @command{cut}: Print selected parts of lines @pindex cut -@@ -6047,7 +6029,7 @@ +@@ -6095,7 +6077,7 @@ @exitstatus @@ -897,7 +922,7 @@ @section @command{paste}: Merge lines of files @pindex paste -@@ -6143,7 +6125,7 @@ +@@ -6191,7 +6173,7 @@ @exitstatus @@ -906,8 +931,8 @@ @section @command{join}: Join lines on a common field @pindex join -@@ -6319,13 +6301,13 @@ - This commands operate on individual characters. +@@ -6367,13 +6349,13 @@ + These commands operate on individual characters. @menu -* tr invocation:: Translate, squeeze, and/or delete characters. @@ -924,7 +949,7 @@ @section @command{tr}: Translate, squeeze, and/or delete characters @pindex tr -@@ -6705,7 +6687,7 @@ +@@ -6753,7 +6735,7 @@ @end itemize @@ -933,7 +958,7 @@ @section @command{expand}: Convert tabs to spaces @pindex expand -@@ -6758,7 +6740,7 @@ +@@ -6806,7 +6788,7 @@ @exitstatus @@ -942,7 +967,7 @@ @section @command{unexpand}: Convert spaces to tabs @pindex unexpand -@@ -6819,14 +6801,14 @@ +@@ -6867,14 +6849,14 @@ and @command{vdir}, which list information about files. @menu @@ -962,7 +987,7 @@ @section @command{ls}: List directory contents @pindex ls -@@ -7689,7 +7671,7 @@ +@@ -7737,7 +7719,7 @@ @item +@var{format} @vindex LC_TIME List timestamps using @var{format}, where @var{format} is interpreted @@ -971,7 +996,7 @@ For example, @option{--time-style="+%Y-%m-%d %H:%M:%S"} causes @command{ls} to list timestamps like @samp{2002-03-30 23:45:56}. As with @command{date}, @var{format}'s interpretation is affected by the -@@ -7881,7 +7863,7 @@ +@@ -7929,7 +7911,7 @@ @end table @@ -980,7 +1005,7 @@ @section @command{dir}: Briefly list directory contents @pindex dir -@@ -7891,10 +7873,10 @@ +@@ -7939,10 +7921,10 @@ -b}; that is, by default files are listed in columns, sorted vertically, and special characters are represented by backslash escape sequences. @@ -993,7 +1018,7 @@ @section @command{vdir}: Verbosely list directory contents @pindex vdir -@@ -7904,7 +7886,7 @@ +@@ -7952,7 +7934,7 @@ -b}; that is, by default files are listed in long format and special characters are represented by backslash escape sequences. @@ -1002,7 +1027,7 @@ @section @command{dircolors}: Color setup for @command{ls} @pindex dircolors -@@ -7991,16 +7973,16 @@ +@@ -8039,16 +8021,16 @@ copying, moving (renaming), and deleting (removing). @menu @@ -1026,7 +1051,7 @@ @section @command{cp}: Copy files and directories @pindex cp -@@ -8477,7 +8459,7 @@ +@@ -8526,7 +8508,7 @@ @exitstatus @@ -1035,7 +1060,7 @@ @section @command{dd}: Convert and copy a file @pindex dd -@@ -8943,7 +8925,7 @@ +@@ -9016,7 +8998,7 @@ @exitstatus @@ -1044,7 +1069,7 @@ @section @command{install}: Copy files and set attributes @pindex install -@@ -9124,7 +9106,7 @@ +@@ -9197,7 +9179,7 @@ @exitstatus @@ -1053,7 +1078,7 @@ @section @command{mv}: Move (rename) files @pindex mv -@@ -9265,7 +9247,7 @@ +@@ -9338,7 +9320,7 @@ @exitstatus @@ -1062,7 +1087,7 @@ @section @command{rm}: Remove files or directories @pindex rm -@@ -9428,7 +9410,7 @@ +@@ -9501,7 +9483,7 @@ @exitstatus @@ -1071,7 +1096,7 @@ @section @command{shred}: Remove files more securely @pindex shred -@@ -9438,7 +9420,7 @@ +@@ -9511,7 +9493,7 @@ @command{shred} overwrites devices or files, to help prevent even very expensive hardware from recovering the data. @@ -1080,7 +1105,7 @@ not actually destroyed. Only the index listing where the file is stored is destroyed, and the storage is made available for reuse. There are undelete utilities that will attempt to reconstruct the index -@@ -9698,18 +9680,18 @@ +@@ -9772,18 +9754,18 @@ (FIFOs), symbolic links, sockets, and so-called @dfn{special files}. @menu @@ -1108,7 +1133,7 @@ @section @command{link}: Make a hard link via the link syscall @pindex link -@@ -9722,7 +9704,7 @@ +@@ -9796,7 +9778,7 @@ @code{link} function. @xref{Hard Links, , , libc, The GNU C Library Reference Manual}. It avoids the bells and whistles of the more commonly-used @@ -1117,7 +1142,7 @@ Synopsis: @example -@@ -9748,7 +9730,7 @@ +@@ -9822,7 +9804,7 @@ @exitstatus @@ -1126,7 +1151,7 @@ @section @command{ln}: Make links between files @pindex ln -@@ -9932,7 +9914,7 @@ +@@ -10006,7 +9988,7 @@ Relative symbolic links are generated based on their canonicalized containing directory, and canonicalized targets. I.E. all symbolic links in these file names will be resolved. @@ -1135,7 +1160,7 @@ over relative file name generation, as demonstrated in the following example: @example -@@ -10009,7 +9991,7 @@ +@@ -10083,7 +10065,7 @@ @end smallexample @@ -1144,7 +1169,7 @@ @section @command{mkdir}: Make directories @pindex mkdir -@@ -10082,7 +10064,7 @@ +@@ -10156,7 +10138,7 @@ @exitstatus @@ -1153,7 +1178,7 @@ @section @command{mkfifo}: Make FIFOs (named pipes) @pindex mkfifo -@@ -10123,7 +10105,7 @@ +@@ -10197,7 +10179,7 @@ @exitstatus @@ -1162,7 +1187,7 @@ @section @command{mknod}: Make block or character special files @pindex mknod -@@ -10200,7 +10182,7 @@ +@@ -10274,7 +10256,7 @@ @exitstatus @@ -1171,7 +1196,7 @@ @section @command{readlink}: Print value of a symlink or canonical file name @pindex readlink -@@ -10302,7 +10284,7 @@ +@@ -10372,7 +10354,7 @@ @exitstatus @@ -1180,7 +1205,7 @@ @section @command{rmdir}: Remove empty directories @pindex rmdir -@@ -10350,12 +10332,12 @@ +@@ -10420,12 +10402,12 @@ @end table @@ -1195,7 +1220,7 @@ @section @command{unlink}: Remove files via the unlink syscall @pindex unlink -@@ -10366,7 +10348,7 @@ +@@ -10436,7 +10418,7 @@ @code{unlink} function. @xref{Deleting Files, , , libc, The GNU C Library Reference Manual}. Synopsis: It avoids the bells and whistles of the more commonly-used @@ -1204,7 +1229,7 @@ @example unlink @var{filename} -@@ -10400,14 +10382,14 @@ +@@ -10470,14 +10452,14 @@ These commands change file attributes. @menu @@ -1224,7 +1249,7 @@ @section @command{chown}: Change file owner and group @pindex chown -@@ -10625,7 +10607,7 @@ +@@ -10702,7 +10684,7 @@ @end smallexample @@ -1233,7 +1258,16 @@ @section @command{chgrp}: Change group ownership @pindex chgrp -@@ -10748,7 +10730,7 @@ +@@ -10711,7 +10693,7 @@ + + @command{chgrp} changes the group ownership of each given @var{file} + to @var{group} (which can be either a group name or a numeric group ID) +-or to the group of an existing reference file. @xref{chown invocation}. ++or to the group of an existing reference file. @xref{chown}. + Synopsis: + + @example +@@ -10828,7 +10810,7 @@ @end smallexample @@ -1242,7 +1276,7 @@ @section @command{chmod}: Change access permissions @pindex chmod -@@ -10848,7 +10830,7 @@ +@@ -10928,7 +10910,7 @@ @exitstatus @@ -1251,7 +1285,7 @@ @section @command{touch}: Change file timestamps @pindex touch -@@ -11055,15 +11037,15 @@ +@@ -11135,15 +11117,15 @@ file status information, and write buffers to disk. @menu @@ -1273,7 +1307,7 @@ @section @command{df}: Report file system disk space usage @pindex df -@@ -11362,7 +11344,7 @@ +@@ -11442,7 +11424,7 @@ or @option{-x} is used together with a file name argument. @@ -1282,7 +1316,7 @@ @section @command{du}: Estimate file space usage @pindex du -@@ -11619,7 +11601,7 @@ +@@ -11699,7 +11681,7 @@ @item +@var{format} @vindex LC_TIME List timestamps using @var{format}, where @var{format} is interpreted @@ -1291,7 +1325,7 @@ For example, @option{--time-style="+%Y-%m-%d %H:%M:%S"} causes @command{du} to list timestamps like @samp{2002-03-30 23:45:56}. As with @command{date}, @var{format}'s interpretation is affected by the -@@ -11687,7 +11669,7 @@ +@@ -11767,7 +11749,7 @@ @exitstatus @@ -1300,7 +1334,7 @@ @section @command{stat}: Report file or file system status @pindex stat -@@ -11876,7 +11858,7 @@ +@@ -11956,7 +11938,7 @@ @exitstatus @@ -1309,7 +1343,7 @@ @section @command{sync}: Synchronize data on disk with memory @pindex sync -@@ -11903,7 +11885,7 @@ +@@ -11983,7 +11965,7 @@ @exitstatus @@ -1318,7 +1352,7 @@ @section @command{truncate}: Shrink or extend the size of a file @pindex truncate -@@ -11980,13 +11962,13 @@ +@@ -12060,13 +12042,13 @@ This section describes commands that display text strings. @menu @@ -1336,7 +1370,7 @@ @section @command{echo}: Print a line of text @pindex echo -@@ -12075,12 +12057,12 @@ +@@ -12155,12 +12137,12 @@ @var{string} contains a backslash or if the first argument is @option{-n}. Portable programs can use the @command{printf} command if they need to omit trailing newlines or output control characters or @@ -1351,7 +1385,7 @@ @section @command{printf}: Format and print data @pindex printf -@@ -12234,7 +12216,7 @@ +@@ -12314,7 +12296,7 @@ @exitstatus @@ -1360,7 +1394,7 @@ @section @command{yes}: Print a string until interrupted @pindex yes -@@ -12265,14 +12247,14 @@ +@@ -12345,14 +12327,14 @@ pipeline. @menu @@ -1380,7 +1414,7 @@ @section @command{false}: Do nothing, unsuccessfully @pindex false -@@ -12302,7 +12284,7 @@ +@@ -12382,7 +12364,7 @@ non-GNU hosts. @@ -1389,7 +1423,7 @@ @section @command{true}: Do nothing, successfully @pindex true -@@ -12338,7 +12320,7 @@ +@@ -12418,7 +12400,7 @@ more secure and faster than a shell script implementation, and may safely be used as a dummy shell for the purpose of disabling accounts. @@ -1398,7 +1432,7 @@ @section @command{test}: Check file types and compare values @pindex test -@@ -12671,7 +12653,7 @@ +@@ -12751,7 +12733,7 @@ @end table @@ -1407,7 +1441,7 @@ @section @command{expr}: Evaluate expressions @pindex expr -@@ -12948,11 +12930,11 @@ +@@ -13028,11 +13010,11 @@ it's described here. @menu @@ -1421,7 +1455,7 @@ @section @command{tee}: Redirect output to multiple files or processes @pindex tee -@@ -13113,15 +13095,15 @@ +@@ -13193,15 +13175,15 @@ This section describes commands that manipulate file names. @menu @@ -1443,7 +1477,7 @@ @section @command{basename}: Strip directory and suffix from a file name @pindex basename -@@ -13207,7 +13189,7 @@ +@@ -13283,7 +13265,7 @@ @end smallexample @@ -1452,7 +1486,7 @@ @section @command{dirname}: Strip last file name component @pindex dirname -@@ -13264,7 +13246,7 @@ +@@ -13336,7 +13318,7 @@ @end smallexample @@ -1461,7 +1495,7 @@ @section @command{pathchk}: Check file name validity and portability @pindex pathchk -@@ -13340,7 +13322,7 @@ +@@ -13412,7 +13394,7 @@ 1 otherwise. @end display @@ -1470,7 +1504,7 @@ @section @command{mktemp}: Create temporary file or directory @pindex mktemp -@@ -13515,7 +13497,7 @@ +@@ -13587,7 +13569,7 @@ @end display @@ -1479,7 +1513,7 @@ @section @command{realpath}: Print the resolved file name. @pindex realpath -@@ -13643,14 +13625,14 @@ +@@ -13711,14 +13693,14 @@ so forth. See also the user-related commands in the next section. @menu @@ -1499,7 +1533,7 @@ @section @command{pwd}: Print working directory @pindex pwd -@@ -13697,7 +13679,7 @@ +@@ -13765,7 +13747,7 @@ @exitstatus @@ -1508,7 +1542,7 @@ @section @command{stty}: Print or change terminal characteristics @pindex stty -@@ -14398,7 +14380,7 @@ +@@ -14466,7 +14448,7 @@ @end table @@ -1517,7 +1551,7 @@ @section @command{printenv}: Print all or some environment variables @pindex printenv -@@ -14433,7 +14415,7 @@ +@@ -14501,7 +14483,7 @@ @end display @@ -1526,7 +1560,7 @@ @section @command{tty}: Print file name of terminal on standard input @pindex tty -@@ -14483,16 +14465,16 @@ +@@ -14551,16 +14533,16 @@ logins, groups, and so forth. @menu @@ -1550,7 +1584,7 @@ @section @command{id}: Print user identity @pindex id -@@ -14594,7 +14576,7 @@ +@@ -14664,7 +14646,7 @@ @exitstatus @@ -1559,7 +1593,7 @@ @section @command{logname}: Print current login name @pindex logname -@@ -14615,7 +14597,7 @@ +@@ -14685,7 +14667,7 @@ @exitstatus @@ -1568,7 +1602,7 @@ @section @command{whoami}: Print effective user ID @pindex whoami -@@ -14631,7 +14613,7 @@ +@@ -14701,7 +14683,7 @@ @exitstatus @@ -1577,7 +1611,7 @@ @section @command{groups}: Print group names a user is in @pindex groups -@@ -14658,7 +14640,7 @@ +@@ -14728,7 +14710,7 @@ @exitstatus @@ -1586,7 +1620,7 @@ @section @command{users}: Print login names of users currently logged in @pindex users -@@ -14689,7 +14671,7 @@ +@@ -14759,7 +14741,7 @@ @exitstatus @@ -1595,7 +1629,7 @@ @section @command{who}: Print who is currently logged in @pindex who -@@ -14848,16 +14830,14 @@ +@@ -14918,16 +14900,14 @@ information. @menu @@ -1618,7 +1652,7 @@ @section @command{date}: Print or set system date and time @pindex date -@@ -15550,7 +15530,7 @@ +@@ -15620,7 +15600,7 @@ @end itemize @@ -1627,7 +1661,7 @@ @section @command{arch}: Print machine hardware name @pindex arch -@@ -15570,7 +15550,7 @@ +@@ -15640,7 +15620,7 @@ @exitstatus @@ -1636,7 +1670,7 @@ @section @command{nproc}: Print the number of available processors @pindex nproc -@@ -15607,7 +15587,7 @@ +@@ -15677,7 +15657,7 @@ @exitstatus @@ -1645,7 +1679,7 @@ @section @command{uname}: Print system information @pindex uname -@@ -15737,31 +15717,7 @@ +@@ -15807,31 +15787,7 @@ @exitstatus @@ -1678,7 +1712,7 @@ @section @command{hostid}: Print numeric host identifier @pindex hostid -@@ -15785,37 +15741,6 @@ +@@ -15855,37 +15811,6 @@ @exitstatus @@ -1716,7 +1750,7 @@ @node SELinux context @chapter SELinux context -@@ -15827,11 +15752,11 @@ +@@ -15897,11 +15822,11 @@ contexts. @menu @@ -1731,7 +1765,7 @@ @section @command{chcon}: Change SELinux context of file @pindex chcon -@@ -15934,7 +15859,7 @@ +@@ -16004,7 +15929,7 @@ @exitstatus @@ -1740,7 +1774,7 @@ @section @command{runcon}: Run a command in specified SELinux context @pindex runcon -@@ -16019,16 +15944,16 @@ +@@ -16089,16 +16014,16 @@ user, etc. @menu @@ -1764,7 +1798,7 @@ @section @command{chroot}: Run a command with a different root directory @pindex chroot -@@ -16116,7 +16041,7 @@ +@@ -16198,7 +16123,7 @@ @end display @@ -1773,7 +1807,7 @@ @section @command{env}: Run a command in a modified environment @pindex env -@@ -16266,7 +16191,7 @@ +@@ -16348,7 +16273,7 @@ @end display @@ -1782,7 +1816,7 @@ @section @command{nice}: Run a command with modified niceness @pindex nice -@@ -16393,7 +16318,7 @@ +@@ -16475,7 +16400,7 @@ @end example @@ -1791,7 +1825,7 @@ @section @command{nohup}: Run a command immune to hangups @pindex nohup -@@ -16466,7 +16391,7 @@ +@@ -16548,7 +16473,7 @@ instead of 125. @@ -1800,7 +1834,7 @@ @section @command{stdbuf}: Run a command with modified I/O stream buffering @pindex stdbuf -@@ -16555,7 +16480,7 @@ +@@ -16637,7 +16562,7 @@ @end display @@ -1809,7 +1843,7 @@ @section @command{timeout}: Run a command with a time limit @pindex timeout -@@ -16642,90 +16567,6 @@ +@@ -16724,90 +16649,6 @@ @end display @@ -1900,7 +1934,7 @@ @node Delaying @chapter Delaying -@@ -16735,11 +16576,11 @@ +@@ -16817,11 +16658,11 @@ @c Perhaps @command{wait} or other commands should be described here also? @menu @@ -1914,7 +1948,7 @@ @section @command{sleep}: Delay for a specified time @pindex sleep -@@ -16789,12 +16630,12 @@ +@@ -16871,12 +16712,12 @@ These programs do numerically-related operations. @menu @@ -1930,7 +1964,7 @@ @section @command{factor}: Print prime factors @pindex factor -@@ -16852,7 +16693,7 @@ +@@ -16934,7 +16775,7 @@ @exitstatus diff --git a/coreutils.spec b/coreutils.spec index 44cc5ec..58f6fd9 100644 --- a/coreutils.spec +++ b/coreutils.spec @@ -1,23 +1,24 @@ # # Conditional build: -%bcond_with advcopy # progress bar in cp +%bcond_with advcopy # progress bar in cp (orphaned patch) %bcond_without tests # do not perform "make test check" # Summary: GNU Core-utils - basic command line utilities Summary(pl.UTF-8): GNU Core-utils - podstawowe narzędzia działające z linii poleceń Name: coreutils -Version: 8.22 +Version: 8.23 Release: 1 License: GPL v3+ Group: Applications/System Source0: http://ftp.gnu.org/gnu/coreutils/%{name}-%{version}.tar.xz -# Source0-md5: 8fb0ae2267aa6e728958adc38f8163a2 +# Source0-md5: abed135279f87ad6762ce57ff6d89c41 Source1: %{name}-non-english-man-pages.tar.bz2 # Source1-md5: f7c986ebc74ccb8d08ed70141063f14c Source2: DIR_COLORS -Source3: fileutils.sh -Source4: fileutils.csh -Source5: mktemp.1.pl +Source3: DIR_COLORS.256color +Source4: colorls.sh +Source5: colorls.csh +Source6: mktemp.1.pl Patch0: %{name}-info.patch Patch1: %{name}-getgid.patch Patch2: %{name}-uname-cpuinfo.patch @@ -142,6 +143,17 @@ Programy zawarte w tym pakiecie to: %{__rm} tests/ls/stat-free-color.sh %{__sed} -i -e '/ls\/stat-free-color/d' tests/local.mk +# filesystem layout dependant (fails on some xfs fs) +%{__rm} tests/dd/sparse.sh +%{__sed} -i -e '/dd\/sparse/d' tests/local.mk + +# mksh is too smart for those, won't let programs fail on ulimit +# would need bash here +%{__rm} tests/misc/sort-merge-fdlimit.sh +%{__sed} -i -e '/misc\/sort-merge-fdlimit/d' tests/local.mk +%{__rm} tests/split/r-chunk.sh +%{__sed} -i -e '/split\/r-chunk/d' tests/local.mk + %build build-aux/gen-lists-of-programs.sh --autoconf > m4/cu-progs.m4 build-aux/gen-lists-of-programs.sh --automake > src/cu-progs.mk @@ -161,7 +173,7 @@ build-aux/gen-lists-of-programs.sh --automake > src/cu-progs.mk %if %{with tests} sed -i -e 's#COLUMNS##g' tests/envvar-check -%{__make} -j1 tests check +LC_ALL=C LANG=C %{__make} -j1 tests check %endif %install @@ -172,20 +184,21 @@ install -d $RPM_BUILD_ROOT{/bin,/sbin,%{_bindir},%{_sbindir},/etc/shrc.d} DESTDIR=$RPM_BUILD_ROOT mv -f $RPM_BUILD_ROOT%{_bindir}/{arch,basename,cat,chgrp,chmod,chown,cp,date,dd,\ -df,echo,false,id,link,ln,ls,mkdir,mknod,mktemp,mv,nice,printf,pwd,rm,rmdir,\ +df,echo,false,id,link,ln,ls,mkdir,mknod,mktemp,mv,nice,printf,pwd,readlink,rm,rmdir,\ sleep,sort,stat,stty,sync,touch,true,unlink,uname} $RPM_BUILD_ROOT/bin mv -f $RPM_BUILD_ROOT%{_bindir}/chroot $RPM_BUILD_ROOT%{_sbindir} cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir} -cp -p %{SOURCE3} %{SOURCE4} $RPM_BUILD_ROOT/etc/shrc.d +cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir} +cp -p %{SOURCE4} %{SOURCE5} $RPM_BUILD_ROOT/etc/shrc.d cp -a man/pt_BR man/pt for d in cs da de es fi fr hu id it ja ko nl pl pt ru zh_CN; do install -d $RPM_BUILD_ROOT%{_mandir}/$d/man1 cp -p man/$d/*.1 $RPM_BUILD_ROOT%{_mandir}/$d/man1 done -install %{SOURCE5} $RPM_BUILD_ROOT%{_mandir}/pl/man1/mktemp.1 +install %{SOURCE6} $RPM_BUILD_ROOT%{_mandir}/pl/man1/mktemp.1 # unwanted (-f left intentionally - some manuals could have no translations) rm -f $RPM_BUILD_ROOT%{_mandir}/*/man1/{hostname,kill,su,uptime}.1 # always remove, never packaged but sometimes installed @@ -228,6 +241,7 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) /bin/nice %attr(755,root,root) /bin/printf %attr(755,root,root) /bin/pwd +%attr(755,root,root) /bin/readlink %attr(755,root,root) /bin/rm %attr(755,root,root) /bin/rmdir %attr(755,root,root) /bin/sleep @@ -276,7 +290,6 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_bindir}/pr %attr(755,root,root) %{_bindir}/printenv %attr(755,root,root) %{_bindir}/ptx -%attr(755,root,root) %{_bindir}/readlink %attr(755,root,root) %{_bindir}/realpath %attr(755,root,root) %{_bindir}/runcon %attr(755,root,root) %{_bindir}/seq @@ -309,8 +322,9 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_bindir}/yes %attr(755,root,root) %{_sbindir}/chroot %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/DIR_COLORS -%config(noreplace) /etc/shrc.d/fileutils.csh -%config(noreplace) /etc/shrc.d/fileutils.sh +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/DIR_COLORS.256color +%config(noreplace) /etc/shrc.d/colorls.csh +%config(noreplace) /etc/shrc.d/colorls.sh %dir %{_libdir}/coreutils %attr(755,root,root) %{_libdir}/coreutils/libstdbuf.so %{_mandir}/man1/arch.1* diff --git a/fileutils.csh b/fileutils.csh deleted file mode 100644 index 4b7249e..0000000 --- a/fileutils.csh +++ /dev/null @@ -1,32 +0,0 @@ -set SYS_RC_FILE=/etc/DIR_COLORS -set USER_RC_FILE=$HOME/.dir_colors -set DEF_COLOR_MODE=tty - -set COLOR_MODE=`awk '/^COLOR/{c=$2} END{print c}' $SYS_RC_FILE` - -test -r $USER_RC_FILE -if ($status == 0) then - set COLOR_MODE=`awk '/^COLOR/{c=$2} END{print c}' $USER_RC_FILE` -endif - -# 'all' argument for 'ls --color=' is no longer valid -test "$COLOR_MODE" = all -if ($status == 0) then - set COLOR_MODE=always -endif - -test -z "$COLOR_MODE" -if ($status == 0) then - set COLOR_MODE=$DEF_COLOR_MODE -endif - -alias ls "ls --color=$COLOR_MODE" - -test -r $USER_RC_FILE -if ($status == 0) then - eval `/usr/bin/dircolors -c $USER_RC_FILE` -else - eval `/usr/bin/dircolors -c $SYS_RC_FILE` -endif - -unset SYS_RC_FILE USER_RC_FILE DEF_COLOR_MODE diff --git a/fileutils.sh b/fileutils.sh deleted file mode 100644 index d28d074..0000000 --- a/fileutils.sh +++ /dev/null @@ -1,22 +0,0 @@ -SYS_RC_FILE=/etc/DIR_COLORS -USER_RC_FILE=$HOME/.dir_colors -DEF_COLOR_MODE=tty - -COLOR_MODE=`awk '/^COLOR/{c=$2} END{print c}' $SYS_RC_FILE` - -[ -r $USER_RC_FILE ] && COLOR_MODE=`awk '/^COLOR/{c=$2} END{print c}' $USER_RC_FILE` - -# 'all' argument for 'ls --color=' is no longer valid -[ "$COLOR_MODE" = all ] && COLOR_MODE=always - -[ -z "$COLOR_MODE" ] && COLOR_MODE=$DEF_COLOR_MODE - -alias ls="ls --color=$COLOR_MODE" - -if [ -r $USER_RC_FILE ]; then - eval `/usr/bin/dircolors -b $USER_RC_FILE` -else - eval `/usr/bin/dircolors -b $SYS_RC_FILE` -fi - -unset SYS_RC_FILE USER_RC_FILE DEF_COLOR_MODE COLOR_MODE diff --git a/tests.patch b/tests.patch index 280c5e7..70d1b9d 100644 --- a/tests.patch +++ b/tests.patch @@ -120,32 +120,42 @@ if test $double_slash = //; then test "$out" = "/$nl//" || fail=1 else ---- coreutils-8.21/tests/misc/nohup.sh~ 2013-01-31 01:46:24.000000000 +0100 -+++ coreutils-8.21/tests/misc/nohup.sh 2013-12-03 13:35:51.952568924 +0100 -@@ -61,18 +61,18 @@ +--- coreutils-8.23/tests/misc/nohup.sh.orig 2014-07-20 19:03:44.627770671 +0200 ++++ coreutils-8.23/tests/misc/nohup.sh 2014-07-20 19:10:31.097753613 +0200 +@@ -61,23 +61,23 @@ # Bug present through coreutils 8.0: failure to print advisory message # to stderr must be fatal. Requires stdout to be terminal. -if test -w /dev/full && test -c /dev/full; then -( +- # POSIX shells immediately exit the subshell on exec error. +- # So check we can write to /dev/tty before the exec, which +- # isn't possible if we've no controlling tty for example. +- test -c /dev/tty && >/dev/tty || exit 0 +- - exec >/dev/tty - test -t 1 || exit 0 - nohup echo hi 2> /dev/full - test $? = 125 || fail=1 - test -f nohup.out || fail=1 -- test -s nohup.out && fail=1 +- compare /dev/null nohup.out || fail=1 - rm -f nohup.out - exit $fail -) || fail=1 -fi +#if test -w /dev/full && test -c /dev/full; then +#( ++# # POSIX shells immediately exit the subshell on exec error. ++# # So check we can write to /dev/tty before the exec, which ++# # isn't possible if we've no controlling tty for example. ++# test -c /dev/tty && >/dev/tty || exit 0 ++# +# exec >/dev/tty +# test -t 1 || exit 0 +# nohup echo hi 2> /dev/full +# test $? = 125 || fail=1 +# test -f nohup.out || fail=1 -+# test -s nohup.out && fail=1 ++# compare /dev/null nohup.out || fail=1 +# rm -f nohup.out +# exit $fail +#) || fail=1 -- 2.46.0