sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Ismael Luceno (0494534207a1e5f8dfcaef8a9df8e92ddd9e75d8)
- From: Ismael Luceno <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (0494534207a1e5f8dfcaef8a9df8e92ddd9e75d8)
- Date: Tue, 20 Apr 2021 20:14:00 +0000
GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:
shell-term-fm/dash/DETAILS
| 4 -
shell-term-fm/dash/HISTORY
| 3
utils/dmidecode/DETAILS
| 2
utils/dmidecode/HISTORY
| 6 +
utils/dmidecode/PRE_BUILD
| 3
utils/dmidecode/patches/0001-dmidecode--Fix-crash-with--u-option.patch
| 35 ++++++++++
utils/dmidecode/patches/0001-dmidecode--Fix-the-condition-error-in-ascii-filter.patch
| 31 ++++++++
7 files changed, 79 insertions(+), 5 deletions(-)
New commits:
commit 0494534207a1e5f8dfcaef8a9df8e92ddd9e75d8
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
dmidecode 3.3
commit 8ba7f164664eff64d2d2d79dc168f6595d60c7c7
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
dash 0.5.11.3
diff --git a/shell-term-fm/dash/DETAILS b/shell-term-fm/dash/DETAILS
index cd92b1a..6505702 100755
--- a/shell-term-fm/dash/DETAILS
+++ b/shell-term-fm/dash/DETAILS
@@ -1,10 +1,10 @@
SPELL=dash
- VERSION=0.5.8
+ VERSION=0.5.11.3
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://gondor.apana.org.au/~herbert/dash/files/$SOURCE
-
SOURCE_HASH=sha512:3dc42d3503b33c50b62c0f9104c0e41c4e8fa7490ba72bc09213fcc894d6fd92b9688c58389acf8b538b08f8e9cc179f0bf5572e22175d1960f04554594237b8
+
SOURCE_HASH=sha512:ffe69b8de3586aba298d936168c329524e385252e12979aa1db28761e882048eb5a80673e93a2a2227f61b52fd8b56546b78c5db9c21a022072f536267f8bc20
WEB_SITE=http://gondor.apana.org.au/~herbert/dash/
LICENSE[0]=BSD
ENTERED=20060706
diff --git a/shell-term-fm/dash/HISTORY b/shell-term-fm/dash/HISTORY
index ccb3501..44670d0 100644
--- a/shell-term-fm/dash/HISTORY
+++ b/shell-term-fm/dash/HISTORY
@@ -1,3 +1,6 @@
+2021-04-20 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 0.5.11.3
+
2021-02-13 Ismael Luceno <ismael AT sourcemage.org>
* BUILD: Fixed build with GCC 10
diff --git a/utils/dmidecode/DETAILS b/utils/dmidecode/DETAILS
index 7311da4..0f1acd5 100755
--- a/utils/dmidecode/DETAILS
+++ b/utils/dmidecode/DETAILS
@@ -1,5 +1,5 @@
SPELL=dmidecode
- VERSION=3.2
+ VERSION=3.3
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=https://savannah.nongnu.org/download/dmidecode/$SOURCE
diff --git a/utils/dmidecode/HISTORY b/utils/dmidecode/HISTORY
index 099190f..aafd24f 100644
--- a/utils/dmidecode/HISTORY
+++ b/utils/dmidecode/HISTORY
@@ -1,3 +1,9 @@
+2021-04-20 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 3.3
+ * PRE_BUILD, patches/0001-dmidecode--Fix-crash-with--u-option.patch,
+
patches/0001-dmidecode--Fix-the-condition-error-in-ascii-filter.patch:
+ added bug fixes recommended by upstream
+
2018-12-08 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.2
* DETAILS: add gpg checking
diff --git a/utils/dmidecode/PRE_BUILD b/utils/dmidecode/PRE_BUILD
index 2c0db9d..0cab101 100755
--- a/utils/dmidecode/PRE_BUILD
+++ b/utils/dmidecode/PRE_BUILD
@@ -1,4 +1,3 @@
default_pre_build &&
cd "${SOURCE_DIRECTORY}" &&
-
-sed -i "s:^CFLAGS +=.*:CFLAGS += ${CFLAGS}:" Makefile
+apply_patch_dir patches
diff --git
a/utils/dmidecode/patches/0001-dmidecode--Fix-crash-with--u-option.patch
b/utils/dmidecode/patches/0001-dmidecode--Fix-crash-with--u-option.patch
new file mode 100644
index 0000000..92e97cc
--- /dev/null
+++ b/utils/dmidecode/patches/0001-dmidecode--Fix-crash-with--u-option.patch
@@ -0,0 +1,35 @@
+From 11e134e54d15e67a64c39a623f492a28df922517 Mon Sep 17 00:00:00 2001
+From: Jean Delvare <jdelvare AT suse.de>
+Date: Tue, 19 Jan 2021 16:26:01 +0100
+Subject: dmidecode: Fix crash with -u option
+
+A segmentation fault was reported with option -u. Turns out to be a
+stupid thinko where the buffer offset was reset at the wrong loop
+depth.
+
+Reported-by: Jerry Hoemann <jerry.hoemann AT hpe.com>
+Fixes: da06888d08b9 ("dmidecode: Use the print helpers in dump mode too")
+Signed-off-by: Jean Delvare <jdelvare AT suse.de>
+Upstream-Status: Backport
+---
+ dmidecode.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dmidecode.c b/dmidecode.c
+index 572cb1a..69ea0e8 100644
+--- a/dmidecode.c
++++ b/dmidecode.c
+@@ -248,9 +248,9 @@ static void dmi_dump(const struct dmi_header *h)
+ {
+ 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",
+--
+cgit v1.2.1
+
diff --git
a/utils/dmidecode/patches/0001-dmidecode--Fix-the-condition-error-in-ascii-filter.patch
b/utils/dmidecode/patches/0001-dmidecode--Fix-the-condition-error-in-ascii-filter.patch
new file mode 100644
index 0000000..023e4f0
--- /dev/null
+++
b/utils/dmidecode/patches/0001-dmidecode--Fix-the-condition-error-in-ascii-filter.patch
@@ -0,0 +1,31 @@
+From 1117390ccd9cea139638db6f460bb6de70e28f94 Mon Sep 17 00:00:00 2001
+From: Tianjia Zhang <tianjia.zhang AT linux.alibaba.com>
+Date: Tue, 5 Jan 2021 10:36:29 +0100
+Subject: dmidecode: Fix the condition error in ascii_filter
+
+The normal printable ASCII range is 32 to 127 (not included),
+so fix the error in this if condition.
+
+Signed-off-by: Tianjia Zhang <tianjia.zhang AT linux.alibaba.com>
+Signed-off-by: Jean Delvare <jdelvare AT suse.de>
+Upstream-Status: Backport
+---
+ dmidecode.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dmidecode.c b/dmidecode.c
+index 27d5494..864a193 100644
+--- a/dmidecode.c
++++ b/dmidecode.c
+@@ -116,7 +116,7 @@ static void ascii_filter(char *bp, size_t len)
+ 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] = '.';
+ }
+
+--
+cgit v1.2.1
+
- [SM-Commit] GIT changes to master grimoire by Ismael Luceno (0494534207a1e5f8dfcaef8a9df8e92ddd9e75d8), Ismael Luceno, 04/20/2021
Archive powered by MHonArc 2.6.24.