Accepting request 330284 from Base:System

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/330284
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dmidecode?expand=0&rev=28

dmidecode-1.173-drop-cast.patch

@@ -1,18 +0,0 @@
-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

@@ -1,45 +0,0 @@
-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-1.176-SMBIOS-2.8-is-supported.patch

@@ -1,20 +0,0 @@
-Subject: Bump SUPPORTED_SMBIOS_VER to 0x0208
-Upstream: yes, 1.176
-
-Bump SUPPORTED_SMBIOS_VER so that SMBIOS 2.8 implementations don't trigger
-a warning.
----
- dmidecode.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/dmidecode.c
-+++ b/dmidecode.c
-@@ -69,7 +69,7 @@
- #define out_of_spec "<OUT OF SPEC>"
- static const char *bad_index = "<BAD INDEX>";
- 
--#define SUPPORTED_SMBIOS_VER 0x0207
-+#define SUPPORTED_SMBIOS_VER 0x0208
- 
- /*
-  * Type-independant Stuff

dmidecode-1.177-decode-pcie3-slot-id.patch

@@ -1,45 +0,0 @@
-Subject: Decode ID of PCI Express 3 slots
-Upstream: yes, 1.177
-
-dmidecode.c: Decode ID of PCI Express 3 slots (DMI type 9).
-This fixes Savannah bug #40178:
-https://savannah.nongnu.org/bugs/?40178
----
- dmidecode.c |   12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
---- a/dmidecode.c
-+++ b/dmidecode.c
-@@ -2,7 +2,7 @@
-  * DMI Decode
-  *
-  *   Copyright (C) 2000-2002 Alan Cox <alan@redhat.com>
-- *   Copyright (C) 2002-2010 Jean Delvare <khali@linux-fr.org>
-+ *   Copyright (C) 2002-2014 Jean Delvare <jdelvare@suse.de>
-  *
-  *   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
-@@ -1697,6 +1697,10 @@ static const char *dmi_slot_type(u8 code
- 		"PCI Express 3 x8",
- 		"PCI Express 3 x16" /* 0xB6 */
- 	};
-+	/*
-+	 * Note to developers: when adding entries to these lists, check if
-+	 * function dmi_slot_id below needs updating too.
-+	 */
- 
- 	if (code >= 0x01 && code <= 0x13)
- 		return type[code - 0x01];
-@@ -1790,6 +1794,12 @@ static void dmi_slot_id(u8 code1, u8 cod
- 		case 0xAE: /* PCI Express 2 */
- 		case 0xAF: /* PCI Express 2 */
- 		case 0xB0: /* PCI Express 2 */
-+		case 0xB1: /* PCI Express 3 */
-+		case 0xB2: /* PCI Express 3 */
-+		case 0xB3: /* PCI Express 3 */
-+		case 0xB4: /* PCI Express 3 */
-+		case 0xB5: /* PCI Express 3 */
-+		case 0xB6: /* PCI Express 3 */
- 			printf("%sID: %u\n", prefix, code1);
- 			break;
- 		case 0x07: /* PCMCIA */

dmidecode-1.181-decode-CPUID-recent-AMD.patch

@@ -1,23 +0,0 @@
-Subject: Decode the CPUID of recent AMD processors
-Upstream: yes, 1.181
----
- dmidecode.c |    6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/dmidecode.c
-+++ b/dmidecode.c
-@@ -1012,11 +1012,11 @@ static void dmi_processor_id(u8 type, co
- 		sig = 1;
- 	else if ((type >= 0x18 && type <= 0x1D) /* AMD */
- 	      || type == 0x1F /* AMD */
--	      || (type >= 0x38 && type <= 0x3E) /* AMD */
--	      || (type >= 0x46 && type <= 0x49) /* AMD */
-+	      || (type >= 0x38 && type <= 0x3F) /* AMD */
-+	      || (type >= 0x46 && type <= 0x4F) /* AMD */
- 	      || (type >= 0x83 && type <= 0x8F) /* AMD */
- 	      || (type >= 0xB6 && type <= 0xB7) /* AMD */
--	      || (type >= 0xE6 && type <= 0xEF)) /* AMD */
-+	      || (type >= 0xE4 && type <= 0xEF)) /* AMD */
- 		sig = 2;
- 	else if (type == 0x01 || type == 0x02)
- 	{

dmidecode-1.182-decode-ddr4-memory-type.patch

@@ -1,26 +0,0 @@
-Subject: Add support for DDR4 memory type
-Upstream: yes, 1.182
-References: savannah#43370
-
-Patch from Tomohiro Kimura. The value was taken from preliminary SMBIOS
-specification version 3.0.0d. This closes bug #43370.
----
- dmidecode.c |    5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
---- a/dmidecode.c
-+++ b/dmidecode.c
-@@ -2311,10 +2311,11 @@ static const char *dmi_memory_device_typ
- 		"Reserved",
- 		"Reserved",
- 		"DDR3",
--		"FBD2", /* 0x19 */
-+		"FBD2",
-+		"DDR4" /* 0x1A */
- 	};
- 
--	if (code >= 0x01 && code <= 0x19)
-+	if (code >= 0x01 && code <= 0x1A)
- 		return type[code - 0x01];
- 	return out_of_spec;
- }

