diff -urp coreutils-7.0.orig/configure.ac coreutils-7.0/configure.ac

--- coreutils-7.0.orig/configure.ac	2009-01-28 17:18:16.790672000 +0100

+++ coreutils-7.0/configure.ac	2009-01-28 17:18:52.757913913 +0100

@@ -51,6 +51,13 @@ AC_ARG_ENABLE(pam, dnl

 LIB_PAM="-ldl -lpam -lpam_misc"

 AC_SUBST(LIB_PAM)])

+dnl Give the chance to enable SELINUX

+AC_ARG_ENABLE(selinux, dnl

+[  --enable-selinux              Enable use of the SELINUX libraries],

+[AC_DEFINE(WITH_SELINUX, 1, [Define if you want to use SELINUX])

+LIB_SELINUX="-lselinux"

+AC_SUBST(LIB_SELINUX)])

+

 AC_FUNC_FORK

 optional_bin_progs=

diff -urp coreutils-7.0.orig/man/chcon.x coreutils-7.0/man/chcon.x

--- coreutils-7.0.orig/man/chcon.x	2008-03-07 17:05:53.000000000 +0100

+++ coreutils-7.0/man/chcon.x	2009-01-28 17:18:52.759913926 +0100

@@ -1,4 +1,4 @@

 [NAME]

-chcon \- change file security context

+chcon \- change file SELinux security context

 [DESCRIPTION]

 .\" Add any additional description here

diff -urp coreutils-7.0.orig/man/runcon.x coreutils-7.0/man/runcon.x

--- coreutils-7.0.orig/man/runcon.x	2008-03-07 17:05:53.000000000 +0100

+++ coreutils-7.0/man/runcon.x	2009-01-28 17:18:52.760913933 +0100

@@ -1,5 +1,5 @@

 [NAME]

-runcon \- run command with specified security context

+runcon \- run command with specified SELinux security context

 [DESCRIPTION]

 Run COMMAND with completely-specified CONTEXT, or with current or

 transitioned security context modified by one or more of LEVEL,

diff -urp coreutils-7.0.orig/src/chcon.c coreutils-7.0/src/chcon.c

--- coreutils-7.0.orig/src/chcon.c	2008-08-24 22:30:10.000000000 +0200

+++ coreutils-7.0/src/chcon.c	2009-01-28 17:18:52.761913940 +0100

