From 592abcd5c4da4f3792402ced652ad0ba9a4e3cb6 Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Fri, 6 Jul 2018 16:51:30 +0200 Subject: [PATCH] up to 048 - fips-aesni package dropped (optimal algorithm selection should be done with base fips package already) - prelink patch removed (prelink dropped from dracut) - ext4-crc32c patch no longer needed --- dracut.spec | 41 ++++++++++------------------------------- ext4-crc32c.patch | 26 -------------------------- prelink-libs.patch | 15 --------------- 3 files changed, 10 insertions(+), 72 deletions(-) delete mode 100644 ext4-crc32c.patch delete mode 100644 prelink-libs.patch diff --git a/dracut.spec b/dracut.spec index 8018a21..c8d98bb 100644 --- a/dracut.spec +++ b/dracut.spec @@ -1,20 +1,18 @@ Summary: Initramfs generator using udev Summary(pl.UTF-8): Generator initramfs wykorzystujący udev Name: dracut -Version: 047 -Release: 3 +Version: 048 +Release: 1 License: GPL v2+ Group: Base Source0: https://www.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz -# Source0-md5: 62d474ccb8411ec4a76ba5c79bc1093a +# Source0-md5: a9705d3c32c7523428f6e5e3e17244f8 Source1: pld.conf Patch0: plymouth-libdir.patch Patch1: os-release.patch Patch2: arch-libdir.patch Patch3: systemd-paths.patch -Patch4: prelink-libs.patch -Patch5: cryptsetup.patch -Patch6: ext4-crc32c.patch +Patch4: cryptsetup.patch URL: https://dracut.wiki.kernel.org/ BuildRequires: asciidoc BuildRequires: dash @@ -122,6 +120,7 @@ Group: Base Requires: %{name} = %{version}-%{release} Requires: hmaccalc Requires: nss-softokn-freebl +Obsoletes: dracut-fips-aesni %description fips This package requires everything which is needed to build an all @@ -132,22 +131,6 @@ Ten pakiet zawiera wszystko, co potrzebne do tworzenia przy użyciu dracuta obrazów initramfs dowolnego przeznaczenia, wykonujących kontrolę własnej spójności. -%package fips-aesni -Summary: Dracut modules to build a dracut initramfs with an integrity check with aesni-intel -Summary(pl.UTF-8): Moduły Dracuta do tworzenia initramfs z kontrolą spójności przez aesni-intel -Group: Base -Requires: %{name}-fips = %{version}-%{release} - -%description fips-aesni -This package requires everything which is needed to build an all -purpose initramfs with dracut, which does an integrity check and adds -the aesni-intel kernel module. - -%description fips-aesni -l pl.UTF-8 -Ten pakiet zawiera wszystko, co potrzebne do tworzenia przy użyciu -dracuta obrazów initramfs dowolnego przeznaczenia wykonujących -kontrolę własnej spójności z dodanym modułem jądra aesni-intel. - %package caps Summary: Dracut modules to build a dracut initramfs which drops capabilities Summary(pl.UTF-8): Moduły Dracuta do tworzenia initramfs zrzucającego uprawnienia @@ -198,8 +181,6 @@ Bashowe dopełnianie składni dla polecenia dracut. %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 -%patch6 -p1 %{__sed} -i -e 's,@libexecdir@,%{_libexecdir},g' modules.d/50plymouth/module-setup.sh %{__sed} -i -e 's,@lib@,%{_lib},g' modules.d/95resume/module-setup.sh @@ -322,10 +303,11 @@ rm -rf $RPM_BUILD_ROOT %dir %{dracutlibdir}/modules.d/90multipath %attr(755,root,root) %{dracutlibdir}/modules.d/90multipath/*.service %attr(755,root,root) %{dracutlibdir}/modules.d/90multipath/*.sh -%dir %{dracutlibdir}/modules.d/90multipath-hostonly -%attr(755,root,root) %{dracutlibdir}/modules.d/90multipath-hostonly/*.sh %dir %{dracutlibdir}/modules.d/90qemu %attr(755,root,root) %{dracutlibdir}/modules.d/90qemu/*.sh +%dir %{dracutlibdir}/modules.d/90stratis +%attr(755,root,root) %{dracutlibdir}/modules.d/90stratis/*.service +%attr(755,root,root) %{dracutlibdir}/modules.d/90stratis/*.sh %dir %{dracutlibdir}/modules.d/91crypt-gpg %{dracutlibdir}/modules.d/91crypt-gpg/README %attr(755,root,root) %{dracutlibdir}/modules.d/91crypt-gpg/*.sh @@ -353,6 +335,8 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{dracutlibdir}/modules.d/95fcoe-uefi/*.sh %dir %{dracutlibdir}/modules.d/95fstab-sys %attr(755,root,root) %{dracutlibdir}/modules.d/95fstab-sys/*.sh +%dir %{dracutlibdir}/modules.d/95qeth_rules +%attr(755,root,root) %{dracutlibdir}/modules.d/95qeth_rules/*.sh %dir %{dracutlibdir}/modules.d/95zfcp %attr(755,root,root) %{dracutlibdir}/modules.d/95zfcp/*.sh %dir %{dracutlibdir}/modules.d/95zfcp_rules @@ -471,11 +455,6 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{dracutlibdir}/modules.d/01fips/*.sh %config(noreplace) %{_sysconfdir}/dracut.conf.d/40-fips.conf -%files fips-aesni -%defattr(644,root,root,755) -%dir %{dracutlibdir}/modules.d/02fips-aesni -%attr(755,root,root) %{dracutlibdir}/modules.d/02fips-aesni/*.sh - %files caps %defattr(644,root,root,755) %{dracutlibdir}/modules.d/02caps/README diff --git a/ext4-crc32c.patch b/ext4-crc32c.patch deleted file mode 100644 index 80edbdb..0000000 --- a/ext4-crc32c.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 384eeedd2d24b6953a8591524edde810ab880883 Mon Sep 17 00:00:00 2001 -From: Marcos Mello -Date: Fri, 6 Apr 2018 08:19:27 -0300 -Subject: [PATCH] fs-lib: install crc32c for ext4 - -EXT4 filesystems created with metadata_csum (enabled by default in mke2fs 1.44+) or ea_inode need crc32c. - -https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/commit/?id=d0b9e0a6aa7d6805338a43b4e372623352d8df09 -https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/tree/fs/ext4/super.c?h=v4.15.15#n3491 ---- - modules.d/99fs-lib/module-setup.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules.d/99fs-lib/module-setup.sh b/modules.d/99fs-lib/module-setup.sh -index e614fe5f5..b69277e24 100755 ---- a/modules.d/99fs-lib/module-setup.sh -+++ b/modules.d/99fs-lib/module-setup.sh -@@ -38,7 +38,7 @@ echo_fs_helper() { - include_fs_helper_modules() { - local dev=$1 fs=$2 - case "$fs" in -- xfs|btrfs) -+ xfs|btrfs|ext4) - instmods crc32c - ;; - f2fs) diff --git a/prelink-libs.patch b/prelink-libs.patch deleted file mode 100644 index 14b920d..0000000 --- a/prelink-libs.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- dracut-034/dracut.sh.orig 2013-10-20 14:13:51.740264092 +0200 -+++ dracut-034/dracut.sh 2013-10-20 14:29:50.300223867 +0200 -@@ -1266,10 +1266,10 @@ - if [[ $UID = 0 ]] && [[ $PRELINK_BIN ]]; then - if [[ $DRACUT_FIPS_MODE ]]; then - dinfo "*** Installing prelink files ***" -- inst_multiple -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf /etc/prelink.cache -+ inst_multiple -l -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf /etc/prelink.cache - elif [[ $do_prelink == yes ]]; then - dinfo "*** Pre-linking files ***" -- inst_multiple -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf -+ inst_multiple -l -o prelink /etc/prelink.conf /etc/prelink.conf.d/*.conf - chroot "$initdir" "$PRELINK_BIN" -a - rm -f -- "$initdir/$PRELINK_BIN" - rm -fr -- "$initdir"/etc/prelink.* -- 2.43.0