Tue Feb 24 11:54:09 UTC 2009

Author: ovasik

Update of /cvs/extras/rpms/coreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23788

Modified Files:
	.cvsignore coreutils-5.2.1-runuser.patch 
	coreutils-6.10-configuration.patch 
	coreutils-6.10-manpages.patch coreutils-DIR_COLORS 
	coreutils-DIR_COLORS.256color coreutils-DIR_COLORS.xterm 
	coreutils-i18n.patch coreutils-pam.patch 
	coreutils-selinux.patch coreutils-selinuxmanpages.patch 
	coreutils.spec sources 
Removed Files:
	coreutils-446294-lsexitstatuses.patch 
	coreutils-463883-chcon-changes.patch 
	coreutils-6.10-longoptions.patch 
	coreutils-6.11-sparc-shafix.patch coreutils-7.0-cp-mv-n.patch 
	coreutils-7.0-dftotal.patch 
	coreutils-7.0-expr-removebignumoptions.patch 
	coreutils-7.0-xattr.patch 
Log Message:
New upstream release 7.1, removed applied patches, amended patches and LS_COLORS files


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18

--- .cvsignore	11 Nov 2008 16:10:30 -0000	1.17
+++ .cvsignore	24 Feb 2009 11:53:36 -0000	1.18
@@ -1 +1 @@
-coreutils-7.0.tar.lzma
+coreutils-7.1.tar.gz

coreutils-5.2.1-runuser.patch:

Index: coreutils-5.2.1-runuser.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-5.2.1-runuser.patch,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- coreutils-5.2.1-runuser.patch	28 Jan 2009 17:29:41 -0000	1.23
+++ coreutils-5.2.1-runuser.patch	24 Feb 2009 11:53:36 -0000	1.24
@@ -107,15 +107,15 @@
  # include <paths.h>
 @@ -149,6 +155,10 @@
  #ifndef USE_PAM
- char *crypt ();
+ char *crypt (char const *key, char const *salt);
  #endif
 +#ifndef CHECKPASSWD
 +#define CHECKPASSWD 1
 +#endif
 +
- char *getusershell ();
- void endusershell ();
- void setusershell ();
+ char *getusershell (void);
+ void endusershell (void);
+ void setusershell (void);
 @@ -156,7 +166,11 @@ void setusershell ();
  extern char **environ;
  

coreutils-6.10-configuration.patch:

Index: coreutils-6.10-configuration.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-6.10-configuration.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- coreutils-6.10-configuration.patch	3 Dec 2008 22:49:49 -0000	1.16
+++ coreutils-6.10-configuration.patch	24 Feb 2009 11:53:36 -0000	1.17
@@ -1,22 +1,3 @@
-diff -urNp coreutils-7.0-orig/tests/Makefile.am coreutils-7.0/tests/Makefile.am
---- coreutils-7.0-orig/tests/Makefile.am	2008-11-11 16:37:08.000000000 +0100
-+++ coreutils-7.0/tests/Makefile.am	2008-11-11 16:39:55.000000000 +0100
-@@ -217,7 +217,6 @@ TESTS =						\
-   misc/tee-dash					\
-   misc/test-diag				\
-   misc/timeout					\
--  misc/timeout-parameters			\
-   misc/tr					\
-   misc/truncate-dangling-symlink		\
-   misc/truncate-dir-fail			\
-@@ -285,7 +284,6 @@ TESTS =						\
-   dd/skip-seek					\
-   dd/skip-seek2					\
-   dd/unblock-sync				\
--  df/total					\
-   df/total-awk					\
-   du/2g						\
-   du/8gb					\
 diff -urN coreutils-6.12-orig/tests/misc/cut coreutils-6.12/tests/misc/cut
 --- coreutils-6.12-orig/tests/misc/cut	2008-05-17 08:41:11.000000000 +0200
 +++ coreutils-6.12/tests/misc/cut	2008-06-02 11:13:08.000000000 +0200

coreutils-6.10-manpages.patch:

