Merge pull request #8647 from tpowa/tpowa-patch-cksum-symlinks

Add hashsum symlinks with tests

Author: tpowa

.github/workflows/CICD.yml

@@ -341,7 +341,53 @@ jobs:
         ! test -f /tmp/usr/local/share/zsh/site-functions/_install
         ! test -f /tmp/usr/local/share/bash-completion/completions/head
         ! test -f /tmp/usr/local/share/fish/vendor_completions.d/cat.fish
-
+    - name: "`make install MULTICALL=n`"
+      shell: bash
+      run: |
+        set -x
+        DESTDIR=/tmp/ make PROFILE=release MULTICALL=n install
+        # Check that the utils are present
+        test -f /tmp/usr/local/bin/hashsum
+        # Check that hashsum symlinks are present
+        test -h /tmp/usr/local/bin/b2sum
+        test -h /tmp/usr/local/bin/b3sum
+        test -h /tmp/usr/local/bin/md5sum
+        test -h /tmp/usr/local/bin/sha1sum
+        test -h /tmp/usr/local/bin/sha224sum
+        test -h /tmp/usr/local/bin/sha256sum
+        test -h /tmp/usr/local/bin/sha3-224sum
+        test -h /tmp/usr/local/bin/sha3-256sum
+        test -h /tmp/usr/local/bin/sha3-384sum
+        test -h /tmp/usr/local/bin/sha3-512sum
+        test -h /tmp/usr/local/bin/sha384sum
+        test -h /tmp/usr/local/bin/sha3sum
+        test -h /tmp/usr/local/bin/sha512sum
+        test -h /tmp/usr/local/bin/shake128sum
+        test -h /tmp/usr/local/bin/shake256sum
+    - name: "`make install MULTICALL=y`"
+      shell: bash
+      run: |
+        set -x
+        DESTDIR=/tmp/ make PROFILE=release MULTICALL=y install
+        # Check that the utils are present
+        test -f /tmp/usr/local/bin/coreutils
+        # Check that hashsum symlinks are present
+        test -h /tmp/usr/local/bin/b2sum
+        test -h /tmp/usr/local/bin/b3sum
+        test -h /tmp/usr/local/bin/md5sum
+        test -h /tmp/usr/local/bin/sha1sum
+        test -h /tmp/usr/local/bin/sha224sum
+        test -h /tmp/usr/local/bin/sha256sum
+        test -h /tmp/usr/local/bin/sha3-224sum
+        test -h /tmp/usr/local/bin/sha3-256sum
+        test -h /tmp/usr/local/bin/sha3-384sum
+        test -h /tmp/usr/local/bin/sha3-512sum
+        test -h /tmp/usr/local/bin/sha384sum
+        test -h /tmp/usr/local/bin/sha3sum
+        test -h /tmp/usr/local/bin/sha512sum
+        test -h /tmp/usr/local/bin/shake128sum
+        test -h /tmp/usr/local/bin/shake256sum
+  
   build_rust_stable:
     name: Build/stable
     needs: [ min_version, deps ]

GNUmakefile

@@ -191,6 +191,23 @@ SELINUX_PROGS := \
 	chcon \
 	runcon
 
+HASHSUM_PROGS := \
+	b2sum \
+	b3sum \
+	md5sum \
+	sha1sum \
+	sha224sum \
+	sha256sum \
+	sha3-224sum \
+	sha3-256sum \
+	sha3-384sum \
+	sha3-512sum \
+	sha384sum \
+	sha3sum \
+	sha512sum \
+	shake128sum \
+	shake256sum
+
 $(info Detected OS = $(OS))
 
 # Don't build the SELinux programs on macOS (Darwin) and FreeBSD
@@ -464,11 +481,17 @@ ifeq (${MULTICALL}, y)
 	$(foreach prog, $(filter-out coreutils, $(INSTALLEES)), \
 		cd $(INSTALLDIR_BIN) && ln -fs $(PROG_PREFIX)coreutils $(PROG_PREFIX)$(prog) $(newline) \
 	)
+	$(foreach prog, $(HASHSUM_PROGS), \
+		cd $(INSTALLDIR_BIN) && ln -fs $(PROG_PREFIX)coreutils $(PROG_PREFIX)$(prog) $(newline) \
+	)
 	$(if $(findstring test,$(INSTALLEES)), cd $(INSTALLDIR_BIN) && ln -fs $(PROG_PREFIX)coreutils $(PROG_PREFIX)[)
 else
 	$(foreach prog, $(INSTALLEES), \
 		$(INSTALL) -m 755 $(BUILDDIR)/$(prog) $(INSTALLDIR_BIN)/$(PROG_PREFIX)$(prog) $(newline) \
 	)
+	$(foreach prog, $(HASHSUM_PROGS), \
+		cd $(INSTALLDIR_BIN) && ln -fs $(PROG_PREFIX)hashsum $(PROG_PREFIX)$(prog) $(newline) \
+	)
 	$(if $(findstring test,$(INSTALLEES)), $(INSTALL) -m 755 $(BUILDDIR)/test $(INSTALLDIR_BIN)/$(PROG_PREFIX)[)
 endif