From: Marcin Krol <hawk@tld-linux.org>
Date: Tue, 28 Jan 2014 14:23:46 +0000 (+0000)
Subject: - merged 8.22 from PLD
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=a60d17b0525ba967763d13c3ee1bffd3b09aaa30;p=packages%2Fcoreutils.git

- merged 8.22 from PLD
---

diff --git a/coreutils-info.patch b/coreutils-info.patch
index 2019f5e..fd167b1 100644
--- a/coreutils-info.patch
+++ b/coreutils-info.patch
@@ -1,5 +1,5 @@
---- coreutils-8.21/doc/coreutils.texi.orig	2013-02-11 10:37:28.000000000 +0100
-+++ coreutils-8.21/doc/coreutils.texi	2013-02-24 17:41:00.409391351 +0100
+--- coreutils-8.22/doc/coreutils.texi.orig	2013-12-13 03:43:10.000000000 +0100
++++ coreutils-8.22/doc/coreutils.texi	2013-12-14 12:02:04.754108101 +0100
 @@ -20,120 +20,109 @@
  @syncodeindex pg cp
  @syncodeindex vr cp
@@ -233,7 +233,7 @@
  * Delaying::                     sleep
  * Numeric operations::           factor seq
  * File permissions::             Access modes
-@@ -230,45 +218,45 @@
+@@ -230,43 +218,43 @@
  
  Output of entire files
  
@@ -259,8 +259,6 @@
 +* pr::                           Paginate or columnate files for printing
 +* fold::                         Wrap input lines to fit in specified width
  
- @command{numfmt}: General Options, Units
- 
  Output of parts of files
  
 -* head invocation::              Output the first part of files
@@ -303,7 +301,7 @@
  
  @command{ptx}: Produce permuted indexes
  
-@@ -280,15 +268,15 @@
+@@ -278,15 +266,15 @@
  
  Operating on fields
  
@@ -325,7 +323,7 @@
  
  @command{tr}: Translate, squeeze, and/or delete characters
  
-@@ -298,10 +286,10 @@
+@@ -296,10 +284,10 @@
  
  Directory listing
  
@@ -340,7 +338,7 @@
  
  @command{ls}:  List directory contents
  
-@@ -314,51 +302,51 @@
+@@ -312,51 +300,51 @@
  
  Basic operations
  
@@ -422,7 +420,7 @@
  
  @command{test}: Check file types and compare values
  
-@@ -377,22 +365,22 @@
+@@ -375,22 +363,22 @@
  
  Redirection
  
@@ -455,7 +453,7 @@
  
  @command{stty}: Print or change terminal characteristics
  
-@@ -406,22 +394,20 @@
+@@ -404,22 +392,20 @@
  
  User information
  
@@ -489,7 +487,7 @@
  
  @command{date}: Print or set system date and time
  
-@@ -436,30 +422,26 @@
+@@ -434,30 +420,26 @@
  
  SELinux context
  
@@ -579,7 +577,7 @@
  @section @command{od}: Write files in octal or other formats
  
  @pindex od
-@@ -2057,7 +2039,7 @@
+@@ -2058,7 +2040,7 @@
  
  @exitstatus
  
@@ -588,7 +586,7 @@
  @section @command{base64}: Transform data into printable data
  
  @pindex base64
-@@ -2125,14 +2107,14 @@
+@@ -2126,14 +2108,14 @@
  These commands reformat the contents of files.
  
  @menu
@@ -608,7 +606,7 @@
  @section @command{fmt}: Reformat paragraph text
  
  @pindex fmt
-@@ -2236,7 +2218,7 @@
+@@ -2237,7 +2219,7 @@
  
  @exitstatus
  
@@ -617,7 +615,7 @@
  @section @command{numfmt}: Reformat numbers
  
  @pindex numfmt
-@@ -2556,7 +2538,7 @@
+@@ -2557,7 +2539,7 @@
  == 2,14,74,83,648==
  @end example
  
@@ -626,7 +624,7 @@
  @section @command{pr}: Paginate or columnate files for printing
  
  @pindex pr
-@@ -2666,7 +2648,7 @@
+@@ -2667,7 +2649,7 @@
  @cindex time formats
  @cindex formatting times
  Format header dates using @var{format}, using the same conventions as
