From 218b52ef2b8f3c4183b030b7d114eeb4b30d653290ee790f4c94a41222d11869 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Thu, 16 Mar 2023 12:30:00 +0000 Subject: [PATCH 1/2] - Update to upstream version 3.5: * Decode HPE OEM records 216, 224, 230, 238 and 242. * Fortify entry point length checks. * Add a --no-quirks option. * Drop the CPUID exception list. * Do not let --dump-bin overwrite an existing file. * Ensure /dev/mem is a character device file. * Obsoletes news-fix-typo.patch and dmioem-fix-segmentation-fault-in-dmi_hp_240_attr.patch. OBS-URL: https://build.opensuse.org/package/show/Base:System/dmidecode?expand=0&rev=66 --- dmidecode-3.4.tar.xz | 3 -- dmidecode-3.4.tar.xz.sig | Bin 566 -> 0 bytes dmidecode-3.5.tar.xz | 3 ++ dmidecode-3.5.tar.xz.sig | Bin 0 -> 566 bytes dmidecode.changes | 13 ++++++ dmidecode.spec | 8 +--- ...egmentation-fault-in-dmi_hp_240_attr.patch | 42 ------------------ news-fix-typo.patch | 20 --------- 8 files changed, 18 insertions(+), 71 deletions(-) delete mode 100644 dmidecode-3.4.tar.xz delete mode 100644 dmidecode-3.4.tar.xz.sig create mode 100644 dmidecode-3.5.tar.xz create mode 100644 dmidecode-3.5.tar.xz.sig delete mode 100644 dmioem-fix-segmentation-fault-in-dmi_hp_240_attr.patch delete mode 100644 news-fix-typo.patch diff --git a/dmidecode-3.4.tar.xz b/dmidecode-3.4.tar.xz deleted file mode 100644 index f5ec362..0000000 --- a/dmidecode-3.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:43cba851d8467c9979ccdbeab192eb6638c7d3a697eba5ddb779da8837542212 -size 61420 diff --git a/dmidecode-3.4.tar.xz.sig b/dmidecode-3.4.tar.xz.sig deleted file mode 100644 index e84d0905cc77f1624b69236589d7887271b33a9ddc0f49fac971cb93502c96c2..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SEvc79j+Drk_M$@x8r4aPeJfQDgJ*X z#A5NiH?zp`u(hAvpnB&N;xIp-pJ~Kq61~r0?>U4i7v@IIXsE{4wJ+AMc<>CFw zmc=ccxTi<55hh0^`ji{ZF+=!hBGW|Wfya@A)wO?kkEVGZZOmq=dz~vi?|3dHC2+by zH-+wCqWJA4KZiPN<0Qfk9}rF5B2q`d6bYu#`K-0&O*~fosvP?XjNs~LZ+HZ*Qs~x< zKt~dy%mOkTwi||PeU%d5!Z#_<5s{Vh=Z^7cR|q+8eofRq#sa9FN}iz4$bGsq3%vA1 E=4Boc7ytkO diff --git a/dmidecode-3.5.tar.xz b/dmidecode-3.5.tar.xz new file mode 100644 index 0000000..6d2397c --- /dev/null +++ b/dmidecode-3.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:79d76735ee8e25196e2a722964cf9683f5a09581503537884b256b01389cc073 +size 65068 diff --git a/dmidecode-3.5.tar.xz.sig b/dmidecode-3.5.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..5d34c96e7962c4494b2f6d500e033d4fbbbe91d5067f52ea4dd8379d9d6d0722 GIT binary patch literal 566 zcmV-60?GY}0y6{v0SEvc79j+Drk_M$@x8@&ucv?G`=hS}U5dxP zaGW>rA&_l7k&y`;fK$OH~cW5e$cS4`AMnNLOb9@{dYlu2V zc&s)W*CakG@+n?9iGPaGT_E>(IRJn{qvP<1Q-)sXuP1ukABTN7?Mb*>OETs$I^ zdB{-#znOhhm|7PJE5BHcd=IBq?Z(<5kbg48kQX{nfNqmS`~n9s>%`u2U?P`~he+x6 zYDLKvdwXuUKFFZrNUR4%g$0m4_`$L#K;>@UPz{DRLZx#j<4&BPyILxVUd^FD-DIJC zE$Q8*FeMza$J=KiU|9eu;qG&b;LS1AZ6hf@=b^#H3b)2Pd>U_^gOL`fa%Iwm=dy5GB814@M5uqk<4^Hvz>IyeVAu-yiEDuoI^~#OPY|ZP4KIh3dM-d zJ~+VkS-Vir?H%Vby9X0 + +- Update to upstream version 3.5: + * Decode HPE OEM records 216, 224, 230, 238 and 242. + * Fortify entry point length checks. + * Add a --no-quirks option. + * Drop the CPUID exception list. + * Do not let --dump-bin overwrite an existing file. + * Ensure /dev/mem is a character device file. + * Obsoletes news-fix-typo.patch and + dmioem-fix-segmentation-fault-in-dmi_hp_240_attr.patch. + ------------------------------------------------------------------- Fri Sep 9 10:00:42 UTC 2022 - Jean Delvare diff --git a/dmidecode.spec b/dmidecode.spec index b614698..cf989e3 100644 --- a/dmidecode.spec +++ b/dmidecode.spec @@ -1,7 +1,7 @@ # # spec file for package dmidecode # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: dmidecode -Version: 3.4 +Version: 3.5 Release: 0 Summary: DMI table decoder License: GPL-2.0-or-later @@ -27,8 +27,6 @@ Source0: http://download.savannah.gnu.org/releases/%{name}/%{name}-%{vers Source1: http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.xz.sig # https://savannah.nongnu.org/project/memberlist-gpgkeys.php?group=dmidecode Source2: %{name}.keyring -Patch1: news-fix-typo.patch -Patch2: dmioem-fix-segmentation-fault-in-dmi_hp_240_attr.patch Provides: pmtools:%{_sbindir}/dmidecode Obsoletes: pmtools < 20071117 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -51,8 +49,6 @@ the BIOS told it to. %prep %setup -q -%patch1 -p1 -%patch2 -p1 %build CFLAGS="%{optflags}" make %{?_smp_mflags} diff --git a/dmioem-fix-segmentation-fault-in-dmi_hp_240_attr.patch b/dmioem-fix-segmentation-fault-in-dmi_hp_240_attr.patch deleted file mode 100644 index 853c976..0000000 --- a/dmioem-fix-segmentation-fault-in-dmi_hp_240_attr.patch +++ /dev/null @@ -1,42 +0,0 @@ -From: Jean Delvare -Date: Fri, 9 Sep 2022 11:46:53 +0200 -Subject: dmioem: Fix segmentation fault in dmi_hp_240_attr() -Patch-mainline: yes -Git-commit: c3357b532941a8df387618e692e522cc7a43b3e8 - -pr_attr() does not accept a NULL format string. glibc can deal with -it, but FreeBSD's libc chokes on it. - -Display the attributes as a list instead. Pack the attribute name and -status into a single formatted string that can be passed to -pr_list_item(). That's arguably a hack, but it's cheap, non-intrusive, -and works nicely in the end. - -Bug reported by Scott Benesh (Microchip). - -Signed-off-by: Jean Delvare -Fixes: a4b31b2bc537 ("dmioem: Present HPE type 240 attributes in a nicer way") -Cc: Jerry Hoemann ---- - dmioem.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - ---- dmidecode-3.4.orig/dmioem.c 2022-06-27 17:06:32.000000000 +0200 -+++ dmidecode-3.4/dmioem.c 2022-09-09 11:57:12.283832820 +0200 -@@ -198,13 +198,14 @@ static void dmi_hp_240_attr(u64 defined, - }; - unsigned int i; - -- pr_attr("Attributes Defined/Set", NULL); -+ pr_list_start("Attributes Defined/Set", NULL); - for (i = 0; i < ARRAY_SIZE(attributes); i++) - { - if (!(defined.l & (1UL << i))) - continue; -- pr_subattr(attributes[i], "%s", set.l & (1UL << i) ? "Yes" : "No"); -+ pr_list_item("%s: %s", attributes[i], set.l & (1UL << i) ? "Yes" : "No"); - } -+ pr_list_end(); - } - - static void dmi_hp_203_assoc_hndl(const char *fname, u16 num) diff --git a/news-fix-typo.patch b/news-fix-typo.patch deleted file mode 100644 index 893405c..0000000 --- a/news-fix-typo.patch +++ /dev/null @@ -1,20 +0,0 @@ -From: Jean Delvare -Date: Mon, 27 Jun 2022 20:19:11 +0200 -Subject: [PATCH] NEWS: Fix typo -Patch-mainline: yes -Git-commit: fb8766a9d26053b3ad5f6228ffaf09690b7cac90 ---- - NEWS | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- dmidecode-3.4.orig/NEWS 2022-06-27 17:06:32.000000000 +0200 -+++ dmidecode-3.4/NEWS 2022-09-09 11:57:06.661756361 +0200 -@@ -7,7 +7,7 @@ Version 3.4 (Mon Jun 27 2022) - characteristics, new slot characteristics, new on-board device types, new - pointing device interface types, and a new record type (type 45 - - Firmware Inventory Information). -- - Decode HPE OEM records 194, 199, 203, 236, 237, 238 ans 240. -+ - Decode HPE OEM records 194, 199, 203, 236, 237, 238 and 240. - - Bug fixes: - Fix OEM vendor name matching - Fix ASCII filtering of strings From a1536ae321505a9f4c12f80dfd56a4f296fad97d7e0c190f42ba51a761bf7394 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Wed, 22 Mar 2023 08:37:12 +0000 Subject: [PATCH 2/2] Accepting request 1073703 from home:jdelvare:branches:Base:System Fix the massive build warnings on armv7l OBS-URL: https://build.opensuse.org/request/show/1073703 OBS-URL: https://build.opensuse.org/package/show/Base:System/dmidecode?expand=0&rev=67 --- arm-use-alignment-workaround.patch | 24 ++++++++++++++++++++++++ dmidecode.changes | 6 ++++++ dmidecode.spec | 2 ++ 3 files changed, 32 insertions(+) create mode 100644 arm-use-alignment-workaround.patch diff --git a/arm-use-alignment-workaround.patch b/arm-use-alignment-workaround.patch new file mode 100644 index 0000000..9224807 --- /dev/null +++ b/arm-use-alignment-workaround.patch @@ -0,0 +1,24 @@ +From: Jean Delvare +Subject: Use -DALIGNMENT_WORKAROUND on arm as well + +The arm build log shows a lot warnings about casts increasing the +required alignment of target type. This suggests that this +architecture needs to use the slower byte access which is enabled by +-DALIGNMENT_WORKAROUND. + +Signed-off-by: Jean Delvare +--- + config.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- dmidecode.orig/config.h ++++ dmidecode/config.h +@@ -22,7 +22,7 @@ + #endif + + /* Use memory alignment workaround or not */ +-#ifdef __ia64__ ++#if defined(__ia64__) || defined(__arm__) + #define ALIGNMENT_WORKAROUND + #endif + diff --git a/dmidecode.changes b/dmidecode.changes index 638bc85..b7ea2a3 100644 --- a/dmidecode.changes +++ b/dmidecode.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 20 10:27:24 UTC 2023 - Jean Delvare + +- arm-use-alignment-workaround.patch: Fix the massive build + warnings on armv7l. + ------------------------------------------------------------------- Thu Mar 16 12:26:11 UTC 2023 - Jean Delvare diff --git a/dmidecode.spec b/dmidecode.spec index cf989e3..f6b4337 100644 --- a/dmidecode.spec +++ b/dmidecode.spec @@ -27,6 +27,7 @@ Source0: http://download.savannah.gnu.org/releases/%{name}/%{name}-%{vers Source1: http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.xz.sig # https://savannah.nongnu.org/project/memberlist-gpgkeys.php?group=dmidecode Source2: %{name}.keyring +Patch1: arm-use-alignment-workaround.patch Provides: pmtools:%{_sbindir}/dmidecode Obsoletes: pmtools < 20071117 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -49,6 +50,7 @@ the BIOS told it to. %prep %setup -q +%patch1 -p1 %build CFLAGS="%{optflags}" make %{?_smp_mflags}