From 130071a0660da7eca6f7be698742b7a2866f4a1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 7 May 2021 08:51:15 +0200 Subject: Add upstream recommended patches --- debian/changelog | 8 ++++++++ debian/files | 1 + .../0145-Fix_condition_error_in_ascii_filter.patch | 18 ++++++++++++++++++ debian/patches/0150-Fix_crash.patch | 21 +++++++++++++++++++++ debian/patches/series | 2 ++ 5 files changed, 50 insertions(+) create mode 100644 debian/files create mode 100644 debian/patches/0145-Fix_condition_error_in_ascii_filter.patch create mode 100644 debian/patches/0150-Fix_crash.patch diff --git a/debian/changelog b/debian/changelog index 207025c..1585f0d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +dmidecode (3.3-2) UNRELEASED; urgency=medium + + * Add upstream recommended patches (Closes: #987033): + - New debian/patches/0145-Fix_condition_error_in_ascii_filter.patch. + - New debian/patches/0150-Fix_crash.patch. + + -- Jörg Frings-Fürst Fri, 07 May 2021 08:46:44 +0200 + dmidecode (3.3-1) unstable; urgency=medium * New upstream release. diff --git a/debian/files b/debian/files new file mode 100644 index 0000000..029f335 --- /dev/null +++ b/debian/files @@ -0,0 +1 @@ +dmidecode_3.3-1_source.buildinfo utils optional diff --git a/debian/patches/0145-Fix_condition_error_in_ascii_filter.patch b/debian/patches/0145-Fix_condition_error_in_ascii_filter.patch new file mode 100644 index 0000000..c7d976e --- /dev/null +++ b/debian/patches/0145-Fix_condition_error_in_ascii_filter.patch @@ -0,0 +1,18 @@ +Description: Fix the condition error in ascii_filter +Origin: upstream, http://git.savannah.gnu.org/cgit/dmidecode.git/commit/?id=1117390ccd9cea139638db6f460bb6de70e28f94 +Last-Update: 2021-05-07 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/dmidecode.c +=================================================================== +--- trunk.orig/dmidecode.c ++++ trunk/dmidecode.c +@@ -116,7 +116,7 @@ static void ascii_filter(char *bp, size_ + size_t i; + + for (i = 0; i < len; i++) +- if (bp[i] < 32 || bp[i] == 127) ++ if (bp[i] < 32 || bp[i] >= 127) + bp[i] = '.'; + } + diff --git a/debian/patches/0150-Fix_crash.patch b/debian/patches/0150-Fix_crash.patch new file mode 100644 index 0000000..c6c5af7 --- /dev/null +++ b/debian/patches/0150-Fix_crash.patch @@ -0,0 +1,21 @@ +Description: Fix crash with -u option +Origin: upstream, http://git.savannah.gnu.org/cgit/dmidecode.git/commit/?id=11e134e54d15e67a64c39a623f492a28df922517 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=987033 +Last-Update: 2021-05-07 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/dmidecode.c +=================================================================== +--- trunk.orig/dmidecode.c ++++ trunk/dmidecode.c +@@ -248,9 +248,9 @@ static void dmi_dump(const struct dmi_he + { + int j, l = strlen(s) + 1; + +- off = 0; + for (row = 0; row < ((l - 1) >> 4) + 1; row++) + { ++ off = 0; + for (j = 0; j < 16 && j < l - (row << 4); j++) + off += sprintf(raw_data + off, + j ? " %02X" : "%02X", diff --git a/debian/patches/series b/debian/patches/series index b13a143..29b56d5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,5 @@ +0145-Fix_condition_error_in_ascii_filter.patch +0150-Fix_crash.patch 0100-ansi-c.patch 0001-hurd.patch #0005-build.patch -- cgit v1.2.3