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, 16 insertions(+), 0 deletions(-) [+]
line diff
     1.1 --- a/sources/baseconfig-uClibc	Sun Aug 19 12:46:36 2012 -0500
     1.2 +++ b/sources/baseconfig-uClibc	Wed Aug 22 19:44:44 2012 -0500
     1.3 @@ -68,6 +68,7 @@
     1.4  UCLIBC_HAS_RPC=y
     1.5  UCLIBC_HAS_FULL_RPC=y
     1.6  UCLIBC_HAS_REENTRANT_RPC=y
     1.7 +UCLIBC_HAS_RESOLVER_SUPPORT=y
     1.8  UCLIBC_HAS_LIBRESOLV_STUB=y
     1.9  UCLIBC_HAS_STRING_GENERIC_OPT=y
    1.10  UCLIBC_HAS_STRING_ARCH_OPT=y
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/sources/patches/busybox-ftpd.patch	Wed Aug 22 19:44:44 2012 -0500
     2.3 @@ -0,0 +1,16 @@
     2.4 +Busybox 1.19 let ftpd upload for non-root users. 1.20 broke that.
     2.5 +
     2.6 +diff --git a/networking/ftpd.c b/networking/ftpd.c
     2.7 +index 33db964..761f239 100644
     2.8 +--- a/networking/ftpd.c
     2.9 ++++ b/networking/ftpd.c
    2.10 +@@ -1180,7 +1180,8 @@ int ftpd_main(int argc UNUSED_PARAM, char **argv)
    2.11 + #endif
    2.12 + 
    2.13 + 	if (argv[optind]) {
    2.14 +-		xchroot(argv[optind]);
    2.15 ++		xchdir(argv[optind]);
    2.16 ++		if (!getpid()) xchroot(".");
    2.17 + 	}
    2.18 + 
    2.19 + 	//umask(077); - admin can set umask before starting us