dmidecode-2.12.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:913ff3055d563a62a420789b8ee33b038de9afa18ea61254760ddf8ab87a5088
-size 55191

dmidecode-3.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7ec35bb193729c1d593a1460b59d82d24b89102ab23fd0416e6cf4325d077e45
+size 58704

dmidecode.changes

@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Thu Sep  3 10:57:15 CEST 2015 - jdelvare@suse.de
+
+- Update to upstream version 3.0:
+  * Adds support for SMBIOS 3.0. This includes a new (64-bit) entry
+    point format and new enumerated values for recent hardware.
+  * Adds support for the new kernel interface (as of Linux v4.2) as
+    an alternative to relying on /dev/mem to access the entry point
+    and DMI table.
+  * Adds decoding of Acer-specific DMI type 170 and HP-specific DMI
+    types 212, 219 and 233.
+  * Obsoletes dmidecode-1.173-drop-cast.patch,
+    dmidecode-1.175-fix-SMBIOS-2.8.0.patch,
+    dmidecode-1.176-SMBIOS-2.8-is-supported.patch,
+    dmidecode-1.177-decode-pcie3-slot-id.patch,
+    dmidecode-1.181-decode-CPUID-recent-AMD.patch, and
+    dmidecode-1.182-decode-ddr4-memory-type.patch.
+  * Various minor fixes and clean-ups.
+
 -------------------------------------------------------------------
 Sun Feb 22 09:07:28 UTC 2015 - meissner@suse.com
 

dmidecode.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package dmidecode
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,26 +17,21 @@
 
 
 Name:           dmidecode
-Version:        2.12
+Version:        3.0
 Release:        0
 Summary:        DMI table decoder
 License:        GPL-2.0+
 Group:          System/Console
 Url:            http://www.nongnu.org/dmidecode/
-Source0:        http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.bz2
+Source0:        http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.xz
-Source1:        http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.bz2.sig
+Source1:        http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.xz.sig
 # would be, but tarball is signed by someone else without signatures.
 # https://savannah.nongnu.org/project/memberlist-gpgkeys.php?group=dmidecode
 # Source2:        %{name}.keyring
-Patch1:         dmidecode-1.173-drop-cast.patch
-Patch2:         dmidecode-1.175-fix-SMBIOS-2.8.0.patch
-Patch3:         dmidecode-1.176-SMBIOS-2.8-is-supported.patch
-Patch4:         dmidecode-1.177-decode-pcie3-slot-id.patch
-Patch5:         dmidecode-1.181-decode-CPUID-recent-AMD.patch
-Patch6:         dmidecode-1.182-decode-ddr4-memory-type.patch
 Provides:       pmtools:%{_sbindir}/dmidecode
 Obsoletes:      pmtools < 20071117
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  xz
 ExclusiveArch:  %ix86 ia64 x86_64 %arm aarch64
 
 %description
@@ -55,12 +50,6 @@ the BIOS told it to.
 
 %prep
 %setup -q
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
 
 %build
 make CFLAGS="%{optflags}" %{?_smp_mflags}