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

Oops, forgot to git pull, merging

Browse Source
This commit is contained in:
Ondřej Vašík 2015-06-04 10:48:30 +02:00
commit 138c00f55f
5 changed files with 109 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
coreutils-DIR_COLORS
View File

@ -209,8 +209,6 @@ EXEC 01;32
.emf 01;35 .emf 01;35
# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions # http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
.axv 01;35
.anx 01;35
.ogv 01;35 .ogv 01;35
.ogx 01;35 .ogx 01;35
@ -218,6 +216,7 @@ EXEC 01;32
.aac 01;36 .aac 01;36
.au 01;36 .au 01;36
.flac 01;36 .flac 01;36
.m4a 01;36
.mid 01;36 .mid 01;36
.midi 01;36 .midi 01;36
.mka 01;36 .mka 01;36
@ -228,8 +227,8 @@ EXEC 01;32
.wav 01;36 .wav 01;36
# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions # http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
.axa 01;36
.oga 01;36 .oga 01;36
.opus 01;36
.spx 01;36 .spx 01;36
.xspf 01;36 .xspf 01;36

13
coreutils-DIR_COLORS.256color
View File

@ -55,17 +55,17 @@ EIGHTBIT 1
#NORMAL 00 # global default, no color code at all #NORMAL 00 # global default, no color code at all
#FILE 00 # normal file, use no color at all #FILE 00 # normal file, use no color at all
RESET 0 # reset to "normal" color RESET 0 # reset to "normal" color
DIR 38;5;27 # 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 44;38;5;15 # 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
SOCK 38;5;13 # socket 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 05;48;5;232;38;5;15 # ... 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)
CAPABILITY 48;5;196;38;5;226 # file with capability CAPABILITY 48;5;196;38;5;226 # file with capability
@ -74,7 +74,7 @@ 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 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: # This is for files with execute permission:
EXEC 38;5;34 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.
@ -179,8 +179,6 @@ EXEC 38;5;34
.emf 38;5;13 .emf 38;5;13
# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions # http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
.axv 38;5;13
.anx 38;5;13
.ogv 38;5;13 .ogv 38;5;13
.ogx 38;5;13 .ogx 38;5;13
@ -188,6 +186,7 @@ EXEC 38;5;34
.aac 38;5;45 .aac 38;5;45
.au 38;5;45 .au 38;5;45
.flac 38;5;45 .flac 38;5;45
.m4a 38;5;45
.mid 38;5;45 .mid 38;5;45
.midi 38;5;45 .midi 38;5;45
.mka 38;5;45 .mka 38;5;45
@ -198,8 +197,8 @@ EXEC 38;5;34
.wav 38;5;45 .wav 38;5;45
# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions # http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
.axa 38;5;45
.oga 38;5;45 .oga 38;5;45
.opus 38;5;45
.spx 38;5;45 .spx 38;5;45
.xspf 38;5;45 .xspf 38;5;45

57
coreutils-DIR_COLORS.lightbgcolor
View File

