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

- 6.8+, in preparation for 6.9.

Browse Source
This commit is contained in:
Tim Waugh 2007-03-01 17:36:24 +00:00
parent 09330094ac
commit bb664a7919
6 changed files with 237 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.cvsignore
View File

@ -6,3 +6,4 @@ coreutils-5.95.tar.bz2
coreutils-5.96.tar.bz2
coreutils-5.97.tar.bz2
coreutils-6.7.tar.bz2
coreutils-6.8+-ss-2007-03-01.11.42.23+0.tar.gz

23
coreutils-getfacl-exit-code.patch Normal file
View File

@ -0,0 +1,23 @@
--- coreutils-6.8+/tests/cp/acl.getfacl-exit-code 2007-03-01 16:48:29.000000000 +0000
+++ coreutils-6.8+/tests/cp/acl 2007-03-01 16:49:35.000000000 +0000
@@ -70,16 +70,16 @@
# copy a file without preserving permissions
cp a/file b/ || fail=1
-acl2=`cd b && getfacl file` || framework_failure=1
+acl2=`cd b && getfacl file`
test "$acl1" = "$acl2" || fail=1
rm a/file || framework_failure=1
# copy a file, preserving permissions
touch a/file || framework_failure=1
-setfacl -m user:bin:rw a/file || framework_failure=1
-acl1=`cd a && getfacl file` || framework_failure=1
+setfacl -m user:bin:rw a/file
+acl1=`cd a && getfacl file`
cp -p a/file b/ || fail=1
-acl2=`cd b && getfacl file` || framework_failure=1
+acl2=`cd b && getfacl file`
test "$acl1" = "$acl2" || fail=1
if test $framework_failure = 1; then

158
coreutils-i18n.patch
View File

