Merge branch 'release/debian/3.5-2'debian/3.5-2

6 files changed, 95 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 39dc0cd..b7a1180 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+dmidecode (3.5-2) unstable; urgency=medium
+
+  * New upstream patches:
+    - debian/patches/0155-use_read_file.patch
+    - debian/patches/0160-HPE_OEM_Firmware_change.patch
+  * Add debian/dmidecode.lintian-overrides for wrong groff-message.
+  * debian/rules:
+    - Remove ansi mode from override_dh_auto_build (Closes: #1041611).
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Sun, 13 Aug 2023 19:53:46 +0200
+
 dmidecode (3.5-1) unstable; urgency=medium
 
   * New upstream release (Closes: #1032980).
diff --git a/debian/dmidecode.lintian-overrides b/debian/dmidecode.lintian-overrides
new file mode 100644
index 0000000..bae92a1
--- /dev/null
+++ b/debian/dmidecode.lintian-overrides
@@ -0,0 +1,6 @@
+#
+# LC_ALL=C.UTF-8 MANROFFSEQ='' MANWIDTH=80 man --warnings -E UTF-8 -l -Tutf8 -Z dmidecode.8 >/dev/null
+#
+# has no error
+#
+groff-message an.tmac:<standard input>:251: warning: tbl preprocessor failed, or it or soelim was not run; table(s) likely not rendered (TE macro called with TW register undefined) [usr/share/man/man8/dmidecode.8.gz:1]
\ No newline at end of file
diff --git a/debian/patches/0155-use_read_file.patch b/debian/patches/0155-use_read_file.patch
new file mode 100644
index 0000000..18b1fb3
--- /dev/null
+++ b/debian/patches/0155-use_read_file.patch
@@ -0,0 +1,43 @@
+Description: Use read_file() instead of mem_chunk()
+Origin: upstream, https://git.savannah.gnu.org/cgit/dmidecode.git/commit/?id=c76ddda0ba0aa99a55945e3290095c2ec493c892
+Forwarded: not-needed
+Last-Update: 2023-07-15
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/dmidecode.c
+===================================================================
+--- trunk.orig/dmidecode.c
++++ trunk/dmidecode.c
+@@ -6025,15 +6025,23 @@ int main(int argc, char * const argv[])
+ 		pr_comment("dmidecode %s", VERSION);
+ 
+ 	/* Read from dump if so instructed */
++	size = 0x20;
+ 	if (opt.flags & FLAG_FROM_DUMP)
+ 	{
+ 		if (!(opt.flags & FLAG_QUIET))
+ 			pr_info("Reading SMBIOS/DMI data from file %s.",
+ 				opt.dumpfile);
+-		if ((buf = mem_chunk(0, 0x20, opt.dumpfile)) == NULL)
++		if ((buf = read_file(0, &size, opt.dumpfile)) == NULL)
+ 		{
+ 			ret = 1;
+ 			goto exit_free;
++		} 
++
++		/* Truncated entry point can't be processed */
++		if (size < 0x20)
++		{
++			ret = 1;
++			goto done;
+ 		}
+ 
+ 		if (memcmp(buf, "_SM3_", 5) == 0)
+@@ -6059,7 +6067,6 @@ int main(int argc, char * const argv[])
+ 	 * contain one of several types of entry points, so read enough for
+ 	 * the largest one, then determine what type it contains.
+ 	 */
+-	size = 0x20;
+ 	if (!(opt.flags & FLAG_NO_SYSFS)
+ 	 && (buf = read_file(0, &size, SYS_ENTRY_FILE)) != NULL)
+ 	{
diff --git a/debian/patches/0160-HPE_OEM_Firmware_change.patch b/debian/patches/0160-HPE_OEM_Firmware_change.patch
new file mode 100644
index 0000000..075b566
--- /dev/null
+++ b/debian/patches/0160-HPE_OEM_Firmware_change.patch
@@ -0,0 +1,32 @@
+Description: HPE OEM Record 237 Firmware change
+Origin: upstream, http://git.savannah.gnu.org/cgit/dmidecode.git/commit/?id=80de376231e903d2cbea95e51ffea31860502159
+Forwarded: not-needed
+Last-Update: 2023-07-15
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/dmioem.c
+===================================================================
+--- trunk.orig/dmioem.c
++++ trunk/dmioem.c
+@@ -1094,7 +1094,8 @@ static int dmi_decode_hp(const struct dm
+ 			 *  0x06  | Manufacture|STRING | DIMM Manufacturer
+ 			 *  0x07  | Part Number|STRING | DIMM Manufacturer's Part Number
+ 			 *  0x08  | Serial Num |STRING | DIMM Vendor Serial Number
+-			 *  0x09  | Spare Part |STRING | DIMM Spare Part Number
++			 *  0x09  | Man Date   | BYTE  | DIMM Manufacture Date (YEAR) in BCD
++			 *  0x0A  | Man Date   | BYTE  | DIMM Manufacture Date (WEEK) in BCD
+ 			 */
+ 			if (gen < G9) return 0;
+ 			pr_handle_name("%s DIMM Vendor Information", company);
+@@ -1105,8 +1106,9 @@ static int dmi_decode_hp(const struct dm
+ 			pr_attr("DIMM Manufacturer Part Number", "%s", dmi_string(h, data[0x07]));
+ 			if (h->length < 0x09) break;
+ 			pr_attr("DIMM Vendor Serial Number", "%s", dmi_string(h, data[0x08]));
+-			if (h->length < 0x0A) break;
+-			pr_attr("DIMM Spare Part Number", "%s", dmi_string(h, data[0x09]));
++			if (h->length < 0x0B) break;
++			if (WORD(data + 0x09))
++				pr_attr("DIMM Manufacture Date", "20%02x-W%02x", data[0x09], data[0x0A]);
+ 			break;
+ 
+ 		case 238:
diff --git a/debian/patches/series b/debian/patches/series
index e5a3b6d..5219567 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,5 @@
 #0130-use_DWORD_for_table_max_size.patch
 #0135-hide_fixup_msg.patch
 #0140-Fix_scan_entry_point.patch
+0155-use_read_file.patch
+0160-HPE_OEM_Firmware_change.patch
diff --git a/debian/rules b/debian/rules
index dd31875..a7e6173 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,7 @@ endif
 	dh ${@}
 
 override_dh_auto_build:
-	dh_auto_build -- CC=$(CC) CFLAGS="$(CFLAGS) $(CPPFLAGS) -Os -ansi" LDFLAGS="$(LDFLAGS)"
+	dh_auto_build -- CC=$(CC) CFLAGS="$(CFLAGS) $(CPPFLAGS) -Os" LDFLAGS="$(LDFLAGS)"
 
 override_dh_auto_install:
 	dh_auto_install -- prefix=/usr