From bc8b2f54c39ab33234058cd4833fd41854faa9be Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Dec 15 2021 04:25:53 +0000
Subject: import kexec-tools-2.0.20-66.el8


---

diff --git a/SOURCES/mkdumprd b/SOURCES/mkdumprd
index c780053..ce3c0f3 100644
--- a/SOURCES/mkdumprd
+++ b/SOURCES/mkdumprd
@@ -68,8 +68,8 @@ to_mount() {
 
     if [[ "$_fstype" == "nfs"* ]]; then
         _pdev=$_target
-        _options=$(echo $_options | sed 's/,addr=[^,]*//')
-        _options=$(echo $_options | sed 's/,proto=[^,]*//')
+        _options=$(echo $_options | sed 's/,\(mount\)\?addr=[^,]*//g')
+        _options=$(echo $_options | sed 's/,\(mount\)\?proto=[^,]*//g')
         _options=$(echo $_options | sed 's/,clientaddr=[^,]*//')
     else
         # for non-nfs _target converting to use udev persistent name
diff --git a/SPECS/kexec-tools.spec b/SPECS/kexec-tools.spec
index 8c12a54..da5bee6 100644
--- a/SPECS/kexec-tools.spec
+++ b/SPECS/kexec-tools.spec
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 2.0.20
-Release: 63%{?dist}
+Release: 66%{?dist}
 License: GPLv2
 Group: Applications/System
 Summary: The kexec/kdump userspace component
@@ -60,6 +60,7 @@ Source201: dracut-fadump-module-setup.sh
 
 %ifarch ppc64 ppc64le
 Requires(post): servicelog
+Recommends: keyutils
 %endif
 
 Requires(post): systemd-units
@@ -70,7 +71,7 @@ Requires: dracut >= 049-129
 Requires: dracut-network >= 049
 Requires: dracut-squash >= 049
 Requires: ethtool
-BuildRequires: zlib-devel zlib zlib-static elfutils-devel glib2-devel bzip2-devel ncurses-devel bison flex lzo-devel snappy-devel
+BuildRequires: zlib-devel zlib zlib-static elfutils-devel glib2-devel bzip2-devel ncurses-devel bison flex lzo-devel snappy-devel libzstd-devel
 BuildRequires: pkgconfig intltool gettext 
 BuildRequires: systemd-units
 BuildRequires: automake autoconf libtool
@@ -185,7 +186,7 @@ cp %{SOURCE31} .
 make
 %ifarch %{ix86} x86_64 ppc64 s390x ppc64le aarch64
 make -C eppic/libeppic
-make -C makedumpfile-1.7.0 LINKTYPE=dynamic USELZO=on USESNAPPY=on
+make -C makedumpfile-1.7.0 LINKTYPE=dynamic USELZO=on USESNAPPY=on USEZSTD=on
 make -C makedumpfile-1.7.0 LDFLAGS="$LDFLAGS -I../eppic/libeppic -L../eppic/libeppic" eppic_makedumpfile.so
 %endif
 
@@ -298,7 +299,7 @@ mv $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/* $RPM_BUILD_ROOT/%{d
 touch /etc/kdump.conf
 
 %ifarch ppc64 ppc64le
-servicelog_notify --remove --command=/usr/lib/kdump/kdump-migrate-action.sh
+servicelog_notify --remove --command=/usr/lib/kdump/kdump-migrate-action.sh 2>/dev/null
 servicelog_notify --add --command=/usr/lib/kdump/kdump-migrate-action.sh --match='refcode="#MIGRATE" and serviceable=0' --type=EVENT --method=pairs_stdin
 %endif
 
@@ -417,6 +418,16 @@ done
 %endif
 
 %changelog
+* Fri Dec 10 2021 Pingfan Liu <piliu@redhat.com> - 2.0.20-66
+- kdump/ppc64: suppress the error message "Could not find a registered notification tool" from servicelog_notify
+- Enable zstd compression for makedumpfile in kexec-tools.spec
+
+* Thu Dec  2 2021 Pingfan Liu <piliu@redhat.com> - 2.0.20-65
+- mkdumprd: drop mountaddr/mountproto nfs mount options 
+
+* Fri Nov 26 2021 Pingfan Liu <piliu@redhat.com> - 2.0.20-64
+- add keytuils as a weak dependency for POWER
+
 * Fri Nov 19 2021 Pingfan Liu <piliu@redhat.com> - 2.0.20-63
 - Document/kexec-kdump-howto.txt: fix escape