Woodpecker CI 4ce71d772da8a401958771eb19293b6ef2190126 [SKIP CI]

7 files changed, 5 insertions, 88 deletions

diff --git a/autils/.checksum b/autils/.checksum
index 59a8bc1d..50f275f8 100644
--- a/autils/.checksum
+++ b/autils/.checksum
@@ -1 +1 @@
-0ecdb8c24fcecb036b86a814467c84162f27ec3afb6f7a446076956e98ea9d96  autils-bfd3420f7a507c4cacebc7ca827b436ec5f7d809.tar.gz
+6ef9dea4183e2913dfd73fec14b3e9924103afebfbb289d5627c2cbd05879657  autils-0.1.tar.gz
diff --git a/autils/abuild b/autils/abuild
index 78ee492e..d672694e 100644
--- a/autils/abuild
+++ b/autils/abuild
@@ -1,8 +1,7 @@
 name=autils
-version=20250912
-_commit=bfd3420f7a507c4cacebc7ca827b436ec5f7d809
+version=0.1
 release=1
-source="$name-$_commit.tar.gz::https://codeberg.org/emmett1/autils/archive/$_commit.tar.gz"
+source="$name-$version.tar.gz::https://codeberg.org/emmett1/autils/archive/v${version}.tar.gz"
 
 build() {
 	chmod +x INSTALL.sh
diff --git a/musl/.checksum b/musl/.checksum
index 2e299cc1..4116dc7a 100644
--- a/musl/.checksum
+++ b/musl/.checksum
@@ -1,5 +1,3 @@
-8471ed3317ec31cd92b0c6055407115bc7377aaad8da552ffbe6655871c9840b  0001-iconv-fix-erroneous-input-validation-in-EUC-KR-decod.patch
-18d1d243e0d7a479bc795d8af152d5f43b8f53f09da038d8e46ca2ac9207ecf4  0002-iconv-harden-UTF-8-output-code-path-against-input-de.patch
 936eb5830af322af38a1d08d02cc1d31ae95efdbc2e381b0e5fa6e91eebe693e  cdefs.h
 bfb4a93ede1bacfa7c7c78aaaf80372223effcea7bbc52aeffca655dd0922159  default-locpath.patch
 ae7b2598293d87cff4fc4e8bed5faabe486615ad7484a08d6dfea807786af895  elfutils-0.190-relr.patch
diff --git a/musl/0001-iconv-fix-erroneous-input-validation-in-EUC-KR-decod.patch b/musl/0001-iconv-fix-erroneous-input-validation-in-EUC-KR-decod.patch
deleted file mode 100644
index 27949dc3..00000000
--- a/musl/0001-iconv-fix-erroneous-input-validation-in-EUC-KR-decod.patch
+++ /dev/null
@@ -1,39 +0,0 @@
->From e5adcd97b5196e29991b524237381a0202a60659 Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@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/musl/0002-iconv-harden-UTF-8-output-code-path-against-input-de.patch b/musl/0002-iconv-harden-UTF-8-output-code-path-against-input-de.patch
deleted file mode 100644
index acb8a60a..00000000
--- a/musl/0002-iconv-harden-UTF-8-output-code-path-against-input-de.patch
+++ /dev/null
@@ -1,39 +0,0 @@
->From c47ad25ea3b484e10326f933e927c0bc8cded3da Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@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
-
-
-
diff --git a/musl/abuild b/musl/abuild
index 8f489be5..3f229dbf 100644
--- a/musl/abuild
+++ b/musl/abuild
@@ -1,6 +1,6 @@
 name=musl
 version=1.2.6
-release=1
+release=2
 source="https://www.musl-libc.org/releases/musl-$version.tar.gz
 	getconf.c
 	getconf.1
@@ -11,9 +11,7 @@ source="https://www.musl-libc.org/releases/musl-$version.tar.gz
 	queue.h
 	cdefs.h
 	elfutils-0.190-relr.patch
-	default-locpath.patch
-	0001-iconv-fix-erroneous-input-validation-in-EUC-KR-decod.patch
-	0002-iconv-harden-UTF-8-output-code-path-against-input-de.patch"
+	default-locpath.patch"
 keep_static=1
 
 build() {
diff --git a/musl/patch b/musl/patch
deleted file mode 100644
index e69de29b..00000000
--- a/musl/patch
+++ /dev/null