diff -Nru dmidecode-2.11/debian/changelog dmidecode-2.11/debian/changelog --- dmidecode-2.11/debian/changelog 2011-09-28 11:07:25.000000000 +0000 +++ dmidecode-2.11/debian/changelog 2011-10-28 19:54:44.000000000 +0000 @@ -1,3 +1,14 @@ +dmidecode (2.11-4) unstable; urgency=low + + * Using compression level 9 also for binary packages. + * Adding patch from Jean Delvare to fix boundary + checks of memory array location codes (DMI type 16). + * Adding patch from Jean Delvare to update to + support SMBIOS specification version 2.7.1. + * Sorting overrides in rules alphabetically. + + -- Daniel Baumann Fri, 28 Oct 2011 21:54:37 +0200 + dmidecode (2.11-3) unstable; urgency=low * Adding patch from Svante Signell to diff -Nru dmidecode-2.11/debian/patches/04-type16-fix.patch dmidecode-2.11/debian/patches/04-type16-fix.patch --- dmidecode-2.11/debian/patches/04-type16-fix.patch 1970-01-01 00:00:00.000000000 +0000 +++ dmidecode-2.11/debian/patches/04-type16-fix.patch 2011-10-28 19:54:05.000000000 +0000 @@ -0,0 +1,28 @@ +Author: Jean Delvare +Description: + Fix boundary checks of memory array location codes (DMI type 16). + +diff -Naurp dmidecode.orig/CHANGELOG dmidecode/CHANGELOG +--- dmidecode.orig/CHANGELOG 2011-10-08 13:38:56.391894224 +0200 ++++ dmidecode/CHANGELOG 2011-10-28 21:48:03.482573716 +0200 +@@ -1,3 +1,8 @@ ++2011-01-25 Jean Delvare ++ ++ * dmidecode.c: Fix boundary checks of memory array location codes ++ (DMI type 16). Reported by Andrey Matveyev. ++ + 2010-11-24 Jean Delvare + + * dmidecode.c: Assume that the max power capacity is expressed in +diff -Naurp dmidecode.orig/dmidecode.c dmidecode/dmidecode.c +--- dmidecode.orig/dmidecode.c 2011-10-08 13:38:56.395894240 +0200 ++++ dmidecode/dmidecode.c 2011-10-28 21:48:03.486574269 +0200 +@@ -2100,7 +2100,7 @@ static const char *dmi_memory_array_loca + + 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; + } diff -Nru dmidecode-2.11/debian/patches/05-smbios-271.patch dmidecode-2.11/debian/patches/05-smbios-271.patch --- dmidecode-2.11/debian/patches/05-smbios-271.patch 1970-01-01 00:00:00.000000000 +0000 +++ dmidecode-2.11/debian/patches/05-smbios-271.patch 2011-10-28 19:54:06.000000000 +0000 @@ -0,0 +1,110 @@ +Author: Jean Delvare +Description: Update to support SMBIOS specification version 2.7.1. + +diff -Naurp dmidecode.orig/CHANGELOG dmidecode/CHANGELOG +--- dmidecode.orig/CHANGELOG 2011-10-28 21:48:03.482573716 +0200 ++++ dmidecode/CHANGELOG 2011-10-28 21:48:45.870796976 +0200 +@@ -1,3 +1,12 @@ ++2011-04-20 Jean Delvare ++ ++ 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 + + * dmidecode.c: Fix boundary checks of memory array location codes +diff -Naurp dmidecode.orig/dmidecode.c dmidecode/dmidecode.c +--- dmidecode.orig/dmidecode.c 2011-10-28 21:48:03.486574269 +0200 ++++ dmidecode/dmidecode.c 2011-10-28 21:48:45.874797137 +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; + } diff -Nru dmidecode-2.11/debian/patches/series dmidecode-2.11/debian/patches/series --- dmidecode-2.11/debian/patches/series 2011-09-28 11:02:38.000000000 +0000 +++ dmidecode-2.11/debian/patches/series 2011-10-28 19:54:04.000000000 +0000 @@ -1,3 +1,5 @@ 01-ansi-c.patch 02-chassis-type.patch 03-hurd.patch +04-type16-fix.patch +05-smbios-271.patch diff -Nru dmidecode-2.11/debian/rules dmidecode-2.11/debian/rules --- dmidecode-2.11/debian/rules 2011-09-28 11:02:24.000000000 +0000 +++ dmidecode-2.11/debian/rules 2011-10-28 19:53:58.000000000 +0000 @@ -23,5 +23,8 @@ rm -f debian/tmp/usr/share/doc/dmidecode/CHANGELOG rm -f debian/tmp/usr/share/doc/dmidecode/README +override_dh_builddeb: + dh_builddeb -- -Zgzip -z9 + override_dh_install: dh_install --fail-missing