From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 03 Jan 2023 23:30:08 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1pCpnL-000p6z-Ln for lore@lore.pengutronix.de; Tue, 03 Jan 2023 23:30:07 +0100 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1pCpnH-00014K-9x; Tue, 03 Jan 2023 23:30:03 +0100 Received: from mail-db5eur02on2050.outbound.protection.outlook.com ([40.107.249.50] helo=EUR02-DB5-obe.outbound.protection.outlook.com) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pCpmn-00012H-1j for ptxdist@pengutronix.de; Tue, 03 Jan 2023 23:29:34 +0100 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CDwCvKV+xAkNf2v9xMnXXjrDAQMDU3yH4Kaw/18XVJonKE6x6BxBDq6T/sqPWz6Dv2ZJFdY/YsA2h7Ukpv65yJ3BSart0Im/iTFj7tstD3AHj4bl9tWzYRy7665H240K5C7MoYVuWYN3HWWUFLzG3fLoeTODIQ61IjEZNhx2ZFG0Uqb4nh5P3I2EgTMuttE/bS3eTkg2LHIvvYtAuPMd9382TWiDj17ij7kh8nU/wq8tBAXrsO0rInD1I/PPasjlNKKCjYR1XFkUemv0/hNX2Levj6Y1CX0BZu5zsmQed1vcuEY0aGrrI3c4gDAhYJyvVyHGlCCwm4VgVidnZwhcuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Q86f4FIOmPgFlKTqTmk9MH5dhk0frg25GbJ7gBy2a+4=; b=WIF1ih2wZad+WQeeWKIoJdywXMG7abM/1w2UwtVfy99KhJF2Swc8xLqwWtTuBEvl7GPxIylP/2GiXBl9qmTVeyXaJyDpA+uvejBvOHzUh2DG8ZwXf8gqXvHmubwCGHjTvyc47RkOpSYRx4BRKE/QamMLqI3TJlSW+hbkoFWHEy3R60yiX8QC0nKSV00UDD/q82E6ggfXj0amcwNbMVcXapef5Eqm1c8AJJbpako0bJyc0SY1tz1R2yhWyWL9Tfu1v++3joAL4BzogSXhNnA0GiQVl6ZrykEHiVeFePO1W962kv/iOHCrneDw3MsyptRfve0ZW4g31R9/09zc+BB7Yg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=t2data.com; dmarc=pass action=none header.from=t2data.com; dkim=pass header.d=t2data.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=t2datacom.onmicrosoft.com; s=selector1-t2datacom-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Q86f4FIOmPgFlKTqTmk9MH5dhk0frg25GbJ7gBy2a+4=; b=JYLdEbuPPGrQeUKQoY1Uc9Tvz0VYbW7/25Y8RLZn/3gKdmyewHfTpu154/CemqfQhI01j7vtBuLzF7EqPsIGHX6/lp+6bXCpnJKhlHJaO3//TM05yp5kXAcDdnG95rKbG7GPUL6tl+MqNMMNTnCagHBlJLD8OjG9mjV+OYxTsts= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=t2data.com; Received: from DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) by AS4P251MB0773.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:505::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.19; Tue, 3 Jan 2023 22:29:29 +0000 Received: from DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::d8cf:bdbe:3526:aa50]) by DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::d8cf:bdbe:3526:aa50%5]) with mapi id 15.20.5944.019; Tue, 3 Jan 2023 22:29:29 +0000 From: Christian Melki To: ptxdist@pengutronix.de Date: Tue, 3 Jan 2023 23:29:22 +0100 Message-Id: <20230103222922.2143458-1-christian.melki@t2data.com> X-Mailer: git-send-email 2.34.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: GV3P280CA0093.SWEP280.PROD.OUTLOOK.COM (2603:10a6:150:8::22) To DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB9P251MB0618:EE_|AS4P251MB0773:EE_ X-MS-Office365-Filtering-Correlation-Id: 265d6888-9625-4e8c-be16-08daedd9fa75 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eR4x6mk27m6E4Tzql/2ULdEoKKJCIUGcbbroajMB3MTaEGIHtubijlqZGhlq3E9K8/qKThEyp/3GZ5RV2MCJpEOiFJYgPkeOqvBTeTmEfGJidUL5QZa2/c3C/0ZYcI3TudwyRYA0wM9aqq8Zvo/qeoP8463HDl0bQVzwnA0Xt/yrejE9xDiLMSs6weQlvyhaTv8Fcya5Ms5MjPF220/qJnHtsN8fQLHvJmPpeUfxVrV/9XUEyNVuZx7FTmo0Nbj7nHIGn5vvqwOHFuIq8405Fc15ysgmI6QIo1vCuXvAhQ+nqfRNcg+aujfCYhR7sbIavzGDDgq5ZmM6KsYKSaXtwTmFS2A17Cne3fA07ozqEFwY4QMAXOtWgNfEaqYivvtdSeNXmgParo6ZZF9oGf7ALdph2R8rCxLKgWrznA9K2McYTc9R0QuEIp73NWE2bOFnhg4+flglGK4lw5OlE6s57DEATSbwVbCHktyzv9OG5ondH+k8X/PjEgmStzKy57xbGHNqea7uj66g+Ujcsqpo2PaHaOXCmS5Y6whhXwM3EzcIY2uPMZUghjgmZq5zkPX4+NuxI1seXBULQhOjbJoXk6HpPlEor4PHOHIF57nHyoMKodrfHe6/JQwPspDYEHWIrSneuuLFKxFqV9wbhrSZjH8WVevkNm5LFSf6UFxixtjkcCDbGg+p/20rDoWZp+4vpywPa3YxhUHYrZMPyA853x5BuqFMQEluX4qxaVHiBu7oFHfyLEDuDCLFyhBKZ0Afyt7NCYSBt6wuf775AuJfjf7jGf221eDYi0uqvftMDOs= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB9P251MB0618.EURP251.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230022)(39830400003)(346002)(366004)(396003)(376002)(136003)(451199015)(186003)(52116002)(6512007)(26005)(6486002)(6916009)(316002)(966005)(478600001)(6506007)(1076003)(8676002)(6666004)(66946007)(66556008)(66476007)(2616005)(8936002)(44832011)(5660300002)(83380400001)(30864003)(2906002)(41300700001)(38100700002)(38350700002)(36756003)(86362001)(19273905006)(40140700001)(22166009)(562404015)(563064011); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?0IZvn/8Xfa9hQGHyZiVBkdKXykLN5JhbmIZNM9vEGJcTZ8aryAsREYat6ATZ?= =?us-ascii?Q?rrdCCrEBNKD3FY3Js5ZK10wVJJ003ONMQ1RRZY5s2SZmQViG5yuw6U/j2bsF?= =?us-ascii?Q?wfPPWcKO7Mf6gCrqmAMMhulBAuNRXSuxh9f1cYE6gO0YbjZhYXMcB5dpie7W?= =?us-ascii?Q?BNvNwMVnQidPse7QlTvWQNemPtbQFtExiRPkdxSmZZ48BktutNTHEy0KdD2j?= =?us-ascii?Q?dEsYPU3OXTz4jeg6ffA1mRC8mBKUOURfZJJVTzCdsBeL2s0cSO6AbBrA3aq+?= =?us-ascii?Q?CXlmMNxJ4FCziCEdHBiV+cC7wlcoqaE5okEO5wWs636aUEGkamstTIPZr7/q?= =?us-ascii?Q?aROBT25yPYUUromHltX0vqw52QsToRB4JG9OpFaZJK8p+8FAuYCULa4qy2bL?= =?us-ascii?Q?PkSAx4CAy5sMG4iwXA9GA/mmSAIMzx7NRQquC7iHSGNZp5RiVP9Llcf5LaVF?= =?us-ascii?Q?nqn/8wTH/jmbqeyxtsX4MojTvP5slpC7xHf4aq0Tn8adrpmIzMAOMw5Git9D?= =?us-ascii?Q?S36Rhbpl3K5MI1Hal6JDh1fsW7Vk159RwQYff6nlppnm0g9rOr6rrDRs/IQ/?= =?us-ascii?Q?2nc2ngHTWbXXxT/d0Ct8ih+A5KYutjq/O4SSixQrnJ+6NP0MA6gf83+h6B/R?= =?us-ascii?Q?S/FfWmyzaLyb4M4L1zrUN4HA5BqJgeRKWo9vYVCRoiSiGgKyUe3R+E+MULTl?= =?us-ascii?Q?mnuir50Rz6jUlNhWF08mB2wtgdaO7Cg0P1bHfI2NmhvTE0yathPJDaUkY+y1?= =?us-ascii?Q?7+pJs0HVw29XvDnjeCDFxxmPC/eTIDb1WuQhZ2vLCLZE4XCnaS4uNxmTD0cP?= =?us-ascii?Q?8znvkb1EF4GF+JQnoV859eySjUB1Fz6fO+oJkPyyvPwwYlsO4rxFhxp09f2A?= =?us-ascii?Q?fgJfOMH8V4lfq19ovzsijTx8c10U/esTuEo0b92d0uoqzxW9ipQPCV0W6RV0?= =?us-ascii?Q?ngSuFelxurPxilomrLnUAd3Lxg3B4m/Mh08ffMy3tPytdBpz88JMpxuz8tp1?= =?us-ascii?Q?hFJ31R8KEViOndCCTQgebtpUSJS1MlHco4pGeWcI2Rpaix8xIteCSVWJLhjL?= =?us-ascii?Q?SsVi2KsgM3KAawEbfuQDXECx3YFLcmSpayPFJTySN9A9qDGG92LYtUcBIgua?= =?us-ascii?Q?1Wa6lUisLLguX6qIF5/T/FrambZ7VuGt4AfCT3lXHlj3dJJ18wHPV3Trhiow?= =?us-ascii?Q?c0f+WI0DxuAVCCU8MJdwISUdZTrg+ckzzKmV2cr5sDFMjPwHM280vEKOl4kU?= =?us-ascii?Q?6ZlufB82WjUut9LiayIJ4qodCFpl/Bl2fYzHLEg/fFwlOGZeA70nJbltIgNX?= =?us-ascii?Q?ESLjP43Vi+DUUfetpjqE7xT+PYs8ptiSn2i0/GdPK4lZWcc0XhceefwtwSWp?= =?us-ascii?Q?8/dik2SbweBP7trQ6idL75kvoktcc5JMgrnq/+g/MNOFf407mYfuVVHoTrxM?= =?us-ascii?Q?H7Gte0c8I2tTCrhxTpkZ0lEiYx5Mj7uvWCq38geNgaTP3Z/Rq4/IP9HdPf+u?= =?us-ascii?Q?ovi2liLcgCYQlw+fId6qlbGOT0xWsDLqebxBkKIn4Nl1UV0hc+WY+qvWMK+A?= =?us-ascii?Q?5GCFYwZQybCO0b9NVX7XfA4H8TjKkAfCdwhF50mrQPEE5VJAiEt4IvPSacyZ?= =?us-ascii?Q?4Q=3D=3D?= X-OriginatorOrg: t2data.com X-MS-Exchange-CrossTenant-Network-Message-Id: 265d6888-9625-4e8c-be16-08daedd9fa75 X-MS-Exchange-CrossTenant-AuthSource: DB9P251MB0618.EURP251.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jan 2023 22:29:29.2990 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 27928da5-aacd-4ba1-9566-c748a6863e6c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: SdFB9cynTTDZD0a1vV6hioDA7OIR54j9HYfEuzKeQPiJZSlsa/PdtQuBNZmybTe9UrUXa3elHSU9u3F3E6aysCnrIJsQtLGKrC5e2AKf4JE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4P251MB0773 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH] busybox: Version bump. 1.35.0 -> 1.36.0 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false After a year of low activity and questionmarks, we finally have a new release of busybox. Release changelog @ https://busybox.net/ Not that many new features, mostly fixes. One notable addition is seedrng. But it marks a new release that includes security fixes. Plugs CVEs: CVE-2022-28391, CVE-2022-30065 * Forward the ptxdist specific patches. * Remove one security patch to awk that has been fixed. * Update busybox imported kconfig tree. Not that many changes, since it has been a slow year. New utilites: tsort, seedrng and tree. Signed-off-by: Christian Melki --- config/busybox/Config.in | 4 +- config/busybox/coreutils/Config.in | 7 ++- config/busybox/libbb/Config.in | 62 ++++++++++++++++--- config/busybox/miscutils/Config.in | 12 ++++ config/busybox/networking/Config.in | 2 +- config/busybox/networking/udhcp/Config.in | 7 ++- config/busybox/shell/Config.in | 5 ++ ...wk-fix-use-after-free-CVE-2022-30065.patch | 29 --------- .../0200-reactivate-check-for-tty.patch | 0 ...-only-pass-real-libs-to-SELINUX_LIBS.patch | 2 +- ...honour-SKIP_STRIP-and-don-t-strip-if.patch | 0 .../{busybox-1.35.0 => busybox-1.36.0}/series | 3 +- 12 files changed, 89 insertions(+), 44 deletions(-) delete mode 100644 patches/busybox-1.35.0/0203-awk-fix-use-after-free-CVE-2022-30065.patch rename patches/{busybox-1.35.0 => busybox-1.36.0}/0200-reactivate-check-for-tty.patch (100%) rename patches/{busybox-1.35.0 => busybox-1.36.0}/0201-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch (94%) rename patches/{busybox-1.35.0 => busybox-1.36.0}/0202-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch (100%) rename patches/{busybox-1.35.0 => busybox-1.36.0}/series (74%) diff --git a/config/busybox/Config.in b/config/busybox/Config.in index 329e2f8e8..199cc6ab2 100644 --- a/config/busybox/Config.in +++ b/config/busybox/Config.in @@ -267,10 +267,10 @@ config BUSYBOX_FEATURE_SUID_CONFIG The file has to be owned by user root, group root and has to be writeable only by root: - (chown 0:0 /etc/busybox.conf; chmod 600 /etc/busybox.conf) + (chown 0.0 /etc/busybox.conf; chmod 600 /etc/busybox.conf) The busybox executable has to be owned by user root, group root and has to be setuid root for this to work: - (chown 0:0 /bin/busybox; chmod 4755 /bin/busybox) + (chown 0.0 /bin/busybox; chmod 4755 /bin/busybox) Robert 'sandman' Griebl has more information here: . diff --git a/config/busybox/coreutils/Config.in b/config/busybox/coreutils/Config.in index 8c9e66e17..1a95a6785 100644 --- a/config/busybox/coreutils/Config.in +++ b/config/busybox/coreutils/Config.in @@ -653,7 +653,7 @@ config BUSYBOX_SORT sort is used to sort lines of text in specified files. config BUSYBOX_FEATURE_SORT_BIG - bool "Full SuSv3 compliant sort (support -ktcbdfiogM)" + bool "Full SuSv3 compliant sort (support -ktcbdfioghM)" default y depends on BUSYBOX_SORT help @@ -851,6 +851,11 @@ config BUSYBOX_TRUNCATE help truncate truncates files to a given size. If a file does not exist, it is created unless told otherwise. +config BUSYBOX_TSORT + bool "tsort (0.7 kb)" + default y + help + tsort performs a topological sort. config BUSYBOX_TTY bool "tty (3.6 kb)" default y diff --git a/config/busybox/libbb/Config.in b/config/busybox/libbb/Config.in index 8e4fe855e..66c135ec6 100644 --- a/config/busybox/libbb/Config.in +++ b/config/busybox/libbb/Config.in @@ -98,21 +98,47 @@ config BUSYBOX_MD5_SMALL default 1 # all "fast or small" options default to small range 0 3 help - Trade binary size versus speed for the md5sum algorithm. + Trade binary size versus speed for the md5 algorithm. Approximate values running uClibc and hashing linux-2.4.4.tar.bz2 were: - value user times (sec) text size (386) - 0 (fastest) 1.1 6144 - 1 1.4 5392 - 2 3.0 5088 - 3 (smallest) 5.1 4912 + value user times (sec) text size (386) + 0 (fastest) 1.1 6144 + 1 1.4 5392 + 2 3.0 5088 + 3 (smallest) 5.1 4912 + +config BUSYBOX_SHA1_SMALL + int "SHA1: Trade bytes for speed (0:fast, 3:slow)" + default 3 # all "fast or small" options default to small + range 0 3 + help + Trade binary size versus speed for the sha1 algorithm. + With FEATURE_COPYBUF_KB=64: + throughput MB/s size of sha1_process_block64 + value 486 x86-64 486 x86-64 + 0 440 485 3481 3502 + 1 265 265 641 696 + 2,3 220 210 342 364 + +config BUSYBOX_SHA1_HWACCEL + bool "SHA1: Use hardware accelerated instructions if possible" + default y + help + On x86, this adds ~590 bytes of code. Throughput + is about twice as fast as fully-unrolled generic code. + +config BUSYBOX_SHA256_HWACCEL + bool "SHA256: Use hardware accelerated instructions if possible" + default y + help + On x86, this adds ~1k bytes of code. config BUSYBOX_SHA3_SMALL int "SHA3: Trade bytes for speed (0:fast, 1:slow)" default 1 # all "fast or small" options default to small range 0 1 help - Trade binary size versus speed for the sha3sum algorithm. + Trade binary size versus speed for the sha3 algorithm. SHA3_SMALL=0 compared to SHA3_SMALL=1 (approximate): 64-bit x86: +270 bytes of code, 45% faster 32-bit x86: +450 bytes of code, 75% faster @@ -399,3 +425,25 @@ config BUSYBOX_UNICODE_PRESERVE_BROKEN For example, this means that entering 'l', 's', ' ', 0xff, [Enter] at shell prompt will list file named 0xff (single char name with char value 255), not file named '?'. + +choice + prompt "Use LOOP_CONFIGURE for losetup and loop mounts" + default BUSYBOX_TRY_LOOP_CONFIGURE + help + LOOP_CONFIGURE is added to Linux 5.8 + https://lwn.net/Articles/820408/ + This allows userspace to completely setup a loop device with a single + ioctl, removing the in-between state where the device can be partially + configured - eg the loop device has a backing file associated with it, + but is reading from the wrong offset. + +config BUSYBOX_LOOP_CONFIGURE + bool "use LOOP_CONFIGURE, needs kernel >= 5.8" + +config BUSYBOX_NO_LOOP_CONFIGURE + bool "use LOOP_SET_FD + LOOP_SET_STATUS" + +config BUSYBOX_TRY_LOOP_CONFIGURE + bool "try LOOP_CONFIGURE, fall back to LOOP_SET_FD + LOOP_SET_STATUS" + +endchoice diff --git a/config/busybox/miscutils/Config.in b/config/busybox/miscutils/Config.in index a236373ae..5c04fd8ef 100644 --- a/config/busybox/miscutils/Config.in +++ b/config/busybox/miscutils/Config.in @@ -699,6 +699,13 @@ config BUSYBOX_RX default y help Receive files using the Xmodem protocol. +config BUSYBOX_SEEDRNG + bool "seedrng (1.3 kb)" + default y + help + Seed the kernel RNG from seed files, meant to be called + once during startup, once during shutdown, and optionally + at some periodic interval in between. config BUSYBOX_SETFATTR bool "setfattr (3.7 kb)" default y @@ -722,6 +729,11 @@ config BUSYBOX_TIME The time command runs the specified program with the given arguments. When the command finishes, time writes a message to standard output giving timing statistics about this program run. +config BUSYBOX_TREE + bool "tree (0.6 kb)" + default y + help + List files and directories in a tree structure. config BUSYBOX_TS bool "ts (450 bytes)" default y diff --git a/config/busybox/networking/Config.in b/config/busybox/networking/Config.in index 27e0f44ba..3a3ad56d9 100644 --- a/config/busybox/networking/Config.in +++ b/config/busybox/networking/Config.in @@ -959,7 +959,7 @@ config BUSYBOX_TELNETD FEATURE_SUID enabled. And finally, you should make certain that busybox has been installed setuid root: - chown root:root /bin/busybox + chown root.root /bin/busybox chmod 4755 /bin/busybox with all that done, telnetd _should_ work.... diff --git a/config/busybox/networking/udhcp/Config.in b/config/busybox/networking/udhcp/Config.in index 4b1255c52..adb5ac16c 100644 --- a/config/busybox/networking/udhcp/Config.in +++ b/config/busybox/networking/udhcp/Config.in @@ -93,12 +93,17 @@ config BUSYBOX_FEATURE_UDHCPC_SANITIZEOPT config BUSYBOX_UDHCPC_DEFAULT_SCRIPT string "Absolute path to config script" default "/usr/share/udhcpc/default.script" - depends on BUSYBOX_UDHCPC || BUSYBOX_UDHCPC6 + depends on BUSYBOX_UDHCPC help This script is called after udhcpc receives an answer. See examples/udhcp for a working example. Normally it is safe to leave this untouched. +config BUSYBOX_UDHCPC6_DEFAULT_SCRIPT + string "Absolute path to config script for IPv6" + default "/usr/share/udhcpc/default6.script" + depends on BUSYBOX_UDHCPC6 + # udhcpc6 config is inserted here: config BUSYBOX_UDHCPC6 bool "udhcpc6 (21 kb)" diff --git a/config/busybox/shell/Config.in b/config/busybox/shell/Config.in index 61275cdc5..cb6215afc 100644 --- a/config/busybox/shell/Config.in +++ b/config/busybox/shell/Config.in @@ -201,6 +201,11 @@ config BUSYBOX_ASH_TEST default y depends on BUSYBOX_SHELL_ASH +config BUSYBOX_ASH_SLEEP + bool "sleep builtin" + default y + depends on BUSYBOX_SHELL_ASH + config BUSYBOX_ASH_HELP bool "help builtin" default y diff --git a/patches/busybox-1.35.0/0203-awk-fix-use-after-free-CVE-2022-30065.patch b/patches/busybox-1.35.0/0203-awk-fix-use-after-free-CVE-2022-30065.patch deleted file mode 100644 index aff9faabc..000000000 --- a/patches/busybox-1.35.0/0203-awk-fix-use-after-free-CVE-2022-30065.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Natanael Copa -Date: Fri, 17 Jun 2022 17:45:34 +0200 -Subject: [PATCH] awk: fix use after free (CVE-2022-30065) - -fixes https://bugs.busybox.net/show_bug.cgi?id=14781 - -function old new delta -evaluate 3343 3357 +14 - -Signed-off-by: Natanael Copa -Signed-off-by: Denys Vlasenko ---- - editors/awk.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/editors/awk.c b/editors/awk.c -index f6314ac7201a..654cbac33331 100644 ---- a/editors/awk.c -+++ b/editors/awk.c -@@ -3114,6 +3114,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) diff --git a/patches/busybox-1.35.0/0200-reactivate-check-for-tty.patch b/patches/busybox-1.36.0/0200-reactivate-check-for-tty.patch similarity index 100% rename from patches/busybox-1.35.0/0200-reactivate-check-for-tty.patch rename to patches/busybox-1.36.0/0200-reactivate-check-for-tty.patch diff --git a/patches/busybox-1.35.0/0201-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch b/patches/busybox-1.36.0/0201-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch similarity index 94% rename from patches/busybox-1.35.0/0201-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch rename to patches/busybox-1.36.0/0201-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch index 87f382e05..8ed9efe53 100644 --- a/patches/busybox-1.35.0/0201-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch +++ b/patches/busybox-1.36.0/0201-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch @@ -10,7 +10,7 @@ Signed-off-by: Marc Kleine-Budde 1 file changed, 1 insertion(+) diff --git a/Makefile.flags b/Makefile.flags -index c34356230a9f..7c42c3abf80c 100644 +index 1cec5ba20b47..fd195efc965d 100644 --- a/Makefile.flags +++ b/Makefile.flags @@ -180,6 +180,7 @@ ifeq ($(CONFIG_SELINUX),y) diff --git a/patches/busybox-1.35.0/0202-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch b/patches/busybox-1.36.0/0202-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch similarity index 100% rename from patches/busybox-1.35.0/0202-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch rename to patches/busybox-1.36.0/0202-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch diff --git a/patches/busybox-1.35.0/series b/patches/busybox-1.36.0/series similarity index 74% rename from patches/busybox-1.35.0/series rename to patches/busybox-1.36.0/series index 3e1a02a16..ee5360887 100644 --- a/patches/busybox-1.35.0/series +++ b/patches/busybox-1.36.0/series @@ -6,5 +6,4 @@ 0200-reactivate-check-for-tty.patch 0201-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch 0202-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch -0203-awk-fix-use-after-free-CVE-2022-30065.patch -# e8b4a3103390b1bd27c9ce24d1e435d7 - git-ptx-patches magic +# 9c0cc4baa8090165b429198c9a10e02c - git-ptx-patches magic -- 2.34.1