@@ -635,7 +633,7 @@
  Except for directives, which start with
  @samp{%}, characters in @var{format} are printed unchanged.  You can use
  this option to specify an arbitrary string in place of the header date,
-@@ -2893,7 +2875,7 @@
+@@ -2894,7 +2876,7 @@
  @exitstatus
  
  
@@ -644,7 +642,7 @@
  @section @command{fold}: Wrap input lines to fit in specified width
  
  @pindex fold
-@@ -2960,13 +2942,13 @@
+@@ -2961,13 +2943,13 @@
  These commands output pieces of the input.
  
  @menu
@@ -663,7 +661,7 @@
  @section @command{head}: Output the first part of files
  
  @pindex head
-@@ -3043,7 +3025,7 @@
+@@ -3044,7 +3026,7 @@
  @exitstatus
  
  
@@ -672,7 +670,7 @@
  @section @command{tail}: Output the last part of files
  
  @pindex tail
-@@ -3273,7 +3255,7 @@
+@@ -3282,7 +3264,7 @@
  @exitstatus
  
  
@@ -681,7 +679,7 @@
  @section @command{split}: Split a file into pieces.
  
  @pindex split
-@@ -3502,7 +3484,7 @@
+@@ -3511,7 +3493,7 @@
  @end example
  
  
@@ -690,7 +688,7 @@
  @section @command{csplit}: Split a file into context-determined pieces
  
  @pindex csplit
-@@ -3693,16 +3675,16 @@
+@@ -3727,16 +3709,16 @@
  contents of files.
  
  @menu
@@ -713,7 +711,7 @@
  @section @command{wc}: Print newline, word, and byte counts
  
  @pindex wc
-@@ -3820,7 +3802,7 @@
+@@ -3854,7 +3836,7 @@
  @exitstatus
  
  
@@ -722,7 +720,7 @@
  @section @command{sum}: Print checksum and block counts
  
  @pindex sum
-@@ -3871,7 +3853,7 @@
+@@ -3905,7 +3887,7 @@
  @exitstatus
  
  
@@ -731,7 +729,7 @@
  @section @command{cksum}: Print CRC checksum and byte counts
  
  @pindex cksum
-@@ -3905,7 +3887,7 @@
+@@ -3939,7 +3921,7 @@
  @exitstatus
  
  
@@ -740,7 +738,7 @@
  @section @command{md5sum}: Print or check MD5 digests
  
  @pindex md5sum
-@@ -4051,7 +4033,7 @@
+@@ -4085,7 +4067,7 @@
  @exitstatus
  
  
@@ -749,7 +747,7 @@
  @section @command{sha1sum}: Print or check SHA-1 digests
  
  @pindex sha1sum
-@@ -4063,7 +4045,7 @@
+@@ -4097,7 +4079,7 @@
  
  @command{sha1sum} computes a 160-bit checksum for each specified
  @var{file}.  The usage and options of this command are precisely the
@@ -758,7 +756,7 @@
  
  Note: The SHA-1 digest is more secure than MD5, and no collisions of
  it are known (different files having the same fingerprint).  However,
-@@ -4103,7 +4085,7 @@
+@@ -4137,7 +4119,7 @@
  various lengths (respectively 224, 256, 384 and 512 bits),
  collectively known as the SHA-2 hashes.  The usage and options of
  these commands are precisely the same as for @command{md5sum}.
@@ -767,7 +765,7 @@
  
  Note: The SHA384 and SHA512 digests are considerably slower to
  compute, especially on 32-bit computers, than SHA224 or SHA256.
-@@ -4118,16 +4100,16 @@
+@@ -4152,16 +4134,16 @@
  These commands work with (or produce) sorted files.
  
  @menu
@@ -791,7 +789,7 @@
  @section @command{sort}: Sort text files
  
  @pindex sort
-@@ -4413,7 +4395,7 @@
+@@ -4450,7 +4432,7 @@
  Sort by hashing the input keys and then sorting the hash values.
  Choose the hash function at random, ensuring that it is free of
  collisions so that differing keys have differing hash values.  This is
@@ -800,7 +798,7 @@
  except that keys with the same value sort together.
  
  If multiple random sort fields are specified, the same random hash
-@@ -4601,7 +4583,7 @@
+@@ -4638,7 +4620,7 @@
  @var{n} is set to the number of available processors, but limited
  to 8, as there are diminishing performance gains after that.
  Note also that using @var{n} threads increases the memory usage by
