- update_flash_nv: fixup null byte command substitution warning

- drmgr: Fix segfault when running 'drmgr -c pmig -h'

powerpc-utils-fixup_null_byte.patch

@@ -0,0 +1,19 @@
+commit 8a0ea6e12b379216e6c498ec15d480cf95e9bbe4
+Author: Than Ngo <than@redhat.com>
+Date:   Tue Feb 25 12:14:00 2020 +0100
+
+    update_flash_nv: fixup null byte command substitution warning
+
+diff --git a/scripts/update_flash_nv b/scripts/update_flash_nv
+index bb9dfee..8be9e8e 100755
+--- a/scripts/update_flash_nv
++++ b/scripts/update_flash_nv
+@@ -313,7 +313,7 @@ fsp_validate_flash() {
+ 	echo 1 > $SYS_VALIDATE_FLASH 2>/dev/null
+ 
+ 	# Display appropriate message, exiting if necessary
+-	output="$(cat $SYS_VALIDATE_FLASH)"
++	output="$(tr -d '\0' < $SYS_VALIDATE_FLASH)"
+ 	fsp_echo_validate_return_status "$output"
+ }
+ 

powerpc-utils-segfault_when_running_drmgr_-c_pmig_-h.patch

@@ -0,0 +1,28 @@
+commit 4fd247b178c81b0395be7dd48db2c762b9922a00
+Author: Than Ngo <than@redhat.com>
+Date:   Tue Feb 25 15:09:00 2020 +0100
+
+    drmgr: Fix segfault when running 'drmgr -c pmig -h'
+
+diff --git a/src/drmgr/drmgr.c b/src/drmgr/drmgr.c
+index 0f207cc..0630f1d 100644
+--- a/src/drmgr/drmgr.c
++++ b/src/drmgr/drmgr.c
+@@ -310,12 +310,16 @@ struct command *get_command(void)
+  		usr_action = HIBERNATE;
+  		return &commands[DRSLOT_CHRP_PHIB];
+ 		break;
++	case DRC_TYPE_MIGRATION:
++		usr_action = MIGRATE;
++		return &commands[DRMIG_CHRP_PMIG];
++		break;
+ 	default:
+ 		/* If we make it this far, the user specified an invalid
+ 		 * connector type.
+ 		 */
+ 		say(ERROR, "Dynamic reconfiguration is not supported for "
+-		    "connector\ntype \"%s\" on this system\n", usr_drc_type);
++		    "connector\ntype \"%d\" on this system\n", usr_drc_type);
+ 		break;
+ 	}
+ 

powerpc-utils.spec

@@ -17,7 +17,6 @@ BuildRequires:  zlib-devel
 BuildRequires:  librtas-devel >= 1.4.0
 BuildRequires:  libservicelog-devel >= 1.0.1-2
 BuildRequires:  perl-generators
-BuildRequires:  systemd
 
 Requires:       which
 # rtas_dump explicit dependency
@@ -36,6 +35,8 @@ Patch4:         powerpc-utils-1.3.5-update_flash_nv.patch
 Patch5:         powerpc-utils-1.3.5-install-man.patch
 # systemd to set default system SMT mode
 Patch6:         powerpc-utils-1.3.4-systemd.patch
+Patch7:         powerpc-utils-segfault_when_running_drmgr_-c_pmig_-h.patch
+Patch8:         powerpc-utils-fixup_null_byte.patch
 
 %description
 Utilities for PowerPC platforms.
@@ -64,14 +65,7 @@ Utilities needed when installing Fedora on PowerPC systems.
 
 
 %prep
-%setup -q
+%autosetup -p1
-
-%patch1 -p1 -b .man
-%patch2 -p1 -b .makefile
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1 -b .systemd
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
@@ -116,7 +110,7 @@ rm -f $RPM_BUILD_ROOT%{_sbindir}/snap $RPM_BUILD_ROOT%{_mandir}/man8/snap.8*
 
 
 %files
-%attr(644, -, -) %doc README Changelog
+%doc README Changelog
 %attr(644, -, -) %{_unitdir}/smt_off.service
 %{_bindir}/amsstat
 %{_sbindir}/activate_firmware
@@ -186,8 +180,9 @@ rm -f $RPM_BUILD_ROOT%{_sbindir}/snap $RPM_BUILD_ROOT%{_mandir}/man8/snap.8*
 
 
 %changelog
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.7-3
+* Mon Mar 09 2020 Than Ngo <than@redhat.com> - 1.3.7-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+- update_flash_nv: fixup null byte command substitution warning
+- drmgr: Fix segfault when running 'drmgr -c pmig -h'
 
 * Thu Dec 19 2019 Than Ngo <than@redhat.com> - 1.3.7-2
 - add systemd service to set default system SMT mode