Gentoo Archives: gentoo-commits

From: "Tony Vroon (chainsaw)" <chainsaw@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/dmidecode/files: 2.12-supported-smbios-version.patch
Date: Tue, 06 May 2014 13:30:01
Message-Id: 20140506132958.1ECEF2004E@flycatcher.gentoo.org
1 chainsaw 14/05/06 13:29:58
2
3 Added: 2.12-supported-smbios-version.patch
4 Log:
5 Upstream left an outdated SMBIOS version check in place but have neglected to roll a new release so far. Backported fixes by J. Rosenboom close bug #504810.
6
7 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xB5058F9A)
8
9 Revision Changes Path
10 1.1 sys-apps/dmidecode/files/2.12-supported-smbios-version.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dmidecode/files/2.12-supported-smbios-version.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dmidecode/files/2.12-supported-smbios-version.patch?rev=1.1&content-type=text/plain
14
15 Index: 2.12-supported-smbios-version.patch
16 ===================================================================
17 diff -uNr dmidecode-2.12.ORIG/dmidecode.c dmidecode-2.12/dmidecode.c
18 --- dmidecode-2.12.ORIG/dmidecode.c 2014-05-06 14:24:27.703057950 +0100
19 +++ dmidecode-2.12/dmidecode.c 2014-05-06 14:24:43.136058719 +0100
20 @@ -69,7 +69,7 @@
21 #define out_of_spec "<OUT OF SPEC>"
22 static const char *bad_index = "<BAD INDEX>";
23
24 -#define SUPPORTED_SMBIOS_VER 0x0207
25 +#define SUPPORTED_SMBIOS_VER 0x0208
26
27 /*
28 * Type-independant Stuff
29 @@ -712,7 +712,6 @@
30 { 0x3D, "Opteron 6200" },
31 { 0x3E, "Opteron 4200" },
32 { 0x3F, "FX" },
33 -
34 { 0x40, "MIPS" },
35 { 0x41, "MIPS R4000" },
36 { 0x42, "MIPS R4200" },
37 @@ -729,7 +728,6 @@
38 { 0x4D, "Opteron 6300" },
39 { 0x4E, "Opteron 3300" },
40 { 0x4F, "FirePro" },
41 -
42 { 0x50, "SPARC" },
43 { 0x51, "SuperSPARC" },
44 { 0x52, "MicroSPARC II" },
45 @@ -1176,7 +1174,7 @@
46 "Socket LGA1356-3" /* 0x2C */
47 };
48
49 - if (code >= 0x01 && code <= 0x2A)
50 + if (code >= 0x01 && code <= 0x2C)
51 return upgrade[code - 0x01];
52 return out_of_spec;
53 }
54 @@ -2236,7 +2234,7 @@
55 if (code == 0)
56 printf(" Unknown");
57 else
58 - printf(" %.3f V", (float)(i16)code / 1000);
59 + printf(" %.3f V", (float)code / 1000);
60 }
61
62 static const char *dmi_memory_device_form_factor(u8 code)
63 @@ -2338,7 +2336,7 @@
64 {
65 int i;
66
67 - for (i = 1; i <= 14; i++)
68 + for (i = 1; i <= 15; i++)
69 if (code & (1 << i))
70 printf(" %s", detail[i - 1]);
71 }