diff --git a/0509-01fips-Remove-zlib-module-as-requirement.patch b/0509-01fips-Remove-zlib-module-as-requirement.patch new file mode 100644 index 0000000..1076be7 --- /dev/null +++ b/0509-01fips-Remove-zlib-module-as-requirement.patch @@ -0,0 +1,27 @@ +From 17eff2759ab2d5e3622864fb06a7657c7f95bfd3 Mon Sep 17 00:00:00 2001 +From: Daniel Molkentin +Date: Wed, 1 Mar 2017 11:43:39 +0100 +Subject: [PATCH] 01fips: Remove zlib module as requirement + +zlib has been removed from the upstream kernel, affecting SLE12SP3. +This patch must not be backported to SLE12SP2 and earlier (bsc#1020063). +--- + modules.d/01fips/module-setup.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh +index 0bca7a1..e29af08 100755 +--- a/modules.d/01fips/module-setup.sh ++++ b/modules.d/01fips/module-setup.sh +@@ -17,7 +17,7 @@ installkernel() { + _fipsmodules+="ctr cts deflate drbg " + _fipsmodules+="ecb fcrypt gcm ghash_generic khazad md4 michael_mic rmd128 " + _fipsmodules+="rmd160 rmd256 rmd320 seed " +- _fipsmodules+="sha512_generic tcrypt tea wp512 xts zlib " ++ _fipsmodules+="sha512_generic tcrypt tea wp512 xts " + _fipsmodules+="aes_s390 des_s390 sha256_s390 ghash_s390 sha1_s390 sha512_s390 " + _fipsmodules+="gf128mul " + _fipsmodules+="cmac vmac xcbc salsa20_generic salsa20_x86_64 camellia_generic camellia_x86_64 pcbc tgr192 anubis " +-- +2.10.2 + diff --git a/dracut.changes b/dracut.changes index 3c3c26f..4a8a3e4 100644 --- a/dracut.changes +++ b/dracut.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Mar 1 13:24:19 UTC 2017 - daniel.molkentin@suse.com + +- 01fips: Remove zlib module as requirement (bsc#1020063) + * add 0509-01fips-Remove-zlib-module-as-requirement.patch + ------------------------------------------------------------------- Wed Feb 8 16:55:16 UTC 2017 - daniel.molkentin@suse.com diff --git a/dracut.spec b/dracut.spec index e597eb8..b4ba292 100644 --- a/dracut.spec +++ b/dracut.spec @@ -92,6 +92,7 @@ Patch126: 0126-01fips-Add-drbg-module-to-force-loaded-modules.patch Patch137: 0137-Switch-from-Mozilla-NSS-sha256hmac-checking-to-fipsc.patch Patch138: 0138-fips_add_aesni-intel.patch Patch139: 0139-fips-kernel-4.4-fixes.patch +Patch509: 0509-01fips-Remove-zlib-module-as-requirement.patch # Others Patch20: 0020-00warpclock-Set-correct-timezone.patch @@ -397,6 +398,7 @@ chmod a+x modules.d/91zipl/install_zipl_cmdline.sh %patch506 -p1 %patch507 -p1 %patch508 -p1 +%patch509 -p1 %build %configure\