From 99fa4770a25c2818609af257fb5aeab1521906b0 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 04:02:25 +0000 Subject: auto-import changelog data from coreutils-5.2.1-14.src.rpm Fri Jun 04 2004 Tim Waugh 5.2.1-14 - Fix selinux patch causing problems with ls --format=... (bug #125238). --- diff --git a/coreutils-selinux.patch b/coreutils-selinux.patch index 81a64ea..5a61e74 100644 --- a/coreutils-selinux.patch +++ b/coreutils-selinux.patch @@ -1713,8 +1713,8 @@ } exit (G_fail ? EXIT_FAILURE : EXIT_SUCCESS); ---- coreutils-5.2.1/src/ls.c.selinux 2004-04-09 10:37:41.233436968 -0400 -+++ coreutils-5.2.1/src/ls.c 2004-04-09 10:42:45.195227752 -0400 +--- coreutils-5.2.1/src/ls.c 2004-06-04 09:22:35.927057211 +0100 ++++ coreutils-5.2.1/src/ls.c 2004-06-04 09:55:05.010506573 +0100 @@ -121,6 +121,18 @@ #define AUTHORS "Richard Stallman", "David MacKenzie" @@ -1792,19 +1792,20 @@ /* The name the program was run with, stripped of any leading path. */ char *program_name; -@@ -354,7 +376,10 @@ +@@ -354,7 +376,11 @@ one_per_line, /* -1 */ many_per_line, /* -C */ horizontal, /* -x */ - with_commas /* -m */ ++ with_commas, /* -m */ +#ifdef WITH_SELINUX + security_format, /* -Z */ +#endif -+ with_commas /* -m */ ++ invalid_format }; static enum format format; -@@ -679,6 +704,11 @@ +@@ -679,6 +705,11 @@ SHOW_CONTROL_CHARS_OPTION, SI_OPTION, SORT_OPTION, @@ -1816,7 +1817,7 @@ TIME_OPTION, TIME_STYLE_OPTION }; -@@ -722,6 +752,11 @@ +@@ -722,6 +753,11 @@ {"time-style", required_argument, 0, TIME_STYLE_OPTION}, {"color", optional_argument, 0, COLOR_OPTION}, {"block-size", required_argument, 0, BLOCK_SIZE_OPTION}, @@ -1828,7 +1829,7 @@ {"author", no_argument, 0, AUTHOR_OPTION}, {GETOPT_HELP_OPTION_DECL}, {GETOPT_VERSION_OPTION_DECL}, -@@ -731,12 +766,19 @@ +@@ -731,13 +767,21 @@ static char const *const format_args[] = { "verbose", "long", "commas", "horizontal", "across", @@ -1843,13 +1844,16 @@ static enum format const format_types[] = { long_format, long_format, with_commas, horizontal, horizontal, +- many_per_line, one_per_line ++ many_per_line, one_per_line, +#ifdef WITH_SELINUX + security_format, +#endif - many_per_line, one_per_line ++ invalid_format }; -@@ -1101,6 +1143,9 @@ + static char const *const sort_args[] = +@@ -1101,6 +1145,9 @@ format_needs_stat = sort_type == sort_time || sort_type == sort_size || format == long_format @@ -1859,7 +1863,7 @@ || dereference == DEREF_ALWAYS || print_block_size || print_inode; format_needs_type = (format_needs_stat == 0 -@@ -1125,7 +1170,7 @@ +@@ -1125,7 +1172,7 @@ for (; i < argc; i++) { @@ -1868,7 +1872,7 @@ } if (dir_defaulted) -@@ -1223,6 +1268,11 @@ +@@ -1223,6 +1270,11 @@ /* Record whether there is an option specifying sort type. */ int sort_type_specified = 0; @@ -1880,7 +1884,7 @@ qmark_funny_chars = 0; /* initialize all switches to default settings */ -@@ -1273,6 +1323,9 @@ +@@ -1273,6 +1325,9 @@ all_files = 0; really_all_files = 0; ignore_patterns = 0; @@ -1890,7 +1894,7 @@ /* FIXME: put this in a function. */ { -@@ -1350,7 +1403,7 @@ +@@ -1350,7 +1405,7 @@ } while ((c = getopt_long (argc, argv, @@ -1899,7 +1903,7 @@ long_options, NULL)) != -1) { switch (c) -@@ -1470,6 +1523,13 @@ +@@ -1470,6 +1525,13 @@ format = horizontal; break; @@ -1913,7 +1917,7 @@ case 'A': really_all_files = 0; all_files = 1; -@@ -1637,6 +1697,25 @@ +@@ -1637,6 +1699,25 @@ case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); @@ -1939,7 +1943,7 @@ default: usage (EXIT_FAILURE); } -@@ -2300,6 +2379,12 @@ +@@ -2300,6 +2381,12 @@ free (files[i].name); if (files[i].linkname) free (files[i].linkname); @@ -1952,7 +1956,7 @@ } files_index = 0; -@@ -2336,11 +2421,14 @@ +@@ -2336,11 +2423,14 @@ f->linkname = 0; f->linkmode = 0; f->linkok = 0; @@ -1968,7 +1972,7 @@ /* FIXME: remove this disjunct. I don't think we care about symlinks here, but for now -@@ -2373,6 +2461,11 @@ +@@ -2373,6 +2463,11 @@ { case DEREF_ALWAYS: err = stat (path, &f->stat); @@ -1980,7 +1984,7 @@ break; case DEREF_COMMAND_LINE_ARGUMENTS: -@@ -2381,6 +2474,11 @@ +@@ -2381,6 +2476,11 @@ { int need_lstat; err = stat (path, &f->stat); @@ -1992,7 +1996,7 @@ if (dereference == DEREF_COMMAND_LINE_ARGUMENTS) break; -@@ -2399,13 +2497,33 @@ +@@ -2399,13 +2499,33 @@ default: /* DEREF_NEVER */ err = lstat (path, &f->stat); @@ -2029,7 +2033,7 @@ return 0; } -@@ -2893,6 +3011,16 @@ +@@ -2893,6 +3013,16 @@ DIRED_PUTCHAR ('\n'); } break; @@ -2046,7 +2050,7 @@ } } -@@ -2974,9 +3102,9 @@ +@@ -2974,9 +3104,9 @@ WIDTH. */ static void @@ -2058,7 +2062,7 @@ if (name) printf ("%-*s ", width, name); else -@@ -2988,9 +3116,9 @@ +@@ -2988,9 +3118,9 @@ /* Likewise, for groups. */ static void @@ -2070,7 +2074,7 @@ if (name) printf ("%-*s ", width, name); else -@@ -3095,7 +3223,7 @@ +@@ -3095,7 +3225,7 @@ { char hbuf[INT_BUFSIZE_BOUND (uintmax_t)]; sprintf (p, "%*s ", inode_number_width, @@ -2079,7 +2083,7 @@ p += inode_number_width + 1; } -@@ -3103,8 +3231,10 @@ +@@ -3103,8 +3233,10 @@ { char hbuf[LONGEST_HUMAN_READABLE + 1]; sprintf (p, "%*s ", block_size_width, @@ -2092,7 +2096,7 @@ p += block_size_width + 1; } -@@ -3113,10 +3243,18 @@ +@@ -3113,10 +3245,18 @@ { char hbuf[INT_BUFSIZE_BOUND (uintmax_t)]; sprintf (p, "%s %*s ", modebuf, nlink_width, @@ -2112,7 +2116,7 @@ DIRED_INDENT (); if (print_owner | print_group | print_author) -@@ -3124,18 +3262,19 @@ +@@ -3124,18 +3264,19 @@ DIRED_FPUTS (buf, stdout, p - buf); if (print_owner) @@ -2136,7 +2140,7 @@ { char majorbuf[INT_BUFSIZE_BOUND (uintmax_t)]; char minorbuf[INT_BUFSIZE_BOUND (uintmax_t)]; -@@ -3153,13 +3292,15 @@ +@@ -3153,13 +3294,15 @@ char hbuf[LONGEST_HUMAN_READABLE + 1]; uintmax_t size = unsigned_file_size (f->stat.st_size); sprintf (p, "%*s ", file_size_width, @@ -2155,7 +2159,7 @@ { time_t six_months_ago; int recent; -@@ -3214,15 +3355,17 @@ +@@ -3214,15 +3357,17 @@ print it as a huge integer number of seconds. */ char hbuf[INT_BUFSIZE_BOUND (intmax_t)]; sprintf (p, "%*s ", long_time_expected_width (), @@ -2177,7 +2181,7 @@ if (f->filetype == symbolic_link) { -@@ -3230,7 +3373,7 @@ +@@ -3230,7 +3375,7 @@ { DIRED_FPUTS_LITERAL (" -> ", stdout); print_name_with_quoting (f->linkname, f->linkmode, f->linkok - 1, @@ -2186,7 +2190,7 @@ if (indicator_style != none) print_type_indicator (f->linkmode); } -@@ -3412,10 +3555,10 @@ +@@ -3412,10 +3557,10 @@ static void print_name_with_quoting (const char *p, mode_t mode, int linkok, @@ -2199,7 +2203,7 @@ if (stack) PUSH_CURRENT_DIRED_POS (stack); -@@ -3460,7 +3603,8 @@ +@@ -3460,7 +3605,8 @@ human_readable (ST_NBLOCKS (f->stat), buf, human_output_opts, ST_NBLOCKSIZE, output_block_size)); @@ -2209,7 +2213,7 @@ if (indicator_style != none) print_type_indicator (f->stat.st_mode); -@@ -3499,7 +3643,8 @@ +@@ -3499,7 +3645,8 @@ } static void @@ -2219,7 +2223,7 @@ { int type = C_FILE; struct color_ext_type *ext; /* Color extension */ -@@ -3536,6 +3681,8 @@ +@@ -3536,6 +3683,8 @@ type = C_CHR; else if (S_ISDOOR (mode)) type = C_DOOR; @@ -2228,7 +2232,7 @@ if ((type == C_FILE) && ((mode & S_ISUID) != 0)) type = C_UID; -@@ -4037,6 +4184,16 @@ +@@ -4037,6 +4186,16 @@ -X sort alphabetically by entry extension\n\ -1 list one file per line\n\ "), stdout); @@ -2245,10 +2249,7 @@ fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); fputs (_("\n\ -@@ -4055,3 +4212,83 @@ - } - exit (status); - } +@@ -4057,0 +4217,80 @@ + +#ifdef WITH_SELINUX + diff --git a/coreutils.spec b/coreutils.spec index 7902592..bb39cb0 100644 --- a/coreutils.spec +++ b/coreutils.spec @@ -4,7 +4,7 @@ Summary: The GNU core utilities: a set of tools commonly used in shell scripts Name: coreutils Version: 5.2.1 -Release: 13 +Release: 14 License: GPL Group: System Environment/Base Url: ftp://alpha.gnu.org/gnu/coreutils/ @@ -242,6 +242,9 @@ fi %_sbindir/chroot %changelog +* Fri Jun 4 2004 Tim Waugh 5.2.1-14 +- Fix selinux patch causing problems with ls --format=... (bug #125238). + * Thu Jun 3 2004 Dan Walsh 5.2.1-13 - Change su to use pam_selinux open and pam_selinux close