rpms/coreutils/devel coreutils-selinux.patch, 1.35, 1.36 coreutils.spec, 1.178, 1.179

[Ondrej Vasik (ovasik)]

Author: ovasik

Update of /cvs/extras/rpms/coreutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7152

Modified Files:
	coreutils-selinux.patch coreutils.spec 
Log Message:
runcon should not reorder parameters - upstream(#232652), License tag to GPLv2+

coreutils-selinux.patch:

Index: coreutils-selinux.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-selinux.patch,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- coreutils-selinux.patch	26 Mar 2007 12:06:23 -0000	1.35
+++ coreutils-selinux.patch	29 Oct 2007 11:36:16 -0000	1.36
@@ -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;
 +    }


Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- coreutils.spec	25 Oct 2007 08:41:11 -0000	1.178
+++ coreutils.spec	29 Oct 2007 11:36:17 -0000	1.179
@@ -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 @@
 /sbin/runuser
 
 %changelog
+* Mon Oct 29 2007 Ondrej Vasik <ovasik at 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 at redhat.com> - 6.9-8
 - applied upstream patch for cp and mv(#248591)