Blame SOURCES/coreutils-8.22-selinux-optionsseparate.patch

dd59ef
diff -urNp coreutils-8.22-orig/src/cp.c coreutils-8.22/src/cp.c
dd59ef
--- coreutils-8.22-orig/src/cp.c	2015-06-11 15:58:04.230858212 +0200
dd59ef
+++ coreutils-8.22/src/cp.c	2015-06-11 15:59:13.191396755 +0200
dd59ef
@@ -233,8 +233,10 @@ Copy SOURCE to DEST, or multiple SOURCE(
dd59ef
   -x, --one-file-system        stay on this file system\n\
dd59ef
 "), stdout);
dd59ef
       fputs (_("\
dd59ef
-  -Z, --context[=CTX]          set SELinux security context of destination\n\
dd59ef
-                                 file to default type, or to CTX if specified\n\
dd59ef
+  -Z                           set SELinux security context of destination\n\
dd59ef
+                                 file to default type\n\
dd59ef
+      --context[=CTX]          like -Z, or if CTX is specified then set the\n\
dd59ef
+                                 SELinux or SMACK security context to CTX\n\
dd59ef
 "), stdout);
dd59ef
       fputs (HELP_OPTION_DESCRIPTION, stdout);
dd59ef
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
dd59ef
diff -urNp coreutils-8.22-orig/src/install.c coreutils-8.22/src/install.c
dd59ef
--- coreutils-8.22-orig/src/install.c	2015-06-11 15:58:04.230858212 +0200
dd59ef
+++ coreutils-8.22/src/install.c	2015-06-11 16:00:16.754893027 +0200
dd59ef
@@ -647,8 +647,10 @@ In the 4th form, create all components o
dd59ef
 "), stdout);
dd59ef
       fputs (_("\
dd59ef
   -P, --preserve-context  preserve SELinux security context (-P deprecated)\n\
dd59ef
-  -Z, --context[=CTX]     set SELinux security context of destination file to\n\
dd59ef
-                            default type, or to CTX if specified\n\
dd59ef
+  -Z                      set SELinux security context of destination\n\
dd59ef
+                            file to default type\n\
dd59ef
+      --context[=CTX]     like -Z, or if CTX is specified then set the\n\
dd59ef
+                            SELinux or SMACK security context to CTX\n\
dd59ef
 "), stdout);
dd59ef
 
dd59ef
       fputs (HELP_OPTION_DESCRIPTION, stdout);
dd59ef
diff -urNp coreutils-8.22-orig/src/mkdir.c coreutils-8.22/src/mkdir.c
dd59ef
--- coreutils-8.22-orig/src/mkdir.c	2013-12-05 01:59:36.000000000 +0100
dd59ef
+++ coreutils-8.22/src/mkdir.c	2015-06-11 16:01:17.209364915 +0200
dd59ef
@@ -66,8 +66,12 @@ Create the DIRECTORY(ies), if they do no
dd59ef
   -m, --mode=MODE   set file mode (as in chmod), not a=rwx - umask\n\
dd59ef
   -p, --parents     no error if existing, make parent directories as needed\n\
dd59ef
   -v, --verbose     print a message for each created directory\n\
dd59ef
-  -Z, --context[=CTX]  set the SELinux security context of each created\n\
dd59ef
-                         directory to default type or to CTX if specified\n\
dd59ef
+"), stdout);
dd59ef
+      fputs (_("\
dd59ef
+  -Z                   set SELinux security context of each created directory\n\
dd59ef
+                         to the default type\n\
dd59ef
+      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n\
dd59ef
+                         or SMACK security context to CTX\n\
dd59ef
 "), stdout);
dd59ef
       fputs (HELP_OPTION_DESCRIPTION, stdout);
dd59ef
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
dd59ef
diff -urNp coreutils-8.22-orig/src/mkfifo.c coreutils-8.22/src/mkfifo.c
dd59ef
--- coreutils-8.22-orig/src/mkfifo.c	2013-12-05 00:43:05.000000000 +0100
dd59ef
+++ coreutils-8.22/src/mkfifo.c	2015-06-11 16:02:03.389725315 +0200
dd59ef
@@ -61,8 +61,9 @@ Create named pipes (FIFOs) with the give
dd59ef
   -m, --mode=MODE    set file permission bits to MODE, not a=rw - umask\n\
dd59ef
 "), stdout);
dd59ef
       fputs (_("\
dd59ef
-  -Z, --context[=CTX]  set the SELinux security context of each NAME to\n\
dd59ef
-                         default type, or CTX if specified\n\
dd59ef
+  -Z                   set the SELinux security context to default type\n\
dd59ef
+      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n\
dd59ef
+                         or SMACK security context to CTX\n\
dd59ef
 "), stdout);
dd59ef
       fputs (HELP_OPTION_DESCRIPTION, stdout);
dd59ef
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
dd59ef
diff -urNp coreutils-8.22-orig/src/mknod.c coreutils-8.22/src/mknod.c
dd59ef
--- coreutils-8.22-orig/src/mknod.c	2013-12-05 00:43:05.000000000 +0100
dd59ef
+++ coreutils-8.22/src/mknod.c	2015-06-11 16:02:36.300982160 +0200
dd59ef
@@ -63,8 +63,9 @@ Create the special file NAME of the give
dd59ef
   -m, --mode=MODE    set file permission bits to MODE, not a=rw - umask\n\
dd59ef
 "), stdout);
dd59ef
       fputs (_("\
dd59ef
-  -Z, --context[=CTX]  set the SELinux security context of NAME to\n\
dd59ef
-                         default type, or to CTX if specified\n\
dd59ef
+  -Z                   set the SELinux security context to default type\n\
dd59ef
+      --context[=CTX]  like -Z, or if CTX is specified then set the SELinux\n\
dd59ef
+                         or SMACK security context to CTX\n\
dd59ef
 "), stdout);
dd59ef
       fputs (HELP_OPTION_DESCRIPTION, stdout);
dd59ef
       fputs (VERSION_OPTION_DESCRIPTION, stdout);