summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2021-05-27 16:44:32 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2021-05-27 16:44:32 +0200
commitf69915f8b9c9574220aa78f6223a672c8be424b0 (patch)
tree33780b84ac90f6cb8cdf6b78c4d3e3d98332069e
parent434575706930a762d7cb26e26cc26b140b453f65 (diff)
parentbe412ebbf9cd697451a73a3cef071aa7d27a8eac (diff)
Merge branch 'release/debian/3.3-2'debian/3.3-2
-rw-r--r--debian/changelog11
-rw-r--r--debian/control2
-rw-r--r--debian/copyright2
-rw-r--r--debian/patches/0145-Fix_condition_error_in_ascii_filter.patch18
-rw-r--r--debian/patches/0150-Fix_crash.patch21
-rw-r--r--debian/patches/series2
6 files changed, 54 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 207025c..ac61225 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+dmidecode (3.3-2) unstable; 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.
+ * Declare compliance with Debian Policy 4.5.1 (No changes needed).
+ * debian/copyright:
+ - Add year 2021 to myself.
+
+ -- Jörg Frings-Fürst <debian@jff.email> Mon, 17 May 2021 18:53:43 +0200
+
dmidecode (3.3-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/control b/debian/control
index 2905d75..df43bfb 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: utils
Priority: optional
Maintainer: Jörg Frings-Fürst <debian@jff.email>
Build-Depends: debhelper-compat (= 13)
-Standards-Version: 4.5.0
+Standards-Version: 4.5.1
Rules-Requires-Root: no
Vcs-Git: git://jff.email/opt/git/dmidecode.git
Vcs-Browser: https://jff.email/cgit/dmidecode.git/
diff --git a/debian/copyright b/debian/copyright
index a7f582a..814fc2d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,7 +13,7 @@ License: GPL-2+
Files: debian/*
Copyright: 2003-2007 Petter Reinholdtsen <pere@debian.org>
2011-2012 Daniel Baumann <daniel.baumann@progress-technologies.net>
- 2014-2020 Jörg Frings-Fürst <debian@jff.email>
+ 2014-2021 Jörg Frings-Fürst <debian@jff.email>
License: GPL-2+
License: GPL-2+
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