- merged 9.6 from PLD

diff --git a/coreutils-fmt-wchars.patch b/coreutils-fmt-wchars.patch
index 066adfdbb3f30ffa9e18da44c67b8c46d0657d8b..f04e109c92e53b55d63b1a39d8c9b715a1586b6b 100644 (file)
--- a/coreutils-fmt-wchars.patch
+++ b/coreutils-fmt-wchars.patch
@@ -232,7 +232,7 @@
 +  prefix = L"";
 +  prefix_width = prefix_lead_space = prefix_full_width = 0;
  
 +  prefix = L"";
 +  prefix_width = prefix_lead_space = prefix_full_width = 0;
  

-   if (argc > 1 && argv[1][0] == '-' && ISDIGIT (argv[1][1]))
+   if (argc > 1 && argv[1][0] == '-' && c_isdigit (argv[1][1]))

      {
 @@ -350,7 +377,7 @@
        argc--;
      {
 @@ -350,7 +377,7 @@
        argc--;

diff --git a/coreutils-info.patch b/coreutils-info.patch
index da9e259009446c1829f4742d3bff7a81158fdb45..c6b7257b5ca985ad16e39f0890579cb7efe564a0 100644 (file)
--- a/coreutils-info.patch
+++ b/coreutils-info.patch
@@ -1,5 +1,5 @@
---- coreutils-9.5/doc/coreutils.texi.orig      2024-03-24 18:51:06.000000000 +0100
-+++ coreutils-9.5/doc/coreutils.texi   2024-03-28 22:13:57.040433328 +0100
+--- coreutils-9.6/doc/coreutils.texi.orig      2025-01-10 15:46:40.000000000 +0100
++++ coreutils-9.6/doc/coreutils.texi   2025-01-19 16:07:53.391846255 +0100

 @@ -24,124 +24,113 @@
  @syncodeindex pg cp
  @syncodeindex vr cp
 @@ -24,124 +24,113 @@
  @syncodeindex pg cp
  @syncodeindex vr cp


@@ -545,7 +545,7 @@
  
  
  File timestamps
  
  
  File timestamps

-@@ -1628,16 +1610,16 @@ These commands read and write entire fil
+@@ -1636,16 +1618,16 @@ These commands read and write entire fil

  in some way.
  
  @menu
  in some way.
  
  @menu


@@ -570,7 +570,7 @@
  @section @command{cat}: Concatenate and write files
  
  @pindex cat
  @section @command{cat}: Concatenate and write files
  
  @pindex cat

-@@ -1739,7 +1721,7 @@ cat
+@@ -1747,7 +1729,7 @@ cat

  @end example
  
  
  @end example
  
  


@@ -579,7 +579,7 @@
  @section @command{tac}: Concatenate and write files in reverse
  
  @pindex tac
  @section @command{tac}: Concatenate and write files in reverse
  
  @pindex tac

-@@ -1797,7 +1779,7 @@ tac -r -s 'x\|[^x]'
+@@ -1805,7 +1787,7 @@ tac -r -s 'x\|[^x]'

  @end example
  
  
  @end example
  
  


@@ -588,7 +588,7 @@
  @section @command{nl}: Number lines and write files
  
  @pindex nl
  @section @command{nl}: Number lines and write files
  
  @pindex nl

-@@ -1965,7 +1947,7 @@ Use @var{number} characters for line num
+@@ -1973,7 +1955,7 @@ Use @var{number} characters for line num

  @exitstatus
  
  
  @exitstatus
  
  


@@ -597,7 +597,7 @@
  @section @command{od}: Write files in octal or other formats
  
  @pindex od
  @section @command{od}: Write files in octal or other formats
  
  @pindex od

-@@ -2237,7 +2219,7 @@ address.
+@@ -2245,7 +2227,7 @@ address.

  @exitstatus
  
  
  @exitstatus
  
  


@@ -606,7 +606,7 @@
  @section @command{base32}: Transform data into printable data
  
  @pindex base32
  @section @command{base32}: Transform data into printable data
  
  @pindex base32

-@@ -2247,11 +2229,11 @@ address.
+@@ -2255,11 +2237,11 @@ address.

  into (or from) base32 encoded form.  The base32 encoded form uses
  printable ASCII characters to represent binary data.
  The usage and options of this command are precisely the
  into (or from) base32 encoded form.  The base32 encoded form uses
  printable ASCII characters to represent binary data.
  The usage and options of this command are precisely the


@@ -621,7 +621,7 @@
  @section @command{base64}: Transform data into printable data
  
  @pindex base64
  @section @command{base64}: Transform data into printable data
  
  @pindex base64

-@@ -2272,7 +2254,7 @@ The base32 encoding expands data to roug
+@@ -2280,7 +2262,7 @@ The base32 encoding expands data to roug

  The format conforms to
  @uref{https://datatracker.ietf.org/doc/rfc4648/, RFC 4648}.
  
  The format conforms to
  @uref{https://datatracker.ietf.org/doc/rfc4648/, RFC 4648}.
  


@@ -630,7 +630,7 @@
  
  The program accepts the following options.  Also see @ref{Common options}.
  
  
  The program accepts the following options.  Also see @ref{Common options}.
  

-@@ -2313,7 +2295,7 @@ to permit distorted data to be decoded.
+@@ -2321,7 +2303,7 @@ to permit distorted data to be decoded.

  
  @exitstatus
  
  
  @exitstatus
  


@@ -639,7 +639,7 @@
  @section @command{basenc}: Transform data into printable data
  
  @pindex basenc
  @section @command{basenc}: Transform data into printable data
  
  @pindex basenc

-@@ -2334,7 +2316,7 @@ The @var{encoding} argument is required.
+@@ -2342,7 +2324,7 @@ The @var{encoding} argument is required.

  @command{basenc} reads from standard input.
  The @option{-w/--wrap},@option{-i/--ignore-garbage},
  @option{-d/--decode} options of this command are precisely the same as
  @command{basenc} reads from standard input.
  The @option{-w/--wrap},@option{-i/--ignore-garbage},
  @option{-d/--decode} options of this command are precisely the same as


@@ -648,7 +648,7 @@
  
  
  Supported @var{encoding}s are:
  
  
  Supported @var{encoding}s are:

-@@ -2449,13 +2431,13 @@ $ printf 01010100 | basenc --base2lsbf -
+@@ -2457,13 +2439,13 @@ $ printf 01010100 | basenc --base2lsbf -

  These commands reformat the contents of files.
  
  @menu
  These commands reformat the contents of files.
  
  @menu


@@ -666,7 +666,7 @@
  @section @command{fmt}: Reformat paragraph text
  
  @pindex fmt
  @section @command{fmt}: Reformat paragraph text
  
  @pindex fmt

-@@ -2559,7 +2541,7 @@ leaving the code unchanged.
+@@ -2567,7 +2549,7 @@ leaving the code unchanged.

  
  @exitstatus
  
  
  @exitstatus
  


@@ -675,7 +675,7 @@
  @section @command{pr}: Paginate or columnate files for printing
  
  @pindex pr
  @section @command{pr}: Paginate or columnate files for printing
  
  @pindex pr

-@@ -2671,7 +2653,7 @@ Double space the output.
+@@ -2679,7 +2661,7 @@ Double space the output.

  @cindex time formats
  @cindex formatting times
  Format header dates using @var{format}, using the same conventions as
  @cindex time formats
  @cindex formatting times
  Format header dates using @var{format}, using the same conventions as


@@ -684,7 +684,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,
  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,

-@@ -2901,7 +2883,7 @@ line is never truncated.
+@@ -2909,7 +2891,7 @@ line is never truncated.

  @exitstatus
  
  
  @exitstatus
  
  


@@ -693,7 +693,7 @@
  @section @command{fold}: Wrap input lines to fit in specified width
  
  @pindex fold
  @section @command{fold}: Wrap input lines to fit in specified width
  
  @pindex fold

-@@ -2968,13 +2950,13 @@ instead.
+@@ -2976,13 +2958,13 @@ instead.

  These commands output pieces of the input.
  
  @menu
  These commands output pieces of the input.
  
  @menu


@@ -712,7 +712,7 @@
  @section @command{head}: Output the first part of files
  
  @pindex head
  @section @command{head}: Output the first part of files
  
  @pindex head

-@@ -3053,7 +3035,7 @@ avoid @command{head}, e.g., by using @sa
+@@ -3061,7 +3043,7 @@ avoid @command{head}, e.g., by using @sa

  @exitstatus
  
  
  @exitstatus
  
  


@@ -721,7 +721,7 @@
  @section @command{tail}: Output the last part of files
  
  @pindex tail
  @section @command{tail}: Output the last part of files
  
  @pindex tail

-@@ -3307,7 +3289,7 @@ mean either @samp{tail ./+4} or @samp{ta
+@@ -3315,7 +3297,7 @@ mean either @samp{tail ./+4} or @samp{ta

  @exitstatus
  
  
  @exitstatus
  
  


@@ -730,7 +730,7 @@
  @section @command{split}: Split a file into pieces.
  
  @pindex split
  @section @command{split}: Split a file into pieces.
  
  @pindex split

-@@ -3564,7 +3546,7 @@ $ seq 100 > k; split -nl/7/33 k
+@@ -3572,7 +3554,7 @@ $ seq 100 > k; split -nl/7/33 k

  @end example
  
  
  @end example
  
  


@@ -739,7 +739,7 @@
  @section @command{csplit}: Split a file into context-determined pieces
  
  @pindex csplit
  @section @command{csplit}: Split a file into context-determined pieces
  
  @pindex csplit

-@@ -3784,17 +3766,17 @@ These commands generate just a few numbe
+@@ -3792,17 +3774,17 @@ These commands generate just a few numbe

  contents of files.
  
  @menu
  contents of files.
  
  @menu


@@ -764,7 +764,7 @@
  @section @command{wc}: Print newline, word, and byte counts
  
  @pindex wc
  @section @command{wc}: Print newline, word, and byte counts
  
  @pindex wc

-@@ -3955,7 +3937,7 @@ find . -name '*.[ch]' -print0 |
+@@ -3963,7 +3945,7 @@ find . -name '*.[ch]' -print0 |

  @exitstatus
  
  
  @exitstatus
  
  


@@ -773,7 +773,7 @@
  @section @command{sum}: Print checksum and block counts
  
  @pindex sum
  @section @command{sum}: Print checksum and block counts
  
  @pindex sum

-@@ -4004,7 +3986,7 @@ next section) is preferable in new appli
+@@ -4012,7 +3994,7 @@ next section) is preferable in new appli

  @exitstatus
  
  
  @exitstatus
  
  


@@ -782,16 +782,16 @@
  @section @command{cksum}: Print and verify file checksums
  
  @pindex cksum
  @section @command{cksum}: Print and verify file checksums
  
  @pindex cksum

-@@ -4052,7 +4034,7 @@ The 32-bit CRC used is based on the poly
- for CRC error checking in the ISO/IEC 8802-3:1996 standard (Ethernet).
+@@ -4061,7 +4043,7 @@ for CRC error checking in the ISO/IEC 88

  Similar output formats are used for the other legacy checksums
  Similar output formats are used for the other legacy checksums

- selectable with @option{--algorithm=sysv} or @option{--algorithm=bsd},
+ selectable with @option{--algorithm=crc32b}, and
+ @option{--algorithm=sysv} or @option{--algorithm=bsd}

 -detailed at @ref{sum invocation}.
 +detailed at @ref{sum}.
  
  @item Tagged output format
  With the @option{--algorithm} option selecting non legacy checksums,
 -detailed at @ref{sum invocation}.
 +detailed at @ref{sum}.
  
  @item Tagged output format
  With the @option{--algorithm} option selecting non legacy checksums,

-@@ -4302,7 +4284,7 @@ exit nonzero after all warnings have bee
+@@ -4312,7 +4294,7 @@ exit nonzero after all warnings have bee

  Also file name escaping is not used.
  @end table
  
  Also file name escaping is not used.
  @end table
  


@@ -800,7 +800,7 @@
  @section @command{md5sum}: Print or check MD5 digests
  
  @pindex md5sum
  @section @command{md5sum}: Print or check MD5 digests
  
  @pindex md5sum

-@@ -4325,7 +4307,7 @@ fingerprint is considered infeasible at
+@@ -4335,7 +4317,7 @@ fingerprint is considered infeasible at

  to modify certain files, including digital certificates, so that they
  appear valid when signed with an \hash\ digest.  For more secure hashes,
  consider using SHA-2 or @command{b2sum}.
  to modify certain files, including digital certificates, so that they
  appear valid when signed with an \hash\ digest.  For more secure hashes,
  consider using SHA-2 or @command{b2sum}.


@@ -809,7 +809,7 @@
  @end macro
  @weakHash{MD5}
  
  @end macro
  @weakHash{MD5}
  

-@@ -4349,7 +4331,7 @@ The program accepts @ref{cksum common op
+@@ -4359,7 +4341,7 @@ The program accepts @ref{cksum common op

  @exitstatus
  
  
  @exitstatus
  
  


@@ -818,7 +818,7 @@
  @section @command{b2sum}: Print or check BLAKE2 digests
  
  @pindex b2sum
  @section @command{b2sum}: Print or check BLAKE2 digests
  
  @pindex b2sum

-@@ -4371,7 +4353,7 @@ In addition @command{b2sum} supports the
+@@ -4381,7 +4363,7 @@ In addition @command{b2sum} supports the

  @end table
  
  
  @end table
  
  


@@ -827,7 +827,7 @@
  @section @command{sha1sum}: Print or check SHA-1 digests
  
  @pindex sha1sum
  @section @command{sha1sum}: Print or check SHA-1 digests
  
  @pindex sha1sum

-@@ -4429,16 +4411,16 @@ collectively known as the SHA-2 hashes.
+@@ -4439,16 +4421,16 @@ collectively known as the SHA-2 hashes.

  These commands work with (or produce) sorted files.
  
  @menu
  These commands work with (or produce) sorted files.
  
  @menu


@@ -851,7 +851,7 @@
  @section @command{sort}: Sort text files
  
  @pindex sort
  @section @command{sort}: Sort text files
  
  @pindex sort

-@@ -4737,7 +4719,7 @@ appear earlier in the output instead of
+@@ -4747,7 +4729,7 @@ appear earlier in the output instead of

  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
  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


@@ -860,7 +860,7 @@
  except that keys with the same value sort together.
  
  If multiple random sort fields are specified, the same random hash
  except that keys with the same value sort together.
  
  If multiple random sort fields are specified, the same random hash

-@@ -4936,7 +4918,7 @@ Set the number of sorts run in parallel
+@@ -4946,7 +4928,7 @@ Set the number of sorts run in parallel

  @var{n} is set to the number of available processors, but limited
  to 8, as performance gains diminish after that.
  Using @var{n} threads increases the memory usage by
  @var{n} is set to the number of available processors, but limited
  to 8, as performance gains diminish after that.
  Using @var{n} threads increases the memory usage by


@@ -869,7 +869,7 @@
  
  @item -u
  @itemx --unique
  
  @item -u
  @itemx --unique

-@@ -4954,7 +4936,7 @@ The commands @code{sort -u} and @code{so
+@@ -4964,7 +4946,7 @@ The commands @code{sort -u} and @code{so

  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 |
  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 |


@@ -878,7 +878,7 @@
  
  @optZeroTerminated
  @macro newlineFieldSeparator
  
  @optZeroTerminated
  @macro newlineFieldSeparator

-@@ -5170,7 +5152,7 @@ ls */* | sort -t / -k 1,1R -k 2,2
+@@ -5190,7 +5172,7 @@ ls */* | sort -t / -k 1,1R -k 2,2

  @end itemize
  
  
  @end itemize
  
  


@@ -887,7 +887,7 @@
  @section @command{shuf}: Shuffling text
  
  @pindex shuf
  @section @command{shuf}: Shuffling text
  
  @pindex shuf

-@@ -5326,7 +5308,7 @@ shuf -r -n 100 -e Head Tail
+@@ -5346,7 +5328,7 @@ shuf -r -n 100 -e Head Tail

  @exitstatus
  
  
  @exitstatus
  
  


@@ -896,7 +896,7 @@
  @section @command{uniq}: Uniquify files
  
  @pindex uniq
  @section @command{uniq}: Uniquify files
  
  @pindex uniq

-@@ -5348,7 +5330,7 @@ lines that are not repeated, or all repe
+@@ -5368,7 +5350,7 @@ lines that are not repeated, or all repe

  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}.
  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}.


@@ -905,7 +905,7 @@
  
  @vindex LC_COLLATE
  Comparisons honor the rules specified by the @env{LC_COLLATE}
  
  @vindex LC_COLLATE
  Comparisons honor the rules specified by the @env{LC_COLLATE}

-@@ -5514,7 +5496,7 @@ compared.
+@@ -5534,7 +5516,7 @@ compared.

  @exitstatus
  
  
  @exitstatus
  
  


@@ -914,7 +914,7 @@
  @section @command{comm}: Compare two sorted files line by line
  
  @pindex comm
  @section @command{comm}: Compare two sorted files line by line
  
  @pindex comm

-@@ -5630,7 +5612,7 @@ $ comm -12 file1 file2 | wc -l    # numb
+@@ -5650,7 +5632,7 @@ $ comm -12 file1 file2 | wc -l    # numb

  
  @end table
  
  
  @end table
  


@@ -923,7 +923,7 @@
  @section @command{ptx}: Produce permuted indexes
  
  @pindex ptx
  @section @command{ptx}: Produce permuted indexes
  
  @pindex ptx

-@@ -6120,7 +6102,7 @@ allowed with System V @command{ptx}.
+@@ -6140,7 +6122,7 @@ allowed with System V @command{ptx}.

  @end itemize
  
  
  @end itemize
  
  


@@ -932,7 +932,7 @@
  @section @command{tsort}: Topological sort
  
  @pindex tsort
  @section @command{tsort}: Topological sort
  
  @pindex tsort

-@@ -6282,13 +6264,13 @@ in different ways.
+@@ -6302,13 +6284,13 @@ in different ways.

  @chapter Operating on fields
  
  @menu
  @chapter Operating on fields
  
  @menu


@@ -950,7 +950,7 @@
  @section @command{cut}: Print selected parts of lines
  
  @pindex cut
  @section @command{cut}: Print selected parts of lines
  
  @pindex cut

-@@ -6413,7 +6395,7 @@ many fields and want to print all but a
+@@ -6433,7 +6415,7 @@ many fields and want to print all but a

  @exitstatus
  
  
  @exitstatus
  
  


@@ -959,7 +959,7 @@
  @section @command{paste}: Merge lines of files
  
  @pindex paste
  @section @command{paste}: Merge lines of files
  
  @pindex paste

-@@ -6511,7 +6493,7 @@ $ paste -d '%_' num2 let3 num2
+@@ -6531,7 +6513,7 @@ $ paste -d '%_' num2 let3 num2

  @exitstatus
  
  
  @exitstatus
  
  


@@ -968,7 +968,7 @@
  @section @command{join}: Join lines on a common field
  
  @pindex join
  @section @command{join}: Join lines on a common field
  
  @pindex join

-@@ -7043,13 +7025,13 @@ entire lines as the key.
+@@ -7063,13 +7045,13 @@ entire lines as the key.

  These commands operate on individual characters.
  
  @menu
  These commands operate on individual characters.
  
  @menu


@@ -986,7 +986,7 @@
  @section @command{tr}: Translate, squeeze, and/or delete characters
  
  @pindex tr
  @section @command{tr}: Translate, squeeze, and/or delete characters
  
  @pindex tr

-@@ -7472,7 +7454,7 @@ tr -d -- -axM
+@@ -7492,7 +7474,7 @@ tr -d -- -axM

  @end itemize
  
  
  @end itemize
  
  


@@ -995,7 +995,7 @@
  @section @command{expand}: Convert tabs to spaces
  
  @pindex expand
  @section @command{expand}: Convert tabs to spaces
  
  @pindex expand

-@@ -7541,7 +7523,7 @@ characters) on each line to spaces.
+@@ -7561,7 +7543,7 @@ characters) on each line to spaces.

  @exitstatus
  
  
  @exitstatus
  
  


@@ -1004,7 +1004,7 @@
  @section @command{unexpand}: Convert spaces to tabs
  
  @pindex unexpand
  @section @command{unexpand}: Convert spaces to tabs
  
  @pindex unexpand

-@@ -7604,14 +7586,14 @@ This chapter describes the @command{ls}
+@@ -7624,14 +7606,14 @@ This chapter describes the @command{ls}

  and @command{vdir}, which list information about files.
  
  @menu
  and @command{vdir}, which list information about files.
  
  @menu


@@ -1024,7 +1024,16 @@
  @section @command{ls}: List directory contents
  
  @pindex ls
  @section @command{ls}: List directory contents
  
  @pindex ls

-@@ -8531,7 +8513,7 @@ be one of the following:
+@@ -8343,7 +8325,7 @@ Specifying @option{--color} and no @var{
+ @option{--color=always}.
+ If piping a colored listing through a pager like @command{less},
+ use the pager's @option{-R} option to pass the color codes to the terminal.
+-@xref{dircolors invocation} to configure the colors used.
++@xref{dircolors} to configure the colors used.
+ 
+ @vindex LS_COLORS
+ @vindex SHELL @r{environment variable, and color}
+@@ -8568,7 +8550,7 @@ be one of the following:

  @item +@var{format}
  @vindex LC_TIME
  List timestamps using @var{format}, where @var{format} is interpreted
  @item +@var{format}
  @vindex LC_TIME
  List timestamps using @var{format}, where @var{format} is interpreted


@@ -1033,7 +1042,7 @@
  For example, @option{--time-style="+%Y-%m-%d %H:%M:%S"} causes
  @command{ls} to list timestamps like @samp{2020-03-30 23:45:56}.  As
  with @command{date}, @var{format}'s interpretation is affected by the
  For example, @option{--time-style="+%Y-%m-%d %H:%M:%S"} causes
  @command{ls} to list timestamps like @samp{2020-03-30 23:45:56}.  As
  with @command{date}, @var{format}'s interpretation is affected by the

-@@ -8732,7 +8714,7 @@ This is the default unless the output is
+@@ -8772,7 +8754,7 @@ This is the default unless the output is

  @end table
  
  
  @end table
  
  


@@ -1042,7 +1051,7 @@
  @section @command{dir}: Briefly list directory contents
  
  @pindex dir
  @section @command{dir}: Briefly list directory contents
  
  @pindex dir

-@@ -8742,10 +8724,10 @@ This is the default unless the output is
+@@ -8782,10 +8764,10 @@ This is the default unless the output is

  -b}; that is, by default files are listed in columns, sorted vertically,
  and special characters are represented by backslash escape sequences.
  
  -b}; that is, by default files are listed in columns, sorted vertically,
  and special characters are represented by backslash escape sequences.
  


@@ -1055,7 +1064,7 @@
  @section @command{vdir}: Verbosely list directory contents
  
  @pindex vdir
  @section @command{vdir}: Verbosely list directory contents
  
  @pindex vdir

-@@ -8755,9 +8737,9 @@ and special characters are represented b
+@@ -8795,9 +8777,9 @@ and special characters are represented b

  -b}; that is, by default files are listed in long format and special
  characters are represented by backslash escape sequences.
  
  -b}; that is, by default files are listed in long format and special
  characters are represented by backslash escape sequences.
  


@@ -1067,7 +1076,7 @@
  @section @command{dircolors}: Color setup for @command{ls}
  
  @pindex dircolors
  @section @command{dircolors}: Color setup for @command{ls}
  
  @pindex dircolors

-@@ -8850,16 +8832,16 @@ This chapter describes the commands for
+@@ -8890,16 +8872,16 @@ This chapter describes the commands for

  copying, moving (renaming), and deleting (removing).
  
  @menu
  copying, moving (renaming), and deleting (removing).
  
  @menu


@@ -1091,7 +1100,7 @@
  @section @command{cp}: Copy files and directories
  
  @pindex cp
  @section @command{cp}: Copy files and directories
  
  @pindex cp

-@@ -9399,7 +9381,7 @@ option, and overrides the @option{--pres
+@@ -9439,7 +9421,7 @@ option, and overrides the @option{--pres

  @exitstatus
  
  
  @exitstatus
  
  


@@ -1100,7 +1109,7 @@
  @section @command{dd}: Convert and copy a file
  
  @pindex dd
  @section @command{dd}: Convert and copy a file
  
  @pindex dd

-@@ -9709,7 +9691,7 @@ If neither this nor @samp{fsync} are spe
+@@ -9749,7 +9731,7 @@ If neither this nor @samp{fsync} are spe

  usual with file systems, i.e., output data and metadata may be cached
  in primary memory for some time before the operating system physically
  writes it, and thus output data and metadata may be lost if power is lost.
  usual with file systems, i.e., output data and metadata may be cached
  in primary memory for some time before the operating system physically
  writes it, and thus output data and metadata may be lost if power is lost.


@@ -1109,7 +1118,7 @@
  This conversion is a GNU extension to POSIX.
  
  @item fsync
  This conversion is a GNU extension to POSIX.
  
  @item fsync

-@@ -9987,7 +9969,7 @@ environment variable is set.
+@@ -10027,7 +10009,7 @@ environment variable is set.

  @exitstatus
  
  
  @exitstatus
  
  


@@ -1118,7 +1127,7 @@
  @section @command{install}: Copy files and set attributes
  
  @pindex install
  @section @command{install}: Copy files and set attributes
  
  @pindex install

-@@ -10171,7 +10153,7 @@ This option is mutually exclusive with t
+@@ -10211,7 +10193,7 @@ This option is mutually exclusive with t

  @exitstatus
  
  
  @exitstatus
  
  


@@ -1127,7 +1136,7 @@
  @section @command{mv}: Move (rename) files
  
  @pindex mv
  @section @command{mv}: Move (rename) files
  
  @pindex mv

-@@ -10354,7 +10336,7 @@ to the system default type for destinati
+@@ -10394,7 +10376,7 @@ to the system default type for destinati

  @exitstatus
  
  
  @exitstatus
  
  


@@ -1136,7 +1145,7 @@
  @section @command{rm}: Remove files or directories
  
  @pindex rm
  @section @command{rm}: Remove files or directories
  
  @pindex rm

-@@ -10520,7 +10502,7 @@ predates the development of the @code{ge
+@@ -10560,7 +10542,7 @@ predates the development of the @code{ge

  @exitstatus
  
  
  @exitstatus
  
  


@@ -1145,7 +1154,7 @@
  @section @command{shred}: Remove files more securely
  
  @pindex shred
  @section @command{shred}: Remove files more securely
  
  @pindex shred

-@@ -10530,7 +10512,7 @@ predates the development of the @code{ge
+@@ -10570,7 +10552,7 @@ predates the development of the @code{ge

  @command{shred} overwrites devices or files, to help prevent even
  extensive forensics from recovering the data.
  
  @command{shred} overwrites devices or files, to help prevent even
  extensive forensics from recovering the data.
  


@@ -1154,7 +1163,7 @@
  and metadata are not actually destroyed.  Only the file's directory
  entry is removed, and the file's storage is reclaimed only when no
  process has the file open and no other directory entry links to the
  and metadata are not actually destroyed.  Only the file's directory
  entry is removed, and the file's storage is reclaimed only when no
  process has the file open and no other directory entry links to the

-@@ -10817,18 +10799,18 @@ Besides directories, other special file
+@@ -10857,18 +10839,18 @@ Besides directories, other special file

  (FIFOs), symbolic links, sockets, and so-called @dfn{special files}.
  
  @menu
  (FIFOs), symbolic links, sockets, and so-called @dfn{special files}.
  
  @menu


@@ -1182,7 +1191,7 @@
  @section @command{link}: Make a hard link via the link syscall
  
  @pindex link
  @section @command{link}: Make a hard link via the link syscall
  
  @pindex link

-@@ -10841,7 +10823,7 @@ It is a minimalist interface to the syst
+@@ -10881,7 +10863,7 @@ It is a minimalist interface to the syst

  @code{link} function.  @xref{Hard Links, , , libc,
  The GNU C Library Reference Manual}.
  It avoids the bells and whistles of the more commonly-used
  @code{link} function.  @xref{Hard Links, , , libc,
  The GNU C Library Reference Manual}.
  It avoids the bells and whistles of the more commonly-used


@@ -1191,7 +1200,7 @@
  Synopsis:
  
  @example
  Synopsis:
  
  @example

-@@ -10867,7 +10849,7 @@ to specify which behavior is desired.
+@@ -10907,7 +10889,7 @@ to specify which behavior is desired.

  @exitstatus
  
  
  @exitstatus
  
  


@@ -1200,7 +1209,7 @@
  @section @command{ln}: Make links between files
  
  @pindex ln
  @section @command{ln}: Make links between files
  
  @pindex ln

-@@ -11055,7 +11037,7 @@ ln -srv /a/file /tmp
+@@ -11095,7 +11077,7 @@ ln -srv /a/file /tmp

  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.
  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.


@@ -1209,7 +1218,7 @@
  over relative file name generation, as demonstrated in the following example:
  
  @example
  over relative file name generation, as demonstrated in the following example:
  
  @example

-@@ -11132,7 +11114,7 @@ ln -s ../adir/afile yetanotherfile
+@@ -11172,7 +11154,7 @@ ln -s ../adir/afile yetanotherfile

  @end example
  
  
  @end example
  
  


@@ -1218,7 +1227,7 @@
  @section @command{mkdir}: Make directories
  
  @pindex mkdir
  @section @command{mkdir}: Make directories
  
  @pindex mkdir

-@@ -11210,7 +11192,7 @@ Print a message for each created directo
+@@ -11250,7 +11232,7 @@ Print a message for each created directo

  @exitstatus
  
  
  @exitstatus
  
  


@@ -1227,7 +1236,7 @@
  @section @command{mkfifo}: Make FIFOs (named pipes)
  
  @pindex mkfifo
  @section @command{mkfifo}: Make FIFOs (named pipes)
  
  @pindex mkfifo

-@@ -11251,7 +11233,7 @@ permission bits.  @xref{File permissions
+@@ -11291,7 +11273,7 @@ permission bits.  @xref{File permissions

  @exitstatus
  
  
  @exitstatus
  
  


@@ -1236,7 +1245,7 @@
  @section @command{mknod}: Make block or character special files
  
  @pindex mknod
  @section @command{mknod}: Make block or character special files
  
  @pindex mknod

-@@ -11328,7 +11310,7 @@ Set the mode of created files to @var{mo
+@@ -11368,7 +11350,7 @@ Set the mode of created files to @var{mo

  @exitstatus
  
  
  @exitstatus
  
  


@@ -1245,7 +1254,7 @@
  @section @command{readlink}: Print value of a symlink or canonical file name
  
  @pindex readlink
  @section @command{readlink}: Print value of a symlink or canonical file name
  
  @pindex readlink

-@@ -11352,7 +11334,7 @@ of a symbolic link, it produces no outpu
+@@ -11392,7 +11374,7 @@ of a symbolic link, it produces no outpu

  @command{readlink} outputs the absolute name of the given files which contain
  no @file{.}, @file{..} components nor any repeated separators
  (@file{/}) or symbolic links.  The @command{realpath} command is the
  @command{readlink} outputs the absolute name of the given files which contain
  no @file{.}, @file{..} components nor any repeated separators
  (@file{/}) or symbolic links.  The @command{realpath} command is the


@@ -1254,7 +1263,7 @@
  
  @end table
  
  
  @end table
  

-@@ -11427,7 +11409,7 @@ The @command{realpath} command without o
+@@ -11467,7 +11449,7 @@ The @command{realpath} command without o

  @exitstatus
  
  
  @exitstatus
  
  


@@ -1263,7 +1272,7 @@
  @section @command{rmdir}: Remove empty directories
  
  @pindex rmdir
  @section @command{rmdir}: Remove empty directories
  
  @pindex rmdir

-@@ -11474,7 +11456,7 @@ Give a diagnostic for each successful re
+@@ -11514,7 +11496,7 @@ Give a diagnostic for each successful re

  
  @end table
  
  
  @end table
  


@@ -1272,7 +1281,7 @@
  
  To remove all empty directories under @var{dirname}, including
  directories that become empty because other directories are removed,
  
  To remove all empty directories under @var{dirname}, including
  directories that become empty because other directories are removed,

-@@ -11491,7 +11473,7 @@ find @var{dirname} -depth -type d -exec
+@@ -11531,7 +11513,7 @@ find @var{dirname} -depth -type d -exec

  @exitstatus
  
  
  @exitstatus
  
  


@@ -1281,7 +1290,7 @@
  @section @command{unlink}: Remove files via the unlink syscall
  
  @pindex unlink
  @section @command{unlink}: Remove files via the unlink syscall
  
  @pindex unlink

-@@ -11502,7 +11484,7 @@ It is a minimalist interface to the syst
+@@ -11542,7 +11524,7 @@ It is a minimalist interface to the syst

  @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
  @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


@@ -1290,7 +1299,7 @@
  
  @example
  unlink @var{filename}
  
  @example
  unlink @var{filename}

-@@ -11536,14 +11518,14 @@ timestamps, and other information.  Coll
+@@ -11576,14 +11558,14 @@ timestamps, and other information.  Coll

  These commands change file attributes.
  
  @menu
  These commands change file attributes.
  
  @menu


@@ -1310,7 +1319,7 @@
  @section @command{chown}: Change file owner and group
  
  @pindex chown
  @section @command{chown}: Change file owner and group
  
  @pindex chown

-@@ -11775,7 +11757,7 @@ chown -hR root /u
+@@ -11815,7 +11797,7 @@ chown -hR root /u

  @end example
  
  
  @end example
  
  


@@ -1319,7 +1328,7 @@
  @section @command{chgrp}: Change group ownership
  
  @pindex chgrp
  @section @command{chgrp}: Change group ownership
  
  @pindex chgrp

-@@ -11784,7 +11766,7 @@ chown -hR root /u
+@@ -11824,7 +11806,7 @@ chown -hR root /u

  
  @command{chgrp} changes the group ownership of each given @var{file}
  to @var{group} (which can be either a group name or a numeric group ID)
  
  @command{chgrp} changes the group ownership of each given @var{file}
  to @var{group} (which can be either a group name or a numeric group ID)


@@ -1328,7 +1337,7 @@
  Synopsis:
  
  @example
  Synopsis:
  
  @example

-@@ -11886,7 +11868,7 @@ chgrp -hR staff /u
+@@ -11926,7 +11908,7 @@ chgrp -hR staff /u

  @end example
  
  
  @end example
  
  


@@ -1337,7 +1346,7 @@
  @section @command{chmod}: Change access permissions
  
  @pindex chmod
  @section @command{chmod}: Change access permissions
  
  @pindex chmod

-@@ -12037,7 +12019,7 @@ chmod -R a=,+rwX dir
+@@ -12077,7 +12059,7 @@ chmod -R a=,+rwX dir

  @end smallexample
  
  
  @end smallexample
  
  


@@ -1346,7 +1355,7 @@
  @section @command{touch}: Change file timestamps
  
  @pindex touch
  @section @command{touch}: Change file timestamps
  
  @pindex touch

-@@ -12212,15 +12194,15 @@ how much storage is in use or available,
+@@ -12252,15 +12234,15 @@ how much storage is in use or available,

  file status information, and write buffers to file systems.
  
  @menu
  file status information, and write buffers to file systems.
  
  @menu


@@ -1368,7 +1377,7 @@
  @section @command{df}: Report file system space usage
  
  @pindex df
  @section @command{df}: Report file system space usage
  
  @pindex df

-@@ -12528,7 +12510,7 @@ be read and one or more of the options @
+@@ -12568,7 +12550,7 @@ be read and one or more of the options @

  or @option{-x} is used together with a file name argument.
  
  
  or @option{-x} is used together with a file name argument.
  
  


@@ -1377,7 +1386,7 @@
  @section @command{du}: Estimate file space usage
  
  @pindex du
  @section @command{du}: Estimate file space usage
  
  @pindex du

-@@ -12787,7 +12769,7 @@ be one of the following:
+@@ -12827,7 +12809,7 @@ be one of the following:

  @item +@var{format}
  @vindex LC_TIME
  List timestamps using @var{format}, where @var{format} is interpreted
  @item +@var{format}
  @vindex LC_TIME
  List timestamps using @var{format}, where @var{format} is interpreted


@@ -1386,7 +1395,7 @@
  For example, @option{--time-style="+%Y-%m-%d %H:%M:%S"} causes
  @command{du} to list timestamps like @samp{2020-07-21 23:45:56}.  As
  with @command{date}, @var{format}'s interpretation is affected by the
  For example, @option{--time-style="+%Y-%m-%d %H:%M:%S"} causes
  @command{du} to list timestamps like @samp{2020-07-21 23:45:56}.  As
  with @command{date}, @var{format}'s interpretation is affected by the

-@@ -12883,7 +12865,7 @@ underlying devices.
+@@ -12923,7 +12905,7 @@ underlying devices.

  @exitstatus
  
  
  @exitstatus
  
  


@@ -1395,7 +1404,7 @@
  @section @command{stat}: Report file or file system status
  
  @pindex stat
  @section @command{stat}: Report file or file system status
  
  @pindex stat

-@@ -13125,7 +13107,7 @@ with @env{TZ}, libc, The GNU C Library R
+@@ -13165,7 +13147,7 @@ with @env{TZ}, libc, The GNU C Library R

  @exitstatus
  
  
  @exitstatus
  
  


@@ -1404,7 +1413,7 @@
  @section @command{sync}: Synchronize cached writes to persistent storage
  
  @pindex sync
  @section @command{sync}: Synchronize cached writes to persistent storage
  
  @pindex sync

-@@ -13185,7 +13167,7 @@ write barriers, than a global sync(2) us
+@@ -13225,7 +13207,7 @@ write barriers, than a global sync(2) us

  @exitstatus
  
  
  @exitstatus
  
  


@@ -1413,7 +1422,7 @@
  @section @command{truncate}: Shrink or extend the size of a file
  
  @pindex truncate
  @section @command{truncate}: Shrink or extend the size of a file
  
  @pindex truncate

-@@ -13262,13 +13244,13 @@ the size of each @var{file} based on its
+@@ -13302,13 +13284,13 @@ the size of each @var{file} based on its

  This section describes commands that display text strings.
  
  @menu
  This section describes commands that display text strings.
  
  @menu


@@ -1431,7 +1440,7 @@
  @section @command{echo}: Print a line of text
  
  @pindex echo
  @section @command{echo}: Print a line of text
  
  @pindex echo

-@@ -13291,7 +13273,7 @@ strings cannot be passed to @command{ech
+@@ -13331,7 +13313,7 @@ strings cannot be passed to @command{ech

  It is therefore not advisable to use @command{echo} for printing unknown or
  variable arguments.  The @command{printf} command is recommended as a more
  portable and flexible replacement for tasks historically performed by
  It is therefore not advisable to use @command{echo} for printing unknown or
  variable arguments.  The @command{printf} command is recommended as a more
  portable and flexible replacement for tasks historically performed by


@@ -1440,7 +1449,7 @@
  
  The program accepts the following options.  Also see @ref{Common options}.
  Options must precede operands, and the normally-special argument
  
  The program accepts the following options.  Also see @ref{Common options}.
  Options must precede operands, and the normally-special argument

-@@ -13366,12 +13348,12 @@ POSIX does not require support for any o
+@@ -13406,12 +13388,12 @@ POSIX does not require support for any o

  that the behavior of @command{echo} is implementation-defined if any
  @var{string} contains a backslash or if the first argument is @option{-n}.
  Portable programs should use the @command{printf} command instead.
  that the behavior of @command{echo} is implementation-defined if any
  @var{string} contains a backslash or if the first argument is @option{-n}.
  Portable programs should use the @command{printf} command instead.


@@ -1455,7 +1464,7 @@
  @section @command{printf}: Format and print data
  
  @pindex printf
  @section @command{printf}: Format and print data
  
  @pindex printf

-@@ -13533,7 +13515,7 @@ Options must precede operands.
+@@ -13584,7 +13566,7 @@ Options must precede operands.

  @exitstatus
  
  
  @exitstatus
  
  


@@ -1464,7 +1473,7 @@
  @section @command{yes}: Print a string until interrupted
  
  @pindex yes
  @section @command{yes}: Print a string until interrupted
  
  @pindex yes

-@@ -13564,14 +13546,14 @@ condition of shell @code{if} statements,
+@@ -13615,14 +13597,14 @@ condition of shell @code{if} statements,

  pipeline.
  
  @menu
  pipeline.
  
  @menu


@@ -1484,7 +1493,7 @@
  @section @command{false}: Do nothing, unsuccessfully
  
  @pindex false
  @section @command{false}: Do nothing, unsuccessfully
  
  @pindex false

-@@ -13601,7 +13583,7 @@ Portable programs should not assume that
+@@ -13652,7 +13634,7 @@ Portable programs should not assume that

  non-GNU hosts.
  
  
  non-GNU hosts.
  
  


@@ -1493,7 +1502,7 @@
  @section @command{true}: Do nothing, successfully
  
  @pindex true
  @section @command{true}: Do nothing, successfully
  
  @pindex true

-@@ -13637,7 +13619,7 @@ This version of @command{true} is implem
+@@ -13688,7 +13670,7 @@ This version of @command{true} is implem

  more secure and faster than a shell script implementation, and may safely
  be used as a dummy shell for the purpose of disabling accounts.
  
  more secure and faster than a shell script implementation, and may safely
  be used as a dummy shell for the purpose of disabling accounts.
  


@@ -1502,7 +1511,7 @@
  @section @command{test}: Check file types and compare values
  
  @pindex test
  @section @command{test}: Check file types and compare values
  
  @pindex test

-@@ -14006,7 +13988,7 @@ True if either @var{expr1} or @var{expr2
+@@ -14067,7 +14049,7 @@ True if either @var{expr1} or @var{expr2

  @end table
  
  
  @end table
  
  


@@ -1511,7 +1520,7 @@
  @section @command{expr}: Evaluate expressions
  
  @pindex expr
  @section @command{expr}: Evaluate expressions
  
  @pindex expr

-@@ -14283,11 +14265,11 @@ useful redirection is performed by a sep
+@@ -14344,11 +14326,11 @@ useful redirection is performed by a sep

  it's described here.
  
  @menu
  it's described here.
  
  @menu


@@ -1525,7 +1534,7 @@
  @section @command{tee}: Redirect output to multiple files or processes
  
  @pindex tee
  @section @command{tee}: Redirect output to multiple files or processes
  
  @pindex tee

-@@ -14503,15 +14485,15 @@ tar chof - "$tardir" \
+@@ -14564,15 +14546,15 @@ tar chof - "$tardir" \

  This section describes commands that manipulate file names.
  
  @menu
  This section describes commands that manipulate file names.
  
  @menu


@@ -1547,7 +1556,7 @@
  @section @command{basename}: Strip directory and suffix from a file name
  
  @pindex basename
  @section @command{basename}: Strip directory and suffix from a file name
  
  @pindex basename

-@@ -14593,7 +14575,7 @@ basename -a -s .h include/stdio.h includ
+@@ -14654,7 +14636,7 @@ basename -a -s .h include/stdio.h includ

  @end example
  
  
  @end example
  
  


@@ -1556,7 +1565,7 @@
  @section @command{dirname}: Strip last file name component
  
  @pindex dirname
  @section @command{dirname}: Strip last file name component
  
  @pindex dirname

-@@ -14646,7 +14628,7 @@ dirname stdio.h
+@@ -14707,7 +14689,7 @@ dirname stdio.h

  @end example
  
  
  @end example
  
  


@@ -1565,7 +1574,7 @@
  @section @command{pathchk}: Check file name validity and portability
  
  @pindex pathchk
  @section @command{pathchk}: Check file name validity and portability
  
  @pindex pathchk

-@@ -14722,7 +14704,7 @@ Exit status:
+@@ -14783,7 +14765,7 @@ Exit status:

  1 otherwise.
  @end display
  
  1 otherwise.
  @end display
  


@@ -1574,7 +1583,7 @@
  @section @command{mktemp}: Create temporary file or directory
  
  @pindex mktemp
  @section @command{mktemp}: Create temporary file or directory
  
  @pindex mktemp

-@@ -14897,7 +14879,7 @@ Exit status:
+@@ -14958,7 +14940,7 @@ Exit status:

  @end display
  
  
  @end display
  
  


@@ -1583,7 +1592,7 @@
  @section @command{realpath}: Print the resolved file name.
  
  @pindex realpath
  @section @command{realpath}: Print the resolved file name.
  
  @pindex realpath

-@@ -15089,14 +15071,14 @@ which you are working: the current direc
+@@ -15150,14 +15132,14 @@ which you are working: the current direc

  so forth.  See also the user-related commands in the next section.
  
  @menu
  so forth.  See also the user-related commands in the next section.
  
  @menu


@@ -1603,7 +1612,7 @@
  @section @command{pwd}: Print working directory
  
  @pindex pwd
  @section @command{pwd}: Print working directory
  
  @pindex pwd

-@@ -15143,7 +15125,7 @@ environment variable is set.
+@@ -15204,7 +15186,7 @@ environment variable is set.

  @exitstatus
  
  
  @exitstatus
  
  


@@ -1612,7 +1621,7 @@
  @section @command{stty}: Print or change terminal characteristics
  
  @pindex stty
  @section @command{stty}: Print or change terminal characteristics
  
  @pindex stty

-@@ -15887,7 +15869,7 @@ or
+@@ -15948,7 +15930,7 @@ or

  @end table
  
  
  @end table
  
  


@@ -1621,7 +1630,7 @@
  @section @command{printenv}: Print all or some environment variables
  
  @pindex printenv
  @section @command{printenv}: Print all or some environment variables
  
  @pindex printenv

-@@ -15922,7 +15904,7 @@ Exit status:
+@@ -15983,7 +15965,7 @@ Exit status:

  @end display
  
  
  @end display
  
  


@@ -1630,7 +1639,7 @@
  @section @command{tty}: Print file name of terminal on standard input
  
  @pindex tty
  @section @command{tty}: Print file name of terminal on standard input
  
  @pindex tty

-@@ -15972,17 +15954,17 @@ This section describes commands that pri
+@@ -16033,17 +16015,17 @@ This section describes commands that pri

  logins, groups, and so forth.
  
  @menu
  logins, groups, and so forth.
  
  @menu


@@ -1656,7 +1665,7 @@
  @section @command{id}: Print user identity
  
  @pindex id
  @section @command{id}: Print user identity
  
  @pindex id

-@@ -16089,7 +16071,7 @@ database to be consulted afresh, and so
+@@ -16150,7 +16132,7 @@ database to be consulted afresh, and so

  
  @exitstatus
  
  
  @exitstatus
  


@@ -1665,7 +1674,7 @@
  @section @command{logname}: Print current login name
  
  @pindex logname
  @section @command{logname}: Print current login name
  
  @pindex logname

-@@ -16110,7 +16092,7 @@ options}.
+@@ -16171,7 +16153,7 @@ options}.

  @exitstatus
  
  
  @exitstatus
  
  


@@ -1674,7 +1683,7 @@
  @section @command{whoami}: Print effective user name
  
  @pindex whoami
  @section @command{whoami}: Print effective user name
  
  @pindex whoami

-@@ -16126,7 +16108,7 @@ options}.
+@@ -16187,7 +16169,7 @@ options}.

  @exitstatus
  
  
  @exitstatus
  
  


@@ -1683,7 +1692,7 @@
  @section @command{groups}: Print group names a user is in
  
  @pindex groups
  @section @command{groups}: Print group names a user is in
  
  @pindex groups

-@@ -16153,7 +16135,7 @@ options}.
+@@ -16214,7 +16196,7 @@ options}.

  
  @exitstatus
  
  
  @exitstatus
  


@@ -1692,7 +1701,7 @@
  @section @command{users}: Print login names of users currently logged in
  
  @pindex users
  @section @command{users}: Print login names of users currently logged in
  
  @pindex users

-@@ -16188,7 +16170,7 @@ should not rely on its existence on non-
+@@ -16249,7 +16231,7 @@ should not rely on its existence on non-

  @exitstatus
  
  
  @exitstatus
  
  


@@ -1701,7 +1710,7 @@
  @section @command{who}: Print who is currently logged in
  
  @pindex who
  @section @command{who}: Print who is currently logged in
  
  @pindex who

-@@ -16342,7 +16324,7 @@ should not rely on its existence on non-
+@@ -16403,7 +16385,7 @@ should not rely on its existence on non-

  @exitstatus
  
  
  @exitstatus
  
  


@@ -1710,7 +1719,7 @@
  @section @command{pinky}: Print information about users
  
  @command{pinky} is a lightweight implementation of the @command{finger} command.
  @section @command{pinky}: Print information about users
  
  @command{pinky} is a lightweight implementation of the @command{finger} command.

-@@ -16417,16 +16399,14 @@ This section describes commands that pri
+@@ -16478,16 +16460,14 @@ This section describes commands that pri

  information.
  
  @menu
  information.
  
  @menu


@@ -1733,7 +1742,7 @@
  @section @command{date}: Print or set system date and time
  
  @pindex date
  @section @command{date}: Print or set system date and time
  
  @pindex date

-@@ -17200,7 +17180,7 @@ date --date='2017-01-01 00:00:00 +0000'
+@@ -17266,7 +17246,7 @@ date --date='2017-01-01 00:00:00 +0000'

  @end itemize
  
  
  @end itemize
  
  


@@ -1742,7 +1751,7 @@
  @section @command{arch}: Print machine hardware name
  
  @pindex arch
  @section @command{arch}: Print machine hardware name
  
  @pindex arch

-@@ -17223,7 +17203,7 @@ not rely on its existence.
+@@ -17289,7 +17269,7 @@ not rely on its existence.

  @exitstatus
  
  
  @exitstatus
  
  


@@ -1751,7 +1760,7 @@
  @section @command{nproc}: Print the number of available processors
  
  @pindex nproc
  @section @command{nproc}: Print the number of available processors
  
  @pindex nproc

-@@ -17262,7 +17242,7 @@ If possible, exclude this @var{number} o
+@@ -17328,7 +17308,7 @@ If possible, exclude this @var{number} o

  @exitstatus
  
  
  @exitstatus
  
  


@@ -1760,7 +1769,7 @@
  @section @command{uname}: Print system information
  
  @pindex uname
  @section @command{uname}: Print system information
  
  @pindex uname

-@@ -17392,35 +17372,7 @@ Print the kernel version.
+@@ -17458,35 +17438,7 @@ Print the kernel version.

  @exitstatus
  
  
  @exitstatus
  
  


@@ -1797,7 +1806,7 @@
  @section @command{hostid}: Print numeric host identifier
  
  @pindex hostid
  @section @command{hostid}: Print numeric host identifier
  
  @pindex hostid

-@@ -17448,44 +17400,6 @@ existence.
+@@ -17514,44 +17466,6 @@ existence.

  
  @exitstatus
  
  
  @exitstatus
  


@@ -1842,7 +1851,7 @@
  @node SELinux context
  @chapter SELinux context
  
  @node SELinux context
  @chapter SELinux context
  

-@@ -17497,11 +17411,11 @@ This section describes commands for oper
+@@ -17563,11 +17477,11 @@ This section describes commands for oper

  contexts.
  
  @menu
  contexts.
  
  @menu


@@ -1857,7 +1866,7 @@
  @section @command{chcon}: Change SELinux context of file
  
  @pindex chcon
  @section @command{chcon}: Change SELinux context of file
  
  @pindex chcon

-@@ -17604,7 +17518,7 @@ Set range @var{range} in the target secu
+@@ -17670,7 +17584,7 @@ Set range @var{range} in the target secu

  
  @exitstatus
  
  
  @exitstatus
  


@@ -1866,7 +1875,7 @@
  @section @command{runcon}: Run a command in specified SELinux context
  
  @pindex runcon
  @section @command{runcon}: Run a command in specified SELinux context
  
  @pindex runcon

-@@ -17697,16 +17611,16 @@ different than the current one: a modifi
+@@ -17763,16 +17677,16 @@ different than the current one: a modifi

  user, etc.
  
  @menu
  user, etc.
  
  @menu


@@ -1890,7 +1899,7 @@
  @section @command{chroot}: Run a command with a different root directory
  
  @pindex chroot
  @section @command{chroot}: Run a command with a different root directory
  
  @pindex chroot

-@@ -17822,7 +17736,7 @@ the exit status of @var{command} otherwi
+@@ -17888,7 +17802,7 @@ the exit status of @var{command} otherwi

  @end display
  
  
  @end display
  
  


@@ -1899,7 +1908,7 @@
  @section @command{env}: Run a command in a modified environment
  
  @pindex env
  @section @command{env}: Run a command in a modified environment
  
  @pindex env

-@@ -18451,7 +18365,7 @@ OLDUSER=gordon
+@@ -18517,7 +18431,7 @@ OLDUSER=gordon

  
  
  
  
  
  


@@ -1908,7 +1917,7 @@
  @section @command{nice}: Run a command with modified niceness
  
  @pindex nice
  @section @command{nice}: Run a command with modified niceness
  
  @pindex nice

-@@ -18582,7 +18496,7 @@ $ sudo nice -n -1 nice
+@@ -18648,7 +18562,7 @@ $ sudo nice -n -1 nice

  @end example
  
  
  @end example
  
  


@@ -1917,7 +1926,7 @@
  @section @command{nohup}: Run a command immune to hangups
  
  @pindex nohup
  @section @command{nohup}: Run a command immune to hangups
  
  @pindex nohup

-@@ -18656,7 +18570,7 @@ If @env{POSIXLY_CORRECT} is set, interna
+@@ -18722,7 +18636,7 @@ If @env{POSIXLY_CORRECT} is set, interna

  instead of 125.
  
  
  instead of 125.
  
  


@@ -1926,7 +1935,7 @@
  @section @command{stdbuf}: Run a command with modified I/O stream buffering
  
  @pindex stdbuf
  @section @command{stdbuf}: Run a command with modified I/O stream buffering
  
  @pindex stdbuf

-@@ -18752,7 +18666,7 @@ the exit status of @var{command} otherwi
+@@ -18818,7 +18732,7 @@ the exit status of @var{command} otherwi

  @end display
  
  
  @end display
  
  


@@ -1935,7 +1944,7 @@
  @section @command{timeout}: Run a command with a time limit
  
  @pindex timeout
  @section @command{timeout}: Run a command with a time limit
  
  @pindex timeout

-@@ -18888,90 +18802,6 @@ timeout -s INT 5s env --ignore-signal=IN
+@@ -18958,90 +18872,6 @@ timeout -s INT 5s env --ignore-signal=IN

  timeout -s INT -k 3s 5s env --ignore-signal=INT sleep 20
  @end example
  
  timeout -s INT -k 3s 5s env --ignore-signal=INT sleep 20
  @end example
  


@@ -2026,7 +2035,7 @@
  @node Delaying
  @chapter Delaying
  
  @node Delaying
  @chapter Delaying
  

-@@ -18981,11 +18811,11 @@ signal names and numbers.
+@@ -19051,11 +18881,11 @@ signal names and numbers.

  @c Perhaps @command{wait} or other commands should be described here also?
  
  @menu
  @c Perhaps @command{wait} or other commands should be described here also?
  
  @menu


@@ -2040,7 +2049,7 @@
  @section @command{sleep}: Delay for a specified time
  
  @pindex sleep
  @section @command{sleep}: Delay for a specified time
  
  @pindex sleep

-@@ -19048,13 +18878,13 @@ options}.
+@@ -19118,13 +18948,13 @@ options}.

  These programs do numerically-related operations.
  
  @menu
  These programs do numerically-related operations.
  
  @menu


@@ -2058,7 +2067,7 @@
  @section @command{factor}: Print prime factors
  
  @pindex factor
  @section @command{factor}: Print prime factors
  
  @pindex factor

-@@ -19119,7 +18949,7 @@ are the product of two large primes), ot
+@@ -19189,7 +19019,7 @@ are the product of two large primes), ot

  @exitstatus
  
  
  @exitstatus
  
  


@@ -2067,7 +2076,7 @@
  @section @command{numfmt}: Reformat numbers
  
  @pindex numfmt
  @section @command{numfmt}: Reformat numbers
  
  @pindex numfmt

-@@ -19475,7 +19305,7 @@ $ LC_ALL=ta_IN numfmt --from=iec --forma
+@@ -19545,7 +19375,7 @@ $ LC_ALL=ta_IN numfmt --from=iec --forma

  @end example
  
  
  @end example
  
  


@@ -2076,7 +2085,7 @@
  @section @command{seq}: Print numeric sequences
  
  @pindex seq
  @section @command{seq}: Print numeric sequences
  
  @pindex seq

-@@ -19650,7 +19480,7 @@ Naively, a file's atime, mtime, and ctim
+@@ -19720,7 +19550,7 @@ Naively, a file's atime, mtime, and ctim

  whenever you read, write, or change the attributes of the file
  respectively, and searching a directory counts as reading it.  A
  file's atime and mtime can also be set directly, via the
  whenever you read, write, or change the attributes of the file
  respectively, and searching a directory counts as reading it.  A
  file's atime and mtime can also be set directly, via the

diff --git a/coreutils-pl.po-update.patch b/coreutils-pl.po-update.patch
deleted file mode 100644 (file)
index 8c00507..0000000
--- a/coreutils-pl.po-update.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -ur -x .svn -x .git -x .bzr -x CVS -urN coreutils-8.31.org/po/pl.po coreutils-8.31/po/pl.po
---- coreutils-8.31.org/po/pl.po        2019-03-11 00:38:30.000000000 +0100
-+++ coreutils-8.31/po/pl.po    2019-05-30 10:08:02.921208715 +0200
-@@ -4441,32 +4441,32 @@
- msgid "failed to set signal process mask"
- msgstr "nie udało się ustawić maski sygnałów dla procesu"
- 
--#: src/env.c:857
-+#: src/env.c:844
- #, c-format
- msgid "invalid option -- '%c'"
- msgstr "błędna opcja -- „%c”"
- 
--#: src/env.c:858 src/env.c:949
-+#: src/env.c:845 src/env.c:936
- #, c-format
- msgid "use -[v]S to pass options in shebang lines"
- msgstr "użyj -[v]S do przekazania opcji do linii z #!"
- 
--#: src/env.c:891
-+#: src/env.c:878
- #, c-format
- msgid "cannot set %s"
- msgstr "nie można ustawić %s"
- 
--#: src/env.c:901
-+#: src/env.c:888
- #, c-format
- msgid "cannot specify --null (-0) with command"
- msgstr "nie można podać --null (-0) razem z poleceniem"
- 
--#: src/env.c:907
-+#: src/env.c:894
- #, c-format
- msgid "must specify command with --chdir (-C)"
- msgstr "razem z --chdir (-C) musi być podane polecenie"
- 
--#: src/env.c:932
-+#: src/env.c:919
- #, c-format
- msgid "cannot change directory to %s"
- msgstr "nie można zmienić katalogu na %s"

diff --git a/coreutils.spec b/coreutils.spec
index 5a9bc11e8de88cc66ddb7b4a99e5798072814080..3cd28e2dd124ada82de6664a39922541e52aaefb 100644 (file)
--- a/coreutils.spec
+++ b/coreutils.spec
@@ -8,12 +8,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
 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:       9.5
+Version:       9.6

 Release:       1
 License:       GPL v3+
 Group:         Applications/System
 Source0:       http://ftp.gnu.org/gnu/coreutils/%{name}-%{version}.tar.xz
 Release:       1
 License:       GPL v3+
 Group:         Applications/System
 Source0:       http://ftp.gnu.org/gnu/coreutils/%{name}-%{version}.tar.xz

-# Source0-md5: e99adfa059a63db3503cc71f3d151e31
+# Source0-md5: 0ed6cc983fe02973bc98803155cc1733

 Source1:       %{name}-non-english-man-pages.tar.bz2
 # Source1-md5: f7c986ebc74ccb8d08ed70141063f14c
 Source2:       DIR_COLORS
 Source1:       %{name}-non-english-man-pages.tar.bz2
 # Source1-md5: f7c986ebc74ccb8d08ed70141063f14c
 Source2:       DIR_COLORS


@@ -107,20 +107,20 @@ Programy zawarte w tym pakiecie to:
 
 %prep
 %setup -q -a1
 
 %prep
 %setup -q -a1

-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%patch -P0 -p1
+%patch -P1 -p1
+%patch -P2 -p1
+%patch -P3 -p1

 
 

-%patch6 -p1
+%patch -P6 -p1

 %ifarch sparc64
 %ifarch sparc64

-%patch7 -p1
+%patch -P7 -p1

 %endif
 %if %{with advcopy}
 # progress-bar patch, -g,--progress-bar //if in doubt, comment it out
 %endif
 %if %{with advcopy}
 # progress-bar patch, -g,--progress-bar //if in doubt, comment it out

-%patch9 -p1
+%patch -P9 -p1

 %endif
 %endif

-%patch10 -p1
+%patch -P10 -p1

 
 %{__mv} man/pt_BR man/pt
 
 
 %{__mv} man/pt_BR man/pt
 

diff --git a/tests.patch b/tests.patch
index fff60284e1efa200b8aa0e513e951a461583e17a..bd824277aa5fc97c0fa7cae3abcf7396a35b4a5a 100644 (file)
--- a/tests.patch
+++ b/tests.patch
@@ -7,10 +7,10 @@ diff -ruN coreutils-8.27.orig/gnulib-tests/gnulib.mk coreutils-8.27/gnulib-tests
  
 -TESTS += test-chown
 -check_PROGRAMS += test-chown
  
 -TESTS += test-chown
 -check_PROGRAMS += test-chown

--test_chown_LDADD = $(LDADD) $(NANOSLEEP_LIB)
+-test_chown_LDADD = $(LDADD) $(NANOSLEEP_LIB) @LIBINTL@

 +#TESTS += test-chown
 +#check_PROGRAMS += test-chown
 +#TESTS += test-chown
 +#check_PROGRAMS += test-chown

-+#test_chown_LDADD = $(LDADD) $(NANOSLEEP_LIB)
++#test_chown_LDADD = $(LDADD) $(NANOSLEEP_LIB) @LIBINTL@

  EXTRA_DIST += nap.h test-chown.h test-chown.c signature.h macros.h
  
  ## end   gnulib module chown-tests
  EXTRA_DIST += nap.h test-chown.h test-chown.c signature.h macros.h
  
  ## end   gnulib module chown-tests


@@ -61,10 +61,10 @@ diff -ruN coreutils-8.27.orig/gnulib-tests/gnulib.mk coreutils-8.27/gnulib-tests
  
 -TESTS += test-lchown
 -check_PROGRAMS += test-lchown
  
 -TESTS += test-lchown
 -check_PROGRAMS += test-lchown

--test_lchown_LDADD = $(LDADD) $(NANOSLEEP_LIB)
+-test_lchown_LDADD = $(LDADD) $(NANOSLEEP_LIB) @LIBINTL@

 +#TESTS += test-lchown
 +#check_PROGRAMS += test-lchown
 +#TESTS += test-lchown
 +#check_PROGRAMS += test-lchown

-+#test_lchown_LDADD = $(LDADD) $(NANOSLEEP_LIB)
++#test_lchown_LDADD = $(LDADD) $(NANOSLEEP_LIB) @LIBINTL@

  EXTRA_DIST += nap.h test-lchown.h test-lchown.c signature.h macros.h
  
  ## end   gnulib module lchown-tests
  EXTRA_DIST += nap.h test-lchown.h test-lchown.c signature.h macros.h
  
  ## end   gnulib module lchown-tests