rpms/coreutils/F-8 coreutils-6.9-dd-fullblock.patch, NONE, 1.1 coreutils-6.9-manpages.patch, NONE, 1.1 coreutils-6.9-md5sha1sum.patch, NONE, 1.1 coreutils-6.9-whorunlevel.patch, NONE, 1.1 coreutils-authors.patch, NONE, 1.1 coreutils-selinuxmanpages.patch, NONE, 1.1 coreutils-i18n.patch, 1.22, 1.23 coreutils.spec, 1.187, 1.188

Ondrej Vasik (ovasik) fedora-extras-commits at redhat.com
Thu Aug 7 13:43:59 UTC 2008


Author: ovasik

Update of /cvs/extras/rpms/coreutils/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24526

Modified Files:
	coreutils-i18n.patch coreutils.spec 
Added Files:
	coreutils-6.9-dd-fullblock.patch coreutils-6.9-manpages.patch 
	coreutils-6.9-md5sha1sum.patch coreutils-6.9-whorunlevel.patch 
	coreutils-authors.patch coreutils-selinuxmanpages.patch 
Log Message:
various backports of bugfixes from F-9

coreutils-6.9-dd-fullblock.patch:

--- NEW FILE coreutils-6.9-dd-fullblock.patch ---
>From 9f8be4b0b83d1e0cbf1326f8cb7e077d026d9b0b Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka at redhat.com>
Date: Wed, 23 Jul 2008 11:29:21 +0200
Subject: [PATCH] dd: iflag=fullblock now read full blocks if possible
* src/dd.c (iread_fullblock): New function for reading full blocks.
(scanargs): Check for new parameter iflag=fullblock.
(skip): Use iread_fnc pointer instead of iread function.
(dd_copy): Use iread_fnc pointer instead of iread function.
* tests/dd/misc: Add test for dd - read full blocks.
* doc/coretuils.texi: Mention new parameter iflag=fullblock.
* NEWS: Mentioned the change.

---
 NEWS               |    4 ++++
 doc/coreutils.texi |    6 ++++++
 src/dd.c           |   39 +++++++++++++++++++++++++++++++++++++--
 tests/dd/misc      |    9 +++++++++
 4 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/doc/coreutils.texi b/doc/coreutils.texi
index 81e3b91..b95f8dc 100644
--- a/doc/coreutils.texi
+++ b/doc/coreutils.texi
@@ -7719,6 +7719,12 @@ platforms that distinguish binary from text I/O.
 Use text I/O.  Like @samp{binary}, this option has no effect on
 standard platforms.
 
+ at item fullblock
+ at opindex fullblock
+Read full blocks from input if possible. read() may return early
+if a full block is not available, so retry until data is available
+or end of file is reached. This flag can be used only for the iflag option.
+
 @end table
 
 These flags are not supported on all systems, and @samp{dd} rejects
diff --git a/src/dd.c b/src/dd.c
index ead9574..1b620df 100644
--- a/src/dd.c
+++ b/src/dd.c
@@ -225,6 +225,9 @@ static sig_atomic_t volatile interrupt_signal;
 /* A count of the number of pending info signals that have been received.  */
 static sig_atomic_t volatile info_signal_count;
 
+/* Function used for read (to handle iflag=fullblock parameter) */
+static ssize_t (*iread_fnc) (int fd, char *buf, size_t size);
+
 /* A longest symbol in the struct symbol_values tables below.  */
 #define LONGEST_SYMBOL "fdatasync"
 
@@ -257,6 +260,7 @@ static struct symbol_value const conversions[] =
 };
 
 /* Flags, for iflag="..." and oflag="...".  */
+#define O_FULLBLOCK 010000000 /* Read only full blocks from input */
 static struct symbol_value const flags[] =
 {
   {"append",	O_APPEND},
@@ -271,6 +275,7 @@ static struct symbol_value const flags[] =
   {"nonblock",	O_NONBLOCK},
   {"sync",	O_SYNC},
   {"text",	O_TEXT},
+  {"fullblock", O_FULLBLOCK}, /* Read only full blocks from input */
   {"",		0}
 };
 
