From 8a5c4f9e437cde32f2abeb9bc59eedbb1489dde4 Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Mon, 11 Oct 2021 08:21:58 +0300
Subject: [PATCH] busybox: 1.34.1

---
 core/busybox/checksums                |  3 +-
 core/busybox/patches/awk-fix-%%.patch | 52 ---------------------------
 core/busybox/sources                  |  1 -
 core/busybox/version                  |  2 +-
 4 files changed, 2 insertions(+), 56 deletions(-)
 delete mode 100644 core/busybox/patches/awk-fix-%%.patch

diff --git a/core/busybox/checksums b/core/busybox/checksums
index 14d8255d..4382d5a1 100644
--- a/core/busybox/checksums
+++ b/core/busybox/checksums
@@ -1,4 +1,4 @@
-dbc9c73cce208e428de003d785bf88cc9f27c86d4b784adf32738f8b073cbe9a
+0187bee922b10a7dbd90410d81a653a4b3061b4e516997ffc539bd51ac76f15c
 09c2f601fec4e5c10664c22f787dafb9424efe219bf826727c356da90dfd60d5
 8d84b1719dca2a751c09072c20cd782a3c47f119a68d35316f89d851daf67b88
 0f54301a73af461e8066bc805b48d991cfed513d08a2f036e015b19f97cb424a
@@ -7,7 +7,6 @@ f0e17fefc0af6b10205d72b242b6ef7481a58ff07726c62890ebc5893b96a396
 73be7b16dcff44e88eb48696522794f529beddf9d5a139b8a76cc8685a9f6fc8
 d70c4cd6381baeb3836c0387f53553021b48bdc851de49f1c86d836f7d0355fc
 b030d6ac2b3284cf3cc0a2eec886d26b7e09ea59feb460a6a09165da62a582b4
-8a5a225a5ae6fbd98718c720aa6f57826d5040b8eaa25e45bb79a109b54cfb15
 c8a6fc95a75fa355d570c14e214d68a618e060a486b824b83b5140b9c6a894a7
 5f3d6cbdc7060deab644555201365e6dd15ffed07d341532c3d82a170e95c0bd
 423c3a67ad56b290ef73440cb748dbc3c6ee2ec486683b5e19242a804db8085b
diff --git a/core/busybox/patches/awk-fix-%%.patch b/core/busybox/patches/awk-fix-%%.patch
deleted file mode 100644
index bb23239b..00000000
--- a/core/busybox/patches/awk-fix-%%.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-
-Upstream commit:
-
-    awk: fix read beyond end of buffer
-    Commit 7d06d6e18 (awk: fix printf %%) can cause awk printf to read
-    beyond the end of a strduped buffer:
-
-      2349      while (*f && *f != '%')
-      2350          f++;
-      2351      c = *++f;
-
-    If the loop terminates because a NUL character is detected the
-    character after the NUL is read.  This can result in failures
-    depending on the value of that character.
-
-    function                                             old     new   delta
-    awk_printf                                           672     665      -7
-
-    Signed-off-by: Ron Yorston <rmy@pobox.com>
-    Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-
-diff --git a/editors/awk.c b/editors/awk.c
-index 3adbca7..02c26d7 100644
---- a/editors/awk.c
-+++ b/editors/awk.c
-@@ -2346,12 +2346,21 @@ static char *awk_printf(node *n, size_t *len)
- 		size_t slen;
-
- 		s = f;
--		while (*f && (*f != '%' || *++f == '%'))
--			f++;
--		while (*f && !isalpha(*f)) {
--			if (*f == '*')
--				syntax_error("%*x formats are not supported");
-+		while (*f && *f != '%')
- 			f++;
-+		if (*f) {
-+      c = *++f;
-+			if (c == '%') { /* double % */
-+				slen = f - s;
-+				s = xstrndup(s, slen);
-+				f++;
-+				goto tail;
-+			}
-+			while (*f && !isalpha(*f)) {
-+				if (*f == '*')
-+					syntax_error("%*x formats are not supported");
-+				f++;
-+ 			}
- 		}
- 		c = *f;
- 		if (!c) {
diff --git a/core/busybox/sources b/core/busybox/sources
index abc7be3d..a273844f 100644
--- a/core/busybox/sources
+++ b/core/busybox/sources
@@ -7,7 +7,6 @@ patches/install-fix-chown.patch patch
 patches/lsusb-vendor-product.patch patch
 patches/unzip-usage-no-error.patch patch
 patches/init-use-baseinit.patch patch
-patches/awk-fix-%%.patch patch
 patches/fix-UB.patch patch-clang
 files/.config
 files/.config-suid
diff --git a/core/busybox/version b/core/busybox/version
index 4b9f397c..fe176654 100644
--- a/core/busybox/version
+++ b/core/busybox/version
@@ -1 +1 @@
-1.34.0 6
+1.34.1 1