@@ -809,7 +807,7 @@
  
  @item -u
  @itemx --unique
-@@ -4619,7 +4601,7 @@
+@@ -4656,7 +4638,7 @@
  this equivalence does not extend to arbitrary @command{sort} options.
  For example, @code{sort -n -u} inspects only the value of the initial
  numeric string when checking for uniqueness, whereas @code{sort -n |
@@ -818,7 +816,7 @@
  
  @macro zeroTerminatedOption
  @item -z
-@@ -4842,7 +4824,7 @@
+@@ -4879,7 +4861,7 @@
  @end itemize
  
  
@@ -827,7 +825,7 @@
  @section @command{shuf}: Shuffling text
  
  @pindex shuf
-@@ -4972,7 +4954,7 @@
+@@ -5035,7 +5017,7 @@
  @exitstatus
  
  
@@ -836,7 +834,7 @@
  @section @command{uniq}: Uniquify files
  
  @pindex uniq
-@@ -4994,7 +4976,7 @@
+@@ -5057,7 +5039,7 @@
  The input need not be sorted, but repeated input lines are detected
  only if they are adjacent.  If you want to discard non-adjacent
  duplicate lines, perhaps you want to use @code{sort -u}.
@@ -845,7 +843,7 @@
  
  @vindex LC_COLLATE
  Comparisons honor the rules specified by the @env{LC_COLLATE}
-@@ -5121,7 +5103,7 @@
+@@ -5218,7 +5200,7 @@
  @exitstatus
  
  
@@ -854,7 +852,7 @@
  @section @command{comm}: Compare two sorted files line by line
  
  @pindex comm
-@@ -5203,7 +5185,7 @@
+@@ -5300,7 +5282,7 @@
  
  @end table
  
@@ -863,7 +861,7 @@
  @section @command{ptx}: Produce permuted indexes
  
  @pindex ptx
-@@ -5662,7 +5644,7 @@
+@@ -5759,7 +5741,7 @@
  @end itemize
  
  
@@ -872,7 +870,7 @@
  @section @command{tsort}: Topological sort
  
  @pindex tsort
-@@ -5824,13 +5806,13 @@
+@@ -5921,13 +5903,13 @@
  @chapter Operating on fields
  
  @menu
@@ -890,7 +888,7 @@
  @section @command{cut}: Print selected parts of lines
  
  @pindex cut
-@@ -5950,7 +5932,7 @@
+@@ -6047,7 +6029,7 @@
  @exitstatus
  
  
@@ -899,7 +897,7 @@
  @section @command{paste}: Merge lines of files
  
  @pindex paste
-@@ -6020,7 +6002,7 @@
+@@ -6143,7 +6125,7 @@
  @exitstatus
  
  
@@ -908,7 +906,7 @@
  @section @command{join}: Join lines on a common field
  
  @pindex join
-@@ -6194,13 +6176,13 @@
+@@ -6319,13 +6301,13 @@
  This commands operate on individual characters.
  
  @menu
@@ -926,7 +924,7 @@
  @section @command{tr}: Translate, squeeze, and/or delete characters
  
  @pindex tr
-@@ -6580,7 +6562,7 @@
+@@ -6705,7 +6687,7 @@
  @end itemize
  
  
@@ -935,7 +933,7 @@
  @section @command{expand}: Convert tabs to spaces
  
  @pindex expand
-@@ -6633,7 +6615,7 @@
+@@ -6758,7 +6740,7 @@
  @exitstatus
  
  
@@ -944,7 +942,7 @@
  @section @command{unexpand}: Convert spaces to tabs
  
  @pindex unexpand
-@@ -6694,14 +6676,14 @@
+@@ -6819,14 +6801,14 @@
  and @command{vdir}, which list information about files.
  
  @menu
@@ -964,7 +962,7 @@
  @section @command{ls}: List directory contents
  
  @pindex ls
-@@ -7566,7 +7548,7 @@
+@@ -7689,7 +7671,7 @@
  @item +@var{format}
  @vindex LC_TIME
  List timestamps using @var{format}, where @var{format} is interpreted
@@ -973,7 +971,7 @@
  For example, @option{--time-style="+%Y-%m-%d %H:%M:%S"} causes
  @command{ls} to list timestamps like @samp{2002-03-30 23:45:56}.  As
  with @command{date}, @var{format}'s interpretation is affected by the
-@@ -7758,7 +7740,7 @@
+@@ -7881,7 +7863,7 @@
  @end table
  
  
@@ -982,7 +980,7 @@
  @section @command{dir}: Briefly list directory contents
  
  @pindex dir
-@@ -7768,10 +7750,10 @@
+@@ -7891,10 +7873,10 @@
  -b}; that is, by default files are listed in columns, sorted vertically,
  and special characters are represented by backslash escape sequences.
  
