3 changed files with 126 additions and 51 deletions
--- a/SOURCES/0001-dmidecode-Add-processor-support-from-SMBIOS-3.6.0.patch
+++ b/SOURCES/0001-dmidecode-Add-processor-support-from-SMBIOS-3.6.0.patch
@ -0,0 +1,72 @@
+From ac65cf23af7cccecb4175d3c13460928e8e2f51d Mon Sep 17 00:00:00 2001
+From: Jean Delvare <jdelvare@suse.de>
+Date: Fri, 26 May 2023 17:41:51 +0200
+Subject: [PATCH] dmidecode: Add processor support from SMBIOS 3.6.0
+
+SMBIOS 3.6.0 adds the following to the Processor Information
+structure (type 4):
+* 9 socket types
+* 1 processor family
+* 1 field (Thread Enabled)
+
+Signed-off-by: Jean Delvare <jdelvare@suse.de>
+---
+ dmidecode.c | 19 ++++++++++++++++---
+ 1 file changed, 16 insertions(+), 3 deletions(-)
+
+diff --git a/dmidecode.c b/dmidecode.c
+index 75b58b1..0e8a98c 100644
+--- a/dmidecode.c
+++ b/dmidecode.c
+@@ -974,6 +974,7 @@ static const char *dmi_processor_family(const struct dmi_header *h, u16 ver)
+ 
+ 		{ 0x100, "ARMv7" },
+ 		{ 0x101, "ARMv8" },
+		{ 0x102, "ARMv9" },
+ 		{ 0x104, "SH-3" },
+ 		{ 0x105, "SH-4" },
+ 		{ 0x118, "ARM" },
+@@ -1073,7 +1074,7 @@ static enum cpuid_type dmi_get_cpuid_type(const struct dmi_header *h)
+ 		else
+ 			return cpuid_80486;
+ 	}
+-	else if ((type >= 0x100 && type <= 0x101) /* ARM */
+	else if ((type >= 0x100 && type <= 0x102) /* ARM */
+ 	      || (type >= 0x118 && type <= 0x119)) /* ARM */
+ 	{
+ 		/*
+@@ -1415,10 +1416,19 @@ static const char *dmi_processor_upgrade(u8 code)
+ 		"Socket BGA1528",
+ 		"Socket LGA4189",
+ 		"Socket LGA1200",
+-		"Socket LGA4677" /* 0x3F */
+		"Socket LGA4677",
+		"Socket LGA1700",
+		"Socket BGA1744",
+		"Socket BGA1781",
+		"Socket BGA1211",
+		"Socket BGA2422",
+		"Socket LGA1211",
+		"Socket LGA2422",
+		"Socket LGA5773",
+		"Socket BGA5773" /* 0x48 */
+ 	};
+ 
+-	if (code >= 0x01 && code <= 0x3F)
+	if (code >= 0x01 && code <= 0x48)
+ 		return upgrade[code - 0x01];
+ 	return out_of_spec;
+ }
+@@ -4451,6 +4461,9 @@ static void dmi_decode(const struct dmi_header *h, u16 ver)
+ 				pr_attr("Thread Count", "%u",
+ 					h->length >= 0x30 && data[0x25] == 0xFF ?
+ 					WORD(data + 0x2E) : data[0x25]);
+			if (h->length >= 0x32 && WORD(data + 0x30) != 0)
+				pr_attr("Thread Enabled", "%u",
+					WORD(data + 0x30));
+ 			dmi_processor_characteristics("Characteristics",
+ 						      WORD(data + 0x26));
+ 			break;
+-- 
+2.43.0
+
--- a/SOURCES/0002-Consistently-use-read_file-when-reading-from-a-dump-.patch
+++ b/SOURCES/0002-Consistently-use-read_file-when-reading-from-a-dump-.patch
--- a/SPECS/dmidecode.spec
+++ b/SPECS/dmidecode.spec
@ -4,14 +4,14 @@ Version:        3.5
 Release:        1%{?dist}
 Epoch:          1
 License:        GPLv2+
-Source0:        http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.xz
-URL:            http://www.nongnu.org/dmidecode/
-
-Patch0:         0001-Consistently-use-read_file-when-reading-from-a-dump-.patch
-
+Source0:        https://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.xz
+URL:            https://www.nongnu.org/dmidecode/
 BuildRequires:  gcc make
 ExclusiveArch:  %{ix86} x86_64 ia64 aarch64

+Patch0:         0001-dmidecode-Add-processor-support-from-SMBIOS-3.6.0.patch
+Patch1:         0002-Consistently-use-read_file-when-reading-from-a-dump-.patch
+
 %description
 dmidecode reports information about x86 & ia64 hardware as described in the
 system BIOS according to the SMBIOS/DMI standard. This information
@ -24,17 +24,18 @@ slots (e.g. AGP, PCI, ISA) and memory module slots, and the list of
 I/O ports (e.g. serial, parallel, USB).

 %prep
-%autosetup
+%setup -q
+%patch0 -p1
+%patch1 -p1

 %build
-make %{?_smp_mflags} CFLAGS="%{optflags}" LDFLAGS="%{__global_ldflags}"
+%make_build CFLAGS="%{optflags}" LDFLAGS="%{__global_ldflags}"

 %install
