sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (fc8e5d0658ebf99ec8be91f2198882ad5a6d38ec)
- From: Ismael Luceno <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
- Subject: [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (fc8e5d0658ebf99ec8be91f2198882ad5a6d38ec)
- Date: Fri, 28 Aug 2026 11:50:01 +0000
GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:
http/dillo/DEPENDS
| 2
http/dillo/DETAILS
| 10 +-
http/dillo/HISTORY
| 3
http/dillo/PRE_BUILD
| 3
libs/musl/DETAILS
| 4 -
libs/musl/HISTORY
| 8 ++
libs/musl/patches/0001-catgets-Handle-invalid-catalog-descriptor.patch
| 35 +++++++++
libs/musl/patches/0001-iconv-fix-erroneous-input-validation-in-EUC-KR-decoder.patch
| 38 ----------
libs/musl/patches/0001-iconv-harden-UTF-8-output-code-path-against-input-decoder.patch
| 38 ----------
9 files changed, 55 insertions(+), 86 deletions(-)
New commits:
commit fc8e5d0658ebf99ec8be91f2198882ad5a6d38ec
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
musl 1.2.6
commit 323a900b6c2327069212195be812dde15ff90ad7
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
dillo 3.3.0
diff --git a/http/dillo/DEPENDS b/http/dillo/DEPENDS
index 7a9d39b..4465928 100755
--- a/http/dillo/DEPENDS
+++ b/http/dillo/DEPENDS
@@ -1,4 +1,4 @@
-depends fltk &&
+depends fltk --enable-experimental-fltk &&
depends wget &&
depends zlib &&
diff --git a/http/dillo/DETAILS b/http/dillo/DETAILS
index 62d0d82..b4f05d2 100755
--- a/http/dillo/DETAILS
+++ b/http/dillo/DETAILS
@@ -1,10 +1,10 @@
. "$GRIMOIRE/FUNCTIONS"
SPELL=dillo
- VERSION=3.2.0
- SOURCE=dillo-$VERSION.tar.bz2
-
SOURCE_URL[0]=https://github.com/dillo-browser/dillo/releases/download/v$VERSION/$SOURCE
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/dillo-$VERSION
-
SOURCE_HASH=sha512:d797dd24c7312ad607c1d8e7fe2153860eaf1bb2146108a183ad788ea59319ec11d2160b9a7cca673f3d04474121b57d8dfa73bf3921daebe601794b8cbdea09
+ VERSION=3.3.0
+ SOURCE=dillo-v$VERSION.tar.gz
+ SOURCE_URL[0]=https://git.sr.ht/~dillo/dillo/archive/v$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/dillo-v$VERSION
+
SOURCE_HASH=sha512:189d73122ba0f557ca295c147d82b525ba779d1a468c730d167a1be6b2ae1beda7de717e8941378f7fe21a4a935f593c31993df4f0e5dc55a6b235cb7c9c8e1f
LICENSE[0]=GPL
WEB_SITE=https://dillo-browser.github.io/
ENTERED=20080826
diff --git a/http/dillo/HISTORY b/http/dillo/HISTORY
index 5df18a8..f0bbb5d 100644
--- a/http/dillo/HISTORY
+++ b/http/dillo/HISTORY
@@ -1,3 +1,6 @@
+2026-08-27 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS, DETAILS, PRE_BUILD: updated spell to 3.3.0
+
2025-01-20 Ismael Luceno <ismael AT sourcemage.org>
* TRIGGERS: added check_self for fltk
* BUILD, DEPENDS, DETAILS: updated spell to 3.2.0
diff --git a/http/dillo/PRE_BUILD b/http/dillo/PRE_BUILD
index 1758366..cf38921 100755
--- a/http/dillo/PRE_BUILD
+++ b/http/dillo/PRE_BUILD
@@ -1,4 +1,3 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-# XXX: Enable building Dillo 3.2.0 with FLTK 1.4.x
-sedit '/^fltk_version=/{s@=.*@=1.3.99@}' configure
+autoreconf -fi
diff --git a/libs/musl/DETAILS b/libs/musl/DETAILS
index 139b128..864db7b 100755
--- a/libs/musl/DETAILS
+++ b/libs/musl/DETAILS
@@ -1,10 +1,10 @@
SPELL=musl
- VERSION=1.2.5
+ VERSION=1.2.6
SECURITY_PATCH=1
SOURCE="$SPELL-$VERSION.tar.gz"
WEB_SITE="https://musl.libc.org";
SOURCE_URL[0]="$WEB_SITE/releases/${SOURCE}"
-
SOURCE_HASH=sha512:7bb7f7833923cd69c7a1a9b8a5f1784bfd5289663eb6061dcd43d583e45987df8a68a1be05d75cc1c88a3f5b610653d1a70f4a9cff4d8f7fd41ae73ee058c17c
+
SOURCE_HASH=sha512:1adad96eddb3a2eb0cacb3e363b0046568925fcdd75cf8b0503f2139df1f693d64730779ca0ce8131b7624ab2d37f4247bb1d3393c523de6e30d2b1d7732555c
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
STAGED_INSTALL=off
LICENSE[0]="MIT"
diff --git a/libs/musl/HISTORY b/libs/musl/HISTORY
index 84cab5f..bd287d4 100644
--- a/libs/musl/HISTORY
+++ b/libs/musl/HISTORY
@@ -1,3 +1,11 @@
+2026-08-28 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 1.2.6
+ * patches/0001-catgets-Handle-invalid-catalog-descriptor.patch:
+ fixed segfault in tcsh
+ *
patches/0001-iconv-fix-erroneous-input-validation-in-EUC-KR-decoder.patch,
+
patches/0001-iconv-harden-UTF-8-output-code-path-against-input-decoder.patch:
+ removed, no longer needed
+
2025-02-17 Ismael Luceno <ismael AT sourcemage.org>
*
patches/0001-iconv-fix-erroneous-input-validation-in-EUC-KR-decoder.patch,
patches/0001-iconv-harden-UTF-8-output-code-path-against-input-decoder.patch:
diff --git
a/libs/musl/patches/0001-catgets-Handle-invalid-catalog-descriptor.patch
b/libs/musl/patches/0001-catgets-Handle-invalid-catalog-descriptor.patch
new file mode 100644
index 0000000..c079e6b
--- /dev/null
+++ b/libs/musl/patches/0001-catgets-Handle-invalid-catalog-descriptor.patch
@@ -0,0 +1,35 @@
+From f1463d7b57118d6fe850b581f7fe15f2e52311da Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael AT iodev.co.uk>
+Date: Fri, 28 Aug 2026 12:51:00 +0200
+Subject: [PATCH] catgets: Handle invalid catalog descriptor
+
+catopen returns -1 on failure, but catgets dereferenced its catd argument
+unconditionally, so passing that value crashed. POSIX allows catgets to
+fail with EBADF for an invalid descriptor and requires it to return the
+caller-supplied default string.
+
+Callers relying on this are common: tcsh calls catopen unconditionally and
+feeds the result to catgets without checking it, so every tcsh invocation
+segfaulted on a system with no message catalogs installed.
+
+Upstream-Status: Pending
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
+---
+ src/locale/catgets.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/locale/catgets.c b/src/locale/catgets.c
+index 71c31c1d6d01..01a4121551c2 100644
+--- a/src/locale/catgets.c
++++ b/src/locale/catgets.c
+@@ -15,6 +15,10 @@ static int cmp(const void *a, const void *b)
+
+ char *catgets (nl_catd catd, int set_id, int msg_id, const char *s)
+ {
++ if (catd == (nl_catd)-1) {
++ errno = EBADF;
++ return (char *)s;
++ }
+ const char *map = (const char *)catd;
+ uint32_t nsets = V(map+4);
+ const char *sets = map+20;
diff --git
a/libs/musl/patches/0001-iconv-fix-erroneous-input-validation-in-EUC-KR-decoder.patch
b/libs/musl/patches/0001-iconv-fix-erroneous-input-validation-in-EUC-KR-decoder.patch
deleted file mode 100644
index e62d28d..0000000
---
a/libs/musl/patches/0001-iconv-fix-erroneous-input-validation-in-EUC-KR-decoder.patch
+++ /dev/null
@@ -1,38 +0,0 @@
->From e5adcd97b5196e29991b524237381a0202a60659 Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias AT aerifal.cx>
-Date: Sun, 9 Feb 2025 10:07:19 -0500
-Subject: [PATCH] iconv: fix erroneous input validation in EUC-KR decoder
-
-as a result of incorrect bounds checking on the lead byte being
-decoded, certain invalid inputs which should produce an encoding
-error, such as "\xc8\x41", instead produced out-of-bounds loads from
-the ksc table.
-
-in a worst case, the loaded value may not be a valid unicode scalar
-value, in which case, if the output encoding was UTF-8, wctomb would
-return (size_t)-1, causing an overflow in the output pointer and
-remaining buffer size which could clobber memory outside of the output
-buffer.
-
-bug report was submitted in private by Nick Wellnhofer on account of
-potential security implications.
----
- src/locale/iconv.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/locale/iconv.c b/src/locale/iconv.c
-index 9605c8e9..008c93f0 100644
---- a/src/locale/iconv.c
-+++ b/src/locale/iconv.c
-@@ -502,7 +502,7 @@ size_t iconv(iconv_t cd, char **restrict in, size_t
*restrict inb, char **restri
- if (c >= 93 || d >= 94) {
- c += (0xa1-0x81);
- d += 0xa1;
-- if (c >= 93 || c>=0xc6-0x81 && d>0x52)
-+ if (c > 0xc6-0x81 || c==0xc6-0x81 && d>0x52)
- goto ilseq;
- if (d-'A'<26) d = d-'A';
- else if (d-'a'<26) d = d-'a'+26;
---
-2.21.0
-
diff --git
a/libs/musl/patches/0001-iconv-harden-UTF-8-output-code-path-against-input-decoder.patch
b/libs/musl/patches/0001-iconv-harden-UTF-8-output-code-path-against-input-decoder.patch
deleted file mode 100644
index 9b64508..0000000
---
a/libs/musl/patches/0001-iconv-harden-UTF-8-output-code-path-against-input-decoder.patch
+++ /dev/null
@@ -1,38 +0,0 @@
->From c47ad25ea3b484e10326f933e927c0bc8cded3da Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias AT aerifal.cx>
-Date: Wed, 12 Feb 2025 17:06:30 -0500
-Subject: [PATCH] iconv: harden UTF-8 output code path against input decoder
- bugs
-
-the UTF-8 output code was written assuming an invariant that iconv's
-decoders only emit valid Unicode Scalar Values which wctomb can encode
-successfully, thereby always returning a value between 1 and 4.
-
-if this invariant is not satisfied, wctomb returns (size_t)-1, and the
-subsequent adjustments to the output buffer pointer and remaining
-output byte count overflow, moving the output position backwards,
-potentially past the beginning of the buffer, without storing any
-bytes.
----
- src/locale/iconv.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/locale/iconv.c b/src/locale/iconv.c
-index 008c93f0..52178950 100644
---- a/src/locale/iconv.c
-+++ b/src/locale/iconv.c
-@@ -545,6 +545,10 @@ size_t iconv(iconv_t cd, char **restrict in, size_t
*restrict inb, char **restri
- if (*outb < k) goto toobig;
- memcpy(*out, tmp, k);
- } else k = wctomb_utf8(*out, c);
-+ /* This failure condition should be unreachable, but
-+ * is included to prevent decoder bugs from
translating
-+ * into advancement outside the output buffer range.
*/
-+ if (k>4) goto ilseq;
- *out += k;
- *outb -= k;
- break;
---
-2.21.0
-
-
- [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (fc8e5d0658ebf99ec8be91f2198882ad5a6d38ec), Ismael Luceno, 08/28/2026
Archive powered by MHonArc 2.6.24.