@@ -366,7 +366,7 @@ Usage: %s [OPTION]... CONTEXT FILE...\n\

 "),

 	program_name, program_name, program_name);

       fputs (_("\

-Change the security context of each FILE to CONTEXT.\n\

+Change the SELinux security context of each FILE to CONTEXT.\n\

 With --reference, change the security context of each FILE to that of RFILE.\n\

 \n\

   -c, --changes          like verbose but report only when a change is made\n\

diff -urp coreutils-7.0.orig/src/copy.c coreutils-7.0/src/copy.c

--- coreutils-7.0.orig/src/copy.c	2009-01-28 17:18:16.748671000 +0100

+++ coreutils-7.0/src/copy.c	2009-01-28 17:18:52.762913947 +0100

@@ -449,9 +449,10 @@ copy_reg (char const *src_name, char con

 	  security_context_t con = NULL;

 	  if (getfscreatecon (&con) < 0)

 	    {

-	      error (0, errno, _("failed to get file system create context"));

+        //do not show error when we not require security context (-a option)

 	      if (x->require_preserve_context)

 		{

+      error (0, errno, _("failed to get file system create context"));

 		  return_val = false;

 		  goto close_src_and_dst_desc;

 		}

@@ -461,11 +462,12 @@ copy_reg (char const *src_name, char con

 	    {

 	      if (fsetfilecon (dest_desc, con) < 0)

 		{

-		  error (0, errno,

-			 _("failed to set the security context of %s to %s"),

-			 quote_n (0, dst_name), quote_n (1, con));

+      //do not show error when we not require security context (-a option)

 		  if (x->require_preserve_context)

 		    {

+          error (0, errno,

+		    	 _("failed to set the security context of %s to %s"),

+    			 quote_n (0, dst_name), quote_n (1, con));

 		      return_val = false;

 		      freecon (con);

 		      goto close_src_and_dst_desc;

@@ -1714,11 +1716,12 @@ copy_internal (char const *src_name, cha

 	{

 	  if (setfscreatecon (con) < 0)

 	    {

-	      error (0, errno,

-		     _("failed to set default file creation context to %s"),

-		     quote (con));

+        //do not show error when we not require security context (-a option)

 	      if (x->require_preserve_context)

 		{

+      error (0, errno,

+		     _("failed to set default file creation context to %s"),

+		     quote (con));

 		  freecon (con);

 		  return false;

 		}

@@ -1728,12 +1731,14 @@ copy_internal (char const *src_name, cha

       else

 	{

 	  if (errno != ENOTSUP && errno != ENODATA)

-	    {

-	      error (0, errno,

-		     _("failed to get security context of %s"),

-		     quote (src_name));

-	      if (x->require_preserve_context)

-		return false;

+	    { 

+        //do not show error when we not require security context (-a option)

+	      if (x->require_preserve_context) {

+           error (0, errno,

+    		   _("failed to get security context of %s"),

+		       quote (src_name));

+           return false;

+        }

 	    }

 	}

     }

@@ -1819,6 +1824,8 @@ copy_internal (char const *src_name, cha

 	{

 	  /* Here, we are crossing a file system boundary and cp's -x option

 	     is in effect: so don't copy the contents of this directory. */

+        if (x->preserve_security_context)

+      	    restore_default_fscreatecon_or_die ();

 	}

       else

 	{

diff -urp coreutils-7.0.orig/src/copy.h coreutils-7.0/src/copy.h

--- coreutils-7.0.orig/src/copy.h	2009-01-28 17:18:16.748671000 +0100

+++ coreutils-7.0/src/copy.h	2009-01-28 17:18:52.763913953 +0100

@@ -141,6 +141,9 @@ struct cp_options

   bool preserve_mode;

   bool preserve_timestamps;

+  /* If true, attempt to set specified security context */

+  bool set_security_context;

+

   /* Enabled for mv, and for cp by the --preserve=links option.

      If true, attempt to preserve in the destination files any

      logical hard links between the source files.  If used with cp's

diff -urp coreutils-7.0.orig/src/cp.c coreutils-7.0/src/cp.c

--- coreutils-7.0.orig/src/cp.c	2009-01-28 17:18:16.750671000 +0100

+++ coreutils-7.0/src/cp.c	2009-01-28 17:20:29.109561384 +0100

@@ -148,6 +148,7 @@ static struct option const long_opts[] =

   {"target-directory", required_argument, NULL, 't'},

   {"update", no_argument, NULL, 'u'},

   {"verbose", no_argument, NULL, 'v'},

+  {"context", required_argument, NULL, 'Z'},

   {GETOPT_HELP_OPTION_DECL},

   {GETOPT_VERSION_OPTION_DECL},

   {NULL, 0, NULL, 0}

@@ -175,7 +176,7 @@ Copy SOURCE to DEST, or multiple SOURCE(

 Mandatory arguments to long options are mandatory for short options too.\n\

 "), stdout);

       fputs (_("\

-  -a, --archive                same as -dpR\n\

+  -a, --archive                same as -cdpR\n\

       --backup[=CONTROL]       make a backup of each existing destination file\n\

   -b                           like --backup but does not accept an argument\n\

       --copy-contents          copy contents of special files when recursive\n\

@@ -206,6 +207,9 @@ Mandatory arguments to long options are 

                                  all\n\

 "), stdout);

       fputs (_("\

+  -c                           same as --preserve=context\n\

+"), stdout);

+      fputs (_("\

       --no-preserve=ATTR_LIST  don't preserve the specified attributes\n\

       --parents                use full source file name under DIRECTORY\n\

 "), stdout);

@@ -231,6 +235,7 @@ Mandatory arguments to long options are 

                                  destination file is missing\n\

   -v, --verbose                explain what is being done\n\

   -x, --one-file-system        stay on this file system\n\

+  -Z, --context=CONTEXT        set security context of copy to CONTEXT\n\

 "), stdout);

       fputs (HELP_OPTION_DESCRIPTION, stdout);

       fputs (VERSION_OPTION_DESCRIPTION, stdout);

@@ -780,6 +785,7 @@ cp_option_init (struct cp_options *x)

   x->preserve_timestamps = false;

   x->preserve_security_context = false;

   x->require_preserve_context = false;

+  x->set_security_context = false;

   x->preserve_xattr = false;

   x->require_preserve_xattr = false;

@@ -925,7 +931,7 @@ main (int argc, char **argv)

      we'll actually use backup_suffix_string.  */

   backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX");

-  while ((c = getopt_long (argc, argv, "abdfHilLnprst:uvxPRS:T",

+  while ((c = getopt_long (argc, argv, "abcdfHilLnprst:uvxPRS:TZ:",

 			   long_opts, NULL))

 	 != -1)

     {

@@ -936,13 +942,15 @@ main (int argc, char **argv)

 				     sparse_type_string, sparse_type);

 	  break;

-	case 'a':		/* Like -dpR. */

+	case 'a':		/* Like -dpRc. */

 	  x.dereference = DEREF_NEVER;

 	  x.preserve_links = true;

 	  x.preserve_ownership = true;

 	  x.preserve_mode = true;

 	  x.preserve_timestamps = true;

-	  x.require_preserve = true;

+    x.require_preserve = true;

+    if (selinux_enabled)

+	     x.preserve_security_context = true;

 	  x.recursive = true;

 	  break;

@@ -956,6 +964,16 @@ main (int argc, char **argv)

 	  copy_contents = true;

 	  break;

+  case 'c':

+	  if ( x.set_security_context ) { 

+	      (void) fprintf(stderr, "%s: cannot force target context and preserve it\n", argv[0]);

+	    exit( 1 );

+	  }

+	  else if (selinux_enabled) {

+	    x.preserve_security_context = true;

+      x.require_preserve_context = true;

+    }

+	  break;

 	case 'd':

 	  x.preserve_links = true;

 	  x.dereference = DEREF_NEVER;

@@ -1072,6 +1090,27 @@ main (int argc, char **argv)

 	  x.one_file_system = true;

 	  break;

+

+  case 'Z':

+	  /* politely decline if we're not on a selinux-enabled kernel. */

+	  if( !selinux_enabled ) {

+	    fprintf( stderr, "Warning:  ignoring --context (-Z). "

+		             "It requires a SELinux enabled kernel.\n" );

+	    break;

+	  }

+	  if ( x.preserve_security_context ) {

+	    (void) fprintf(stderr, "%s: cannot force target context to '%s' and preserve it\n", argv[0], optarg);

+	    exit( 1 );

+	  }

+	  x.set_security_context = true;

+	  /* if there's a security_context given set new path 

+	     components to that context, too */

+	  if ( setfscreatecon(optarg) < 0 ) {

+	    (void) fprintf(stderr, _("cannot set default security context %s\n"), optarg);

+	    exit( 1 );

+	  }

+	  break;

+

 	case 'S':

 	  make_backups = true;

 	  backup_suffix_string = optarg;

diff -urp coreutils-7.0.orig/src/id.c coreutils-7.0/src/id.c

--- coreutils-7.0.orig/src/id.c	2008-08-24 22:58:15.000000000 +0200

+++ coreutils-7.0/src/id.c	2009-01-28 17:18:52.766913973 +0100

@@ -106,7 +106,7 @@ int

 main (int argc, char **argv)

 {

   int optc;

-  int selinux_enabled = (is_selinux_enabled () > 0);

+  bool selinux_enabled = (is_selinux_enabled () > 0);

   /* If true, output the list of all group IDs. -G */

   bool just_group_list = false;

diff -urp coreutils-7.0.orig/src/install.c coreutils-7.0/src/install.c

--- coreutils-7.0.orig/src/install.c	2009-01-28 17:18:16.751671000 +0100

+++ coreutils-7.0/src/install.c	2009-01-28 17:18:52.767913980 +0100

@@ -152,11 +152,11 @@ static struct option const long_options[

   {"no-target-directory", no_argument, NULL, 'T'},

   {"owner", required_argument, NULL, 'o'},

   {"preserve-timestamps", no_argument, NULL, 'p'},

-  {"preserve-context", no_argument, NULL, PRESERVE_CONTEXT_OPTION},

+  {"preserve-context", no_argument, NULL, 'P'},

   /* Continue silent support for --preserve_context until Jan 2008. FIXME-obs

      After that, FIXME-obs: warn in, say, late 2008, and disable altogether

      a year or two later.  */

-  {"preserve_context", no_argument, NULL, PRESERVE_CONTEXT_OPTION},

+  {"preserve_context", no_argument, NULL, 'P'},

   {"strip", no_argument, NULL, 's'},

   {"strip-program", required_argument, NULL, STRIP_PROGRAM_OPTION},

   {"suffix", required_argument, NULL, 'S'},

@@ -185,6 +185,7 @@ cp_option_init (struct cp_options *x)

   x->preserve_timestamps = false;

   x->require_preserve = false;

   x->require_preserve_context = false;

+  x->set_security_context = false;

   x->recursive = false;

   x->sparse_mode = SPARSE_AUTO;

   x->symbolic_link = false;

@@ -361,7 +362,7 @@ main (int argc, char **argv)

      we'll actually use backup_suffix_string.  */

   backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX");

-  while ((optc = getopt_long (argc, argv, "bcsDdg:m:o:pt:TvS:Z:", long_options,

+  while ((optc = getopt_long (argc, argv, "bcsDdg:m:o:pPt:TvS:Z:", long_options,

 			      NULL)) != -1)

     {

       switch (optc)

@@ -428,6 +429,7 @@ main (int argc, char **argv)

 	  no_target_directory = true;

 	  break;

+  case 'P':

 	case PRESERVE_CONTEXT_OPTION:

 	  if ( ! selinux_enabled)

 	    {

@@ -435,6 +437,10 @@ main (int argc, char **argv)

 			     "this kernel is not SELinux-enabled"));

 	      break;

 	    }

+    if ( x.set_security_context ) {

+		  (void) fprintf(stderr, "%s: cannot force target context and preserve it\n", argv[0]);

+ 	    exit( 1 );

+ 	  }

 	  x.preserve_security_context = true;

 	  use_default_selinux_context = false;

 	  break;

@@ -446,6 +452,7 @@ main (int argc, char **argv)

 	      break;

 	    }

 	  scontext = optarg;

+	  x.set_security_context = true;

 	  use_default_selinux_context = false;

 	  break;

 	case_GETOPT_HELP_CHAR;

@@ -850,8 +857,8 @@ Mandatory arguments to long options are 

   -v, --verbose       print the name of each directory as it is created\n\

 "), stdout);

       fputs (_("\

-      --preserve-context  preserve SELinux security context\n\

-  -Z, --context=CONTEXT  set SELinux security context of files and directories\n\

+  -P, --preserve-context (SELinux) preserve security context\n\

+  -Z, --context=CONTEXT  (SELinux) set security context of files and directories\n\

 "), stdout);

       fputs (HELP_OPTION_DESCRIPTION, stdout);

diff -urp coreutils-7.0.orig/src/ls.c coreutils-7.0/src/ls.c

--- coreutils-7.0.orig/src/ls.c	2009-01-28 17:18:16.705671000 +0100

+++ coreutils-7.0/src/ls.c	2009-01-28 17:18:52.770914000 +0100

@@ -139,7 +139,8 @@ enum filetype

     symbolic_link,

     sock,

     whiteout,

-    arg_directory

+    arg_directory,

+    command_line

   };

 /* Display letters and indicators for each filetype.

@@ -182,8 +183,9 @@ struct fileinfo

        exists, otherwise false.  */

     bool linkok;

-    /* For long listings, true if the file has an access control list,

-       or an SELinux security context.  */

+    /* For long listings, true if the file has an access control list.

+       Unlike with upstream not true for SELinux scontext(#430779) as

+       this removes possibility to detect ACL via ls */

     bool have_acl;

   };

@@ -246,6 +248,7 @@ static void queue_directory (char const 

 static void sort_files (void);

 static void parse_ls_color (void);

 void usage (int status);

+static void print_scontext_format (const struct fileinfo *f);

 /* Initial size of hash table.

    Most hierarchies are likely to be shallower than this.  */

@@ -315,7 +318,7 @@ static struct pending *pending_dirs;

 static struct timespec current_time;

-static bool print_scontext;

+static int print_scontext = 0;

 static char UNKNOWN_SECURITY_CONTEXT[] = "?";

 /* Whether any of the files has an ACL.  This affects the width of the

@@ -355,7 +358,9 @@ enum format

     one_per_line,		/* -1 */

     many_per_line,		/* -C */

     horizontal,			/* -x */

-    with_commas			/* -m */

+    with_commas,			/* -m */

+    security_format, /* -Z */

+    invalid_format

   };

 static enum format format;

@@ -744,6 +749,9 @@ enum

   SHOW_CONTROL_CHARS_OPTION,

   SI_OPTION,

   SORT_OPTION,

+  CONTEXT_OPTION,

+  LCONTEXT_OPTION,

+  SCONTEXT_OPTION,

   TIME_OPTION,

   TIME_STYLE_OPTION

 };

@@ -789,7 +797,9 @@ static struct option const long_options[

   {"time-style", required_argument, NULL, TIME_STYLE_OPTION},

   {"color", optional_argument, NULL, COLOR_OPTION},

   {"block-size", required_argument, NULL, BLOCK_SIZE_OPTION},

-  {"context", no_argument, 0, 'Z'},

+  {"context", no_argument, 0, CONTEXT_OPTION},

+  {"lcontext", no_argument, 0, LCONTEXT_OPTION},

+  {"scontext", no_argument, 0, SCONTEXT_OPTION},

   {"author", no_argument, NULL, AUTHOR_OPTION},

   {GETOPT_HELP_OPTION_DECL},

   {GETOPT_VERSION_OPTION_DECL},

@@ -799,12 +809,12 @@ static struct option const long_options[

 static char const *const format_args[] =

 {

   "verbose", "long", "commas", "horizontal", "across",

-  "vertical", "single-column", NULL

+  "vertical", "single-column", "context", NULL

 };

 static enum format const format_types[] =

 {

   long_format, long_format, with_commas, horizontal, horizontal,

-  many_per_line, one_per_line

+  many_per_line, one_per_line, security_format

 };

 ARGMATCH_VERIFY (format_args, format_types);

@@ -1251,7 +1261,7 @@ main (int argc, char **argv)

   format_needs_stat = sort_type == sort_time || sort_type == sort_size

     || format == long_format

-    || print_scontext

+    || format == security_format || print_scontext

     || print_block_size;

   format_needs_type = (! format_needs_stat

 		       && (recursive

@@ -1282,7 +1292,7 @@ main (int argc, char **argv)

     }

   else

     do

-      gobble_file (argv[i++], unknown, NOT_AN_INODE_NUMBER, true, "");

+      gobble_file (argv[i++], command_line, NOT_AN_INODE_NUMBER, true, "");

     while (i < argc);

   if (cwd_n_used)

@@ -1445,7 +1455,7 @@ decode_switches (int argc, char **argv)

   ignore_mode = IGNORE_DEFAULT;

   ignore_patterns = NULL;

   hide_patterns = NULL;

-  print_scontext = false;

+  print_scontext = 0;

   /* FIXME: put this in a function.  */

   {

@@ -1827,13 +1837,27 @@ decode_switches (int argc, char **argv)

 	  break;

 	case 'Z':

-	  print_scontext = true;

+	  print_scontext = 1;

+    format = security_format;

 	  break;

 	case_GETOPT_HELP_CHAR;

 	case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);

+  case CONTEXT_OPTION: /* default security context format */

+		print_scontext = 1;

+		format = security_format;

+		break;

+	case LCONTEXT_OPTION: /* long format plus security context */

+		print_scontext = 1;

+		format = long_format;

+		break;

+	case SCONTEXT_OPTION: /* short form of new security format */

+		print_scontext = 0;

+		format = security_format;

+		break;

+

 	default:

 	  usage (LS_FAILURE);

 	}

@@ -2547,8 +2571,10 @@ clear_files (void)

       struct fileinfo *f = sorted_file[i];

       free (f->name);

       free (f->linkname);

-      if (f->scontext != UNKNOWN_SECURITY_CONTEXT)

-	freecon (f->scontext);

+      if (f->scontext != UNKNOWN_SECURITY_CONTEXT) {

+       	freecon (f->scontext);

+        f->scontext = NULL;

+      }

     }

   cwd_n_used = 0;

@@ -2590,6 +2616,7 @@ gobble_file (char const *name, enum file

   memset (f, '\0', sizeof *f);

   f->stat.st_ino = inode;

   f->filetype = type;

+  f->scontext = NULL;

   if (command_line_arg

       || format_needs_stat

@@ -2689,7 +2716,7 @@ gobble_file (char const *name, enum file

       f->stat_ok = true;

-      if (format == long_format || print_scontext)

+      if (format == long_format || format == security_format || print_scontext)

 	{

 	  bool have_acl = false;

 	  int attr_len = (do_deref

@@ -2708,9 +2735,7 @@ gobble_file (char const *name, enum file

 	      f->scontext = xstrdup ("unlabeled");

 	    }

-	  if (err == 0)

-	    have_acl = ! STREQ ("unlabeled", f->scontext);

-	  else

+	  if (err != 0)

 	    {

 	      f->scontext = UNKNOWN_SECURITY_CONTEXT;

@@ -2722,7 +2747,7 @@ gobble_file (char const *name, enum file

 		err = 0;

 	    }

-	  if (err == 0 && ! have_acl && format == long_format)

+	  if (err == 0 && format == long_format)

 	    {

 	      int n = file_has_acl (absolute_name, &f->stat);

 	      err = (n < 0);

@@ -3297,6 +3322,13 @@ print_current_files (void)

 	  print_long_format (sorted_file[i]);

 	  DIRED_PUTCHAR ('\n');

 	}

+     break;

+    case security_format:

+      for (i = 0; i < cwd_n_used; i++)

+      {

+        print_scontext_format (sorted_file[i]);

+        DIRED_PUTCHAR ('\n');

+      }

       break;

     }

 }

@@ -3482,7 +3514,7 @@ print_long_format (const struct fileinfo

 	 The latter is wrong when inode_number_width is zero.  */

       p += strlen (p);

     }

-

+  

   if (print_block_size)

     {

       char hbuf[LONGEST_HUMAN_READABLE + 1];

@@ -3511,9 +3543,15 @@ print_long_format (const struct fileinfo

      The latter is wrong when nlink_width is zero.  */

   p += strlen (p);

+  if (print_scontext)

+    {

+      sprintf (p, "%-32s ", f->scontext ? f->scontext : "");

+      p += strlen (p);

+    }

+

   DIRED_INDENT ();

-  if (print_owner | print_group | print_author | print_scontext)

+  if (print_owner | print_group | print_author)

     {

       DIRED_FPUTS (buf, stdout, p - buf);

@@ -3526,9 +3564,6 @@ print_long_format (const struct fileinfo

       if (print_author)

 	format_user (f->stat.st_author, author_width, f->stat_ok);

-      if (print_scontext)

-	format_user_or_group (f->scontext, 0, scontext_width);

-

       p = buf;

     }

@@ -3867,9 +3902,6 @@ print_file_name_and_frills (const struct

 	    human_readable (ST_NBLOCKS (f->stat), buf, human_output_opts,

 			    ST_NBLOCKSIZE, output_block_size));

-  if (print_scontext)

-    printf ("%*s ", format == with_commas ? 0 : scontext_width, f->scontext);

-

   print_name_with_quoting (f->name, FILE_OR_LINK_MODE (f), f->linkok,

 			   f->stat_ok, f->filetype, NULL);

@@ -4077,9 +4109,6 @@ length_of_file_name_and_frills (const st

 					  output_block_size))

 		: block_size_width);

-  if (print_scontext)

-    len += 1 + (format == with_commas ? strlen (f->scontext) : scontext_width);

-

   quote_name (NULL, f->name, filename_quoting_options, &name_width);

   len += name_width;

@@ -4510,9 +4539,16 @@ Mandatory arguments to long options are 

   -w, --width=COLS           assume screen width instead of current value\n\

   -x                         list entries by lines instead of by columns\n\

   -X                         sort alphabetically by entry extension\n\

-  -Z, --context              print any SELinux security context of each file\n\

   -1                         list one file per line\n\

 "), stdout);

+      fputs(_("\nSELinux options:\n\n\

+  --lcontext                 Display security context.   Enable -l. Lines\n\

+                             will probably be too wide for most displays.\n\

+  -Z, --context              Display security context so it fits on most\n\

+                             displays.  Displays only mode, user, group,\n\

+                             security context and file name.\n\

+  --scontext                 Display only security context and file name.\n\

+"), stdout);

       fputs (HELP_OPTION_DESCRIPTION, stdout);

       fputs (VERSION_OPTION_DESCRIPTION, stdout);

       fputs (_("\n\

@@ -4541,3 +4577,67 @@ Exit status:\n\

     }

   exit (status);

 }

+

+static void

+print_scontext_format (const struct fileinfo *f)

+{

+  char modebuf[12];

+

+  /* 7 fields that may require LONGEST_HUMAN_READABLE bytes,

+     1 10-byte mode string,

+     9 spaces, one following each of these fields, and

+     1 trailing NUL byte.  */

+

+  char init_bigbuf[7 * LONGEST_HUMAN_READABLE + 10  + 9 + 1];

+  char *buf = init_bigbuf;

+  size_t bufsize = sizeof (init_bigbuf);

+  size_t s;

+  char *p;

+  const char *fmt;

+  char *user_name;

+  char *group_name;

+  int rv;

+  char *scontext;

+

+  p = buf;

+

+  if ( print_scontext ) { /* zero means terse listing */

+    filemodestring (&f->stat, modebuf);

+    modebuf[10] = (f->have_acl ? '+' : ' ');

+    modebuf[11] = '\0';

+

+    /* print mode */

+

+    (void) sprintf (p, "%s ", modebuf);

+    p += strlen (p);

+

+    /* print standard user and group */

+

+    DIRED_FPUTS (buf, stdout, p - buf);

+    format_user (f->stat.st_uid, owner_width, f->stat_ok);

+    format_group (f->stat.st_gid, group_width, f->stat_ok);

+    p = buf;

+  }

+

+  (void) sprintf (p, "%-32s ", f->scontext ?: "");

+  p += strlen (p);

+ 

+  DIRED_INDENT ();

+  DIRED_FPUTS (buf, stdout, p - buf);

+  print_name_with_quoting (f->name, f->stat.st_mode, f->linkok,

+			   f->stat_ok, f->filetype, &dired_obstack);

+ 

+  if (f->filetype == symbolic_link) {

+      if (f->linkname) {

+	  DIRED_FPUTS_LITERAL (" -> ", stdout);

+	  print_name_with_quoting (f->linkname, f->linkmode, f->linkok - 1,

+				   f->stat_ok, f->filetype, NULL);

+	  if (indicator_style != none)

+	    print_type_indicator (f->stat_ok, f->linkmode, f->filetype);

+      }

+  }

+  else {

+    if (indicator_style != none)

+      print_type_indicator (f->stat_ok, f->stat.st_mode, f->filetype);

+  }

+}

diff -urp coreutils-7.0.orig/src/mkdir.c coreutils-7.0/src/mkdir.c

--- coreutils-7.0.orig/src/mkdir.c	2008-08-24 22:58:15.000000000 +0200

+++ coreutils-7.0/src/mkdir.c	2009-01-28 17:18:52.771914007 +0100

@@ -39,6 +39,7 @@

 static struct option const longopts[] =

 {

   {GETOPT_SELINUX_CONTEXT_OPTION_DECL},

+  {"context", required_argument, NULL, 'Z'},

   {"mode", required_argument, NULL, 'm'},

   {"parents", no_argument, NULL, 'p'},

   {"verbose", no_argument, NULL, 'v'},

diff -urp coreutils-7.0.orig/src/mknod.c coreutils-7.0/src/mknod.c

--- coreutils-7.0.orig/src/mknod.c	2008-09-27 19:28:54.000000000 +0200

+++ coreutils-7.0/src/mknod.c	2009-01-28 17:18:52.772914014 +0100

@@ -35,7 +35,7 @@

 static struct option const longopts[] =

 {

-  {GETOPT_SELINUX_CONTEXT_OPTION_DECL},

+  {GETOPT_SELINUX_CONTEXT_OPTION_DECL}, 

   {"mode", required_argument, NULL, 'm'},

   {GETOPT_HELP_OPTION_DECL},

   {GETOPT_VERSION_OPTION_DECL},

diff -urp coreutils-7.0.orig/src/mv.c coreutils-7.0/src/mv.c

--- coreutils-7.0.orig/src/mv.c	2009-01-28 17:18:16.752671000 +0100

+++ coreutils-7.0/src/mv.c	2009-01-28 17:18:52.773914020 +0100

@@ -138,6 +138,7 @@ cp_option_init (struct cp_options *x)

   x->preserve_mode = true;

   x->preserve_timestamps = true;

   x->preserve_security_context = selinux_enabled;

+  x->set_security_context = false;

   x->require_preserve = false;  /* FIXME: maybe make this an option */

   x->require_preserve_context = false;

   x->preserve_xattr = true;

diff -urp coreutils-7.0.orig/src/runcon.c coreutils-7.0/src/runcon.c

--- coreutils-7.0.orig/src/runcon.c	2008-08-24 22:30:10.000000000 +0200

+++ coreutils-7.0/src/runcon.c	2009-01-28 17:18:52.774914027 +0100

@@ -86,7 +86,7 @@ Usage: %s CONTEXT COMMAND [args]\n\

   or:  %s [ -c ] [-u USER] [-r ROLE] [-t TYPE] [-l RANGE] COMMAND [args]\n\

 "), program_name, program_name);

       fputs (_("\

-Run a program in a different security context.\n\

+Run a program in a different SELinux security context.\n\

 With neither CONTEXT nor COMMAND, print the current security context.\n\

 \n\

   CONTEXT            Complete security context\n\

diff -urp coreutils-7.0.orig/src/stat.c coreutils-7.0/src/stat.c

--- coreutils-7.0.orig/src/stat.c	2008-09-27 19:28:54.000000000 +0200

+++ coreutils-7.0/src/stat.c	2009-01-28 17:18:52.775914034 +0100

@@ -823,7 +823,7 @@ print_it (char const *format, char const

 /* Stat the file system and print what we find.  */

 static bool

-do_statfs (char const *filename, bool terse, char const *format)

+do_statfs (char const *filename, bool terse, bool secure, char const *format)

 {

   STRUCT_STATVFS statfsbuf;

@@ -835,15 +835,31 @@ do_statfs (char const *filename, bool te

     }

   if (format == NULL)

+  {

+    if (terse)

     {

-      format = (terse

-		? "%n %i %l %t %s %S %b %f %a %c %d\n"

-		: "  File: \"%n\"\n"

-		"    ID: %-8i Namelen: %-7l Type: %T\n"

-		"Block size: %-10s Fundamental block size: %S\n"

-		"Blocks: Total: %-10b Free: %-10f Available: %a\n"

-		"Inodes: Total: %-10c Free: %d\n");

+      if (secure)

+        format = "%n %i %l %t %s %S %b %f %a %c %d %C\n";

+   	  else

+	      format = "%n %i %l %t %s %S %b %f %a %c %d\n";

     }

+    else

+  	{

+	    if (secure)

+	      format = "  File: \"%n\"\n"

+	        "    ID: %-8i Namelen: %-7l Type: %T\n"

+  	      "Block size: %-10s Fundamental block size: %S\n"

+	        "Blocks: Total: %-10b Free: %-10f Available: %a\n"

+	        "Inodes: Total: %-10c Free: %d\n"

+	        "   S_Context: %C\n";

+  	  else

+	      format = "  File: \"%n\"\n"

+	        "    ID: %-8i Namelen: %-7l Type: %T\n"

+	        "Block size: %-10s Fundamental block size: %S\n"

+	        "Blocks: Total: %-10b Free: %-10f Available: %a\n"

+  	      "Inodes: Total: %-10c Free: %d\n";

+     }

+  }

   print_it (format, filename, print_statfs, &statfsbuf);

   return true;

@@ -851,7 +867,7 @@ do_statfs (char const *filename, bool te

 /* stat the file and print what we find */

 static bool

-do_stat (char const *filename, bool terse, char const *format)

+do_stat (char const *filename, bool terse, bool secure, char const *format)

 {

   struct stat statbuf;

@@ -864,9 +880,12 @@ do_stat (char const *filename, bool ters

   if (format == NULL)

     {

       if (terse)

-	{

-	  format = "%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %o\n";

-	}

+      {

+        if (secure)

+  	     format = "%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %o %C\n";

+  	   else

+	       format = "%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %o\n";

+      }

       else

 	{

 	  /* Temporary hack to match original output until conditional

@@ -883,12 +902,22 @@ do_stat (char const *filename, bool ters

 	    }

 	  else

 	    {

-	      format =

-		"  File: %N\n"

-		"  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"

-		"Device: %Dh/%dd\tInode: %-10i  Links: %h\n"

-		"Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"

-		"Access: %x\n" "Modify: %y\n" "Change: %z\n";

+        if (secure)

+           format =

+  		  "  File: %N\n"

+	  	  "  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"

+  		  "Device: %Dh/%dd\tInode: %-10i  Links: %-5h"

+	  	  " Device type: %t,%T\n"

+ 		    "Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"

+  		  "   S_Context: %C\n"

+	  	  "Access: %x\n" "Modify: %y\n" "Change: %z\n";

+        else 

+	        format =

+    		"  File: %N\n"

+	    	"  Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"

+  	  	"Device: %Dh/%dd\tInode: %-10i  Links: %h\n"

+  	  	"Access: (%04a/%10.10A)  Uid: (%5u/%8U)   Gid: (%5g/%8G)\n"

+    		"Access: %x\n" "Modify: %y\n" "Change: %z\n";

 	    }

 	}

     }

@@ -909,6 +938,7 @@ usage (int status)

 Display file or file system status.\n\

 \n\

   -L, --dereference     follow links\n\

+  -Z, --context         print the SELinux security context \n\

   -f, --file-system     display file system status instead of file status\n\

 "), stdout);

       fputs (_("\

@@ -993,6 +1023,7 @@ main (int argc, char *argv[])

   int i;

   bool fs = false;

   bool terse = false;

+  bool secure = false;

   char *format = NULL;

   bool ok = true;

@@ -1032,13 +1063,13 @@ main (int argc, char *argv[])

 	  terse = true;

 	  break;

-	case 'Z':  /* FIXME: remove in 2010 */

-	  /* Ignore, for compatibility with distributions

-	     that implemented this before upstream.

-	     But warn of impending removal.  */

-	  error (0, 0,

-		 _("the --context (-Z) option is obsolete and will be removed\n"

-		   "in a future release"));

+	case 'Z':

+    if((is_selinux_enabled()>0))

+	    secure = 1;

+	  else {

+	    error (0, 0, _("Kernel is not SELinux enabled"));

+	    usage (EXIT_FAILURE);

+	  }

 	  break;

 	case_GETOPT_HELP_CHAR;