-make %{?_smp_mflags} DESTDIR=%{buildroot} prefix=%{_prefix} install-bin install-man
+%make_install %{?_smp_mflags} prefix=%{_prefix} install-bin install-man

 %files
 %doc AUTHORS NEWS README
-%{!?_licensedir:%global license %%doc}
 %license LICENSE
 %{_sbindir}/dmidecode
 %ifnarch ia64 aarch64
@ -45,61 +46,64 @@ make %{?_smp_mflags} DESTDIR=%{buildroot} prefix=%{_prefix} install-bin install-
 %{_mandir}/man8/*

 %changelog
-* Wed Dec 20 2023 Lichen Liu <lichliu@redhat.com> - 1:3.5-1
- Rebase to upstream 3.5
+* Fri May 05 2023 Lichen Liuu <lichliu@redhat.com> - 1:3.5-1
+- updated to upstream v3.5
+- Resolves: rhbz#2186858

-* Thu Jun 08 2023 Lichen Liu <lichliu@redhat.com> - 1:3.3-5
- Resolves: rhbz#2186860
+* Wed Jan 05 2022 Coiby Xu <coxu@redhat.com> - 1:3.3-7
+- Resolves: rhbz#2029784

-* Wed Jan 26 2022 Coiby Xu <coxu@redhat.com> - 1:3.3-4
- Resolves: rhbz#2042224
+* Mon Dec 06 2021 Coiby Xu <coxu@redhat.com> - 1:3.3-6
+- Resolves: rhbz#2024078

-* Wed Jan 05 2022 Coiby Xu <coxu@redhat.com> - 1:3.3-3
- Resolves: rhbz#2027665
+* Thu Nov 04 2021 Coiby Xu <coxu@redhat.com> - 1:3.3-4
+- Resolves: rhbz#1996988

-* Tue Nov 10 2021 Coiby Xu <coxu@redhat.com> - 1:3.3-2
- Resolves: rhbz#1996651
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1:3.3-2
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688

-* Tue Nov  9 2021 Coiby Xu <coxu@redhat.com> - 1:3.3-1
- Rebase to upsteam 3.3
- Resolves: rhbz#1998772
+* Wed May 19 2021 Coiby Xu <coxu@redhat.com> - 1:3.3-1
+- updated to upstream v3.3
+- Supported SMBIOS spec up to v3.3.0

-* Fri Apr  9 2021 Coiby Xu <coxu@redhat.com> - 1:3.2-10
- Fix crash with -u option
- Resolves: rhbz#1885823
+* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1:3.2-10
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937

-* Thu Dec 10 2020 Lianbo Jiang <lijiang@redhat.com> - 1:3.2-8
- CI found an error in the commit <c54348130a2a>, need to fix it.
- Resolves: rhbz#1858350
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.2-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

-* Tue Dec 08 2020 Lianbo Jiang <lijiang@redhat.com> - 1:3.2-7
- Fix the "OUT OF SPEC" error for empty NVMe and DIMM slots
- Resolves: rhbz#1858350
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.2-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

-* Wed May 20 2020 Lianbo Jiang <lijiang@redhat.com> - 1:3.2-6
- Updated to the latest upstream(5b3c8e995026 ("Allow overriding
-  build settings from the environment"))
- Resolves: rhbz#1796581
+* Mon Jul 13 2020 Tom Stellard <tstellar@redhat.com> - 1:3.2-7
+- Use make macros
+- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro

-* Sun Oct 27 2019 Lianbo Jiang <lijiang@redhat.com> - 1:3.2-5
- Fix the "OUT OF SPEC" for type 9
- Resolves: rhbz#1763678
+* Mon Feb 03 2020 Tom Stellard <tstellar@redhat.com> - 1:3.2-6
+- Use make_build macro instead of plain make

-* Mon Oct 21 2019 Lianbo Jiang <lijiang@redhat.com> - 1:3.2-4
- Updated to the latest upstream(a808e6ef4ebc ("Typo"))
- Resolves: rhbz#1725435
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

-* Mon Apr 22 2019 Lianbo Jiang <lijiang@redhat.com> - 1:3.2-3
- Add "Logical non-volatile device" to the memory device types
- Resolves: rhbz#1664573
+* Mon Nov 18 2019 Anton Arapov <aarapov@redhat.com> - 1:3.2-4
+- v3.2 patched up to upstream commit 62bce59f

-* Mon Apr 15 2019 Lianbo Jiang <lijiang@redhat.com> - 1:3.2-2
- add CI gating test.
- Resolves: rhbz#1680617
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

-* Wed Sep 19 2018 Lianbo Jiang <lijiang@redhat.com> - 1:3.2-1
- update to upstream dmidecode-3.2
- Resolves: rhbz#1628211
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Tue Sep 18 2018 Anton Arapov <aarapov@redhat.com> - 1:3.2-1
+- updated to upstream v3.2
+- Supported SMBIOS spec up to v3.2.0
+
+* Thu Aug 02 2018 Anton Arapov <aarapov@redhat.com> - 1:3.1-7
+- patched up to upstream commit bd78a5dfd4
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
@ -288,4 +292,3 @@ make %{?_smp_mflags} DESTDIR=%{buildroot} prefix=%{_prefix} install-bin install-

 * Sat Dec 18 2004 Dave Jones <davej@redhat.com>
 - Initial packaging, based upon kernel-utils package.
-