Index: coreutils-6.10-manpages.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-6.10-manpages.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- coreutils-6.10-manpages.patch	11 Nov 2008 16:03:48 -0000	1.4
+++ coreutils-6.10-manpages.patch	24 Feb 2009 11:53:36 -0000	1.5
@@ -11,15 +11,3 @@
        fputs (_("\
  \n\
  The following three options are useful only when verifying checksums:\n\
-diff -urNp coreutils-6.12-orig/src/sort.c coreutils-6.12/src/sort.c
---- coreutils-6.12-orig/src/sort.c	2008-10-21 16:04:50.000000000 +0200
-+++ coreutils-6.12/src/sort.c	2008-10-22 10:52:30.000000000 +0200
-@@ -412,7 +413,7 @@ With no FILE, or when FILE is -, read st
- \n\
- *** WARNING ***\n\
- The locale specified by the environment affects sort order.\n\
--Set LC_ALL=C to get the traditional sort order that uses\n\
-+Set LC_ALL=C (by \"export LC_LL=C\") to get the traditional sort order that uses\n\
- native byte values.\n\
- "), stdout );
-       emit_bug_reporting_address ();


Index: coreutils-DIR_COLORS
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-DIR_COLORS,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- coreutils-DIR_COLORS	24 Jul 2008 13:17:42 -0000	1.5
+++ coreutils-DIR_COLORS	24 Feb 2009 11:53:37 -0000	1.6
@@ -1,4 +1,5 @@
 # Configuration file for the color ls utility
+# Synchronized with coreutils 7.1 dircolors
 # This file goes in the /etc directory, and must be world readable.
 # You can copy this file to .dir_colors in your $HOME directory to override
 # the system defaults.
@@ -34,6 +35,8 @@
 TERM dtterm
 TERM eterm-color
 TERM gnome
+TERM gnome-256color
+TERM jfbterm
 TERM konsole
 TERM kterm
 TERM linux
@@ -63,22 +66,24 @@
 
 # Below are the color init strings for the basic file types. A color init
 # string consists of one or more of the following numeric codes:
-# Attribute codes: 
+# Attribute codes:
 # 00=none 01=bold 04=underscore 05=blink 07=reverse 08=concealed
 # Text color codes:
 # 30=black 31=red 32=green 33=yellow 34=blue 35=magenta 36=cyan 37=white
 # Background color codes:
 # 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white
-NORMAL 00	# global default, although everything should be something.
-FILE 00 	# normal file
-DIR 01;34 	# directory
-LINK 01;36 	# symbolic link (If you set this to 'target' instead of a
+#NORMAL 00	# no color code at all
+#FILE 00	# normal file, use no color at all
+RESET 0 # reset to "normal" color
+DIR 01;34	# directory
+LINK 01;36	# symbolic link (If you set this to 'target' instead of a
 		# numerical value, the color is as for the file pointed to.)
+HARDLINK 44;37 # regular file with more than one link
 FIFO 40;33	# pipe
 SOCK 01;35	# socket
 DOOR 01;35	# door
 BLK 40;33;01	# block device driver
-CHR 40;33;01 	# character device driver
+CHR 40;33;01	# character device driver
 ORPHAN 40;31;01  # symlink to nonexistent file, or non-stat'able file
 MISSING 01;05;37;41 # ... and the files they point to
 SETUID 37;41	# file that is setuid (u+s)
@@ -90,13 +95,13 @@
 
 
 # This is for files with execute permission:
-EXEC 01;32 
+EXEC 01;32
 
 # List any file extensions like '.gz' or '.tar' that you would like ls
 # to colorize below. Put the extension, a space, and the color init string.
 # (and any comments you want to add after a '#')
 # executables (bright green)
-#.cmd 01;32 
+#.cmd 01;32
 #.exe 01;32
 #.com 01;32
 #.btm 01;32
@@ -104,9 +109,8 @@
 #.sh  01;32
 #.csh 01;32
  # archives or compressed (bright red)
-.tar 01;31 
+.tar 01;31
 .tgz 01;31
-.svgz 01;31
 .arj 01;31
 .taz 01;31
 .lzh 01;31
@@ -129,8 +133,9 @@
 .cpio 01;31
 .7z  01;31
 .rz  01;31
+.xz  01;31
 # image formats (magenta)
-.jpg 01;35 
+.jpg 01;35
 .jpeg 01;35
 .gif 01;35
 .bmp 01;35
@@ -164,21 +169,33 @@
 .flc 01;35
 .avi 01;35
 .fli 01;35
+.flv 01;35
 .gl 01;35
 .dl 01;35
 .xcf 01;35
 .xwd 01;35
 .yuv 01;35
 .svg 01;35
+.svgz 01;35
+# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
+.axv 01;35
+.anx 01;35
+.ogv 01;35
+.ogx 01;35
 # audio formats (cyan)
-.aac 00;36
-.au 00;36
-.flac 00;36
-.mid 00;36
-.midi 00;36
-.mka 00;36
-.mp3 00;36
-.mpc 00;36
-.ogg 00;36
-.ra 00;36
-.wav 00;36
+.aac 01;36
+.au 01;36
+.flac 01;36
+.mid 01;36
+.midi 01;36
+.mka 01;36
+.mp3 01;36
+.mpc 01;36
+.ogg 01;36
+.ra 01;36
+.wav 01;36
+# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
+.axa 01;36
+.oga 01;36
+.spx 01;36
+.xspf 01;36


Index: coreutils-DIR_COLORS.256color
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-DIR_COLORS.256color,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- coreutils-DIR_COLORS.256color	24 Jul 2008 13:17:42 -0000	1.4
+++ coreutils-DIR_COLORS.256color	24 Feb 2009 11:53:37 -0000	1.5
@@ -1,5 +1,6 @@
 # Configuration file for the 256color ls utility
 # This file goes in the /etc directory, and must be world readable.
+# Synchronized with coreutils 7.1 dircolors
 # You can copy this file to .dir_colors in your $HOME directory to override
 # the system defaults.
 # In the case that you are not satisfied with supplied colors, please
@@ -31,7 +32,7 @@
 
 # Below are the color init strings for the basic file types. A color init
 # string consists of one or more of the following numeric codes:
-# Attribute codes: 
+# Attribute codes:
 # 00=none 01=bold 04=underscore 05=blink 07=reverse 08=concealed
 # Text color(8 colors mode) codes:
 # 30=black 31=red 32=green 33=yellow 34=blue 35=magenta 36=cyan 37=white
@@ -48,16 +49,18 @@
 # You may find following command useful to search the best one for you:
 # for ((x=0; x<=255; x++));do echo -e "${x}:\033[48;5;${x}mcolor\033[000m";done
 
-NORMAL 00	# global default, although everything should be something.
-FILE 00 	# normal file
-DIR 01;38;5;27 	# directory
-LINK 01;38;5;51 	# symbolic link (If you set this to 'target' instead of a
+#NORMAL 00	# global default, no color code at all
+#FILE 00	# normal file, use no color at all
+RESET 0 # reset to "normal" color
+DIR 01;38;5;27	# directory
+LINK 01;38;5;51	# symbolic link (If you set this to 'target' instead of a
 		# numerical value, the color is as for the file pointed to.)
+HARDLINK 44;38;5;15; # regular file with more than one link
 FIFO 40;38;5;11	# pipe
 SOCK 01;38;5;13	# socket
 DOOR 01;38;5;5	# door
 BLK 01;48;5;232;38;5;11	# block device driver
-CHR 01;48;5;232;38;5;3 	# character device driver
+CHR 01;48;5;232;38;5;3	# character device driver
 ORPHAN 01;48;5;232;38;5;9  # symlink to nonexistent file, or non-stat'able file
 MISSING 01;05;48;5;232;38;5;15 # ... and the files they point to
 SETUID 48;5;196;38;5;15	# file that is setuid (u+s)
@@ -82,9 +85,8 @@
 #.sh  01;38;5;34
 #.csh 01;38;5;34
  # archives or compressed (bright red)
-.tar 01;38;5;9 
+.tar 01;38;5;9
 .tgz 01;38;5;9
-.svgz 01;38;5;9
 .arj 01;38;5;9
 .taz 01;38;5;9
 .lzh 01;38;5;9
@@ -107,8 +109,9 @@
 .cpio 01;38;5;9
 .7z  01;38;5;9
 .rz  01;38;5;9
+.xz  01;38;5;9
 # image formats (magenta)
-.jpg 01;38;5;13 
+.jpg 01;38;5;13
 .jpeg 01;38;5;13
 .gif 01;38;5;13
 .bmp 01;38;5;13
@@ -142,21 +145,33 @@
 .flc 01;38;5;13
 .avi 01;38;5;13
 .fli 01;38;5;13
+.flv 01;38;5;13
 .gl 01;38;5;13
 .dl 01;38;5;13
 .xcf 01;38;5;13
 .xwd 01;38;5;13
 .yuv 01;38;5;13
 .svg 01;38;5;13
+.svgz 01;38;5;13
+# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
+.axv 01;38;5;13
+.anx 01;38;5;13
+.ogv 01;38;5;13
+.ogx 01;38;5;13
 # audio formats (cyan)
-.aac 00;38;5;45
-.au 00;38;5;45
-.flac 00;38;5;45
-.mid 00;38;5;45
-.midi 00;38;5;45
-.mka 00;38;5;45
-.mp3 00;38;5;45
-.mpc 00;38;5;45
-.ogg 00;38;5;45
-.ra 00;38;5;45
-.wav 00;38;5;45
+.aac 01;38;5;45
+.au 01;38;5;45
+.flac 01;38;5;45
+.mid 01;38;5;45
+.midi 01;38;5;45
+.mka 01;38;5;45
+.mp3 01;38;5;45
+.mpc 01;38;5;45
+.ogg 01;38;5;45
+.ra 01;38;5;45
+.wav 01;38;5;45
+# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
+.axa 01;38;5;45
+.oga 01;38;5;45
+.spx 01;38;5;45
+.xspf 01;38;5;45


Index: coreutils-DIR_COLORS.xterm
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-DIR_COLORS.xterm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- coreutils-DIR_COLORS.xterm	24 Jul 2008 13:17:42 -0000	1.5
+++ coreutils-DIR_COLORS.xterm	24 Feb 2009 11:53:37 -0000	1.6
@@ -1,4 +1,5 @@
 # Configuration file for the color ls utility
+# Synchronized with coreutils 7.1 dircolors
 # This file goes in the /etc directory, and must be world readable.
 # You can copy this file to .dir_colors in your $HOME directory to override
 # the system defaults.
@@ -45,22 +46,24 @@
 
 # Below are the color init strings for the basic file types. A color init
 # string consists of one or more of the following numeric codes:
-# Attribute codes: 
+# Attribute codes:
 # 00=none 01=bold 04=underscore 05=blink 07=reverse 08=concealed
 # Text color codes:
 # 30=black 31=red 32=green 33=yellow 34=blue 35=magenta 36=cyan 37=white
 # Background color codes:
 # 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white
-NORMAL 00	# global default, although everything should be something.
-FILE 00 	# normal file
-DIR 00;34 	# directory
-LINK 00;36 	# symbolic link (If you set this to 'target' instead of a
+#NORMAL 00	# no color code at all
+#FILE 00	# normal file, use no color at all
+RESET 0
+DIR 00;34	# directory
+LINK 00;36	# symbolic link (If you set this to 'target' instead of a
 		# numerical value, the color is as for the file pointed to.)
+HARDLINK 44;37 # regular file with more than one link
 FIFO 40;33	# pipe
 SOCK 00;35	# socket
 DOOR 00;35	# door
 BLK 40;33;01	# block device driver
-CHR 40;33;01 	# character device driver
+CHR 40;33;01	# character device driver
 ORPHAN 40;31;01  # symlink to nonexistent file, or non-stat'able file
 MISSING 01;05;37;41 # ... and the files they point to
 SETUID 37;41	# file that is setuid (u+s)
@@ -72,7 +75,7 @@
 
 
 # This is for files with execute permission:
-EXEC 00;32 
+EXEC 00;32
 
 # List any file extensions like '.gz' or '.tar' that you would like ls
 # to colorize below. Put the extension, a space, and the color init string.
@@ -85,9 +88,8 @@
 #.sh  00;32
 #.csh 00;32
  # archives or compressed (red)
-.tar 00;31 
+.tar 00;31
 .tgz 00;31
-.svgz 00;31
 .arj 00;31
 .taz 00;31
 .lzh 00;31
@@ -110,8 +112,9 @@
 .cpio 00;31
 .7z  00;31
 .rz  00;31
+.xz  00;31
 # image formats (magenta)
-.jpg 00;35 
+.jpg 00;35
 .jpeg 00;35
 .gif 00;35
 .bmp 00;35
@@ -145,12 +148,19 @@
 .flc 00;35
 .avi 00;35
 .fli 00;35
+.flv 00;35
 .gl 00;35
 .dl 00;35
 .xcf 00;35
 .xwd 00;35
 .yuv 00;35
 .svg 00;35
+.svgz 00;35
+# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
+.axv 00;35
+.anx 00;35
+.ogv 00;35
+.ogx 00;35
 # audio formats (cyan)
 .aac 00;36
 .au 00;36
@@ -163,3 +173,8 @@
 .ogg 00;36
 .ra 00;36
 .wav 00;36
+# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
+.axa 00;36
+.oga 00;36
+.spx 00;36
+.xspf 00;36

coreutils-i18n.patch:

Index: coreutils-i18n.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-i18n.patch,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- coreutils-i18n.patch	11 Nov 2008 16:03:49 -0000	1.28
+++ coreutils-i18n.patch	24 Feb 2009 11:53:37 -0000	1.29
@@ -331,7 +331,7 @@
      error (EXIT_FAILURE, errno, "-");
 --- coreutils-6.8+/src/join.c.i18n	2007-01-14 15:41:28.000000000 +0000
 +++ coreutils-6.8+/src/join.c	2007-03-01 15:08:24.000000000 +0000
-@@ -23,17 +23,31 @@
+@@ -23,16 +23,30 @@
  #include <sys/types.h>
  #include <getopt.h>
  
@@ -347,7 +347,6 @@
 +
  #include "system.h"
  #include "error.h"
- #include "hard-locale.h"
  #include "linebuffer.h"
 -#include "memcasecmp.h"
  #include "quote.h"
@@ -2841,11 +2840,11 @@
     line of 1st page printed). */
 @@ -696,6 +756,7 @@
     -a|COLUMN|-m is a `space' and with the -J option a `tab'. */
