From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 04 Jan 2023 10:14:54 +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 1pCzrL-001IQP-9U for lore@lore.pengutronix.de; Wed, 04 Jan 2023 10:14:54 +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 1pCzrI-0002g4-Us; Wed, 04 Jan 2023 10:14:52 +0100 Received: from mail-he1eur01on2043.outbound.protection.outlook.com ([40.107.13.43] helo=EUR01-HE1-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 1pCzrA-0002fv-CP for ptxdist@pengutronix.de; Wed, 04 Jan 2023 10:14:45 +0100 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FE/Q9kQG4sLNqnL8YJOk4eIlbiD0qLNjcVDSTcyjDiW4903rKAfh+UuLpsQtP1ahDgTETJoC/aFFH2joV08ARd7fMOKKSihBMUSUIlXjN8G6UHhZpzyUpTPMgjZK/uvvn4JbCg5Fg6/KcKAI75tePeKVflHKVBQumvsw7SSUoMWPlu5B4fhdm6GiI2FgBC90hwtk0qm3LQlV5NWp5vDJWeaq4x0eP3LlcVVyAEOcw6xaks1FS/ydiAOoiZjpREd3SavuhXR+my3Aif9SvF2E6x+tbxJZs3Id04cACFuCBAqNZh23zBT+ZEmNc1zWmToY6+/xT8hoQo8pKDvCMKznZg== 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=dRouaE4C7kqzHABXmN4E00sVU1ctX8tWLVzOTyPJNgc=; b=JBAzjia3yFRJ1rWfOOaIDjbLc9Y+lgWv25uzYz26EphFXltLEmtIfFmSo3G8dBkeHSn7WyB7iyCRA7l077Bb9YUNo0mcrn7qXTufzhQnE13BZcKD9XXxThEoMU1kc/FgPkq69eOOuqUG7rjPYYOQE9Vpp1Quwn/c52GIVgT0YkU0PDWpmBrdkQd9QDUfPymCnIL/vuLl/aSkHAvkQRAGWjfm+IfWD+Qn4iEnkkJd2eRUEFoSJexxVXSdzAQ+v3p8cf+JoEd8sz2yPgfagOaSdK3PYU8Kn34KEevGp0zRkv65dgjQpL8U/oKfA2plRuYhyU1RNkJLoQQHQUUw32vBfA== 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=dRouaE4C7kqzHABXmN4E00sVU1ctX8tWLVzOTyPJNgc=; b=j65ilX/ZsTmC5V/NG/8ojc9baryTEKgmR0UhjWvPzMrZU7XOeeLvH+/lcP6mZX8etVglCHaHxc9TZHnjaHK8JPHl7DPzOsE4urbp3YJv+QiKujU+T45Q2KbLI35hnAH/ViBm3qASlyJ63lNcWI8LNv/xOLiPPPjdKHkc1rjZpZo= 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 DU0P251MB0867.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:3ca::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.19; Wed, 4 Jan 2023 09:14:40 +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; Wed, 4 Jan 2023 09:14:40 +0000 From: Christian Melki To: ptxdist@pengutronix.de Date: Wed, 4 Jan 2023 10:14:33 +0100 Message-Id: <20230104091433.2419958-1-christian.melki@t2data.com> X-Mailer: git-send-email 2.34.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: GVYP280CA0043.SWEP280.PROD.OUTLOOK.COM (2603:10a6:150:f9::18) To DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB9P251MB0618:EE_|DU0P251MB0867:EE_ X-MS-Office365-Filtering-Correlation-Id: 233cfdcb-20a5-45ff-ffe8-08daee341bf4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ip8N6JyNXmdyrN0zdR3PyBRyQ2/JQMcVKjEynXXx5aUe/j+A0VCz7RYcbKM79lQ21T74fgfX6Jrt4ml3jEc1BLZQLrrABmMtbSjkJOJDb0x+8r2CwqXYTGRxoSqiZ8SGxzt1nhcdwyseQf8aAGOmz1/HENh49HKQbQiykVf90UHI4s6NzUE6ExearJNSZdDY4W+lt4LkKAD5moutjG+Td3hJBjFh7+1pKOKRZIlBMSJw9P1N5Cvy+29GZTz4dD8P2qwAMTTTFKrI1q6WNrRJLfdA+heWQx5M3KxEjHY1/sOmaFirOSAlvCcdgdUNlP8PauyYqG1h0EySjmxQa2DwQ4/LSZOL7Kev7OHkmf0/4CFh9ley2R3IO0vAxcNwcn/upgxmR9/Zf5ORBG3jV6OMz50/GBpq7BJvh3UsRA20sP4X3zqu5cOcY+qX4yLbBrvXqC+IBNvYAtniqKGz9MhimlLpNfjeJZZr0+qhZzS1x30W1DI+ch1MTBBqtzkVIMCw9y/5pPCDEA75F/Dxkjm8GbQYSwHZNsgR1EjtlPtWHjje2tdjZ4wBgL6iAeQ1o7R7YhbgONo2VRTAJpA4dWOLuT+lOmbcT/oeZV4LnRlxFN7H5oF0MRdv9YUbeAGGVQ2zhbibsJkO+ELoOhV3yo++/YGrdxfya09daz5wMiKkxpcb8qUxE53IeodN4VDgljzGB84qYTrGApRQMJYJOGYrexhje0ghpvTars1wdHh63ZG2I+7lw2qnwVqauzT+W7lktNdOBln6H2lUdFi7fhRT+Q== 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)(346002)(136003)(396003)(39830400003)(366004)(376002)(451199015)(83380400001)(1076003)(6512007)(26005)(6666004)(40140700001)(6506007)(19273905006)(86362001)(36756003)(2616005)(38350700002)(38100700002)(186003)(478600001)(41300700001)(30864003)(2906002)(5660300002)(8936002)(44832011)(8676002)(52116002)(66556008)(966005)(6486002)(66946007)(66476007)(316002)(6916009)(562404015)(563064011); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?FQlH6mYdz5QJl+879HzFSMIBH+iksm2ansh8cJ0/gWOLYXVK1uaSX8fpAW5d?= =?us-ascii?Q?+6f0V9a6x3pRYu3mi5hec+DFSlIIYnX1pN3k16t3sl+B82O2m8zZeI626U2d?= =?us-ascii?Q?ZJq/K9yPao7MR7Z0ScKPOM1lyHeTY2QTzzIY/7m+D3aMCzDEyzLUUHgb2ZeN?= =?us-ascii?Q?Q6BvU3BTEWaQMI9gBQAA8QHp2L7af1uczHxbhTBR2OLwpvK3Vz00srqt8aYY?= =?us-ascii?Q?1YZ8SM4z+gp/ZLnng2pJij5E6dstJmWPC+sm9zqKx8EnawoImMcx/QSglE8I?= =?us-ascii?Q?7duGJFpmM3lDtp/jQCjLRd3bGD1P84Cl9dlQ/9wMqiUK4YDO2q0sbIwNazAg?= =?us-ascii?Q?fPjTVgDLy2OJih8KocfCgUMv+YbGebdGzt9S7uXlDqUpi+4cm8eC3o8n1ckM?= =?us-ascii?Q?tK09ZQUA9Ac2NSgAgafsaKPYVuD6mxEyg5LNOw0vMabAa+dcPDbEsa302Xb4?= =?us-ascii?Q?/LbUOuwBDYeFH/hvHQQv82S7H+1uj1DVy6z/S46gzA/drOcENOE2N6VKjqFP?= =?us-ascii?Q?Sbx3jhXxJuYoShlLHlmNXTHrnMnliGhe00rRkQgr0EBxIjQUUYwut7T1+eme?= =?us-ascii?Q?NVVASsmXloJ3HhVgFYTezeERVSNAVtQbG6bIxO4OAkM/LL4oM0skoxcdFrt9?= =?us-ascii?Q?LQHX4gBz8+wXy0wM+xjAAo8tg4dMBUFjsjKas5EAzJ/PA/5JDcO5DfR3t8QR?= =?us-ascii?Q?IlKxMp1gB2yhbcMJXxC+oDY74lxIMQ2NVeqDMkwsIYveoL92KkSaDA/NM0Ye?= =?us-ascii?Q?NLqdYgIDTj03iCZwLeiTqPW/7f8wEWLPRhipK/C/8B3oD8dembVEZrB0AHan?= =?us-ascii?Q?oee6dkBUAMCgrPiPSrffC9nwkur0pDkY/QVCOwvhL6HLmb5d/Ge+pbBC8T14?= =?us-ascii?Q?LIiMdkRMdnPvcORhJOBBWrtUNMAd9EDk+L6oXNYVFF1u6SAYUTlZroTmnRMK?= =?us-ascii?Q?T2d0dwl5JwWXGy3i3aciu0edYOxbBrgi9zQf4b//t6AvzMy7cTdjt56TeUTI?= =?us-ascii?Q?0ykmExyeZhP6T1CvZg/f3cOgeg+Z07fF714SB0PDKrYmLKU1P4M46NTmTR+m?= =?us-ascii?Q?U6LD0Bh6kecPhgv59lT6Mj99GFLcnvlpjPAEhCt6jODMassqZipjdY/Fk1Vy?= =?us-ascii?Q?vKJvJS+NpgrHmtwvdDUBO3SR9je72H+0lqCTMgRgzDB1U6kidmnr4vCZsJEX?= =?us-ascii?Q?w5Fy29dmIHu6olI2e3mbgn13Spr7aKbiRl9wTnX9CEKkFt46ILgDqCwMMm8D?= =?us-ascii?Q?UrZ82WyF3STxbnCY66G5SoUgfNZrNpgtpYSqRw6FMPFwlsye2cz5Lq9qwlVs?= =?us-ascii?Q?e8HcdeqKNxIYgvFoi/065BjDQ3LNSzzdXPFch6imwkiy8iY0SRMgMJo+KAZu?= =?us-ascii?Q?4ya4p5/cucYQC7ifphqHt9tNE8fiSI1zC/V06Ez72C8Gspd2SFuePBzJ8Xx2?= =?us-ascii?Q?O0JR75zbn/ZHG6Yz8hKv3aq7Ahne5x0LuzHqZrR3eIdkjBU0CJDzvKE/Pni1?= =?us-ascii?Q?IbaoEWMdGI1M3xfZ/ysZ+fizyBmz65zZ9dsr593n397mI4ufovACTxTZ3P2A?= =?us-ascii?Q?0qmwFfSgiGNUhnlxPkoel45Qr5FKUmKxb5CxeeqG9EcvU5pMeveBzDFob1lG?= =?us-ascii?Q?0Q=3D=3D?= X-OriginatorOrg: t2data.com X-MS-Exchange-CrossTenant-Network-Message-Id: 233cfdcb-20a5-45ff-ffe8-08daee341bf4 X-MS-Exchange-CrossTenant-AuthSource: DB9P251MB0618.EURP251.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jan 2023 09:14:40.2191 (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: yY7RyiEMClazMy81vZrCOMDZgHIpcfoDgkjyn8e5F4kYGh222d2Cznavz/nFDmOnJTaEGn385it9khnttR/eSfskGgI07G851AJj8oQ2sss= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0P251MB0867 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, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH v2] 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 +- rules/busybox.make | 4 +- 13 files changed, 91 insertions(+), 46 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 diff --git a/rules/busybox.make b/rules/busybox.make index 413ad735c..f3ef2b75c 100644 --- a/rules/busybox.make +++ b/rules/busybox.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_BUSYBOX) += busybox # # Paths and names # -BUSYBOX_VERSION := 1.35.0 -BUSYBOX_MD5 := 585949b1dd4292b604b7d199866e9913 +BUSYBOX_VERSION := 1.36.0 +BUSYBOX_MD5 := 835e3ac11e8a5ca13756eb1573719566 BUSYBOX := busybox-$(BUSYBOX_VERSION) BUSYBOX_SUFFIX := tar.bz2 BUSYBOX_URL := https://www.busybox.net/downloads/$(BUSYBOX).$(BUSYBOX_SUFFIX) -- 2.34.1