Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (ce39589663f8c34393baf6bf65933e464fcee666)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • 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 (ce39589663f8c34393baf6bf65933e464fcee666)
  • Date: Sun, 28 Feb 2021 00:13:08 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

libs/musl/DETAILS | 6 +-
libs/musl/HISTORY | 4 +
libs/musl/patches/wcsnrtombs-cve-2020-28928.diff | 66
-----------------------
3 files changed, 7 insertions(+), 69 deletions(-)

New commits:
commit ce39589663f8c34393baf6bf65933e464fcee666
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

musl 1.2.2

diff --git a/libs/musl/DETAILS b/libs/musl/DETAILS
index 5d53786..32ce5e3 100755
--- a/libs/musl/DETAILS
+++ b/libs/musl/DETAILS
@@ -1,10 +1,10 @@
SPELL=musl
- VERSION=1.2.1
+ VERSION=1.2.2
SECURITY_PATCH=1
SOURCE="$SPELL-$VERSION.tar.gz"
- WEB_SITE="https://musl.libc.org/";
+ WEB_SITE="https://musl.libc.org";
SOURCE_URL[0]="$WEB_SITE/releases/${SOURCE}"
-
SOURCE_HASH=sha512:455464ef47108a78457291bda2b1ea574987a1787f6001e9376956f20521593a4816bc215dab41c1a80292ae7ebd315accb4d4fa6a1210ff77d9a4d68239e960
+
SOURCE_HASH=sha512:5344b581bd6463d71af8c13e91792fa51f25a96a1ecbea81e42664b63d90b325aeb421dfbc8c22e187397ca08e84d9296a0c0c299ba04fa2b751d6864914bd82
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
LICENSE[0]="MIT"
ENTERED=20150110
diff --git a/libs/musl/HISTORY b/libs/musl/HISTORY
index cde6d52..f9e59ba 100644
--- a/libs/musl/HISTORY
+++ b/libs/musl/HISTORY
@@ -1,3 +1,7 @@
+2021-02-21 Ismael Luceno <ismael AT sourcemage.org>
+ * patches/wcsnrtombs-cve-2020-28928.diff: removed, no longer needed
+ * DETAILS: updated spell to 1.2.2
+
2020-11-20 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated website, SECURITY_PATCH++
* patches/wcsnrtombs-cve-2020-28928.diff: patch for CVE-2020-28928
diff --git a/libs/musl/patches/wcsnrtombs-cve-2020-28928.diff
b/libs/musl/patches/wcsnrtombs-cve-2020-28928.diff
deleted file mode 100644
index ef6c07c..0000000
--- a/libs/musl/patches/wcsnrtombs-cve-2020-28928.diff
+++ /dev/null
@@ -1,66 +0,0 @@
-diff --git a/src/multibyte/wcsnrtombs.c b/src/multibyte/wcsnrtombs.c
-index 676932b5..95e25e70 100644
---- a/src/multibyte/wcsnrtombs.c
-+++ b/src/multibyte/wcsnrtombs.c
-@@ -1,41 +1,33 @@
- #include <wchar.h>
-+#include <limits.h>
-+#include <string.h>
-
- size_t wcsnrtombs(char *restrict dst, const wchar_t **restrict wcs, size_t
wn, size_t n, mbstate_t *restrict st)
- {
-- size_t l, cnt=0, n2;
-- char *s, buf[256];
- const wchar_t *ws = *wcs;
-- const wchar_t *tmp_ws;
--
-- if (!dst) s = buf, n = sizeof buf;
-- else s = dst;
--
-- while ( ws && n && ( (n2=wn)>=n || n2>32 ) ) {
-- if (n2>=n) n2=n;
-- tmp_ws = ws;
-- l = wcsrtombs(s, &ws, n2, 0);
-- if (!(l+1)) {
-- cnt = l;
-- n = 0;
-+ size_t cnt = 0;
-+ if (!dst) n=0;
-+ while (ws && wn) {
-+ char tmp[MB_LEN_MAX];
-+ size_t l = wcrtomb(n<MB_LEN_MAX ? tmp : dst, *ws, 0);
-+ if (l==-1) {
-+ cnt = -1;
- break;
- }
-- if (s != buf) {
-- s += l;
-+ if (dst) {
-+ if (n<MB_LEN_MAX) {
-+ if (l>n) break;
-+ memcpy(dst, tmp, l);
-+ }
-+ dst += l;
- n -= l;
- }
-- wn = ws ? wn - (ws - tmp_ws) : 0;
-- cnt += l;
-- }
-- if (ws) while (n && wn) {
-- l = wcrtomb(s, *ws, 0);
-- if ((l+1)<=1) {
-- if (!l) ws = 0;
-- else cnt = l;
-+ if (!*ws) {
-+ ws = 0;
- break;
- }
-- ws++; wn--;
-- /* safe - this loop runs fewer than sizeof(buf) times */
-- s+=l; n-=l;
-+ ws++;
-+ wn--;
- cnt += l;
- }
- if (dst) *wcs = ws;
-



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (ce39589663f8c34393baf6bf65933e464fcee666), Ismael Luceno, 02/27/2021

Archive powered by MHonArc 2.6.24.

Top of Page