From 66361246c841d56ddcb4285e978b1a219f17ab95 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jan 18 2021 06:09:23 +0000
Subject: import rhel-system-roles-1.0-24.el8


---

diff --git a/SOURCES/kdump-fix-newline.diff b/SOURCES/kdump-fix-newline.diff
new file mode 100644
index 0000000..52a1a7e
--- /dev/null
+++ b/SOURCES/kdump-fix-newline.diff
@@ -0,0 +1,28 @@
+commit cafd95d0b03360d12e86170eb10fc1fc3dcade06
+Author: Pavel Cahyna <pcahyna@redhat.com>
+Date:   Thu Jan 14 11:42:48 2021 +0100
+
+    Get rid of the extra final newline in string
+    
+    Use the `-` chomping indicator to indicate that the trailing newline is
+    not intended as a part of the string.
+    https://yaml.org/spec/1.1/#chomping/
+    
+    The trailing newline was causing an actual problem in the test.
+    
+    Also use the `>` folded style, which is more appropriate here than the
+    `|` literal style.
+
+diff --git a/tests/tests_ssh.yml b/tests/tests_ssh.yml
+index 6d3699c..d3503f7 100644
+--- a/tests/tests_ssh.yml
++++ b/tests/tests_ssh.yml
+@@ -27,7 +27,7 @@
+     - include_role:
+         name: linux-system-roles.kdump
+       vars:
+-        kdump_ssh_user: |
++        kdump_ssh_user: >-
+           {{ hostvars[kdump_ssh_server_outside]['ansible_user_id'] }}
+         # This is the outside address. Ansible will connect to it to
+         # copy the ssh key.
diff --git a/SPECS/rhel-system-roles.spec b/SPECS/rhel-system-roles.spec
index 078e4a1..c7494b1 100644
--- a/SPECS/rhel-system-roles.spec
+++ b/SPECS/rhel-system-roles.spec
@@ -6,7 +6,7 @@ Name: linux-system-roles
 Url: https://github.com/linux-system-roles/
 Summary: Set of interfaces for unified system management
 Version: 1.0
-Release: 23%{?dist}
+Release: 24%{?dist}
 
 #Group: Development/Libraries
 License: GPLv3+ and MIT and BSD
@@ -119,6 +119,7 @@ Patch101: rhel-system-roles-kdump-pr22.diff
 
 Patch102: kdump-tier1-tags.diff
 Patch103: kdump-meta-el8.diff
+Patch104: kdump-fix-newline.diff
 
 Patch21: selinux-tier1-tags.diff
 
@@ -175,6 +176,7 @@ cd %{rolename0}
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1
+%patch104 -p1
 cd ..
 cd %{rolename1}
 %patch11 -p1
@@ -505,6 +507,9 @@ cp -p $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}sshd/README.md \
 %license %{_datadir}/ansible/roles/%{roleprefix}sshd/LICENSE
 
 %changelog
+* Fri Jan 15 2021 Pavel Cahyna <pcahyna@redhat.com> - 1.0-24
+- Apply PR #63 for kdump to fix a problem in test introduced by rebase
+
 * Fri Jan  8 2021 Pavel Cahyna <pcahyna@redhat.com> - 1.0-23
 - Add {crypto_policies,sshd}/README.md to docfiles, thanks jjelen
 - Fix role name in selinux patch