@@ -762,6 +767,27 @@ iread (int fd, char *buf, size_t size)
     }
 }
 
+/* Wrapper around iread function which reads full blocks if possible */
+static ssize_t
+iread_fullblock (int fd, char *buf, size_t size)
+{
+  ssize_t nread = 0;
+
+  while (0 < size)
+    {
+      ssize_t ncurr = iread(fd, buf, size);
+      if (ncurr < 0)
+	return ncurr;
+      if (ncurr == 0)
+	break;
+      nread += ncurr;
+      buf   += ncurr;
+      size  -= ncurr;
+    }
+
+  return nread;
+}
+
 /* Write to FD the buffer BUF of size SIZE, processing any signals
    that arrive.  Return the number of bytes written, setting errno if
    this is less than SIZE.  Keep trying if there are partial
@@ -1000,6 +1026,15 @@ scanargs (int argc, char *const *argv)
   if (input_flags & (O_DSYNC | O_SYNC))
     input_flags |= O_RSYNC;
 
+  if (output_flags & O_FULLBLOCK)
+    {
+      error (0, 0, "%s: %s", _("invalid output flag"), "'fullblock'");
+      usage (EXIT_FAILURE);
+    }
+  iread_fnc = (input_flags & O_FULLBLOCK)?
+    iread_fullblock:
+    iread;
+
   if (multiple_bits_set (conversions_mask & (C_ASCII | C_EBCDIC | C_IBM)))
     error (EXIT_FAILURE, 0, _("cannot combine any two of {ascii,ebcdic,ibm}"));
   if (multiple_bits_set (conversions_mask & (C_BLOCK | C_UNBLOCK)))
@@ -1197,7 +1232,7 @@ skip (int fdesc, char const *file, uintmax_t records, size_t blocksize,
 
       do
 	{
-	  ssize_t nread = iread (fdesc, buf, blocksize);
+	  ssize_t nread = iread_fnc (fdesc, buf, blocksize);
 	  if (nread < 0)
 	    {
 	      if (fdesc == STDIN_FILENO)
@@ -1508,7 +1543,7 @@ dd_copy (void)
 		(conversions_mask & (C_BLOCK | C_UNBLOCK)) ? ' ' : '\0',
 		input_blocksize);
 
-      nread = iread (STDIN_FILENO, ibuf, input_blocksize);
+      nread = iread_fnc (STDIN_FILENO, ibuf, input_blocksize);
 
       if (nread == 0)
 	break;			/* EOF.  */
diff --git a/tests/dd/misc b/tests/dd/misc
index d54fbfa..24e5eba 100755
--- a/tests/dd/misc
+++ b/tests/dd/misc
@@ -88,6 +88,15 @@ fi
 outbytes=`echo x | dd bs=3 ibs=10 obs=10 conv=sync 2>/dev/null | wc -c`
 test "$outbytes" -eq 3 || fail=1
 
+(echo a; sleep .1; echo b) \
+  | LC_ALL=C dd bs=4 status=noxfer iflag=fullblock > out 2> err || fail=1
+echo "a
+b" > out_ok
+echo "1+0 records in
+1+0 records out" > err_ok
+cmp out out_ok || fail=1
+cmp err err_ok || fail=1
+
 test $fail -eq 0 && fail=$warn
 
 (exit $fail); exit $fail
diff -ruN coreutils-6.12.old/doc/coreutils.info coreutils-6.12/doc/coreutils.info
--- coreutils-6.12.old/doc/coreutils.info	2008-07-24 12:49:57.000000000 +0200
+++ coreutils-6.12/doc/coreutils.info	2008-07-24 12:52:17.000000000 +0200
@@ -6112,6 +6112,12 @@
           Use text I/O.  Like `binary', this option has no effect on
           standard platforms.
 
+    'fullblock'
+          Read full blocks from input if possible. read() may return
+	  early if a full block is not available, so retry until data
+	  is available or end of file is reached. This flag can be used
+	  only for the iflag option.
+
 
      These flags are not supported on all systems, and `dd' rejects
      attempts to use them when they are not supported.  When reading
