From add8cb4ea7db75e0c8a79969ef0c133e6c9d9034 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Nov 24 2006 18:35:26 +0000
Subject: - Unbreak id (bug #217177).

- Resolves: rhbz#217177

---

diff --git a/coreutils-selinux.patch b/coreutils-selinux.patch
index 0cf6a4b..58d6a53 100644
--- a/coreutils-selinux.patch
+++ b/coreutils-selinux.patch
@@ -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 ) {
diff --git a/coreutils.spec b/coreutils.spec
index 113accf..bc85f76 100644
--- a/coreutils.spec
+++ b/coreutils.spec
@@ -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 @@ fi
 /sbin/runuser
 
 %changelog
+* Fri Nov 24 2006 Tim Waugh <twaugh@redhat.com> 5.97-16
+- Unbreak id (bug #217177).
+
 * Thu Nov 23 2006 Tim Waugh <twaugh@redhat.com> 5.97-15
 - Fixed stat's 'C' format specifier (bug #216676).
 - Misleading 'id -Z root' error message (bug #211089).