rpms/coreutils/FC-6 coreutils-selinux.patch, 1.29, 1.30 coreutils.spec, 1.152, 1.153 coreutils-dangling-full-path.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Apr 17 11:43:09 UTC 2007
Author: twaugh
Update of /cvs/dist/rpms/coreutils/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv8955
Modified Files:
coreutils-selinux.patch coreutils.spec
Removed Files:
coreutils-dangling-full-path.patch
Log Message:
* Tue Apr 17 2007 Tim Waugh <twaugh at redhat.com> 5.97-12.5
- Fixed dangling symlinks fix (bug #230052, bug #236311).
- Resolves: rhbz#230052 rhbz#236311
coreutils-selinux.patch:
README | 4
config.hin | 33 +---
configure.ac | 7
man/Makefile.am | 4
man/chcon.1 | 64 ++++++++
man/chcon.x | 4
man/cp.1 | 5
man/dir.1 | 14 +
man/id.1 | 3
man/install.1 | 5
man/ls.1 | 14 +
man/mkdir.1 | 2
man/mkfifo.1 | 3
man/mknod.1 | 3
man/runcon.1 | 45 +++++
man/runcon.x | 14 +
man/stat.1 | 6
man/vdir.1 | 14 +
src/Makefile.am | 23 +-
src/chcon.c | 421 +++++++++++++++++++++++++++++++++++++++++++++++++++++
src/copy.c | 73 +++++++++
src/copy.h | 4
src/cp.c | 67 ++++++++
src/id.c | 68 ++++++++
src/install.c | 99 ++++++++++++
src/ls.c | 296 ++++++++++++++++++++++++++++++++-----
src/mkdir.c | 30 +++
src/mkfifo.c | 29 +++
src/mknod.c | 30 +++
src/mv.c | 13 +
src/runcon.c | 253 +++++++++++++++++++++++++++++++
src/stat.c | 146 ++++++++++++++----
tests/help-version | 4
33 files changed, 1699 insertions(+), 101 deletions(-)
Index: coreutils-selinux.patch
===================================================================
RCS file: /cvs/dist/rpms/coreutils/FC-6/coreutils-selinux.patch,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- coreutils-selinux.patch 11 Apr 2007 18:31:15 -0000 1.29
+++ coreutils-selinux.patch 17 Apr 2007 11:43:06 -0000 1.30
@@ -1,5 +1,5 @@
---- coreutils-5.97/tests/help-version.selinux 2007-04-11 18:15:32.000000000 +0100
-+++ coreutils-5.97/tests/help-version 2007-04-11 18:15:32.000000000 +0100
+--- coreutils-5.97/tests/help-version.selinux 2007-04-17 12:34:48.000000000 +0100
++++ coreutils-5.97/tests/help-version 2007-04-17 12:34:48.000000000 +0100
@@ -46,6 +46,8 @@
# Skip `test'; it doesn't accept --help or --version.
@@ -18,8 +18,8 @@
rm -rf $tmp_in $tmp_in2 $tmp_dir $tmp_out
echo > $tmp_in
---- coreutils-5.97/src/ls.c.selinux 2007-04-11 18:15:32.000000000 +0100
-+++ coreutils-5.97/src/ls.c 2007-04-11 18:16:16.000000000 +0100
+--- coreutils-5.97/src/ls.c.selinux 2007-04-17 12:34:48.000000000 +0100
++++ coreutils-5.97/src/ls.c 2007-04-17 12:36:02.000000000 +0100
@@ -135,6 +135,18 @@
#define AUTHORS "Richard Stallman", "David MacKenzie"
@@ -259,10 +259,10 @@
|| (format_needs_type
- && (type == unknown
+ && (type == unknown || type == command_line
- /* --indicator-style=classify (aka -F)
- requires that we stat each regular file
- to see if it's executable. */
-@@ -2541,6 +2625,11 @@
+
+ /* FIXME: remove this disjunct.
+ I don't think we care about symlinks here, but for now
+@@ -2547,6 +2631,11 @@
{
case DEREF_ALWAYS:
err = stat (absolute_name, &f->stat);
@@ -274,7 +274,7 @@
break;
case DEREF_COMMAND_LINE_ARGUMENTS:
-@@ -2549,6 +2638,11 @@
+@@ -2555,6 +2644,11 @@
{
bool need_lstat;
err = stat (absolute_name, &f->stat);
@@ -286,7 +286,7 @@
if (dereference == DEREF_COMMAND_LINE_ARGUMENTS)
break;
-@@ -2567,17 +2661,41 @@
+@@ -2573,17 +2667,41 @@
default: /* DEREF_NEVER */
err = lstat (absolute_name, &f->stat);
@@ -315,7 +315,7 @@
+ f->filetype = type;
+ memset (&f->stat, '\0', sizeof (f->stat));
+
-+ f->name = xstrdup (absolute_name);
++ f->name = xstrdup (name);
+ files_index++;
+
return 0;
@@ -331,7 +331,7 @@
{
int n = file_has_acl (absolute_name, &f->stat);
f->have_acl = (0 < n);
-@@ -3066,6 +3184,16 @@
+@@ -3072,6 +3190,16 @@
DIRED_PUTCHAR ('\n');
}
break;
@@ -348,7 +348,7 @@
}
}
-@@ -3173,17 +3301,19 @@
+@@ -3179,17 +3307,19 @@
WIDTH. */
static void
@@ -372,7 +372,7 @@
}
/* Return the number of columns that format_user_or_group will print. */
-@@ -3273,7 +3403,7 @@
+@@ -3279,7 +3409,7 @@
{
char hbuf[INT_BUFSIZE_BOUND (uintmax_t)];
sprintf (p, "%*s ", inode_number_width,
@@ -381,7 +381,7 @@
p += inode_number_width + 1;
}
-@@ -3281,8 +3411,10 @@
+@@ -3287,8 +3417,10 @@
{
char hbuf[LONGEST_HUMAN_READABLE + 1];
char const *blocks =
@@ -394,7 +394,7 @@
int pad;
for (pad = block_size_width - mbswidth (blocks, 0); 0 < pad; pad--)
*p++ = ' ';
-@@ -3296,10 +3428,18 @@
+@@ -3302,10 +3434,18 @@
{
char hbuf[INT_BUFSIZE_BOUND (uintmax_t)];
sprintf (p, "%s %*s ", modebuf, nlink_width,
@@ -414,7 +414,7 @@
DIRED_INDENT ();
if (print_owner | print_group | print_author)
-@@ -3307,18 +3447,19 @@
+@@ -3313,18 +3453,19 @@
DIRED_FPUTS (buf, stdout, p - buf);
if (print_owner)
@@ -438,7 +438,7 @@
{
char majorbuf[INT_BUFSIZE_BOUND (uintmax_t)];
char minorbuf[INT_BUFSIZE_BOUND (uintmax_t)];
-@@ -3336,8 +3477,10 @@
+@@ -3342,8 +3483,10 @@
{
char hbuf[LONGEST_HUMAN_READABLE + 1];
char const *size =
@@ -451,7 +451,7 @@
int pad;
for (pad = file_size_width - mbswidth (size, 0); 0 < pad; pad--)
*p++ = ' ';
-@@ -3350,7 +3493,7 @@
+@@ -3356,7 +3499,7 @@
s = 0;
*p = '\1';
@@ -460,7 +460,7 @@
{
time_t six_months_ago;
bool recent;
-@@ -3397,15 +3540,17 @@
+@@ -3403,15 +3546,17 @@
print it as a huge integer number of seconds. */
char hbuf[INT_BUFSIZE_BOUND (intmax_t)];
sprintf (p, "%*s ", long_time_expected_width (),
@@ -482,7 +482,7 @@
if (f->filetype == symbolic_link)
{
-@@ -3413,7 +3558,7 @@
+@@ -3419,7 +3564,7 @@
{
DIRED_FPUTS_LITERAL (" -> ", stdout);
print_name_with_quoting (f->linkname, f->linkmode, f->linkok - 1,
@@ -491,7 +491,7 @@
if (indicator_style != none)
print_type_indicator (f->linkmode);
}
-@@ -3595,10 +3740,10 @@
+@@ -3601,10 +3746,10 @@
static void
print_name_with_quoting (const char *p, mode_t mode, int linkok,
@@ -504,7 +504,7 @@
if (stack)
PUSH_CURRENT_DIRED_POS (stack);
-@@ -3646,7 +3791,8 @@
+@@ -3652,7 +3797,8 @@
human_readable (ST_NBLOCKS (f->stat), buf, human_output_opts,
ST_NBLOCKSIZE, output_block_size));
@@ -514,7 +514,7 @@
if (indicator_style != none)
print_type_indicator (f->stat.st_mode);
-@@ -3687,7 +3833,8 @@
+@@ -3693,7 +3839,8 @@
}
static void
@@ -524,7 +524,7 @@
{
int type = C_FILE;
struct color_ext_type *ext; /* Color extension */
-@@ -3726,6 +3873,8 @@
+@@ -3732,6 +3879,8 @@
type = C_CHR;
else if (S_ISDOOR (mode))
type = C_DOOR;
@@ -533,7 +533,7 @@
if (type == C_FILE)
{
-@@ -4215,6 +4364,16 @@
+@@ -4221,6 +4370,16 @@
-X sort alphabetically by entry extension\n\
-1 list one file per line\n\
"), stdout);
@@ -550,7 +550,7 @@
fputs (HELP_OPTION_DESCRIPTION, stdout);
fputs (VERSION_OPTION_DESCRIPTION, stdout);
fputs (_("\n\
-@@ -4238,3 +4397,70 @@
+@@ -4244,3 +4403,70 @@
}
exit (status);
}
@@ -621,8 +621,8 @@
+ }
+}
+#endif
---- coreutils-5.97/src/cp.c.selinux 2007-04-11 18:15:32.000000000 +0100
-+++ coreutils-5.97/src/cp.c 2007-04-11 18:15:32.000000000 +0100
+--- coreutils-5.97/src/cp.c.selinux 2007-04-17 12:34:48.000000000 +0100
++++ coreutils-5.97/src/cp.c 2007-04-17 12:34:48.000000000 +0100
@@ -52,6 +52,11 @@
#define AUTHORS "Torbjorn Granlund", "David MacKenzie", "Jim Meyering"
@@ -788,8 +788,8 @@
case REPLY_OPTION: /* Deprecated */
x.interactive = XARGMATCH ("--reply", optarg,
---- coreutils-5.97/src/Makefile.am.selinux 2007-04-11 18:15:32.000000000 +0100
-+++ coreutils-5.97/src/Makefile.am 2007-04-11 18:15:32.000000000 +0100
+--- coreutils-5.97/src/Makefile.am.selinux 2007-04-17 12:34:48.000000000 +0100
++++ coreutils-5.97/src/Makefile.am 2007-04-17 12:34:48.000000000 +0100
@@ -20,14 +20,14 @@
EXTRA_PROGRAMS = chroot df hostid nice pinky stty su runuser uname uptime users who
@@ -842,8 +842,8 @@
## If necessary, add -lm to resolve use of pow in lib/strtod.c.
sort_LDADD = $(LDADD) $(POW_LIB)
---- coreutils-5.97/src/copy.h.selinux 2007-04-11 18:15:32.000000000 +0100
-+++ coreutils-5.97/src/copy.h 2007-04-11 18:15:32.000000000 +0100
+--- coreutils-5.97/src/copy.h.selinux 2007-04-17 12:34:48.000000000 +0100
++++ coreutils-5.97/src/copy.h 2007-04-17 12:34:48.000000000 +0100
@@ -127,6 +127,10 @@
bool preserve_ownership;
bool preserve_mode;
@@ -855,8 +855,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-04-11 11:08:35.527429462 +0100
-+++ coreutils-5.97/src/chcon.c 2007-04-11 18:15:32.000000000 +0100
+--- /dev/null 2007-04-17 09:18:47.810494296 +0100
++++ coreutils-5.97/src/chcon.c 2007-04-17 12:34:48.000000000 +0100
@@ -0,0 +1,421 @@
+/* chcontext -- change security context of a pathname */
+
@@ -1280,7 +1280,7 @@
+ exit (errors);
+}
--- coreutils-5.97/src/mkdir.c.selinux 2005-06-15 00:55:47.000000000 +0100
-+++ coreutils-5.97/src/mkdir.c 2007-04-11 18:15:32.000000000 +0100
++++ coreutils-5.97/src/mkdir.c 2007-04-17 12:34:48.000000000 +0100
@@ -34,11 +34,18 @@
#define AUTHORS "David MacKenzie"
@@ -1346,7 +1346,7 @@
case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
default:
--- coreutils-5.97/src/stat.c.selinux 2005-12-15 21:25:53.000000000 +0000
-+++ coreutils-5.97/src/stat.c 2007-04-11 18:15:32.000000000 +0100
++++ coreutils-5.97/src/stat.c 2007-04-17 12:34:48.000000000 +0100
@@ -42,6 +42,13 @@
# endif
#endif
@@ -1639,7 +1639,7 @@
exit (ok ? EXIT_SUCCESS : EXIT_FAILURE);
}
--- coreutils-5.97/src/mkfifo.c.selinux 2005-05-14 08:58:37.000000000 +0100
-+++ coreutils-5.97/src/mkfifo.c 2007-04-11 18:15:32.000000000 +0100
++++ coreutils-5.97/src/mkfifo.c 2007-04-17 12:34:48.000000000 +0100
@@ -32,11 +32,18 @@
#define AUTHORS "David MacKenzie"
@@ -1703,7 +1703,7 @@
case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
default:
--- coreutils-5.97/src/mknod.c.selinux 2005-05-14 08:58:37.000000000 +0100
-+++ coreutils-5.97/src/mknod.c 2007-04-11 18:15:32.000000000 +0100
++++ coreutils-5.97/src/mknod.c 2007-04-17 12:34:48.000000000 +0100
@@ -36,8 +36,15 @@
/* The name this program was run with. */
char *program_name;
@@ -1764,8 +1764,8 @@
case_GETOPT_HELP_CHAR;
case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
default:
---- coreutils-5.97/src/id.c.selinux 2007-04-11 18:15:32.000000000 +0100
-+++ coreutils-5.97/src/id.c 2007-04-11 18:15:32.000000000 +0100
+--- coreutils-5.97/src/id.c.selinux 2007-04-17 12:34:48.000000000 +0100
++++ coreutils-5.97/src/id.c 2007-04-17 12:34:48.000000000 +0100
@@ -37,6 +37,20 @@
int getugroups ();
@@ -1896,8 +1896,8 @@
+ }
+#endif
}
---- coreutils-5.97/src/mv.c.selinux 2007-04-11 18:15:32.000000000 +0100
-+++ coreutils-5.97/src/mv.c 2007-04-11 18:15:32.000000000 +0100
+--- coreutils-5.97/src/mv.c.selinux 2007-04-17 12:34:48.000000000 +0100
++++ coreutils-5.97/src/mv.c 2007-04-17 12:34:48.000000000 +0100
@@ -34,6 +34,11 @@
#include "quote.h"
#include "remove.h"
@@ -1932,8 +1932,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-04-11 11:08:35.527429462 +0100
-+++ coreutils-5.97/src/runcon.c 2007-04-11 18:15:32.000000000 +0100
+--- /dev/null 2007-04-17 09:18:47.810494296 +0100
++++ coreutils-5.97/src/runcon.c 2007-04-17 12:34:48.000000000 +0100
@@ -0,0 +1,253 @@
+/*
+ * runcon [ context |
@@ -2188,8 +2188,8 @@
+ }
+ return 1; /* can't reach this statement.... */
+}
---- coreutils-5.97/src/copy.c.selinux 2007-04-11 18:15:32.000000000 +0100
-+++ coreutils-5.97/src/copy.c 2007-04-11 18:15:32.000000000 +0100
+--- coreutils-5.97/src/copy.c.selinux 2007-04-17 12:34:48.000000000 +0100
++++ coreutils-5.97/src/copy.c 2007-04-17 12:34:48.000000000 +0100
@@ -52,6 +52,11 @@
#include "xreadlink.h"
#include "yesno.h"
@@ -2305,8 +2305,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-5.97/src/install.c.selinux 2007-04-11 18:15:32.000000000 +0100
-+++ coreutils-5.97/src/install.c 2007-04-11 18:15:32.000000000 +0100
+--- coreutils-5.97/src/install.c.selinux 2007-04-17 12:34:48.000000000 +0100
++++ coreutils-5.97/src/install.c 2007-04-17 12:34:48.000000000 +0100
@@ -48,6 +48,43 @@
# include <sys/wait.h>
#endif
@@ -2469,8 +2469,8 @@
fputs (HELP_OPTION_DESCRIPTION, stdout);
fputs (VERSION_OPTION_DESCRIPTION, stdout);
fputs (_("\
---- coreutils-5.97/config.hin.selinux 2007-04-11 18:15:32.000000000 +0100
-+++ coreutils-5.97/config.hin 2007-04-11 18:15:32.000000000 +0100
+--- coreutils-5.97/config.hin.selinux 2007-04-17 12:34:48.000000000 +0100
++++ coreutils-5.97/config.hin 2007-04-17 12:34:48.000000000 +0100
@@ -411,10 +411,6 @@
don't. */
#undef HAVE_DECL_TTYNAME
@@ -2573,8 +2573,8 @@
#undef size_t
/* Map `socklen_t' to `int' if it is missing. */
---- coreutils-5.97/configure.ac.selinux 2007-04-11 18:15:32.000000000 +0100
-+++ coreutils-5.97/configure.ac 2007-04-11 18:15:32.000000000 +0100
+--- coreutils-5.97/configure.ac.selinux 2007-04-17 12:34:48.000000000 +0100
++++ coreutils-5.97/configure.ac 2007-04-17 12:34:48.000000000 +0100
@@ -34,6 +34,13 @@
LIB_PAM="-ldl -lpam -lpam_misc"
AC_SUBST(LIB_PAM)])
@@ -2590,7 +2590,7 @@
gl_USE_SYSTEM_EXTENSIONS
gl_PERL
--- coreutils-5.97/man/stat.1.selinux 2006-05-25 18:27:38.000000000 +0100
-+++ coreutils-5.97/man/stat.1 2007-04-11 18:15:32.000000000 +0100
++++ coreutils-5.97/man/stat.1 2007-04-17 12:34:48.000000000 +0100
@@ -28,6 +28,9 @@
\fB\-t\fR, \fB\-\-terse\fR
print the information in terse form
@@ -2611,15 +2611,15 @@
%D
Device number in hex
.TP
---- /dev/null 2007-04-11 11:08:35.527429462 +0100
-+++ coreutils-5.97/man/chcon.x 2007-04-11 18:15:32.000000000 +0100
+--- /dev/null 2007-04-17 09:18:47.810494296 +0100
++++ coreutils-5.97/man/chcon.x 2007-04-17 12:34:48.000000000 +0100
@@ -0,0 +1,4 @@
+[NAME]
+chcon \- change file security context
+[DESCRIPTION]
+.\" Add any additional description here
---- /dev/null 2007-04-11 11:08:35.527429462 +0100
-+++ coreutils-5.97/man/chcon.1 2007-04-11 18:15:32.000000000 +0100
+--- /dev/null 2007-04-17 09:18:47.810494296 +0100
++++ coreutils-5.97/man/chcon.1 2007-04-17 12:34:48.000000000 +0100
@@ -0,0 +1,64 @@
+.TH CHCON 1 "July 2003" "chcon (coreutils) 5.0" "User Commands"
+.SH NAME
@@ -2686,7 +2686,7 @@
+.PP
+should give you access to the complete manual.
--- coreutils-5.97/man/dir.1.selinux 2006-06-01 08:33:14.000000000 +0100
-+++ coreutils-5.97/man/dir.1 2007-04-11 18:15:32.000000000 +0100
++++ coreutils-5.97/man/dir.1 2007-04-17 12:34:48.000000000 +0100
@@ -201,6 +201,20 @@
.TP
\fB\-1\fR
@@ -2709,7 +2709,7 @@
\fB\-\-help\fR
display this help and exit
--- coreutils-5.97/man/mkfifo.1.selinux 2006-05-25 18:27:36.000000000 +0100
-+++ coreutils-5.97/man/mkfifo.1 2007-04-11 18:15:32.000000000 +0100
++++ coreutils-5.97/man/mkfifo.1 2007-04-17 12:34:48.000000000 +0100
@@ -12,6 +12,9 @@
.PP
Mandatory arguments to long options are mandatory for short options too.
@@ -2720,8 +2720,8 @@
\fB\-m\fR, \fB\-\-mode\fR=\fIMODE\fR
set permission mode (as in chmod), not a=rw \- umask
.TP
---- coreutils-5.97/man/Makefile.am.selinux 2007-04-11 18:15:32.000000000 +0100
-+++ coreutils-5.97/man/Makefile.am 2007-04-11 18:15:32.000000000 +0100
+--- coreutils-5.97/man/Makefile.am.selinux 2007-04-17 12:34:48.000000000 +0100
++++ coreutils-5.97/man/Makefile.am 2007-04-17 12:34:48.000000000 +0100
@@ -11,7 +11,7 @@
shred.1 sleep.1 sort.1 split.1 stat.1 stty.1 \
su.1 sum.1 sync.1 tac.1 tail.1 tee.1 test.1 touch.1 tr.1 true.1 tsort.1 \
@@ -2741,7 +2741,7 @@
SUFFIXES = .x .1
--- coreutils-5.97/man/cp.1.selinux 2006-05-25 18:27:33.000000000 +0100
-+++ coreutils-5.97/man/cp.1 2007-04-11 18:15:32.000000000 +0100
++++ coreutils-5.97/man/cp.1 2007-04-17 12:34:48.000000000 +0100
@@ -57,7 +57,7 @@
.TP
\fB\-\-preserve\fR[=\fIATTR_LIST\fR]
@@ -2762,7 +2762,7 @@
output version information and exit
.PP
--- coreutils-5.97/man/id.1.selinux 2006-05-25 18:27:35.000000000 +0100
-+++ coreutils-5.97/man/id.1 2007-04-11 18:15:32.000000000 +0100
++++ coreutils-5.97/man/id.1 2007-04-17 12:34:48.000000000 +0100
@@ -13,6 +13,9 @@
\fB\-a\fR
ignore, for compatibility with other versions
@@ -2773,8 +2773,8 @@
\fB\-g\fR, \fB\-\-group\fR
print only the effective group ID
.TP
---- /dev/null 2007-04-11 11:08:35.527429462 +0100
-+++ coreutils-5.97/man/runcon.x 2007-04-11 18:15:32.000000000 +0100
+--- /dev/null 2007-04-17 09:18:47.810494296 +0100
++++ coreutils-5.97/man/runcon.x 2007-04-17 12:34:48.000000000 +0100
@@ -0,0 +1,14 @@
+[NAME]
+runcon \- run command with specified security context
@@ -2790,8 +2790,8 @@
+.PP
+Note that only carefully-chosen contexts are likely to successfully
+run.
---- /dev/null 2007-04-11 11:08:35.527429462 +0100
-+++ coreutils-5.97/man/runcon.1 2007-04-11 18:15:32.000000000 +0100
+--- /dev/null 2007-04-17 09:18:47.810494296 +0100
++++ coreutils-5.97/man/runcon.1 2007-04-17 12:34:48.000000000 +0100
@@ -0,0 +1,45 @@
+.TH RUNCON "1" "February 2005" "runcon (coreutils) 5.0" "selinux"
+.SH NAME
@@ -2839,7 +2839,7 @@
+Note that only carefully-chosen contexts are likely to successfully
+run.
--- coreutils-5.97/man/mknod.1.selinux 2006-05-25 18:27:36.000000000 +0100
-+++ coreutils-5.97/man/mknod.1 2007-04-11 18:15:32.000000000 +0100
++++ coreutils-5.97/man/mknod.1 2007-04-17 12:34:48.000000000 +0100
@@ -12,6 +12,9 @@
.PP
Mandatory arguments to long options are mandatory for short options too.
@@ -2851,7 +2851,7 @@
set permission mode (as in chmod), not a=rw \- umask
.TP
--- coreutils-5.97/man/ls.1.selinux 2006-06-01 08:33:14.000000000 +0100
-+++ coreutils-5.97/man/ls.1 2007-04-11 18:15:32.000000000 +0100
++++ coreutils-5.97/man/ls.1 2007-04-17 12:34:48.000000000 +0100
@@ -201,6 +201,20 @@
.TP
\fB\-1\fR
@@ -2874,7 +2874,7 @@
\fB\-\-help\fR
display this help and exit
--- coreutils-5.97/man/mkdir.1.selinux 2006-05-25 18:27:35.000000000 +0100
-+++ coreutils-5.97/man/mkdir.1 2007-04-11 18:15:32.000000000 +0100
++++ coreutils-5.97/man/mkdir.1 2007-04-17 12:34:48.000000000 +0100
@@ -12,6 +12,8 @@
.PP
Mandatory arguments to long options are mandatory for short options too.
@@ -2885,7 +2885,7 @@
set permission mode (as in chmod), not rwxrwxrwx \- umask
.TP
--- coreutils-5.97/man/vdir.1.selinux 2006-06-01 08:33:14.000000000 +0100
-+++ coreutils-5.97/man/vdir.1 2007-04-11 18:15:32.000000000 +0100
++++ coreutils-5.97/man/vdir.1 2007-04-17 12:34:48.000000000 +0100
@@ -201,6 +201,20 @@
.TP
\fB\-1\fR
@@ -2908,7 +2908,7 @@
\fB\-\-help\fR
display this help and exit
--- coreutils-5.97/man/install.1.selinux 2006-05-25 18:27:35.000000000 +0100
-+++ coreutils-5.97/man/install.1 2007-04-11 18:15:32.000000000 +0100
++++ coreutils-5.97/man/install.1 2007-04-17 12:34:48.000000000 +0100
@@ -65,6 +65,11 @@
.TP
\fB\-v\fR, \fB\-\-verbose\fR
@@ -2921,8 +2921,8 @@
.TP
\fB\-\-help\fR
display this help and exit
---- coreutils-5.97/README.selinux 2007-04-11 18:15:32.000000000 +0100
-+++ coreutils-5.97/README 2007-04-11 18:15:32.000000000 +0100
+--- coreutils-5.97/README.selinux 2007-04-17 12:34:48.000000000 +0100
++++ coreutils-5.97/README 2007-04-17 12:34:48.000000000 +0100
@@ -8,11 +8,11 @@
The programs that can be built with this package are:
Index: coreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/coreutils/FC-6/coreutils.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- coreutils.spec 11 Apr 2007 18:31:15 -0000 1.152
+++ coreutils.spec 17 Apr 2007 11:43:06 -0000 1.153
@@ -1,7 +1,7 @@
Summary: The GNU core utilities: a set of tools commonly used in shell scripts
Name: coreutils
Version: 5.97
-Release: 12.4%{?dist}
+Release: 12.5%{?dist}
License: GPL
Group: System Environment/Base
Url: http://www.gnu.org/software/coreutils/
@@ -25,7 +25,6 @@
Patch3: coreutils-cut-coredump.patch
Patch4: coreutils-223869.patch
Patch5: coreutils-rm-race.patch
-Patch6: coreutils-dangling-full-path.patch
Patch10: coreutils-newhashes.patch
# Our patches
@@ -89,7 +88,6 @@
%patch3 -p1 -b .cut-coredump
%patch4 -p1 -b .223869
%patch5 -p1 -b .rm-race
-%patch6 -p1 -b .dangling-full-path
%patch10 -p1 -b .newhashes
# Our patches
@@ -292,6 +290,9 @@
/sbin/runuser
%changelog
+* Tue Apr 17 2007 Tim Waugh <twaugh at redhat.com> 5.97-12.5
+- Fixed dangling symlinks fix (bug #230052, bug #236311).
+
* Wed Apr 11 2007 Tim Waugh <twaugh at redhat.com> 5.97-12.4
- Backported ls fix for 'ls -lL' showing dangling links with full paths
(bug #230052).
--- coreutils-dangling-full-path.patch DELETED ---
More information about the fedora-cvs-commits
mailing list