diff -ruN coreutils-6.12.old/man/dd.1 coreutils-6.12/man/dd.1
--- coreutils-6.12.old/man/dd.1	2008-07-24 12:51:06.000000000 +0200
+++ coreutils-6.12/man/dd.1	2008-07-24 12:59:06.000000000 +0200
@@ -111,6 +111,13 @@
 .TP
 direct
 use direct I/O for data
+.PP
+FLAG symbols only for iflag option:
+.TP
+fullblock
+Read full blocks from input if possible. read() may return early
+if a full block is not available, so retry until data is available
+or end of file is reached.
 .IP
 directory fail unless a directory
 dsync     use synchronized I/O for data

coreutils-6.9-manpages.patch:

--- NEW FILE coreutils-6.9-manpages.patch ---
diff -urp coreutils-6.9-orig/man/md5sum.1 coreutils-6.9/man/md5sum.1
--- coreutils-6.9-orig/man/md5sum.1
+++ coreutils-6.9/man/md5sum.1
@@ -19,6 +19,8 @@ read MD5 sums from the FILEs and check t
 .TP
 \fB\-t\fR, \fB\-\-text\fR
 read in text mode (default)
+.br
+\fBNote:\fR There is no difference between binary and text mode option on GNU system.
 .SS "The following two options are useful only when verifying checksums:"
 .TP
 \fB\-\-status\fR
diff -urp coreutils-6.9-orig/man/sort.1 coreutils-6.9/man/sort.1
--- coreutils-6.9-orig/man/sort.1
+++ coreutils-6.9/man/sort.1
@@ -56,7 +56,7 @@ compress temporaries with PROG;
 decompress them with PROG \fB\-d\fR
 .TP
 \fB\-k\fR, \fB\-\-key\fR=\fIPOS1[\fR,POS2]
-start a key at POS1, end it at POS2 (origin 1)
+start a key at POS1, end it at POS2 (origin 1) - when no POS2 is specified, end of line is used
 .TP
 \fB\-m\fR, \fB\-\-merge\fR
 merge already sorted files; do not sort
@@ -103,8 +103,8 @@ With no FILE, or when FILE is \-, read s
 .PP
 *** WARNING ***
 The locale specified by the environment affects sort order.
-Set LC_ALL=C to get the traditional sort order that uses
-native byte values.
+Set LC_ALL=C (by "export LC_ALL=C") to get the traditional 
+sort order that uses native byte values.
 .SH AUTHOR
 Written by Mike Haertel and Paul Eggert.
 .SH "REPORTING BUGS"

coreutils-6.9-md5sha1sum.patch:

--- NEW FILE coreutils-6.9-md5sha1sum.patch ---
diff -urNp coreutils-6.9-orig/src/md5sum.c coreutils-6.9/src/md5sum.c
--- coreutils-6.9-orig/src/md5sum.c	2007-11-25 14:23:31.000000000 +0100
+++ coreutils-6.9/src/md5sum.c	2008-04-15 21:04:09.000000000 +0200
@@ -205,6 +205,9 @@ bsd_split_3 (char *s, size_t s_len, unsi
 {
   size_t i;
 
+	if (s_len ==0)
+		return false;
+
   *file_name = s;
 
   /* Find end of filename. The BSD 'md5' and 'sha1' commands do not escape
diff -urNp coreutils-6.9-orig/src/md5sum.c coreutils-6.9/src/md5sum.c
--- coreutils-6.9-orig/src/md5sum.c	2008-05-13 15:09:09.000000000 +0200
+++ coreutils-6.9/src/md5sum.c	2008-05-13 15:10:59.000000000 +0200
@@ -343,16 +343,19 @@ split_3 (char *s, size_t s_len,
   return true;
 }
 
+/* Return true if S is a NUL-terminated string of DIGEST_HEX_BYTES hex digits.
+   Otherwise, return false.  */
 static bool
 hex_digits (unsigned char const *s)
 {
-  while (*s)
+  unsigned int i;
+  for (i = 0; i < digest_hex_bytes; i++)
     {
       if (!isxdigit (*s))
         return false;
       ++s;
     }
-  return true;
+  return *s == '\0';
 }
 
 /* An interface to the function, DIGEST_STREAM.
diff -urNp coreutils-6.9-orig/tests/sha1sum/basic-1 coreutils-6.9/tests/sha1sum/basic-1
--- coreutils-6.9-orig/tests/sha1sum/basic-1
+++ coreutils-6.9/tests/sha1sum/basic-1
@@ -29,7 +29,7 @@ exec $PERL -w -I$srcdir/.. -MCoreutils -M"CuTmpdir qw($me)" -- - <<\EOF
 require 5.003;
 use strict;
 
-(my $program_name = $0) =~ s|.*/||;
+my $prog = 'sha1sum';
 
 # Turn off localisation of executable's ouput.
 @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3;
@@ -72,6 +72,8 @@ my @Tests =
      ['check-bsd3', '--check', '--status',
 			{IN=> {'f.sha1' => "SHA1 (f) = $sha_degenerate\n"}},
 			{AUX=> {f=> 'bar'}}, {EXIT=> 1}],
+     ['bsd-segv', '--check', {IN=> {'z' => "SHA1 ("}}, {EXIT=> 1},
+      {ERR=> "$prog: z: no properly formatted SHA1 checksum lines found\n"}],
     );
 
 # Insert the `--text' argument for each test.
@@ -86,7 +88,6 @@ foreach $t (@Tests)
 my $save_temps = $ENV{DEBUG};
 my $verbose = $ENV{VERBOSE};
 
-my $prog = $ENV{PROG} || die "$0: \$PROG not specified in environment\n";
-my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose);
+my $fail = run_tests ($prog, $prog, \@Tests, $save_temps, $verbose);
 exit $fail;
 EOF
diff -urNp coreutils-6.9-orig/tests/md5sum/basic-1 coreutils-6.9/tests/md5sum/basic-1
--- coreutils-6.9-orig/tests/md5sum/basic-1
+++ coreutils-6.9/tests/md5sum/basic-1
@@ -70,6 +70,15 @@ my @Tests =
      ['check-bsd3', '--check', '--status',
 				{IN=> {'f.md5' => "MD5 (f) = $degenerate\n"}},
 				{AUX=> {f=> 'bar'}}, {EXIT=> 1}],
+     ['bsd-segv', '--check', {IN=> {'z' => "MD5 ("}}, {EXIT=> 1},
+       {ERR=> "md5sum: z: no properly formatted MD5 checksum lines found\n"}],
+     # Ensure that when there's a NUL byte among the checksum hex digits
+     # we detect the invalid formatting and don't even open the file.
+     # Up to coreutils-6.9, this would report:
+     #   h: FAILED
+     #   md5sum: WARNING: 1 of 1 computed checksum did NOT match
+     ['nul-in-cksum', '--check', {IN=> {'h'=>("\0"x32)."  h\n"}}, {EXIT=> 1},
+      {ERR=> "md5sum: h: no properly formatted MD5 checksum lines found\n"}],
     );
 
 # Insert the `--text' argument for each test.

coreutils-6.9-whorunlevel.patch:

--- NEW FILE coreutils-6.9-whorunlevel.patch ---
>From 63467fa18794f02497c7a46e3b7783ba1180f8fc Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering at redhat.com>
Date: Fri, 4 Jul 2008 16:34:39 +0200
Subject: [PATCH] who -r: don't print "last=" when the corresponding byte is unprintable