- static char *col_sep_string = "";
+ static char *col_sep_string = (char *) "";
  static int col_sep_length = 0;
 +static int col_sep_width = 0;
- static char *column_separator = " ";
- static char *line_separator = "\t";
+ static char *column_separator = (char *) " ";
+ static char *line_separator = (char *) "\t";
  
 @@ -852,6 +913,13 @@
    col_sep_length = (int) strlen (optarg_S);
@@ -2927,7 +2926,7 @@
 @@ -1031,7 +1122,7 @@
  	  old_s = false;
  	  /* Reset an additional input of -s, -S dominates -s */
- 	  col_sep_string = "";
+ 	  col_sep_string = bad_cast ("");
 -	  col_sep_length = 0;
 +	  col_sep_length = col_sep_width = 0;
  	  use_col_separator = true;

coreutils-pam.patch:

Index: coreutils-pam.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-pam.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- coreutils-pam.patch	11 Nov 2008 16:03:49 -0000	1.13
+++ coreutils-pam.patch	24 Feb 2009 11:53:37 -0000	1.14
@@ -49,11 +49,11 @@
  #define DEFAULT_USER "root"
  
 +#ifndef USE_PAM
- char *crypt ();
+ char *crypt (char const *key, char const *salt);
 +#endif
- char *getusershell ();
- void endusershell ();
- void setusershell ();
+ char *getusershell (void);
+ void endusershell (void);
+ void setusershell (void);
  
  extern char **environ;
  

