[packages/dmidecode] up to 3.1
atler
atler at pld-linux.org
Wed Aug 23 21:25:50 CEST 2017
commit 80581919199263c93ace916c603384df40b6914f
Author: Jan Palus <atler at pld-linux.org>
Date: Wed Aug 23 21:25:23 2017 +0200
up to 3.1
dmidecode-fixes.patch | 67 ---------------------------------------------------
dmidecode.spec | 6 ++---
2 files changed, 2 insertions(+), 71 deletions(-)
---
diff --git a/dmidecode.spec b/dmidecode.spec
index 4187874..63861c2 100644
--- a/dmidecode.spec
+++ b/dmidecode.spec
@@ -1,13 +1,12 @@
Summary: A tool for dumping a computer's DMI table contents
Summary(pl.UTF-8): Narzędzie do zrzucania zawartości tabeli DMI komputera
Name: dmidecode
-Version: 3.0
+Version: 3.1
Release: 1
License: GPL v2+
Group: Applications/System
Source0: http://savannah.nongnu.org/download/dmidecode/%{name}-%{version}.tar.xz
-# Source0-md5: 281ee572d45c78eca73a14834c495ffd
-Patch0: %{name}-fixes.patch
+# Source0-md5: 679c2c015c515aa6ca5f229aee49c102
URL: http://www.nongnu.org/dmidecode/
BuildRequires: tar >= 1:1.22
BuildRequires: xz
@@ -28,7 +27,6 @@ BIOS-u.
%prep
%setup -q
-%patch0 -p1
%build
%{__make} \
diff --git a/dmidecode-fixes.patch b/dmidecode-fixes.patch
deleted file mode 100644
index 11fe21b..0000000
--- a/dmidecode-fixes.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 33b5aafc6ee6b5de9f2526fb1cf4b14d1e16e4f0 Mon Sep 17 00:00:00 2001
-From: Roy Franz <roy.franz at linaro.org>
-Date: Thu, 01 Oct 2015 06:41:43 +0000
-Subject: Add "--no-sysfs" option description to -h output
-
-A description of --no-sysfs was not added to the output of "-h" when
-the feature was added, so add it now.
----
-diff --git a/dmiopt.c b/dmiopt.c
-index 0d142d2..de607f4 100644
---- a/dmiopt.c
-+++ b/dmiopt.c
-@@ -314,6 +314,7 @@ void print_help(void)
- " -u, --dump Do not decode the entries\n"
- " --dump-bin FILE Dump the DMI data to a binary file\n"
- " --from-dump FILE Read the DMI data from a binary file\n"
-+ " --no-sysfs Do not attempt to read DMI data from sysfs files\n"
- " -V, --version Display the version and exit\n";
-
- printf("%s", help);
---
-cgit v0.9.0.2
-From bf7bad24ce141dab5b5acc3ffb98ce5fe4a8e0f9 Mon Sep 17 00:00:00 2001
-From: Xie XiuQi <xiexiuqi at huawei.com>
-Date: Wed, 21 Oct 2015 13:12:50 +0000
-Subject: Fix 'No SMBIOS nor DMI entry point found' on SMBIOS3
-
-address_from_efi may return a SMBIOS or SMBIOS3 format entry
-point, so add this condition.
----
-diff --git a/AUTHORS b/AUTHORS
-index d4badfa..ccf7fbb 100644
---- a/AUTHORS
-+++ b/AUTHORS
-@@ -19,6 +19,7 @@ Jarod Wilson <jarod at redhat.com>
- Anton Arapov <anton at redhat.com>
- Roy Franz <roy.franz at linaro.org>
- Tyler Bell <tyler.bell at hp.com>
-+Xie XiuQi <xiexiuqi at huawei.com>
-
- MANY THANKS TO (IN CHRONOLOGICAL ORDER)
- Werner Heuser
-diff --git a/dmidecode.c b/dmidecode.c
-index ce0511b..cfcade4 100644
---- a/dmidecode.c
-+++ b/dmidecode.c
-@@ -4866,8 +4866,16 @@ int main(int argc, char * const argv[])
- goto exit_free;
- }
-
-- if (smbios_decode(buf, opt.devmem, 0))
-- found++;
-+ if (memcmp(buf, "_SM3_", 5) == 0)
-+ {
-+ if (smbios3_decode(buf, opt.devmem, 0))
-+ found++;
-+ }
-+ else if (memcmp(buf, "_SM_", 4) == 0)
-+ {
-+ if (smbios_decode(buf, opt.devmem, 0))
-+ found++;
-+ }
- goto done;
-
- memory_scan:
---
-cgit v0.9.0.2
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dmidecode.git/commitdiff/80581919199263c93ace916c603384df40b6914f
More information about the pld-cvs-commit
mailing list