From 2a294eb600422257310589ef29013f2737e7632c6b51955da51ba68de7bbaeef Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Fri, 22 Jan 2021 09:34:24 +0000 Subject: [PATCH] - Update to version 21.01.00: * See provided changelog for detailed list of changes - Drop upstreamed patch: * acpi-pmtt-fix-infinite-loops-when-length-is-incorrectly-zero.diff OBS-URL: https://build.opensuse.org/package/show/hardware/fwts?expand=0&rev=120 --- ...loops-when-length-is-incorrectly-zero.diff | 36 ------------------- fwts-V20.12.00.tar.gz | 3 -- fwts-V21.01.00.tar.gz | 3 ++ fwts-fix-non-acpi.patch | 8 +++-- fwts.changes | 8 +++++ fwts.spec | 4 +-- 6 files changed, 17 insertions(+), 45 deletions(-) delete mode 100644 acpi-pmtt-fix-infinite-loops-when-length-is-incorrectly-zero.diff delete mode 100644 fwts-V20.12.00.tar.gz create mode 100644 fwts-V21.01.00.tar.gz diff --git a/acpi-pmtt-fix-infinite-loops-when-length-is-incorrectly-zero.diff b/acpi-pmtt-fix-infinite-loops-when-length-is-incorrectly-zero.diff deleted file mode 100644 index aa5fd66..0000000 --- a/acpi-pmtt-fix-infinite-loops-when-length-is-incorrectly-zero.diff +++ /dev/null @@ -1,36 +0,0 @@ -Index: fwts-20.12.00/src/acpi/pmtt/pmtt.c -=================================================================== ---- fwts-20.12.00.orig/src/acpi/pmtt/pmtt.c -+++ fwts-20.12.00/src/acpi/pmtt/pmtt.c -@@ -117,6 +117,14 @@ static void pmtt_controller_test(fwts_fr - offset += sizeof(fwts_acpi_table_pmtt_domain) * entry->domain_count; - header = (fwts_acpi_table_pmtt_header *) (((char *) entry) + offset); - while (offset < entry->header.length) { -+ -+ if (header->length == 0) { -+ fwts_failed(fw, LOG_LEVEL_CRITICAL, -+ "PMTTBadSubtableLength", -+ "PMTT Controller has a subtable with zero length"); -+ break; -+ } -+ - if (header->type == FWTS_ACPI_PMTT_TYPE_DIMM) { - pmtt_physical_component_test(fw, (fwts_acpi_table_pmtt_physical_component *) header, passed); - } else { -@@ -145,7 +153,16 @@ static void pmtt_socket_test(fwts_framew - - offset = sizeof(fwts_acpi_table_pmtt_socket); - header = (fwts_acpi_table_pmtt_header *) (((char *) entry) + offset); -+ - while (offset < entry->header.length) { -+ -+ if (header->length == 0) { -+ fwts_failed(fw, LOG_LEVEL_CRITICAL, -+ "PMTTBadSubtableLength", -+ "PMTT Socket has a subtable with zero length"); -+ break; -+ } -+ - if (header->type == FWTS_ACPI_PMTT_TYPE_CONTROLLER) { - pmtt_controller_test(fw, (fwts_acpi_table_pmtt_controller *) header, passed); - } else { diff --git a/fwts-V20.12.00.tar.gz b/fwts-V20.12.00.tar.gz deleted file mode 100644 index 1540749..0000000 --- a/fwts-V20.12.00.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ca99747ab027b20e3dc48633ea497c3e7f0445ba113cad52541590f3c74b3350 -size 3846526 diff --git a/fwts-V21.01.00.tar.gz b/fwts-V21.01.00.tar.gz new file mode 100644 index 0000000..7819c97 --- /dev/null +++ b/fwts-V21.01.00.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a355bc0ad3d73759ff7c495bc1f702165128e035f9618bcf56a7f2d4a7b3314c +size 3846263 diff --git a/fwts-fix-non-acpi.patch b/fwts-fix-non-acpi.patch index 2a5f033..e0f681b 100644 --- a/fwts-fix-non-acpi.patch +++ b/fwts-fix-non-acpi.patch @@ -1,6 +1,8 @@ ---- fwts-20.11.00/src/acpica/source/tools/acpiexec/aecommon.h 2020/11/27 15:57:25 1.1 -+++ fwts-20.11.00/src/acpica/source/tools/acpiexec/aecommon.h 2020/11/27 15:57:41 -@@ -201,11 +201,18 @@ +Index: fwts-21.01.00/src/acpica/source/tools/acpiexec/aecommon.h +=================================================================== +--- fwts-21.01.00.orig/src/acpica/source/tools/acpiexec/aecommon.h ++++ fwts-21.01.00/src/acpica/source/tools/acpiexec/aecommon.h +@@ -201,11 +201,18 @@ typedef struct init_file_entry } INIT_FILE_ENTRY; diff --git a/fwts.changes b/fwts.changes index 47faeb1..305e20b 100644 --- a/fwts.changes +++ b/fwts.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Jan 22 09:30:24 UTC 2021 - Martin Pluskal + +- Update to version 21.01.00: + * See provided changelog for detailed list of changes +- Drop upstreamed patch: + * acpi-pmtt-fix-infinite-loops-when-length-is-incorrectly-zero.diff + ------------------------------------------------------------------- Mon Jan 18 08:25:34 UTC 2021 - Martin Pluskal diff --git a/fwts.spec b/fwts.spec index 86174c8..6e3d2b1 100644 --- a/fwts.spec +++ b/fwts.spec @@ -17,7 +17,7 @@ Name: fwts -Version: 20.12.00 +Version: 21.01.00 Release: 0 Summary: Firmware Test Suite License: GPL-2.0-or-later @@ -28,8 +28,6 @@ Source0: https://fwts.ubuntu.com/release/%{name}-V%{version}.tar.gz Patch1: fwts-no-compiletime.patch # PATCH-FIX-OPENSUSE fwts-fix-non-acpi.patch Patch2: fwts-fix-non-acpi.patch -# PATCH-FIX-UPSTREAM acpi-pmtt-fix-infinite-loops-when-length-is-incorrectly-zero.diff -Patch3: acpi-pmtt-fix-infinite-loops-when-length-is-incorrectly-zero.diff BuildRequires: autoconf BuildRequires: automake BuildRequires: bison