pool/dmidecode
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Update to upstream version 2.12:

Browse Source 
* Adds support for SMBIOS 2.8. This includes new enumerated
    values for recent hardware.
  * Obsoletes dmidecode-add-SMBIOS-2_7_1-support.patch and
    dmidecode-fix-memory-array-location-overrun.patch.
  * Various minor fixes and clean-ups.
- dmidecode-1.173-drop-cast.patch: Drop unneeded and possibly
  dangerous cast.
- dmidecode-1.175-fix-SMBIOS-2.8.0.patch: Fix support for new
  processor upgrade types (DMI type 4) and new memory device type
  (DMI type 17.)

OBS-URL: https://build.opensuse.org/package/show/Base:System/dmidecode?expand=0&rev=19
This commit is contained in:
Jean Delvare 2013-04-24 20:15:20 +00:00 committed by Git OBS Bridge
parent 84cb98fee1
commit 31748488d0
8 changed files with 84 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dmidecode-1.173-drop-cast.patch Normal file
View File

@ -0,0 +1,18 @@
Subject: Drop unneeded and possibly dangerous cast
Upstream: yes, 1.173
---
dmidecode.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- dmidecode-2.12.orig/dmidecode.c
+++ dmidecode-2.12/dmidecode.c
@@ -2236,7 +2236,7 @@ static void dmi_memory_voltage_value(u16
if (code == 0)
printf(" Unknown");
else
- printf(" %.3f V", (float)(i16)code / 1000);
+ printf(" %.3f V", (float)code / 1000);
}
static const char *dmi_memory_device_form_factor(u8 code)

45
dmidecode-1.175-fix-SMBIOS-2.8.0.patch Normal file
View File

@ -0,0 +1,45 @@
Subject: Fix SMBIOS 2.8.0 support
Upstream: yes, 1.175
Fix support for new processor upgrade types (DMI type 4) and new memory
device type (DMI type 17.)
---
dmidecode.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
--- a/dmidecode.c
+++ b/dmidecode.c
@@ -712,7 +712,6 @@ static const char *dmi_processor_family(
{ 0x3D, "Opteron 6200" },
{ 0x3E, "Opteron 4200" },
{ 0x3F, "FX" },
-
{ 0x40, "MIPS" },
{ 0x41, "MIPS R4000" },
{ 0x42, "MIPS R4200" },
@@ -729,7 +728,6 @@ static const char *dmi_processor_family(
{ 0x4D, "Opteron 6300" },
{ 0x4E, "Opteron 3300" },
{ 0x4F, "FirePro" },
-
{ 0x50, "SPARC" },
{ 0x51, "SuperSPARC" },
{ 0x52, "MicroSPARC II" },
@@ -1176,7 +1174,7 @@ static const char *dmi_processor_upgrade
"Socket LGA1356-3" /* 0x2C */
};
- if (code >= 0x01 && code <= 0x2A)
+ if (code >= 0x01 && code <= 0x2C)
return upgrade[code - 0x01];
return out_of_spec;
}
@@ -2338,7 +2336,7 @@ static void dmi_memory_device_type_detai
{
int i;
- for (i = 1; i <= 14; i++)
+ for (i = 1; i <= 15; i++)
if (code & (1 << i))
printf(" %s", detail[i - 1]);
}

3
dmidecode-2.11.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6da5643479b3b591b71a91122a25b89b77920b66e1ad0a5162d3c75b50423b51
size 54537

3
dmidecode-2.12.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:913ff3055d563a62a420789b8ee33b038de9afa18ea61254760ddf8ab87a5088
size 55191

99
dmidecode-add-SMBIOS-2_7_1-support.patch
View File