* src/who.c (print_runlevel): Print last=%c only when the "preceding
run-level" byte is printable.  Reported by Gian Piero De Lolliis in
<http://bugzilla.redhat.com/453249>.
---
 src/who.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/who.c b/src/who.c
index 5529618..0bba912 100644
--- a/src/who.c
+++ b/src/who.c
@@ -30,6 +30,7 @@
 #include <sys/types.h>
 #include "system.h"

+#include "c-ctype.h"
 #include "canon-host.h"
 #include "readutmp.h"
 #include "error.h"
@@ -511,7 +512,7 @@ print_runlevel (const STRUCT_UTMP *utmp_ent)
   sprintf (comment, "%s%c", _("last="), (last == 'N') ? 'S' : last);

   print_line (-1, "", ' ', -1, runlevline, time_string (utmp_ent),
-	      "", "", comment, "");
+	      "", "", c_isprint (last) ? comment : "", "");

   return;
 }
--
1.5.6.1.206.g8dcaf96

>From 10db2e5e05c67eea205b3ec76a2408f46356a7fd Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Ond=C5=99ej=20Va=C5=A1=C3=ADk?= <ovasik at redhat.com>
Date: Wed, 2 Jul 2008 14:11:05 +0200
Subject: [PATCH] doci: describe who's -p -r and -t options

* doc/coreutils.texi (who invocation):
---
 doc/coreutils.texi |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/doc/coreutils.texi b/doc/coreutils.texi
index 155ba8d..c0ea237 100644
--- a/doc/coreutils.texi
+++ b/doc/coreutils.texi
@@ -12710,6 +12710,24 @@ automatic dial-up internet access.
 @opindex --heading
 Print a line of column headings.
 
+ at item -p
+ at itemx --process
+ at opindex -p
+ at opindex --process
+List active processes spawned by init.
+
+ at item -r
+ at itemx --runlevel
+ at opindex -r
+ at opindex --runlevel
+Print the current (and maybe previous) run-level of the init process. 
+
+ at item -t
+ at itemx --time
+ at opindex -t
+ at opindex --time
+Print last system clock change. 
+
 @item -w
 @itemx -T
 @itemx --mesg
-- 
1.5.2.2


coreutils-authors.patch:

--- NEW FILE coreutils-authors.patch ---
Signed-off-by: Ondřej Vašík <ovasik at redhat.com>
Signed-off-by: Jim Meyering <meyering at redhat.com>

* src/echo.c (AUTHORS) : Use bash builtin echo authors instead of FIXME unknown
* src/basename.c (AUTHORS): List David as the author.
* AUTHORS: Update here, too.
---
 AUTHORS        |    4 ++--
 src/basename.c |    2 +-
 src/echo.c     |    4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/basename.c b/src/basename.c
index 38e8879..69b708f 100644
--- a/src/basename.c
+++ b/src/basename.c
@@ -37,7 +37,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "basename"
 
-#define AUTHORS "FIXME unknown"
+#define AUTHORS "David MacKenzie"
 
 /* The name this program was run with. */
 char *program_name; 
diff --git a/AUTHORS b/AUTHORS
index 404cf70..666edc1 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3,7 +3,7 @@ each followed by the name(s) of its author(s).
 
 arch: David MacKenzie, Karel Zak
 base64: Simon Josefsson
-basename: FIXME unknown
+basename: David MacKenzie
 cat: Torbjorn Granlund, Richard M. Stallman
 chcon: Russell Coker, Jim Meyering
 chgrp: David MacKenzie, Jim Meyering
@@ -22,7 +22,7 @@ dir: Richard M. Stallman, David MacKenzie
 dircolors: H. Peter Anvin
 dirname: David MacKenzie, Jim Meyering
 du: Torbjorn Granlund, David MacKenzie, Paul Eggert, Jim Meyering
-echo: FIXME unknown
+echo: Brian Fox, Chet Ramey
 env: Richard Mlynarik, David MacKenzie
 expand: David MacKenzie
 expr: Mike Parker
diff --git a/src/echo.c b/src/echo.c
index ebbf5b8..11e648e 100644
--- a/src/echo.c
+++ b/src/echo.c
@@ -24,7 +24,7 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "echo"
 
-#define AUTHORS "FIXME unknown"
+#define AUTHORS "Brian Fox", "Chet Ramey"
 
 /* echo [-neE] [arg ...]
 Output the ARGs.  If -n is specified, the trailing newline is

coreutils-selinuxmanpages.patch:

--- NEW FILE coreutils-selinuxmanpages.patch ---
diff -urNp coreutils-6.9-orig/man/cp.1 coreutils-6.9/man/cp.1
--- coreutils-6.9-orig/man/cp.1
+++ coreutils-6.9/man/cp.1
@@ -19,7 +19,7 @@ Copy SOURCE to DEST, or multiple SOURCE(
 Mandatory arguments to long options are mandatory for short options too.
 .TP
 \fB\-a\fR, \fB\-\-archive\fR
-same as \fB\-dpPR\fR
+same as \fB\-cdpPR\fR
 .TP
 \fB\-\-backup\fR[=\fICONTROL\fR]
 make a backup of each existing destination file
@@ -55,6 +55,9 @@ never follow symbolic links in SOURCE
 \fB\-p\fR
 same as \fB\-\-preserve\fR=\fImode\fR,ownership,timestamps
 .TP
+\fB\-c\fR
+same as \fB\-\-preserve\fR=context\fR
+.TP
 \fB\-\-preserve\fR[=\fIATTR_LIST\fR]
 preserve the specified attributes (default:
 mode,ownership,timestamps), if possible
diff -urNp coreutils-6.9-orig/doc/coreutils.info coreutils-6.9/doc/coreutils.info
--- coreutils-6.9-orig/doc/coreutils.info
+++ coreutils-6.9/doc/coreutils.info
@@ -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 `-dpPR'.
+     directory in a different order).  Equivalent to `-cdpPR'.
 
 `-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.9-orig/doc/coreutils.texi coreutils-6.9/doc/coreutils.texi
--- coreutils-6.9-orig/doc/coreutils.texi
+++ coreutils-6.9/doc/coreutils.texi
@@ -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{-dpPR}.
+Equivalent to @option{-cdpPR}.
 
 @item -b
 @itemx @w{@kbd{--backup}[=@var{method}]}
@@ -6981,6 +6981,11 @@ for i; do
 done
 @end example
 
+ at item -c
+ at cindex SELinux security context information, preserving
+Preserve SELinux security context of the original files if possible.
+Some file systems don't support storing of SELinux security context.
+
 @item --copy-contents
 @cindex directories, copying recursively
 @cindex copying directories recursively

coreutils-i18n.patch:

Index: coreutils-i18n.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/F-8/coreutils-i18n.patch,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- coreutils-i18n.patch	30 Oct 2007 16:47:35 -0000	1.22
+++ coreutils-i18n.patch	7 Aug 2008 13:43:28 -0000	1.23
@@ -3949,8 +3949,8 @@
 -	    FATAL_ERROR (_("the delimiter must be a single character"));
 -	  delim = optarg[0];
 -	  delim_specified = true;
-+#if HAVE_MBRTOWC
 +	    {
++#if HAVE_MBRTOWC
 +	      if(MB_CUR_MAX > 1)
 +		{
 +		  mbstate_t state;


Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/F-8/coreutils.spec,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- coreutils.spec	25 Mar 2008 17:54:57 -0000	1.187
+++ coreutils.spec	7 Aug 2008 13:43:28 -0000	1.188
@@ -23,11 +23,17 @@
 Patch4: coreutils-6.9-du-ls-upstream.patch
 Patch5: coreutils-dddoubleclose.patch
 Patch6: coreutils-mvatomic.patch
+Patch7: coreutils-authors.patch
+Patch8: coreutils-6.9-md5sha1sum.patch
+Patch9: coreutils-6.9-lonebackslash.patch
+Patch10: coreutils-6.9-whorunlevel.patch
 
 # Our patches
 Patch100: coreutils-chgrp.patch
 Patch101: coreutils-getdateYYYYMMDD.patch
-#Patch102: coreutils-6.9-longoptions.patch
+Patch102: coreutils-6.9-manpages.patch
+#Patch103: coreutils-6.9-longoptions.patch
+Patch104: coreutils-6.9-dd-fullblock.patch
 
 # sh-utils
 Patch703: sh-utils-2.0.11-dateman.patch
@@ -54,6 +60,8 @@
 #SELINUX Patch fix to allow cp -a rewrite file on different filesystem
 Patch951: coreutils-6.9-requiresecuritycontext.patch
 Patch952: coreutils-6.9-statsecuritycontext.patch
+Patch953: coreutils-selinuxmanpages.patch
+
 
 BuildRequires: libselinux-devel >= 1.25.6-1
 BuildRequires: libacl-devel
@@ -98,11 +106,18 @@
 %patch4 -p1 -b .du-ls
 %patch5 -p1 -b .doubleclose
 %patch6 -p1 -b .mvatomic
+%patch7 -p1 -b .authors
+%patch8 -p1 -b .md5sum
+%patch9 -p1 -b .backslash
+%patch10 -p1 -b .whorunlevel
 
 # Our patches
 %patch100 -p1 -b .chgrp
 %patch101 -p1 -b .getdate
-#%patch102 -p1 -b .longopts
+%patch102 -p1 -b .manpages
+#%patch103 -p1 -b .longopts
+%patch104 -p1 -b .dd-fullblock
+
 
 # sh-utils
 %patch703 -p1 -b .dateman
@@ -126,6 +141,14 @@
 %patch950 -p1 -b .selinux
 %patch951 -p1 -b .require-preserve
 %patch952 -p1 -b .statsecuritycontext
+%patch953 -p1 -b .selinuxman
+
+#fix typos/mistakes in localized documentation(#439410, #440056)
+for pofile in $(find ./po/*.p*)
+do
+   sed -i 's/-dpPR/-cdpPR/' "$pofile"
+   sed -i 's/commmand/command/' "$pofile"
+done
 
 # Don't run basic-1 test, since it breaks when run in the background
 # (bug #102033).
@@ -199,6 +222,8 @@
 # su
 install -m 4755 src/su $RPM_BUILD_ROOT/bin
 install -m 755 src/runuser $RPM_BUILD_ROOT/sbin
+# do not ship runuser in /usr/bin/runuser
+rm -rf $RPM_BUILD_ROOT/usr/bin/runuser
 
 # These come from util-linux and/or procps.
 for i in hostname uptime kill ; do
@@ -298,6 +323,25 @@
 /sbin/runuser
 
 %changelog
+* Thu Aug 07 2008 Ondrej Vasik <ovasik at redhat.com> 6.9-18
+- fix typo in runuser manpages (#439410)
+- mention that cp -a includes -c option + mention cp -c 
+  option in manpages (#440056)
+- fix possible build-failure typo in i18n patch(#442205)
+- fix possible segfault in sha1sum/md5sum command
+- fix wrong checksum line handling in sha1sum -c 
+  command(#439531)
+- print verbose output of chcon with newline after each 
+  message (#451478)
+- who -r should not show last runlevel for nonprintable chars
+  (like \0) - #453249,add few missing who options to texinfo 
+  documentation, add missing authors for basename and echo
+- dd: iflag=fullblock now read full blocks if possible
+  (#431997, #449263)
+- ptx with odd number of backslashes no longer leads to buffer
+  overflow
+- paste -d'\' file" no longer ovveruns memory
+
 * Tue Mar 25 2008 Ondrej Vasik <ovasik at redhat.com> 6.9-17
 - mv: never unlink a destination file before calling rename
   (upstream, #438076)




More information about the fedora-extras-commits mailing list