@@ -995,7 +993,7 @@
  @section @command{vdir}: Verbosely list directory contents
  
  @pindex vdir
-@@ -7781,7 +7763,7 @@
+@@ -7904,7 +7886,7 @@
  -b}; that is, by default files are listed in long format and special
  characters are represented by backslash escape sequences.
  
@@ -1004,7 +1002,7 @@
  @section @command{dircolors}: Color setup for @command{ls}
  
  @pindex dircolors
-@@ -7868,16 +7850,16 @@
+@@ -7991,16 +7973,16 @@
  copying, moving (renaming), and deleting (removing).
  
  @menu
@@ -1028,7 +1026,7 @@
  @section @command{cp}: Copy files and directories
  
  @pindex cp
-@@ -8332,7 +8314,7 @@
+@@ -8477,7 +8459,7 @@
  @exitstatus
  
  
@@ -1037,7 +1035,7 @@
  @section @command{dd}: Convert and copy a file
  
  @pindex dd
-@@ -8798,7 +8780,7 @@
+@@ -8943,7 +8925,7 @@
  @exitstatus
  
  
@@ -1046,7 +1044,7 @@
  @section @command{install}: Copy files and set attributes
  
  @pindex install
-@@ -8979,7 +8961,7 @@
+@@ -9124,7 +9106,7 @@
  @exitstatus
  
  
@@ -1055,7 +1053,7 @@
  @section @command{mv}: Move (rename) files
  
  @pindex mv
-@@ -9110,7 +9092,7 @@
+@@ -9265,7 +9247,7 @@
  @exitstatus
  
  
@@ -1064,7 +1062,7 @@
  @section @command{rm}: Remove files or directories
  
  @pindex rm
-@@ -9272,7 +9254,7 @@
+@@ -9428,7 +9410,7 @@
  @exitstatus
  
  
@@ -1073,7 +1071,7 @@
  @section @command{shred}: Remove files more securely
  
  @pindex shred
-@@ -9282,7 +9264,7 @@
+@@ -9438,7 +9420,7 @@
  @command{shred} overwrites devices or files, to help prevent even
  very expensive hardware from recovering the data.
  
@@ -1082,7 +1080,7 @@
  not actually destroyed.  Only the index listing where the file is
  stored is destroyed, and the storage is made available for reuse.
  There are undelete utilities that will attempt to reconstruct the index
-@@ -9529,18 +9511,18 @@
+@@ -9698,18 +9680,18 @@
  (FIFOs), symbolic links, sockets, and so-called @dfn{special files}.
  
  @menu
@@ -1110,7 +1108,7 @@
  @section @command{link}: Make a hard link via the link syscall
  
  @pindex link
-@@ -9553,7 +9535,7 @@
+@@ -9722,7 +9704,7 @@
  @code{link} function.  @xref{Hard Links, , , libc,
  The GNU C Library Reference Manual}.
  It avoids the bells and whistles of the more commonly-used
@@ -1119,7 +1117,7 @@
  Synopsis:
  
  @example
-@@ -9579,7 +9561,7 @@
+@@ -9748,7 +9730,7 @@
  @exitstatus
  
  
@@ -1128,16 +1126,16 @@
  @section @command{ln}: Make links between files
  
  @pindex ln
-@@ -9760,7 +9742,7 @@
- '/tmp/file' -> '../a/file'
- @end smallexample
- 
+@@ -9932,7 +9914,7 @@
+ Relative symbolic links are generated based on their canonicalized
+ containing directory, and canonicalized targets.  I.E. all symbolic
+ links in these file names will be resolved.
 -@xref{realpath invocation}, which gives greater control
 +@xref{realpath}, which gives greater control
- over relative file name generation.
+ over relative file name generation, as demonstrated in the following example:
  