@ -1,4 +1,4 @@
# Configuration file for the color ls utility - modified for gray backgrounds # Configuration file for the color ls utility - modified for lighter backgrounds
# Synchronized with coreutils 8.5 dircolors # 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
@ -16,8 +16,9 @@ COLOR tty
OPTIONS -F -T 0 OPTIONS -F -T 0
# Below, there should be one TERM entry for each termtype that is colorizable # Below, there should be one TERM entry for each termtype that is colorizable
TERM linux TERM Eterm
TERM console TERM ansi
TERM color-xterm
TERM con132x25 TERM con132x25
TERM con132x30 TERM con132x30
TERM con132x43 TERM con132x43
@ -29,20 +30,46 @@ TERM con80x43
TERM con80x50 TERM con80x50
TERM con80x60 TERM con80x60
TERM cons25 TERM cons25
TERM xterm TERM console
TERM xterm-16color TERM cygwin
TERM xterm-88color TERM dtterm
TERM xterm-256color 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
TERM rxvt-256color TERM rxvt-256color
TERM rxvt-cygwin
TERM rxvt-cygwin-native
TERM rxvt-unicode TERM rxvt-unicode
TERM rxvt-unicode-256color TERM rxvt-unicode-256color
TERM rxvt-unicode256 TERM rxvt-unicode256
TERM xterm-color TERM screen
TERM color-xterm 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 vt100
TERM dtterm TERM xterm
TERM color_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, followed by '1' for on, '0' for off. (8-bit output)
EIGHTBIT 1 EIGHTBIT 1
@ -57,7 +84,7 @@ EIGHTBIT 1
# 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 # normal file, use no color at all
RESET 0 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.)
@ -76,7 +103,6 @@ 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 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 STICKY 37;44 # dir with the sticky bit set (+t) and not other-writable
# This is for files with execute permission: # This is for files with execute permission:
EXEC 00;32 EXEC 00;32
@ -182,8 +208,6 @@ EXEC 00;32
.emf 00;35 .emf 00;35
# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions # http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
.axv 00;35
.anx 00;35
.ogv 00;35 .ogv 00;35
.ogx 00;35 .ogx 00;35
@ -191,6 +215,7 @@ EXEC 00;32
.aac 00;36 .aac 00;36
.au 00;36 .au 00;36
.flac 00;36 .flac 00;36
.m4a 00;36
.mid 00;36 .mid 00;36
.midi 00;36 .midi 00;36
.mka 00;36 .mka 00;36
@ -201,8 +226,8 @@ EXEC 00;32
.wav 00;36 .wav 00;36
# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions # http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
.axa 00;36
.oga 00;36 .oga 00;36
.opus 00;36
.spx 00;36 .spx 00;36
.xspf 00;36 .xspf 00;36

40
coreutils-i18n.patch
View File

@ -3245,8 +3245,8 @@ diff -urNp coreutils-8.23-orig/src/sort.c coreutils-8.23/src/sort.c
+ +
+ if (ignore || translate) + if (ignore || translate)
+ { + {
+ char *copy_a = (char *) xmalloc (lena + 1 + lenb + 1); + char *copy_a = (char *) xmalloc ((lena + lenb) * MB_CUR_MAX + 2);
+ char *copy_b = copy_a + lena + 1; + char *copy_b = copy_a + lena * MB_CUR_MAX + 1;
+ size_t new_len_a, new_len_b; + size_t new_len_a, new_len_b;
+ size_t i, j; + size_t i, j;
+ +
@ -3452,6 +3452,39 @@ diff -urNp coreutils-8.23-orig/src/sort.c coreutils-8.23/src/sort.c
} }
break; break;
diff -urNp coreutils-8.23-orig/tests/i18n/sort.sh coreutils-8.23/tests/i18n/sort.sh
--- coreutils-8.23-orig/tests/i18n/sort.sh 1970-01-01 01:00:00.000000000 +0100
+++ coreutils-8.23/tests/i18n/sort.sh 2014-07-22 13:45:52.733652016 +0200
@@ -0,0 +1,29 @@
+#!/bin/sh
+# Verify sort's multi-byte support.
+
+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
+print_ver_ sort
+
+export LC_ALL=en_US.UTF-8
+locale -k LC_CTYPE | grep -q "charmap.*UTF-8" \
+ || skip_ "No UTF-8 locale available"
+
+# Enable heap consistency checkng on older systems
+export MALLOC_CHECK_=2
+
+
+# check buffer overflow issue due to
+# expanding multi-byte representation due to case conversion
+# https://bugzilla.suse.com/show_bug.cgi?id=928749
+cat <<EOF > exp
+.
+ɑ
+EOF
+cat <<EOF | sort -f > out || fail=1
+.
+ɑ
+EOF
+compare exp out || { fail=1; cat out; }
+
+
+Exit $fail
diff -urNp coreutils-8.23-orig/src/unexpand.c coreutils-8.23/src/unexpand.c diff -urNp coreutils-8.23-orig/src/unexpand.c coreutils-8.23/src/unexpand.c
--- coreutils-8.23-orig/src/unexpand.c 2014-07-11 13:00:07.000000000 +0200 --- coreutils-8.23-orig/src/unexpand.c 2014-07-11 13:00:07.000000000 +0200
+++ coreutils-8.23/src/unexpand.c 2014-07-22 13:45:52.721651968 +0200 +++ coreutils-8.23/src/unexpand.c 2014-07-22 13:45:52.721651968 +0200
@ -4099,11 +4132,12 @@ diff -urNp coreutils-8.23-orig/src/uniq.c coreutils-8.23/src/uniq.c
diff -urNp coreutils-8.23-orig/tests/local.mk coreutils-8.23/tests/local.mk diff -urNp coreutils-8.23-orig/tests/local.mk coreutils-8.23/tests/local.mk
--- coreutils-8.23-orig/tests/local.mk 2014-07-22 13:45:10.494422571 +0200 --- coreutils-8.23-orig/tests/local.mk 2014-07-22 13:45:10.494422571 +0200
+++ coreutils-8.23/tests/local.mk 2014-07-22 13:45:52.726651988 +0200 +++ coreutils-8.23/tests/local.mk 2014-07-22 13:45:52.726651988 +0200
@@ -331,6 +331,7 @@ all_tests = \ @@ -331,6 +331,8 @@ all_tests = \
tests/misc/sort-discrim.sh \ tests/misc/sort-discrim.sh \
tests/misc/sort-files0-from.pl \ tests/misc/sort-files0-from.pl \
tests/misc/sort-float.sh \ tests/misc/sort-float.sh \
+ tests/misc/sort-mb-tests.sh \ + tests/misc/sort-mb-tests.sh \
+ tests/i18n/sort.sh \
tests/misc/sort-merge.pl \ tests/misc/sort-merge.pl \
tests/misc/sort-merge-fdlimit.sh \ tests/misc/sort-merge-fdlimit.sh \
tests/misc/sort-month.sh \ tests/misc/sort-month.sh \

25
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.23 Version: 8.23
Release: 7%{?dist} Release: 12%{?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/
@ -179,7 +179,7 @@ make all %{?_smp_mflags}
sed -i -e 's,/etc/utmp,/var/run/utmp,g;s,/etc/wtmp,/var/run/wtmp,g' doc/coreutils.texi sed -i -e 's,/etc/utmp,/var/run/utmp,g;s,/etc/wtmp,/var/run/wtmp,g' doc/coreutils.texi
%check %check
make check make check %{?_smp_mflags}
%install %install
make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install
@ -263,7 +263,7 @@ fi
%defattr(-,root,root,-) %defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/DIR_COLORS* %config(noreplace) %{_sysconfdir}/DIR_COLORS*
%config(noreplace) %{_sysconfdir}/profile.d/* %config(noreplace) %{_sysconfdir}/profile.d/*
%doc ABOUT-NLS ChangeLog.bz2 NEWS README THANKS TODO old/* %doc ABOUT-NLS NEWS README THANKS TODO
%{!?_licensedir:%global license %%doc} %{!?_licensedir:%global license %%doc}
%license COPYING %license COPYING
%{_bindir}/arch %{_bindir}/arch
@ -373,9 +373,26 @@ fi
%{_sbindir}/chroot %{_sbindir}/chroot
%changelog %changelog
* Thu Jun 04 2015 Ondrej Vasik <ovasik@redhat.com> - 8.23-7 * Thu Jun 04 2015 Ondrej Vasik <ovasik@redhat.com> - 8.23-12
- call utilities in colorls.* scripts with full path (#1222140) - call utilities in colorls.* scripts with full path (#1222140)
* Thu May 14 2015 Kamil Dudka <kdudka@redhat.com> - 8.23-11
- run 'make check' in parallel to speed up the build
* Wed May 13 2015 Ondrej Oprala <ooprala@redhat.com> - 8.23-10
- sort - fix buffer overflow in some case conversions
- patch by Pádraig Brady
* Mon Apr 20 2015 Pádraig Brady <pbrady@redhat.com> - 8.23-9
- Adjust LS_COLORS in 256 color mode; brighten some, remove hardlink colors (#1196642)
* Sun Mar 22 2015 Peter Robinson <pbrobinson@fedoraproject.org> 8.23-8
- Drop large ancient docs
* Sat Feb 21 2015 Till Maas <opensource@till.name> - 8.23-7
- Rebuilt for Fedora 23 Change
https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code
* Mon Dec 01 2014 Ondrej Vasik <ovasik@redhat.com> - 8.23-6 * Mon Dec 01 2014 Ondrej Vasik <ovasik@redhat.com> - 8.23-6
- have the LC_TIME subdirs with lang macro (#1169027) - have the LC_TIME subdirs with lang macro (#1169027)