Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit f2f50ee

Browse files
authored
Remove non-GNU hashsum binaries
1 parent c5554ab commit f2f50ee

File tree

6 files changed

+1
-51
lines changed

6 files changed

+1
-51
lines changed

.github/workflows/CICD.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -355,20 +355,12 @@ jobs:
355355
test -f /tmp/usr/local/bin/hashsum
356356
# Check that hashsum symlinks are present
357357
test -h /tmp/usr/local/bin/b2sum
358-
test -h /tmp/usr/local/bin/b3sum
359358
test -h /tmp/usr/local/bin/md5sum
360359
test -h /tmp/usr/local/bin/sha1sum
361360
test -h /tmp/usr/local/bin/sha224sum
362361
test -h /tmp/usr/local/bin/sha256sum
363-
test -h /tmp/usr/local/bin/sha3-224sum
364-
test -h /tmp/usr/local/bin/sha3-256sum
365-
test -h /tmp/usr/local/bin/sha3-384sum
366-
test -h /tmp/usr/local/bin/sha3-512sum
367362
test -h /tmp/usr/local/bin/sha384sum
368-
test -h /tmp/usr/local/bin/sha3sum
369363
test -h /tmp/usr/local/bin/sha512sum
370-
test -h /tmp/usr/local/bin/shake128sum
371-
test -h /tmp/usr/local/bin/shake256sum
372364
- name: "`make install MULTICALL=y LN=ln -svf`"
373365
shell: bash
374366
run: |

GNUmakefile

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -199,20 +199,12 @@ SELINUX_PROGS := \
199199

200200
HASHSUM_PROGS := \
201201
b2sum \
202-
b3sum \
203202
md5sum \
204203
sha1sum \
205204
sha224sum \
206205
sha256sum \
207-
sha3-224sum \
208-
sha3-256sum \
209-
sha3-384sum \
210-
sha3-512sum \
211206
sha384sum \
212-
sha3sum \
213-
sha512sum \
214-
shake128sum \
215-
shake256sum
207+
sha512sum
216208

217209
$(info Detected OS = $(OS))
218210

build.rs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -79,23 +79,13 @@ pub fn main() {
7979
phf_map.entry(krate, format!("({krate}::uumain, {krate}::uu_app_custom)"));
8080

8181
let map_value = format!("({krate}::uumain, {krate}::uu_app_common)");
82-
let map_value_bits = format!("({krate}::uumain, {krate}::uu_app_bits)");
83-
let map_value_b3sum = format!("({krate}::uumain, {krate}::uu_app_b3sum)");
8482
phf_map.entry("md5sum", map_value.clone());
8583
phf_map.entry("sha1sum", map_value.clone());
8684
phf_map.entry("sha224sum", map_value.clone());
8785
phf_map.entry("sha256sum", map_value.clone());
8886
phf_map.entry("sha384sum", map_value.clone());
8987
phf_map.entry("sha512sum", map_value.clone());
90-
phf_map.entry("sha3sum", map_value_bits.clone());
91-
phf_map.entry("sha3-224sum", map_value.clone());
92-
phf_map.entry("sha3-256sum", map_value.clone());
93-
phf_map.entry("sha3-384sum", map_value.clone());
94-
phf_map.entry("sha3-512sum", map_value.clone());
95-
phf_map.entry("shake128sum", map_value_bits.clone());
96-
phf_map.entry("shake256sum", map_value_bits.clone());
9788
phf_map.entry("b2sum", map_value.clone());
98-
phf_map.entry("b3sum", map_value_b3sum);
9989
}
10090
_ => {
10191
phf_map.entry(krate, map_value.clone());

docs/src/extensions.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,6 @@ supports computing the checksums with several algorithms. The flags and options
5454
are identical to the `*sum` family of utils (`sha1sum`, `sha256sum`, `b2sum`,
5555
etc.). This utility will be removed in the future and it is advised to use `cksum --untagged` instead.
5656

57-
## `b3sum`
58-
59-
This utility does not exist in GNU coreutils. The behavior is modeled after both
60-
the `b2sum` utility of GNU and the
61-
[`b3sum`](https://github.com/BLAKE3-team/BLAKE3) utility by the BLAKE3 team. It also
62-
supports the `--no-names` option, that does not appear in the GNU utility.
63-
6457
## `more`
6558

6659
We provide a simple implementation of `more`, which is not part of GNU

src/uu/hashsum/src/hashsum.rs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -507,15 +507,6 @@ fn uu_app(binary_name: &str) -> (Command, bool) {
507507
}
508508
// b2sum supports the md5sum options plus -l/--length.
509509
"b2sum" => (uu_app_length(), false),
510-
// These have never been part of GNU Coreutils, but can function with the same
511-
// options as md5sum.
512-
"sha3-224sum" | "sha3-256sum" | "sha3-384sum" | "sha3-512sum" => (uu_app_common(), false),
513-
// These have never been part of GNU Coreutils, and require an additional --bits
514-
// option to specify their output size.
515-
"sha3sum" | "shake128sum" | "shake256sum" => (uu_app_bits(), false),
516-
// b3sum has never been part of GNU Coreutils, and has a --no-names option in
517-
// addition to the b2sum options.
518-
"b3sum" => (uu_app_b3sum(), false),
519510
// We're probably just being called as `hashsum`, so give them everything.
520511
_ => (uu_app_custom(), true),
521512
};

tests/by-util/test_hashsum.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1142,14 +1142,6 @@ fn test_help_shows_correct_utility_name() {
11421142
.stdout_contains("Usage: b2sum")
11431143
.stdout_does_not_contain("Usage: hashsum");
11441144

1145-
// Test b3sum
1146-
scene
1147-
.ccmd("b3sum")
1148-
.arg("--help")
1149-
.succeeds()
1150-
.stdout_contains("Usage: b3sum")
1151-
.stdout_does_not_contain("Usage: hashsum");
1152-
11531145
// Test that generic hashsum still shows the correct usage
11541146
scene
11551147
.ccmd("hashsum")

0 commit comments

Comments
 (0)