rpms/coreutils/FC-6 coreutils-selinux.patch, 1.25, 1.26 coreutils.spec, 1.146, 1.147

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Nov 23 17:45:13 UTC 2006


Author: twaugh

Update of /cvs/dist/rpms/coreutils/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv9327

Modified Files:
	coreutils-selinux.patch coreutils.spec 
Log Message:
* Thu Nov 23 2006 Tim Waugh <twaugh at redhat.com> 5.97-12.1
- Fixed stat's 'C' format specifier (bug #216676).
- Misleading 'id -Z root' error message (bug #211089).
- Resolves: rhbz#216676 rhbz#211089


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.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- coreutils-selinux.patch	4 Oct 2006 11:18:28 -0000	1.25
+++ coreutils-selinux.patch	23 Nov 2006 17:45:11 -0000	1.26
@@ -1,5 +1,5 @@
---- /dev/null	2006-10-03 09:23:15.605078000 +0100
-+++ coreutils-5.97/src/chcon.c	2006-10-03 17:18:16.000000000 +0100
+--- /dev/null	2006-11-23 08:31:37.745607750 +0000
++++ coreutils-5.97/src/chcon.c	2006-11-17 13:56:55.000000000 +0000
 @@ -0,0 +1,421 @@
 +/* chcontext -- change security context of a pathname */
 +
@@ -422,8 +422,8 @@
 +    freecon(ref_context);
 +  exit (errors);
 +}
---- coreutils-5.97/src/mv.c.selinux	2006-10-03 17:18:16.000000000 +0100
-+++ coreutils-5.97/src/mv.c	2006-10-03 17:21:33.000000000 +0100
+--- coreutils-5.97/src/mv.c.selinux	2006-11-17 13:56:55.000000000 +0000
++++ coreutils-5.97/src/mv.c	2006-11-17 13:56:55.000000000 +0000
 @@ -34,6 +34,11 @@
  #include "quote.h"
  #include "remove.h"
@@ -459,7 +459,7 @@
       we'll actually use backup_suffix_string.  */
    backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX");
 --- coreutils-5.97/src/mkdir.c.selinux	2005-06-15 00:55:47.000000000 +0100
-+++ coreutils-5.97/src/mkdir.c	2006-10-03 17:18:16.000000000 +0100
++++ coreutils-5.97/src/mkdir.c	2006-11-17 13:56:55.000000000 +0000
 @@ -34,11 +34,18 @@
  
  #define AUTHORS "David MacKenzie"
@@ -524,8 +524,8 @@
  	case_GETOPT_HELP_CHAR;
  	case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
  	default:
---- coreutils-5.97/src/cp.c.selinux	2006-10-03 17:18:16.000000000 +0100
-+++ coreutils-5.97/src/cp.c	2006-10-03 17:39:30.000000000 +0100
+--- coreutils-5.97/src/cp.c.selinux	2006-11-17 13:56:55.000000000 +0000
++++ coreutils-5.97/src/cp.c	2006-11-17 13:56:55.000000000 +0000
 @@ -52,6 +52,11 @@
  
  #define AUTHORS "Torbjorn Granlund", "David MacKenzie", "Jim Meyering"
@@ -691,8 +691,8 @@
  
  	case REPLY_OPTION: /* Deprecated */
  	  x.interactive = XARGMATCH ("--reply", optarg,
---- coreutils-5.97/src/install.c.selinux	2006-10-03 17:18:16.000000000 +0100
-+++ coreutils-5.97/src/install.c	2006-10-03 17:40:19.000000000 +0100
+--- coreutils-5.97/src/install.c.selinux	2006-11-17 13:56:55.000000000 +0000
++++ coreutils-5.97/src/install.c	2006-11-17 13:56:55.000000000 +0000
 @@ -48,6 +48,43 @@
  # include <sys/wait.h>
  #endif
@@ -855,8 +855,8 @@
        fputs (HELP_OPTION_DESCRIPTION, stdout);
        fputs (VERSION_OPTION_DESCRIPTION, stdout);
        fputs (_("\
---- coreutils-5.97/src/copy.h.selinux	2006-10-03 17:18:16.000000000 +0100
-+++ coreutils-5.97/src/copy.h	2006-10-03 17:18:16.000000000 +0100
+--- coreutils-5.97/src/copy.h.selinux	2006-11-17 13:56:55.000000000 +0000
++++ coreutils-5.97/src/copy.h	2006-11-17 13:56:55.000000000 +0000
 @@ -127,6 +127,10 @@
    bool preserve_ownership;
    bool preserve_mode;
@@ -868,8 +868,8 @@
  
    /* Enabled for mv, and for cp by the --preserve=links option.
       If true, attempt to preserve in the destination files any
---- coreutils-5.97/src/Makefile.am.selinux	2006-10-03 17:18:16.000000000 +0100
-+++ coreutils-5.97/src/Makefile.am	2006-10-03 17:18:16.000000000 +0100
+--- coreutils-5.97/src/Makefile.am.selinux	2006-11-17 13:56:55.000000000 +0000
++++ coreutils-5.97/src/Makefile.am	2006-11-17 13:56:55.000000000 +0000
 @@ -20,14 +20,14 @@
  EXTRA_PROGRAMS = chroot df hostid nice pinky stty su runuser uname uptime users who
  
@@ -922,8 +922,8 @@
  
  ## If necessary, add -lm to resolve use of pow in lib/strtod.c.
  sort_LDADD = $(LDADD) $(POW_LIB)
---- /dev/null	2006-10-03 09:23:15.605078000 +0100
-+++ coreutils-5.97/src/runcon.c	2006-10-03 17:18:16.000000000 +0100
+--- /dev/null	2006-11-23 08:31:37.745607750 +0000
++++ coreutils-5.97/src/runcon.c	2006-11-17 13:56:55.000000000 +0000
 @@ -0,0 +1,253 @@
 +/*
 + * runcon [ context |
@@ -1178,8 +1178,8 @@
 +  }
 +  return 1; /* can't reach this statement.... */
 +}
---- coreutils-5.97/src/ls.c.selinux	2006-10-03 17:18:16.000000000 +0100
-+++ coreutils-5.97/src/ls.c	2006-10-03 17:18:16.000000000 +0100
+--- coreutils-5.97/src/ls.c.selinux	2006-11-17 13:56:55.000000000 +0000
++++ coreutils-5.97/src/ls.c	2006-11-17 13:56:55.000000000 +0000
 @@ -135,6 +135,18 @@
  
  #define AUTHORS "Richard Stallman", "David MacKenzie"
@@ -1782,7 +1782,7 @@
 +}
 +#endif
 --- coreutils-5.97/src/stat.c.selinux	2005-12-15 21:25:53.000000000 +0000
-+++ coreutils-5.97/src/stat.c	2006-10-03 17:18:16.000000000 +0100
++++ coreutils-5.97/src/stat.c	2006-11-23 17:33:50.000000000 +0000
 @@ -42,6 +42,13 @@
  # endif
  #endif
@@ -1867,7 +1867,7 @@
  		break;
  	      }
  	    break;
-@@ -690,9 +706,17 @@
+@@ -690,9 +706,21 @@
  
  /* Stat the file system and print what we find.  */
  static bool
@@ -1877,16 +1877,20 @@
    STRUCT_STATVFS statfsbuf;
 +  SECURITY_ID_T scontext = NULL;
 +#ifdef WITH_SELINUX
-+  if(secure)
++  if(is_selinux_enabled()) {
 +    if (getfilecon(filename,&scontext)<0) {
-+      perror (filename);
-+      return false;
++      if (secure) {
++        perror (filename);
++        return false;
++      }
++      scontext = NULL;
 +    }
++  }
 +#endif
  
    if (STATFS (filename, &statfsbuf) != 0)
      {
-@@ -703,25 +727,46 @@
+@@ -703,25 +731,46 @@
  
    if (format == NULL)
      {
@@ -1942,18 +1946,18 @@
  
    if ((follow_links ? stat : lstat) (filename, &statbuf) != 0)
      {
-@@ -729,11 +774,29 @@
+@@ -729,11 +778,29 @@
        return false;
      }
  
 +#ifdef WITH_SELINUX
-+  if(secure) {
++  if(is_selinux_enabled()) {
 +    int i;
 +    if (!follow_links) 
 +      i=lgetfilecon(filename, &scontext);
 +    else
 +      i=getfilecon(filename, &scontext);
-+    if (i == -1)
++    if (i == -1 && secure)
 +      {
 +	perror (filename);
 +	return false;
@@ -1973,7 +1977,7 @@
  	}
        else
  	{
-@@ -751,16 +814,30 @@
+@@ -751,16 +818,30 @@
  	    }
  	  else
  	    {
@@ -2011,7 +2015,7 @@
    return true;
  }
  
-@@ -777,6 +854,7 @@
+@@ -777,6 +858,7 @@
  Display file or file system status.\n\
  \n\
    -L, --dereference     follow links\n\
@@ -2019,7 +2023,7 @@
    -f, --file-system     display file system status instead of file status\n\
  "), stdout);
        fputs (_("\
-@@ -836,6 +914,7 @@
+@@ -836,6 +918,7 @@
    %c   Total file nodes in file system\n\
    %d   Free file nodes in file system\n\
    %f   Free blocks in file system\n\
@@ -2027,7 +2031,7 @@
  "), stdout);
        fputs (_("\
    %i   File System ID in hex\n\
-@@ -860,6 +939,7 @@
+@@ -860,6 +943,7 @@
    bool follow_links = false;
    bool fs = false;
    bool terse = false;
@@ -2035,7 +2039,7 @@
    char *format = NULL;
    bool ok = true;
  
-@@ -871,7 +951,7 @@
+@@ -871,7 +955,7 @@
  
    atexit (close_stdout);
  
@@ -2044,7 +2048,7 @@
      {
        switch (c)
  	{
-@@ -898,6 +978,14 @@
+@@ -898,6 +982,14 @@
  	case 't':
  	  terse = true;
  	  break;
@@ -2059,7 +2063,7 @@
  
  	case_GETOPT_HELP_CHAR;
  
-@@ -916,8 +1004,8 @@
+@@ -916,8 +1008,8 @@
  
    for (i = optind; i < argc; i++)
      ok &= (fs
@@ -2071,7 +2075,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	2006-10-03 17:18:16.000000000 +0100
++++ coreutils-5.97/src/mkfifo.c	2006-11-17 13:56:55.000000000 +0000
 @@ -32,11 +32,18 @@
  
  #define AUTHORS "David MacKenzie"
@@ -2134,8 +2138,8 @@
  	case_GETOPT_HELP_CHAR;
  	case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
  	default:
---- coreutils-5.97/src/id.c.selinux	2006-10-03 17:18:16.000000000 +0100
-+++ coreutils-5.97/src/id.c	2006-10-03 17:18:16.000000000 +0100
+--- coreutils-5.97/src/id.c.selinux	2006-11-17 13:56:55.000000000 +0000
++++ coreutils-5.97/src/id.c	2006-11-23 17:05:07.000000000 +0000
 @@ -37,6 +37,20 @@
  
  int getugroups ();
@@ -2176,7 +2180,7 @@
  Print information for USERNAME, or the current user.\n\
  \n\
    -a              ignore, for compatibility with other versions\n\
-+  -Z, --context   print only the context\n\
++  -Z, --context   print only the context of the current process\n\
    -g, --group     print only the effective group ID\n\
    -G, --groups    print all group IDs\n\
    -n, --name      print a name instead of a number, for -ugG\n\
@@ -2222,12 +2226,12 @@
 -    error (EXIT_FAILURE, 0, _("cannot print only user and only group"));
 +#ifdef WITH_SELINUX
 +  if (argc - optind == 1)
-+    selinux_enabled = 0;
++    error (1, 0, _("\
++cannot print security context when user specified"));
 +
 +  if( just_context  && !selinux_enabled)
 +    error (1, 0, _("\
-+cannot display context when selinux not enabled or when displaying the id\n\
-+of a different user"));
++cannot display context when selinux not enabled"));
 +
 +  /* If we are on a selinux-enabled kernel, get our context.    *
 +   * Otherwise, leave the context variable alone - it has *
@@ -2266,8 +2270,8 @@
 +  }
 +#endif
  }
---- coreutils-5.97/src/copy.c.selinux	2006-10-03 17:18:16.000000000 +0100
-+++ coreutils-5.97/src/copy.c	2006-10-03 17:18:16.000000000 +0100
+--- coreutils-5.97/src/copy.c.selinux	2006-11-17 13:56:55.000000000 +0000
++++ coreutils-5.97/src/copy.c	2006-11-17 13:56:55.000000000 +0000
 @@ -52,6 +52,11 @@
  #include "xreadlink.h"
  #include "yesno.h"
@@ -2384,7 +2388,7 @@
       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/mknod.c.selinux	2005-05-14 08:58:37.000000000 +0100
-+++ coreutils-5.97/src/mknod.c	2006-10-03 17:18:16.000000000 +0100
++++ coreutils-5.97/src/mknod.c	2006-11-17 13:56:55.000000000 +0000
 @@ -36,8 +36,15 @@
  /* The name this program was run with. */
  char *program_name;
@@ -2445,8 +2449,8 @@
  	case_GETOPT_HELP_CHAR;
  	case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
  	default:
---- coreutils-5.97/README.selinux	2006-10-03 17:18:16.000000000 +0100
-+++ coreutils-5.97/README	2006-10-03 17:18:16.000000000 +0100
+--- coreutils-5.97/README.selinux	2006-11-17 13:56:55.000000000 +0000
++++ coreutils-5.97/README	2006-11-17 13:56:55.000000000 +0000
 @@ -8,11 +8,11 @@
  The programs that can be built with this package are:
  
@@ -2461,8 +2465,8 @@
    sha256sum sha384sum sha512sum shred sleep sort
    split stat stty su sum sync tac tail tee test touch tr true tsort tty
    uname unexpand uniq unlink uptime users vdir wc who whoami yes
---- coreutils-5.97/tests/help-version.selinux	2006-10-03 17:18:16.000000000 +0100
-+++ coreutils-5.97/tests/help-version	2006-10-03 17:18:16.000000000 +0100
+--- coreutils-5.97/tests/help-version.selinux	2006-11-17 13:56:55.000000000 +0000
++++ coreutils-5.97/tests/help-version	2006-11-17 13:56:55.000000000 +0000
 @@ -46,6 +46,8 @@
  
      # Skip `test'; it doesn't accept --help or --version.
@@ -2481,8 +2485,8 @@
  
    rm -rf $tmp_in $tmp_in2 $tmp_dir $tmp_out
    echo > $tmp_in
---- coreutils-5.97/configure.ac.selinux	2006-10-03 17:18:16.000000000 +0100
-+++ coreutils-5.97/configure.ac	2006-10-03 17:18:16.000000000 +0100
+--- coreutils-5.97/configure.ac.selinux	2006-11-17 13:56:55.000000000 +0000
++++ coreutils-5.97/configure.ac	2006-11-17 13:56:55.000000000 +0000
 @@ -34,6 +34,13 @@
  LIB_PAM="-ldl -lpam -lpam_misc"
  AC_SUBST(LIB_PAM)])
@@ -2497,8 +2501,8 @@
  gl_DEFAULT_POSIX2_VERSION
  gl_USE_SYSTEM_EXTENSIONS
  gl_PERL
---- coreutils-5.97/config.hin.selinux	2006-10-03 17:18:16.000000000 +0100
-+++ coreutils-5.97/config.hin	2006-10-03 17:18:16.000000000 +0100
+--- coreutils-5.97/config.hin.selinux	2006-11-17 13:56:55.000000000 +0000
++++ coreutils-5.97/config.hin	2006-11-17 13:56:55.000000000 +0000
 @@ -411,10 +411,6 @@
     don't. */
  #undef HAVE_DECL_TTYNAME
@@ -2602,7 +2606,7 @@
  
  /* Map `socklen_t' to `int' if it is missing. */
 --- coreutils-5.97/man/ls.1.selinux	2006-06-01 08:33:14.000000000 +0100
-+++ coreutils-5.97/man/ls.1	2006-10-03 17:18:16.000000000 +0100
++++ coreutils-5.97/man/ls.1	2006-11-17 13:56:55.000000000 +0000
 @@ -201,6 +201,20 @@
  .TP
  \fB\-1\fR
@@ -2625,7 +2629,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	2006-10-03 17:18:16.000000000 +0100
++++ coreutils-5.97/man/install.1	2006-11-17 13:56:55.000000000 +0000
 @@ -65,6 +65,11 @@
  .TP
  \fB\-v\fR, \fB\-\-verbose\fR
@@ -2639,19 +2643,19 @@
  \fB\-\-help\fR
  display this help and exit
 --- coreutils-5.97/man/id.1.selinux	2006-05-25 18:27:35.000000000 +0100
-+++ coreutils-5.97/man/id.1	2006-10-03 17:18:16.000000000 +0100
++++ coreutils-5.97/man/id.1	2006-11-17 16:26:50.000000000 +0000
 @@ -13,6 +13,9 @@
  \fB\-a\fR
  ignore, for compatibility with other versions
  .TP
 +\fB\-Z\fR, \fB\-\-context\fR
-+print only the security context
++print only the security context of the current process
 +.TP
  \fB\-g\fR, \fB\-\-group\fR
  print only the effective group ID
  .TP
 --- coreutils-5.97/man/stat.1.selinux	2006-05-25 18:27:38.000000000 +0100
-+++ coreutils-5.97/man/stat.1	2006-10-03 17:18:16.000000000 +0100
++++ coreutils-5.97/man/stat.1	2006-11-17 13:56:55.000000000 +0000
 @@ -28,6 +28,9 @@
  \fB\-t\fR, \fB\-\-terse\fR
  print the information in terse form
@@ -2672,9 +2676,9 @@
  %D
  Device number in hex
  .TP
---- /dev/null	2006-10-03 09:23:15.605078000 +0100
-+++ coreutils-5.97/man/runcon.1	2006-10-03 17:18:16.000000000 +0100
-@@ -0,0 +1,43 @@
+--- /dev/null	2006-11-23 08:31:37.745607750 +0000
++++ coreutils-5.97/man/runcon.1	2006-11-17 13:56:55.000000000 +0000
+@@ -0,0 +1,45 @@
 +.TH RUNCON "1" "February 2005" "runcon (coreutils) 5.0" "selinux"
 +.SH NAME
 +runcon \- run command with specified security context 
@@ -2710,16 +2714,18 @@
 +.TP
 +\fB\-u\fR
 +change current user to the specified user
++.TP
++\fB\-\-\fR
++The \fB\-\-\fR flag indicates that \fBruncon\fR should stop processing command
++line arguments. Further arguments will be passed to COMMAND.
 +.PP
 +If none of \fI-c\fR, \fI-t\fR, \fI-u\fR, \fI-r\fR, or \fI-l\fR, is specified,
-+the first argument is used as the complete context.  Any additional
-+arguments after \fICOMMAND\fR are interpreted as arguments to the
-+command.
++the first argument is used as the complete context.
 +.PP
 +Note that only carefully-chosen contexts are likely to successfully
 +run.
---- coreutils-5.97/man/Makefile.am.selinux	2006-10-03 17:18:16.000000000 +0100
-+++ coreutils-5.97/man/Makefile.am	2006-10-03 17:18:16.000000000 +0100
+--- coreutils-5.97/man/Makefile.am.selinux	2006-11-17 13:56:55.000000000 +0000
++++ coreutils-5.97/man/Makefile.am	2006-11-17 13:56:55.000000000 +0000
 @@ -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 \
@@ -2739,7 +2745,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	2006-10-03 17:18:16.000000000 +0100
++++ coreutils-5.97/man/cp.1	2006-11-17 13:56:55.000000000 +0000
 @@ -57,7 +57,7 @@
  .TP
  \fB\-\-preserve\fR[=\fIATTR_LIST\fR]
@@ -2760,7 +2766,7 @@
  output version information and exit
  .PP
 --- coreutils-5.97/man/mkfifo.1.selinux	2006-05-25 18:27:36.000000000 +0100
-+++ coreutils-5.97/man/mkfifo.1	2006-10-03 17:18:16.000000000 +0100
++++ coreutils-5.97/man/mkfifo.1	2006-11-17 13:56:55.000000000 +0000
 @@ -12,6 +12,9 @@
  .PP
  Mandatory arguments to long options are mandatory for short options too.
@@ -2772,7 +2778,7 @@
  set permission mode (as in chmod), not a=rw \- umask
  .TP
 --- coreutils-5.97/man/mknod.1.selinux	2006-05-25 18:27:36.000000000 +0100
-+++ coreutils-5.97/man/mknod.1	2006-10-03 17:18:16.000000000 +0100
++++ coreutils-5.97/man/mknod.1	2006-11-17 13:56:55.000000000 +0000
 @@ -12,6 +12,9 @@
  .PP
  Mandatory arguments to long options are mandatory for short options too.
@@ -2784,7 +2790,7 @@
  set permission mode (as in chmod), not a=rw \- umask
  .TP
 --- coreutils-5.97/man/mkdir.1.selinux	2006-05-25 18:27:35.000000000 +0100
-+++ coreutils-5.97/man/mkdir.1	2006-10-03 17:18:16.000000000 +0100
++++ coreutils-5.97/man/mkdir.1	2006-11-17 13:56:55.000000000 +0000
 @@ -12,6 +12,8 @@
  .PP
  Mandatory arguments to long options are mandatory for short options too.
@@ -2795,7 +2801,7 @@
  set permission mode (as in chmod), not rwxrwxrwx \- umask
  .TP
 --- coreutils-5.97/man/dir.1.selinux	2006-06-01 08:33:14.000000000 +0100
-+++ coreutils-5.97/man/dir.1	2006-10-03 17:18:16.000000000 +0100
++++ coreutils-5.97/man/dir.1	2006-11-17 13:56:55.000000000 +0000
 @@ -201,6 +201,20 @@
  .TP
  \fB\-1\fR
@@ -2817,8 +2823,8 @@
  .TP
  \fB\-\-help\fR
  display this help and exit
---- /dev/null	2006-10-03 09:23:15.605078000 +0100
-+++ coreutils-5.97/man/runcon.x	2006-10-03 17:18:16.000000000 +0100
+--- /dev/null	2006-11-23 08:31:37.745607750 +0000
++++ coreutils-5.97/man/runcon.x	2006-11-17 13:56:55.000000000 +0000
 @@ -0,0 +1,14 @@
 +[NAME]
 +runcon \- run command with specified security context
@@ -2835,7 +2841,7 @@
 +Note that only carefully-chosen contexts are likely to successfully
 +run.
 --- coreutils-5.97/man/vdir.1.selinux	2006-06-01 08:33:14.000000000 +0100
-+++ coreutils-5.97/man/vdir.1	2006-10-03 17:18:16.000000000 +0100
++++ coreutils-5.97/man/vdir.1	2006-11-17 13:56:55.000000000 +0000
 @@ -201,6 +201,20 @@
  .TP
  \fB\-1\fR
@@ -2857,15 +2863,15 @@
  .TP
  \fB\-\-help\fR
  display this help and exit
---- /dev/null	2006-10-03 09:23:15.605078000 +0100
-+++ coreutils-5.97/man/chcon.x	2006-10-03 17:18:16.000000000 +0100
+--- /dev/null	2006-11-23 08:31:37.745607750 +0000
++++ coreutils-5.97/man/chcon.x	2006-11-17 13:56:55.000000000 +0000
 @@ -0,0 +1,4 @@
 +[NAME]
 +chcon \- change file security context
 +[DESCRIPTION]
 +.\" Add any additional description here
---- /dev/null	2006-10-03 09:23:15.605078000 +0100
-+++ coreutils-5.97/man/chcon.1	2006-10-03 17:18:16.000000000 +0100
+--- /dev/null	2006-11-23 08:31:37.745607750 +0000
++++ coreutils-5.97/man/chcon.1	2006-11-17 13:56:55.000000000 +0000
 @@ -0,0 +1,64 @@
 +.TH CHCON 1 "July 2003" "chcon (coreutils) 5.0" "User Commands"
 +.SH NAME
@@ -2931,4 +2937,3 @@
 +.B info chcon
 +.PP
 +should give you access to the complete manual.
-


Index: coreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/coreutils/FC-6/coreutils.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- coreutils.spec	4 Oct 2006 11:18:28 -0000	1.146
+++ coreutils.spec	23 Nov 2006 17:45:11 -0000	1.147
@@ -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
+Release: 12.1%{?dist}
 License: GPL
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -284,6 +284,10 @@
 /sbin/runuser
 
 %changelog
+* Thu Nov 23 2006 Tim Waugh <twaugh at redhat.com> 5.97-12.1
+- Fixed stat's 'C' format specifier (bug #216676).
+- Misleading 'id -Z root' error message (bug #211089).
+
 * Wed Oct  4 2006 Tim Waugh <twaugh at redhat.com> 5.97-12
 - Fixed 'cp -Z' when destination exists, again (bug #189967).
 




More information about the fedora-cvs-commits mailing list