From b4c7b0bfa1891a7ec71af5d8ffc5a3ac0ab02428 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 18 May 2021 03:00:17 -0400 Subject: [PATCH] import redfish-finder-0.3-5.el8 --- SOURCES/hostconfig-dhcp-parse.patch | 28 ++++++++++++++++++++++++++++ SPECS/redfish-finder.spec | 6 +++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 SOURCES/hostconfig-dhcp-parse.patch diff --git a/SOURCES/hostconfig-dhcp-parse.patch b/SOURCES/hostconfig-dhcp-parse.patch new file mode 100644 index 0000000..8d9a412 --- /dev/null +++ b/SOURCES/hostconfig-dhcp-parse.patch @@ -0,0 +1,28 @@ +commit 581327fd45351dd53c06a26517bb7f92e19d8f31 +Author: Charles Rose +Date: Mon Aug 31 17:40:08 2020 -0500 + + fix parsing HostConfig for DHCP + + assigntype.append(AssignType.DHCP) fails for DHCP because + assigntype [] is not set. + + Signed-off-by: Charles Rose + +diff --git a/redfish-finder b/redfish-finder +old mode 100644 +new mode 100755 +index 9a185b3..461eff9 +--- a/redfish-finder ++++ b/redfish-finder +@@ -124,8 +124,8 @@ class HostConfig(): + if cursor == None: + printf("redfish-finder: Unable to parse SMBIOS Host IP Assignment Type") + return None ++ self.assigntype = [] + if cursor.split()[0] == "Static": +- self.assigntype = [] + self.assigntype.append(AssignType.STATIC) + cursor = cursor_consume_next(cursor, "Host IP Address Format: ") + if cursor.split()[0] == "IPv4": + diff --git a/SPECS/redfish-finder.spec b/SPECS/redfish-finder.spec index f243ee6..83f3b40 100644 --- a/SPECS/redfish-finder.spec +++ b/SPECS/redfish-finder.spec @@ -1,6 +1,6 @@ Name: redfish-finder Version: 0.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Utility for parsing SMBIOS information and configuring canonical BMC access BuildArch: noarch @@ -10,6 +10,7 @@ Source0: %url/archive/V%{version}/%{name}-%{version}.tar.gz Patch0: redfish-finder-multi-block.patch Patch1: hostname-null-check.patch +Patch2: hostconfig-dhcp-parse.patch %{?systemd_requires} BuildRequires: systemd @@ -51,6 +52,9 @@ install -D -p -m 0644 ./redfish-finder.service %{buildroot}/%{_unitdir}/redfish- %{_unitdir}/redfish-finder.service %changelog +* Fri Feb 12 2021 Joel Savitz - 0.3-4 - Fix null hostname check (bz1729343)