@ -1,5 +1,5 @@
--- /dev/null 2007-01-09 09:38:07.860075128 +0000
+++ coreutils-6.7/tests/sort/sort-mb-tests 2007-01-09 17:18:28.000000000 +0000
--- /dev/null 2007-03-01 09:16:39.219409909 +0000
+++ coreutils-6.8+/tests/sort/sort-mb-tests 2007-03-01 15:08:24.000000000 +0000
@@ -0,0 +1,58 @@
+#! /bin/sh
+case $# in
@ -59,38 +59,38 @@
+fi
+test $errors = 0 || errors=1
+exit $errors
--- /dev/null 2007-01-09 09:38:07.860075128 +0000
+++ coreutils-6.7/tests/sort/mb2.I 2007-01-09 17:18:28.000000000 +0000
--- /dev/null 2007-03-01 09:16:39.219409909 +0000
+++ coreutils-6.8+/tests/sort/mb2.I 2007-03-01 15:08:24.000000000 +0000
@@ -0,0 +1,4 @@
+Apple＠ＡＡ10＠＠20
+Banana＠ＡＡ5＠＠30
+Citrus＠ＡＡ20＠＠5
+Cherry＠ＡＡ30＠＠10
--- /dev/null 2007-01-09 09:38:07.860075128 +0000
+++ coreutils-6.7/tests/sort/mb2.X 2007-01-09 17:18:28.000000000 +0000
--- /dev/null 2007-03-01 09:16:39.219409909 +0000
+++ coreutils-6.8+/tests/sort/mb2.X 2007-03-01 15:08:24.000000000 +0000
@@ -0,0 +1,4 @@
+Citrus＠ＡＡ20＠＠5
+Cherry＠ＡＡ30＠＠10
+Apple＠ＡＡ10＠＠20
+Banana＠ＡＡ5＠＠30
--- /dev/null 2007-01-09 09:38:07.860075128 +0000
+++ coreutils-6.7/tests/sort/mb1.I 2007-01-09 17:18:28.000000000 +0000
--- /dev/null 2007-03-01 09:16:39.219409909 +0000
+++ coreutils-6.8+/tests/sort/mb1.I 2007-03-01 15:08:24.000000000 +0000
@@ -0,0 +1,4 @@
+Apple＠10
+Banana＠5
+Citrus＠20
+Cherry＠30
--- /dev/null 2007-01-09 09:38:07.860075128 +0000
+++ coreutils-6.7/tests/sort/mb1.X 2007-01-09 17:18:28.000000000 +0000
--- /dev/null 2007-03-01 09:16:39.219409909 +0000
+++ coreutils-6.8+/tests/sort/mb1.X 2007-03-01 15:08:24.000000000 +0000
@@ -0,0 +1,4 @@
+Banana＠5
+Apple＠10
+Citrus＠20
+Cherry＠30
--- coreutils-6.7/tests/sort/Makefile.am.i18n 2006-10-22 17:54:15.000000000 +0100
+++ coreutils-6.7/tests/sort/Makefile.am 2007-01-09 17:25:00.000000000 +0000
@@ -64,14 +64,16 @@
nul-tab.E
--- coreutils-6.8+/tests/sort/Makefile.am.i18n 2007-01-24 07:47:37.000000000 +0000
+++ coreutils-6.8+/tests/sort/Makefile.am 2007-03-01 15:09:59.000000000 +0000
@@ -66,15 +66,17 @@
bigfield.O bigfield.E
##test-files-end
-EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
@ -100,6 +100,7 @@
+EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen) mb1.I mb1.X mb2.I mb2.X
+noinst_SCRIPTS = $x-tests # $x-mb-tests
TESTS_ENVIRONMENT = \
CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,$(srcdir),g'
@ -109,8 +110,8 @@
mk_script = $(srcdir)/../mk-script
$(srcdir)/$x-tests: $(mk_script) Test.pm Makefile.am
--- coreutils-6.7/lib/linebuffer.h.i18n 2005-05-14 07:44:24.000000000 +0100
+++ coreutils-6.7/lib/linebuffer.h 2007-01-09 17:18:28.000000000 +0000
--- coreutils-6.8+/lib/linebuffer.h.i18n 2005-05-14 07:44:24.000000000 +0100
+++ coreutils-6.8+/lib/linebuffer.h 2007-03-01 15:08:24.000000000 +0000
@@ -22,6 +22,11 @@
# include <stdio.h>
@ -133,8 +134,8 @@
};
/* Initialize linebuffer LINEBUFFER for use. */
--- coreutils-6.7/src/expand.c.i18n 2006-10-22 17:54:15.000000000 +0100
+++ coreutils-6.7/src/expand.c 2007-01-09 17:18:28.000000000 +0000
--- coreutils-6.8+/src/expand.c.i18n 2007-01-14 15:41:28.000000000 +0000
+++ coreutils-6.8+/src/expand.c 2007-03-01 15:08:24.000000000 +0000
@@ -38,11 +38,28 @@
#include <stdio.h>
#include <getopt.h>
@ -329,8 +330,8 @@
if (have_read_stdin && fclose (stdin) != 0)
error (EXIT_FAILURE, errno, "-");
--- coreutils-6.7/src/join.c.i18n 2006-10-22 17:54:15.000000000 +0100
+++ coreutils-6.7/src/join.c 2007-01-09 17:18:28.000000000 +0000
--- coreutils-6.8+/src/join.c.i18n 2007-01-14 15:41:28.000000000 +0000
+++ coreutils-6.8+/src/join.c 2007-03-01 15:08:24.000000000 +0000
@@ -23,16 +23,30 @@
#include <sys/types.h>
#include <getopt.h>
@ -774,7 +775,7 @@
prfield (i, line2);
}
putchar ('\n');
@@ -862,20 +1093,41 @@
@@ -859,20 +1090,41 @@
case 't':
{
@ -826,8 +827,8 @@
}
break;
--- coreutils-6.7/src/uniq.c.i18n 2006-10-22 17:54:15.000000000 +0100
+++ coreutils-6.7/src/uniq.c 2007-01-09 17:18:28.000000000 +0000
--- coreutils-6.8+/src/uniq.c.i18n 2007-01-14 15:41:28.000000000 +0000
+++ coreutils-6.8+/src/uniq.c 2007-03-01 15:08:24.000000000 +0000
@@ -23,6 +23,16 @@
#include <getopt.h>
#include <sys/types.h>
@ -877,7 +878,7 @@
static struct option const longopts[] =
{
{"count", no_argument, NULL, 'c'},
@@ -189,7 +215,7 @@
@@ -198,7 +224,7 @@
return a pointer to the beginning of the line's field to be compared. */
static char *
@ -886,7 +887,7 @@
{
size_t count;
char *lp = line->buffer;
@@ -210,6 +236,83 @@
@@ -219,6 +245,83 @@
return lp + i;
}
@ -970,7 +971,7 @@
/* Return false if two strings OLD and NEW match, true if not.
OLD and NEW point not to the beginnings of the lines
but rather to the beginnings of the fields to compare.
@@ -218,6 +321,8 @@
@@ -227,6 +330,8 @@
static bool
different (char *old, char *new, size_t oldlen, size_t newlen)
{
@ -979,7 +980,7 @@
if (check_chars < oldlen)
oldlen = check_chars;
if (check_chars < newlen)
@@ -225,14 +330,92 @@
@@ -234,14 +339,92 @@
if (ignore_case)
{
@ -1077,7 +1078,7 @@
/* Output the line in linebuffer LINE to standard output
provided that the switches say it should be output.
@@ -286,15 +469,43 @@
@@ -295,15 +478,43 @@
{
char *prevfield IF_LINT (= NULL);
size_t prevlen IF_LINT (= 0);
@ -1121,7 +1122,7 @@
if (prevline->length == 0
|| different (thisfield, prevfield, thislen, prevlen))
{
@@ -313,17 +524,26 @@
@@ -322,17 +533,26 @@
size_t prevlen;
uintmax_t match_count = 0;
bool first_delimiter = true;
@ -1148,7 +1149,7 @@
if (readlinebuffer (thisline, stdin) == 0)
{
if (ferror (stdin))
@@ -332,6 +552,15 @@
@@ -341,6 +561,15 @@
}
thisfield = find_field (thisline);
thislen = thisline->length - 1 - (thisfield - thisline->buffer);
@ -1164,7 +1165,7 @@
match = !different (thisfield, prevfield, thislen, prevlen);
match_count += match;
@@ -364,6 +593,9 @@
@@ -373,6 +602,9 @@
SWAP_LINES (prevline, thisline);
prevfield = thisfield;
prevlen = thislen;
@ -1174,7 +1175,7 @@
if (!match)
match_count = 0;
}
@@ -408,6 +640,19 @@
@@ -417,6 +649,19 @@
atexit (close_stdout);
@ -1194,8 +1195,8 @@
skip_chars = 0;
skip_fields = 0;
check_chars = SIZE_MAX;
--- coreutils-6.7/src/fold.c.i18n 2006-10-24 23:35:57.000000000 +0100
+++ coreutils-6.7/src/fold.c 2007-01-09 17:23:46.000000000 +0000
--- coreutils-6.8+/src/fold.c.i18n 2007-02-23 12:01:47.000000000 +0000
+++ coreutils-6.8+/src/fold.c 2007-03-01 15:08:24.000000000 +0000
@@ -23,11 +23,33 @@
#include <getopt.h>
#include <sys/types.h>
@ -1599,15 +1600,16 @@
break;
case 's': /* Break at word boundaries. */
--- coreutils-6.7/src/sort.c.i18n 2006-11-13 18:14:02.000000000 +0000
+++ coreutils-6.7/src/sort.c 2007-01-09 17:18:28.000000000 +0000
@@ -23,9 +23,18 @@
--- coreutils-6.8+/src/sort.c.i18n 2007-02-24 11:23:23.000000000 +0000
+++ coreutils-6.8+/src/sort.c 2007-03-01 15:10:57.000000000 +0000
@@ -23,10 +23,19 @@
#include <config.h>
+#include <assert.h>
#include <getopt.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <signal.h>
+#if HAVE_WCHAR_H
+# include <wchar.h>
@ -1618,9 +1620,9 @@
+#endif
+
#include "system.h"
#include "argmatch.h"
#include "error.h"
#include "hard-locale.h"
@@ -98,14 +107,38 @@
@@ -116,14 +125,38 @@
/* Thousands separator; if -1, then there isn't one. */
static int thousands_sep;
@ -1660,7 +1662,7 @@
/* The kind of blanks for '-b' to skip in various options. */
enum blanktype { bl_start, bl_end, bl_both };
@@ -243,13 +276,11 @@
@@ -261,13 +294,11 @@
they were read if all keys compare equal. */
static bool stable;
@ -1677,9 +1679,9 @@
/* Flag to remove consecutive duplicate lines from the output.
Only the last of a sequence of equal lines will be output. */
@@ -408,6 +439,44 @@
static struct tempnode *volatile temphead;
static struct tempnode *volatile *temptail = &temphead;
@@ -639,6 +670,44 @@
update_proc (pid);
}
+/* Function pointers. */
+static void
@ -1722,7 +1724,7 @@
/* Clean up any remaining temporary files. */
static void
@@ -561,7 +630,7 @@
@@ -978,7 +1047,7 @@
free (node);
}
@ -1731,7 +1733,7 @@
static int
struct_month_cmp (const void *m1, const void *m2)
@@ -576,7 +645,7 @@
@@ -993,7 +1062,7 @@
/* Initialize the character class tables. */
static void
@ -1740,7 +1742,7 @@
{
size_t i;
@@ -588,7 +657,7 @@
@@ -1005,7 +1074,7 @@
fold_toupper[i] = toupper (i);
}
@ -1749,7 +1751,7 @@
/* If we're not in the "C" locale, read different names for months. */
if (hard_LC_TIME)
{
@@ -614,6 +683,64 @@
@@ -1031,6 +1100,64 @@
#endif
}
@ -1814,7 +1816,7 @@
/* Specify the amount of main memory to use when sorting. */
static void
specify_sort_size (char const *s)
@@ -824,7 +951,7 @@
@@ -1241,7 +1368,7 @@
by KEY in LINE. */
static char *
@ -1823,7 +1825,7 @@
{
char *ptr = line->text, *lim = ptr + line->length - 1;
size_t sword = key->sword;
@@ -834,10 +961,10 @@
@@ -1251,10 +1378,10 @@
/* The leading field separator itself is included in a field when -t
is absent. */
@ -1836,7 +1838,7 @@
++ptr;
if (ptr < lim)
++ptr;
@@ -865,11 +992,70 @@
@@ -1282,11 +1409,70 @@
return ptr;
}
@ -1908,7 +1910,7 @@
{
char *ptr = line->text, *lim = ptr + line->length - 1;
size_t eword = key->eword, echar = key->echar;
@@ -882,10 +1068,10 @@
@@ -1299,10 +1485,10 @@
`beginning' is the first character following the delimiting TAB.
Otherwise, leave PTR pointing at the first `blank' character after
the preceding field. */
@ -1921,7 +1923,7 @@
++ptr;
if (ptr < lim && (eword | echar))
++ptr;
@@ -931,10 +1117,10 @@
@@ -1348,10 +1534,10 @@
*/
/* Make LIM point to the end of (one byte past) the current field. */
@ -1934,7 +1936,7 @@
if (newlim)
lim = newlim;
}
@@ -967,6 +1153,107 @@
@@ -1384,6 +1570,107 @@
return ptr;
}
@ -2042,7 +2044,7 @@
/* 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
@@ -1049,8 +1336,24 @@
@@ -1466,8 +1753,24 @@
else
{
if (key->skipsblanks)
@ -2069,7 +2071,7 @@
line->keybeg = line_start;
}
}
@@ -1083,7 +1386,7 @@
@@ -1500,7 +1803,7 @@
hideously fast. */
static int
@ -2078,7 +2080,7 @@
{
while (blanks[to_uchar (*a)])
a++;
@@ -1093,6 +1396,25 @@
@@ -1510,6 +1813,25 @@
return strnumcmp (a, b, decimal_point, thousands_sep);
}
@ -2104,7 +2106,7 @@
static int
general_numcompare (const char *sa, const char *sb)
{
@@ -1126,7 +1448,7 @@
@@ -1543,7 +1865,7 @@
Return 0 if the name in S is not recognized. */
static int
@ -2113,7 +2115,7 @@
{
size_t lo = 0;
size_t hi = MONTHS_PER_YEAR;
@@ -1281,11 +1603,79 @@
@@ -1698,11 +2020,79 @@
return diff;
}
@ -2194,7 +2196,7 @@
{
struct keyfield const *key = keylist;
@@ -1458,6 +1848,177 @@
@@ -1875,6 +2265,177 @@
return key->reverse ? -diff : diff;
}
@ -2372,8 +2374,8 @@
/* Compare two lines A and B, returning negative, zero, or positive
depending on whether A compares less than, equal to, or greater than B. */
@@ -2309,7 +2870,7 @@
atexit (close_stdout);
@@ -2744,7 +3305,7 @@
initialize_exit_failure (SORT_FAILURE);
hard_LC_COLLATE = hard_locale (LC_COLLATE);
-#if HAVE_NL_LANGINFO
@ -2381,7 +2383,7 @@
hard_LC_TIME = hard_locale (LC_TIME);
#endif
@@ -2330,6 +2891,27 @@
@@ -2765,6 +3326,27 @@
thousands_sep = -1;
}
@ -2409,7 +2411,7 @@
have_read_stdin = false;
inittables ();
@@ -2544,13 +3126,35 @@
@@ -3015,13 +3597,35 @@
case 't':
{
@ -2449,7 +2451,7 @@
else
{
/* Provoke with `sort -txx'. Complain about
@@ -2561,9 +3165,12 @@
@@ -3032,9 +3636,12 @@
quote (optarg));
}
}
@ -2464,8 +2466,8 @@
}
break;
--- coreutils-6.7/src/unexpand.c.i18n 2006-10-22 17:54:15.000000000 +0100
+++ coreutils-6.7/src/unexpand.c 2007-01-09 17:18:28.000000000 +0000
--- coreutils-6.8+/src/unexpand.c.i18n 2007-01-14 15:41:28.000000000 +0000
+++ coreutils-6.8+/src/unexpand.c 2007-03-01 15:08:24.000000000 +0000
@@ -39,11 +39,28 @@
#include <stdio.h>
#include <getopt.h>
@ -2718,8 +2720,8 @@
if (have_read_stdin && fclose (stdin) != 0)
error (EXIT_FAILURE, errno, "-");
--- coreutils-6.7/src/pr.c.i18n 2006-10-24 23:59:25.000000000 +0100
+++ coreutils-6.7/src/pr.c 2007-01-09 17:18:28.000000000 +0000
--- coreutils-6.8+/src/pr.c.i18n 2007-01-14 15:41:28.000000000 +0000
+++ coreutils-6.8+/src/pr.c 2007-03-01 15:08:24.000000000 +0000
@@ -313,6 +313,32 @@
#include <getopt.h>
@ -3442,8 +3444,8 @@
/* We've just printed some files and need to clean up things before
looking for more options and printing the next batch of files.
--- coreutils-6.7/src/cut.c.i18n 2006-11-27 10:25:51.000000000 +0000
+++ coreutils-6.7/src/cut.c 2007-01-09 17:18:28.000000000 +0000
--- coreutils-6.8+/src/cut.c.i18n 2007-01-14 15:41:28.000000000 +0000
+++ coreutils-6.8+/src/cut.c 2007-03-01 15:08:24.000000000 +0000
@@ -29,6 +29,11 @@
#include <assert.h>
#include <getopt.h>
@ -3709,7 +3711,7 @@
/* Read from stream STREAM, printing to standard output any selected fields. */
static void
@@ -691,13 +830,192 @@
@@ -692,13 +831,192 @@
}
}
@ -3905,7 +3907,7 @@
}
/* Process file FILE to standard output.
@@ -747,6 +1065,8 @@
@@ -748,6 +1066,8 @@
bool ok;
bool delim_specified = false;
char *spec_list_string IF_LINT(= NULL);
@ -3914,7 +3916,7 @@
initialize_main (&argc, &argv);
program_name = argv[0];
@@ -769,7 +1089,6 @@
@@ -770,7 +1090,6 @@
switch (optc)
{
case 'b':
@ -3922,7 +3924,7 @@
/* Build the byte list. */
if (operating_mode != undefined_mode)
FATAL_ERROR (_("only one type of list may be specified"));
@@ -777,6 +1096,14 @@
@@ -778,6 +1097,14 @@
spec_list_string = optarg;
break;
@ -3937,7 +3939,7 @@
case 'f':
/* Build the field list. */
if (operating_mode != undefined_mode)
@@ -788,10 +1115,35 @@
@@ -789,10 +1116,35 @@
case 'd':
/* New delimiter. */
/* Interpret -d '' to mean `use the NUL byte as the delimiter.' */
@ -3977,7 +3979,7 @@
break;
case OUTPUT_DELIMITER_OPTION:
@@ -804,6 +1156,7 @@
@@ -805,6 +1157,7 @@
break;
case 'n':
@ -3985,7 +3987,7 @@
break;
case 's':
@@ -826,7 +1179,7 @@
@@ -827,7 +1180,7 @@
if (operating_mode == undefined_mode)
FATAL_ERROR (_("you must specify a list of bytes, characters, or fields"));
@ -3994,7 +3996,7 @@
FATAL_ERROR (_("an input delimiter may be specified only\
when operating on fields"));
@@ -853,15 +1206,34 @@
@@ -854,15 +1207,34 @@
}
if (!delim_specified)