- @item -s
-@@ -9824,7 +9806,7 @@
+ @example
+@@ -10009,7 +9991,7 @@
  @end smallexample
  
  
@@ -1146,7 +1144,7 @@
  @section @command{mkdir}: Make directories
  
  @pindex mkdir
-@@ -9903,7 +9885,7 @@
+@@ -10082,7 +10064,7 @@
  @exitstatus
  
  
@@ -1155,7 +1153,7 @@
  @section @command{mkfifo}: Make FIFOs (named pipes)
  
  @pindex mkfifo
-@@ -9950,7 +9932,7 @@
+@@ -10123,7 +10105,7 @@
  @exitstatus
  
  
@@ -1164,7 +1162,7 @@
  @section @command{mknod}: Make block or character special files
  
  @pindex mknod
-@@ -10033,7 +10015,7 @@
+@@ -10200,7 +10182,7 @@
  @exitstatus
  
  
@@ -1173,7 +1171,7 @@
  @section @command{readlink}: Print value of a symlink or canonical file name
  
  @pindex readlink
-@@ -10135,7 +10117,7 @@
+@@ -10302,7 +10284,7 @@
  @exitstatus
  
  
@@ -1182,7 +1180,7 @@
  @section @command{rmdir}: Remove empty directories
  
  @pindex rmdir
-@@ -10183,12 +10165,12 @@
+@@ -10350,12 +10332,12 @@
  
  @end table
  
@@ -1197,7 +1195,7 @@
  @section @command{unlink}: Remove files via the unlink syscall
  
  @pindex unlink
-@@ -10199,7 +10181,7 @@
+@@ -10366,7 +10348,7 @@
  @code{unlink} function.  @xref{Deleting Files, , , libc,
  The GNU C Library Reference Manual}.  Synopsis:
  It avoids the bells and whistles of the more commonly-used
@@ -1206,7 +1204,7 @@
  
  @example
  unlink @var{filename}
-@@ -10233,14 +10215,14 @@
+@@ -10400,14 +10382,14 @@
  These commands change file attributes.
  
  @menu
@@ -1226,7 +1224,7 @@
  @section @command{chown}: Change file owner and group
  
  @pindex chown
-@@ -10458,7 +10440,7 @@
+@@ -10625,7 +10607,7 @@
  @end smallexample
  
  
@@ -1235,7 +1233,7 @@
  @section @command{chgrp}: Change group ownership
  
  @pindex chgrp
-@@ -10581,7 +10563,7 @@
+@@ -10748,7 +10730,7 @@
  @end smallexample
  
  
@@ -1244,7 +1242,7 @@
  @section @command{chmod}: Change access permissions
  
  @pindex chmod
-@@ -10681,7 +10663,7 @@
+@@ -10848,7 +10830,7 @@
  @exitstatus
  
  
@@ -1253,7 +1251,7 @@
  @section @command{touch}: Change file timestamps
  
  @pindex touch
-@@ -10888,15 +10870,15 @@
+@@ -11055,15 +11037,15 @@
  file status information, and write buffers to disk.
  
  @menu
@@ -1275,7 +1273,7 @@
  @section @command{df}: Report file system disk space usage
  
  @pindex df
-@@ -11191,7 +11173,7 @@
+@@ -11362,7 +11344,7 @@
  or @option{-x} is used together with a file name argument.
  
  
@@ -1284,7 +1282,7 @@
  @section @command{du}: Estimate file space usage
  
  @pindex du
-@@ -11424,7 +11406,7 @@
+@@ -11619,7 +11601,7 @@
  @item +@var{format}
  @vindex LC_TIME
  List timestamps using @var{format}, where @var{format} is interpreted
@@ -1293,7 +1291,7 @@
  For example, @option{--time-style="+%Y-%m-%d %H:%M:%S"} causes
  @command{du} to list timestamps like @samp{2002-03-30 23:45:56}.  As
  with @command{date}, @var{format}'s interpretation is affected by the
-@@ -11492,7 +11474,7 @@
+@@ -11687,7 +11669,7 @@
  @exitstatus
  
  
@@ -1302,7 +1300,7 @@
  @section @command{stat}: Report file or file system status
  
  @pindex stat
-@@ -11676,7 +11658,7 @@
+@@ -11876,7 +11858,7 @@
  @exitstatus
  
  
