busybox: update to 1.37.0

Add config support for the new getfattr applet and refresh patches. Signed-off-by: Rui Salvaterra <[email protected]>
rsalvaterra · Sep 27, 2024 · 839d76e · 839d76e
1 parent a4c95f1
commit 839d76e
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 8 deletions.
diff --git a/package/utils/busybox/Config-defaults.in b/package/utils/busybox/Config-defaults.in
@@ -2186,6 +2186,9 @@ config BUSYBOX_DEFAULT_RX
 config BUSYBOX_DEFAULT_SEEDRNG
 	bool
 	default n
+config BUSYBOX_DEFAULT_GETFATTR
+	bool
+	default n
 config BUSYBOX_DEFAULT_SETFATTR
 	bool
 	default n

diff --git a/package/utils/busybox/Makefile b/package/utils/busybox/Makefile
@@ -5,14 +5,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=busybox
-PKG_VERSION:=1.36.1
-PKG_RELEASE:=2
+PKG_VERSION:=1.37.0
+PKG_RELEASE:=1
 PKG_FLAGS:=essential
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://www.busybox.net/downloads \
 		http://sources.buildroot.net
-PKG_HASH:=b8cc24c9574d809e7279c3be349795c5d5ceb6fdf19ca709f80cde50e47de314
+PKG_HASH:=3311dff32e746499f4df0d5df04d7eb396382d7e108bb9250e7b519b837043a4
 
 PKG_BUILD_DEPENDS:=BUSYBOX_CONFIG_PAM:libpam
 PKG_BUILD_PARALLEL:=1

diff --git a/package/utils/busybox/config/miscutils/Config.in b/package/utils/busybox/config/miscutils/Config.in
@@ -711,6 +711,11 @@ config BUSYBOX_CONFIG_SEEDRNG
 	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_CONFIG_GETFATTR
+	bool "getfattr (12.3 kb)"
+	default BUSYBOX_DEFAULT_GETFATTR
+	help
+	Get extended attributes on files
 config BUSYBOX_CONFIG_SETFATTR
 	bool "setfattr (3.7 kb)"
 	default BUSYBOX_DEFAULT_SETFATTR

diff --git a/package/utils/busybox/patches/200-udhcpc_reduce_msgs.patch b/package/utils/busybox/patches/200-udhcpc_reduce_msgs.patch
@@ -1,14 +1,14 @@
 --- a/networking/udhcp/dhcpc.c
 +++ b/networking/udhcp/dhcpc.c
-@@ -722,6 +722,7 @@ static int bcast_or_ucast(struct dhcp_pa
+@@ -711,6 +711,7 @@ static int bcast_or_ucast(struct dhcp_pa
  static NOINLINE int send_discover(uint32_t requested)
  {
  	struct dhcp_packet packet;
 +	static int msgs = 0;
 
  	/* Fill in: op, htype, hlen, cookie, chaddr fields,
  	 * xid field, message type option:
-@@ -736,6 +737,7 @@ static NOINLINE int send_discover(uint32
+@@ -725,6 +726,7 @@ static NOINLINE int send_discover(uint32
  	 */
  	add_client_options(&packet);
 

diff --git a/package/utils/busybox/patches/201-udhcpc_changed_ifindex.patch b/package/utils/busybox/patches/201-udhcpc_changed_ifindex.patch
@@ -1,6 +1,6 @@
 --- a/networking/udhcp/dhcpc.c
 +++ b/networking/udhcp/dhcpc.c
-@@ -1384,6 +1384,12 @@ int udhcpc_main(int argc UNUSED_PARAM, c
+@@ -1374,6 +1374,12 @@ int udhcpc_main(int argc UNUSED_PARAM, c
  		struct pollfd pfds[2];
  		struct dhcp_packet packet;
 

diff --git a/package/utils/busybox/patches/301-ip-link-fix-netlink-msg-size.patch b/package/utils/busybox/patches/301-ip-link-fix-netlink-msg-size.patch
@@ -1,6 +1,6 @@
 --- a/networking/libiproute/iplink.c
 +++ b/networking/libiproute/iplink.c
-@@ -683,7 +683,7 @@ static int do_add_or_delete(char **argv,
+@@ -953,7 +953,7 @@ static int do_add_or_delete(char **argv,
  	}
  	xrtnl_open(&rth);
  	ll_init_map(&rth);

diff --git a/...tils/busybox/patches/530-nslookup-ensure-unique-transaction-IDs-for-the-DNS-queries.patch b/...tils/busybox/patches/530-nslookup-ensure-unique-transaction-IDs-for-the-DNS-queries.patch
@@ -29,7 +29,7 @@ Forwarded: http://lists.busybox.net/pipermail/busybox/2022-October/089911.html
 ---
 --- a/networking/nslookup.c
 +++ b/networking/nslookup.c
-@@ -978,6 +978,10 @@ int nslookup_main(int argc UNUSED_PARAM,
+@@ -1370,6 +1370,10 @@ int nslookup_main(int argc UNUSED_PARAM,
  		}
  	}