From 06fa1c46fc32644a54393a7a0125eba5dd9dbb3f Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 18 Sep 2016 23:26:26 +0200 Subject: busybox: update to version 1.25.0 The following patches were removed: 010-networking-fix-uninitialized-memory-when-displaying-.patch https://git.busybox.net/busybox/commit/?id=f2c043acfcf9dad9fd3d65821b81f89986bbe54e 030-ip-fix-problem-on-mips64-n64-big-endian-musl-systems.patch https://git.busybox.net/busybox/commit/?id=4ab372d49a6e82b0bf097dedb96d26330c5f2d5f 204-udhcpc_src_ip_rebind.patch https://git.busybox.net/busybox/commit/?id=abe8f7515aded80889d78c2c1c8947997918cf90 230-ntpd_delayed_resolve.patch https://git.busybox.net/busybox/commit/?id=c8641962e4cbde48108ddfc1c105e3320778190d https://git.busybox.net/busybox/commit/?id=e4caf1dd9ce8569371a0eeb77ccf02a572dc0f11 260-arping_missing_includes.patch Not needed any more, still builds with musl for me. Add in 92fd6e6f1a "busybox: fix arping applet building on musl" The Kconfig files were updated with these commands: cd config ../convert_menuconfig.pl .../build_dir/target-*/busybox-1.25.0 cd .. ./convert_defaults.pl < .../build_dir/target-*/busybox-1.25.0/.config > Config-defaults.in Signed-off-by: Hauke Mehrtens --- package/utils/busybox/patches/220-add_lock_util.patch | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'package/utils/busybox/patches/220-add_lock_util.patch') diff --git a/package/utils/busybox/patches/220-add_lock_util.patch b/package/utils/busybox/patches/220-add_lock_util.patch index 047d32ef10..c60f5db392 100644 --- a/package/utils/busybox/patches/220-add_lock_util.patch +++ b/package/utils/busybox/patches/220-add_lock_util.patch @@ -1,16 +1,16 @@ --- a/include/applets.src.h +++ b/include/applets.src.h -@@ -211,6 +211,7 @@ IF_LN(APPLET_NOEXEC(ln, ln, BB_DIR_BIN, +@@ -196,6 +196,7 @@ IF_LN(APPLET_NOEXEC(ln, ln, BB_DIR_BIN, IF_LOAD_POLICY(APPLET(load_policy, BB_DIR_USR_SBIN, BB_SUID_DROP)) IF_LOADFONT(APPLET(loadfont, BB_DIR_USR_SBIN, BB_SUID_DROP)) IF_LOADKMAP(APPLET(loadkmap, BB_DIR_SBIN, BB_SUID_DROP)) +IF_LOCK(APPLET(lock, BB_DIR_BIN, BB_SUID_DROP)) - IF_LOGGER(APPLET(logger, BB_DIR_USR_BIN, BB_SUID_DROP)) - /* Needs to be run by root or be suid root - needs to change uid and gid: */ - IF_LOGIN(APPLET(login, BB_DIR_BIN, BB_SUID_REQUIRE)) + IF_LOGNAME(APPLET_NOFORK(logname, logname, BB_DIR_USR_BIN, BB_SUID_DROP, logname)) + IF_LOSETUP(APPLET(losetup, BB_DIR_SBIN, BB_SUID_DROP)) + IF_LS(APPLET_NOEXEC(ls, ls, BB_DIR_BIN, BB_SUID_DROP, ls)) --- a/miscutils/Config.src +++ b/miscutils/Config.src -@@ -385,6 +385,12 @@ config FEATURE_HDPARM_HDIO_GETSET_DMA +@@ -375,6 +375,12 @@ config FEATURE_HDPARM_HDIO_GETSET_DMA help Enables the 'hdparm -d' option to get/set using_dma flag. @@ -25,9 +25,9 @@ default y --- a/miscutils/Kbuild.src +++ b/miscutils/Kbuild.src -@@ -28,6 +28,7 @@ lib-$(CONFIG_INOTIFYD) += inotifyd.o - lib-$(CONFIG_FEATURE_LAST_SMALL)+= last.o - lib-$(CONFIG_FEATURE_LAST_FANCY)+= last_fancy.o +@@ -33,6 +33,7 @@ lib-$(CONFIG_LAST) += last.o + endif + lib-$(CONFIG_LESS) += less.o +lib-$(CONFIG_LOCK) += lock.o lib-$(CONFIG_MAKEDEVS) += makedevs.o -- cgit v1.2.3