coreutils-selinux.patch:

Index: coreutils-selinux.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-selinux.patch,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- coreutils-selinux.patch	28 Jan 2009 17:29:41 -0000	1.54
+++ coreutils-selinux.patch	24 Feb 2009 11:53:37 -0000	1.55
@@ -49,71 +49,6 @@
 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
@@ -147,15 +82,6 @@
    {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);
@@ -191,24 +117,6 @@
  			   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;
@@ -288,15 +196,15 @@
    x->require_preserve = false;
    x->require_preserve_context = false;
 +  x->set_security_context = false;
+   x->require_preserve_xattr = 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,
+-  while ((optc = getopt_long (argc, argv, "bcCsDdg:m:o:pt:TvS:Z:", long_options,
++  while ((optc = getopt_long (argc, argv, "bcCsDdg:m:o:pPt:TvS:Z:", long_options,
  			      NULL)) != -1)
      {
        switch (optc)
@@ -351,18 +259,6 @@
    };
  
  /* 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);
@@ -513,26 +409,6 @@
  	{
  	  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');
@@ -590,9 +466,9 @@
 -  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);
- 
+   size_t width = print_name_with_quoting (f->name, FILE_OR_LINK_MODE (f),
+ 					  f->linkok, f->stat_ok, f->filetype,
+ 					  NULL, f->stat.st_nlink, start_col);
 @@ -4077,9 +4109,6 @@ length_of_file_name_and_frills (const st
  					  output_block_size))
  		: block_size_width);
@@ -621,74 +497,6 @@
        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
@@ -720,9 +528,9 @@
    x->preserve_timestamps = true;
    x->preserve_security_context = selinux_enabled;
 +  x->set_security_context = false;
+   x->reduce_diagnostics = 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
@@ -891,7 +699,7 @@
 diff -urp coreutils-7.0.orig/tests/misc/selinux coreutils-7.0/tests/misc/selinux
 --- coreutils-7.0.orig/tests/misc/selinux	2008-09-27 19:28:54.000000000 +0200
 +++ coreutils-7.0/tests/misc/selinux	2009-01-28 17:18:52.776914041 +0100
-@@ -30,12 +30,10 @@ chcon $ctx f d p ||
+@@ -30,7 +30,7 @@ chcon $ctx f d p ||
  
  # inspect that context with both ls -Z and stat.
  for i in d f p; do
@@ -900,8 +708,76 @@
    c=`stat --printf %C $i`; test x$c = x$ctx || fail=1
  done
  
--# ensure that ls -l output includes the "+".
--c=`ls -l f|cut -c11`; test "$c" = + || fail=1
+diff -urNp coreutils-7.1-orig/src/ls.c coreutils-7.1/src/ls.c
+--- coreutils-7.1-orig/src/ls.c	2009-02-23 17:11:01.000000000 +0100
++++ coreutils-7.1/src/ls.c	2009-02-23 17:14:27.000000000 +0100
+@@ -3467,6 +3467,69 @@ format_group_width (gid_t g)
+ }
+ 
+ 
++/* Print info about f in scontext format */
++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;
++  char *p;
++
++  p = buf;
++
++  if ( print_scontext ) { /* zero means terse listing */
++    filemodestring (&f->stat, modebuf);
++    if (! any_has_acl)
++      modebuf[10] = '\0';
++    else if (f->acl_type == ACL_T_SELINUX_ONLY)
++      modebuf[10] = '.';
++    else if (f->acl_type == ACL_T_YES)
++      modebuf[10] = '+';
++    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);
++  size_t w = print_name_with_quoting (f->name, FILE_OR_LINK_MODE(f), f->linkok,
++			   f->stat_ok, f->filetype, &dired_obstack, f->stat.st_nlink, p - buf);
++
++  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, f->stat.st_nlink, (p-buf) + w + 4 );
++	  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);
++  }
++}
++
+ /* Print information about F in long format.  */
  
