mirror of
https://abf.rosa.ru/djam/coreutils.git
synced 2025-02-24 01:32:50 +00:00
Automatic import for version 8.20-1
This commit is contained in:
Rosa
parent
d3c5adf1ce
commit
9e62ba0fcd
11 changed files with 582 additions and 147 deletions
2
.abf.yml
2
.abf.yml
|
|
@ -1,2 +1,2 @@
|
|||
sources:
|
||||
"coreutils-8.19.tar.xz": b508dd4e21f5dccbdb846a27d9122598f1878a6a
|
||||
"coreutils-8.20.tar.xz": b120f138758100060333c2ed207ee276dd318980
|
||||
|
|
|
|||
27
coreutils-256color.sh
Normal file
27
coreutils-256color.sh
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
# Enable 256 color capabilities for appropriate terminals
|
||||
|
||||
# Set this variable in your local shell config if you want remote
|
||||
# xterms connecting to this system, to be sent 256 colors.
|
||||
# This can be done in /etc/csh.cshrc, or in an earlier profile.d script.
|
||||
# SEND_256_COLORS_TO_REMOTE=1
|
||||
|
||||
# Terminals with any of the following set, support 256 colors (and are local)
|
||||
local256="$COLORTERM$XTERM_VERSION$ROXTERM_ID$KONSOLE_DBUS_SESSION"
|
||||
|
||||
if [ -n "$local256" ] || [ -n "$SEND_256_COLORS_TO_REMOTE" ]; then
|
||||
|
||||
case "$TERM" in
|
||||
'xterm') TERM=xterm-256color;;
|
||||
'screen') TERM=screen-256color;;
|
||||
'Eterm') TERM=Eterm-256color;;
|
||||
esac
|
||||
export TERM
|
||||
|
||||
if [ -n "$TERMCAP" ] && [ "$TERM" = "screen-256color" ]; then
|
||||
TERMCAP=$(echo "$TERMCAP" | sed -e 's/Co#8/Co#256/g')
|
||||
export TERMCAP
|
||||
fi
|
||||
fi
|
||||
|
||||
unset local256
|
||||
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1.4.12 (GNU/Linux)
|
||||
|
||||
iQIcBAABCAAGBQJQMdyBAAoJEH/Z/MsAC+7uPSkQAIVt2Eow5UChyij0PL95zvG4
|
||||
l72JuAHgHYzSv4qCQQ4OOYTWhIdjo8DAe6byyTfyjJx67Mypz4e1oIkal+9CoReT
|
||||
UDLfjJo90n46kwYVdogBs5Zgs+/7R4eNKLlNtiJ3w52JxGlOjZTSexfe/Km4wqqQ
|
||||
6vQRx3LyZva7a4w/BiLFlCi/BLrid3ZeDsGOgMZ/A8zf+YFPXTOPqcFMnxmxQXMb
|
||||
jVGjSrjMIPjeozX4h11T4/mTN2qeUEG0RjN1DwjrcC+v24Jz97CsrvlQZtBrzmxr
|
||||
vyAr+Nf2x1bwwRHJHrJ1HvNQV0SQGLjPIIfbfSULSau5bv/wFRxIDfak7Z0S9bbq
|
||||
n9l6+qzSii40utIX9S+LwwbNNBe5ORktLy8TzfU1np7/998RqK7TlhiedXzZ1NLq
|
||||
wV7sRr34h1qpr4JRM4ieJrwIKXQImlktbu/WRe4OCC560ON3XJppd1cAxFLzynhN
|
||||
LgGlX1O6LjyiFpAJkx7oNkQ9QGIjghz4YD06TITkfrxD+zzdwt2WDSMr/1/6z2/y
|
||||
4pmpZaW68tGCLLFaluhJ0Pr+3g/QdnqvY3Nod5VXjsT2TlDUnqK59pWsNMBxeeyk
|
||||
G0OD4UvaZrkh8RJUbzCJtQsi5ZZTrzv0/3HjkTEshu8m5hdklEwOEQjtpsHfT/iv
|
||||
aTUjgqN11Iw67QIvYKaB
|
||||
=bzPS
|
||||
-----END PGP SIGNATURE-----
|
||||
|
|
@ -1,17 +1,38 @@
|
|||
--- coreutils-8.14/src/dircolors.hin.colors_mdkconf~ 2011-10-20 19:59:24.629576377 +0200
|
||||
+++ coreutils-8.14/src/dircolors.hin 2011-10-20 19:59:29.842570728 +0200
|
||||
@@ -8,6 +8,10 @@
|
||||
--- coreutils-8.20/src/dircolors.hin.colors_mdkconf~ 2012-10-23 16:14:12.000000000 +0200
|
||||
+++ coreutils-8.20/src/dircolors.hin 2012-10-31 15:21:50.521617371 +0100
|
||||
@@ -7,6 +7,23 @@
|
||||
|
||||
# The keywords COLOR, OPTIONS, and EIGHTBIT (honored by the
|
||||
# slackware version of dircolors) are recognized but ignored.
|
||||
|
||||
+# EIGHTBIT, followed by '1' for on, '0' for off. (8-bit output)
|
||||
+EIGHTBIT 1
|
||||
+
|
||||
+# 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
|
||||
+
|
||||
+# 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.
|
||||
+
|
||||
|
||||
# Below, there should be one TERM entry for each termtype that is colorizable
|
||||
TERM Eterm
|
||||
TERM ansi
|
||||
@@ -81,7 +85,8 @@ SOCK 01;35 # socket
|
||||
@@ -31,6 +48,7 @@ TERM gnome
|
||||
TERM gnome-256color
|
||||
TERM jfbterm
|
||||
TERM konsole
|
||||
+TERM konsole-256color
|
||||
TERM kterm
|
||||
TERM linux
|
||||
TERM linux-c
|
||||
@@ -83,7 +101,8 @@ SOCK 01;35 # socket
|
||||
DOOR 01;35 # door
|
||||
BLK 40;33;01 # block device driver
|
||||
CHR 40;33;01 # character device driver
|
||||
|
|
@ -21,7 +42,7 @@
|
|||
SETUID 37;41 # file that is setuid (u+s)
|
||||
SETGID 30;43 # file that is setgid (g+s)
|
||||
CAPABILITY 30;41 # file with capability
|
||||
@@ -97,15 +102,15 @@ EXEC 01;32
|
||||
@@ -99,15 +118,15 @@ EXEC 01;32
|
||||
# (and any comments you want to add after a '#')
|
||||
|
||||
# If you use DOS-style suffixes, you may want to uncomment the following:
|
||||
|
|
@ -44,7 +65,7 @@
|
|||
|
||||
# archives or compressed (bright red)
|
||||
.tar 01;31
|
||||
@@ -140,10 +145,13 @@ EXEC 01;32
|
||||
@@ -142,10 +161,13 @@ EXEC 01;32
|
||||
.cpio 01;31
|
||||
.7z 01;31
|
||||
.rz 01;31
|
||||
|
|
@ -58,7 +79,7 @@
|
|||
.gif 01;35
|
||||
.bmp 01;35
|
||||
.pbm 01;35
|
||||
@@ -155,6 +163,7 @@ EXEC 01;32
|
||||
@@ -157,6 +179,7 @@ EXEC 01;32
|
||||
.tif 01;35
|
||||
.tiff 01;35
|
||||
.png 01;35
|
||||
|
|
@ -66,7 +87,7 @@
|
|||
.svg 01;35
|
||||
.svgz 01;35
|
||||
.mng 01;35
|
||||
@@ -166,6 +175,9 @@ EXEC 01;32
|
||||
@@ -168,6 +191,9 @@ EXEC 01;32
|
||||
.mkv 01;35
|
||||
.webm 01;35
|
||||
.ogm 01;35
|
||||
|
|
@ -76,7 +97,7 @@
|
|||
.mp4 01;35
|
||||
.m4v 01;35
|
||||
.mp4v 01;35
|
||||
@@ -187,6 +199,7 @@ EXEC 01;32
|
||||
@@ -189,6 +215,7 @@ EXEC 01;32
|
||||
.yuv 01;35
|
||||
.cgm 01;35
|
||||
.emf 01;35
|
||||
|
|
@ -84,7 +105,7 @@
|
|||
|
||||
# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
|
||||
.axv 01;35
|
||||
@@ -212,3 +225,74 @@ EXEC 01;32
|
||||
@@ -214,3 +241,75 @@ EXEC 01;32
|
||||
.oga 00;36
|
||||
.spx 00;36
|
||||
.xspf 00;36
|
||||
|
|
@ -155,7 +176,8 @@
|
|||
+.bck 47;30
|
||||
+.bk 47;30
|
||||
+.old 47;30
|
||||
+.tmp 47;30
|
||||
+.save 47;30
|
||||
+.orig 47;30
|
||||
+.rpmsave 47;30
|
||||
+.rpmnew 47;30
|
||||
+.save 47;30
|
||||
+.tmp 47;30
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
--- coreutils-8.17/src/cp.c.override~ 2012-05-01 22:55:08.000000000 +0200
|
||||
+++ coreutils-8.17/src/cp.c 2012-05-11 11:56:02.647690415 +0200
|
||||
@@ -986,6 +986,7 @@ main (int argc, char **argv)
|
||||
--- coreutils-8.20/src/cp.c.override~ 2012-10-23 16:14:12.000000000 +0200
|
||||
+++ coreutils-8.20/src/cp.c 2012-10-31 02:26:46.930833341 +0100
|
||||
@@ -989,6 +989,7 @@ main (int argc, char **argv)
|
||||
break;
|
||||
|
||||
case 'f':
|
||||
|
|
@ -8,8 +8,8 @@
|
|||
x.unlink_dest_after_failed_open = true;
|
||||
break;
|
||||
|
||||
--- coreutils-8.17/tests/cp/cp-i.override~ 2012-02-03 10:22:06.000000000 +0100
|
||||
+++ coreutils-8.17/tests/cp/cp-i 2012-05-11 11:56:02.647690415 +0200
|
||||
--- coreutils-8.20/tests/cp/cp-i.sh.override~ 2012-10-23 16:14:12.000000000 +0200
|
||||
+++ coreutils-8.20/tests/cp/cp-i.sh 2012-10-31 02:28:21.954108100 +0100
|
||||
@@ -56,8 +56,8 @@ echo n | cp -vfn c d 2>/dev/null > out6
|
||||
compare out6 out_empty || fail=1
|
||||
|
||||
|
|
@ -21,8 +21,8 @@
|
|||
|
||||
# options --backup and --no-clobber are mutually exclusive
|
||||
cp -bn c d 2>/dev/null && fail=1
|
||||
--- coreutils-8.17/tests/mv/i-2.override~ 2012-04-19 19:39:23.000000000 +0200
|
||||
+++ coreutils-8.17/tests/mv/i-2 2012-05-11 11:57:30.774687787 +0200
|
||||
--- coreutils-8.20/tests/mv/i-2.sh.override~ 2012-10-23 16:14:12.000000000 +0200
|
||||
+++ coreutils-8.20/tests/mv/i-2.sh 2012-10-31 02:28:21.955108113 +0100
|
||||
@@ -34,11 +34,12 @@ mv -fi c d < y >/dev/null 2>&1 || fail=1
|
||||
# Before 4.0s, this would not prompt.
|
||||
cp -if e f < y > out 2>&1 || fail=1
|
||||
|
|
@ -1,6 +1,5 @@
|
|||
diff -urNp coreutils-8.19-orig/lib/linebuffer.h coreutils-8.19/lib/linebuffer.h
|
||||
--- coreutils-8.19-orig/lib/linebuffer.h 2012-01-06 10:14:31.000000000 +0100
|
||||
+++ coreutils-8.19/lib/linebuffer.h 2012-08-20 13:52:04.061593006 +0200
|
||||
--- coreutils-8.20/lib/linebuffer.h.i18n~ 2012-10-23 16:17:24.000000000 +0200
|
||||
+++ coreutils-8.20/lib/linebuffer.h 2012-10-31 03:05:56.656567524 +0100
|
||||
@@ -21,6 +21,11 @@
|
||||
|
||||
# include <stdio.h>
|
||||
|
|
@ -23,9 +22,29 @@ diff -urNp coreutils-8.19-orig/lib/linebuffer.h coreutils-8.19/lib/linebuffer.h
|
|||
};
|
||||
|
||||
/* Initialize linebuffer LINEBUFFER for use. */
|
||||
diff -urNp coreutils-8.19-orig/src/cut.c coreutils-8.19/src/cut.c
|
||||
--- coreutils-8.19-orig/src/cut.c 2012-07-21 16:54:31.000000000 +0200
|
||||
+++ coreutils-8.19/src/cut.c 2012-08-20 13:52:52.299593173 +0200
|
||||
--- coreutils-8.20/Makefile.in.i18n~ 2012-10-31 03:06:29.139005513 +0100
|
||||
+++ coreutils-8.20/Makefile.in 2012-10-31 03:07:41.168976621 +0100
|
||||
@@ -3650,6 +3650,7 @@ all_tests = \
|
||||
tests/misc/sort-debug-warn.sh \
|
||||
tests/misc/sort-discrim.sh \
|
||||
tests/misc/sort-files0-from.pl \
|
||||
+ tests/misc/sort-mb-tests \
|
||||
tests/misc/sort-float.sh \
|
||||
tests/misc/sort-merge.pl \
|
||||
tests/misc/sort-merge-fdlimit.sh \
|
||||
@@ -4012,6 +4013,10 @@ factor_tests = \
|
||||
$(tf)/$(q)960336-$(q)962335-569e4363e8d9e8830a187d9ab27365eef08abde1.sh
|
||||
|
||||
pr_data = \
|
||||
+ tests/misc/mb1.X \
|
||||
+ tests/misc/mb1.I \
|
||||
+ tests/misc/mb2.X \
|
||||
+ tests/misc/mb2.I \
|
||||
tests/pr/0F \
|
||||
tests/pr/0FF \
|
||||
tests/pr/0FFnt \
|
||||
--- coreutils-8.20/src/cut.c.i18n~ 2012-10-23 16:14:12.000000000 +0200
|
||||
+++ coreutils-8.20/src/cut.c 2012-10-31 03:05:56.658567550 +0100
|
||||
@@ -28,6 +28,11 @@
|
||||
#include <assert.h>
|
||||
#include <getopt.h>
|
||||
|
|
@ -170,7 +189,7 @@ diff -urNp coreutils-8.19-orig/src/cut.c coreutils-8.19/src/cut.c
|
|||
|
||||
/* True if the --output-delimiter=STRING option was specified. */
|
||||
static bool output_delimiter_specified;
|
||||
@@ -206,7 +283,7 @@ Mandatory arguments to long options are
|
||||
@@ -206,7 +283,7 @@ Mandatory arguments to long options are
|
||||
-f, --fields=LIST select only these fields; also print any line\n\
|
||||
that contains no delimiter character, unless\n\
|
||||
the -s option is specified\n\
|
||||
|
|
@ -633,9 +652,8 @@ diff -urNp coreutils-8.19-orig/src/cut.c coreutils-8.19/src/cut.c
|
|||
}
|
||||
|
||||
if (optind == argc)
|
||||
diff -urNp coreutils-8.19-orig/src/expand.c coreutils-8.19/src/expand.c
|
||||
--- coreutils-8.19-orig/src/expand.c 2012-07-21 16:54:31.000000000 +0200
|
||||
+++ coreutils-8.19/src/expand.c 2012-08-20 13:54:02.974621693 +0200
|
||||
--- coreutils-8.20/src/expand.c.i18n~ 2012-10-23 16:14:12.000000000 +0200
|
||||
+++ coreutils-8.20/src/expand.c 2012-10-31 03:05:56.659567563 +0100
|
||||
@@ -37,12 +37,29 @@
|
||||
#include <stdio.h>
|
||||
#include <getopt.h>
|
||||
|
|
@ -823,9 +841,8 @@ diff -urNp coreutils-8.19-orig/src/expand.c coreutils-8.19/src/expand.c
|
|||
|
||||
if (have_read_stdin && fclose (stdin) != 0)
|
||||
error (EXIT_FAILURE, errno, "-");
|
||||
diff -urNp coreutils-8.19-orig/src/fold.c coreutils-8.19/src/fold.c
|
||||
--- coreutils-8.19-orig/src/fold.c 2012-07-21 16:54:31.000000000 +0200
|
||||
+++ coreutils-8.19/src/fold.c 2012-08-20 13:52:04.066592980 +0200
|
||||
--- coreutils-8.20/src/fold.c.i18n~ 2012-10-23 16:14:12.000000000 +0200
|
||||
+++ coreutils-8.20/src/fold.c 2012-10-31 03:05:56.660567577 +0100
|
||||
@@ -22,12 +22,34 @@
|
||||
#include <getopt.h>
|
||||
#include <sys/types.h>
|
||||
|
|
@ -907,7 +924,7 @@ diff -urNp coreutils-8.19-orig/src/fold.c coreutils-8.19/src/fold.c
|
|||
{"spaces", no_argument, NULL, 's'},
|
||||
{"width", required_argument, NULL, 'w'},
|
||||
{GETOPT_HELP_OPTION_DECL},
|
||||
@@ -77,6 +120,7 @@ Mandatory arguments to long options are
|
||||
@@ -77,6 +120,7 @@ Mandatory arguments to long options are
|
||||
"), stdout);
|
||||
fputs (_("\
|
||||
-b, --bytes count bytes rather than columns\n\
|
||||
|
|
@ -915,7 +932,7 @@ diff -urNp coreutils-8.19-orig/src/fold.c coreutils-8.19/src/fold.c
|
|||
-s, --spaces break at spaces\n\
|
||||
-w, --width=WIDTH use WIDTH columns instead of 80\n\
|
||||
"), stdout);
|
||||
@@ -94,7 +138,7 @@ Mandatory arguments to long options are
|
||||
@@ -94,7 +138,7 @@ Mandatory arguments to long options are
|
||||
static size_t
|
||||
adjust_column (size_t column, char c)
|
||||
{
|
||||
|
|
@ -957,7 +974,7 @@ diff -urNp coreutils-8.19-orig/src/fold.c coreutils-8.19/src/fold.c
|
|||
|
||||
fadvise (istream, FADVISE_SEQUENTIAL);
|
||||
|
||||
@@ -170,6 +198,15 @@ fold_file (char const *filename, size_t
|
||||
@@ -170,6 +198,15 @@ fold_file (char const *filename, size_t
|
||||
bool found_blank = false;
|
||||
size_t logical_end = offset_out;
|
||||
|
||||
|
|
@ -973,16 +990,16 @@ diff -urNp coreutils-8.19-orig/src/fold.c coreutils-8.19/src/fold.c
|
|||
/* Look for the last blank. */
|
||||
while (logical_end)
|
||||
{
|
||||
@@ -216,11 +253,221 @@ fold_file (char const *filename, size_t
|
||||
@@ -216,11 +253,221 @@ fold_file (char const *filename, size_t
|
||||
line_out[offset_out++] = c;
|
||||
}
|
||||
|
||||
- saved_errno = errno;
|
||||
+ *saved_errno = errno;
|
||||
|
||||
if (offset_out)
|
||||
fwrite (line_out, sizeof (char), (size_t) offset_out, stdout);
|
||||
|
||||
+
|
||||
+ if (offset_out)
|
||||
+ fwrite (line_out, sizeof (char), (size_t) offset_out, stdout);
|
||||
+
|
||||
+}
|
||||
+
|
||||
+#if HAVE_MBRTOWC
|
||||
|
|
@ -1154,10 +1171,10 @@ diff -urNp coreutils-8.19-orig/src/fold.c coreutils-8.19/src/fold.c
|
|||
+ }
|
||||
+
|
||||
+ *saved_errno = errno;
|
||||
+
|
||||
+ if (offset_out)
|
||||
+ fwrite (line_out, sizeof (char), (size_t) offset_out, stdout);
|
||||
+
|
||||
|
||||
if (offset_out)
|
||||
fwrite (line_out, sizeof (char), (size_t) offset_out, stdout);
|
||||
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
|
|
@ -1223,9 +1240,8 @@ diff -urNp coreutils-8.19-orig/src/fold.c coreutils-8.19/src/fold.c
|
|||
break;
|
||||
|
||||
case 's': /* Break at word boundaries. */
|
||||
diff -urNp coreutils-8.19-orig/src/join.c coreutils-8.19/src/join.c
|
||||
--- coreutils-8.19-orig/src/join.c 2012-07-21 16:54:31.000000000 +0200
|
||||
+++ coreutils-8.19/src/join.c 2012-08-20 13:52:04.069594876 +0200
|
||||
--- coreutils-8.20/src/join.c.i18n~ 2012-10-23 16:14:12.000000000 +0200
|
||||
+++ coreutils-8.20/src/join.c 2012-10-31 03:05:56.662567605 +0100
|
||||
@@ -22,18 +22,32 @@
|
||||
#include <sys/types.h>
|
||||
#include <getopt.h>
|
||||
|
|
@ -1701,9 +1717,8 @@ diff -urNp coreutils-8.19-orig/src/join.c coreutils-8.19/src/join.c
|
|||
break;
|
||||
|
||||
case NOCHECK_ORDER_OPTION:
|
||||
diff -urNp coreutils-8.19-orig/src/pr.c coreutils-8.19/src/pr.c
|
||||
--- coreutils-8.19-orig/src/pr.c 2012-07-21 16:54:31.000000000 +0200
|
||||
+++ coreutils-8.19/src/pr.c 2012-08-20 13:52:04.074593445 +0200
|
||||
--- coreutils-8.20/src/pr.c.i18n~ 2012-10-23 16:14:12.000000000 +0200
|
||||
+++ coreutils-8.20/src/pr.c 2012-10-31 03:05:56.665567645 +0100
|
||||
@@ -312,6 +312,32 @@
|
||||
|
||||
#include <getopt.h>
|
||||
|
|
@ -2447,9 +2462,8 @@ diff -urNp coreutils-8.19-orig/src/pr.c coreutils-8.19/src/pr.c
|
|||
/* We've just printed some files and need to clean up things before
|
||||
looking for more options and printing the next batch of files.
|
||||
|
||||
diff -urNp coreutils-8.19-orig/src/sort.c coreutils-8.19/src/sort.c
|
||||
--- coreutils-8.19-orig/src/sort.c 2012-08-18 07:39:29.000000000 +0200
|
||||
+++ coreutils-8.19/src/sort.c 2012-08-20 13:52:04.079596072 +0200
|
||||
--- coreutils-8.20/src/sort.c.i18n~ 2012-10-23 16:14:12.000000000 +0200
|
||||
+++ coreutils-8.20/src/sort.c 2012-10-31 03:05:56.669567699 +0100
|
||||
@@ -29,6 +29,14 @@
|
||||
#include <sys/wait.h>
|
||||
#include <signal.h>
|
||||
|
|
@ -3392,9 +3406,8 @@ diff -urNp coreutils-8.19-orig/src/sort.c coreutils-8.19/src/sort.c
|
|||
}
|
||||
break;
|
||||
|
||||
diff -urNp coreutils-8.19-orig/src/unexpand.c coreutils-8.19/src/unexpand.c
|
||||
--- coreutils-8.19-orig/src/unexpand.c 2012-07-21 16:54:31.000000000 +0200
|
||||
+++ coreutils-8.19/src/unexpand.c 2012-08-20 13:52:04.081596774 +0200
|
||||
--- coreutils-8.20/src/unexpand.c.i18n~ 2012-10-23 16:14:12.000000000 +0200
|
||||
+++ coreutils-8.20/src/unexpand.c 2012-10-31 03:05:56.670567712 +0100
|
||||
@@ -38,12 +38,29 @@
|
||||
#include <stdio.h>
|
||||
#include <getopt.h>
|
||||
|
|
@ -3648,9 +3661,8 @@ diff -urNp coreutils-8.19-orig/src/unexpand.c coreutils-8.19/src/unexpand.c
|
|||
|
||||
if (have_read_stdin && fclose (stdin) != 0)
|
||||
error (EXIT_FAILURE, errno, "-");
|
||||
diff -urNp coreutils-8.19-orig/src/uniq.c coreutils-8.19/src/uniq.c
|
||||
--- coreutils-8.19-orig/src/uniq.c 2012-07-21 16:54:31.000000000 +0200
|
||||
+++ coreutils-8.19/src/uniq.c 2012-08-20 13:52:04.083502506 +0200
|
||||
--- coreutils-8.20/src/uniq.c.i18n~ 2012-10-23 16:14:12.000000000 +0200
|
||||
+++ coreutils-8.20/src/uniq.c 2012-10-31 03:05:56.671567726 +0100
|
||||
@@ -21,6 +21,16 @@
|
||||
#include <getopt.h>
|
||||
#include <sys/types.h>
|
||||
|
|
@ -3802,7 +3814,7 @@ diff -urNp coreutils-8.19-orig/src/uniq.c coreutils-8.19/src/uniq.c
|
|||
if (check_chars < oldlen)
|
||||
oldlen = check_chars;
|
||||
if (check_chars < newlen)
|
||||
@@ -241,14 +346,92 @@ different (char *old, char *new, size_t
|
||||
@@ -241,15 +346,93 @@ different (char *old, char *new, size_t
|
||||
|
||||
if (ignore_case)
|
||||
{
|
||||
|
|
@ -3829,8 +3841,8 @@ diff -urNp coreutils-8.19-orig/src/uniq.c coreutils-8.19/src/uniq.c
|
|||
+ }
|
||||
+
|
||||
+ return xmemcoll (copy_old, oldlen, copy_new, newlen);
|
||||
+}
|
||||
+
|
||||
}
|
||||
|
||||
+#if HAVE_MBRTOWC
|
||||
+static int
|
||||
+different_multi (const char *old, const char *new, size_t oldlen, size_t newlen, mbstate_t oldstate, mbstate_t newstate)
|
||||
|
|
@ -3895,11 +3907,12 @@ diff -urNp coreutils-8.19-orig/src/uniq.c coreutils-8.19/src/uniq.c
|
|||
+ }
|
||||
+
|
||||
+ return xmemcoll (copy[0], len[0], copy[1], len[1]);
|
||||
}
|
||||
+}
|
||||
+#endif
|
||||
|
||||
+
|
||||
/* Output the line in linebuffer LINE to standard output
|
||||
provided that the switches say it should be output.
|
||||
MATCH is true if the line matches the previous line.
|
||||
@@ -304,15 +487,43 @@ check_file (const char *infile, const ch
|
||||
{
|
||||
char *prevfield IF_LINT ( = NULL);
|
||||
|
|
@ -4016,31 +4029,8 @@ diff -urNp coreutils-8.19-orig/src/uniq.c coreutils-8.19/src/uniq.c
|
|||
skip_chars = 0;
|
||||
skip_fields = 0;
|
||||
check_chars = SIZE_MAX;
|
||||
diff -urNp coreutils-8.19-orig/tests/Makefile.am coreutils-8.19/tests/Makefile.am
|
||||
--- coreutils-8.19-orig/tests/Makefile.am 2012-08-20 13:51:39.856841699 +0200
|
||||
+++ coreutils-8.19/tests/Makefile.am 2012-08-20 13:52:04.085491266 +0200
|
||||
@@ -247,6 +247,7 @@ TESTS = \
|
||||
misc/sort-debug-warn \
|
||||
misc/sort-discrim \
|
||||
misc/sort-files0-from \
|
||||
+ misc/sort-mb-tests \
|
||||
misc/sort-float \
|
||||
misc/sort-merge \
|
||||
misc/sort-merge-fdlimit \
|
||||
@@ -551,6 +552,10 @@ TESTS = \
|
||||
$(root_tests)
|
||||
|
||||
pr_data = \
|
||||
+ misc/mb1.X \
|
||||
+ misc/mb1.I \
|
||||
+ misc/mb2.X \
|
||||
+ misc/mb2.I \
|
||||
pr/0F \
|
||||
pr/0FF \
|
||||
pr/0FFnt \
|
||||
diff -urNp coreutils-8.19-orig/tests/misc/cut coreutils-8.19/tests/misc/cut
|
||||
--- coreutils-8.19-orig/tests/misc/cut 2012-07-21 16:54:31.000000000 +0200
|
||||
+++ coreutils-8.19/tests/misc/cut 2012-08-20 13:52:04.086593767 +0200
|
||||
--- coreutils-8.20/tests/misc/cut.pl.i18n~ 2012-10-23 16:14:12.000000000 +0200
|
||||
+++ coreutils-8.20/tests/misc/cut.pl 2012-10-31 03:05:56.672567740 +0100
|
||||
@@ -23,14 +23,15 @@ use strict;
|
||||
# Turn off localization of executable's output.
|
||||
@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3;
|
||||
|
|
@ -4070,9 +4060,8 @@ diff -urNp coreutils-8.19-orig/tests/misc/cut coreutils-8.19/tests/misc/cut
|
|||
['inval2', qw(-f -), {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR=>$no_endpoint}],
|
||||
['inval3', '-f', '4,-', {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR=>$no_endpoint}],
|
||||
['inval4', '-f', '1-2,-', {IN=>''}, {OUT=>''}, {EXIT=>1},
|
||||
diff -urNp coreutils-8.19-orig/tests/misc/expand coreutils-8.19/tests/misc/expand
|
||||
--- coreutils-8.19-orig/tests/misc/expand 2012-07-21 16:54:31.000000000 +0200
|
||||
+++ coreutils-8.19/tests/misc/expand 2012-08-20 13:55:44.188467648 +0200
|
||||
--- coreutils-8.20/tests/misc/expand.pl.i18n~ 2012-10-23 16:14:12.000000000 +0200
|
||||
+++ coreutils-8.20/tests/misc/expand.pl 2012-10-31 03:05:56.672567740 +0100
|
||||
@@ -23,6 +23,15 @@ use strict;
|
||||
# Turn off localization of executable's output.
|
||||
@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3;
|
||||
|
|
@ -4127,41 +4116,36 @@ diff -urNp coreutils-8.19-orig/tests/misc/expand coreutils-8.19/tests/misc/expan
|
|||
my $save_temps = $ENV{DEBUG};
|
||||
my $verbose = $ENV{VERBOSE};
|
||||
|
||||
diff -urNp coreutils-8.19-orig/tests/misc/mb1.I coreutils-8.19/tests/misc/mb1.I
|
||||
--- coreutils-8.19-orig/tests/misc/mb1.I 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ coreutils-8.19/tests/misc/mb1.I 2012-08-20 13:52:04.086593767 +0200
|
||||
--- coreutils-8.20/tests/misc/mb1.I.i18n~ 2012-10-31 03:05:56.672567740 +0100
|
||||
+++ coreutils-8.20/tests/misc/mb1.I 2012-10-31 03:05:56.712568279 +0100
|
||||
@@ -0,0 +1,4 @@
|
||||
+Apple＠10
|
||||
+Banana＠5
|
||||
+Citrus＠20
|
||||
+Cherry＠30
|
||||
diff -urNp coreutils-8.19-orig/tests/misc/mb1.X coreutils-8.19/tests/misc/mb1.X
|
||||
--- coreutils-8.19-orig/tests/misc/mb1.X 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ coreutils-8.19/tests/misc/mb1.X 2012-08-20 13:52:04.087526516 +0200
|
||||
--- coreutils-8.20/tests/misc/mb1.X.i18n~ 2012-10-31 03:05:56.712568279 +0100
|
||||
+++ coreutils-8.20/tests/misc/mb1.X 2012-10-31 03:05:56.732568549 +0100
|
||||
@@ -0,0 +1,4 @@
|
||||
+Banana＠5
|
||||
+Apple＠10
|
||||
+Citrus＠20
|
||||
+Cherry＠30
|
||||
diff -urNp coreutils-8.19-orig/tests/misc/mb2.I coreutils-8.19/tests/misc/mb2.I
|
||||
--- coreutils-8.19-orig/tests/misc/mb2.I 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ coreutils-8.19/tests/misc/mb2.I 2012-08-20 13:52:04.088593815 +0200
|
||||
--- coreutils-8.20/tests/misc/mb2.I.i18n~ 2012-10-31 03:05:56.740568657 +0100
|
||||
+++ coreutils-8.20/tests/misc/mb2.I 2012-10-31 03:05:56.761568940 +0100
|
||||
@@ -0,0 +1,4 @@
|
||||
+Apple＠ＡＡ10＠＠20
|
||||
+Banana＠ＡＡ5＠＠30
|
||||
+Citrus＠ＡＡ20＠＠5
|
||||
+Cherry＠ＡＡ30＠＠10
|
||||
diff -urNp coreutils-8.19-orig/tests/misc/mb2.X coreutils-8.19/tests/misc/mb2.X
|
||||
--- coreutils-8.19-orig/tests/misc/mb2.X 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ coreutils-8.19/tests/misc/mb2.X 2012-08-20 13:52:04.088593815 +0200
|
||||
--- coreutils-8.20/tests/misc/mb2.X.i18n~ 2012-10-31 03:05:56.761568940 +0100
|
||||
+++ coreutils-8.20/tests/misc/mb2.X 2012-10-31 03:05:56.769569048 +0100
|
||||
@@ -0,0 +1,4 @@
|
||||
+Citrus＠ＡＡ20＠＠5
|
||||
+Cherry＠ＡＡ30＠＠10
|
||||
+Apple＠ＡＡ10＠＠20
|
||||
+Banana＠ＡＡ5＠＠30
|
||||
diff -urNp coreutils-8.19-orig/tests/misc/sort-mb-tests coreutils-8.19/tests/misc/sort-mb-tests
|
||||
--- coreutils-8.19-orig/tests/misc/sort-mb-tests 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ coreutils-8.19/tests/misc/sort-mb-tests 2012-08-20 13:52:04.089593318 +0200
|
||||
--- coreutils-8.20/tests/misc/sort-mb-tests.i18n~ 2012-10-31 03:05:56.770569062 +0100
|
||||
+++ coreutils-8.20/tests/misc/sort-mb-tests 2012-10-31 03:05:56.771569075 +0100
|
||||
@@ -0,0 +1,58 @@
|
||||
+#! /bin/sh
|
||||
+case $# in
|
||||
17
coreutils-8.20.tar.xz.sig
Normal file
17
coreutils-8.20.tar.xz.sig
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1.4.11 (GNU/Linux)
|
||||
|
||||
iQIcBAABAgAGBQJQhsqJAAoJEN9v2XEwYDfZTMoQAKYI+TJvArhfsFHwmCCQwiKn
|
||||
J9xxTB6mfKIWbem3nTjlV9dkVe59RRgjm5unvXA5ZAxc/wY5TGzXRjqbYiUNTPf0
|
||||
xUK0jfJIeMWQnWkEy8u9U9zh70izi3WwQp4+hdhSzM8x7c4Ja0V9bhS/p6aM2Kod
|
||||
iKRl7ufAAnhd+du8TpWcVUYduxtVahWLUh0VnB8NIM9Z9xMdx8KgoyYZKAjsqarA
|
||||
fa9yqYUCoxivincXi+qH7LlsKcElSE1bD6jPKTC/8vgWJGlkVF7YfxznfiwX7zwF
|
||||
cRhqi2DrsZsJs18F9vwsfZvvXUjijdRxN4OOZs9VxbMi5/MDoLV152Q41eYQcRZo
|
||||
rJE2TPnprQmBXXtTeXfByYStPH0EoXX8nwsUmNUjVSrkpHYUgn38a+07xViJ7p9H
|
||||
M5adjMhHzuEDNGMLAH69cGHfBEtSgQl/pmVSBsz+nLBmLY/XT5mFa+twLvCOm44e
|
||||
6uEsnfk73rZHtcKTSlNomYd/PpWriPZR+UpVvnn2OaZg5vUtsozphdH+Yqq9c6X0
|
||||
LXfw2H/dhIhCi0HkI05IOYahOYZ48Q5ICrsHSIsTWqkhG0tFzLpfNfWSb2SN2HVk
|
||||
iO5IYmi1XXfR6E6btmmDVHHEKN7qr2u5ARhbaElv1mejDYBJhEcCcpeIQP5bY/CD
|
||||
faZXvmx+5wT0+ewpLR56
|
||||
=HBLr
|
||||
-----END PGP SIGNATURE-----
|
||||
295
coreutils-DIR_COLORS.256color
Normal file
295
coreutils-DIR_COLORS.256color
Normal file
|
|
@ -0,0 +1,295 @@
|
|||
# Configuration file for the 256color ls utility
|
||||
# This file goes in the /etc directory, and must be world readable.
|
||||
# Synchronized with coreutils 8.5 dircolors
|
||||
# You can copy this file to .dir_colors in your $HOME directory to override
|
||||
# the system defaults.
|
||||
# In the case that you are not satisfied with supplied colors, please
|
||||
# submit your color configuration or attach your file with colors readable
|
||||
# on ALL color background schemas (white,gray,black) to RedHat Bugzilla
|
||||
# ticket on https://bugzilla.redhat.com/show_bug.cgi?id=429121 . TIA.
|
||||
# Please just keep ls color conventions from 8 color scheme.
|
||||
|
||||
# COLOR needs one of these arguments: 'tty' colorizes output to ttys, but not
|
||||
# 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 konsole-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(8 colors mode) codes:
|
||||
# 30=black 31=red 32=green 33=yellow 34=blue 35=magenta 36=cyan 37=white
|
||||
# Background color(8 colors mode) 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;<color number> , 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;<color number> , 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, no color code at all
|
||||
#FILE 00 # normal file, use no color at all
|
||||
RESET 0 # reset to "normal" color
|
||||
DIR 38;5;27 # 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 44;38;5;15 # 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 01;05;37;41 # symlink to nonexistent file, or non-stat'able file
|
||||
MISSING 05;48;5;232;38;5;15 # ... 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
|
||||
|
||||
# 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)
|
||||
.cmd 38;5;35
|
||||
.exe 38;5;35
|
||||
.com 38;5;35
|
||||
.btm 38;5;35
|
||||
.bat 38;5;35
|
||||
.sh 38;5;34
|
||||
.csh 38;5;34
|
||||
|
||||
# archives or compressed (bright red)
|
||||
.tar 01;31
|
||||
.tgz 01;31
|
||||
.arj 01;31
|
||||
.taz 01;31
|
||||
.lzh 01;31
|
||||
.lzma 01;31
|
||||
.tlz 01;31
|
||||
.txz 01;31
|
||||
.zip 01;31
|
||||
.z 01;31
|
||||
.Z 01;31
|
||||
.dz 01;31
|
||||
.gz 01;31
|
||||
.lz 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
|
||||
.ace 01;31
|
||||
.zoo 01;31
|
||||
.cpio 01;31
|
||||
.7z 01;31
|
||||
.rz 01;31
|
||||
.iso 01;31
|
||||
|
||||
# image formats (magenta)
|
||||
.jpg 01;35
|
||||
.jpeg 01;35
|
||||
.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
|
||||
.ico 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
|
||||
.divx 01;35
|
||||
.xvid 01;35
|
||||
.3gp 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
|
||||
.gem 01;35
|
||||
|
||||
# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
|
||||
.axv 01;35
|
||||
.anx 01;35
|
||||
.ogv 01;35
|
||||
.ogx 01;35
|
||||
|
||||
# audio formats (cyan)
|
||||
.aac 38;5;45
|
||||
.au 38;5;45
|
||||
.flac 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
|
||||
.axa 38;5;45
|
||||
.oga 38;5;45
|
||||
.spx 38;5;45
|
||||
.xspf 38;5;45
|
||||
|
||||
# colorize binary documents (brown)
|
||||
.pdf 38;5;100
|
||||
.ps 38;5;100
|
||||
.ps.gz 38;5;100;236
|
||||
.tex 38;5;100
|
||||
.xls 38;5;100
|
||||
.xlsx 38;5;100
|
||||
.ppt 38;5;100
|
||||
.pptx 38;5;100
|
||||
.rtf 38;5;100
|
||||
.doc 38;5;100
|
||||
.docx 38;5;100
|
||||
.odt 38;5;100
|
||||
.ods 38;5;100
|
||||
.odp 38;5;100
|
||||
.epub 38;5;100
|
||||
.abw 38;5;100
|
||||
.wpd 38;5;100
|
||||
.pdb 38;5;100
|
||||
.sxw 38;5;100
|
||||
.kwd 38;5;100
|
||||
.wri 38;5;100
|
||||
|
||||
# colorize text documents (brown)
|
||||
.diff 38;5;101
|
||||
.htm 38;5;101
|
||||
.html 38;5;101
|
||||
.info 38;5;101
|
||||
.info.bz2 38;5;101;236
|
||||
.info.gz 38;5;101;236
|
||||
.info.lzma 38;5;101;236
|
||||
.info.xz 38;5;101;236
|
||||
.log 38;5;101
|
||||
.man 38;5;101
|
||||
.man.bz2 38;5;101;236
|
||||
.man.gz 38;5;101;236
|
||||
.man.lzma 38;5;101;236
|
||||
.man.xz 38;5;101;236
|
||||
.patch 38;5;101
|
||||
.sgml 38;5;101
|
||||
.shtml 38;5;101
|
||||
.txt 38;5;101
|
||||
.xml 38;5;101
|
||||
.wml 38;5;101
|
||||
|
||||
|
||||
*ABOUT-NLS 38;5;102
|
||||
*AUTHORS 38;5;102
|
||||
*CHANGES 38;5;102
|
||||
*COPYING 38;5;102
|
||||
*ChangeLog 38;5;102
|
||||
*FAQ 38;5;102
|
||||
*INSTALL 38;5;102
|
||||
*NEWS 38;5;102
|
||||
*README 38;5;102
|
||||
*THANKS 38;5;102
|
||||
*TODO 38;5;102
|
||||
|
||||
# config
|
||||
.cfg 38;5;103
|
||||
.cnf 38;5;103
|
||||
.conf 38;5;103
|
||||
.config 38;5;103
|
||||
.ini 38;5;103
|
||||
.rc 38;5;103
|
||||
|
||||
# source
|
||||
.c 38;5;104
|
||||
.cpp 38;5;104
|
||||
.cxx 38;5;104
|
||||
.h 38;5;104
|
||||
.hpp 38;5;104
|
||||
.java 38;5;104
|
||||
.js 38;5;104
|
||||
.pl 38;5;104
|
||||
.php 38;5;104
|
||||
.py 38;5;104
|
||||
.spec 38;5;104
|
||||
|
||||
# backup formats
|
||||
*~ 47;30
|
||||
.bak 47;30
|
||||
.swp 47;30
|
||||
.bck 47;30
|
||||
.bk 47;30
|
||||
.old 47;30
|
||||
.orig 47;30
|
||||
.rpmsave 47;30
|
||||
.rpmnew 47;30
|
||||
.save 47;30
|
||||
.tmp 47;30
|
||||
40
coreutils-colorls.csh
Normal file
40
coreutils-colorls.csh
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
# color-ls initialization
|
||||
if ( $?USER_LS_COLORS ) then
|
||||
if ( "$USER_LS_COLORS" != "" ) then
|
||||
#when USER_LS_COLORS defined do not override user
|
||||
#specified LS_COLORS and use them
|
||||
goto finish
|
||||
endif
|
||||
endif
|
||||
|
||||
set COLORS=/etc/DIR_COLORS
|
||||
if ($?TERM) then
|
||||
if ( -e "/etc/DIR_COLORS.$TERM" ) then
|
||||
set COLORS="/etc/DIR_COLORS.$TERM"
|
||||
endif
|
||||
if ( -e "/etc/DIR_COLORS.256color" ) then
|
||||
if ( "`tput colors`" == "256" ) then
|
||||
set COLORS=/etc/DIR_COLORS.256color
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
if ( -f ~/.dircolors ) set COLORS=~/.dircolors
|
||||
if ( -f ~/.dir_colors ) set COLORS=~/.dir_colors
|
||||
if ($?TERM) then
|
||||
if ( -f ~/.dircolors."$TERM" ) set COLORS=~/.dircolors."$TERM"
|
||||
if ( -f ~/.dir_colors."$TERM" ) set COLORS=~/.dir_colors."$TERM"
|
||||
endif
|
||||
|
||||
if ( ! -e "$COLORS" ) exit
|
||||
|
||||
eval "`dircolors -c $COLORS`"
|
||||
|
||||
if ( "$LS_COLORS" == '' ) exit
|
||||
set color_none=`sed -n '/^COLOR.*none/Ip' < $COLORS`
|
||||
if ( "$color_none" != '' ) then
|
||||
unset color_none
|
||||
exit
|
||||
endif
|
||||
unset color_none
|
||||
|
||||
finish:
|
||||
32
coreutils-colorls.sh
Normal file
32
coreutils-colorls.sh
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
# color-ls initialization
|
||||
|
||||
#when USER_LS_COLORS defined do not override user LS_COLORS, but use them.
|
||||
if [ -z "$USER_LS_COLORS" ]; then
|
||||
|
||||
# Skip the rest for noninteractive shells.
|
||||
[ -z "$PS1" ] && return
|
||||
|
||||
COLORS=
|
||||
|
||||
for colors in "$HOME/.dir_colors.$TERM" "$HOME/.dircolors.$TERM" \
|
||||
"$HOME/.dir_colors" "$HOME/.dircolors"; do
|
||||
[ -e "$colors" ] && COLORS="$colors" && break
|
||||
done
|
||||
|
||||
[ -z "$COLORS" ] && [ -e "/etc/DIR_COLORS.256color" ] && \
|
||||
[ "x`tty -s && tput colors 2>/dev/null`" = "x256" ] && \
|
||||
COLORS="/etc/DIR_COLORS.256color"
|
||||
|
||||
if [ -z "$COLORS" ]; then
|
||||
for colors in "/etc/DIR_COLORS.$TERM" "/etc/DIR_COLORS" ; do
|
||||
[ -e "$colors" ] && COLORS="$colors" && break
|
||||
done
|
||||
fi
|
||||
|
||||
# Existence of $COLORS already checked above.
|
||||
[ -n "$COLORS" ] || return
|
||||
|
||||
eval "`dircolors --sh "$COLORS" 2>/dev/null`"
|
||||
[ -z "$LS_COLORS" ] && return
|
||||
grep -qi "^COLOR.*none" $COLORS >/dev/null 2>/dev/null && return
|
||||
fi
|
||||
|
|
@ -1,16 +1,20 @@
|
|||
Summary: The GNU core utilities: a set of tools commonly used in shell scripts
|
||||
Name: coreutils
|
||||
Version: 8.19
|
||||
Release: 3
|
||||
Version: 8.20
|
||||
Release: 1
|
||||
License: GPLv3+
|
||||
Group: System/Base
|
||||
Url: http://www.gnu.org/software/coreutils/
|
||||
Source0: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
|
||||
Source1: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig
|
||||
Source2: coreutils-DIR_COLORS.256color
|
||||
Source3: coreutils-colorls.sh
|
||||
Source4: coreutils-colorls.csh
|
||||
Source5: coreutils-256color.sh
|
||||
|
||||
# fileutils
|
||||
Patch101: coreutils-8.2-spacedir.patch
|
||||
Patch1155: coreutils-8.2-force-option--override--interactive-option.patch
|
||||
Patch1155: coreutils-8.20-force-option--override--interactive-option.patch
|
||||
Patch118: fileutils-4.1-ls_h.patch
|
||||
Patch500: coreutils-8.3-mem.patch
|
||||
|
||||
|
|
@ -29,14 +33,14 @@ Patch713: coreutils-4.5.3-langinfo.patch
|
|||
# this one is actually a merger of 5.2 and 5.3, as join segfaults
|
||||
# compiled with gcc4 and the 5.1/5.2 patch
|
||||
# fwang: we often get this patch from fedora
|
||||
Patch800: coreutils-8.19-new-i18n.patch
|
||||
Patch800: coreutils-8.20-new-i18n.patch
|
||||
|
||||
Patch909: coreutils-5.1.0-64bit-fixes.patch
|
||||
|
||||
# https://qa.mandriva.com/show_bug.cgi?id=38577
|
||||
Patch911: coreutils-8.3-groupfix.patch
|
||||
|
||||
Patch1011: coreutils-8.14-DIR_COLORS-mdkconf.patch
|
||||
Patch1011: coreutils-8.20-DIR_COLORS-mdkconf.patch
|
||||
#(peroyvind): fix a test that fails to compile with -Werror=format-security
|
||||
Patch1014: coreutils-8.8-check-string-format.patch
|
||||
|
||||
|
|
@ -58,7 +62,6 @@ Patch2908: coreutils-8.14-getgrouplist.patch
|
|||
Patch2912: coreutils-overflow.patch
|
||||
|
||||
BuildRequires: gettext
|
||||
BuildRequires: termcap-devel
|
||||
BuildRequires: pam-devel
|
||||
BuildRequires: texinfo >= 4.3
|
||||
# We need automake which supports the dist-xz target
|
||||
|
|
@ -66,9 +69,9 @@ BuildRequires: automake >= 1.10.2-2
|
|||
# And tar which supports xz automagically since rpm.org seems to rely on this(..?)
|
||||
BuildRequires: tar >= 1.21-2
|
||||
BuildRequires: acl-devel
|
||||
BuildRequires: libattr-devel
|
||||
BuildRequires: attr-devel
|
||||
BuildRequires: gmp-devel
|
||||
BuildRequires: libcap-devel
|
||||
BuildRequires: cap-devel
|
||||
BuildRequires: bison
|
||||
BuildRequires: flex
|
||||
BuildRequires: strace
|
||||
|
|
@ -136,14 +139,14 @@ This package contains coreutils documentation in GNU info format.
|
|||
# (tpg) not needed for now
|
||||
#%patch2104 -p1 -b .dfdirect~
|
||||
|
||||
%ifnarch %arm
|
||||
%ifnarch %{arm}
|
||||
%patch2105 -p1 -b .sparc~
|
||||
%endif
|
||||
|
||||
%patch2908 -p1 -b .getgrouplist~
|
||||
%patch2912 -p1 -b .overflow~
|
||||
|
||||
chmod a+x tests/misc/sort-mb-tests tests/misc/id-context
|
||||
chmod a+x tests/misc/sort-mb-tests tests/misc/id-context.sh
|
||||
chmod +w ./src/dircolors.h
|
||||
./src/dcgen ./src/dircolors.hin > ./src/dircolors.h
|
||||
|
||||
|
|
@ -154,21 +157,20 @@ autoconf
|
|||
bzip2 -9 ChangeLog
|
||||
|
||||
%build
|
||||
export CFLAGS="%{optflags} -fPIC -D_GNU_SOURCE=1"
|
||||
|
||||
%configure2_5x \
|
||||
--enable-largefile \
|
||||
--enable-pam \
|
||||
--enable-no-install-program=arch,hostname,uptime,kill \
|
||||
--without-selinux \
|
||||
--disable-rpath \
|
||||
--disable-silent-rules
|
||||
--with-packager="%{packager}" \
|
||||
--with-packager-version="%{version}-%{release}" \
|
||||
--with-packager-bug-reports="%{bugurl}" \
|
||||
--with-tty-group
|
||||
|
||||
%make
|
||||
|
||||
%check
|
||||
#(proyvind): check suite randomly fails on build hosts, unable to reproduce
|
||||
# locally, so just disable for now.. :(
|
||||
#%make check
|
||||
|
||||
%install
|
||||
|
|
@ -181,7 +183,7 @@ make mandir=%{buildroot}%{_mandir} install-man
|
|||
mkdir -p %{buildroot}{/bin,%{_bindir},%{_sbindir},%{_sysconfdir}/pam.d}
|
||||
for f in basename cat chgrp chmod chown cp cut date dd df echo env expr false id link ln ls mkdir mknod mktemp mv nice pwd rm rmdir sleep sort stat stty sync touch true uname unlink tac
|
||||
do
|
||||
mv %{buildroot}/{%{_bindir},bin}/$f
|
||||
mv %{buildroot}{%{_bindir},/bin}/$f
|
||||
done
|
||||
|
||||
# chroot was in /usr/sbin :
|
||||
|
|
@ -191,15 +193,24 @@ for f in cut env expr tac; do
|
|||
ln -s /bin/$f %{buildroot}%{_bindir}/$f
|
||||
done
|
||||
|
||||
install -m644 src/dircolors.hin -D %{buildroot}%{_sysconfdir}/DIR_COLORS
|
||||
install -p -m644 src/dircolors.hin -D %{buildroot}%{_sysconfdir}/DIR_COLORS
|
||||
install -p -m644 %{SOURCE2} -D %{buildroot}%{_sysconfdir}/DIR_COLORS.256color
|
||||
install -p -m644 %{SOURCE3} -D %{buildroot}%{_sysconfdir}/profile.d/90_colorls.sh
|
||||
install -p -m644 %{SOURCE4} -D %{buildroot}%{_sysconfdir}/profile.d/90_colorls.csh
|
||||
# XXX: should have csh profile.d script too...
|
||||
install -p -m644 %{SOURCE5} -D %{buildroot}%{_sysconfdir}/profile.d/10_256color.sh
|
||||
|
||||
#TV# find_lang look for LC_MESSAGES, not LC_TIME:
|
||||
find %{buildroot}%{_datadir}/locale/ -name coreutils.mo | fgrep LC_TIME | xargs rm -f
|
||||
find %{buildroot}%{_datadir}/locale/ -name coreutils.mo | grep LC_TIME | xargs rm -f
|
||||
%find_lang %{name}
|
||||
|
||||
%files -f %{name}.lang
|
||||
%config(noreplace) %{_sysconfdir}/D*
|
||||
%doc README
|
||||
%config(noreplace) %{_sysconfdir}/DIR_COLORS
|
||||
%config(noreplace) %{_sysconfdir}/DIR_COLORS.256color
|
||||
%{_sysconfdir}/profile.d/10_256color.sh
|
||||
%{_sysconfdir}/profile.d/90_colorls.sh
|
||||
%{_sysconfdir}/profile.d/90_colorls.csh
|
||||
/bin/*
|
||||
%{_bindir}/*
|
||||
%{_sbindir}/chroot
|
||||
|
|
@ -213,6 +224,30 @@ find %{buildroot}%{_datadir}/locale/ -name coreutils.mo | fgrep LC_TIME | xargs
|
|||
|
||||
|
||||
%changelog
|
||||
* Wed Oct 31 2012 Per Øyvind Karlsen <peroyvind@mandriva.org> 8.20-1
|
||||
+ Revision: 821484
|
||||
- disable %%check again for now, failures are anyways non-critical
|
||||
- enable 256 color terminal by default for known supported
|
||||
- activate check suite
|
||||
- drop compiler flags we no longer have to explicitly pass ourself
|
||||
- add 'ls' color configuration for 256 color terminals
|
||||
- add konsole-256color to TERM list
|
||||
- don't manually pass --disable-silent-rules to %%configure, it's now part of
|
||||
the default options passed by the macro
|
||||
- enable --with-tty-group
|
||||
- drop dead termcap-devel buildrequires
|
||||
- enable --with-packager* options
|
||||
- update color settings with the following options:
|
||||
o EIGHTBIT 1
|
||||
o COLOR tty
|
||||
o OPTIONS -F -T 0
|
||||
- regenerate i18n patch (P800)
|
||||
- regenerate '--force' overriding '--interactive' for 'cp' & 'mv' patch (P1155)
|
||||
- fix buildrequires
|
||||
|
||||
+ Tomasz Pawel Gajc <tpg@mandriva.org>
|
||||
- update to new version 8.20
|
||||
|
||||
* Sat Aug 25 2012 Tomasz Pawel Gajc <tpg@mandriva.org> 8.19-3
|
||||
+ Revision: 815748
|
||||
- su.pamd and su-l.pamd files have been moved to util-linux package
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue