rpms/coreutils/devel coreutils-selinux.patch, 1.28, 1.29 coreutils.spec, 1.151, 1.152

[fedora-cvs-commits at redhat.com]

Author: twaugh

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

Modified Files:
	coreutils-selinux.patch coreutils.spec 
Log Message:
* Fri Nov 24 2006 Tim Waugh <twaugh at redhat.com> 5.97-16
- Unbreak id (bug #217177).
- Resolves: rhbz#217177


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/devel/coreutils-selinux.patch,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- coreutils-selinux.patch	23 Nov 2006 17:41:19 -0000	1.28
+++ coreutils-selinux.patch	24 Nov 2006 18:35:25 -0000	1.29
@@ -2138,8 +2138,8 @@
  	case_GETOPT_HELP_CHAR;
  	case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
  	default:
---- 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
+--- coreutils-5.97/src/id.c	2006-11-23 17:05:07.000000000 +0000
++++ coreutils-5.97/src/id.c	2006-11-24 18:29:34.000000000 +0000
 @@ -37,6 +37,20 @@
  
  int getugroups ();
@@ -2226,7 +2226,7 @@
 -    error (EXIT_FAILURE, 0, _("cannot print only user and only group"));
 +#ifdef WITH_SELINUX
 +  if (argc - optind == 1)
-+    error (1, 0, _("\
++    if (just_context) error (1, 0, _("\
 +cannot print security context when user specified"));
 +
 +  if( just_context  && !selinux_enabled)
@@ -2260,9 +2260,7 @@
    else
      print_full_info (argv[optind]);
    putchar ('\n');
-@@ -407,4 +464,9 @@
-     free (groups);
-   }
+@@ -409,2 +466,7 @@
  #endif /* HAVE_GETGROUPS */
 +#ifdef WITH_SELINUX
 +  if ( context != NULL ) {


Index: coreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- coreutils.spec	23 Nov 2006 17:41:36 -0000	1.151
+++ coreutils.spec	24 Nov 2006 18:35:26 -0000	1.152
@@ -1,7 +1,7 @@
 Summary: The GNU core utilities: a set of tools commonly used in shell scripts
 Name:    coreutils
 Version: 5.97
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: GPL
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -285,6 +285,9 @@
 /sbin/runuser
 
 %changelog
+* Fri Nov 24 2006 Tim Waugh <twaugh at redhat.com> 5.97-16
+- Unbreak id (bug #217177).
+
 * Thu Nov 23 2006 Tim Waugh <twaugh at redhat.com> 5.97-15
 - Fixed stat's 'C' format specifier (bug #216676).
 - Misleading 'id -Z root' error message (bug #211089).