[dmidecode] improve dmidecode

[Anton Arapov]

commit df0f86a3148506dcda523d296c14b9de5cf4245c
Author: Anton Arapov <anton at redhat.com>
Date:   Mon Mar 12 10:29:34 2012 +0100

    improve dmidecode
    
    Signed-off-by: Anton Arapov <anton at redhat.com>

 dmidecode-2.11-dmidecode_fix.patch |   24 ++++++++++++++++++++++++
 dmidecode-2.11-dmioem_hp_fix.patch |   32 ++++++++++++++++++++++++++++++++
 dmidecode.spec                     |   10 +++++++++-
 3 files changed, 65 insertions(+), 1 deletions(-)
---
diff --git a/dmidecode-2.11-dmidecode_fix.patch b/dmidecode-2.11-dmidecode_fix.patch
new file mode 100644
index 0000000..163f9c9
--- /dev/null
+++ b/dmidecode-2.11-dmidecode_fix.patch
@@ -0,0 +1,24 @@
+diff -up dmidecode-2.11/CHANGELOG.dmidecode_fix dmidecode-2.11/CHANGELOG
+--- dmidecode-2.11/CHANGELOG.dmidecode_fix	2012-03-12 10:25:01.980020072 +0100
++++ dmidecode-2.11/CHANGELOG	2012-03-12 10:25:20.123020332 +0100
+@@ -1,3 +1,8 @@
++2011-11-18  Jean Delvare  <khali at linux-fr.org>
++
++	* dmidecode.c: Properly print the hexadecimal value of invalid
++	  string characters.
++
+ 2011-11-14  Anton Arapov  <anton at redhat.com>
+ 
+ 	* dmidecode.c: Make dmi_chassis_type aware of the lock bit.
+diff -up dmidecode-2.11/dmidecode.c.dmidecode_fix dmidecode-2.11/dmidecode.c
+--- dmidecode-2.11/dmidecode.c.dmidecode_fix	2012-03-12 10:25:11.261020199 +0100
++++ dmidecode-2.11/dmidecode.c	2012-03-12 10:25:20.124020332 +0100
+@@ -197,7 +197,7 @@ static void dmi_dump(const struct dmi_he
+ 					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 */
diff --git a/dmidecode-2.11-dmioem_hp_fix.patch b/dmidecode-2.11-dmioem_hp_fix.patch
new file mode 100644
index 0000000..afeb490
--- /dev/null
+++ b/dmidecode-2.11-dmioem_hp_fix.patch
@@ -0,0 +1,32 @@
+diff -up dmidecode-2.11/AUTHORS.dmioem_hp_fix dmidecode-2.11/AUTHORS
+--- dmidecode-2.11/AUTHORS.dmioem_hp_fix	2012-03-12 10:26:58.166021817 +0100
++++ dmidecode-2.11/AUTHORS	2012-03-12 10:27:18.818022115 +0100
+@@ -83,3 +83,4 @@ Lars Mueller
+ Thomas Mingarelli
+ Andrey Matveyev
+ Stefan Tauner
++Naga Chumbalkar
+diff -up dmidecode-2.11/CHANGELOG.dmioem_hp_fix dmidecode-2.11/CHANGELOG
+--- dmidecode-2.11/CHANGELOG.dmioem_hp_fix	2012-03-12 10:27:05.076021906 +0100
++++ dmidecode-2.11/CHANGELOG	2012-03-12 10:27:18.818022115 +0100
+@@ -1,3 +1,8 @@
++2012-03-12  Anton Arapov  <anton at 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  <khali at linux-fr.org>
+ 
+ 	* dmidecode.c: Properly print the hexadecimal value of invalid
+diff -up dmidecode-2.11/dmioem.c.dmioem_hp_fix dmidecode-2.11/dmioem.c
+--- dmidecode-2.11/dmioem.c.dmioem_hp_fix	2012-03-12 10:27:13.108022027 +0100
++++ dmidecode-2.11/dmioem.c	2012-03-12 10:27:18.819022112 +0100
+@@ -83,7 +83,7 @@ static int dmi_decode_hp(const struct dm
+ 			 */
+ 			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 --git a/dmidecode.spec b/dmidecode.spec
index 9b92016..88802f9 100644
--- a/dmidecode.spec
+++ b/dmidecode.spec
@@ -1,7 +1,7 @@
 Summary:        Tool to analyse BIOS DMI data
 Name:           dmidecode
 Version:        2.11
-Release:        6%{?dist}
+Release:        7%{?dist}
 Epoch:          1
 Group:          System Environment/Base
 License:        GPLv2+
@@ -10,6 +10,8 @@ URL:            http://www.nongnu.org/dmidecode/
 Patch0:         dmidecode-2.11-type16-fix.patch
 Patch1:         dmidecode-2.11-smbios-271.patch
 Patch2:         dmidecode-2.11-chassis_fix.patch
+Patch3:         dmidecode-2.11-dmidecode_fix.patch
+Patch4:         dmidecode-2.11-dmioem_hp_fix.patch
 Buildroot:      %{_tmppath}/%{name}-%{version}-root
 BuildRequires:  automake autoconf
 ExclusiveArch:  %{ix86} x86_64 ia64
@@ -30,6 +32,8 @@ I/O ports (e.g. serial, parallel, USB).
 %patch0 -p1 -b .type16_fix
 %patch1 -p1 -b .smbios271
 %patch2 -p1 -b .chassis_fix
+%patch3 -p1 -b .dmidecode_fix
+%patch4 -p1 -b .dmioem_hp_fix
 
 %build
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
@@ -53,6 +57,10 @@ rm -rf ${buildroot}
 %{_mandir}/man8/*
 
 %changelog
+* Mon Mar 12 2012 Anton Arapov <anton at redhat.com> - 1:2.11-7
+- Add "PXE" to HP OEM Type 209 record output
+- Properly print the hexadecimal value of invalid string characters
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:2.11-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild