From: Ondrej Mosnacek <omosnace@redhat.com>
Date: Thu, 14 Jun 2018 08:25:33 +0000 (+0200)
Subject: fips: Drop obsolete dependencies
X-Git-Tag: 048~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bca1967c90967d5453d8b215ff28552776e4fcb3;p=thirdparty%2Fdracut.git

fips: Drop obsolete dependencies

Explicitly require libkcapi-hmaccalc and stop installing NSS/prelink
dependencies that are no longer needed.
---

diff --git a/dracut.spec b/dracut.spec
index 1d2226497..5d66e224b 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -93,9 +93,7 @@ Requires: util-linux-ng >= 2.21
 %endif
 
 %if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version}
-Requires: hmaccalc
-Requires: nss
-Requires: nss-softokn-freebl
+Requires: libkcapi-hmaccalc
 %endif
 
 %description
diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh
index 4b3e322fd..7c41f5278 100755
--- a/modules.d/01fips/module-setup.sh
+++ b/modules.d/01fips/module-setup.sh
@@ -42,12 +42,7 @@ install() {
     inst_hook pre-pivot 01 "$moddir/fips-noboot.sh"
     inst_script "$moddir/fips.sh" /sbin/fips.sh
 
-    inst_multiple sha512hmac rmmod insmod mount uname umount fipscheck
-
-    inst_libdir_file libsoftokn3.so libsoftokn3.so \
-        libsoftokn3.chk libfreebl3.so libfreebl3.chk \
-        libssl.so 'hmaccalc/sha512hmac.hmac' libssl.so.10 \
-        libfreeblpriv3.so libfreeblpriv3.chk
+    inst_multiple sha512hmac rmmod insmod mount uname umount
 
     inst_simple /etc/system-fips
     [ -c ${initdir}/dev/random ] || mknod ${initdir}/dev/random c 1 8 \