Merge branch 'release/debian/3.2-3'debian/3.2-3

7 files changed, 78 insertions, 4 deletions

diff --git a/debian/changelog b/debian/changelog
index 3b627f9..fa13d73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+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
+      upstream Commit e12ec26e19e02281d3e7258c3aabb88a5cf5ec1d.
+  * 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.
+  * debian/control: Add Rules-Requires-Root.
+  * Refresh debian/copyright.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Mon, 23 Dec 2019 18:56:41 +0100
+
 dmidecode (3.2-2) unstable; urgency=medium
 
   * Mark dmidecode Multi-Arch: foreign (Closes: #929455).
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 2b07a3a..81ebc58 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,9 @@ Source: dmidecode
 Section: utils
 Priority: optional
 Maintainer: Jörg Frings-Fürst <debian@jff.email>
-Build-Depends: debhelper (>= 12)
-Standards-Version: 4.4.0
+Build-Depends: debhelper-compat (= 12)
+Standards-Version: 4.4.1.2
+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/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 <jdelvare@suse.de>
+Copyright: 2002-2019 Jean Delvare <jdelvare@suse.de>
            2002      Alan Cox <alan@redhat.com>
            2010      Anton Arapov <anton@redhat.com>
            2015      Xie XiuQi <xiexiuqi@huawei.com>
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..4183af5
--- /dev/null
+++ b/debian/patches/0140-Fix_scan_entry_point.patch
@@ -0,0 +1,54 @@
+Description: Cherry picked fix Only scan /dev/mem for entry point on x86
+Author: <name and email of author, optional>
+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
++++ trunk/dmidecode.c
+@@ -2,7 +2,7 @@
+  * DMI Decode
+  *
+  *   Copyright (C) 2000-2002 Alan Cox <alan@redhat.com>
+- *   Copyright (C) 2002-2018 Jean Delvare <jdelvare@suse.de>
++ *   Copyright (C) 2002-2019 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
+@@ -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
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..cd63486
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,3 @@
+# smoke test
+Test-Command: /usr/sbin/dmidecode -V
+Depends: dmidecode