rpms/coreutils
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

new upstream release coreutils-8.9

Browse Source
This commit is contained in:
Ondřej Vašík 2011-01-04 17:59:58 +01:00
parent 1c281144c3
commit 58ba6d5250
8 changed files with 187 additions and 291 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -2,3 +2,4 @@ coreutils-8.5.tar.xz
/coreutils-8.6.tar.xz
/coreutils-8.7.tar.xz
/coreutils-8.8.tar.xz
/coreutils-8.9.tar.xz

2
coreutils-6.10-manpages.patch
View File

@ -3,7 +3,7 @@ diff -urNp coreutils-6.12-orig/src/md5sum.c coreutils-6.12/src/md5sum.c
+++ coreutils-6.12/src/md5sum.c 2008-10-21 16:07:28.000000000 +0200
@@ -175,6 +175,9 @@ With no FILE, or when FILE is -, read st
fputs (_("\
-t, --text read in text mode (default)\n\
-t, --text read in text mode (default)\n\
"), stdout);
+ fputs (_("\
+ Note: There is no difference between binary and text mode option on GNU system.\n\

98
coreutils-8.8-split-suffix.patch
View File

@ -1,98 +0,0 @@
From ec19e2a647cb64d4a5620787d4ecf5964d85fcf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
Date: Thu, 30 Dec 2010 01:36:59 +0000
Subject: [PATCH] split: fix the suffix length calculation
* src/split.c (set_suffix_length): Only auto calculate
the suffix length when the number of files is specified.
* tests/misc/split-a: Add a case to trigger the bug.
---
src/split.c | 32 ++++++++++++++++++++------------
tests/misc/split-a | 5 +++++
2 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/src/split.c b/src/split.c
index ae98bc7..9e9efbf 100644
--- a/src/split.c
+++ b/src/split.c
@@ -78,6 +78,13 @@ static bool elide_empty_files;
input to output, which is much slower, so disabled by default. */
static bool unbuffered;
+/* The split mode to use. */
+enum Split_type
+{
+ type_undef, type_bytes, type_byteslines, type_lines, type_digits,
+ type_chunk_bytes, type_chunk_lines, type_rr
+};
+
/* For long options that have no equivalent short option, use a
non-character as a pseudo short option, starting with CHAR_MAX + 1. */
enum
@@ -105,16 +112,21 @@ static struct option const longopts[] =
};
static void
-set_suffix_length (uintmax_t n_units)
+set_suffix_length (uintmax_t n_units, enum Split_type split_type)
{
#define DEFAULT_SUFFIX_LENGTH 2
size_t suffix_needed = 0;
- size_t alphabet_len = strlen (suffix_alphabet);
- bool alphabet_slop = (n_units % alphabet_len) != 0;
- while (n_units /= alphabet_len)
- suffix_needed++;
- suffix_needed += alphabet_slop;
+
+ if (split_type == type_chunk_bytes || split_type == type_chunk_lines
+ || split_type == type_rr)
+ {
+ size_t alphabet_len = strlen (suffix_alphabet);
+ bool alphabet_slop = (n_units % alphabet_len) != 0;
+ while (n_units /= alphabet_len)
+ suffix_needed++;
+ suffix_needed += alphabet_slop;
+ }
if (suffix_length) /* set by user */
{
@@ -780,11 +792,7 @@ int
main (int argc, char **argv)
{
struct stat stat_buf;
- enum
- {
- type_undef, type_bytes, type_byteslines, type_lines, type_digits,
- type_chunk_bytes, type_chunk_lines, type_rr
- } split_type = type_undef;
+ enum Split_type split_type = type_undef;
size_t in_blk_size = 0; /* optimal block size of input file device */
char *buf; /* file i/o buffer */
size_t page_size = getpagesize ();
@@ -984,7 +992,7 @@ main (int argc, char **argv)
usage (EXIT_FAILURE);
}
- set_suffix_length (n_units);
+ set_suffix_length (n_units, split_type);
/* Get out the filename arguments. */
diff --git a/tests/misc/split-a b/tests/misc/split-a
index d861b92..b0526bc 100755
--- a/tests/misc/split-a
+++ b/tests/misc/split-a
@@ -63,4 +63,9 @@ for f in $files; do
n=$(expr $n + 1)
done
+# Ensure that -a is independent of -[bCl]
+split -a2 -b1000 < /dev/null || fail=1
+split -a2 -l1000 < /dev/null || fail=1
+split -a2 -C1000 < /dev/null || fail=1
+
Exit $fail
--
1.7.3.4

65
coreutils-df-direct.patch
View File

@ -1,8 +1,7 @@
diff --git a/doc/coreutils.texi b/doc/coreutils.texi
index fa21f03..7b8b622 100644
--- a/doc/coreutils.texi
+++ b/doc/coreutils.texi
@@ -10104,6 +10104,13 @@ pseudo-file-systems, such as automounter entries.
diff -urNp coreutils-8.9-orig/doc/coreutils.texi coreutils-8.9/doc/coreutils.texi
--- coreutils-8.9-orig/doc/coreutils.texi 2011-01-01 22:19:23.000000000 +0100
+++ coreutils-8.9/doc/coreutils.texi 2011-01-04 17:38:33.323888382 +0100
@@ -10306,6 +10306,13 @@ pseudo-file-systems, such as automounter
Scale sizes by @var{size} before printing them (@pxref{Block size}).
For example, @option{-BG} prints sizes in units of 1,073,741,824 bytes.
@ -16,11 +15,10 @@ index fa21f03..7b8b622 100644
@itemx --total
@opindex --total
@cindex grand total of disk size, usage and available space
diff --git a/src/df.c b/src/df.c
index b862879..a74c353 100644
--- a/src/df.c
+++ b/src/df.c
@@ -110,6 +110,9 @@ static bool print_type;
diff -urNp coreutils-8.9-orig/src/df.c coreutils-8.9/src/df.c
--- coreutils-8.9-orig/src/df.c 2011-01-01 22:19:23.000000000 +0100
+++ coreutils-8.9/src/df.c 2011-01-04 17:38:33.324887614 +0100
@@ -109,6 +109,9 @@ static bool print_type;
/* If true, print a grand total at the end. */
static bool print_grand_total;
@ -30,7 +28,7 @@ index b862879..a74c353 100644
/* Grand total data. */
static struct fs_usage grand_fsu;
@@ -118,13 +121,15 @@ static struct fs_usage grand_fsu;
@@ -117,13 +120,15 @@ static struct fs_usage grand_fsu;
enum
{
NO_SYNC_OPTION = CHAR_MAX + 1,
@ -47,7 +45,7 @@ index b862879..a74c353 100644
{"inodes", no_argument, NULL, 'i'},
{"human-readable", no_argument, NULL, 'h'},
{"si", no_argument, NULL, 'H'},
@@ -205,7 +210,10 @@ print_header (void)
@@ -204,7 +209,10 @@ print_header (void)
human_readable (output_block_size, buf, opts, 1, 1));
}
@ -59,7 +57,7 @@ index b862879..a74c353 100644
}
/* Is FSTYPE a type of file system that should be listed? */
@@ -754,6 +762,17 @@ show_point (const char *point, const struct stat *statp)
@@ -646,6 +654,17 @@ show_point (const char *point, const str
static void
show_entry (char const *name, struct stat const *statp)
{
@ -77,15 +75,15 @@ index b862879..a74c353 100644
if ((S_ISBLK (statp->st_mode) || S_ISCHR (statp->st_mode))
&& show_disk (name))
return;
@@ -820,6 +839,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\
@@ -714,6 +733,7 @@ Mandatory arguments to long options are
-B, --block-size=SIZE scale sizes by SIZE before printing them. E.g.,\n\
`-BM' prints sizes in units of 1,048,576 bytes.\n\
See SIZE format below.\n\
+ --direct show statistics for a file instead of mount point\n\
--total produce a grand total\n\
-h, --human-readable print sizes in human readable format (e.g., 1K 234M 2G)\n\
-H, --si likewise, but use powers of 1000 not 1024\n\
@@ -894,6 +914,9 @@ main (int argc, char **argv)
-h, --human-readable print sizes in human readable format (e.g., 1K 234M 2G)\
\n\
@@ -790,6 +810,9 @@ main (int argc, char **argv)
xstrtol_fatal (e, oi, c, long_options, optarg);
}
break;
@ -95,7 +93,7 @@ index b862879..a74c353 100644
case 'i':
inode_format = true;
break;
@@ -954,6 +977,13 @@ main (int argc, char **argv)
@@ -850,6 +873,13 @@ main (int argc, char **argv)
}
}
@ -109,23 +107,9 @@ index b862879..a74c353 100644
if (human_output_opts == -1)
{
if (posix_format)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1cb5a76..ab7abb4 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -328,6 +328,7 @@ TESTS = \
dd/stderr \
dd/unblock \
dd/unblock-sync \
+ df/direct \
df/total-verify \
du/2g \
du/8gb \
diff --git a/tests/df/direct b/tests/df/direct
new file mode 100644
index 0000000..9088f27
--- /dev/null
+++ b/tests/df/direct
diff -urNp coreutils-8.9-orig/tests/df/direct coreutils-8.9/tests/df/direct
--- coreutils-8.9-orig/tests/df/direct 1970-01-01 01:00:00.000000000 +0100
+++ coreutils-8.9/tests/df/direct 2011-01-04 17:38:33.328138905 +0100
@@ -0,0 +1,55 @@
+#!/bin/sh
+# Ensure "df --direct" works as documented
@ -182,3 +166,14 @@ index 0000000..9088f27
+compare file_out file_exp || fail=1
+
+Exit $fail
diff -urNp coreutils-8.9-orig/tests/Makefile.am coreutils-8.9/tests/Makefile.am
--- coreutils-8.9-orig/tests/Makefile.am 2011-01-04 17:37:57.837887753 +0100
+++ coreutils-8.9/tests/Makefile.am 2011-01-04 17:38:33.326913944 +0100
@@ -352,6 +352,7 @@ TESTS = \
dd/stderr \
dd/unblock \
dd/unblock-sync \
+ df/direct \
df/total-verify \
du/2g \
du/8gb \

148
coreutils-i18n.patch
View File

@ -1,6 +1,6 @@
diff -urNp coreutils-8.8-orig/lib/linebuffer.h coreutils-8.8/lib/linebuffer.h
--- coreutils-8.8-orig/lib/linebuffer.h 2010-04-23 15:44:00.000000000 +0200
+++ coreutils-8.8/lib/linebuffer.h 2010-12-23 13:59:44.393514385 +0100
diff -urNp coreutils-8.9-orig/lib/linebuffer.h coreutils-8.9/lib/linebuffer.h
--- coreutils-8.9-orig/lib/linebuffer.h 2011-01-01 22:19:27.000000000 +0100
+++ coreutils-8.9/lib/linebuffer.h 2011-01-04 17:41:55.358888521 +0100
@@ -21,6 +21,11 @@
# include <stdio.h>
@ -23,9 +23,9 @@ diff -urNp coreutils-8.8-orig/lib/linebuffer.h coreutils-8.8/lib/linebuffer.h
};
/* Initialize linebuffer LINEBUFFER for use. */
diff -urNp coreutils-8.8-orig/src/cut.c coreutils-8.8/src/cut.c
--- coreutils-8.8-orig/src/cut.c 2010-08-14 01:49:07.000000000 +0200
+++ coreutils-8.8/src/cut.c 2010-12-23 13:59:44.397514141 +0100
diff -urNp coreutils-8.9-orig/src/cut.c coreutils-8.9/src/cut.c
--- coreutils-8.9-orig/src/cut.c 2011-01-01 22:19:23.000000000 +0100
+++ coreutils-8.9/src/cut.c 2011-01-04 17:41:55.361888730 +0100
@@ -28,6 +28,11 @@
#include <assert.h>
#include <getopt.h>
@ -616,9 +616,9 @@ diff -urNp coreutils-8.8-orig/src/cut.c coreutils-8.8/src/cut.c
}
if (optind == argc)
diff -urNp coreutils-8.8-orig/src/expand.c coreutils-8.8/src/expand.c
--- coreutils-8.8-orig/src/expand.c 2010-08-14 01:49:07.000000000 +0200
+++ coreutils-8.8/src/expand.c 2010-12-23 13:59:44.399514013 +0100
diff -urNp coreutils-8.9-orig/src/expand.c coreutils-8.9/src/expand.c
--- coreutils-8.9-orig/src/expand.c 2011-01-01 22:19:23.000000000 +0100
+++ coreutils-8.9/src/expand.c 2011-01-04 17:41:55.363905562 +0100
@@ -38,12 +38,29 @@
#include <stdio.h>
#include <getopt.h>
@ -806,9 +806,9 @@ diff -urNp coreutils-8.8-orig/src/expand.c coreutils-8.8/src/expand.c
if (have_read_stdin && fclose (stdin) != 0)
error (EXIT_FAILURE, errno, "-");
diff -urNp coreutils-8.8-orig/src/fold.c coreutils-8.8/src/fold.c
--- coreutils-8.8-orig/src/fold.c 2010-11-27 16:06:22.000000000 +0100
+++ coreutils-8.8/src/fold.c 2010-12-23 13:59:44.401513895 +0100
diff -urNp coreutils-8.9-orig/src/fold.c coreutils-8.9/src/fold.c
--- coreutils-8.9-orig/src/fold.c 2011-01-01 22:19:23.000000000 +0100
+++ coreutils-8.9/src/fold.c 2011-01-04 17:41:55.366888520 +0100
@@ -22,12 +22,34 @@
#include <getopt.h>
#include <sys/types.h>
@ -1207,9 +1207,9 @@ diff -urNp coreutils-8.8-orig/src/fold.c coreutils-8.8/src/fold.c
break;
case 's': /* Break at word boundaries. */
diff -urNp coreutils-8.8-orig/src/join.c coreutils-8.8/src/join.c
--- coreutils-8.8-orig/src/join.c 2010-09-17 11:13:45.000000000 +0200
+++ coreutils-8.8/src/join.c 2010-12-23 13:59:44.404513732 +0100
diff -urNp coreutils-8.9-orig/src/join.c coreutils-8.9/src/join.c
--- coreutils-8.9-orig/src/join.c 2011-01-01 22:19:23.000000000 +0100
+++ coreutils-8.9/src/join.c 2011-01-04 17:41:55.369888660 +0100
@@ -22,18 +22,32 @@
#include <sys/types.h>
#include <getopt.h>
@ -1692,9 +1692,9 @@ diff -urNp coreutils-8.8-orig/src/join.c coreutils-8.8/src/join.c
break;
case NOCHECK_ORDER_OPTION:
diff -urNp coreutils-8.8-orig/src/pr.c coreutils-8.8/src/pr.c
--- coreutils-8.8-orig/src/pr.c 2010-08-14 01:49:07.000000000 +0200
+++ coreutils-8.8/src/pr.c 2010-12-23 13:59:44.410513374 +0100
diff -urNp coreutils-8.9-orig/src/pr.c coreutils-8.9/src/pr.c
--- coreutils-8.9-orig/src/pr.c 2011-01-01 22:19:23.000000000 +0100
+++ coreutils-8.9/src/pr.c 2011-01-04 17:41:55.377138275 +0100
@@ -312,6 +312,32 @@
#include <getopt.h>
@ -2417,9 +2417,9 @@ diff -urNp coreutils-8.8-orig/src/pr.c coreutils-8.8/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.8-orig/src/sort.c coreutils-8.8/src/sort.c
--- coreutils-8.8-orig/src/sort.c 2010-12-20 12:20:41.000000000 +0100
+++ coreutils-8.8/src/sort.c 2010-12-23 13:59:44.420512797 +0100
diff -urNp coreutils-8.9-orig/src/sort.c coreutils-8.9/src/sort.c
--- coreutils-8.9-orig/src/sort.c 2011-01-01 22:19:23.000000000 +0100
+++ coreutils-8.9/src/sort.c 2011-01-04 17:41:55.384888730 +0100
@@ -22,11 +22,20 @@
#include <config.h>
@ -2494,7 +2494,7 @@ diff -urNp coreutils-8.8-orig/src/sort.c coreutils-8.8/src/sort.c
/* Flag to remove consecutive duplicate lines from the output.
Only the last of a sequence of equal lines will be output. */
@@ -768,6 +797,46 @@ reap_all (void)
@@ -775,6 +804,46 @@ reap_all (void)
reap (-1);
}
@ -2541,7 +2541,7 @@ diff -urNp coreutils-8.8-orig/src/sort.c coreutils-8.8/src/sort.c
/* Clean up any remaining temporary files. */
static void
@@ -1200,7 +1269,7 @@ zaptemp (char const *name)
@@ -1207,7 +1276,7 @@ zaptemp (char const *name)
free (node);
}
@ -2550,7 +2550,7 @@ diff -urNp coreutils-8.8-orig/src/sort.c coreutils-8.8/src/sort.c
static int
struct_month_cmp (void const *m1, void const *m2)
@@ -1215,7 +1284,7 @@ struct_month_cmp (void const *m1, void c
@@ -1222,7 +1291,7 @@ struct_month_cmp (void const *m1, void c
/* Initialize the character class tables. */
static void
@ -2559,7 +2559,7 @@ diff -urNp coreutils-8.8-orig/src/sort.c coreutils-8.8/src/sort.c
{
size_t i;
@@ -1227,7 +1296,7 @@ inittables (void)
@@ -1234,7 +1303,7 @@ inittables (void)
fold_toupper[i] = toupper (i);
}
@ -2568,7 +2568,7 @@ diff -urNp coreutils-8.8-orig/src/sort.c coreutils-8.8/src/sort.c
/* If we're not in the "C" locale, read different names for months. */
if (hard_LC_TIME)
{
@@ -1309,6 +1378,84 @@ specify_nmerge (int oi, char c, char con
@@ -1316,6 +1385,84 @@ specify_nmerge (int oi, char c, char con
xstrtol_fatal (e, oi, c, long_options, s);
}
@ -2653,7 +2653,7 @@ diff -urNp coreutils-8.8-orig/src/sort.c coreutils-8.8/src/sort.c
/* Specify the amount of main memory to use when sorting. */
static void
specify_sort_size (int oi, char c, char const *s)
@@ -1537,7 +1684,7 @@ buffer_linelim (struct buffer const *buf
@@ -1544,7 +1691,7 @@ buffer_linelim (struct buffer const *buf
by KEY in LINE. */
static char *
@ -2662,7 +2662,7 @@ diff -urNp coreutils-8.8-orig/src/sort.c coreutils-8.8/src/sort.c
{
char *ptr = line->text, *lim = ptr + line->length - 1;
size_t sword = key->sword;
@@ -1546,10 +1693,10 @@ begfield (struct line const *line, struc
@@ -1553,10 +1700,10 @@ begfield (struct line const *line, struc
/* The leading field separator itself is included in a field when -t
is absent. */
@ -2675,7 +2675,7 @@ diff -urNp coreutils-8.8-orig/src/sort.c coreutils-8.8/src/sort.c
++ptr;
if (ptr < lim)
++ptr;
@@ -1575,11 +1722,70 @@ begfield (struct line const *line, struc
@@ -1582,11 +1729,70 @@ begfield (struct line const *line, struc
return ptr;
}
@ -2747,7 +2747,7 @@ diff -urNp coreutils-8.8-orig/src/sort.c coreutils-8.8/src/sort.c
{
char *ptr = line->text, *lim = ptr + line->length - 1;
size_t eword = key->eword, echar = key->echar;
@@ -1594,10 +1800,10 @@ limfield (struct line const *line, struc
@@ -1601,10 +1807,10 @@ limfield (struct line const *line, struc
`beginning' is the first character following the delimiting TAB.
Otherwise, leave PTR pointing at the first `blank' character after
the preceding field. */
@ -2760,7 +2760,7 @@ diff -urNp coreutils-8.8-orig/src/sort.c coreutils-8.8/src/sort.c
++ptr;
if (ptr < lim && (eword || echar))
++ptr;
@@ -1643,10 +1849,10 @@ limfield (struct line const *line, struc
@@ -1650,10 +1856,10 @@ limfield (struct line const *line, struc
*/
/* Make LIM point to the end of (one byte past) the current field. */
@ -2773,7 +2773,7 @@ diff -urNp coreutils-8.8-orig/src/sort.c coreutils-8.8/src/sort.c
if (newlim)
lim = newlim;
}
@@ -1677,6 +1883,130 @@ limfield (struct line const *line, struc
@@ -1684,6 +1890,130 @@ limfield (struct line const *line, struc
return ptr;
}
@ -2904,7 +2904,7 @@ diff -urNp coreutils-8.8-orig/src/sort.c coreutils-8.8/src/sort.c
/* Fill BUF reading from FP, moving buf->left bytes from the end
of buf->buf to the beginning first. If EOF is reached and the
file wasn't terminated by a newline, supply one. Set up BUF's line
@@ -1763,8 +2093,22 @@ fillbuf (struct buffer *buf, FILE *fp, c
@@ -1770,8 +2100,22 @@ fillbuf (struct buffer *buf, FILE *fp, c
else
{
if (key->skipsblanks)
@ -2929,7 +2929,7 @@ diff -urNp coreutils-8.8-orig/src/sort.c coreutils-8.8/src/sort.c
line->keybeg = line_start;
}
}
@@ -1885,7 +2229,7 @@ human_numcompare (char const *a, char co
@@ -1892,7 +2236,7 @@ human_numcompare (char const *a, char co
hideously fast. */
static int
@ -2938,7 +2938,7 @@ diff -urNp coreutils-8.8-orig/src/sort.c coreutils-8.8/src/sort.c
{
while (blanks[to_uchar (*a)])
a++;
@@ -1895,6 +2239,25 @@ numcompare (char const *a, char const *b
@@ -1902,6 +2246,25 @@ numcompare (char const *a, char const *b
return strnumcmp (a, b, decimal_point, thousands_sep);
}
@ -2964,7 +2964,7 @@ diff -urNp coreutils-8.8-orig/src/sort.c coreutils-8.8/src/sort.c
static int
general_numcompare (char const *sa, char const *sb)
{
@@ -1927,7 +2290,7 @@ general_numcompare (char const *sa, char
@@ -1934,7 +2297,7 @@ general_numcompare (char const *sa, char
Return 0 if the name in S is not recognized. */
static int
@ -2973,7 +2973,7 @@ diff -urNp coreutils-8.8-orig/src/sort.c coreutils-8.8/src/sort.c
{
size_t lo = 0;
size_t hi = MONTHS_PER_YEAR;
@@ -2202,13 +2565,12 @@ debug_key (struct line const *line, stru
@@ -2209,13 +2572,12 @@ debug_key (struct line const *line, stru
char saved = *lim;
*lim = '\0';
@ -2989,7 +2989,7 @@ diff -urNp coreutils-8.8-orig/src/sort.c coreutils-8.8/src/sort.c
else if (key->general_numeric)
ignore_value (strtold (beg, &tighter_lim));
else if (key->numeric || key->human_numeric)
@@ -2352,7 +2714,7 @@ key_warnings (struct keyfield const *gke
@@ -2359,7 +2721,7 @@ key_warnings (struct keyfield const *gke
bool maybe_space_aligned = !hard_LC_COLLATE && default_key_compare (key)
&& !(key->schar || key->echar);
bool line_offset = key->eword == 0 && key->echar != 0; /* -k1.x,1.y */
@ -2998,7 +2998,7 @@ diff -urNp coreutils-8.8-orig/src/sort.c coreutils-8.8/src/sort.c
&& ((!key->skipsblanks && !(implicit_skip || maybe_space_aligned))
|| (!key->skipsblanks && key->schar)
|| (!key->skipeblanks && key->echar)))
@@ -2410,11 +2772,83 @@ key_warnings (struct keyfield const *gke
@@ -2417,11 +2779,83 @@ key_warnings (struct keyfield const *gke
error (0, 0, _("option `-r' only applies to last-resort comparison"));
}
@ -3083,7 +3083,7 @@ diff -urNp coreutils-8.8-orig/src/sort.c coreutils-8.8/src/sort.c
{
struct keyfield *key = keylist;
@@ -2499,7 +2933,7 @@ keycompare (struct line const *a, struct
@@ -2506,7 +2940,7 @@ keycompare (struct line const *a, struct
else if (key->human_numeric)
diff = human_numcompare (ta, tb);
else if (key->month)
@ -3092,7 +3092,7 @@ diff -urNp coreutils-8.8-orig/src/sort.c coreutils-8.8/src/sort.c
else if (key->random)
diff = compare_random (ta, tlena, tb, tlenb);
else if (key->version)
@@ -2615,6 +3049,179 @@ keycompare (struct line const *a, struct
@@ -2622,6 +3056,179 @@ keycompare (struct line const *a, struct
return key->reverse ? -diff : diff;
}
@ -3272,7 +3272,7 @@ diff -urNp coreutils-8.8-orig/src/sort.c coreutils-8.8/src/sort.c
/* Compare two lines A and B, returning negative, zero, or positive
depending on whether A compares less than, equal to, or greater than B. */
@@ -4077,7 +4684,7 @@ main (int argc, char **argv)
@@ -4084,7 +4691,7 @@ main (int argc, char **argv)
initialize_exit_failure (SORT_FAILURE);
hard_LC_COLLATE = hard_locale (LC_COLLATE);
@ -3281,7 +3281,7 @@ diff -urNp coreutils-8.8-orig/src/sort.c coreutils-8.8/src/sort.c
hard_LC_TIME = hard_locale (LC_TIME);
#endif
@@ -4098,6 +4705,29 @@ main (int argc, char **argv)
@@ -4105,6 +4712,29 @@ main (int argc, char **argv)
thousands_sep = -1;
}
@ -3311,7 +3311,7 @@ diff -urNp coreutils-8.8-orig/src/sort.c coreutils-8.8/src/sort.c
have_read_stdin = false;
inittables ();
@@ -4368,13 +4998,34 @@ main (int argc, char **argv)
@@ -4375,13 +5005,34 @@ main (int argc, char **argv)
case 't':
{
@ -3350,7 +3350,7 @@ diff -urNp coreutils-8.8-orig/src/sort.c coreutils-8.8/src/sort.c
else
{
/* Provoke with `sort -txx'. Complain about
@@ -4385,9 +5036,12 @@ main (int argc, char **argv)
@@ -4392,9 +5043,12 @@ main (int argc, char **argv)
quote (optarg));
}
}
@ -3365,9 +3365,9 @@ diff -urNp coreutils-8.8-orig/src/sort.c coreutils-8.8/src/sort.c
}
break;
diff -urNp coreutils-8.8-orig/src/unexpand.c coreutils-8.8/src/unexpand.c
--- coreutils-8.8-orig/src/unexpand.c 2010-08-14 01:49:07.000000000 +0200
+++ coreutils-8.8/src/unexpand.c 2010-12-23 13:59:44.423512620 +0100
diff -urNp coreutils-8.9-orig/src/unexpand.c coreutils-8.9/src/unexpand.c
--- coreutils-8.9-orig/src/unexpand.c 2011-01-01 22:19:23.000000000 +0100
+++ coreutils-8.9/src/unexpand.c 2011-01-04 17:41:55.387888171 +0100
@@ -39,12 +39,29 @@
#include <stdio.h>
#include <getopt.h>
@ -3621,9 +3621,9 @@ diff -urNp coreutils-8.8-orig/src/unexpand.c coreutils-8.8/src/unexpand.c
if (have_read_stdin && fclose (stdin) != 0)
error (EXIT_FAILURE, errno, "-");
diff -urNp coreutils-8.8-orig/src/uniq.c coreutils-8.8/src/uniq.c
--- coreutils-8.8-orig/src/uniq.c 2010-08-14 01:49:07.000000000 +0200
+++ coreutils-8.8/src/uniq.c 2010-12-23 13:59:44.426512446 +0100
diff -urNp coreutils-8.9-orig/src/uniq.c coreutils-8.9/src/uniq.c
--- coreutils-8.9-orig/src/uniq.c 2011-01-01 22:19:23.000000000 +0100
+++ coreutils-8.9/src/uniq.c 2011-01-04 17:41:55.391888381 +0100
@@ -21,6 +21,16 @@
#include <getopt.h>
#include <sys/types.h>
@ -3990,9 +3990,9 @@ diff -urNp coreutils-8.8-orig/src/uniq.c coreutils-8.8/src/uniq.c
skip_chars = 0;
skip_fields = 0;
check_chars = SIZE_MAX;
diff -urNp coreutils-8.8-orig/tests/Makefile.am coreutils-8.8/tests/Makefile.am
--- coreutils-8.8-orig/tests/Makefile.am 2010-12-23 13:59:21.007870308 +0100
+++ coreutils-8.8/tests/Makefile.am 2010-12-23 13:59:44.428512331 +0100
diff -urNp coreutils-8.9-orig/tests/Makefile.am coreutils-8.9/tests/Makefile.am
--- coreutils-8.9-orig/tests/Makefile.am 2011-01-04 17:41:12.682173268 +0100
+++ coreutils-8.9/tests/Makefile.am 2011-01-04 17:41:55.392900534 +0100
@@ -233,6 +233,7 @@ TESTS = \
misc/sort-debug-keys \
misc/sort-debug-warn \
@ -4012,9 +4012,9 @@ diff -urNp coreutils-8.8-orig/tests/Makefile.am coreutils-8.8/tests/Makefile.am
pr/0F \
pr/0FF \
pr/0FFnt \
diff -urNp coreutils-8.8-orig/tests/misc/cut coreutils-8.8/tests/misc/cut
--- coreutils-8.8-orig/tests/misc/cut 2010-01-01 14:06:47.000000000 +0100
+++ coreutils-8.8/tests/misc/cut 2010-12-23 13:59:44.429512273 +0100
diff -urNp coreutils-8.9-orig/tests/misc/cut coreutils-8.9/tests/misc/cut
--- coreutils-8.9-orig/tests/misc/cut 2011-01-01 22:19:23.000000000 +0100
+++ coreutils-8.9/tests/misc/cut 2011-01-04 17:41:55.393887822 +0100
@@ -26,7 +26,7 @@ use strict;
my $prog = 'cut';
my $try = "Try \`$prog --help' for more information.\n";
@ -4024,7 +4024,7 @@ diff -urNp coreutils-8.8-orig/tests/misc/cut coreutils-8.8/tests/misc/cut
my $no_endpoint = "$prog: invalid range with no endpoint: -\n$try";
my @Tests =
@@ -141,7 +141,7 @@ my @Tests =
@@ -143,7 +143,7 @@ my @Tests =
# None of the following invalid ranges provoked an error up to coreutils-6.9.
['inval1', qw(-f 2-0), {IN=>''}, {OUT=>''}, {EXIT=>1},
@ -4032,42 +4032,42 @@ diff -urNp coreutils-8.8-orig/tests/misc/cut coreutils-8.8/tests/misc/cut
+ {ERR=>"$prog: invalid byte, character or field list\n$try"}],
['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}, {ERR=>$no_endpoint}],
diff -urNp coreutils-8.8-orig/tests/misc/mb1.I coreutils-8.8/tests/misc/mb1.I
--- coreutils-8.8-orig/tests/misc/mb1.I 1970-01-01 01:00:00.000000000 +0100
+++ coreutils-8.8/tests/misc/mb1.I 2010-12-23 13:59:44.430512213 +0100
['inval4', '-f', '1-2,-', {IN=>''}, {OUT=>''}, {EXIT=>1},
diff -urNp coreutils-8.9-orig/tests/misc/mb1.I coreutils-8.9/tests/misc/mb1.I
--- coreutils-8.9-orig/tests/misc/mb1.I 1970-01-01 01:00:00.000000000 +0100
+++ coreutils-8.9/tests/misc/mb1.I 2011-01-04 17:41:55.394899835 +0100
@@ -0,0 +1,4 @@
+Apple＠10
+Banana＠5
+Citrus＠20
+Cherry＠30
diff -urNp coreutils-8.8-orig/tests/misc/mb1.X coreutils-8.8/tests/misc/mb1.X
--- coreutils-8.8-orig/tests/misc/mb1.X 1970-01-01 01:00:00.000000000 +0100
+++ coreutils-8.8/tests/misc/mb1.X 2010-12-23 13:59:44.430512213 +0100
diff -urNp coreutils-8.9-orig/tests/misc/mb1.X coreutils-8.9/tests/misc/mb1.X
--- coreutils-8.9-orig/tests/misc/mb1.X 1970-01-01 01:00:00.000000000 +0100
+++ coreutils-8.9/tests/misc/mb1.X 2011-01-04 17:41:55.395888102 +0100
@@ -0,0 +1,4 @@
+Banana＠5
+Apple＠10
+Citrus＠20
+Cherry＠30
diff -urNp coreutils-8.8-orig/tests/misc/mb2.I coreutils-8.8/tests/misc/mb2.I
--- coreutils-8.8-orig/tests/misc/mb2.I 1970-01-01 01:00:00.000000000 +0100
+++ coreutils-8.8/tests/misc/mb2.I 2010-12-23 13:59:44.431512154 +0100
diff -urNp coreutils-8.9-orig/tests/misc/mb2.I coreutils-8.9/tests/misc/mb2.I
--- coreutils-8.9-orig/tests/misc/mb2.I 1970-01-01 01:00:00.000000000 +0100
+++ coreutils-8.9/tests/misc/mb2.I 2011-01-04 17:41:55.395888102 +0100
@@ -0,0 +1,4 @@
+Apple＠ＡＡ10＠＠20
+Banana＠ＡＡ5＠＠30
+Citrus＠ＡＡ20＠＠5
+Cherry＠ＡＡ30＠＠10
diff -urNp coreutils-8.8-orig/tests/misc/mb2.X coreutils-8.8/tests/misc/mb2.X
--- coreutils-8.8-orig/tests/misc/mb2.X 1970-01-01 01:00:00.000000000 +0100
+++ coreutils-8.8/tests/misc/mb2.X 2010-12-23 13:59:44.432512095 +0100
diff -urNp coreutils-8.9-orig/tests/misc/mb2.X coreutils-8.9/tests/misc/mb2.X
--- coreutils-8.9-orig/tests/misc/mb2.X 1970-01-01 01:00:00.000000000 +0100
+++ coreutils-8.9/tests/misc/mb2.X 2011-01-04 17:41:55.396892432 +0100
@@ -0,0 +1,4 @@
+Citrus＠ＡＡ20＠＠5
+Cherry＠ＡＡ30＠＠10
+Apple＠ＡＡ10＠＠20
+Banana＠ＡＡ5＠＠30
diff -urNp coreutils-8.8-orig/tests/misc/sort-mb-tests coreutils-8.8/tests/misc/sort-mb-tests
--- coreutils-8.8-orig/tests/misc/sort-mb-tests 1970-01-01 01:00:00.000000000 +0100
+++ coreutils-8.8/tests/misc/sort-mb-tests 2010-12-23 13:59:44.433512037 +0100
diff -urNp coreutils-8.9-orig/tests/misc/sort-mb-tests coreutils-8.9/tests/misc/sort-mb-tests
--- coreutils-8.9-orig/tests/misc/sort-mb-tests 1970-01-01 01:00:00.000000000 +0100
+++ coreutils-8.9/tests/misc/sort-mb-tests 2011-01-04 17:41:55.396892432 +0100
@@ -0,0 +1,58 @@
+#! /bin/sh
+case $# in

152
coreutils-selinux.patch
View File

@ -1,7 +1,7 @@
diff -urNp coreutils-8.7-orig/configure.ac coreutils-8.7/configure.ac
--- coreutils-8.7-orig/configure.ac 2010-11-15 10:03:39.636171519 +0100
+++ coreutils-8.7/configure.ac 2010-11-15 10:04:08.161930423 +0100
@@ -133,6 +133,13 @@ if test "$gl_gcc_warnings" = yes; then
diff -urNp coreutils-8.9-orig/configure.ac coreutils-8.9/configure.ac
--- coreutils-8.9-orig/configure.ac 2011-01-04 17:43:03.876887473 +0100
+++ coreutils-8.9/configure.ac 2011-01-04 17:43:36.194889010 +0100
@@ -132,6 +132,13 @@ if test "$gl_gcc_warnings" = yes; then
AC_SUBST([GNULIB_TEST_WARN_CFLAGS])
fi
@ -15,18 +15,18 @@ diff -urNp coreutils-8.7-orig/configure.ac coreutils-8.7/configure.ac
AC_FUNC_FORK
AC_ARG_ENABLE(pam, AS_HELP_STRING([--disable-pam],
diff -urNp coreutils-8.7-orig/man/chcon.x coreutils-8.7/man/chcon.x
--- coreutils-8.7-orig/man/chcon.x 2009-09-01 13:01:16.000000000 +0200
+++ coreutils-8.7/man/chcon.x 2010-11-15 10:04:08.161930423 +0100
diff -urNp coreutils-8.9-orig/man/chcon.x coreutils-8.9/man/chcon.x
--- coreutils-8.9-orig/man/chcon.x 2009-09-01 13:01:16.000000000 +0200
+++ coreutils-8.9/man/chcon.x 2011-01-04 17:43:36.195889150 +0100
@@ -1,4 +1,4 @@
[NAME]
-chcon \- change file security context
+chcon \- change file SELinux security context
[DESCRIPTION]
.\" Add any additional description here
diff -urNp coreutils-8.7-orig/man/runcon.x coreutils-8.7/man/runcon.x
--- coreutils-8.7-orig/man/runcon.x 2009-09-01 13:01:16.000000000 +0200
+++ coreutils-8.7/man/runcon.x 2010-11-15 10:04:08.162922322 +0100
diff -urNp coreutils-8.9-orig/man/runcon.x coreutils-8.9/man/runcon.x
--- coreutils-8.9-orig/man/runcon.x 2009-09-01 13:01:16.000000000 +0200
+++ coreutils-8.9/man/runcon.x 2011-01-04 17:43:36.195889150 +0100
@@ -1,5 +1,5 @@
[NAME]
-runcon \- run command with specified security context
@ -34,10 +34,10 @@ diff -urNp coreutils-8.7-orig/man/runcon.x coreutils-8.7/man/runcon.x
[DESCRIPTION]
Run COMMAND with completely-specified CONTEXT, or with current or
transitioned security context modified by one or more of LEVEL,
diff -urNp coreutils-8.7-orig/src/copy.c coreutils-8.7/src/copy.c
--- coreutils-8.7-orig/src/copy.c 2010-10-28 12:31:17.000000000 +0200
+++ coreutils-8.7/src/copy.c 2010-11-15 10:04:08.165921553 +0100
@@ -1924,6 +1924,8 @@ copy_internal (char const *src_name, cha
diff -urNp coreutils-8.9-orig/src/copy.c coreutils-8.9/src/copy.c
--- coreutils-8.9-orig/src/copy.c 2011-01-01 22:19:23.000000000 +0100
+++ coreutils-8.9/src/copy.c 2011-01-04 17:43:36.199888591 +0100
@@ -1931,6 +1931,8 @@ copy_internal (char const *src_name, cha
{
/* Here, we are crossing a file system boundary and cp's -x option
is in effect: so don't copy the contents of this directory. */
@ -46,9 +46,9 @@ diff -urNp coreutils-8.7-orig/src/copy.c coreutils-8.7/src/copy.c
}
else
{
diff -urNp coreutils-8.7-orig/src/copy.h coreutils-8.7/src/copy.h
--- coreutils-8.7-orig/src/copy.h 2010-10-11 19:35:11.000000000 +0200
+++ coreutils-8.7/src/copy.h 2010-11-15 10:04:08.166925814 +0100
diff -urNp coreutils-8.9-orig/src/copy.h coreutils-8.9/src/copy.h
--- coreutils-8.9-orig/src/copy.h 2011-01-01 22:19:23.000000000 +0100
+++ coreutils-8.9/src/copy.h 2011-01-04 17:43:36.201889220 +0100
@@ -158,6 +158,9 @@ struct cp_options
bool preserve_mode;
bool preserve_timestamps;
@ -59,9 +59,9 @@ diff -urNp coreutils-8.7-orig/src/copy.h coreutils-8.7/src/copy.h
/* Enabled for mv, and for cp by the --preserve=links option.
If true, attempt to preserve in the destination files any
logical hard links between the source files. If used with cp's
diff -urNp coreutils-8.7-orig/src/cp.c coreutils-8.7/src/cp.c
--- coreutils-8.7-orig/src/cp.c 2010-10-11 19:35:11.000000000 +0200
+++ coreutils-8.7/src/cp.c 2010-11-15 10:04:08.168931890 +0100
diff -urNp coreutils-8.9-orig/src/cp.c coreutils-8.9/src/cp.c
--- coreutils-8.9-orig/src/cp.c 2011-01-01 22:19:23.000000000 +0100
+++ coreutils-8.9/src/cp.c 2011-01-04 17:43:36.202898439 +0100
@@ -141,6 +141,7 @@ static struct option const long_opts[] =
{"target-directory", required_argument, NULL, 't'},
{"update", no_argument, NULL, 'u'},
@ -70,7 +70,7 @@ diff -urNp coreutils-8.7-orig/src/cp.c coreutils-8.7/src/cp.c
{GETOPT_HELP_OPTION_DECL},
{GETOPT_VERSION_OPTION_DECL},
{NULL, 0, NULL, 0}
@@ -200,6 +201,9 @@ Mandatory arguments to long options are
@@ -204,6 +205,9 @@ Mandatory arguments to long options are
all\n\
"), stdout);
fputs (_("\
@ -80,7 +80,7 @@ diff -urNp coreutils-8.7-orig/src/cp.c coreutils-8.7/src/cp.c
--no-preserve=ATTR_LIST don't preserve the specified attributes\n\
--parents use full source file name under DIRECTORY\n\
"), stdout);
@@ -226,6 +230,7 @@ Mandatory arguments to long options are
@@ -230,6 +234,7 @@ Mandatory arguments to long options are
destination file is missing\n\
-v, --verbose explain what is being done\n\
-x, --one-file-system stay on this file system\n\
@ -88,7 +88,7 @@ diff -urNp coreutils-8.7-orig/src/cp.c coreutils-8.7/src/cp.c
"), stdout);
fputs (HELP_OPTION_DESCRIPTION, stdout);
fputs (VERSION_OPTION_DESCRIPTION, stdout);
@@ -780,6 +785,7 @@ cp_option_init (struct cp_options *x)
@@ -786,6 +791,7 @@ cp_option_init (struct cp_options *x)
x->preserve_timestamps = false;
x->preserve_security_context = false;
x->require_preserve_context = false;
@ -96,7 +96,7 @@ diff -urNp coreutils-8.7-orig/src/cp.c coreutils-8.7/src/cp.c
x->preserve_xattr = false;
x->reduce_diagnostics = false;
x->require_preserve_xattr = false;
@@ -927,7 +933,7 @@ main (int argc, char **argv)
@@ -933,7 +939,7 @@ main (int argc, char **argv)
we'll actually use backup_suffix_string. */
backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX");
@ -105,7 +105,7 @@ diff -urNp coreutils-8.7-orig/src/cp.c coreutils-8.7/src/cp.c
long_opts, NULL))
!= -1)
{
@@ -974,6 +980,16 @@ main (int argc, char **argv)
@@ -981,6 +987,16 @@ main (int argc, char **argv)
copy_contents = true;
break;
@ -122,7 +122,7 @@ diff -urNp coreutils-8.7-orig/src/cp.c coreutils-8.7/src/cp.c
case 'd':
x.preserve_links = true;
x.dereference = DEREF_NEVER;
@@ -1083,6 +1099,27 @@ main (int argc, char **argv)
@@ -1090,6 +1106,27 @@ main (int argc, char **argv)
x.one_file_system = true;
break;
@ -150,9 +150,9 @@ diff -urNp coreutils-8.7-orig/src/cp.c coreutils-8.7/src/cp.c
case 'S':
make_backups = true;
backup_suffix_string = optarg;
diff -urNp coreutils-8.7-orig/src/chcon.c coreutils-8.7/src/chcon.c
--- coreutils-8.7-orig/src/chcon.c 2010-10-11 19:35:11.000000000 +0200
+++ coreutils-8.7/src/chcon.c 2010-11-15 10:04:08.169922391 +0100
diff -urNp coreutils-8.9-orig/src/chcon.c coreutils-8.9/src/chcon.c
--- coreutils-8.9-orig/src/chcon.c 2011-01-01 22:19:23.000000000 +0100
+++ coreutils-8.9/src/chcon.c 2011-01-04 17:43:36.205888452 +0100
@@ -356,7 +356,7 @@ Usage: %s [OPTION]... CONTEXT FILE...\n\
"),
program_name, program_name, program_name);
@ -162,9 +162,9 @@ diff -urNp coreutils-8.7-orig/src/chcon.c coreutils-8.7/src/chcon.c
With --reference, change the security context of each FILE to that of RFILE.\n\
\n\
-h, --no-dereference affect symbolic links instead of any referenced file\n\
diff -urNp coreutils-8.7-orig/src/id.c coreutils-8.7/src/id.c
--- coreutils-8.7-orig/src/id.c 2010-10-11 19:35:11.000000000 +0200
+++ coreutils-8.7/src/id.c 2010-11-15 10:04:08.170933217 +0100
diff -urNp coreutils-8.9-orig/src/id.c coreutils-8.9/src/id.c
--- coreutils-8.9-orig/src/id.c 2011-01-01 22:19:23.000000000 +0100
+++ coreutils-8.9/src/id.c 2011-01-04 17:43:36.206888661 +0100
@@ -107,7 +107,7 @@ int
main (int argc, char **argv)
{
@ -174,9 +174,9 @@ diff -urNp coreutils-8.7-orig/src/id.c coreutils-8.7/src/id.c
/* If true, output the list of all group IDs. -G */
bool just_group_list = false;
diff -urNp coreutils-8.7-orig/src/install.c coreutils-8.7/src/install.c
--- coreutils-8.7-orig/src/install.c 2010-10-15 21:56:29.000000000 +0200
+++ coreutils-8.7/src/install.c 2010-11-15 10:04:08.171921693 +0100
diff -urNp coreutils-8.9-orig/src/install.c coreutils-8.9/src/install.c
--- coreutils-8.9-orig/src/install.c 2011-01-01 22:19:23.000000000 +0100
+++ coreutils-8.9/src/install.c 2011-01-04 17:47:30.255887962 +0100
@@ -283,6 +283,7 @@ cp_option_init (struct cp_options *x)
x->data_copy_required = true;
x->require_preserve = false;
@ -221,20 +221,18 @@ diff -urNp coreutils-8.7-orig/src/install.c coreutils-8.7/src/install.c
use_default_selinux_context = false;
break;
case_GETOPT_HELP_CHAR;
@@ -985,8 +992,8 @@ Mandatory arguments to long options are
@@ -985,7 +992,7 @@ Mandatory arguments to long options are
-v, --verbose print the name of each directory as it is created\n\
"), stdout);
fputs (_("\
- --preserve-context preserve SELinux security context\n\
- -Z, --context=CONTEXT set SELinux security context of files and directories\n\
+ -P, --preserve-context (SELinux) preserve security context\n\
+ -Z, --context=CONTEXT (SELinux) set security context of files and directories\n\
+ -P, --preserve-context preserve SELinux security context\n\
-Z, --context=CONTEXT set SELinux security context of files and directories\
\n\
"), stdout);
fputs (HELP_OPTION_DESCRIPTION, stdout);
diff -urNp coreutils-8.7-orig/src/ls.c coreutils-8.7/src/ls.c
--- coreutils-8.7-orig/src/ls.c 2010-10-25 12:07:57.000000000 +0200
+++ coreutils-8.7/src/ls.c 2010-11-15 10:04:08.175921763 +0100
diff -urNp coreutils-8.9-orig/src/ls.c coreutils-8.9/src/ls.c
--- coreutils-8.9-orig/src/ls.c 2011-01-01 22:19:23.000000000 +0100
+++ coreutils-8.9/src/ls.c 2011-01-04 17:43:36.211887474 +0100
@@ -159,7 +159,8 @@ enum filetype
symbolic_link,
sock,
@ -384,7 +382,7 @@ diff -urNp coreutils-8.7-orig/src/ls.c coreutils-8.7/src/ls.c
default:
usage (LS_FAILURE);
}
@@ -2690,8 +2714,10 @@ clear_files (void)
@@ -2691,8 +2715,10 @@ clear_files (void)
struct fileinfo *f = sorted_file[i];
free (f->name);
free (f->linkname);
@ -397,7 +395,7 @@ diff -urNp coreutils-8.7-orig/src/ls.c coreutils-8.7/src/ls.c
}
cwd_n_used = 0;
@@ -2733,6 +2759,7 @@ gobble_file (char const *name, enum file
@@ -2734,6 +2760,7 @@ gobble_file (char const *name, enum file
memset (f, '\0', sizeof *f);
f->stat.st_ino = inode;
f->filetype = type;
@ -405,7 +403,7 @@ diff -urNp coreutils-8.7-orig/src/ls.c coreutils-8.7/src/ls.c
if (command_line_arg
|| format_needs_stat
@@ -2842,7 +2869,7 @@ gobble_file (char const *name, enum file
@@ -2843,7 +2870,7 @@ gobble_file (char const *name, enum file
&& print_with_color && is_colored (C_CAP))
f->has_capability = has_capability (absolute_name);
@ -414,7 +412,7 @@ diff -urNp coreutils-8.7-orig/src/ls.c coreutils-8.7/src/ls.c
{
bool have_selinux = false;
bool have_acl = false;
@@ -2865,7 +2892,7 @@ gobble_file (char const *name, enum file
@@ -2866,7 +2893,7 @@ gobble_file (char const *name, enum file
err = 0;
}
@ -423,7 +421,7 @@ diff -urNp coreutils-8.7-orig/src/ls.c coreutils-8.7/src/ls.c
{
int n = file_has_acl (absolute_name, &f->stat);
err = (n < 0);
@@ -2884,7 +2911,8 @@ gobble_file (char const *name, enum file
@@ -2885,7 +2912,8 @@ gobble_file (char const *name, enum file
}
if (S_ISLNK (f->stat.st_mode)
@ -433,7 +431,7 @@ diff -urNp coreutils-8.7-orig/src/ls.c coreutils-8.7/src/ls.c
{
char *linkname;
struct stat linkstats;
@@ -2904,6 +2932,7 @@ gobble_file (char const *name, enum file
@@ -2905,6 +2933,7 @@ gobble_file (char const *name, enum file
command line are automatically traced if not being
listed as files. */
if (!command_line_arg || format == long_format
@ -441,7 +439,7 @@ diff -urNp coreutils-8.7-orig/src/ls.c coreutils-8.7/src/ls.c
|| !S_ISDIR (linkstats.st_mode))
{
/* Get the linked-to file's mode for the filetype indicator
@@ -2943,7 +2972,7 @@ gobble_file (char const *name, enum file
@@ -2944,7 +2973,7 @@ gobble_file (char const *name, enum file
block_size_width = len;
}
@ -450,7 +448,7 @@ diff -urNp coreutils-8.7-orig/src/ls.c coreutils-8.7/src/ls.c
{
if (print_owner)
{
@@ -3444,6 +3473,13 @@ print_current_files (void)
@@ -3445,6 +3474,13 @@ print_current_files (void)
print_long_format (sorted_file[i]);
DIRED_PUTCHAR ('\n');
}
@ -464,7 +462,7 @@ diff -urNp coreutils-8.7-orig/src/ls.c coreutils-8.7/src/ls.c
break;
}
}
@@ -3606,6 +3642,67 @@ format_inode (char *buf, size_t buflen,
@@ -3607,6 +3643,67 @@ format_inode (char *buf, size_t buflen,
: (char *) "?");
}
@ -532,7 +530,7 @@ diff -urNp coreutils-8.7-orig/src/ls.c coreutils-8.7/src/ls.c
/* Print information about F in long format. */
static void
print_long_format (const struct fileinfo *f)
@@ -3697,9 +3794,15 @@ print_long_format (const struct fileinfo
@@ -3698,9 +3795,15 @@ print_long_format (const struct fileinfo
The latter is wrong when nlink_width is zero. */
p += strlen (p);
@ -549,7 +547,7 @@ diff -urNp coreutils-8.7-orig/src/ls.c coreutils-8.7/src/ls.c
{
DIRED_FPUTS (buf, stdout, p - buf);
@@ -3712,9 +3815,6 @@ print_long_format (const struct fileinfo
@@ -3713,9 +3816,6 @@ print_long_format (const struct fileinfo
if (print_author)
format_user (f->stat.st_author, author_width, f->stat_ok);
@ -559,7 +557,7 @@ diff -urNp coreutils-8.7-orig/src/ls.c coreutils-8.7/src/ls.c
p = buf;
}
@@ -4059,9 +4159,6 @@ print_file_name_and_frills (const struct
@@ -4060,9 +4160,6 @@ print_file_name_and_frills (const struct
: human_readable (ST_NBLOCKS (f->stat), buf, human_output_opts,
ST_NBLOCKSIZE, output_block_size));
@ -569,7 +567,7 @@ diff -urNp coreutils-8.7-orig/src/ls.c coreutils-8.7/src/ls.c
size_t width = print_name_with_quoting (f, false, NULL, start_col);
if (indicator_style != none)
@@ -4265,9 +4362,6 @@ length_of_file_name_and_frills (const st
@@ -4266,9 +4363,6 @@ length_of_file_name_and_frills (const st
output_block_size))
: block_size_width);
@ -579,7 +577,7 @@ diff -urNp coreutils-8.7-orig/src/ls.c coreutils-8.7/src/ls.c
quote_name (NULL, f->name, filename_quoting_options, &name_width);
len += name_width;
@@ -4700,9 +4794,16 @@ Mandatory arguments to long options are
@@ -4707,9 +4801,16 @@ Mandatory arguments to long options are
-w, --width=COLS assume screen width instead of current value\n\
-x list entries by lines instead of by columns\n\
-X sort alphabetically by entry extension\n\
@ -597,9 +595,9 @@ diff -urNp coreutils-8.7-orig/src/ls.c coreutils-8.7/src/ls.c
fputs (HELP_OPTION_DESCRIPTION, stdout);
fputs (VERSION_OPTION_DESCRIPTION, stdout);
emit_size_note ();
diff -urNp coreutils-8.7-orig/src/mkdir.c coreutils-8.7/src/mkdir.c
--- coreutils-8.7-orig/src/mkdir.c 2010-10-11 19:35:11.000000000 +0200
+++ coreutils-8.7/src/mkdir.c 2010-11-15 10:04:08.177942716 +0100
diff -urNp coreutils-8.9-orig/src/mkdir.c coreutils-8.9/src/mkdir.c
--- coreutils-8.9-orig/src/mkdir.c 2011-01-01 22:19:23.000000000 +0100
+++ coreutils-8.9/src/mkdir.c 2011-01-04 17:43:36.213899906 +0100
@@ -38,6 +38,7 @@
static struct option const longopts[] =
{
@ -608,9 +606,9 @@ diff -urNp coreutils-8.7-orig/src/mkdir.c coreutils-8.7/src/mkdir.c
{"mode", required_argument, NULL, 'm'},
{"parents", no_argument, NULL, 'p'},
{"verbose", no_argument, NULL, 'v'},
diff -urNp coreutils-8.7-orig/src/mknod.c coreutils-8.7/src/mknod.c
--- coreutils-8.7-orig/src/mknod.c 2010-10-11 19:35:11.000000000 +0200
+++ coreutils-8.7/src/mknod.c 2010-11-15 10:04:08.177942716 +0100
diff -urNp coreutils-8.9-orig/src/mknod.c coreutils-8.9/src/mknod.c
--- coreutils-8.9-orig/src/mknod.c 2011-01-01 22:19:23.000000000 +0100
+++ coreutils-8.9/src/mknod.c 2011-01-04 17:43:36.215887404 +0100
@@ -35,7 +35,7 @@
static struct option const longopts[] =
@ -620,9 +618,9 @@ diff -urNp coreutils-8.7-orig/src/mknod.c coreutils-8.7/src/mknod.c
{"mode", required_argument, NULL, 'm'},
{GETOPT_HELP_OPTION_DECL},
{GETOPT_VERSION_OPTION_DECL},
diff -urNp coreutils-8.7-orig/src/mv.c coreutils-8.7/src/mv.c
--- coreutils-8.7-orig/src/mv.c 2010-10-11 19:35:11.000000000 +0200
+++ coreutils-8.7/src/mv.c 2010-11-15 10:04:08.179924138 +0100
diff -urNp coreutils-8.9-orig/src/mv.c coreutils-8.9/src/mv.c
--- coreutils-8.9-orig/src/mv.c 2011-01-01 22:19:23.000000000 +0100
+++ coreutils-8.9/src/mv.c 2011-01-04 17:43:36.216896344 +0100
@@ -118,6 +118,7 @@ cp_option_init (struct cp_options *x)
x->preserve_mode = true;
x->preserve_timestamps = true;
@ -631,9 +629,9 @@ diff -urNp coreutils-8.7-orig/src/mv.c coreutils-8.7/src/mv.c
x->reduce_diagnostics = false;
x->data_copy_required = true;
x->require_preserve = false; /* FIXME: maybe make this an option */
diff -urNp coreutils-8.7-orig/src/runcon.c coreutils-8.7/src/runcon.c
--- coreutils-8.7-orig/src/runcon.c 2010-10-11 19:35:11.000000000 +0200
+++ coreutils-8.7/src/runcon.c 2010-11-15 10:04:08.180922252 +0100
diff -urNp coreutils-8.9-orig/src/runcon.c coreutils-8.9/src/runcon.c
--- coreutils-8.9-orig/src/runcon.c 2011-01-01 22:19:23.000000000 +0100
+++ coreutils-8.9/src/runcon.c 2011-01-04 17:43:36.216896344 +0100
@@ -86,7 +86,7 @@ Usage: %s CONTEXT COMMAND [args]\n\
or: %s [ -c ] [-u USER] [-r ROLE] [-t TYPE] [-l RANGE] COMMAND [args]\n\
"), program_name, program_name);
@ -643,9 +641,9 @@ diff -urNp coreutils-8.7-orig/src/runcon.c coreutils-8.7/src/runcon.c
With neither CONTEXT nor COMMAND, print the current security context.\n\
\n\
CONTEXT Complete security context\n\
diff -urNp coreutils-8.7-orig/tests/init.cfg coreutils-8.7/tests/init.cfg
--- coreutils-8.7-orig/tests/init.cfg 2010-11-08 14:10:20.000000000 +0100
+++ coreutils-8.7/tests/init.cfg 2010-11-15 10:04:08.181922042 +0100
diff -urNp coreutils-8.9-orig/tests/init.cfg coreutils-8.9/tests/init.cfg
--- coreutils-8.9-orig/tests/init.cfg 2010-12-22 12:29:13.000000000 +0100
+++ coreutils-8.9/tests/init.cfg 2011-01-04 17:43:36.218137788 +0100
@@ -216,8 +216,8 @@ skip_if_()
require_selinux_()
@ -657,10 +655,10 @@ diff -urNp coreutils-8.7-orig/tests/init.cfg coreutils-8.7/tests/init.cfg
skip_test_ "this system (or maybe just" \
"the current file system) lacks SELinux support"
;;
diff -urNp coreutils-8.7-orig/tests/misc/selinux coreutils-8.7/tests/misc/selinux
--- coreutils-8.7-orig/tests/misc/selinux 2010-10-11 19:35:11.000000000 +0200
+++ coreutils-8.7/tests/misc/selinux 2010-11-15 10:04:08.181922042 +0100
@@ -44,7 +44,7 @@ chcon $ctx f d p ||
diff -urNp coreutils-8.9-orig/tests/misc/selinux coreutils-8.9/tests/misc/selinux
--- coreutils-8.9-orig/tests/misc/selinux 2011-01-01 22:19:23.000000000 +0100
+++ coreutils-8.9/tests/misc/selinux 2011-01-04 17:43:36.219137718 +0100
@@ -37,7 +37,7 @@ chcon $ctx f d p ||
# inspect that context with both ls -Z and stat.
for i in d f p; do

10
coreutils.spec
View File

@ -1,7 +1,7 @@
Summary: A set of basic GNU tools commonly used in shell scripts
Name: coreutils
Version: 8.8
Release: 2%{?dist}
Version: 8.9
Release: 1%{?dist}
License: GPLv3+
Group: System Environment/Base
Url: http://www.gnu.org/software/coreutils/
@ -18,8 +18,6 @@ Source202: coreutils-su-l.pamd
Source203: coreutils-runuser-l.pamd
# From upstream
#The suffix length was dependent on the number of bytes or lines per file(#666293)
Patch1: coreutils-8.8-split-suffix.patch
# Our patches
#general patch to workaround koji build system issues
@ -117,7 +115,6 @@ Libraries for coreutils package.
%setup -q
# From upstream
%patch1 -p1 -b .splitsuffix
# Our patches
%patch100 -p1 -b .configure
@ -335,6 +332,9 @@ fi
%{_libdir}/coreutils
%changelog
* Tue Jan 04 2011 Ondrej Vasik <ovasik@redhat.com> - 8.9-1
- new upstream release coreutils-8.9
* Fri Dec 31 2010 Ondrej Vasik <ovasik@redhat.com> - 8.8-2
- The suffix length was dependent on the number of bytes
or lines per file (#666293)

2
sources
View File

@ -1 +1 @@
a78848e3d7ba52e65b564ffea875ef20 coreutils-8.8.tar.xz
4a38f51941bae177c997cda9bdc603bd coreutils-8.9.tar.xz