From c0da70ac4b01ec8d97e24496493086e24c601f0e Mon Sep 17 00:00:00 2001 From: Michael Fischer Date: Mon, 1 Nov 2021 11:12:17 +0100 Subject: [PATCH] package/busybox: bump version to 1.34.1 patch 0003: already applied upstream Signed-off-by: Michael Fischer Reviewed-by: Petr Vorel Signed-off-by: Thomas Petazzoni --- ...003-udhcp-fix-build-breakage-on-MIPS.patch | 39 ------------------- package/busybox/busybox.hash | 4 +- package/busybox/busybox.mk | 2 +- 3 files changed, 3 insertions(+), 42 deletions(-) delete mode 100644 package/busybox/0003-udhcp-fix-build-breakage-on-MIPS.patch diff --git a/package/busybox/0003-udhcp-fix-build-breakage-on-MIPS.patch b/package/busybox/0003-udhcp-fix-build-breakage-on-MIPS.patch deleted file mode 100644 index d54d45da43..0000000000 --- a/package/busybox/0003-udhcp-fix-build-breakage-on-MIPS.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 56824284b749e5b9d568b75d5c5bc471b1814d46 Mon Sep 17 00:00:00 2001 -From: Denys Vlasenko -Date: Fri, 20 Aug 2021 13:33:50 +0200 -Subject: [PATCH] udhcp: fix build breakage on MIPS - -Signed-off-by: Denys Vlasenko -Signed-off-by: Petr Vorel ---- -upstream status: 00adcdb64 ("udhcp: fix build breakage on MIPS") - - networking/udhcp/common.h | 12 ------------ - 1 file changed, 12 deletions(-) - -diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h -index 8c678dd32..ca778dab8 100644 ---- a/networking/udhcp/common.h -+++ b/networking/udhcp/common.h -@@ -304,18 +304,6 @@ void udhcp_dump_packet(struct dhcp_packet *packet) FAST_FUNC; - # define log3s(msg) ((void)0) - #endif - --#if defined(__mips__) --/* -- * The 'simple' message functions have a negative impact on the size of the -- * DHCP code when compiled for MIPS, so don't use them in this case. -- */ --#define bb_simple_info_msg bb_info_msg --#define bb_simple_error_msg bb_error_msg --#define bb_simple_perror_msg_and_die bb_perror_msg_and_die --#undef log1s --#define log1s log1 --#endif -- - /*** Other shared functions ***/ - - /* 2nd param is "uint32_t*" */ --- -2.33.0 - diff --git a/package/busybox/busybox.hash b/package/busybox/busybox.hash index 4782f68819..1f34651d7b 100644 --- a/package/busybox/busybox.hash +++ b/package/busybox/busybox.hash @@ -1,5 +1,5 @@ -# From https://busybox.net/downloads/busybox-1.34.0.tar.bz2.sha256 -sha256 ec8d1615edb045b83b81966604759c4d4ac921434ab4011da604f629c06074ce busybox-1.34.0.tar.bz2 +# From https://busybox.net/downloads/busybox-1.34.1.tar.bz2.sha256 +sha256 415fbd89e5344c96acf449d94a6f956dbed62e18e835fc83e064db33a34bd549 busybox-1.34.1.tar.bz2 # Locally computed sha256 bbfc9843646d483c334664f651c208b9839626891d8f17604db2146962f43548 LICENSE sha256 b5a136ed67798e51fe2e0ca0b2a21cb01b904ff0c9f7d563a6292e276607e58f archival/libarchive/bz/LICENSE diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 08b5c55c50..3523cf21d0 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -4,7 +4,7 @@ # ################################################################################ -BUSYBOX_VERSION = 1.34.0 +BUSYBOX_VERSION = 1.34.1 BUSYBOX_SITE = https://www.busybox.net/downloads BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2 BUSYBOX_LICENSE = GPL-2.0, bzip2-1.0.4