changeset 1799:9aa5983fbbaa

Busybox 1.24.1 (nommu fixes to hush)
author Rob Landley <rob@landley.net>
date Sat, 24 Oct 2015 06:39:21 -0500
parents 6bc4074067e9
children 60d648f342ab
files download.sh sources/patches/busybox-ftpd.patch sources/sections/busybox.build
diffstat 3 files changed, 3 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/download.sh	Mon Oct 19 08:53:26 2015 -0500
+++ b/download.sh	Sat Oct 24 06:39:21 2015 -0500
@@ -70,8 +70,8 @@
 SHA1=08fb1c23f520c25a15f262a8a95ea5b676a98d54 \
 maybe_fork "download || dienow"
 
-URL=http://www.busybox.net/downloads/busybox-1.22.1.tar.bz2 \
-SHA1=d6e96fefb6f0fb8079f27468b9bf22d8dd96108e \
+URL=http://www.busybox.net/downloads/busybox-1.24.1.tar.bz2 \
+SHA1=157d14d24748b4505b1a418535688706a2b81680 \
 maybe_fork "download || dienow"
 
 URL=ftp://ftp.gnu.org/gnu/make/make-3.81.tar.bz2 \
--- a/sources/patches/busybox-ftpd.patch	Mon Oct 19 08:53:26 2015 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-Busybox 1.19 let ftpd upload for non-root users. 1.20 broke that.
-
-diff --git a/networking/ftpd.c b/networking/ftpd.c
-index 33db964..761f239 100644
---- a/networking/ftpd.c
-+++ b/networking/ftpd.c
-@@ -1180,7 +1180,8 @@ int ftpd_main(int argc UNUSED_PARAM, char **argv)
- #endif
- 
- 	if (argv[optind]) {
--		xchroot(argv[optind]);
-+		xchdir(argv[optind]);
-+		if (!getpid()) xchroot(".");
- 	}
- 
- 	//umask(077); - admin can set umask before starting us
--- a/sources/sections/busybox.build	Mon Oct 19 08:53:26 2015 -0500
+++ b/sources/sections/busybox.build	Sat Oct 24 06:39:21 2015 -0500
@@ -15,7 +15,7 @@
   make allnoconfig KCONFIG_ALLCONFIG="$WORK/config-busybox" || dienow
 fi
 
-LDFLAGS="$LDFLAGS $STATIC_FLAGS" make -j $CPUS V=${BUILD_VERBOSE:+2} \
+LDFLAGS="$LDFLAGS $STATIC_FLAGS" make -j $CPUS V=${BUILD_VERBOSE:+1} \
   $DO_CROSS ${ELF2FLT:+SKIP_STRIP=y} &&
 make busybox.links || dienow