mirror of
https://codeberg.org/kiss-community/repo
synced 2025-02-23 06:47:44 -07:00
busybox: 1.36.0
This commit is contained in:
Owen Rafferty
parent
8ce3d6adbf
commit
e9a704ad3c
@ -1,6 +1,5 @@
|
||||
41738a779c726f09c44d73ab38eab7f8e80dbdab10c35e7b217712d2deea791bae
|
||||
2a69caa7dc77b6c5fe81444e44de6c01fee720b86b4b38d1c9ecd665d50061a9d5
|
||||
0a1941324ddafd093406d518ee1fca0c3d6c6839e1834889013fc935dd1bdd2f85
|
||||
9b60304fe0307ff992a38287b6f351d8f8de52bb4fa79cef4d788665197ad0a211
|
||||
f62969ee1426bea40ffd603cb01aa4f6e264930ce29a0266b776f5d08253772a78
|
||||
2fc84cd00bba1a27bb692fb61f7b06307bd2a618161c1f019efd5a8432b0f3c53f
|
||||
0e7127f64ee6760d433ceff02e3c6300c5cbf35ac0172037c68725538babd32c8e
|
||||
@ -9,8 +8,8 @@ fd866b53f9d1ca305c15b93bc2699caaf1c930f093326bb737cc33fa2455787e00
|
||||
830b9252cbb017d3a2e31e0a38171d23dac199353179b79f27dbbdc7e924d708d6
|
||||
ac7b8b37fb4f713d2b9816ac65201b5fd728971ac5fc8c0f020a319aa9f7610afc
|
||||
473bf2b8963fb8fc28fd05edc36d610606f77a6f34f652e951e3f68a8473ba4913
|
||||
edb11edc39c2a5b9b055d576338331b175401a4c971f1f9be8970bddcc3cfb4d9f
|
||||
076b8e0f37dd33f955242915c11c007f14122a81c5a456173418eed3a519101540
|
||||
a76533bec15f766a6ccc0ae644316a5f5f2a0d2fccc2d665612422190598c926fe
|
||||
88d4564c6f2a39cae3d9ea559e23ce778d3688dfca054abd66c2174e6f88c797f6
|
||||
cd1b92ae0db6357b11e1669e8866b9cff94522087cfa146ca192000bee07d9042d
|
||||
391a00f117af366881d48012b83e977503d8d0e3a1afe79b102ce26faa2f4f8508
|
||||
f17db98491aab9d838e5c0b64e896b619bba5b9c819f11871692338c94cbcbd460
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# Automatically generated make config: don't edit
|
||||
# Busybox version: 1.35.0
|
||||
# Sat May 28 23:26:19 2022
|
||||
# Busybox version: 1.36.0
|
||||
# Wed Jan 4 20:02:28 2023
|
||||
#
|
||||
CONFIG_HAVE_DOT_CONFIG=y
|
||||
|
||||
@ -93,6 +93,9 @@ CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
|
||||
# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
|
||||
CONFIG_PASSWORD_MINLEN=6
|
||||
CONFIG_MD5_SMALL=1
|
||||
CONFIG_SHA1_SMALL=1
|
||||
CONFIG_SHA1_HWACCEL=y
|
||||
CONFIG_SHA256_HWACCEL=y
|
||||
CONFIG_SHA3_SMALL=1
|
||||
CONFIG_FEATURE_NON_POSIX_CP=y
|
||||
CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y
|
||||
@ -123,6 +126,9 @@ CONFIG_UNICODE_WIDE_WCHARS=y
|
||||
# CONFIG_UNICODE_BIDI_SUPPORT is not set
|
||||
# CONFIG_UNICODE_NEUTRAL_TABLE is not set
|
||||
# CONFIG_UNICODE_PRESERVE_BROKEN is not set
|
||||
# CONFIG_LOOP_CONFIGURE is not set
|
||||
# CONFIG_NO_LOOP_CONFIGURE is not set
|
||||
CONFIG_TRY_LOOP_CONFIGURE=y
|
||||
|
||||
#
|
||||
# Applets
|
||||
@ -338,6 +344,7 @@ CONFIG_FEATURE_TR_CLASSES=y
|
||||
CONFIG_FEATURE_TR_EQUIV=y
|
||||
CONFIG_TRUE=y
|
||||
CONFIG_TRUNCATE=y
|
||||
CONFIG_TSORT=y
|
||||
CONFIG_TTY=y
|
||||
CONFIG_UNAME=y
|
||||
CONFIG_UNAME_OSNAME="GNU/Linux"
|
||||
@ -832,10 +839,12 @@ CONFIG_READAHEAD=y
|
||||
CONFIG_RFKILL=y
|
||||
CONFIG_RUNLEVEL=y
|
||||
# CONFIG_RX is not set
|
||||
# CONFIG_SEEDRNG is not set
|
||||
CONFIG_SETFATTR=y
|
||||
# CONFIG_SETSERIAL is not set
|
||||
# CONFIG_STRINGS is not set
|
||||
CONFIG_TIME=y
|
||||
# CONFIG_TREE is not set
|
||||
# CONFIG_TS is not set
|
||||
# CONFIG_TTYSIZE is not set
|
||||
# CONFIG_UBIATTACH is not set
|
||||
@ -1008,6 +1017,7 @@ CONFIG_DHCPD_LEASES_FILE=""
|
||||
# CONFIG_FEATURE_UDHCPC_ARPING is not set
|
||||
# CONFIG_FEATURE_UDHCPC_SANITIZEOPT is not set
|
||||
CONFIG_UDHCPC_DEFAULT_SCRIPT=""
|
||||
CONFIG_UDHCPC6_DEFAULT_SCRIPT=""
|
||||
# CONFIG_UDHCPC6 is not set
|
||||
# CONFIG_FEATURE_UDHCPC6_RFC3646 is not set
|
||||
# CONFIG_FEATURE_UDHCPC6_RFC4704 is not set
|
||||
@ -1138,6 +1148,7 @@ CONFIG_ASH_MAIL=y
|
||||
CONFIG_ASH_ECHO=y
|
||||
CONFIG_ASH_PRINTF=y
|
||||
CONFIG_ASH_TEST=y
|
||||
CONFIG_ASH_SLEEP=y
|
||||
CONFIG_ASH_HELP=y
|
||||
CONFIG_ASH_GETOPTS=y
|
||||
CONFIG_ASH_CMDCMD=y
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# Automatically generated make config: don't edit
|
||||
# Busybox version: 1.35.0
|
||||
# Sun Mar 6 17:35:37 2022
|
||||
# Busybox version: 1.36.0
|
||||
# Wed Jan 4 20:05:50 2023
|
||||
#
|
||||
CONFIG_HAVE_DOT_CONFIG=y
|
||||
|
||||
@ -93,6 +93,9 @@ CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
|
||||
# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
|
||||
CONFIG_PASSWORD_MINLEN=6
|
||||
CONFIG_MD5_SMALL=1
|
||||
CONFIG_SHA1_SMALL=1
|
||||
CONFIG_SHA1_HWACCEL=y
|
||||
CONFIG_SHA256_HWACCEL=y
|
||||
CONFIG_SHA3_SMALL=1
|
||||
# CONFIG_FEATURE_NON_POSIX_CP is not set
|
||||
# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
|
||||
@ -123,6 +126,9 @@ CONFIG_LAST_SUPPORTED_WCHAR=0
|
||||
# CONFIG_UNICODE_BIDI_SUPPORT is not set
|
||||
# CONFIG_UNICODE_NEUTRAL_TABLE is not set
|
||||
# CONFIG_UNICODE_PRESERVE_BROKEN is not set
|
||||
# CONFIG_LOOP_CONFIGURE is not set
|
||||
# CONFIG_NO_LOOP_CONFIGURE is not set
|
||||
CONFIG_TRY_LOOP_CONFIGURE=y
|
||||
|
||||
#
|
||||
# Applets
|
||||
@ -326,6 +332,7 @@ CONFIG_GZIP_FAST=0
|
||||
# CONFIG_FEATURE_TR_EQUIV is not set
|
||||
# CONFIG_TRUE is not set
|
||||
# CONFIG_TRUNCATE is not set
|
||||
# CONFIG_TSORT is not set
|
||||
# CONFIG_TTY is not set
|
||||
# CONFIG_UNAME is not set
|
||||
CONFIG_UNAME_OSNAME=""
|
||||
@ -627,6 +634,7 @@ CONFIG_DEFAULT_DEPMOD_FILE=""
|
||||
# CONFIG_LOSETUP is not set
|
||||
# CONFIG_LSPCI is not set
|
||||
# CONFIG_LSUSB is not set
|
||||
# CONFIG_FEATURE_LSUSB_STRINGS is not set
|
||||
# CONFIG_MDEV is not set
|
||||
# CONFIG_FEATURE_MDEV_CONF is not set
|
||||
# CONFIG_FEATURE_MDEV_RENAME is not set
|
||||
@ -807,10 +815,12 @@ CONFIG_FEATURE_LESS_MAXLINES=0
|
||||
# CONFIG_RFKILL is not set
|
||||
# CONFIG_RUNLEVEL is not set
|
||||
# CONFIG_RX is not set
|
||||
# CONFIG_SEEDRNG is not set
|
||||
# CONFIG_SETFATTR is not set
|
||||
# CONFIG_SETSERIAL is not set
|
||||
# CONFIG_STRINGS is not set
|
||||
# CONFIG_TIME is not set
|
||||
# CONFIG_TREE is not set
|
||||
# CONFIG_TS is not set
|
||||
# CONFIG_TTYSIZE is not set
|
||||
# CONFIG_UBIATTACH is not set
|
||||
@ -983,6 +993,7 @@ CONFIG_DHCPD_LEASES_FILE=""
|
||||
# CONFIG_FEATURE_UDHCPC_ARPING is not set
|
||||
# CONFIG_FEATURE_UDHCPC_SANITIZEOPT is not set
|
||||
CONFIG_UDHCPC_DEFAULT_SCRIPT=""
|
||||
CONFIG_UDHCPC6_DEFAULT_SCRIPT=""
|
||||
# CONFIG_UDHCPC6 is not set
|
||||
# CONFIG_FEATURE_UDHCPC6_RFC3646 is not set
|
||||
# CONFIG_FEATURE_UDHCPC6_RFC4704 is not set
|
||||
@ -1113,6 +1124,7 @@ CONFIG_BASH_IS_NONE=y
|
||||
# CONFIG_ASH_ECHO is not set
|
||||
# CONFIG_ASH_PRINTF is not set
|
||||
# CONFIG_ASH_TEST is not set
|
||||
# CONFIG_ASH_SLEEP is not set
|
||||
# CONFIG_ASH_HELP is not set
|
||||
# CONFIG_ASH_GETOPTS is not set
|
||||
# CONFIG_ASH_CMDCMD is not set
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
From 3c284dcb726ff6599d3b87fb366fb04411cf5595 Mon Sep 17 00:00:00 2001
|
||||
From: Natanael Copa <ncopa@alpinelinux.org>
|
||||
Date: Fri, 17 Jun 2022 09:52:11 +0000
|
||||
Subject: [PATCH 1/2] awk: fix use after free (CVE-2022-30065)
|
||||
|
||||
fixes https://bugs.busybox.net/show_bug.cgi?id=14781
|
||||
|
||||
Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
|
||||
---
|
||||
editors/awk.c | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/editors/awk.c b/editors/awk.c
|
||||
index 079d0bde5..728ee8685 100644
|
||||
--- a/editors/awk.c
|
||||
+++ b/editors/awk.c
|
||||
@@ -3128,6 +3128,9 @@ static var *evaluate(node *op, var *res)
|
||||
|
||||
case XC( OC_MOVE ):
|
||||
debug_printf_eval("MOVE\n");
|
||||
+ /* make sure that we never return a temp var */
|
||||
+ if (L.v == TMPVAR0)
|
||||
+ L.v = res;
|
||||
/* if source is a temporary string, jusk relink it to dest */
|
||||
if (R.v == TMPVAR1
|
||||
&& !(R.v->type & VF_NUMBER)
|
||||
--
|
||||
2.36.1
|
||||
@ -1,6 +1,5 @@
|
||||
https://git.busybox.net/busybox/snapshot/busybox-MAJOR_MINOR_PATCH.tar.bz2
|
||||
https://busybox.net/downloads/busybox-VERSION.tar.bz2
|
||||
patches/CVE-2022-28391.patch patch
|
||||
patches/CVE-2022-30065.patch patch
|
||||
patches/adduser-no-setgid.patch patch
|
||||
patches/fsck-resolve-uuid.patch patch
|
||||
patches/modprobe-kernel-version.patch patch
|
||||
|
||||
@ -1 +1 @@
|
||||
1.35.0 6
|
||||
1.36.0 1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user