243
coreutils-selinux.patch
View File

@ -1,5 +1,5 @@
--- coreutils-6.7/tests/help-version.selinux 2007-01-09 18:47:03.000000000 +0000
+++ coreutils-6.7/tests/help-version 2007-01-09 18:47:04.000000000 +0000
--- coreutils-6.8+/tests/help-version.selinux 2007-03-01 15:52:06.000000000 +0000
+++ coreutils-6.8+/tests/help-version 2007-03-01 15:52:06.000000000 +0000
@@ -72,6 +72,8 @@
# Skip `test'; it doesn't accept --help or --version.
@ -18,9 +18,9 @@
rm -rf $tmp_in $tmp_in2 $tmp_dir $tmp_out
echo > $tmp_in
--- coreutils-6.7/src/ls.c.selinux 2006-11-27 10:25:51.000000000 +0000
+++ coreutils-6.7/src/ls.c 2007-01-10 14:01:08.000000000 +0000
@@ -110,6 +110,18 @@
--- coreutils-6.8+/src/ls.c.selinux 2007-03-01 06:51:46.000000000 +0000
+++ coreutils-6.8+/src/ls.c 2007-03-01 15:53:13.000000000 +0000
@@ -111,6 +111,18 @@
#define AUTHORS "Richard Stallman", "David MacKenzie"
@ -39,7 +39,7 @@
#define obstack_chunk_alloc malloc
#define obstack_chunk_free free
@@ -132,7 +144,8 @@
@@ -133,7 +145,8 @@
symbolic_link,
sock,
whiteout,
@ -49,7 +49,7 @@
};
/* Display letters and indicators for each filetype.
@@ -175,6 +188,10 @@
@@ -177,6 +190,10 @@
/* For long listings, true if the file has an access control list. */
bool have_acl;
#endif
@ -60,7 +60,7 @@
};
#if USE_ACL
@@ -245,6 +262,9 @@
@@ -247,6 +264,9 @@
static void sort_files (void);
static void parse_ls_color (void);
void usage (int status);
@ -70,7 +70,7 @@
/* The name this program was run with. */
char *program_name;
@@ -353,7 +373,11 @@
@@ -360,7 +380,11 @@
one_per_line, /* -1 */
many_per_line, /* -C */
horizontal, /* -x */
@ -83,7 +83,7 @@
};
static enum format format;
@@ -734,6 +758,11 @@
@@ -741,6 +765,11 @@
SHOW_CONTROL_CHARS_OPTION,
SI_OPTION,
SORT_OPTION,
@ -95,7 +95,7 @@
TIME_OPTION,
TIME_STYLE_OPTION
};
@@ -780,6 +809,11 @@
@@ -787,6 +816,11 @@
{"time-style", required_argument, NULL, TIME_STYLE_OPTION},
{"color", optional_argument, NULL, COLOR_OPTION},
{"block-size", required_argument, NULL, BLOCK_SIZE_OPTION},
@ -107,7 +107,7 @@
{"author", no_argument, NULL, AUTHOR_OPTION},
{GETOPT_HELP_OPTION_DECL},
{GETOPT_VERSION_OPTION_DECL},
@@ -789,12 +823,19 @@
@@ -796,12 +830,19 @@
static char const *const format_args[] =
{
"verbose", "long", "commas", "horizontal", "across",
@ -128,7 +128,7 @@
};
ARGMATCH_VERIFY (format_args, format_types);
@@ -1218,6 +1259,9 @@
@@ -1246,6 +1287,9 @@
format_needs_stat = sort_type == sort_time || sort_type == sort_size
|| format == long_format
@ -138,7 +138,7 @@
|| print_block_size;
format_needs_type = (! format_needs_stat
&& (recursive
@@ -1248,7 +1292,7 @@
@@ -1276,7 +1320,7 @@
}
else
do
@ -146,8 +146,8 @@
+ gobble_file (argv[i++], command_line, NOT_AN_INODE_NUMBER, true, "");
while (i < argc);
if (files_index)
@@ -1411,6 +1455,9 @@
if (cwd_n_used)
@@ -1439,6 +1483,9 @@
ignore_mode = IGNORE_DEFAULT;
ignore_patterns = NULL;
hide_patterns = NULL;
@ -157,7 +157,7 @@
/* FIXME: put this in a function. */
{
@@ -1486,7 +1533,7 @@
@@ -1514,7 +1561,7 @@
}
while ((c = getopt_long (argc, argv,
@ -166,7 +166,7 @@
long_options, NULL)) != -1)
{
switch (c)
@@ -1609,6 +1656,13 @@
@@ -1637,6 +1684,13 @@
format = horizontal;
break;
@ -180,7 +180,7 @@
case 'A':
if (ignore_mode == IGNORE_DEFAULT)
ignore_mode = IGNORE_DOT_AND_DOTDOT;
@@ -1789,6 +1843,25 @@
@@ -1817,6 +1871,25 @@
case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
@ -206,20 +206,21 @@
default:
usage (LS_FAILURE);
}
@@ -2485,6 +2558,12 @@
@@ -2514,6 +2587,13 @@
for (i = 0; i < cwd_n_used; i++)
{
free (files[i].name);
free (files[i].linkname);
struct fileinfo *f = sorted_file[i];
+#ifdef WITH_SELINUX
+ if (files[i].scontext) {
+ freecon (files[i].scontext);
+ files[i].scontext=NULL;
+ }
+#endif
+ if (f->scontext)
+ {
+ freecon (f->scontext);
+ f->scontext = NULL;
+ }
+#endif /* SELINUX */
free (f->name);
free (f->linkname);
}
files_index = 0;
@@ -2527,6 +2606,9 @@
@@ -2558,6 +2638,9 @@
memset (f, '\0', sizeof *f);
f->stat.st_ino = inode;
f->filetype = type;
@ -229,7 +230,7 @@
if (command_line_arg
|| format_needs_stat
@@ -2574,6 +2656,11 @@
@@ -2606,6 +2689,11 @@
{
case DEREF_ALWAYS:
err = stat (absolute_name, &f->stat);
@ -241,7 +242,7 @@
break;
case DEREF_COMMAND_LINE_ARGUMENTS:
@@ -2582,6 +2669,11 @@
@@ -2614,6 +2702,11 @@
{
bool need_lstat;
err = stat (absolute_name, &f->stat);
@ -253,7 +254,7 @@
if (dereference == DEREF_COMMAND_LINE_ARGUMENTS)
break;
@@ -2600,6 +2692,11 @@
@@ -2632,6 +2725,11 @@
default: /* DEREF_NEVER */
err = lstat (absolute_name, &f->stat);
@ -265,7 +266,7 @@
break;
}
@@ -2622,7 +2719,11 @@
@@ -2654,7 +2752,11 @@
f->stat_ok = true;
#if USE_ACL
@ -278,16 +279,16 @@
{
int n = file_has_acl (absolute_name, &f->stat);
f->have_acl = (0 < n);
@@ -3158,6 +3259,16 @@
@@ -3207,6 +3309,16 @@
DIRED_PUTCHAR ('\n');
}
break;
+
+#ifdef WITH_SELINUX
+ case security_format:
+ for (i = 0; i < files_index; i++)
+ for (i = 0; i < cwd_n_used; i++)
+ {
+ print_scontext_format (files + i);
+ print_scontext_format (sorted_file[i]);
+ DIRED_PUTCHAR ('\n');
+ }
+ break;
@ -295,7 +296,7 @@
}
}
@@ -3412,6 +3523,15 @@
@@ -3461,6 +3573,15 @@
The latter is wrong when nlink_width is zero. */
p += strlen (p);
@ -311,7 +312,7 @@
DIRED_INDENT ();
if (print_owner | print_group | print_author)
@@ -4351,6 +4471,16 @@
@@ -4405,6 +4526,16 @@
-X sort alphabetically by entry extension\n\
-1 list one file per line\n\
"), stdout);
@ -328,7 +329,7 @@
fputs (HELP_OPTION_DESCRIPTION, stdout);
fputs (VERSION_OPTION_DESCRIPTION, stdout);
fputs (_("\n\
@@ -4374,3 +4504,70 @@
@@ -4428,3 +4559,70 @@
}
exit (status);
}
@ -399,8 +400,8 @@
+ }
+}
+#endif
--- coreutils-6.7/src/cp.c.selinux 2006-12-06 11:04:22.000000000 +0000
+++ coreutils-6.7/src/cp.c 2007-01-09 18:47:04.000000000 +0000
--- coreutils-6.8+/src/cp.c.selinux 2007-02-04 09:52:39.000000000 +0000
+++ coreutils-6.8+/src/cp.c 2007-03-01 15:52:06.000000000 +0000
@@ -51,6 +51,11 @@
#define AUTHORS "Torbjorn Granlund", "David MacKenzie", "Jim Meyering"
@ -441,7 +442,7 @@
"), stdout);
fputs (HELP_OPTION_DESCRIPTION, stdout);
fputs (VERSION_OPTION_DESCRIPTION, stdout);
@@ -736,6 +748,11 @@
@@ -750,6 +762,11 @@
x->preserve_mode = false;
x->preserve_timestamps = false;
@ -453,7 +454,7 @@
x->require_preserve = false;
x->recursive = false;
x->sparse_mode = SPARSE_AUTO;
@@ -763,18 +780,19 @@
@@ -777,18 +794,19 @@
PRESERVE_TIMESTAMPS,
PRESERVE_OWNERSHIP,
PRESERVE_LINK,
@ -475,7 +476,7 @@
};
ARGMATCH_VERIFY (preserve_args, preserve_vals);
@@ -810,11 +828,16 @@
@@ -824,11 +842,16 @@
x->preserve_links = on_off;
break;
@ -492,7 +493,7 @@
break;
default:
@@ -839,6 +862,9 @@
@@ -853,6 +876,9 @@
bool copy_contents = false;
char *target_directory = NULL;
bool no_target_directory = false;
@ -502,7 +503,7 @@
initialize_main (&argc, &argv);
program_name = argv[0];
@@ -854,7 +880,11 @@
@@ -868,7 +894,11 @@
we'll actually use backup_suffix_string. */
backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX");
@ -514,7 +515,7 @@
long_opts, NULL))
!= -1)
{
@@ -865,12 +895,13 @@
@@ -879,12 +909,13 @@
sparse_type_string, sparse_type);
break;
@ -529,7 +530,7 @@
x.require_preserve = true;
x.recursive = true;
break;
@@ -945,6 +976,36 @@
@@ -959,6 +990,36 @@
case 'R':
x.recursive = true;
break;
@ -566,9 +567,9 @@
case REPLY_OPTION: /* Deprecated */
x.interactive = XARGMATCH ("--reply", optarg,
--- coreutils-6.7/src/Makefile.am.selinux 2007-01-09 18:47:04.000000000 +0000
+++ coreutils-6.7/src/Makefile.am 2007-01-09 18:47:04.000000000 +0000
@@ -20,14 +20,14 @@
--- coreutils-6.8+/src/Makefile.am.selinux 2007-03-01 15:52:06.000000000 +0000
+++ coreutils-6.8+/src/Makefile.am 2007-03-01 15:52:06.000000000 +0000
@@ -19,14 +19,14 @@
EXTRA_PROGRAMS = chroot df hostid nice pinky stty su runuser uname uptime users who
bin_SCRIPTS = groups
@ -585,7 +586,7 @@
test true tty whoami yes \
base64 \
$(OPTIONAL_BIN_PROGS) $(DF_PROG)
@@ -61,9 +61,9 @@
@@ -60,9 +60,9 @@
LDADD = ../lib/libcoreutils.a $(LIBINTL) ../lib/libcoreutils.a
# for eaccess in lib/euidaccess.c.
@ -598,7 +599,7 @@
pathchk_LDADD = $(LDADD) $(LIB_EACCESS)
rm_LDADD = $(LDADD) $(LIB_EACCESS)
test_LDADD = $(LDADD) $(LIB_EACCESS)
@@ -72,12 +72,19 @@
@@ -71,12 +71,19 @@
# for clock_gettime and fdatasync
dd_LDADD = $(LDADD) $(LIB_GETHRXTIME) $(LIB_FDATASYNC)
@ -621,8 +622,8 @@
## If necessary, add -lm to resolve use of pow in lib/strtod.c.
sort_LDADD = $(LDADD) $(POW_LIB) $(LIB_GETHRXTIME)
--- coreutils-6.7/src/copy.h.selinux 2006-12-06 11:04:22.000000000 +0000
+++ coreutils-6.7/src/copy.h 2007-01-09 18:47:05.000000000 +0000
--- coreutils-6.8+/src/copy.h.selinux 2007-01-30 07:19:49.000000000 +0000
+++ coreutils-6.8+/src/copy.h 2007-03-01 15:52:06.000000000 +0000
@@ -127,6 +127,10 @@
bool preserve_ownership;
bool preserve_mode;
@ -634,8 +635,8 @@
/* Enabled for mv, and for cp by the --preserve=links option.
If true, attempt to preserve in the destination files any
--- /dev/null 2007-01-10 09:33:30.042789464 +0000
+++ coreutils-6.7/src/chcon.c 2007-01-09 18:47:05.000000000 +0000
--- /dev/null 2007-03-01 09:16:39.219409909 +0000
+++ coreutils-6.8+/src/chcon.c 2007-03-01 15:52:06.000000000 +0000
@@ -0,0 +1,421 @@
+/* chcontext -- change security context of a pathname */
+
@ -1058,8 +1059,8 @@
+ freecon(ref_context);
+ exit (errors);
+}
--- coreutils-6.7/src/mkdir.c.selinux 2006-10-22 17:54:15.000000000 +0100
+++ coreutils-6.7/src/mkdir.c 2007-01-09 18:47:05.000000000 +0000
--- coreutils-6.8+/src/mkdir.c.selinux 2007-01-14 15:41:28.000000000 +0000
+++ coreutils-6.8+/src/mkdir.c 2007-03-01 15:52:06.000000000 +0000
@@ -35,11 +35,18 @@
#define AUTHORS "David MacKenzie"
@ -1124,8 +1125,8 @@
case_GETOPT_HELP_CHAR;
case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
default:
--- coreutils-6.7/src/stat.c.selinux 2006-11-27 10:25:51.000000000 +0000
+++ coreutils-6.7/src/stat.c 2007-01-09 18:47:05.000000000 +0000
--- coreutils-6.8+/src/stat.c.selinux 2007-03-01 06:51:46.000000000 +0000
+++ coreutils-6.8+/src/stat.c 2007-03-01 15:52:06.000000000 +0000
@@ -55,6 +55,13 @@
# include <fs_info.h>
#endif
@ -1417,8 +1418,8 @@
exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
}
--- coreutils-6.7/src/mkfifo.c.selinux 2006-10-22 17:54:15.000000000 +0100
+++ coreutils-6.7/src/mkfifo.c 2007-01-09 18:47:05.000000000 +0000
--- coreutils-6.8+/src/mkfifo.c.selinux 2007-01-14 15:41:28.000000000 +0000
+++ coreutils-6.8+/src/mkfifo.c 2007-03-01 15:52:06.000000000 +0000
@@ -32,11 +32,18 @@
#define AUTHORS "David MacKenzie"
@ -1484,8 +1485,8 @@
case_GETOPT_HELP_CHAR;
case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
default:
--- coreutils-6.7/src/mknod.c.selinux 2006-10-22 17:54:15.000000000 +0100
+++ coreutils-6.7/src/mknod.c 2007-01-09 18:47:05.000000000 +0000
--- coreutils-6.8+/src/mknod.c.selinux 2007-01-14 15:41:28.000000000 +0000
+++ coreutils-6.8+/src/mknod.c 2007-03-01 15:52:06.000000000 +0000
@@ -36,8 +36,15 @@
/* The name this program was run with. */
char *program_name;
@ -1546,8 +1547,8 @@
case_GETOPT_HELP_CHAR;
case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
default:
--- coreutils-6.7/src/id.c.selinux 2007-01-09 18:47:04.000000000 +0000
+++ coreutils-6.7/src/id.c 2007-01-09 18:47:05.000000000 +0000
--- coreutils-6.8+/src/id.c.selinux 2007-03-01 15:52:06.000000000 +0000
+++ coreutils-6.8+/src/id.c 2007-03-01 15:52:06.000000000 +0000
@@ -37,6 +37,20 @@
int getugroups ();
@ -1678,8 +1679,8 @@
+ }
+#endif
}
--- coreutils-6.7/src/mv.c.selinux 2006-10-23 10:09:10.000000000 +0100
+++ coreutils-6.7/src/mv.c 2007-01-09 18:47:05.000000000 +0000
--- coreutils-6.8+/src/mv.c.selinux 2007-01-30 07:19:49.000000000 +0000
+++ coreutils-6.8+/src/mv.c 2007-03-01 15:52:06.000000000 +0000
@@ -33,6 +33,11 @@
#include "quote.h"
#include "remove.h"
@ -1714,8 +1715,8 @@
/* FIXME: consider not calling getenv for SIMPLE_BACKUP_SUFFIX unless
we'll actually use backup_suffix_string. */
backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX");
--- /dev/null 2007-01-10 09:33:30.042789464 +0000
+++ coreutils-6.7/src/runcon.c 2007-01-09 18:47:05.000000000 +0000
--- /dev/null 2007-03-01 09:16:39.219409909 +0000
+++ coreutils-6.8+/src/runcon.c 2007-03-01 15:52:06.000000000 +0000
@@ -0,0 +1,253 @@
+/*
+ * runcon [ context |
@ -1970,8 +1971,8 @@
+ }
+ return 1; /* can't reach this statement.... */
+}
--- coreutils-6.7/src/copy.c.selinux 2006-12-07 07:01:16.000000000 +0000
+++ coreutils-6.7/src/copy.c 2007-01-09 18:47:05.000000000 +0000
--- coreutils-6.8+/src/copy.c.selinux 2007-03-01 06:51:46.000000000 +0000
+++ coreutils-6.8+/src/copy.c 2007-03-01 15:52:06.000000000 +0000
@@ -53,6 +53,11 @@
#include "xreadlink.h"
#include "yesno.h"
@ -2015,7 +2016,7 @@
if (dest_desc < 0 && x->unlink_dest_after_failed_open)
{
if (unlink (dst_name) != 0)
@@ -1520,6 +1549,32 @@
@@ -1534,6 +1563,32 @@
In such cases, set this variable to zero. */
preserve_metadata = true;
@ -2048,7 +2049,7 @@
if (S_ISDIR (src_mode))
{
struct dir_list *dir;
@@ -1595,7 +1650,13 @@
@@ -1606,7 +1661,13 @@
/* Are we crossing a file system boundary? */
if (x->one_file_system && device != 0 && device != src_sb.st_dev)
@ -2063,7 +2064,7 @@
/* Copy the contents of the directory. */
@@ -1740,6 +1801,11 @@
@@ -1756,6 +1817,11 @@
}
}
@ -2075,7 +2076,7 @@
/* There's no need to preserve timestamps or permissions. */
preserve_metadata = false;
@@ -1873,6 +1939,11 @@
@@ -1889,6 +1955,11 @@
un_backup:
@ -2087,8 +2088,8 @@
/* We have failed to create the destination file.
If we've just added a dev/ino entry via the remember_copied
call above (i.e., unless we've just failed to create a hard link),
--- coreutils-6.7/src/install.c.selinux 2006-12-04 09:00:28.000000000 +0000
+++ coreutils-6.7/src/install.c 2007-01-09 18:47:05.000000000 +0000
--- coreutils-6.8+/src/install.c.selinux 2007-02-10 15:04:45.000000000 +0000
+++ coreutils-6.8+/src/install.c 2007-03-01 15:52:06.000000000 +0000
@@ -49,6 +49,43 @@
# include <sys/wait.h>
#endif
@ -2251,9 +2252,9 @@
fputs (HELP_OPTION_DESCRIPTION, stdout);
fputs (VERSION_OPTION_DESCRIPTION, stdout);
fputs (_("\
--- coreutils-6.7/configure.ac.selinux 2007-01-09 18:47:02.000000000 +0000
+++ coreutils-6.7/configure.ac 2007-01-09 18:47:05.000000000 +0000
@@ -46,6 +46,13 @@
--- coreutils-6.8+/configure.ac.selinux 2007-03-01 15:52:06.000000000 +0000
+++ coreutils-6.8+/configure.ac 2007-03-01 15:52:06.000000000 +0000
@@ -48,6 +48,13 @@
LIB_PAM="-ldl -lpam -lpam_misc"
AC_SUBST(LIB_PAM)])
@ -2267,8 +2268,8 @@
AC_CHECK_FUNCS(uname,
OPTIONAL_BIN_PROGS="$OPTIONAL_BIN_PROGS uname\$(EXEEXT)"
MAN="$MAN uname.1")
--- coreutils-6.7/man/stat.1.selinux 2006-12-07 22:45:45.000000000 +0000
+++ coreutils-6.7/man/stat.1 2007-01-09 18:47:05.000000000 +0000
--- coreutils-6.8+/man/stat.1.selinux 2007-03-01 07:05:38.000000000 +0000
+++ coreutils-6.8+/man/stat.1 2007-03-01 15:52:06.000000000 +0000
@@ -28,6 +28,9 @@
\fB\-t\fR, \fB\-\-terse\fR
print the information in terse form
@ -2289,15 +2290,15 @@
%D
Device number in hex
.TP
--- /dev/null 2007-01-10 09:33:30.042789464 +0000
+++ coreutils-6.7/man/chcon.x 2007-01-09 18:47:05.000000000 +0000
--- /dev/null 2007-03-01 09:16:39.219409909 +0000
+++ coreutils-6.8+/man/chcon.x 2007-03-01 15:52:06.000000000 +0000
@@ -0,0 +1,4 @@
+[NAME]
+chcon \- change file security context
+[DESCRIPTION]
+.\" Add any additional description here
--- /dev/null 2007-01-10 09:33:30.042789464 +0000
+++ coreutils-6.7/man/chcon.1 2007-01-09 18:47:05.000000000 +0000
--- /dev/null 2007-03-01 09:16:39.219409909 +0000
+++ coreutils-6.8+/man/chcon.1 2007-03-01 15:52:06.000000000 +0000
@@ -0,0 +1,64 @@
+.TH CHCON 1 "July 2003" "chcon (coreutils) 5.0" "User Commands"
+.SH NAME
@ -2363,9 +2364,9 @@
+.B info chcon
+.PP
+should give you access to the complete manual.
--- coreutils-6.7/man/dir.1.selinux 2006-12-07 22:45:41.000000000 +0000
+++ coreutils-6.7/man/dir.1 2007-01-09 18:47:05.000000000 +0000
@@ -204,6 +204,20 @@
--- coreutils-6.8+/man/dir.1.selinux 2007-03-01 07:05:37.000000000 +0000
+++ coreutils-6.8+/man/dir.1 2007-03-01 15:52:06.000000000 +0000
@@ -205,6 +205,20 @@
.TP
\fB\-1\fR
list one file per line
@ -2386,8 +2387,8 @@
.TP
\fB\-\-help\fR
display this help and exit
--- coreutils-6.7/man/mkfifo.1.selinux 2006-12-07 22:45:43.000000000 +0000
+++ coreutils-6.7/man/mkfifo.1 2007-01-09 18:47:05.000000000 +0000
--- coreutils-6.8+/man/mkfifo.1.selinux 2007-02-27 12:41:10.000000000 +0000
+++ coreutils-6.8+/man/mkfifo.1 2007-03-01 15:52:06.000000000 +0000
@@ -12,6 +12,9 @@
.PP
Mandatory arguments to long options are mandatory for short options too.
@ -2398,9 +2399,9 @@
\fB\-m\fR, \fB\-\-mode\fR=\fIMODE\fR
set file permission bits to MODE, not a=rw \- umask
.TP
--- coreutils-6.7/man/Makefile.am.selinux 2007-01-09 18:47:04.000000000 +0000
+++ coreutils-6.7/man/Makefile.am 2007-01-09 18:47:05.000000000 +0000
@@ -30,7 +30,7 @@
--- coreutils-6.8+/man/Makefile.am.selinux 2007-03-01 15:52:06.000000000 +0000
+++ coreutils-6.8+/man/Makefile.am 2007-03-01 15:52:06.000000000 +0000
@@ -29,7 +29,7 @@
shred.1 shuf.1 sleep.1 sort.1 split.1 stat.1 \
su.1 sum.1 sync.1 tac.1 tail.1 tee.1 test.1 touch.1 tr.1 true.1 tsort.1 \
tty.1 unexpand.1 uniq.1 unlink.1 vdir.1 wc.1 \
@ -2409,7 +2410,7 @@
optional_mans = \
chroot.1 hostid.1 nice.1 pinky.1 stty.1 uname.1 uptime.1 users.1 who.1
@@ -142,6 +142,8 @@
@@ -141,6 +141,8 @@
who.1: $(common_dep) $(srcdir)/who.x ../src/who.c
whoami.1: $(common_dep) $(srcdir)/whoami.x ../src/whoami.c
yes.1: $(common_dep) $(srcdir)/yes.x ../src/yes.c
@ -2418,8 +2419,8 @@
SUFFIXES = .x .1
--- coreutils-6.7/man/cp.1.selinux 2006-12-07 22:45:41.000000000 +0000
+++ coreutils-6.7/man/cp.1 2007-01-09 18:47:05.000000000 +0000
--- coreutils-6.8+/man/cp.1.selinux 2007-02-27 12:41:07.000000000 +0000
+++ coreutils-6.8+/man/cp.1 2007-03-01 15:52:06.000000000 +0000
@@ -57,7 +57,7 @@
.TP
\fB\-\-preserve\fR[=\fIATTR_LIST\fR]
@ -2439,8 +2440,8 @@
\fB\-\-version\fR
output version information and exit
.PP
--- coreutils-6.7/man/id.1.selinux 2006-12-07 22:45:42.000000000 +0000
+++ coreutils-6.7/man/id.1 2007-01-09 18:47:06.000000000 +0000
--- coreutils-6.8+/man/id.1.selinux 2007-02-27 12:41:09.000000000 +0000
+++ coreutils-6.8+/man/id.1 2007-03-01 15:52:06.000000000 +0000
@@ -13,6 +13,9 @@
\fB\-a\fR
ignore, for compatibility with other versions
@ -2451,8 +2452,8 @@
\fB\-g\fR, \fB\-\-group\fR
print only the effective group ID
.TP
--- /dev/null 2007-01-10 09:33:30.042789464 +0000
+++ coreutils-6.7/man/runcon.x 2007-01-09 18:47:06.000000000 +0000
--- /dev/null 2007-03-01 09:16:39.219409909 +0000
+++ coreutils-6.8+/man/runcon.x 2007-03-01 15:52:06.000000000 +0000
@@ -0,0 +1,14 @@
+[NAME]
+runcon \- run command with specified security context
@ -2468,8 +2469,8 @@
+.PP
+Note that only carefully-chosen contexts are likely to successfully
+run.
--- /dev/null 2007-01-10 09:33:30.042789464 +0000
+++ coreutils-6.7/man/runcon.1 2007-01-09 18:47:06.000000000 +0000
--- /dev/null 2007-03-01 09:16:39.219409909 +0000
+++ coreutils-6.8+/man/runcon.1 2007-03-01 15:52:06.000000000 +0000
@@ -0,0 +1,45 @@
+.TH RUNCON "1" "February 2005" "runcon (coreutils) 5.0" "selinux"
+.SH NAME
@ -2516,8 +2517,8 @@
+.PP
+Note that only carefully-chosen contexts are likely to successfully
+run.
--- coreutils-6.7/man/mknod.1.selinux 2006-12-07 22:45:43.000000000 +0000
+++ coreutils-6.7/man/mknod.1 2007-01-09 18:47:06.000000000 +0000
--- coreutils-6.8+/man/mknod.1.selinux 2007-02-27 12:41:10.000000000 +0000
+++ coreutils-6.8+/man/mknod.1 2007-03-01 15:52:06.000000000 +0000
@@ -12,6 +12,9 @@
.PP
Mandatory arguments to long options are mandatory for short options too.
@ -2528,9 +2529,9 @@
\fB\-m\fR, \fB\-\-mode\fR=\fIMODE\fR
set file permission bits to MODE, not a=rw \- umask
.TP
--- coreutils-6.7/man/ls.1.selinux 2006-12-07 22:45:42.000000000 +0000
+++ coreutils-6.7/man/ls.1 2007-01-09 18:47:06.000000000 +0000
@@ -204,6 +204,20 @@
--- coreutils-6.8+/man/ls.1.selinux 2007-03-01 07:05:38.000000000 +0000
+++ coreutils-6.8+/man/ls.1 2007-03-01 15:52:06.000000000 +0000
@@ -205,6 +205,20 @@
.TP
\fB\-1\fR
list one file per line
@ -2551,8 +2552,8 @@
.TP
\fB\-\-help\fR
display this help and exit
--- coreutils-6.7/man/mkdir.1.selinux 2006-12-07 22:45:43.000000000 +0000
+++ coreutils-6.7/man/mkdir.1 2007-01-09 18:47:06.000000000 +0000
--- coreutils-6.8+/man/mkdir.1.selinux 2007-02-27 12:41:10.000000000 +0000
+++ coreutils-6.8+/man/mkdir.1 2007-03-01 15:52:06.000000000 +0000
@@ -12,6 +12,8 @@
.PP
Mandatory arguments to long options are mandatory for short options too.
@ -2562,9 +2563,9 @@
\fB\-m\fR, \fB\-\-mode\fR=\fIMODE\fR
set file mode (as in chmod), not a=rwx \- umask
.TP
--- coreutils-6.7/man/vdir.1.selinux 2006-12-07 22:45:46.000000000 +0000
+++ coreutils-6.7/man/vdir.1 2007-01-09 18:47:06.000000000 +0000
@@ -204,6 +204,20 @@
--- coreutils-6.8+/man/vdir.1.selinux 2007-03-01 07:05:38.000000000 +0000
+++ coreutils-6.8+/man/vdir.1 2007-03-01 15:52:06.000000000 +0000
@@ -205,6 +205,20 @@
.TP
\fB\-1\fR
list one file per line
@ -2585,9 +2586,9 @@
.TP
\fB\-\-help\fR
display this help and exit
--- coreutils-6.7/man/install.1.selinux 2006-12-07 22:45:42.000000000 +0000
+++ coreutils-6.7/man/install.1 2007-01-09 18:47:06.000000000 +0000
@@ -66,6 +66,11 @@
--- coreutils-6.8+/man/install.1.selinux 2007-02-27 12:41:09.000000000 +0000
+++ coreutils-6.8+/man/install.1 2007-03-01 15:52:06.000000000 +0000
@@ -67,6 +67,11 @@
.TP
\fB\-v\fR, \fB\-\-verbose\fR
print the name of each directory as it is created
@ -2599,8 +2600,8 @@
.TP
\fB\-\-help\fR
display this help and exit
--- coreutils-6.7/README.selinux 2007-01-09 18:47:04.000000000 +0000
+++ coreutils-6.7/README 2007-01-09 18:47:06.000000000 +0000
--- coreutils-6.8+/README.selinux 2007-03-01 15:52:06.000000000 +0000
+++ coreutils-6.8+/README 2007-03-01 15:52:06.000000000 +0000
@@ -7,11 +7,11 @@
The programs that can be built with this package are:

14
coreutils.spec
View File

@ -1,12 +1,13 @@
Summary: The GNU core utilities: a set of tools commonly used in shell scripts
Name: coreutils
Version: 6.7
Release: 9%{?dist}
Version: 6.8
Release: 1%{?dist}
License: GPL
Group: System Environment/Base
Url: http://www.gnu.org/software/coreutils/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2
#Source0: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2
Source0: http://meyering.net/cu/%{name}-%{version}+-ss-2007-03-01.11.42.23+0.tar.gz
Source101: coreutils-DIR_COLORS
Source102: coreutils-DIR_COLORS.xterm
Source105: coreutils-colorls.sh
@ -39,6 +40,7 @@ Patch907: coreutils-5.2.1-runuser.patch
Patch908: coreutils-getgrouplist.patch
Patch912: coreutils-overflow.patch
Patch915: coreutils-split-pam.patch
Patch916: coreutils-getfacl-exit-code.patch
#SELINUX Patch
Patch950: coreutils-selinux.patch
@ -77,7 +79,7 @@ These are the GNU core utilities. This package is the combination of
the old GNU fileutils, sh-utils, and textutils packages.
%prep
%setup -q
%setup -q -n %{name}-%{version}+
# From upstream
@ -100,6 +102,7 @@ the old GNU fileutils, sh-utils, and textutils packages.
%patch908 -p1 -b .getgrouplist
%patch912 -p1 -b .overflow
%patch915 -p1 -b .splitl
%patch916 -p1 -b .getfacl-exit-code
#SELinux
%patch950 -p1 -b .selinux
@ -264,6 +267,9 @@ fi
/sbin/runuser
%changelog
* Thu Mar 1 2007 Tim Waugh <twaugh@redhat.com>
- 6.8+, in preparation for 6.9.
* Thu Feb 22 2007 Tim Waugh <twaugh@redhat.com> 6.7-9
- Use sed instead of perl for text replacement (bug #225655).
- Use install-info scriptlets from the guidelines (bug #225655).

2
sources
View File

@ -1 +1 @@
a16465d0856cd011a1acc1c21040b7f4 coreutils-6.7.tar.bz2
36b5190ccdde4d526ebb1efd42aedf6f coreutils-6.8+-ss-2007-03-01.11.42.23+0.tar.gz