# HG changeset patch # User Rob Landley # Date 1345682684 18000 # Node ID 2d264744ac3a7e623c65137f3f410897aac90f31 # Parent 418a7e78cfe1f7b55461b9b5ff8ae4db1f9ac1f3 Fix to busybox ftpd so native-build can upload, and switch on yet another uClibc symbol busybox defconfig grew a dependency on. diff -r 418a7e78cfe1 -r 2d264744ac3a sources/baseconfig-uClibc --- a/sources/baseconfig-uClibc Sun Aug 19 12:46:36 2012 -0500 +++ b/sources/baseconfig-uClibc Wed Aug 22 19:44:44 2012 -0500 @@ -68,6 +68,7 @@ UCLIBC_HAS_RPC=y UCLIBC_HAS_FULL_RPC=y UCLIBC_HAS_REENTRANT_RPC=y +UCLIBC_HAS_RESOLVER_SUPPORT=y UCLIBC_HAS_LIBRESOLV_STUB=y UCLIBC_HAS_STRING_GENERIC_OPT=y UCLIBC_HAS_STRING_ARCH_OPT=y diff -r 418a7e78cfe1 -r 2d264744ac3a sources/patches/busybox-ftpd.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sources/patches/busybox-ftpd.patch Wed Aug 22 19:44:44 2012 -0500 @@ -0,0 +1,16 @@ +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