- # Copy each to a new directory and ensure that context is preserved.
- cp -r --preserve=all d f p s1 || fail=1
+ static void

coreutils-selinuxmanpages.patch:

Index: coreutils-selinuxmanpages.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-selinuxmanpages.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- coreutils-selinuxmanpages.patch	22 Oct 2008 11:07:43 -0000	1.2
+++ coreutils-selinuxmanpages.patch	24 Feb 2009 11:53:38 -0000	1.3
@@ -1,39 +1,6 @@
-diff -urNp coreutils-6.10-orig/doc/coreutils.info coreutils-6.10/doc/coreutils.info
---- coreutils-6.10-orig/doc/coreutils.info	2008-04-07 17:52:11.000000000 +0200
-+++ coreutils-6.10/doc/coreutils.info	2008-04-07 18:03:27.000000000 +0200
-@@ -5642,7 +5642,7 @@ options::.
-      Preserve as much as possible of the structure and attributes of the
-      original files in the copy (but do not attempt to preserve internal
-      directory structure; i.e., `ls -U' may list the entries in a copied
--     directory in a different order).  Equivalent to `-dpR'.
-+     directory in a different order).  Equivalent to `-cdpR'.
- 
- `-b'
- `--backup[=METHOD]'
-@@ -5660,6 +5660,11 @@ options::.
-             cp --backup --force -- "$i" "$i"
-           done
- 
-+`-c'
-+     Preserve SELinux security context of the original files if possible.
-+     Note: Some file systems don't support storing of SELinux security 
-+           context.
-+
- `--copy-contents'
-      If copying recursively, copy the contents of any special files
-      (e.g., FIFOs and device files) as if they were regular files.
 diff -urNp coreutils-6.10-orig/doc/coreutils.texi coreutils-6.10/doc/coreutils.texi
 --- coreutils-6.10-orig/doc/coreutils.texi	2008-04-07 17:52:11.000000000 +0200
 +++ coreutils-6.10/doc/coreutils.texi	2008-04-07 18:01:43.000000000 +0200
-@@ -6957,7 +6957,7 @@ Preserve as much as possible of the stru
- original files in the copy (but do not attempt to preserve internal
- directory structure; i.e., @samp{ls -U} may list the entries in a copied
- directory in a different order).
--Equivalent to @option{-dpR}.
-+Equivalent to @option{-cdpR}.
- 
- @item -b
- @itemx @w{@kbd{--backup}[=@var{method}]}
 @@ -6981,6 +6981,11 @@ for i; do
  done
  @end example


Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -r1.246 -r1.247
--- coreutils.spec	24 Feb 2009 09:12:38 -0000	1.246
+++ coreutils.spec	24 Feb 2009 11:53:38 -0000	1.247
@@ -1,12 +1,13 @@
 Summary: A set of basic GNU tools commonly used in shell scripts
 Name:    coreutils
-Version: 7.0
-Release: 8%{?dist}
+Version: 7.1
+Release: 1%{?dist}
 License: GPLv3+
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.lzma
+#Using .tar.gz tarball until xz utils will be in Fedora
+Source0: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
 Source101:  coreutils-DIR_COLORS
 Source102:  coreutils-DIR_COLORS.xterm
 Source103:  coreutils-DIR_COLORS.256color
@@ -18,17 +19,10 @@
 Source203:  coreutils-runuser-l.pamd
 
 # From upstream
-Patch1: coreutils-446294-lsexitstatuses.patch
-Patch2: coreutils-7.0-dftotal.patch
-Patch3: coreutils-7.0-expr-removebignumoptions.patch
-Patch4: coreutils-7.0-cp-mv-n.patch
-Patch5: coreutils-7.0-xattr.patch
 
 # Our patches
 Patch100: coreutils-6.10-configuration.patch
 Patch101: coreutils-6.10-manpages.patch
-#Patch102: coreutils-6.10-longoptions.patch
-Patch103: coreutils-6.11-sparc-shafix.patch
 
 # sh-utils
 Patch703: sh-utils-2.0.11-dateman.patch
@@ -54,15 +48,12 @@
 #(upstream did some SELinux implementation unlike with RedHat patch)
 Patch950: coreutils-selinux.patch
 Patch951: coreutils-selinuxmanpages.patch
-Patch952: coreutils-463883-chcon-changes.patch
 
 BuildRequires: libselinux-devel >= 1.25.6-1
 BuildRequires: libacl-devel
 BuildRequires: gettext bison
 BuildRequires: texinfo >= 4.3
-BuildRequires: lzma
 BuildRequires: autoconf >= 2.58
-#dist-lzma required
 BuildRequires: automake >= 1.10.1
 %{?!nopam:BuildRequires: pam-devel}
 BuildRequires: libcap-devel >= 2.0.6
@@ -107,17 +98,10 @@
 %setup -q
 
 # From upstream
-%patch1 -p1 -b .lsexit
-%patch2 -p1 -b .dftotal
-%patch3 -p1 -b .bignum
-%patch4 -p1 -b .cpmvn
-%patch5 -p1 -b .xattr
 
 # Our patches
 %patch100 -p1 -b .configure
 %patch101 -p1 -b .manpages
-#%patch102 -p1 -b .longopt
-%patch103 -p1 -b .sparc
 
 # sh-utils
 %patch703 -p1 -b .dateman
@@ -134,19 +118,16 @@
 %patch908 -p1 -b .getgrouplist
 %patch912 -p1 -b .overflow
 %patch915 -p1 -b .splitl
-#%patch916 -p1 -b .getfacl-exit-code
+%patch916 -p1 -b .getfacl-exit-code
 
 #SELinux
 %patch950 -p1 -b .selinux
 %patch951 -p1 -b .selinuxman
-%patch952 -p1 -b .changeonly
 
 chmod a+x tests/misc/sort-mb-tests
-chmod a+x tests/misc/id-context
-chmod a+x tests/mv/mv-n
-chmod a+x tests/misc/xattr
 
 sed -i 's/1.10a/1.10.1/' configure.ac
+sed -i 's/dist-xz/dist-lzma/' configure.ac
 
 #fix typos/mistakes in localized documentation(#439410, #440056)
 find ./po/ -name "*.p*" | xargs \
@@ -328,6 +309,11 @@
 /sbin/runuser
 
 %changelog
+* Tue Feb 24 2009 Ondrej Vasik <ovasik at redhat.com> - 7.1-1
+- New upstream release 7.1 (temporarily using tar.gz tarball
+  as there are no xz utils in Fedora), removed applied
+  patches, amended patches and LS_COLORS files
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	11 Nov 2008 16:10:30 -0000	1.19
+++ sources	24 Feb 2009 11:53:38 -0000	1.20
@@ -1 +1 @@
-81c7aecc0daa6cada78005108edb6502  coreutils-7.0.tar.lzma
+cbb2b3d1718ee1237b808e00b5c11b1e  coreutils-7.1.tar.gz


--- coreutils-446294-lsexitstatuses.patch DELETED ---


--- coreutils-463883-chcon-changes.patch DELETED ---


--- coreutils-6.10-longoptions.patch DELETED ---


--- coreutils-6.11-sparc-shafix.patch DELETED ---


--- coreutils-7.0-cp-mv-n.patch DELETED ---


--- coreutils-7.0-dftotal.patch DELETED ---


--- coreutils-7.0-expr-removebignumoptions.patch DELETED ---


--- coreutils-7.0-xattr.patch DELETED ---


