Skip to content

Commit eabb527

Browse files
authored
Merge pull request #10587 from RenjiSann/delete-hashsum
Remove hashsum
2 parents 9ece362 + ade6e8c commit eabb527

22 files changed

+4
-1861
lines changed

Cargo.lock

Lines changed: 0 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ feat_common_core = [
112112
"false",
113113
"fmt",
114114
"fold",
115-
"hashsum",
116115
"head",
117116
"join",
118117
"link",
@@ -473,7 +472,6 @@ false = { optional = true, version = "0.6.0", package = "uu_false", path = "src/
473472
fmt = { optional = true, version = "0.6.0", package = "uu_fmt", path = "src/uu/fmt" }
474473
fold = { optional = true, version = "0.6.0", package = "uu_fold", path = "src/uu/fold" }
475474
groups = { optional = true, version = "0.6.0", package = "uu_groups", path = "src/uu/groups" }
476-
hashsum = { optional = true, version = "0.6.0", package = "uu_hashsum", path = "src/uu/hashsum" }
477475
head = { optional = true, version = "0.6.0", package = "uu_head", path = "src/uu/head" }
478476
hostid = { optional = true, version = "0.6.0", package = "uu_hostid", path = "src/uu/hostid" }
479477
hostname = { optional = true, version = "0.6.0", package = "uu_hostname", path = "src/uu/hostname" }

GNUmakefile

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,6 @@ ifeq ($(SELINUX_ENABLED),1)
105105
endif
106106

107107
UTILS ?= $(filter-out $(SKIP_UTILS),$(PROGS))
108-
ifneq ($(filter hashsum,$(UTILS)),hashsum)
109-
HASHSUM_PROGS :=
110-
endif
111108

112109
ifneq ($(findstring stdbuf,$(UTILS)),)
113110
# Use external libstdbuf per default. It is more robust than embedding libstdbuf.
@@ -306,9 +303,6 @@ else
306303
$(foreach prog, $(INSTALLEES), \
307304
$(INSTALL) -m 755 $(BUILDDIR)/$(prog) $(INSTALLDIR_BIN)/$(PROG_PREFIX)$(prog) $(newline) \
308305
)
309-
$(foreach prog, $(HASHSUM_PROGS), \
310-
cd $(INSTALLDIR_BIN) && $(LN) $(PROG_PREFIX)hashsum $(PROG_PREFIX)$(prog) $(newline) \
311-
)
312306
$(if $(findstring test,$(INSTALLEES)), $(INSTALL) -m 755 $(BUILDDIR)/test $(INSTALLDIR_BIN)/$(PROG_PREFIX)[)
313307
endif
314308

build.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,6 @@ pub fn main() {
8787
"false" | "true" => {
8888
phf_map.entry(krate, format!("(r#{krate}::uumain, r#{krate}::uu_app)"));
8989
}
90-
"hashsum" => {
91-
phf_map.entry(krate, format!("({krate}::uumain, {krate}::uu_app_custom)"));
92-
}
9390
_ => {
9491
phf_map.entry(krate, map_value.clone());
9592
}

docs/src/extensions.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,6 @@ packages.
5353

5454
`rm` can display a progress bar when the `-g`/`--progress` flag is set.
5555

56-
## `hashsum` (deprecated)
57-
58-
This utility does not exist in GNU coreutils. `hashsum` is a utility that
59-
supports computing the checksums with several algorithms. The flags and options
60-
are identical to the `*sum` family of utils (`sha1sum`, `sha256sum`, `b2sum`,
61-
etc.). This utility will be removed in the future and it is advised to use `cksum --untagged` instead.
62-
6356
## `more`
6457

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

fuzz/fuzz_targets/fuzz_non_utf8_paths.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ static PATH_PROGRAMS: &[&str] = &[
8383
"vdir",
8484
"mkfifo",
8585
"mknod",
86-
"hashsum",
8786
// File I/O utilities
8887
"dd",
8988
"sync",
@@ -252,12 +251,6 @@ fn test_program_with_non_utf8_path(program: &str, path: &Path) -> CommandResult
252251
OsString::from("bs=1"),
253252
OsString::from("count=1"),
254253
],
255-
// Hashsum needs algorithm
256-
"hashsum" => vec![
257-
OsString::from(program),
258-
OsString::from("--md5"),
259-
path_os.to_owned(),
260-
],
261254
// Encoding/decoding programs
262255
"base32" | "base64" | "basenc" => vec![OsString::from(program), path_os.to_owned()],
263256
"df" => vec![OsString::from(program), path_os.to_owned()],

src/uu/hashsum/Cargo.toml

Lines changed: 0 additions & 30 deletions
This file was deleted.

src/uu/hashsum/LICENSE

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/uu/hashsum/locales/en-US.ftl

Lines changed: 0 additions & 39 deletions
This file was deleted.

src/uu/hashsum/locales/fr-FR.ftl

Lines changed: 0 additions & 37 deletions
This file was deleted.

0 commit comments

Comments
 (0)