@@ -1311,7 +1309,7 @@
  @section @command{sync}: Synchronize data on disk with memory
  
  @pindex sync
-@@ -11703,7 +11685,7 @@
+@@ -11903,7 +11885,7 @@
  @exitstatus
  
  
@@ -1320,7 +1318,7 @@
  @section @command{truncate}: Shrink or extend the size of a file
  
  @pindex truncate
-@@ -11779,13 +11761,13 @@
+@@ -11980,13 +11962,13 @@
  This section describes commands that display text strings.
  
  @menu
@@ -1338,7 +1336,7 @@
  @section @command{echo}: Print a line of text
  
  @pindex echo
-@@ -11874,12 +11856,12 @@
+@@ -12075,12 +12057,12 @@
  @var{string} contains a backslash or if the first argument is
  @option{-n}.  Portable programs can use the @command{printf} command
  if they need to omit trailing newlines or output control characters or
@@ -1353,7 +1351,7 @@
  @section @command{printf}: Format and print data
  
  @pindex printf
-@@ -12033,7 +12015,7 @@
+@@ -12234,7 +12216,7 @@
  @exitstatus
  
  
@@ -1362,7 +1360,7 @@
  @section @command{yes}: Print a string until interrupted
  
  @pindex yes
-@@ -12064,14 +12046,14 @@
+@@ -12265,14 +12247,14 @@
  pipeline.
  
  @menu
@@ -1382,7 +1380,7 @@
  @section @command{false}: Do nothing, unsuccessfully
  
  @pindex false
-@@ -12101,7 +12083,7 @@
+@@ -12302,7 +12284,7 @@
  non-GNU hosts.
  
  
@@ -1391,7 +1389,7 @@
  @section @command{true}: Do nothing, successfully
  
  @pindex true
-@@ -12137,7 +12119,7 @@
+@@ -12338,7 +12320,7 @@
  more secure and faster than a shell script implementation, and may safely
  be used as a dummy shell for the purpose of disabling accounts.
  
@@ -1400,7 +1398,7 @@
  @section @command{test}: Check file types and compare values
  
  @pindex test
-@@ -12470,7 +12452,7 @@
+@@ -12671,7 +12653,7 @@
  @end table
  
  
@@ -1409,7 +1407,7 @@
  @section @command{expr}: Evaluate expressions
  
  @pindex expr
-@@ -12747,11 +12729,11 @@
+@@ -12948,11 +12930,11 @@
  it's described here.
  
  @menu
@@ -1423,7 +1421,7 @@
  @section @command{tee}: Redirect output to multiple files or processes
  
  @pindex tee
-@@ -12912,15 +12894,15 @@
+@@ -13113,15 +13095,15 @@
  This section describes commands that manipulate file names.
  
  @menu
@@ -1445,7 +1443,7 @@
  @section @command{basename}: Strip directory and suffix from a file name
  
  @pindex basename
-@@ -13006,7 +12988,7 @@
+@@ -13207,7 +13189,7 @@
  @end smallexample
  
  
@@ -1454,7 +1452,7 @@
  @section @command{dirname}: Strip last file name component
  
  @pindex dirname
-@@ -13063,7 +13045,7 @@
+@@ -13264,7 +13246,7 @@
  @end smallexample
  
  
@@ -1463,7 +1461,7 @@
  @section @command{pathchk}: Check file name validity and portability
  
  @pindex pathchk
-@@ -13139,7 +13121,7 @@
+@@ -13340,7 +13322,7 @@
  1 otherwise.
  @end display
  
@@ -1472,7 +1470,7 @@
  @section @command{mktemp}: Create temporary file or directory
  
  @pindex mktemp
-@@ -13314,7 +13296,7 @@
+@@ -13515,7 +13497,7 @@
  @end display
  
  
@@ -1481,7 +1479,7 @@
  @section @command{realpath}: Print the resolved file name.
  
  @pindex realpath
-@@ -13442,14 +13424,14 @@
+@@ -13643,14 +13625,14 @@
  so forth.  See also the user-related commands in the next section.
  
  @menu
@@ -1501,7 +1499,7 @@
  @section @command{pwd}: Print working directory
  
  @pindex pwd
-@@ -13496,7 +13478,7 @@
+@@ -13697,7 +13679,7 @@
  @exitstatus
  
  
@@ -1510,7 +1508,7 @@
  @section @command{stty}: Print or change terminal characteristics
  
  @pindex stty
