From 28c507a87ce5c5fcb63476d29690331d47ac069c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 15 Jul 2023 15:42:52 +0200 Subject: New upstream patches --- debian/patches/0155-use_read_file.patch | 43 +++++++++++++++++++++++ debian/patches/0160-HPE_OEM_Firmware_change.patch | 32 +++++++++++++++++ debian/patches/series | 2 ++ 3 files changed, 77 insertions(+) create mode 100644 debian/patches/0155-use_read_file.patch create mode 100644 debian/patches/0160-HPE_OEM_Firmware_change.patch 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 -- cgit v1.2.3 From 631d24d23d137f28d6c7b5c5c1ece26dc23f2ed8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 15 Jul 2023 16:57:17 +0200 Subject: Add upstream requested patches --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 39dc0cd..30ff203 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +dmidecode (3.5-2) UNRELEASED; urgency=medium + + * New upstream patches: + - debian/patches/0155-use_read_file.patch + - debian/patches/0160-HPE_OEM_Firmware_change.patch + + -- Jörg Frings-Fürst Sat, 15 Jul 2023 13:41:27 +0200 + dmidecode (3.5-1) unstable; urgency=medium * New upstream release (Closes: #1032980). -- cgit v1.2.3 From 3cf82b74f0127eb3092bb989e14f76881fbdb736 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 15 Jul 2023 17:02:03 +0200 Subject: New dmidecode.lintian-overrides --- debian/changelog | 1 + debian/dmidecode.lintian-overrides | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 debian/dmidecode.lintian-overrides diff --git a/debian/changelog b/debian/changelog index 30ff203..8f97f56 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ dmidecode (3.5-2) UNRELEASED; 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. -- Jörg Frings-Fürst Sat, 15 Jul 2023 13:41:27 +0200 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::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 -- cgit v1.2.3 From 872f6df82901c2f057bce995c570dc78931a9165 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 13 Aug 2023 19:52:36 +0200 Subject: d/rules: Remove ansi mode from override_dh_auto_build --- debian/changelog | 2 ++ debian/rules | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8f97f56..87fa6ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ dmidecode (3.5-2) UNRELEASED; urgency=medium - 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 Sat, 15 Jul 2023 13:41:27 +0200 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 -- cgit v1.2.3 From e791bb035e146432e8681c0308bec5df74281ce3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 13 Aug 2023 20:00:38 +0200 Subject: d/changelog: Change distribution to unstable, Change date and time --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 87fa6ba..b7a1180 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dmidecode (3.5-2) UNRELEASED; urgency=medium +dmidecode (3.5-2) unstable; urgency=medium * New upstream patches: - debian/patches/0155-use_read_file.patch @@ -7,7 +7,7 @@ dmidecode (3.5-2) UNRELEASED; urgency=medium * debian/rules: - Remove ansi mode from override_dh_auto_build (Closes: #1041611). - -- Jörg Frings-Fürst Sat, 15 Jul 2023 13:41:27 +0200 + -- Jörg Frings-Fürst Sun, 13 Aug 2023 19:53:46 +0200 dmidecode (3.5-1) unstable; urgency=medium -- cgit v1.2.3