From 5529b527d56af1eca4bd99dbe95ebf240dddb1af Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Wed, 20 Jan 2021 21:30:24 +0300
Subject: musl: bump to 1.2.2

---
 core/musl/build                        |  2 --
 core/musl/checksums                    |  2 +-
 core/musl/patches/CVE-2020-28928.patch | 64 ----------------------------------
 core/musl/sources                      |  3 +-
 core/musl/version                      |  2 +-
 5 files changed, 3 insertions(+), 70 deletions(-)
 delete mode 100644 core/musl/patches/CVE-2020-28928.patch

(limited to 'core')

diff --git a/core/musl/build b/core/musl/build
index 44b80ec1..e48ce47f 100755
--- a/core/musl/build
+++ b/core/musl/build
@@ -16,8 +16,6 @@ kinstall_t() {
     done
 }
 
-patch -p0 < CVE-2020-28928.patch
-
 ./configure \
     --prefix=/usr \
     --syslibdir=/usr/lib
diff --git a/core/musl/checksums b/core/musl/checksums
index cae02eda..fe5203f2 100644
--- a/core/musl/checksums
+++ b/core/musl/checksums
@@ -1,4 +1,4 @@
-68af6e18539f646f9c41a3a2bb25be4a5cfa5a8f65f0bb647fd2bbfdf877e84b  musl-1.2.1.tar.gz
+9b969322012d796dc23dda27a35866034fa67d8fb67e0e2c45c913c3d43219dd  musl-1.2.2.tar.gz
 30bb6d7e0e0b61fcd95d830c376c829a614bce4683c1b97e06c201ec2c6e839a  cdefs.h
 c13407edd0e33be73cae72514cb234f8612e1c0e54401c9448daffd3a240158b  queue.h
 e1e498a79bf160a5766fa560f2b07b206fe89fe21a62600c77d72e00a6992f92  tree.h
diff --git a/core/musl/patches/CVE-2020-28928.patch b/core/musl/patches/CVE-2020-28928.patch
deleted file mode 100644
index 9075ae1f..00000000
--- a/core/musl/patches/CVE-2020-28928.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- src/multibyte/wcsnrtombs.c
-+++ 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;
-
diff --git a/core/musl/sources b/core/musl/sources
index c23268c7..40571d85 100644
--- a/core/musl/sources
+++ b/core/musl/sources
@@ -1,8 +1,7 @@
-https://www.musl-libc.org/releases/musl-1.2.1.tar.gz
+https://www.musl-libc.org/releases/musl-1.2.2.tar.gz
 files/cdefs.h
 files/queue.h
 files/tree.h
 files/getconf.c
 files/getent
 files/__stack_chk_fail_local.c
-patches/CVE-2020-28928.patch
diff --git a/core/musl/version b/core/musl/version
index 28527bea..52669276 100644
--- a/core/musl/version
+++ b/core/musl/version
@@ -1 +1 @@
-1.2.1 2
+1.2.2 1
-- 
cgit v1.2.3