-@@ -14187,7 +14169,7 @@
+@@ -14398,7 +14380,7 @@
  @end table
  
  
@@ -1519,7 +1517,7 @@
  @section @command{printenv}: Print all or some environment variables
  
  @pindex printenv
-@@ -14222,7 +14204,7 @@
+@@ -14433,7 +14415,7 @@
  @end display
  
  
@@ -1528,7 +1526,7 @@
  @section @command{tty}: Print file name of terminal on standard input
  
  @pindex tty
-@@ -14272,16 +14254,16 @@
+@@ -14483,16 +14465,16 @@
  logins, groups, and so forth.
  
  @menu
@@ -1552,16 +1550,16 @@
  @section @command{id}: Print user identity
  
  @pindex id
-@@ -14367,7 +14349,7 @@
- @end macro
- @primaryAndSupplementaryGroups{id,user argument}
+@@ -14594,7 +14576,7 @@
+ 
+ @exitstatus
  
 -@node logname invocation
 +@node logname
  @section @command{logname}: Print current login name
  
  @pindex logname
-@@ -14388,7 +14370,7 @@
+@@ -14615,7 +14597,7 @@
  @exitstatus
  
  
@@ -1570,7 +1568,7 @@
  @section @command{whoami}: Print effective user ID
  
  @pindex whoami
-@@ -14404,7 +14386,7 @@
+@@ -14631,7 +14613,7 @@
  @exitstatus
  
  
@@ -1579,16 +1577,16 @@
  @section @command{groups}: Print group names a user is in
  
  @pindex groups
-@@ -14432,7 +14414,7 @@
- @exitstatus
+@@ -14658,7 +14640,7 @@
  
+ @exitstatus
  
 -@node users invocation
 +@node users
  @section @command{users}: Print login names of users currently logged in
  
  @pindex users
-@@ -14463,7 +14445,7 @@
+@@ -14689,7 +14671,7 @@
  @exitstatus
  
  
@@ -1597,7 +1595,7 @@
  @section @command{who}: Print who is currently logged in
  
  @pindex who
-@@ -14622,16 +14604,14 @@
+@@ -14848,16 +14830,14 @@
  information.
  
  @menu
@@ -1620,7 +1618,7 @@
  @section @command{date}: Print or set system date and time
  
  @pindex date
-@@ -15324,7 +15304,7 @@
+@@ -15550,7 +15530,7 @@
  @end itemize
  
  
@@ -1629,7 +1627,7 @@
  @section @command{arch}: Print machine hardware name
  
  @pindex arch
-@@ -15344,7 +15324,7 @@
+@@ -15570,7 +15550,7 @@
  @exitstatus
  
  
@@ -1638,7 +1636,7 @@
  @section @command{nproc}: Print the number of available processors
  
  @pindex nproc
-@@ -15381,7 +15361,7 @@
+@@ -15607,7 +15587,7 @@
  @exitstatus
  
  
@@ -1647,7 +1645,7 @@
  @section @command{uname}: Print system information
  
  @pindex uname
-@@ -15511,31 +15491,7 @@
+@@ -15737,31 +15717,7 @@
  @exitstatus
  
  
@@ -1680,7 +1678,7 @@
  @section @command{hostid}: Print numeric host identifier
  
  @pindex hostid
-@@ -15559,37 +15515,6 @@
+@@ -15785,37 +15741,6 @@
  
  @exitstatus
  
@@ -1718,7 +1716,7 @@
  @node SELinux context
  @chapter SELinux context
  
-@@ -15601,11 +15526,11 @@
+@@ -15827,11 +15752,11 @@
  contexts.
  
  @menu
@@ -1733,7 +1731,7 @@
  @section @command{chcon}: Change SELinux context of file
  
  @pindex chcon
-@@ -15708,7 +15633,7 @@
+@@ -15934,7 +15859,7 @@
  
  @exitstatus
  
@@ -1742,7 +1740,7 @@
  @section @command{runcon}: Run a command in specified SELinux context
  
  @pindex runcon
-@@ -15793,16 +15718,16 @@
+@@ -16019,16 +15944,16 @@
  user, etc.
  
  @menu
@@ -1766,7 +1764,7 @@
  @section @command{chroot}: Run a command with a different root directory
  
  @pindex chroot
