Hello community, here is the log from the commit of package dmidecode for openSUSE:Factory checked in at 2013-04-26 07:13:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dmidecode (Old) and /work/SRC/openSUSE:Factory/.dmidecode.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dmidecode", Maintainer is "jdelv...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/dmidecode/dmidecode.changes 2013-03-26 06:59:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dmidecode.new/dmidecode.changes 2013-04-26 07:13:41.000000000 +0200 @@ -1,0 +2,15 @@ +Wed Apr 24 22:07:43 CEST 2013 - jdelv...@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.) + +------------------------------------------------------------------- Old: ---- dmidecode-2.11.tar.bz2 dmidecode-add-SMBIOS-2_7_1-support.patch dmidecode-fix-memory-array-location-overrun.patch New: ---- dmidecode-1.173-drop-cast.patch dmidecode-1.175-fix-SMBIOS-2.8.0.patch dmidecode-2.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dmidecode.spec ++++++ --- /var/tmp/diff_new_pack.TNtslc/_old 2013-04-26 07:13:46.000000000 +0200 +++ /var/tmp/diff_new_pack.TNtslc/_new 2013-04-26 07:13:46.000000000 +0200 @@ -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 ++++++ dmidecode-1.173-drop-cast.patch ++++++ 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) ++++++ dmidecode-1.175-fix-SMBIOS-2.8.0.patch ++++++ 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]); } ++++++ dmidecode-2.11.tar.bz2 -> dmidecode-2.12.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dmidecode-2.11/AUTHORS new/dmidecode-2.12/AUTHORS --- old/dmidecode-2.11/AUTHORS 2010-11-24 10:29:09.000000000 +0100 +++ new/dmidecode-2.12/AUTHORS 2012-03-12 08:49:07.000000000 +0100 @@ -81,3 +81,6 @@ Harald Mueller-Ney Lars Mueller Thomas Mingarelli +Andrey Matveyev +Stefan Tauner +Naga Chumbalkar diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dmidecode-2.11/CHANGELOG new/dmidecode-2.12/CHANGELOG --- old/dmidecode-2.11/CHANGELOG 2010-11-24 21:49:06.000000000 +0100 +++ new/dmidecode-2.12/CHANGELOG 2013-04-17 14:25:34.000000000 +0200 @@ -1,3 +1,51 @@ +2013-04-17 Anton Arapov <an...@redhat.com> + + Update to support SMBIOS specification version 2.8.0. + + * dmidecode.c: Correct processor family name (DMI type 4). + * dmidecode.c: Correct typo in processor upgrade type (DMI type 4). + * dmidecode.c: Add 9 new processor families (DMI type 4). + * dmidecode.c: Add 2 new Intel socket types (DMI type 4). + * dmidecode.c: Add Min/Max/Configured memory voltages (DMI type 17). + * dmidecode.c: Add LRDIMM to memory device list (DMI type 17). + +2012-03-26 Anton Arapov <an...@redhat.com> + + * man/dmidecode.8: Add missing DMI type introduced with SMBIOS 2.7+, and + include the information about the extra output when dmidecode is run + on a hardware that has non-supported SMBIOS version. + +2012-03-12 Anton Arapov <an...@redhat.com> + + * dmioem.c: Add "PXE" to the HP OEM Type 209 output so it is similar to + the "iSCSI" description in HP OEM Type 221. Patch from Naga Chumbalkar. + +2011-11-18 Jean Delvare <kh...@linux-fr.org> + + * dmidecode.c: Properly print the hexadecimal value of invalid + string characters. + +2011-11-14 Anton Arapov <an...@redhat.com> + + * dmidecode.c: Make dmi_chassis_type aware of the lock bit. + Patch from Stefan Tauner. + * config.h: Haiku dropped the _BEOS_ definition in favor of its own + platform identification _HAIKU_. Patch from Francois Revol. + +2011-04-20 Jean Delvare <kh...@linux-fr.org> + + Update to support SMBIOS specification version 2.7.1. + + * dmidecode.c: Add 6 AMD processor families (DMI type 4). + * dmidecode.c: Add cache associativity value + "20-way Set-associative" (DMI type 7). + * dmidecode.c: Add PCI Express 3 slot types (DMI type 9). + +2011-01-25 Jean Delvare <kh...@linux-fr.org> + + * dmidecode.c: Fix boundary checks of memory array location codes + (DMI type 16). Reported by Andrey Matveyev. + 2010-11-24 Jean Delvare <kh...@linux-fr.org> * dmidecode.c: Assume that the max power capacity is expressed in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dmidecode-2.11/config.h new/dmidecode-2.12/config.h --- old/dmidecode-2.11/config.h 2007-07-02 16:56:45.000000000 +0200 +++ new/dmidecode-2.12/config.h 2011-11-14 11:36:22.000000000 +0100 @@ -6,7 +6,7 @@ #define CONFIG_H /* Default memory device file */ -#ifdef __BEOS__ +#if defined(__BEOS__) || defined(__HAIKU__) #define DEFAULT_MEM_DEV "/dev/misc/mem" #else #ifdef __sun diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dmidecode-2.11/dmidecode.c new/dmidecode-2.12/dmidecode.c --- old/dmidecode-2.11/dmidecode.c 2010-11-24 21:48:19.000000000 +0100 +++ new/dmidecode-2.12/dmidecode.c 2013-04-17 14:25:34.000000000 +0200 @@ -25,7 +25,7 @@ * are deemed to be part of the source code. * * Unless specified otherwise, all references are aimed at the "System - * Management BIOS Reference Specification, Version 2.7.0" document, + * Management BIOS Reference Specification, Version 2.8.0" document, * available from http://www.dmtf.org/standards/smbios. * * Note to contributors: @@ -197,7 +197,7 @@ printf("%s\t", prefix); for (j = 0; j < 16 && j < l - (row << 4); j++) printf("%s%02X", j ? " " : "", - s[(row << 4) + j]); + (unsigned char)s[(row << 4) + j]); printf("\n"); } /* String isn't filtered yet so do it now */ @@ -532,6 +532,8 @@ "Blade Enclosing" /* 0x1D */ }; + code &= 0x7F; /* bits 6:0 are chassis type, 7th bit is the lock bit */ + if (code >= 0x01 && code <= 0x1D) return type[code - 0x01]; return out_of_spec; @@ -707,6 +709,9 @@ { 0x3A, "Athlon II Dual-Core M" }, { 0x3B, "Opteron 6100" }, { 0x3C, "Opteron 4100" }, + { 0x3D, "Opteron 6200" }, + { 0x3E, "Opteron 4200" }, + { 0x3F, "FX" }, { 0x40, "MIPS" }, { 0x41, "MIPS R4000" }, @@ -714,6 +719,16 @@ { 0x43, "MIPS R4400" }, { 0x44, "MIPS R4600" }, { 0x45, "MIPS R10000" }, + { 0x46, "C-Series" }, + { 0x47, "E-Series" }, + { 0x48, "A-Series" }, + { 0x49, "G-Series" }, + { 0x4A, "Z-Series" }, + { 0x4B, "R-Series" }, + { 0x4C, "Opteron 4300" }, + { 0x4D, "Opteron 6300" }, + { 0x4E, "Opteron 3300" }, + { 0x4F, "FirePro" }, { 0x50, "SPARC" }, { 0x51, "SuperSPARC" }, @@ -826,6 +841,8 @@ { 0xDF, "Multi-Core Xeon 7xxx" }, { 0xE0, "Multi-Core Xeon 3400" }, + { 0xE4, "Opteron 3000" }, + { 0xE5, "Sempron II" }, { 0xE6, "Embedded Opteron Quad-Core" }, { 0xE7, "Phenom Triple-Core" }, { 0xE8, "Turion Ultra Dual-Core Mobile" }, @@ -997,7 +1014,8 @@ 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 +1161,22 @@ "Socket LGA1156", "Socket LGA1567", "Socket PGA988A", - "Socket BGA1288" /* 0x20 */ + "Socket BGA1288", + "Socket rPGA988B", + "Socket BGA1023", + "Socket BGA1224", + "Socket BGA1155", + "Socket LGA1356", + "Socket LGA2011", + "Socket FS1", + "Socket FS2", + "Socket FM1", + "Socket FM2", + "Socket LGA2011-3", + "Socket LGA1356-3" /* 0x2C */ }; - if (code >= 0x01 && code <= 0x20) + if (code >= 0x01 && code <= 0x2A) return upgrade[code - 0x01]; return out_of_spec; } @@ -1493,10 +1523,11 @@ "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 +1691,18 @@ "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; } @@ -2100,7 +2137,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; } @@ -2194,6 +2231,14 @@ printf(" %lu TB", (unsigned long)code >> 20); } +static void dmi_memory_voltage_value(u16 code) +{ + if (code == 0) + printf(" Unknown"); + else + printf(" %.3f V", (float)(i16)code / 1000); +} + static const char *dmi_memory_device_form_factor(u8 code) { /* 7.18.1 */ @@ -2283,7 +2328,8 @@ "Cache DRAM", "Non-Volatile", "Registered (Buffered)", - "Unbuffered (Unregistered)" /* 14 */ + "Unbuffered (Unregistered)", + "LRDIMM" /* 15 */ }; if ((code & 0x7FFE) == 0) @@ -3213,7 +3259,7 @@ printf("\tManufacturer: %s\n", dmi_string(h, data[0x04])); printf("\tType: %s\n", - dmi_chassis_type(data[0x05] & 0x7F)); + dmi_chassis_type(data[0x05])); printf("\tLock: %s\n", dmi_chassis_lock(data[0x05] >> 7)); printf("\tVersion: %s\n", @@ -3610,6 +3656,16 @@ printf("\tConfigured Clock Speed:"); dmi_memory_device_speed(WORD(data + 0x20)); printf("\n"); + if (h->length < 0x28) break; + printf("\tMinimum voltage: "); + dmi_memory_voltage_value(WORD(data + 0x22)); + printf("\n"); + printf("\tMaximum voltage: "); + dmi_memory_voltage_value(WORD(data + 0x24)); + printf("\n"); + printf("\tConfigured voltage: "); + dmi_memory_voltage_value(WORD(data + 0x26)); + printf("\n"); break; case 18: /* 7.19 32-bit Memory Error Information */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dmidecode-2.11/dmioem.c new/dmidecode-2.12/dmioem.c --- old/dmidecode-2.11/dmioem.c 2009-07-27 14:07:39.000000000 +0200 +++ new/dmidecode-2.12/dmioem.c 2012-03-12 08:49:07.000000000 +0100 @@ -83,7 +83,7 @@ */ printf(h->type == 221 ? "HP BIOS iSCSI NIC PCI and MAC Information\n" : - "HP BIOS NIC PCI and MAC Information\n"); + "HP BIOS PXE NIC PCI and MAC Information\n"); nic = 1; ptr = 4; while (h->length >= ptr + 8) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dmidecode-2.11/man/dmidecode.8 new/dmidecode-2.12/man/dmidecode.8 --- old/dmidecode-2.11/man/dmidecode.8 2008-11-07 11:14:08.000000000 +0100 +++ new/dmidecode-2.12/man/dmidecode.8 2012-03-26 12:43:11.000000000 +0200 @@ -1,4 +1,4 @@ -.TH DMIDECODE 8 "November 2008" "dmidecode" +.TH DMIDECODE 8 "March 2012" "dmidecode" .SH NAME dmidecode \- \s-1DMI\s0 table decoder .SH SYNOPSIS @@ -127,6 +127,13 @@ .P Options --string, --type and --dump-bin determine the output format and are mutually exclusive. +.P +Please note in case of +.B dmidecode +is run on a system with BIOS that boasts new SMBIOS specification, which +is not supported by the tool yet, it will print out relevant message in +addition to requested data on the very top of the output. Thus informs the +output data is not reliable. .SH "DMI TYPES" The \s-1SMBIOS\s0 specification defines the following \s-1DMI\s0 types: @@ -138,7 +145,7 @@ Type Information 0 BIOS 1 System -2 Base Board +2 Baseboard 3 Chassis 4 Processor 5 Memory Controller @@ -177,7 +184,8 @@ 38 IPMI Device 39 Power Supply 40 Additional Information -41 Onboard Device +41 Onboard Devices Extended Information +42 Management Controller Host Interface .TE Additionally, type 126 is used for disabled entries and type 127 is an diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dmidecode-2.11/version.h new/dmidecode-2.12/version.h --- old/dmidecode-2.11/version.h 2011-01-19 15:58:24.000000000 +0100 +++ new/dmidecode-2.12/version.h 2013-04-17 14:25:34.000000000 +0200 @@ -1 +1 @@ -#define VERSION "2.11" +#define VERSION "2.12" -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
