Resolves: #1688740 - fix formatting of sha512sum(1) man page

This commit is contained in:
Kamil Dudka 2019-03-18 13:37:19 +01:00
parent f26bf7c959
commit 172f6456cc
3 changed files with 43 additions and 17 deletions

View File

@ -1,14 +0,0 @@
diff --git a/src/md5sum.c b/src/md5sum.c
index 8e21609..a857d62 100644
--- a/src/md5sum.c
+++ b/src/md5sum.c
@@ -265,6 +265,9 @@ Print or check %s (%d-bit) checksums.\n\
else
fputs (_("\
-t, --text read in text mode (default)\n\
+"), stdout);
+ fputs (_("\
+ Note: There is no difference between binary and text mode option on GNU system.\n\
"), stdout);
fputs (_("\
-z, --zero end each output line with NUL, not newline,\n\

View File

@ -0,0 +1,36 @@
From ef6be60dcaf424bdb21392aff42331bd4dc272e0 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Thu, 14 Mar 2019 13:48:01 +0100
Subject: [PATCH] md5sum,b2sum,sha*sum: --help: add note about binary/text mode
* src/md5sum.c (usage): Make it clear that there is no difference
between binary mode and text mode on GNU systems.
Bug: https://bugzilla.redhat.com/406981
Bug: https://bugzilla.redhat.com/1688740
Upstream-commit: ae61b1066351bb784b54fbfd7b52caf129ec286c
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
---
src/md5sum.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/md5sum.c b/src/md5sum.c
index 3532f7b7a..f75b6de02 100644
--- a/src/md5sum.c
+++ b/src/md5sum.c
@@ -287,7 +287,10 @@ The following five options are useful only when verifying checksums:\n\
The sums are computed as described in %s. When checking, the input\n\
should be a former output of this program. The default mode is to print a\n\
line with checksum, a space, a character indicating input mode ('*' for binary,\
-\n' ' for text or where binary is insignificant), and name for each FILE.\n"),
+\n' ' for text or where binary is insignificant), and name for each FILE.\n\
+\n\
+Note: There is no difference between binary mode and text mode on GNU systems.\
+\n"),
DIGEST_REFERENCE);
emit_ancillary_info (PROGRAM_NAME);
}
--
2.17.2

View File

@ -1,7 +1,7 @@
Summary: A set of basic GNU tools commonly used in shell scripts
Name: coreutils
Version: 8.30
Release: 6%{?dist}
Release: 7%{?dist}
License: GPLv3+
Group: System Environment/Base
Url: https://www.gnu.org/software/coreutils/
@ -23,14 +23,15 @@ Patch2: coreutils-8.30-CVE-2018-17942.patch
# sync: fix open() fallback bug
Patch3: coreutils-8.30-fsync-fallback.patch
# md5sum,b2sum,sha*sum: --help: add note about binary/text mode
Patch4: coreutils-8.31-sums-man-pages.patch
# disable the test-lock gnulib test prone to deadlock
Patch100: coreutils-8.26-test-lock.patch
# require_selinux_(): use selinuxenabled(8) if available
Patch105: coreutils-8.26-selinuxenable.patch
#add note about no difference between binary/text mode on Linux - md5sum manpage
Patch101: coreutils-6.10-manpages.patch
# downstream changes to default DIR_COLORS
Patch102: coreutils-8.25-DIR_COLORS.patch
#do display processor type for uname -p/-i based on uname(2) syscall
@ -258,6 +259,9 @@ fi
%license COPYING
%changelog
* Fri May 03 2019 Kamil Dudka <kdudka@redhat.com> - 8.30-7
- fix formatting of sha512sum(1) man page (#1688740)
* Wed Nov 07 2018 Kamil Dudka <kdudka@redhat.com> - 8.30-6
- sync: fix open() fallback bug
- fix implicit declaration warning in coreutils-getgrouplist.patch