From 689a87788019fb7f08affd56d19aedc41c45360d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 19 Dec 2019 10:30:10 +0100 Subject: Fix Scan only /dev/mem for entry point on x86 --- debian/changelog | 9 +++++ debian/control | 2 +- debian/patches/0140-Fix_scan_entry_point.patch | 47 ++++++++++++++++++++++++++ debian/patches/series | 1 + 4 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 debian/patches/0140-Fix_scan_entry_point.patch diff --git a/debian/changelog b/debian/changelog index 3b627f9..0ccad00 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +dmidecode (3.2-3) UNRELEASED; urgency=medium + + * Fix Scan only /dev/mem for entry point on x86 (Closes: #946911): + - New debian/patches/0140-Fix_scan_entry_point.patch (Cherry picked from + upstream Commit e12ec26e19e02281d3e7258c3aabb88a5cf5ec1d. + * Declare compliance with Debian Policy 4.4.1.2 (No changes needed). + + -- Jörg Frings-Fürst Thu, 19 Dec 2019 09:59:52 +0100 + dmidecode (3.2-2) unstable; urgency=medium * Mark dmidecode Multi-Arch: foreign (Closes: #929455). diff --git a/debian/control b/debian/control index 2b07a3a..05fb8d9 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: utils Priority: optional Maintainer: Jörg Frings-Fürst Build-Depends: debhelper (>= 12) -Standards-Version: 4.4.0 +Standards-Version: 4.4.1.2 Vcs-Git: git://jff.email/opt/git/dmidecode.git Vcs-Browser: https://jff.email/cgit/dmidecode.git/ Homepage: https://nongnu.org/dmidecode/ diff --git a/debian/patches/0140-Fix_scan_entry_point.patch b/debian/patches/0140-Fix_scan_entry_point.patch new file mode 100644 index 0000000..9a8aa93 --- /dev/null +++ b/debian/patches/0140-Fix_scan_entry_point.patch @@ -0,0 +1,47 @@ +Index: trunk/dmidecode.c +=================================================================== +--- trunk.orig/dmidecode.c ++++ trunk/dmidecode.c +@@ -2,7 +2,7 @@ + * DMI Decode + * + * Copyright (C) 2000-2002 Alan Cox +- * Copyright (C) 2002-2018 Jean Delvare ++ * Copyright (C) 2002-2019 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 +@@ -5534,7 +5534,7 @@ int main(int argc, char * const argv[]) + off_t fp; + size_t size; + int efi; +- u8 *buf; ++ u8 *buf = NULL; + + /* + * We don't want stdout and stderr to be mixed up if both are +@@ -5638,7 +5638,7 @@ int main(int argc, char * const argv[]) + printf("Failed to get SMBIOS data from sysfs.\n"); + } + +- /* Next try EFI (ia64, Intel-based Mac) */ ++ /* Next try EFI (ia64, Intel-based Mac, arm64) */ + efi = address_from_efi(&fp); + switch (efi) + { +@@ -5671,6 +5671,7 @@ int main(int argc, char * const argv[]) + goto done; + + memory_scan: ++#if defined __i386__ || defined __x86_64__ + if (!(opt.flags & FLAG_QUIET)) + printf("Scanning %s for entry point.\n", opt.devmem); + /* Fallback to memory scan (x86, x86_64) */ +@@ -5713,6 +5714,7 @@ memory_scan: + } + } + } ++#endif + + done: + if (!found && !(opt.flags & FLAG_QUIET)) diff --git a/debian/patches/series b/debian/patches/series index e06432c..fb5d205 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -8,3 +8,4 @@ #0125-use_read_file_to_read_DMI_table_from_sysfs.patch #0130-use_DWORD_for_table_max_size.patch #0135-hide_fixup_msg.patch +0140-Fix_scan_entry_point.patch -- cgit v1.2.3 From e40e5703b00b588953ecdf95151b345d130aef66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 19 Dec 2019 10:49:45 +0100 Subject: Add DEP3 Header to patch --- debian/patches/0140-Fix_scan_entry_point.patch | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/patches/0140-Fix_scan_entry_point.patch b/debian/patches/0140-Fix_scan_entry_point.patch index 9a8aa93..4183af5 100644 --- a/debian/patches/0140-Fix_scan_entry_point.patch +++ b/debian/patches/0140-Fix_scan_entry_point.patch @@ -1,3 +1,10 @@ +Description: Cherry picked fix Only scan /dev/mem for entry point on x86 +Author: +Origin: upstream, http://git.savannah.nongnu.org/cgit/dmidecode.git/commit/?id=e12ec26e19e02281d3e7258c3aabb88a5cf5ec1d +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=946911 +Last-Update: 2019-12-19 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ Index: trunk/dmidecode.c =================================================================== --- trunk.orig/dmidecode.c -- cgit v1.2.3 From de5c85dc4fc34c7b7ecf9d0dd1e304a89a94786d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 19 Dec 2019 13:13:51 +0100 Subject: Add Smoketest --- debian/changelog | 2 ++ debian/tests/control | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 debian/tests/control diff --git a/debian/changelog b/debian/changelog index 0ccad00..ca0d79f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ dmidecode (3.2-3) UNRELEASED; urgency=medium - New debian/patches/0140-Fix_scan_entry_point.patch (Cherry picked from upstream Commit e12ec26e19e02281d3e7258c3aabb88a5cf5ec1d. * Declare compliance with Debian Policy 4.4.1.2 (No changes needed). + * Add Smoketest: + - New debian/tests/control. -- Jörg Frings-Fürst Thu, 19 Dec 2019 09:59:52 +0100 diff --git a/debian/tests/control b/debian/tests/control new file mode 100644 index 0000000..bc1e9d4 --- /dev/null +++ b/debian/tests/control @@ -0,0 +1,3 @@ +# smoke test +Test-Command: dmidecode -V +Depends: dmidecode -- cgit v1.2.3 From fc8e22379f30235de985f9a7943004b8e7a81f8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 19 Dec 2019 13:19:20 +0100 Subject: Switch to debhelper-compat --- debian/changelog | 3 +++ debian/compat | 1 - debian/control | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) delete mode 100644 debian/compat diff --git a/debian/changelog b/debian/changelog index ca0d79f..daf796f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,9 @@ dmidecode (3.2-3) UNRELEASED; urgency=medium * Declare compliance with Debian Policy 4.4.1.2 (No changes needed). * Add Smoketest: - New debian/tests/control. + * Switch to debhelper-compat: + - debian/control: Replace debhelper with debhelper-compat. + - Remove debian/compat. -- Jörg Frings-Fürst Thu, 19 Dec 2019 09:59:52 +0100 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 48082f7..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -12 diff --git a/debian/control b/debian/control index 05fb8d9..a2bb7c0 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: dmidecode Section: utils Priority: optional Maintainer: Jörg Frings-Fürst -Build-Depends: debhelper (>= 12) +Build-Depends: debhelper-compat (= 12) Standards-Version: 4.4.1.2 Vcs-Git: git://jff.email/opt/git/dmidecode.git Vcs-Browser: https://jff.email/cgit/dmidecode.git/ -- cgit v1.2.3 From 3f76a5a35f54edcb471b74f7b90def6653197fd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 19 Dec 2019 13:41:20 +0100 Subject: Add Rules-Requires-Root --- debian/changelog | 1 + debian/control | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index daf796f..6ede80a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ dmidecode (3.2-3) UNRELEASED; urgency=medium * Switch to debhelper-compat: - debian/control: Replace debhelper with debhelper-compat. - Remove debian/compat. + * debian/control: Add Rules-Requires-Root. -- Jörg Frings-Fürst Thu, 19 Dec 2019 09:59:52 +0100 diff --git a/debian/control b/debian/control index a2bb7c0..af55d03 100644 --- a/debian/control +++ b/debian/control @@ -4,6 +4,7 @@ Priority: optional Maintainer: Jörg Frings-Fürst Build-Depends: debhelper-compat (= 12) Standards-Version: 4.4.1.2 +Rules-Requires-Root: binary-targets Vcs-Git: git://jff.email/opt/git/dmidecode.git Vcs-Browser: https://jff.email/cgit/dmidecode.git/ Homepage: https://nongnu.org/dmidecode/ -- cgit v1.2.3 From d13eff8405a14362f821bdbe5ea170355f205a61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 19 Dec 2019 14:04:18 +0100 Subject: Refresh debian/copyright; d/changelog: Change distribution to unstable, Change date and time --- debian/changelog | 5 +++-- debian/copyright | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6ede80a..7f6cfbf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dmidecode (3.2-3) UNRELEASED; urgency=medium +dmidecode (3.2-3) unstable; urgency=medium * Fix Scan only /dev/mem for entry point on x86 (Closes: #946911): - New debian/patches/0140-Fix_scan_entry_point.patch (Cherry picked from @@ -10,8 +10,9 @@ dmidecode (3.2-3) UNRELEASED; urgency=medium - debian/control: Replace debhelper with debhelper-compat. - Remove debian/compat. * debian/control: Add Rules-Requires-Root. + * Refresh debian/copyright. - -- Jörg Frings-Fürst Thu, 19 Dec 2019 09:59:52 +0100 + -- Jörg Frings-Fürst Thu, 19 Dec 2019 14:01:38 +0100 dmidecode (3.2-2) unstable; urgency=medium diff --git a/debian/copyright b/debian/copyright index f3ad943..2578c43 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,7 +4,7 @@ Upstream-Contact: dmidecode-devel@nongnu.org Source: http://download.savannah.gnu.org/releases/demidecode/ Files: * -Copyright: 2002-2018 Jean Delvare +Copyright: 2002-2019 Jean Delvare 2002 Alan Cox 2010 Anton Arapov 2015 Xie XiuQi -- cgit v1.2.3 From 91ff0a4442757a5ed61ee7637971c122a7917878 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 22 Dec 2019 20:31:10 +0100 Subject: fix path at Smoketest --- debian/files | 1 + debian/tests/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 debian/files diff --git a/debian/files b/debian/files new file mode 100644 index 0000000..8966b1e --- /dev/null +++ b/debian/files @@ -0,0 +1 @@ +dmidecode_3.2-3_source.buildinfo utils optional diff --git a/debian/tests/control b/debian/tests/control index bc1e9d4..cd63486 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -1,3 +1,3 @@ # smoke test -Test-Command: dmidecode -V +Test-Command: /usr/sbin/dmidecode -V Depends: dmidecode -- cgit v1.2.3 From 888b27390ef234d08136ee9b9dbc3ac31b59faa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 22 Dec 2019 20:31:45 +0100 Subject: d/changelog: Change date and time --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 7f6cfbf..ac26f0c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,7 +12,7 @@ dmidecode (3.2-3) unstable; urgency=medium * debian/control: Add Rules-Requires-Root. * Refresh debian/copyright. - -- Jörg Frings-Fürst Thu, 19 Dec 2019 14:01:38 +0100 + -- Jörg Frings-Fürst Sun, 22 Dec 2019 20:31:29 +0100 dmidecode (3.2-2) unstable; urgency=medium -- cgit v1.2.3 From 4993c9d0832ddc5b3531f294605e08da1a56c48a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 23 Dec 2019 18:57:58 +0100 Subject: Change Rules-Requires-Root to no --- debian/changelog | 2 +- debian/control | 2 +- debian/files | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 debian/files diff --git a/debian/changelog b/debian/changelog index ac26f0c..fa13d73 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,7 +12,7 @@ dmidecode (3.2-3) unstable; urgency=medium * debian/control: Add Rules-Requires-Root. * Refresh debian/copyright. - -- Jörg Frings-Fürst Sun, 22 Dec 2019 20:31:29 +0100 + -- Jörg Frings-Fürst Mon, 23 Dec 2019 18:56:41 +0100 dmidecode (3.2-2) unstable; urgency=medium diff --git a/debian/control b/debian/control index af55d03..81ebc58 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Jörg Frings-Fürst Build-Depends: debhelper-compat (= 12) Standards-Version: 4.4.1.2 -Rules-Requires-Root: binary-targets +Rules-Requires-Root: no Vcs-Git: git://jff.email/opt/git/dmidecode.git Vcs-Browser: https://jff.email/cgit/dmidecode.git/ Homepage: https://nongnu.org/dmidecode/ diff --git a/debian/files b/debian/files deleted file mode 100644 index 8966b1e..0000000 --- a/debian/files +++ /dev/null @@ -1 +0,0 @@ -dmidecode_3.2-3_source.buildinfo utils optional -- cgit v1.2.3