-@@ -15890,7 +15815,7 @@
+@@ -16116,7 +16041,7 @@
  @end display
  
  
@@ -1775,7 +1773,7 @@
  @section @command{env}: Run a command in a modified environment
  
  @pindex env
-@@ -16040,7 +15965,7 @@
+@@ -16266,7 +16191,7 @@
  @end display
  
  
@@ -1784,7 +1782,7 @@
  @section @command{nice}: Run a command with modified niceness
  
  @pindex nice
-@@ -16167,7 +16092,7 @@
+@@ -16393,7 +16318,7 @@
  @end example
  
  
@@ -1793,7 +1791,7 @@
  @section @command{nohup}: Run a command immune to hangups
  
  @pindex nohup
-@@ -16240,7 +16165,7 @@
+@@ -16466,7 +16391,7 @@
  instead of 125.
  
  
@@ -1802,7 +1800,7 @@
  @section @command{stdbuf}: Run a command with modified I/O stream buffering
  
  @pindex stdbuf
-@@ -16329,7 +16254,7 @@
+@@ -16555,7 +16480,7 @@
  @end display
  
  
@@ -1811,7 +1809,7 @@
  @section @command{timeout}: Run a command with a time limit
  
  @pindex timeout
-@@ -16416,90 +16341,6 @@
+@@ -16642,90 +16567,6 @@
  @end display
  
  
@@ -1902,7 +1900,7 @@
  @node Delaying
  @chapter Delaying
  
-@@ -16509,11 +16350,11 @@
+@@ -16735,11 +16576,11 @@
  @c Perhaps @command{wait} or other commands should be described here also?
  
  @menu
@@ -1916,7 +1914,7 @@
  @section @command{sleep}: Delay for a specified time
  
  @pindex sleep
-@@ -16563,12 +16404,12 @@
+@@ -16789,12 +16630,12 @@
  These programs do numerically-related operations.
  
  @menu
@@ -1932,7 +1930,7 @@
  @section @command{factor}: Print prime factors
  
  @pindex factor
-@@ -16626,7 +16467,7 @@
+@@ -16852,7 +16693,7 @@
  @exitstatus
  
  
diff --git a/coreutils.spec b/coreutils.spec
index a1d9101..44cc5ec 100644
--- a/coreutils.spec
+++ b/coreutils.spec
@@ -6,12 +6,12 @@
 Summary:	GNU Core-utils - basic command line utilities
 Summary(pl.UTF-8):	GNU Core-utils - podstawowe narzędzia działające z linii poleceń
 Name:		coreutils
-Version:	8.21
-Release:	2
+Version:	8.22
+Release:	1
 License:	GPL v3+
 Group:		Applications/System
 Source0:	http://ftp.gnu.org/gnu/coreutils/%{name}-%{version}.tar.xz
-# Source0-md5:	065ba41828644eca5dd8163446de5d64
+# Source0-md5:	8fb0ae2267aa6e728958adc38f8163a2
 Source1:	%{name}-non-english-man-pages.tar.bz2
 # Source1-md5:	f7c986ebc74ccb8d08ed70141063f14c
 Source2:	DIR_COLORS
@@ -29,7 +29,7 @@ Patch7:		%{name}-sparc64.patch
 Patch8:		%{name}-pl.po-update.patch
 # from http://www.beatex.org/web/advancedcopy.html, edited by shadzik
 Patch9:		%{name}-advcopy.patch
-Patch10:	format-security.patch
+Patch10:	tests.patch
 URL:		http://www.gnu.org/software/coreutils/
 BuildRequires:	acl-devel
 BuildRequires:	attr-devel
diff --git a/format-security.patch b/format-security.patch
deleted file mode 100644
index 676a203..0000000
--- a/format-security.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- coreutils-8.20/gnulib-tests/test-xvasprintf.c~	2012-10-23 16:17:25.000000000 +0200
-+++ coreutils-8.20/gnulib-tests/test-xvasprintf.c	2012-12-17 23:51:09.622359300 +0100
-@@ -95,7 +95,7 @@
-   {
-     /* Silence gcc warning about zero-length format string.  */
-     const char *empty = "";
--    result = xasprintf (empty);
-+    result = xasprintf ("%s",empty);
-     ASSERT (result != NULL);
-     ASSERT (strcmp (result, "") == 0);
-     free (result);