From cf9b6d9ff31bb93abd8038015b33a0b2b48d5b8f8f30824fb57482318da8a68f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Tesa=C5=99=C3=ADk?= <ptesarik@suse.com>
Date: Mon, 3 Jan 2022 14:07:02 +0000
Subject: [PATCH] Accepting request 943594 from
 home:LPechacek:branches:Kernel:kdump

This is a fix to an urgent SLE bug spotted by the openQA automation. To alleviate the pressure, I'm submitting the fix in parallel to the upstream pull request at https://github.com/openSUSE/kdump/pull/24 .

- kdump-0.9.2-mkdumprd-Properly-pass-compression-params.patch: Fix
  malformation in passing Dracut compression parameters in mkdumprd
  (bsc#1193765).
- Refresh existing patches.

OBS-URL: https://build.opensuse.org/request/show/943594
OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/kdump?expand=0&rev=217
---
 ...prd-properly-pass-compression-params.patch | 25 +++++++++++++++++++
 kdump-fillupdir-fixes.patch                   |  4 +--
 kdump-use-pbl.patch                           |  4 +--
 kdump.changes                                 |  8 ++++++
 kdump.spec                                    |  4 ++-
 5 files changed, 39 insertions(+), 6 deletions(-)
 create mode 100644 kdump-0.9.2-mkdumprd-properly-pass-compression-params.patch

diff --git a/kdump-0.9.2-mkdumprd-properly-pass-compression-params.patch b/kdump-0.9.2-mkdumprd-properly-pass-compression-params.patch
new file mode 100644
index 0000000..79ea0ef
--- /dev/null
+++ b/kdump-0.9.2-mkdumprd-properly-pass-compression-params.patch
@@ -0,0 +1,25 @@
+From 6aaf4b81953c0f181c0f3c08073ba96ffd6a472e Mon Sep 17 00:00:00 2001
+From: Libor Pechacek <lpechacek@suse.com>
+Date: Thu, 16 Dec 2021 14:25:56 +0100
+Subject: [PATCH] mkdumprd: Properly pass compression params
+
+The compression parameter needs more careful handling so that the
+individual bits stay together.
+
+Fixes: 368fbdf62aa8 ("mkdumprd: Do not compress temporary fadump initrd")
+Signed-off-by: Libor Pechacek <lpechacek@suse.com>
+---
+ init/mkdumprd | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/init/mkdumprd
++++ b/init/mkdumprd
+@@ -86,7 +86,7 @@ function build_initrd()
+     if [ "$KDUMP_FADUMP" = "yes" ] ; then
+         build_fadumprd
+     else
+-        run_dracut --compress='xz -0 --check=crc32'
++        run_dracut --compress \'xz -0 --check=crc32\'
+     fi
+ }                                                                          # }}}
+ 
diff --git a/kdump-fillupdir-fixes.patch b/kdump-fillupdir-fixes.patch
index 53ce170..baa570e 100644
--- a/kdump-fillupdir-fixes.patch
+++ b/kdump-fillupdir-fixes.patch
@@ -1,8 +1,6 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 77205e1..3032d3d 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -182,7 +182,7 @@ ADD_CUSTOM_TARGET(
+@@ -172,7 +172,7 @@ ADD_CUSTOM_TARGET(
  INSTALL(FILES
      ${CMAKE_CURRENT_BINARY_DIR}/sysconfig.kdump
      DESTINATION
diff --git a/kdump-use-pbl.patch b/kdump-use-pbl.patch
index 0c9dc82..b490d6a 100644
--- a/kdump-use-pbl.patch
+++ b/kdump-use-pbl.patch
@@ -15,7 +15,7 @@ Acked-by: Petr Tesarik <ptesarik@suse.com>
 
 --- a/init/CMakeLists.txt
 +++ b/init/CMakeLists.txt
-@@ -65,7 +65,6 @@ INSTALL(
+@@ -51,7 +51,6 @@ INSTALL(
  INSTALL(
      FILES
          ${CMAKE_CURRENT_SOURCE_DIR}/mkdumprd
@@ -25,7 +25,7 @@ Acked-by: Petr Tesarik <ptesarik@suse.com>
      PERMISSIONS
 --- a/init/load.sh
 +++ b/init/load.sh
-@@ -214,14 +214,10 @@ function fadump_bootloader()
+@@ -255,14 +255,10 @@ function fadump_bootloader()
      local newstate="$1"
  
      # check if the old configuration is still valid
diff --git a/kdump.changes b/kdump.changes
index 2abf09d..552049c 100644
--- a/kdump.changes
+++ b/kdump.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Jan  3 11:56:47 UTC 2022 - Libor Pecháček <lpechacek@suse.com>
+
+- kdump-0.9.2-mkdumprd-Properly-pass-compression-params.patch: Fix
+  malformation in passing Dracut compression parameters in mkdumprd
+  (bsc#1193765).
+- Refresh existing patches.
+
 -------------------------------------------------------------------
 Thu Dec  9 08:23:35 UTC 2021 - Petr Tesařík <ptesarik@suse.com>
 
diff --git a/kdump.spec b/kdump.spec
index 4e8be1e..4bf4a38 100644
--- a/kdump.spec
+++ b/kdump.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package kdump
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -34,6 +34,7 @@ Source:         %{name}-%{version}.tar.bz2
 Source2:        %{name}-rpmlintrc
 Patch1:         %{name}-fillupdir-fixes.patch
 Patch9:         %{name}-use-pbl.patch
+Patch10:        %{name}-0.9.2-mkdumprd-properly-pass-compression-params.patch
 BuildRequires:  asciidoc
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
@@ -89,6 +90,7 @@ after a crash dump has occured.
 %patch1 -p1
 %endif
 %patch9 -p1
+%patch10 -p1
 
 %build
 export CXXFLAGS="%{optflags} -std=c++11"