Mercurial > hg > aboriginal
changeset 1535:2d264744ac3a 1.2.0
Fix to busybox ftpd so native-build can upload, and switch on yet another uClibc symbol busybox defconfig grew a dependency on.
author | Rob Landley <rob@landley.net> |
---|---|
date | Wed, 22 Aug 2012 19:44:44 -0500 |
parents | 418a7e78cfe1 |
children | 6840ac8ad2d9 |
files | sources/baseconfig-uClibc sources/patches/busybox-ftpd.patch |
diffstat | 2 files changed, 17 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- /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