From 96aa3c3d90abcd7fb5161dc8469f2735b1aafde6 Mon Sep 17 00:00:00 2001
From: Ondrej Vasik <ovasik@fedoraproject.org>
Date: Oct 29 2007 11:36:17 +0000
Subject: runcon should not reorder parameters - upstream(#232652), License tag to

    GPLv2+

---

diff --git a/coreutils-selinux.patch b/coreutils-selinux.patch
index 7e4797d..baba88a 100644
--- a/coreutils-selinux.patch
+++ b/coreutils-selinux.patch
@@ -1717,7 +1717,7 @@
    backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX");
 --- /dev/null	2007-03-23 08:54:03.819414923 +0000
 +++ coreutils-6.9/src/runcon.c	2007-03-23 11:59:21.000000000 +0000
-@@ -0,0 +1,253 @@
+@@ -0,0 +1,252 @@
 +/*
 + * runcon [ context |
 + *         ( [ -c ] [ -r role ] [-t type] [ -u user ] [ -l levelrange ] )
@@ -1803,7 +1803,6 @@
 +  textdomain (PACKAGE);
 +  
 +  while (1) {
-+    int c;
 +    int this_option_optind = optind ? optind : 1;
 +    int option_index = 0;
 +    static struct option long_options[] = {
@@ -1816,7 +1815,7 @@
 +      { "version", 0, &show_version, 1 },
 +      { 0, 0, 0, 0 }
 +    };
-+    c = getopt_long(argc, argv, "r:t:u:l:c", long_options, &option_index);
++    int c = getopt_long(argc, argv, "+r:t:u:l:c", long_options, &option_index);
 +    if ( c == -1 ) {
 +      break;
 +    }
diff --git a/coreutils.spec b/coreutils.spec
index 4548042..f260e1a 100644
--- a/coreutils.spec
+++ b/coreutils.spec
@@ -1,8 +1,8 @@
 Summary: The GNU core utilities: a set of tools commonly used in shell scripts
 Name:    coreutils
 Version: 6.9
-Release: 8%{?dist}
-License: GPL
+Release: 9%{?dist}
+License: GPLv2+
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -282,6 +282,10 @@ fi
 /sbin/runuser
 
 %changelog
+* Mon Oct 29 2007 Ondrej Vasik <ovasik@redhat.com> - 6.9-9
+- applied upstream patch for runuser to coreutils-selinux.patch(#232652)
+- License tag to GPLv2+
+
 * Thu Oct 25 2007 Ondrej Vasik <ovasik@redhat.com> - 6.9-8
 - applied upstream patch for cp and mv(#248591)