From 98503116b4c0dee6720eb7b12f8ea19e405fd7c3 Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Tue, 14 Sep 2021 19:22:43 +0200 Subject: [PATCH] package/busybox: bump version to 1.34.0 * backport fix from 1_34_stable branch * refresh patches Signed-off-by: Petr Vorel Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...route-use-linux-if_packet.h-instead-.patch | 18 ++++++--- ...trip-non-l-arguments-returned-by-pkg.patch | 15 +++---- ...003-udhcp-fix-build-breakage-on-MIPS.patch | 39 +++++++++++++++++++ package/busybox/busybox.hash | 4 +- package/busybox/busybox.mk | 2 +- 5 files changed, 63 insertions(+), 15 deletions(-) create mode 100644 package/busybox/0003-udhcp-fix-build-breakage-on-MIPS.patch diff --git a/package/busybox/0001-networking-libiproute-use-linux-if_packet.h-instead-.patch b/package/busybox/0001-networking-libiproute-use-linux-if_packet.h-instead-.patch index 3aabc96053..9b5eaf89bd 100644 --- a/package/busybox/0001-networking-libiproute-use-linux-if_packet.h-instead-.patch +++ b/package/busybox/0001-networking-libiproute-use-linux-if_packet.h-instead-.patch @@ -1,4 +1,4 @@ -From d4fec31889ad660a58dab633c511221feb66e817 Mon Sep 17 00:00:00 2001 +From 60da1d0763224698008d847eb8ad8d4d8c6f54ff Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 5 Oct 2013 15:55:06 +0200 Subject: [PATCH] networking/libiproute: use instead of @@ -14,10 +14,15 @@ This commit fixes the build of iplink with the musl C library. Signed-off-by: Thomas Petazzoni [Gustavo: update for busybox 1.22.0] +Signed-off-by: Petr Vorel +--- + networking/libiproute/iplink.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -diff -Nura busybox-1.22.0.orig/networking/libiproute/iplink.c busybox-1.22.0/networking/libiproute/iplink.c ---- busybox-1.22.0.orig/networking/libiproute/iplink.c 2014-01-01 09:42:40.301137882 -0300 -+++ busybox-1.22.0/networking/libiproute/iplink.c 2014-01-01 09:43:01.282827700 -0300 +diff --git a/networking/libiproute/iplink.c b/networking/libiproute/iplink.c +index 1a1064bdc..a4c3ad307 100644 +--- a/networking/libiproute/iplink.c ++++ b/networking/libiproute/iplink.c @@ -7,7 +7,7 @@ */ #include @@ -25,5 +30,8 @@ diff -Nura busybox-1.22.0.orig/networking/libiproute/iplink.c busybox-1.22.0/net -#include +#include #include - + #include +-- +2.33.0 + diff --git a/package/busybox/0002-Makefile.flags-strip-non-l-arguments-returned-by-pkg.patch b/package/busybox/0002-Makefile.flags-strip-non-l-arguments-returned-by-pkg.patch index 84435442c9..3a94241043 100644 --- a/package/busybox/0002-Makefile.flags-strip-non-l-arguments-returned-by-pkg.patch +++ b/package/busybox/0002-Makefile.flags-strip-non-l-arguments-returned-by-pkg.patch @@ -1,7 +1,8 @@ -From 67eb23d2be8aba3c474dac81a15b0fa11e5847b7 Mon Sep 17 00:00:00 2001 +From 59daea82e7b5abcdb42a4f97a0109f14d5a774ea Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 25 Nov 2013 22:51:53 +0100 -Subject: [PATCH] Makefile.flags: strip non -l arguments returned by pkg-config +Subject: [PATCH] Makefile.flags: strip non -l arguments returned by + pkg-config Signed-off-by: Thomas Petazzoni [yann.morin.1998@free.fr: refresh for 1.29.0] @@ -13,10 +14,10 @@ Signed-off-by: Petr Vorel 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.flags b/Makefile.flags -index 307afa7..885e323 100644 +index 667481983..88d76efec 100644 --- a/Makefile.flags +++ b/Makefile.flags -@@ -176,7 +176,9 @@ ifeq ($(CONFIG_SELINUX),y) +@@ -180,7 +180,9 @@ ifeq ($(CONFIG_SELINUX),y) SELINUX_PC_MODULES = libselinux libsepol $(eval $(call pkg_check_modules,SELINUX,$(SELINUX_PC_MODULES))) CPPFLAGS += $(SELINUX_CFLAGS) @@ -25,8 +26,8 @@ index 307afa7..885e323 100644 + $(patsubst -l%,%,$(filter -l%,$(SELINUX_LIBS))),\ + $(SELINUX_PC_MODULES:lib%=%)) endif - + ifeq ($(CONFIG_FEATURE_NSLOOKUP_BIG),y) --- -1.8.1.2 +-- +2.33.0 diff --git a/package/busybox/0003-udhcp-fix-build-breakage-on-MIPS.patch b/package/busybox/0003-udhcp-fix-build-breakage-on-MIPS.patch new file mode 100644 index 0000000000..d54d45da43 --- /dev/null +++ b/package/busybox/0003-udhcp-fix-build-breakage-on-MIPS.patch @@ -0,0 +1,39 @@ +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 3e9c30cad0..4782f68819 100644 --- a/package/busybox/busybox.hash +++ b/package/busybox/busybox.hash @@ -1,5 +1,5 @@ -# From https://busybox.net/downloads/busybox-1.33.1.tar.bz2.sha256 -sha256 12cec6bd2b16d8a9446dd16130f2b92982f1819f6e1c5f5887b6db03f5660d28 busybox-1.33.1.tar.bz2 +# From https://busybox.net/downloads/busybox-1.34.0.tar.bz2.sha256 +sha256 ec8d1615edb045b83b81966604759c4d4ac921434ab4011da604f629c06074ce busybox-1.34.0.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 560c4fe7b6..08b5c55c50 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -4,7 +4,7 @@ # ################################################################################ -BUSYBOX_VERSION = 1.33.1 +BUSYBOX_VERSION = 1.34.0 BUSYBOX_SITE = https://www.busybox.net/downloads BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2 BUSYBOX_LICENSE = GPL-2.0, bzip2-1.0.4 -- 2.30.2