From: Marcin Krol Date: Fri, 15 Dec 2023 22:30:49 +0000 (+0100) Subject: - merged 9.4 from PLD X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=e804a1edb9dcd75e9f4f8f5abe5d4fe3ce254fed;p=packages%2Fcoreutils.git - merged 9.4 from PLD --- diff --git a/coreutils-fmt-wchars.patch b/coreutils-fmt-wchars.patch index e82dde1..fcc6792 100644 --- a/coreutils-fmt-wchars.patch +++ b/coreutils-fmt-wchars.patch @@ -83,13 +83,13 @@ + /* Extra ctype(3)-style macros. */ --#define isopen(c) (strchr ("(['`\"", c) != NULL) --#define isclose(c) (strchr (")]'\"", c) != NULL) --#define isperiod(c) (strchr (".?!", c) != NULL) +-#define isopen(c) (strchr ("(['`\"", c) != nullptr) +-#define isclose(c) (strchr (")]'\"", c) != nullptr) +-#define isperiod(c) (strchr (".?!", c) != nullptr) +#define isopen(c) \ -+ (wcschr (L"(['`\"\u2018\u201A\u201B\u201C\u201E\u201F", c) != NULL) -+#define isclose(c) (wcschr (L")]'\"\u2018\u2019\u201C\u201D", c) != NULL) -+#define isperiod(c) (wcschr (L".?!", c) != NULL) ++ (wcschr (L"(['`\"\u2018\u201A\u201B\u201C\u201E\u201F", c) != nullptr) ++#define isclose(c) (wcschr (L")]'\"\u2018\u2019\u201C\u201D", c) != nullptr) ++#define isperiod(c) (wcschr (L".?!", c) != nullptr) /* Size of a tab stop, for expansion on input and re-introduction on output. */ @@ -214,12 +214,12 @@ -g, --goal=WIDTH goal width (default of 93% of width)\n\ "), stdout); @@ -311,6 +336,7 @@ - {"split-only", no_argument, NULL, 's'}, - {"tagged-paragraph", no_argument, NULL, 't'}, - {"uniform-spacing", no_argument, NULL, 'u'}, -+ {"single-spaces", no_argument, NULL, 'n'}, - {"width", required_argument, NULL, 'w'}, - {"goal", required_argument, NULL, 'g'}, + {"split-only", no_argument, nullptr, 's'}, + {"tagged-paragraph", no_argument, nullptr, 't'}, + {"uniform-spacing", no_argument, nullptr, 'u'}, ++ {"single-spaces", no_argument, nullptr, 'n'}, + {"width", required_argument, nullptr, 'w'}, + {"goal", required_argument, nullptr, 'g'}, {GETOPT_HELP_OPTION_DECL}, @@ -335,9 +361,10 @@ atexit (close_stdout); @@ -240,7 +240,7 @@ - while ((optchar = getopt_long (argc, argv, "0123456789cstuw:p:g:", + while ((optchar = getopt_long (argc, argv, "0123456789cstunw:p:g:", - long_options, NULL)) + long_options, nullptr)) != -1) switch (optchar) @@ -378,6 +405,10 @@ @@ -611,7 +611,7 @@ + word_limit->width = saved_width; } - /* Return the constant component of the cost of breaking before the + /* Work around . */ @@ -932,33 +975,33 @@ else if ((this - 1)->punct) cost -= PUNCT_BONUS; diff --git a/coreutils-info.patch b/coreutils-info.patch index 98476ce..c54e7dc 100644 --- a/coreutils-info.patch +++ b/coreutils-info.patch @@ -1,5 +1,5 @@ ---- coreutils-9.2/doc/coreutils.texi.orig 2023-03-13 19:08:10.000000000 +0100 -+++ coreutils-9.2/doc/coreutils.texi 2023-03-24 12:19:31.822135178 +0100 +--- coreutils-9.4/doc/coreutils.texi.orig 2023-08-29 13:39:27.000000000 +0200 ++++ coreutils-9.4/doc/coreutils.texi 2023-08-29 23:57:13.945034048 +0200 @@ -24,123 +24,112 @@ @syncodeindex pg cp @syncodeindex vr cp @@ -283,8 +283,8 @@ -* wc invocation:: Print newline, word, and byte counts -* sum invocation:: Print checksum and block counts -* cksum invocation:: Print CRC checksum and byte counts --* b2sum invocation:: Print or check BLAKE2 digests -* md5sum invocation:: Print or check MD5 digests +-* b2sum invocation:: Print or check BLAKE2 digests -* sha1sum invocation:: Print or check SHA-1 digests +* wc:: Print newline, word, and byte counts +* sum:: Print checksum and block counts @@ -717,7 +717,7 @@ @section @command{tail}: Output the last part of files @pindex tail -@@ -3291,7 +3273,7 @@ mean either @samp{tail ./+4} or @samp{ta +@@ -3293,7 +3275,7 @@ mean either @samp{tail ./+4} or @samp{ta @exitstatus @@ -726,7 +726,7 @@ @section @command{split}: Split a file into pieces. @pindex split -@@ -3548,7 +3530,7 @@ $ seq 100 > k; split -nl/7/33 k +@@ -3550,7 +3532,7 @@ $ seq 100 > k; split -nl/7/33 k @end example @@ -735,22 +735,22 @@ @section @command{csplit}: Split a file into context-determined pieces @pindex csplit -@@ -3768,17 +3750,17 @@ These commands generate just a few numbe +@@ -3770,17 +3752,17 @@ These commands generate just a few numbe contents of files. @menu -* wc invocation:: Print newline, word, and byte counts. -* sum invocation:: Print checksum and block counts. -* cksum invocation:: Print CRC checksum and byte counts. --* b2sum invocation:: Print or check BLAKE2 digests. -* md5sum invocation:: Print or check MD5 digests. +-* b2sum invocation:: Print or check BLAKE2 digests. -* sha1sum invocation:: Print or check SHA-1 digests. -+* wc:: Print newline, word, and byte counts. -+* sum:: Print checksum and block counts. -+* cksum:: Print CRC checksum and byte counts. -+* b2sum:: Print or check BLAKE2 digests. -+* md5sum:: Print or check MD5 digests. -+* sha1sum:: Print or check SHA-1 digests. ++* wc:: Print newline, word, and byte counts. ++* sum:: Print checksum and block counts. ++* cksum:: Print CRC checksum and byte counts. ++* md5sum:: Print or check MD5 digests. ++* b2sum:: Print or check BLAKE2 digests. ++* sha1sum:: Print or check SHA-1 digests. * sha2 utilities:: Print or check SHA-2 digests. @end menu @@ -760,7 +760,7 @@ @section @command{wc}: Print newline, word, and byte counts @pindex wc -@@ -3929,7 +3911,7 @@ find . -name '*.[ch]' -print0 | +@@ -3931,7 +3913,7 @@ find . -name '*.[ch]' -print0 | @exitstatus @@ -769,7 +769,7 @@ @section @command{sum}: Print checksum and block counts @pindex sum -@@ -3978,7 +3960,7 @@ next section) is preferable in new appli +@@ -3980,7 +3962,7 @@ next section) is preferable in new appli @exitstatus @@ -778,40 +778,17 @@ @section @command{cksum}: Print and verify file checksums @pindex cksum -@@ -4010,7 +3992,7 @@ for each file along with the number of b - and the file name unless no arguments were given. - - The same usage and options as the @command{b2sum} --command are supported. @xref{b2sum invocation}. -+command are supported. @xref{b2sum}. - In addition @command{cksum} supports the following options. - - @table @samp -@@ -4080,11 +4062,11 @@ This format has the checksum at the star - more amenable to further processing by other utilities, - especially in combination with the @option{--zero} option. - Note this does not identify the digest algorithm used for the checksum. --@xref{md5sum invocation} for details of this format. -+@xref{md5sum} for details of this format. - @end table - - --@node b2sum invocation -+@node b2sum - @section @command{b2sum}: Print or check BLAKE2 digests - - @pindex b2sum -@@ -4096,7 +4078,7 @@ Note this does not identify the digest a - - @command{b2sum} computes a 512-bit checksum for each specified - @var{file}. The same usage and options as the @command{md5sum} --command are supported. @xref{md5sum invocation}. -+command are supported. @xref{md5sum}. - In addition @command{b2sum} supports the following options. - - @table @samp -@@ -4111,7 +4093,7 @@ This option is ignored when @option{--ch - as the length is automatically determined when checking. +@@ -4027,7 +4009,7 @@ The 32-bit CRC used is based on the poly + for CRC error checking in the ISO/IEC 8802-3:1996 standard (Ethernet). + Similar output formats are used for the other legacy checksums + selectable with @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, +@@ -4273,7 +4255,7 @@ exit nonzero after all warnings have bee + Also file name escaping is not used. @end table -@node md5sum invocation @@ -819,7 +796,7 @@ @section @command{md5sum}: Print or check MD5 digests @pindex md5sum -@@ -4134,7 +4116,7 @@ fingerprint is considered infeasible at +@@ -4296,7 +4278,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 the newer @command{b2sum} command. @@ -828,34 +805,25 @@ @end macro @weakHash{MD5} -@@ -4297,7 +4279,7 @@ Also file name escaping is not used. +@@ -4320,7 +4302,7 @@ The program accepts @ref{cksum common op @exitstatus +-@node b2sum invocation ++@node b2sum + @section @command{b2sum}: Print or check BLAKE2 digests + + @pindex b2sum +@@ -4342,7 +4324,7 @@ In addition @command{b2sum} supports the + @end table + + -@node sha1sum invocation +@node sha1sum @section @command{sha1sum}: Print or check SHA-1 digests @pindex sha1sum -@@ -4309,7 +4291,7 @@ Also file name escaping is not used. - - @command{sha1sum} computes a 160-bit checksum for each specified - @var{file}. The usage and options of this command are precisely the --same as for @command{md5sum}. @xref{md5sum invocation}. -+same as for @command{md5sum}. @xref{md5sum}. - - @weakHash{SHA-1} - -@@ -4345,7 +4327,7 @@ various lengths (respectively 224, 256, - collectively known as the SHA-2 hashes. The usage and options of - these commands are precisely the same as for @command{md5sum} - and @command{sha1sum}. --@xref{md5sum invocation}. -+@xref{md5sum}. - - - @node Operating on sorted files -@@ -4357,16 +4339,16 @@ and @command{sha1sum}. +@@ -4400,16 +4382,16 @@ collectively known as the SHA-2 hashes. These commands work with (or produce) sorted files. @menu @@ -879,7 +847,7 @@ @section @command{sort}: Sort text files @pindex sort -@@ -4662,7 +4644,7 @@ appear earlier in the output instead of +@@ -4705,7 +4687,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 @@ -888,7 +856,7 @@ except that keys with the same value sort together. If multiple random sort fields are specified, the same random hash -@@ -4861,7 +4843,7 @@ Set the number of sorts run in parallel +@@ -4904,7 +4886,7 @@ Set the number of sorts run in parallel @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 @@ -897,7 +865,7 @@ @item -u @itemx --unique -@@ -4879,7 +4861,7 @@ The commands @code{sort -u} and @code{so +@@ -4922,7 +4904,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 | @@ -906,7 +874,7 @@ @optZeroTerminated @macro newlineFieldSeparator -@@ -5095,7 +5077,7 @@ ls */* | sort -t / -k 1,1R -k 2,2 +@@ -5138,7 +5120,7 @@ ls */* | sort -t / -k 1,1R -k 2,2 @end itemize @@ -915,7 +883,7 @@ @section @command{shuf}: Shuffling text @pindex shuf -@@ -5251,7 +5233,7 @@ shuf -r -n 100 -e Head Tail +@@ -5294,7 +5276,7 @@ shuf -r -n 100 -e Head Tail @exitstatus @@ -924,7 +892,7 @@ @section @command{uniq}: Uniquify files @pindex uniq -@@ -5273,7 +5255,7 @@ lines that are not repeated, or all repe +@@ -5316,7 +5298,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}. @@ -933,7 +901,7 @@ @vindex LC_COLLATE Comparisons honor the rules specified by the @env{LC_COLLATE} -@@ -5439,7 +5421,7 @@ compared. +@@ -5482,7 +5464,7 @@ compared. @exitstatus @@ -942,7 +910,7 @@ @section @command{comm}: Compare two sorted files line by line @pindex comm -@@ -5555,7 +5537,7 @@ $ comm -12 file1 file2 | wc -l # numb +@@ -5598,7 +5580,7 @@ $ comm -12 file1 file2 | wc -l # numb @end table @@ -951,7 +919,7 @@ @section @command{ptx}: Produce permuted indexes @pindex ptx -@@ -6045,7 +6027,7 @@ allowed with System V @command{ptx}. +@@ -6088,7 +6070,7 @@ allowed with System V @command{ptx}. @end itemize @@ -960,7 +928,7 @@ @section @command{tsort}: Topological sort @pindex tsort -@@ -6207,13 +6189,13 @@ in different ways. +@@ -6250,13 +6232,13 @@ in different ways. @chapter Operating on fields @menu @@ -978,7 +946,7 @@ @section @command{cut}: Print selected parts of lines @pindex cut -@@ -6338,7 +6320,7 @@ many fields and want to print all but a +@@ -6381,7 +6363,7 @@ many fields and want to print all but a @exitstatus @@ -987,7 +955,7 @@ @section @command{paste}: Merge lines of files @pindex paste -@@ -6436,7 +6418,7 @@ $ paste -d '%_' num2 let3 num2 +@@ -6479,7 +6461,7 @@ $ paste -d '%_' num2 let3 num2 @exitstatus @@ -996,7 +964,7 @@ @section @command{join}: Join lines on a common field @pindex join -@@ -6968,13 +6950,13 @@ entire lines as the key. +@@ -7011,13 +6993,13 @@ entire lines as the key. These commands operate on individual characters. @menu @@ -1014,7 +982,7 @@ @section @command{tr}: Translate, squeeze, and/or delete characters @pindex tr -@@ -7397,7 +7379,7 @@ tr -d -- -axM +@@ -7440,7 +7422,7 @@ tr -d -- -axM @end itemize @@ -1023,7 +991,7 @@ @section @command{expand}: Convert tabs to spaces @pindex expand -@@ -7466,7 +7448,7 @@ characters) on each line to spaces. +@@ -7509,7 +7491,7 @@ characters) on each line to spaces. @exitstatus @@ -1032,7 +1000,7 @@ @section @command{unexpand}: Convert spaces to tabs @pindex unexpand -@@ -7529,14 +7511,14 @@ This chapter describes the @command{ls} +@@ -7572,14 +7554,14 @@ This chapter describes the @command{ls} and @command{vdir}, which list information about files. @menu @@ -1052,7 +1020,7 @@ @section @command{ls}: List directory contents @pindex ls -@@ -8452,7 +8434,7 @@ be one of the following: +@@ -8495,7 +8477,7 @@ be one of the following: @item +@var{format} @vindex LC_TIME List timestamps using @var{format}, where @var{format} is interpreted @@ -1061,7 +1029,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 -@@ -8653,7 +8635,7 @@ This is the default unless the output is +@@ -8696,7 +8678,7 @@ This is the default unless the output is @end table @@ -1070,7 +1038,7 @@ @section @command{dir}: Briefly list directory contents @pindex dir -@@ -8663,10 +8645,10 @@ This is the default unless the output is +@@ -8706,10 +8688,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. @@ -1083,7 +1051,7 @@ @section @command{vdir}: Verbosely list directory contents @pindex vdir -@@ -8676,9 +8658,9 @@ and special characters are represented b +@@ -8719,9 +8701,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. @@ -1095,7 +1063,7 @@ @section @command{dircolors}: Color setup for @command{ls} @pindex dircolors -@@ -8771,16 +8753,16 @@ This chapter describes the commands for +@@ -8814,16 +8796,16 @@ This chapter describes the commands for copying, moving (renaming), and deleting (removing). @menu @@ -1119,7 +1087,7 @@ @section @command{cp}: Copy files and directories @pindex cp -@@ -9293,7 +9275,7 @@ option, and overrides the @option{--pres +@@ -9356,7 +9338,7 @@ option, and overrides the @option{--pres @exitstatus @@ -1128,7 +1096,7 @@ @section @command{dd}: Convert and copy a file @pindex dd -@@ -9603,7 +9585,7 @@ If neither this nor @samp{fsync} are spe +@@ -9666,7 +9648,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. @@ -1137,7 +1105,7 @@ This conversion is a GNU extension to POSIX. @item fsync -@@ -9882,7 +9864,7 @@ environment variable is set. +@@ -9945,7 +9927,7 @@ environment variable is set. @exitstatus @@ -1146,7 +1114,7 @@ @section @command{install}: Copy files and set attributes @pindex install -@@ -10066,7 +10048,7 @@ This option is mutually exclusive with t +@@ -10129,7 +10111,7 @@ This option is mutually exclusive with t @exitstatus @@ -1155,7 +1123,7 @@ @section @command{mv}: Move (rename) files @pindex mv -@@ -10217,7 +10199,7 @@ to the system default type for destinati +@@ -10284,7 +10266,7 @@ to the system default type for destinati @exitstatus @@ -1164,7 +1132,7 @@ @section @command{rm}: Remove files or directories @pindex rm -@@ -10383,7 +10365,7 @@ predates the development of the @code{ge +@@ -10450,7 +10432,7 @@ predates the development of the @code{ge @exitstatus @@ -1173,7 +1141,7 @@ @section @command{shred}: Remove files more securely @pindex shred -@@ -10393,7 +10375,7 @@ predates the development of the @code{ge +@@ -10460,7 +10442,7 @@ predates the development of the @code{ge @command{shred} overwrites devices or files, to help prevent even extensive forensics from recovering the data. @@ -1182,7 +1150,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 -@@ -10680,18 +10662,18 @@ Besides directories, other special file +@@ -10747,18 +10729,18 @@ Besides directories, other special file (FIFOs), symbolic links, sockets, and so-called @dfn{special files}. @menu @@ -1210,7 +1178,7 @@ @section @command{link}: Make a hard link via the link syscall @pindex link -@@ -10704,7 +10686,7 @@ It is a minimalist interface to the syst +@@ -10771,7 +10753,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 @@ -1219,7 +1187,7 @@ Synopsis: @example -@@ -10730,7 +10712,7 @@ to specify which behavior is desired. +@@ -10797,7 +10779,7 @@ to specify which behavior is desired. @exitstatus @@ -1228,7 +1196,7 @@ @section @command{ln}: Make links between files @pindex ln -@@ -10918,7 +10900,7 @@ ln -srv /a/file /tmp +@@ -10985,7 +10967,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. @@ -1237,7 +1205,7 @@ over relative file name generation, as demonstrated in the following example: @example -@@ -10995,7 +10977,7 @@ ln -s ../adir/afile yetanotherfile +@@ -11062,7 +11044,7 @@ ln -s ../adir/afile yetanotherfile @end example @@ -1246,7 +1214,7 @@ @section @command{mkdir}: Make directories @pindex mkdir -@@ -11073,7 +11055,7 @@ Print a message for each created directo +@@ -11140,7 +11122,7 @@ Print a message for each created directo @exitstatus @@ -1255,7 +1223,7 @@ @section @command{mkfifo}: Make FIFOs (named pipes) @pindex mkfifo -@@ -11114,7 +11096,7 @@ permission bits. @xref{File permissions +@@ -11181,7 +11163,7 @@ permission bits. @xref{File permissions @exitstatus @@ -1264,7 +1232,7 @@ @section @command{mknod}: Make block or character special files @pindex mknod -@@ -11191,7 +11173,7 @@ Set the mode of created files to @var{mo +@@ -11258,7 +11240,7 @@ Set the mode of created files to @var{mo @exitstatus @@ -1273,7 +1241,7 @@ @section @command{readlink}: Print value of a symlink or canonical file name @pindex readlink -@@ -11215,7 +11197,7 @@ of a symbolic link, it produces no outpu +@@ -11282,7 +11264,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. Note the @command{realpath} command is the @@ -1282,7 +1250,7 @@ @end table -@@ -11290,7 +11272,7 @@ The @command{realpath} command without o +@@ -11357,7 +11339,7 @@ The @command{realpath} command without o @exitstatus @@ -1291,7 +1259,7 @@ @section @command{rmdir}: Remove empty directories @pindex rmdir -@@ -11337,7 +11319,7 @@ Give a diagnostic for each successful re +@@ -11404,7 +11386,7 @@ Give a diagnostic for each successful re @end table @@ -1300,7 +1268,7 @@ To remove all empty directories under @var{dirname}, including directories that become empty because other directories are removed, -@@ -11354,7 +11336,7 @@ find @var{dirname} -depth -type d -exec +@@ -11421,7 +11403,7 @@ find @var{dirname} -depth -type d -exec @exitstatus @@ -1309,7 +1277,7 @@ @section @command{unlink}: Remove files via the unlink syscall @pindex unlink -@@ -11365,7 +11347,7 @@ It is a minimalist interface to the syst +@@ -11432,7 +11414,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 @@ -1318,7 +1286,7 @@ @example unlink @var{filename} -@@ -11399,14 +11381,14 @@ timestamps, and other information. Coll +@@ -11466,14 +11448,14 @@ timestamps, and other information. Coll These commands change file attributes. @menu @@ -1338,7 +1306,7 @@ @section @command{chown}: Change file owner and group @pindex chown -@@ -11634,7 +11616,7 @@ chown -hR root /u +@@ -11701,7 +11683,7 @@ chown -hR root /u @end example @@ -1347,7 +1315,7 @@ @section @command{chgrp}: Change group ownership @pindex chgrp -@@ -11643,7 +11625,7 @@ chown -hR root /u +@@ -11710,7 +11692,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) @@ -1356,7 +1324,7 @@ Synopsis: @example -@@ -11762,7 +11744,7 @@ chgrp -hR staff /u +@@ -11829,7 +11811,7 @@ chgrp -hR staff /u @end example @@ -1365,7 +1333,7 @@ @section @command{chmod}: Change access permissions @pindex chmod -@@ -11884,7 +11866,7 @@ chmod -R a=,+rwX dir +@@ -11951,7 +11933,7 @@ chmod -R a=,+rwX dir @end smallexample @@ -1374,7 +1342,7 @@ @section @command{touch}: Change file timestamps @pindex touch -@@ -12059,15 +12041,15 @@ how much storage is in use or available, +@@ -12126,15 +12108,15 @@ how much storage is in use or available, file status information, and write buffers to file systems. @menu @@ -1396,7 +1364,7 @@ @section @command{df}: Report file system space usage @pindex df -@@ -12375,7 +12357,7 @@ be read and one or more of the options @ +@@ -12442,7 +12424,7 @@ be read and one or more of the options @ or @option{-x} is used together with a file name argument. @@ -1405,7 +1373,7 @@ @section @command{du}: Estimate file space usage @pindex du -@@ -12634,7 +12616,7 @@ be one of the following: +@@ -12701,7 +12683,7 @@ be one of the following: @item +@var{format} @vindex LC_TIME List timestamps using @var{format}, where @var{format} is interpreted @@ -1414,7 +1382,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 -@@ -12730,7 +12712,7 @@ underlying devices. +@@ -12797,7 +12779,7 @@ underlying devices. @exitstatus @@ -1423,7 +1391,7 @@ @section @command{stat}: Report file or file system status @pindex stat -@@ -12972,7 +12954,7 @@ with @env{TZ}, libc, The GNU C Library R +@@ -13039,7 +13021,7 @@ with @env{TZ}, libc, The GNU C Library R @exitstatus @@ -1432,7 +1400,7 @@ @section @command{sync}: Synchronize cached writes to persistent storage @pindex sync -@@ -13032,7 +13014,7 @@ write barriers, than a global sync(2) us +@@ -13099,7 +13081,7 @@ write barriers, than a global sync(2) us @exitstatus @@ -1441,7 +1409,7 @@ @section @command{truncate}: Shrink or extend the size of a file @pindex truncate -@@ -13109,13 +13091,13 @@ the size of each @var{file} based on its +@@ -13176,13 +13158,13 @@ the size of each @var{file} based on its This section describes commands that display text strings. @menu @@ -1459,7 +1427,7 @@ @section @command{echo}: Print a line of text @pindex echo -@@ -13138,7 +13120,7 @@ strings cannot be passed to @command{ech +@@ -13205,7 +13187,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 @@ -1468,7 +1436,7 @@ The program accepts the following options. Also see @ref{Common options}. Options must precede operands, and the normally-special argument -@@ -13213,12 +13195,12 @@ POSIX does not require support for any o +@@ -13280,12 +13262,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. @@ -1483,7 +1451,7 @@ @section @command{printf}: Format and print data @pindex printf -@@ -13380,7 +13362,7 @@ Options must precede operands. +@@ -13447,7 +13429,7 @@ Options must precede operands. @exitstatus @@ -1492,7 +1460,7 @@ @section @command{yes}: Print a string until interrupted @pindex yes -@@ -13411,14 +13393,14 @@ condition of shell @code{if} statements, +@@ -13478,14 +13460,14 @@ condition of shell @code{if} statements, pipeline. @menu @@ -1512,7 +1480,7 @@ @section @command{false}: Do nothing, unsuccessfully @pindex false -@@ -13448,7 +13430,7 @@ Portable programs should not assume that +@@ -13515,7 +13497,7 @@ Portable programs should not assume that non-GNU hosts. @@ -1521,7 +1489,7 @@ @section @command{true}: Do nothing, successfully @pindex true -@@ -13484,7 +13466,7 @@ This version of @command{true} is implem +@@ -13551,7 +13533,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. @@ -1530,7 +1498,7 @@ @section @command{test}: Check file types and compare values @pindex test -@@ -13855,7 +13837,7 @@ True if either @var{expr1} or @var{expr2 +@@ -13922,7 +13904,7 @@ True if either @var{expr1} or @var{expr2 @end table @@ -1539,7 +1507,7 @@ @section @command{expr}: Evaluate expressions @pindex expr -@@ -14132,11 +14114,11 @@ useful redirection is performed by a sep +@@ -14199,11 +14181,11 @@ useful redirection is performed by a sep it's described here. @menu @@ -1553,7 +1521,7 @@ @section @command{tee}: Redirect output to multiple files or processes @pindex tee -@@ -14352,15 +14334,15 @@ tar chof - "$tardir" \ +@@ -14419,15 +14401,15 @@ tar chof - "$tardir" \ This section describes commands that manipulate file names. @menu @@ -1575,7 +1543,7 @@ @section @command{basename}: Strip directory and suffix from a file name @pindex basename -@@ -14442,7 +14424,7 @@ basename -a -s .h include/stdio.h includ +@@ -14509,7 +14491,7 @@ basename -a -s .h include/stdio.h includ @end example @@ -1584,7 +1552,7 @@ @section @command{dirname}: Strip last file name component @pindex dirname -@@ -14495,7 +14477,7 @@ dirname stdio.h +@@ -14562,7 +14544,7 @@ dirname stdio.h @end example @@ -1593,7 +1561,7 @@ @section @command{pathchk}: Check file name validity and portability @pindex pathchk -@@ -14571,7 +14553,7 @@ Exit status: +@@ -14638,7 +14620,7 @@ Exit status: 1 otherwise. @end display @@ -1602,7 +1570,7 @@ @section @command{mktemp}: Create temporary file or directory @pindex mktemp -@@ -14746,7 +14728,7 @@ Exit status: +@@ -14813,7 +14795,7 @@ Exit status: @end display @@ -1611,7 +1579,7 @@ @section @command{realpath}: Print the resolved file name. @pindex realpath -@@ -14938,14 +14920,14 @@ which you are working: the current direc +@@ -15005,14 +14987,14 @@ which you are working: the current direc so forth. See also the user-related commands in the next section. @menu @@ -1631,7 +1599,7 @@ @section @command{pwd}: Print working directory @pindex pwd -@@ -14992,7 +14974,7 @@ environment variable is set. +@@ -15059,7 +15041,7 @@ environment variable is set. @exitstatus @@ -1640,7 +1608,7 @@ @section @command{stty}: Print or change terminal characteristics @pindex stty -@@ -15736,7 +15718,7 @@ or +@@ -15803,7 +15785,7 @@ or @end table @@ -1649,7 +1617,7 @@ @section @command{printenv}: Print all or some environment variables @pindex printenv -@@ -15771,7 +15753,7 @@ Exit status: +@@ -15838,7 +15820,7 @@ Exit status: @end display @@ -1658,7 +1626,7 @@ @section @command{tty}: Print file name of terminal on standard input @pindex tty -@@ -15821,16 +15803,16 @@ This section describes commands that pri +@@ -15888,16 +15870,16 @@ This section describes commands that pri logins, groups, and so forth. @menu @@ -1682,7 +1650,7 @@ @section @command{id}: Print user identity @pindex id -@@ -15937,7 +15919,7 @@ database to be consulted afresh, and so +@@ -16004,7 +15986,7 @@ database to be consulted afresh, and so @exitstatus @@ -1691,7 +1659,7 @@ @section @command{logname}: Print current login name @pindex logname -@@ -15958,7 +15940,7 @@ options}. +@@ -16025,7 +16007,7 @@ options}. @exitstatus @@ -1700,7 +1668,7 @@ @section @command{whoami}: Print effective user name @pindex whoami -@@ -15974,7 +15956,7 @@ options}. +@@ -16041,7 +16023,7 @@ options}. @exitstatus @@ -1709,7 +1677,7 @@ @section @command{groups}: Print group names a user is in @pindex groups -@@ -16001,7 +15983,7 @@ options}. +@@ -16068,7 +16050,7 @@ options}. @exitstatus @@ -1718,7 +1686,7 @@ @section @command{users}: Print login names of users currently logged in @pindex users -@@ -16036,7 +16018,7 @@ should not rely on its existence on non- +@@ -16103,7 +16085,7 @@ should not rely on its existence on non- @exitstatus @@ -1727,7 +1695,7 @@ @section @command{who}: Print who is currently logged in @pindex who -@@ -16199,16 +16181,14 @@ This section describes commands that pri +@@ -16266,16 +16248,14 @@ This section describes commands that pri information. @menu @@ -1750,7 +1718,7 @@ @section @command{date}: Print or set system date and time @pindex date -@@ -16965,7 +16945,7 @@ date --date='2017-01-01 00:00:00 +0000' +@@ -17049,7 +17029,7 @@ date --date='2017-01-01 00:00:00 +0000' @end itemize @@ -1759,7 +1727,7 @@ @section @command{arch}: Print machine hardware name @pindex arch -@@ -16988,7 +16968,7 @@ not rely on its existence. +@@ -17072,7 +17052,7 @@ not rely on its existence. @exitstatus @@ -1768,7 +1736,7 @@ @section @command{nproc}: Print the number of available processors @pindex nproc -@@ -17027,7 +17007,7 @@ If possible, exclude this @var{number} o +@@ -17111,7 +17091,7 @@ If possible, exclude this @var{number} o @exitstatus @@ -1777,7 +1745,7 @@ @section @command{uname}: Print system information @pindex uname -@@ -17157,35 +17137,7 @@ Print the kernel version. +@@ -17241,35 +17221,7 @@ Print the kernel version. @exitstatus @@ -1814,7 +1782,7 @@ @section @command{hostid}: Print numeric host identifier @pindex hostid -@@ -17213,44 +17165,6 @@ existence. +@@ -17297,44 +17249,6 @@ existence. @exitstatus @@ -1859,7 +1827,7 @@ @node SELinux context @chapter SELinux context -@@ -17262,11 +17176,11 @@ This section describes commands for oper +@@ -17346,11 +17260,11 @@ This section describes commands for oper contexts. @menu @@ -1874,7 +1842,7 @@ @section @command{chcon}: Change SELinux context of file @pindex chcon -@@ -17369,7 +17283,7 @@ Set range @var{range} in the target secu +@@ -17453,7 +17367,7 @@ Set range @var{range} in the target secu @exitstatus @@ -1883,7 +1851,7 @@ @section @command{runcon}: Run a command in specified SELinux context @pindex runcon -@@ -17462,16 +17376,16 @@ different than the current one: a modifi +@@ -17546,16 +17460,16 @@ different than the current one: a modifi user, etc. @menu @@ -1907,7 +1875,7 @@ @section @command{chroot}: Run a command with a different root directory @pindex chroot -@@ -17587,7 +17501,7 @@ the exit status of @var{command} otherwi +@@ -17671,7 +17585,7 @@ the exit status of @var{command} otherwi @end display @@ -1916,7 +1884,7 @@ @section @command{env}: Run a command in a modified environment @pindex env -@@ -18209,7 +18123,7 @@ OLDUSER=gordon +@@ -18293,7 +18207,7 @@ OLDUSER=gordon @@ -1925,7 +1893,7 @@ @section @command{nice}: Run a command with modified niceness @pindex nice -@@ -18340,7 +18254,7 @@ $ sudo nice -n -1 nice +@@ -18424,7 +18338,7 @@ $ sudo nice -n -1 nice @end example @@ -1934,7 +1902,7 @@ @section @command{nohup}: Run a command immune to hangups @pindex nohup -@@ -18414,7 +18328,7 @@ If @env{POSIXLY_CORRECT} is set, interna +@@ -18498,7 +18412,7 @@ If @env{POSIXLY_CORRECT} is set, interna instead of 125. @@ -1943,7 +1911,7 @@ @section @command{stdbuf}: Run a command with modified I/O stream buffering @pindex stdbuf -@@ -18508,7 +18422,7 @@ the exit status of @var{command} otherwi +@@ -18592,7 +18506,7 @@ the exit status of @var{command} otherwi @end display @@ -1952,7 +1920,7 @@ @section @command{timeout}: Run a command with a time limit @pindex timeout -@@ -18644,90 +18558,6 @@ timeout -s INT 5s env --ignore-signal=IN +@@ -18728,90 +18642,6 @@ timeout -s INT 5s env --ignore-signal=IN timeout -s INT -k 3s 5s env --ignore-signal=INT sleep 20 @end example @@ -2043,7 +2011,7 @@ @node Delaying @chapter Delaying -@@ -18737,11 +18567,11 @@ signal names and numbers. +@@ -18821,11 +18651,11 @@ signal names and numbers. @c Perhaps @command{wait} or other commands should be described here also? @menu @@ -2057,7 +2025,7 @@ @section @command{sleep}: Delay for a specified time @pindex sleep -@@ -18804,13 +18634,13 @@ options}. +@@ -18888,13 +18718,13 @@ options}. These programs do numerically-related operations. @menu @@ -2075,7 +2043,7 @@ @section @command{factor}: Print prime factors @pindex factor -@@ -18875,7 +18705,7 @@ are the product of two large primes), ot +@@ -18959,7 +18789,7 @@ are the product of two large primes), ot @exitstatus @@ -2084,7 +2052,7 @@ @section @command{numfmt}: Reformat numbers @pindex numfmt -@@ -19228,7 +19058,7 @@ $ LC_ALL=ta_IN numfmt --from=iec --forma +@@ -19312,7 +19142,7 @@ $ LC_ALL=ta_IN numfmt --from=iec --forma @end example @@ -2093,7 +2061,7 @@ @section @command{seq}: Print numeric sequences @pindex seq -@@ -19403,7 +19233,7 @@ Naively, a file's atime, mtime, and ctim +@@ -19487,7 +19317,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 diff --git a/coreutils-uname-cpuinfo.patch b/coreutils-uname-cpuinfo.patch index 5ec76d0..c882d59 100644 --- a/coreutils-uname-cpuinfo.patch +++ b/coreutils-uname-cpuinfo.patch @@ -9,7 +9,7 @@ diff -urNp -x '*.orig' coreutils-8.32.org/src/uname.c coreutils-8.32/src/uname.c + static struct option const uname_long_options[] = { - {"all", no_argument, NULL, 'a'}, + {"all", no_argument, nullptr, 'a'}, @@ -323,14 +323,12 @@ element = "powerpc"; # endif diff --git a/coreutils.spec b/coreutils.spec index 8cd0254..6a67824 100644 --- 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 -Version: 9.3 +Version: 9.4 Release: 1 License: GPL v3+ Group: Applications/System Source0: http://ftp.gnu.org/gnu/coreutils/%{name}-%{version}.tar.xz -# Source0-md5: 040b4b7acaf89499834bfc79609af29f +# Source0-md5: 459e9546074db2834eefe5421f250025 Source1: %{name}-non-english-man-pages.tar.bz2 # Source1-md5: f7c986ebc74ccb8d08ed70141063f14c Source2: DIR_COLORS @@ -29,8 +29,6 @@ Patch3: %{name}-date-man.patch Patch6: %{name}-fmt-wchars.patch Patch7: %{name}-sparc64.patch -# http://translationproject.org/latest/coreutils/pl.po (pass through msgcat to generate shorter diff) -Patch8: %{name}-pl.po-update.patch # https://github.com/jarun/advcpmv Patch9: %{name}-advcopy.patch Patch10: tests.patch @@ -45,6 +43,7 @@ BuildRequires: gmp-devel BuildRequires: help2man BuildRequires: libcap-devel BuildRequires: libselinux-devel +BuildRequires: perl-base BuildRequires: rpmbuild(find_lang) >= 1.24 BuildRequires: smack-devel BuildRequires: tar >= 1:1.22 @@ -108,8 +107,6 @@ Programy zawarte w tym pakiecie to: %prep %setup -q -a1 -# translationproject seems to be older than in 9.0 -#%patch8 -p1 %patch0 -p1 %patch1 -p1 %patch2 -p1 @@ -143,8 +140,8 @@ Programy zawarte w tym pakiecie to: # getgid needs to be fixed: # getgid: missing operand # Try `getgid --help' for more information. -%{__rm} tests/misc/help-version.sh -%{__sed} -i -e '/misc\/help-version/d' tests/local.mk +%{__rm} tests/help/help-version.sh +%{__sed} -i -e '/help\/help-version/d' tests/local.mk # fails on some filesystems (like XFS), where readdir returns d_type=DT_UNKNOWN %{__rm} tests/ls/stat-free-color.sh @@ -156,8 +153,8 @@ Programy zawarte w tym pakiecie to: # mksh is too smart for those, won't let programs fail on ulimit # would need bash here -%{__rm} tests/misc/sort-merge-fdlimit.sh -%{__sed} -i -e '/misc\/sort-merge-fdlimit/d' tests/local.mk +%{__rm} tests/sort/sort-merge-fdlimit.sh +%{__sed} -i -e '/sort\/sort-merge-fdlimit/d' tests/local.mk %{__rm} tests/split/r-chunk.sh %{__sed} -i -e '/split\/r-chunk/d' tests/local.mk diff --git a/tests.patch b/tests.patch index 0067738..fff6028 100644 --- a/tests.patch +++ b/tests.patch @@ -112,15 +112,15 @@ diff -ruN coreutils-8.27.orig/tests/local.mk coreutils-8.27/tests/local.mk tests/rm/cycle.sh \ tests/cp/link-heap.sh \ tests/cp/no-ctx.sh \ -- tests/misc/tty-eof.pl \ - tests/tail-2/inotify-hash-abuse.sh \ - tests/tail-2/inotify-hash-abuse2.sh \ - tests/tail-2/F-vs-missing.sh \ +- tests/tty/tty-eof.pl \ + tests/misc/read-errors.sh \ + tests/misc/write-errors.sh \ + tests/tail/inotify-hash-abuse.sh \ @@ -364,7 +363,6 @@ - tests/misc/sort-unique-segv.sh \ - tests/misc/sort-version.sh \ - tests/misc/sort-NaN-infloop.sh \ -- tests/misc/sort-u-FMR.sh \ + tests/sort/sort-unique-segv.sh \ + tests/sort/sort-version.sh \ + tests/sort/sort-NaN-infloop.sh \ +- tests/sort/sort-u-FMR.sh \ tests/split/filter.sh \ tests/split/suffix-auto-length.sh \ tests/split/suffix-length.sh \