diff --git a/SOURCES/0001-dmidecode-Hide-irrelevant-fixup-message.patch b/SOURCES/0001-dmidecode-Hide-irrelevant-fixup-message.patch index 993773e..7ae827d 100644 --- a/SOURCES/0001-dmidecode-Hide-irrelevant-fixup-message.patch +++ b/SOURCES/0001-dmidecode-Hide-irrelevant-fixup-message.patch @@ -1,7 +1,7 @@ From cff11afa886a0147d734b650755d232b5e7f2099 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Tue, 3 May 2016 15:32:21 +0200 -Subject: [PATCH 1/1] dmidecode: Hide irrelevant fixup message +Subject: [PATCH 1/9] dmidecode: Hide irrelevant fixup message Only display the message about type 34 length fixup if the entry in question is going to be displayed. Otherwise it's only confusing. @@ -48,4 +48,5 @@ index 0c26685..84c18e1 100644 /* look for the next handle */ next = data + h.length; -- -2.7.3 +2.10.2 + diff --git a/SOURCES/0001-dmidecode-Unmask-LRDIMM-in-memmory-type-detail.patch b/SOURCES/0001-dmidecode-Unmask-LRDIMM-in-memmory-type-detail.patch deleted file mode 100644 index a7a1681..0000000 --- a/SOURCES/0001-dmidecode-Unmask-LRDIMM-in-memmory-type-detail.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0915927d93ae5be2a90a13faa157e5b900825212 Mon Sep 17 00:00:00 2001 -From: Petr Oros -Date: Wed, 29 Jun 2016 11:28:20 +0200 -Subject: [PATCH] dmidecode: Unmask LRDIMM in memmory type detail - - For memmory with bit 15 only set show dmidecode None in type detail. - -Signed-off-by: Petr Oros ---- - dmidecode.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dmidecode.c b/dmidecode.c -index 84c18e1..48d9e66 100644 ---- a/dmidecode.c -+++ b/dmidecode.c -@@ -2392,7 +2392,7 @@ static void dmi_memory_device_type_detail(u16 code) - "LRDIMM" /* 15 */ - }; - -- if ((code & 0x7FFE) == 0) -+ if ((code & 0xFFFE) == 0) - printf(" None"); - else - { --- -2.7.3 - diff --git a/SOURCES/0002-dmidecode-Unmask-LRDIMM-in-memory-type-detail.patch b/SOURCES/0002-dmidecode-Unmask-LRDIMM-in-memory-type-detail.patch new file mode 100644 index 0000000..3034852 --- /dev/null +++ b/SOURCES/0002-dmidecode-Unmask-LRDIMM-in-memory-type-detail.patch @@ -0,0 +1,56 @@ +From 23aa50565a65c98fc452ed8ffdffb49b6504941d Mon Sep 17 00:00:00 2001 +From: Petr Oros +Date: Thu, 30 Jun 2016 11:50:30 +0200 +Subject: [PATCH 2/9] dmidecode: Unmask LRDIMM in memory type detail + +For memory with bit 15 only set, dmidecode would show "None" in type +detail. + +Fixes: 0740adaea98a ("Bump release verison to 2.12") +Signed-off-by: Petr Oros +Signed-off-by: Jean Delvare +--- + AUTHORS | 1 + + CHANGELOG | 4 ++++ + dmidecode.c | 2 +- + 3 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/AUTHORS b/AUTHORS +index ccf7fbb..748b985 100644 +--- a/AUTHORS ++++ b/AUTHORS +@@ -20,6 +20,7 @@ Anton Arapov + Roy Franz + Tyler Bell + Xie XiuQi ++Petr Oros + + MANY THANKS TO (IN CHRONOLOGICAL ORDER) + Werner Heuser +diff --git a/CHANGELOG b/CHANGELOG +index ba61cab..ebae4b3 100644 +--- a/CHANGELOG ++++ b/CHANGELOG +@@ -1,3 +1,7 @@ ++2016-06-30 Petr Oros ++ ++ * dmidecode.c: Unmask LRDIMM in memory type detail (DMI type 17). ++ + 2015-11-02 Jean Delvare + + * dmidecode.c, util.c, util.h: Let read_file return the actual data +diff --git a/dmidecode.c b/dmidecode.c +index 84c18e1..48d9e66 100644 +--- a/dmidecode.c ++++ b/dmidecode.c +@@ -2392,7 +2392,7 @@ static void dmi_memory_device_type_detail(u16 code) + "LRDIMM" /* 15 */ + }; + +- if ((code & 0x7FFE) == 0) ++ if ((code & 0xFFFE) == 0) + printf(" None"); + else + { +-- +2.10.2 diff --git a/SOURCES/0003-dmidecode-Clarify-error-message-on-table-read-failur.patch b/SOURCES/0003-dmidecode-Clarify-error-message-on-table-read-failur.patch new file mode 100644 index 0000000..fc43e20 --- /dev/null +++ b/SOURCES/0003-dmidecode-Clarify-error-message-on-table-read-failur.patch @@ -0,0 +1,37 @@ +From dcbff064744f8b7c0d53d6932d25708b4bb13b4f Mon Sep 17 00:00:00 2001 +From: Jean Delvare +Date: Fri, 22 Jul 2016 10:26:41 +0200 +Subject: [PATCH 3/9] dmidecode: Clarify error message on table read failure + +Stop using the term "unreachable" when the DMI table can't be read. It +originates from the /dev/mem access method, but no longer makes sense +when reading from sysfs or from a binary dump file. + +Also don't suggest building with -DUSE_MMAP if reading from sysfs, as +it wouldn't help anyway. +--- + dmidecode.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/dmidecode.c b/dmidecode.c +index 48d9e66..ffd916c 100644 +--- a/dmidecode.c ++++ b/dmidecode.c +@@ -4550,11 +4550,12 @@ static void dmi_table(off_t base, u32 len, u16 num, u16 ver, const char *devmem, + + if (buf == NULL) + { +- fprintf(stderr, "Table is unreachable, sorry." ++ fprintf(stderr, "Failed to read table, sorry.\n"); + #ifndef USE_MMAP +- " Try compiling dmidecode with -DUSE_MMAP." ++ if (!(flags & FLAG_NO_FILE_OFFSET)) ++ fprintf(stderr, ++ "Try compiling dmidecode with -DUSE_MMAP.\n"); + #endif +- "\n"); + return; + } + +-- +2.10.2 diff --git a/SOURCES/0004-dmidecode-Move-error-messages-to-stderr.patch b/SOURCES/0004-dmidecode-Move-error-messages-to-stderr.patch new file mode 100644 index 0000000..17e9713 --- /dev/null +++ b/SOURCES/0004-dmidecode-Move-error-messages-to-stderr.patch @@ -0,0 +1,111 @@ +From 74614633b31a2ac01240c72890722a86a3f3fc97 Mon Sep 17 00:00:00 2001 +From: Jean Delvare +Date: Fri, 22 Jul 2016 10:26:50 +0200 +Subject: [PATCH 4/9] dmidecode: Move error messages to stderr + +Consistently write error messages to stderr, to avoid messing up the +output of "dmidecode -s". Based on preliminary patches by +Kevin Bowling and Simon Rettberg. + +Fixes bug #47274: +https://savannah.nongnu.org/bugs/?47274 +Fixes bug #48158: +https://savannah.nongnu.org/bugs/?48158 +Supersedes patch #8989: +https://savannah.nongnu.org/patch/?8989 +--- + dmidecode.c | 37 ++++++++++++++++++++++++++----------- + 1 file changed, 26 insertions(+), 11 deletions(-) + +diff --git a/dmidecode.c b/dmidecode.c +index ffd916c..f56d0c5 100644 +--- a/dmidecode.c ++++ b/dmidecode.c +@@ -2958,7 +2958,8 @@ static void dmi_fixup_type_34(struct dmi_header *h, int display) + && is_printable(p + 0x0B, 0x10 - 0x0B)) + { + if (!(opt.flags & FLAG_QUIET) && display) +- printf("Invalid entry length (%u). Fixed up to %u.\n", ++ fprintf(stderr, ++ "Invalid entry length (%u). Fixed up to %u.\n", + 0x10, 0x0B); + h->length = 0x0B; + } +@@ -4427,9 +4428,14 @@ static void dmi_table_decode(u8 *buf, u32 len, u16 num, u16 ver, u32 flags) + */ + if (h.length < 4) + { +- printf("Invalid entry length (%u). DMI table is " +- "broken! Stop.\n\n", (unsigned int)h.length); +- opt.flags |= FLAG_QUIET; ++ if (!(opt.flags & FLAG_QUIET)) ++ { ++ fprintf(stderr, ++ "Invalid entry length (%u). DMI table " ++ "is broken! Stop.\n\n", ++ (unsigned int)h.length); ++ opt.flags |= FLAG_QUIET; ++ } + break; + } + +@@ -4490,11 +4496,11 @@ static void dmi_table_decode(u8 *buf, u32 len, u16 num, u16 ver, u32 flags) + if (!(opt.flags & FLAG_QUIET)) + { + if (num && i != num) +- printf("Wrong DMI structures count: %d announced, " ++ fprintf(stderr, "Wrong DMI structures count: %d announced, " + "only %d decoded.\n", num, i); + if ((unsigned long)(data - buf) > len + || (num && (unsigned long)(data - buf) < len)) +- printf("Wrong DMI structures length: %u bytes " ++ fprintf(stderr, "Wrong DMI structures length: %u bytes " + "announced, structures occupy %lu bytes.\n", + len, (unsigned long)(data - buf)); + } +@@ -4539,7 +4545,7 @@ static void dmi_table(off_t base, u32 len, u16 num, u16 ver, const char *devmem, + buf = read_file(&size, devmem); + if (!(opt.flags & FLAG_QUIET) && num && size != (size_t)len) + { +- printf("Wrong DMI structures length: %u bytes " ++ fprintf(stderr, "Wrong DMI structures length: %u bytes " + "announced, only %lu bytes available.\n", + len, (unsigned long)size); + } +@@ -4652,14 +4658,16 @@ static int smbios_decode(u8 *buf, const char *devmem, u32 flags) + case 0x021F: + case 0x0221: + if (!(opt.flags & FLAG_QUIET)) +- printf("SMBIOS version fixup (2.%d -> 2.%d).\n", +- ver & 0xFF, 3); ++ fprintf(stderr, ++ "SMBIOS version fixup (2.%d -> 2.%d).\n", ++ ver & 0xFF, 3); + ver = 0x0203; + break; + case 0x0233: + if (!(opt.flags & FLAG_QUIET)) +- printf("SMBIOS version fixup (2.%d -> 2.%d).\n", +- 51, 6); ++ fprintf(stderr, ++ "SMBIOS version fixup (2.%d -> 2.%d).\n", ++ 51, 6); + ver = 0x0206; + break; + } +@@ -4771,6 +4779,13 @@ int main(int argc, char * const argv[]) + int efi; + u8 *buf; + ++ /* ++ * We don't want stdout and stderr to be mixed up if both are ++ * redirected to the same file. ++ */ ++ setlinebuf(stdout); ++ setlinebuf(stderr); ++ + if (sizeof(u8) != 1 || sizeof(u16) != 2 || sizeof(u32) != 4 || '\0' != 0) + { + fprintf(stderr, "%s: compiler incompatibility\n", argv[0]); +-- +2.10.2 diff --git a/SOURCES/0005-Clarify-a-comment-in-dmi_memory_device_extended_size.patch b/SOURCES/0005-Clarify-a-comment-in-dmi_memory_device_extended_size.patch new file mode 100644 index 0000000..1f031e0 --- /dev/null +++ b/SOURCES/0005-Clarify-a-comment-in-dmi_memory_device_extended_size.patch @@ -0,0 +1,29 @@ +From 5696fa33e5f9fce843fa3b5972b87a705fed2067 Mon Sep 17 00:00:00 2001 +From: Jean Delvare +Date: Wed, 7 Sep 2016 22:16:16 +0200 +Subject: [PATCH 5/9] Clarify a comment in dmi_memory_device_extended_size + +Improve the comment to avoid the confusion as reported in bug #48723: +http://savannah.nongnu.org/bugs/?48723 +--- + dmidecode.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/dmidecode.c b/dmidecode.c +index f56d0c5..f929b28 100644 +--- a/dmidecode.c ++++ b/dmidecode.c +@@ -2277,7 +2277,10 @@ static void dmi_memory_device_extended_size(u32 code) + { + code &= 0x7FFFFFFFUL; + +- /* Use the most suitable unit depending on size */ ++ /* ++ * Use the greatest unit for which the exact value can be displayed ++ * as an integer without rounding ++ */ + if (code & 0x3FFUL) + printf(" %lu MB", (unsigned long)code); + else if (code & 0xFFFFFUL) +-- +2.10.2 diff --git a/SOURCES/0006-Prevent-static-code-analyzer-confusion.patch b/SOURCES/0006-Prevent-static-code-analyzer-confusion.patch new file mode 100644 index 0000000..010b260 --- /dev/null +++ b/SOURCES/0006-Prevent-static-code-analyzer-confusion.patch @@ -0,0 +1,30 @@ +From 0b5c47c64b6fb3b626c5f75d9dc36bc864907fca Mon Sep 17 00:00:00 2001 +From: Jean Delvare +Date: Wed, 7 Sep 2016 22:16:20 +0200 +Subject: [PATCH 6/9] Prevent static code analyzer confusion + +As reported in bug #48723: +http://savannah.nongnu.org/bugs/?48723 + +This is a false positive and the static code analyzer output should +be made clearer. Nevertheless we can write the code differently so +that it doesn't trigger a warning. +--- + dmidecode.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dmidecode.c b/dmidecode.c +index f929b28..3993592 100644 +--- a/dmidecode.c ++++ b/dmidecode.c +@@ -2283,7 +2283,7 @@ static void dmi_memory_device_extended_size(u32 code) + */ + if (code & 0x3FFUL) + printf(" %lu MB", (unsigned long)code); +- else if (code & 0xFFFFFUL) ++ else if (code & 0xFFC00UL) + printf(" %lu GB", (unsigned long)code >> 10); + else + printf(" %lu TB", (unsigned long)code >> 20); +-- +2.10.2 diff --git a/SOURCES/0007-Cygwin-is-no-longer-supported.patch b/SOURCES/0007-Cygwin-is-no-longer-supported.patch new file mode 100644 index 0000000..2c21217 --- /dev/null +++ b/SOURCES/0007-Cygwin-is-no-longer-supported.patch @@ -0,0 +1,49 @@ +From df9ebd5ffbe039550ca4f9d5075db09aa7dd2bfe Mon Sep 17 00:00:00 2001 +From: Jean Delvare +Date: Thu, 22 Sep 2016 17:59:09 +0200 +Subject: [PATCH 7/9] Cygwin is no longer supported + +--- + CHANGELOG | 4 ++++ + README | 7 +++---- + 2 files changed, 7 insertions(+), 4 deletions(-) + +diff --git a/CHANGELOG b/CHANGELOG +index ebae4b3..ac748b0 100644 +--- a/CHANGELOG ++++ b/CHANGELOG +@@ -1,3 +1,7 @@ ++2016-09-22 Jean Delvare ++ ++ * README: Explain that we can no longer support Cygwin. ++ + 2016-06-30 Petr Oros + + * dmidecode.c: Unmask LRDIMM in memory type detail (DMI type 17). +diff --git a/README b/README +index 391a5cb..f612b36 100644 +--- a/README ++++ b/README +@@ -28,7 +28,7 @@ and other interesting material, such as a list of related projects and + articles. + + This program was first written for Linux, and has since been reported to work +-on FreeBSD, NetBSD, OpenBSD, BeOS, Cygwin and Solaris as well. ++on FreeBSD, NetBSD, OpenBSD, BeOS and Solaris as well. + + There's no configure script, so simply run "make" to build dmidecode, and + "make install" to install it. You also can use "make uninstall" to remove +@@ -83,9 +83,8 @@ successfully run. + + CYGWIN + +-Dmidecode was reported to work under Cygwin. It seems that /dev/mem doesn't +-work properly before version 1.5.10 though, so you will need to use at least +-this version. ++Dmidecode used to work under Cygwin. However the /dev/mem interface was ++removed at some point in time so it no longer works. + + + ** MISCELLANEOUS TOOLS ** +-- +2.10.2 diff --git a/SOURCES/0008-Only-decode-one-DMI-table.patch b/SOURCES/0008-Only-decode-one-DMI-table.patch new file mode 100644 index 0000000..d4b28e4 --- /dev/null +++ b/SOURCES/0008-Only-decode-one-DMI-table.patch @@ -0,0 +1,86 @@ +From 12fbde92a26da61eda9f2ff0ba3c316779163f10 Mon Sep 17 00:00:00 2001 +From: Jean Delvare +Date: Fri, 20 Jan 2017 10:57:12 +0100 +Subject: [PATCH 8/9] Only decode one DMI table + +Since version 3.0.0 of the SMBIOS specification, there can be +multiple entry points in memory, pointing to one or two DMI tables. +If both a 32-bit ("_SM_") entry point and a 64-bit ("_SM3_") entry +point are present, the specification requires that the latter points +to a table which is a super-set of the table pointed to by the +former. Therefore it makes no sense to decode both. + +Per specification, look for a 64-bit ("_SM3_") entry point first, and +if we can't find any, look for a 32-bit ("_SM_" or "_DMI_") entry +point. + +This fixes bug #50022: +https://savannah.nongnu.org/bugs/?50022 +--- + CHANGELOG | 6 ++++++ + dmidecode.c | 19 ++++++++++++++----- + 2 files changed, 20 insertions(+), 5 deletions(-) + +diff --git a/CHANGELOG b/CHANGELOG +index ac748b0..67aef99 100644 +--- a/CHANGELOG ++++ b/CHANGELOG +@@ -1,3 +1,9 @@ ++2017-01-20 Jean Delvare ++ ++ * dmidecode.c: Only decode one DMI table. ++ This fixes Savannah bug #50022: ++ https://savannah.nongnu.org/bugs/?50022 ++ + 2016-09-22 Jean Delvare + + * README: Explain that we can no longer support Cygwin. +diff --git a/dmidecode.c b/dmidecode.c +index 3993592..4b46a13 100644 +--- a/dmidecode.c ++++ b/dmidecode.c +@@ -4925,28 +4925,37 @@ memory_scan: + goto exit_free; + } + +- for (fp = 0; fp <= 0xFFF0; fp += 16) ++ /* Look for a 64-bit entry point first */ ++ for (fp = 0; fp <= 0xFFE0; fp += 16) + { +- if (memcmp(buf + fp, "_SM3_", 5) == 0 && fp <= 0xFFE0) ++ if (memcmp(buf + fp, "_SM3_", 5) == 0) + { + if (smbios3_decode(buf + fp, opt.devmem, 0)) + { + found++; +- fp += 16; ++ goto done; + } + } +- else if (memcmp(buf + fp, "_SM_", 4) == 0 && fp <= 0xFFE0) ++ } ++ ++ /* If none found, look for a 32-bit entry point */ ++ for (fp = 0; fp <= 0xFFF0; fp += 16) ++ { ++ if (memcmp(buf + fp, "_SM_", 4) == 0 && fp <= 0xFFE0) + { + if (smbios_decode(buf + fp, opt.devmem, 0)) + { + found++; +- fp += 16; ++ goto done; + } + } + else if (memcmp(buf + fp, "_DMI_", 5) == 0) + { + if (legacy_decode(buf + fp, opt.devmem, 0)) ++ { + found++; ++ goto done; ++ } + } + } + +-- +2.10.2 diff --git a/SOURCES/0009-biosdecode-Decode-Intel-Multiprocessor-entry-point.patch b/SOURCES/0009-biosdecode-Decode-Intel-Multiprocessor-entry-point.patch new file mode 100644 index 0000000..43c01ea --- /dev/null +++ b/SOURCES/0009-biosdecode-Decode-Intel-Multiprocessor-entry-point.patch @@ -0,0 +1,95 @@ +From adbd050d70b6173dd6880b21fd6f995af5ea79d2 Mon Sep 17 00:00:00 2001 +From: Jean Delvare +Date: Fri, 20 Jan 2017 17:26:02 +0100 +Subject: [PATCH 9/9] biosdecode: Decode Intel Multiprocessor entry point + +Decode the entry point defined in the Intel Multiprocessor +specification. +--- + CHANGELOG | 5 +++++ + biosdecode.c | 34 +++++++++++++++++++++++++++++++++- + 2 files changed, 38 insertions(+), 1 deletion(-) + +diff --git a/CHANGELOG b/CHANGELOG +index 67aef99..26a8f35 100644 +--- a/CHANGELOG ++++ b/CHANGELOG +@@ -1,5 +1,10 @@ + 2017-01-20 Jean Delvare + ++ * biosdecode.c: Decode the entry point defined in the Intel ++ Multiprocessor specification. ++ ++2017-01-20 Jean Delvare ++ + * dmidecode.c: Only decode one DMI table. + This fixes Savannah bug #50022: + https://savannah.nongnu.org/bugs/?50022 +diff --git a/biosdecode.c b/biosdecode.c +index 3bbfe28..ad3d4bc 100644 +--- a/biosdecode.c ++++ b/biosdecode.c +@@ -2,7 +2,7 @@ + * BIOS Decode + * + * Copyright (C) 2000-2002 Alan Cox +- * Copyright (C) 2002-2015 Jean Delvare ++ * Copyright (C) 2002-2017 Jean Delvare + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +@@ -52,6 +52,9 @@ + * - Fujitsu application panel technical details + * As of July 23rd, 2004 + * http://apanel.sourceforge.net/tech.php ++ * - Intel Multiprocessor Specification ++ * Version 1.4 ++ * http://www.intel.com/design/archives/processors/pro/docs/242016.htm + */ + + #include +@@ -546,6 +549,34 @@ static int fjkeyinf_decode(const u8 *p, size_t len) + } + + /* ++ * Intel Multiprocessor ++ */ ++ ++static size_t mp_length(const u8 *p) ++{ ++ return 16 * p[8]; ++} ++ ++static int mp_decode(const u8 *p, size_t len) ++{ ++ if (!checksum(p, len)) ++ return 0; ++ ++ printf("Intel Multiprocessor present.\n"); ++ printf("\tSpecification Revision: %s\n", ++ p[9] == 0x01 ? "1.1" : p[9] == 0x04 ? "1.4" : "Invalid"); ++ if (p[11]) ++ printf("\tDefault Configuration: #%d\n", p[11]); ++ else ++ printf("\tConfiguration Table Address: 0x%08X\n", ++ DWORD(p + 4)); ++ printf("\tMode: %s\n", p[12] & (1 << 7) ? ++ "IMCR and PIC" : "Virtual Wire"); ++ ++ return 1; ++} ++ ++/* + * Main + */ + +@@ -562,6 +593,7 @@ static struct bios_entry bios_entries[] = { + { "32OS", 0, 0xE0000, 0xFFFFF, compaq_length, compaq_decode }, + { "\252\125VPD", 0, 0xF0000, 0xFFFFF, vpd_length, vpd_decode }, + { "FJKEYINF", 0, 0xF0000, 0xFFFFF, fjkeyinf_length, fjkeyinf_decode }, ++ { "_MP_", 0, 0xE0000, 0xFFFFF, mp_length, mp_decode }, + { NULL, 0, 0, 0, NULL, NULL } + }; + +-- +2.10.2 diff --git a/SPECS/dmidecode.spec b/SPECS/dmidecode.spec index 2fd0456..aa63261 100644 --- a/SPECS/dmidecode.spec +++ b/SPECS/dmidecode.spec @@ -1,7 +1,7 @@ Summary: Tool to analyse BIOS DMI data Name: dmidecode Version: 3.0 -Release: 2.1%{?dist} +Release: 5%{?dist} Epoch: 1 Group: System Environment/Base License: GPLv2+ @@ -17,8 +17,16 @@ Patch6: 0007-Let-read_file-return-the-actual-data-size.patch Patch7: 0008-dmidecode-Use-read_file-to-read-the-DMI-table-from-s.patch Patch8: 0009-dmidecode-Check-sysfs-entry-point-length.patch Patch9: 0010-Use-DWORD-for-Structure-table-maximum-size-in-SMBIOS.patch -Patch10: 0001-dmidecode-Unmask-LRDIMM-in-memmory-type-detail.patch -Patch11: 0001-dmidecode-Hide-irrelevant-fixup-message.patch +Patch10: 0001-dmidecode-Hide-irrelevant-fixup-message.patch +Patch11: 0002-dmidecode-Unmask-LRDIMM-in-memory-type-detail.patch +Patch12: 0003-dmidecode-Clarify-error-message-on-table-read-failur.patch +Patch13: 0004-dmidecode-Move-error-messages-to-stderr.patch +Patch14: 0005-Clarify-a-comment-in-dmi_memory_device_extended_size.patch +Patch15: 0006-Prevent-static-code-analyzer-confusion.patch +Patch16: 0007-Cygwin-is-no-longer-supported.patch +Patch17: 0008-Only-decode-one-DMI-table.patch +Patch18: 0009-biosdecode-Decode-Intel-Multiprocessor-entry-point.patch + Buildroot: %{_tmppath}/%{name}-%{version}-root BuildRequires: automake autoconf ExclusiveArch: %{ix86} x86_64 ia64 aarch64 @@ -46,11 +54,18 @@ I/O ports (e.g. serial, parallel, USB). %patch7 -p1 -b .read_file %patch8 -p1 -b .sysfs_entry_check %patch9 -p1 -b .dword -%patch10 -p1 -b .fix_lrdimm -%patch11 -p1 -b .hide_msg +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 +%patch15 -p1 +%patch16 -p1 +%patch17 -p1 +%patch18 -p1 %build -make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" +make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fPIE" LDFLAGS="-pie -Wl,-z,now" %install rm -rf ${buildroot} @@ -72,9 +87,17 @@ rm -rf ${buildroot} %{_mandir}/man8/* %changelog -* Tue Dec 6 2016 Petr Oros - 1:3.0-2.1 +* Wed May 3 2017 Petr Oros - 1:3.0-5 +- Update compiler flags for hardened builds +- Resolves: #1420763 + +* Tue Feb 28 2017 Petr Oros - 1:3.0-4 +- Sync with upstream +- Resolves: #1385884 + +* Tue Nov 8 2016 Petr Oros - 1:3.0-3 - Hide irrelevant fixup message -- Resolves: #1401905 +- Resolves: #1384195 * Wed Jun 29 2016 Petr Oros - 1:3.0-2 - Unmask LRDIMM in memmory type detail