@ -1,99 +0,0 @@
Add support for SMBIOS 2.7.1:
* 6 new AMD processor families
* 1 new cache associativity value
* PCI Express 3 slot types
---
dmidecode.c | 38 +++++++++++++++++++++++++++++++-------
1 file changed, 31 insertions(+), 7 deletions(-)
--- dmidecode.orig/dmidecode.c 2011-01-25 17:10:05.000000000 +0100
+++ dmidecode/dmidecode.c 2011-04-13 16:10:39.000000000 +0200
@@ -707,6 +707,8 @@ static const char *dmi_processor_family(
{ 0x3A, "Athlon II Dual-Core M" },
{ 0x3B, "Opteron 6100" },
{ 0x3C, "Opteron 4100" },
+ { 0x3D, "Opteron 6200" },
+ { 0x3E, "Opteron 4200" },
{ 0x40, "MIPS" },
{ 0x41, "MIPS R4000" },
@@ -714,6 +716,10 @@ static const char *dmi_processor_family(
{ 0x43, "MIPS R4400" },
{ 0x44, "MIPS R4600" },
{ 0x45, "MIPS R10000" },
+ { 0x46, "C-Series" },
+ { 0x47, "E-Series" },
+ { 0x48, "S-Series" },
+ { 0x49, "G-Series" },
{ 0x50, "SPARC" },
{ 0x51, "SuperSPARC" },
@@ -997,7 +1003,8 @@ static void dmi_processor_id(u8 type, co
sig = 1;
else if ((type >= 0x18 && type <= 0x1D) /* AMD */
|| type == 0x1F /* AMD */
- || (type >= 0x38 && type <= 0x3C) /* AMD */
+ || (type >= 0x38 && type <= 0x3E) /* AMD */
+ || (type >= 0x46 && type <= 0x49) /* AMD */
|| (type >= 0x83 && type <= 0x8F) /* AMD */
|| (type >= 0xB6 && type <= 0xB7) /* AMD */
|| (type >= 0xE6 && type <= 0xEF)) /* AMD */
@@ -1143,10 +1150,20 @@ static const char *dmi_processor_upgrade
"Socket LGA1156",
"Socket LGA1567",
"Socket PGA988A",
- "Socket BGA1288" /* 0x20 */
+ "Socket BGA1288",
+ "Socket rPGA988B",
+ "Socket BGA1023",
+ "Socket BGA1024",
+ "Socket BGA1155",
+ "Socket LGA1356",
+ "Socket LGA2011",
+ "Socket FS1",
+ "Socket FS2",
+ "Socket FM1",
+ "Socket FM2" /* 0x2A */
};
- if (code >= 0x01 && code <= 0x20)
+ if (code >= 0x01 && code <= 0x2A)
return upgrade[code - 0x01];
return out_of_spec;
}
@@ -1493,10 +1510,11 @@ static const char *dmi_cache_associativi
"24-way Set-associative",
"32-way Set-associative",
"48-way Set-associative",
- "64-way Set-associative" /* 0x0D */
+ "64-way Set-associative",
+ "20-way Set-associative" /* 0x0E */
};
- if (code >= 0x01 && code <= 0x0D)
+ if (code >= 0x01 && code <= 0x0E)
return type[code - 0x01];
return out_of_spec;
}
@@ -1660,12 +1678,18 @@ static const char *dmi_slot_type(u8 code
"PCI Express 2 x2",
"PCI Express 2 x4",
"PCI Express 2 x8",
- "PCI Express 2 x16", /* 0xB0 */
+ "PCI Express 2 x16",
+ "PCI Express 3",
+ "PCI Express 3 x1",
+ "PCI Express 3 x2",
+ "PCI Express 3 x4",
+ "PCI Express 3 x8",
+ "PCI Express 3 x16" /* 0xB6 */
};
if (code >= 0x01 && code <= 0x13)
return type[code - 0x01];
- if (code >= 0xA0 && code <= 0xB0)
+ if (code >= 0xA0 && code <= 0xB6)
return type_0xA0[code - 0xA0];
return out_of_spec;
}

16
dmidecode-fix-memory-array-location-overrun.patch
View File

@ -1,16 +0,0 @@
Upstream: http://cvs.savannah.gnu.org/viewvc/dmidecode/dmidecode.c?root=dmidecode&r1=1.166&r2=1.167
Fix boundary checks of memory array location codes (DMI type 16).
Reported by Andrey Matveyev.
--- dmidecode/dmidecode.c 2010/11/24 20:48:19 1.166
+++ dmidecode/dmidecode.c 2011/01/25 16:19:42 1.167
@@ -2100,7 +2100,7 @@
if (code >= 0x01 && code <= 0x0A)
return location[code - 0x01];
- if (code >= 0xA0 && code <= 0xA4)
+ if (code >= 0xA0 && code <= 0xA3)
return location_0xA0[code - 0xA0];
return out_of_spec;
}

15
dmidecode.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Wed Apr 24 22:07:43 CEST 2013 - jdelvare@suse.de
- Update to upstream version 2.12:
* Adds support for SMBIOS 2.8. This includes new enumerated
values for recent hardware.
* Obsoletes dmidecode-add-SMBIOS-2_7_1-support.patch and
dmidecode-fix-memory-array-location-overrun.patch.
* Various minor fixes and clean-ups.
- dmidecode-1.173-drop-cast.patch: Drop unneeded and possibly
dangerous cast.
- dmidecode-1.175-fix-SMBIOS-2.8.0.patch: Fix support for new
processor upgrade types (DMI type 4) and new memory device type
(DMI type 17.)
-------------------------------------------------------------------
Mon Mar 25 15:09:35 UTC 2013 - mmeister@suse.com

6
dmidecode.spec
View File

@ -18,15 +18,15 @@
Name: dmidecode
Url: http://www.nongnu.org/dmidecode/
Version: 2.11
Version: 2.12
Release: 0
Provides: pmtools:/usr/sbin/dmidecode
Summary: DMI table decoder
License: GPL-2.0+
Group: System/Console
Source: http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.bz2
Patch1: dmidecode-fix-memory-array-location-overrun.patch
Patch2: dmidecode-add-SMBIOS-2_7_1-support.patch
Patch1: dmidecode-1.173-drop-cast.patch
Patch2: dmidecode-1.175-fix-SMBIOS-2.8.0.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 ia64 x86_64
Obsoletes: pmtools < 20071117