From f87f495e65bd0ab8ae3f7f2a60b9a6361aa62186 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Fri, 24 Aug 2007 10:27:41 +0000 Subject: [PATCH] Update defconfig; fix comments --- ipsvd/tcpudp.c | 4 ++-- scripts/defconfig | 24 ++++++++++++++++++------ scripts/trylink | 3 +-- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/ipsvd/tcpudp.c b/ipsvd/tcpudp.c index b5c35cc66..6a11539c7 100644 --- a/ipsvd/tcpudp.c +++ b/ipsvd/tcpudp.c @@ -98,7 +98,7 @@ enum { static void connection_status(void) { - /* "only 1 client max" don't need this */ + /* "only 1 client max" desn't need this */ if (cmax > 1) printf("%s: info: status %u/%u\n", applet_name, cnum, cmax); } @@ -341,7 +341,7 @@ int tcpudpsvd_main(int argc, char **argv) * we cannot replace fd #0 - we will lose pending packet * which is already buffered for us! And we cannot use fd #1 * instead - it will "intercept" all following packets, but child - * do not expect data coming *from fd #1*! */ + * does not expect data coming *from fd #1*! */ #if 0 /* Make it so that local addr is fixed to localp->sa * and we don't accidentally accept packets to other local IPs. */ diff --git a/scripts/defconfig b/scripts/defconfig index c97cfa5b3..a669de14c 100644 --- a/scripts/defconfig +++ b/scripts/defconfig @@ -30,7 +30,7 @@ CONFIG_FEATURE_SUID_CONFIG_QUIET=y # CONFIG_FEATURE_PREFER_APPLETS is not set CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" CONFIG_FEATURE_SYSLOG=y -# CONFIG_FEATURE_HAVE_RPC is not set +CONFIG_FEATURE_HAVE_RPC=y # # Build Options @@ -66,6 +66,7 @@ CONFIG_PREFIX="./_install" # CONFIG_PASSWORD_MINLEN=6 CONFIG_MD5_SIZE_VS_SPEED=2 +CONFIG_FEATURE_FAST_TOP=y # CONFIG_FEATURE_ETC_NETWORKS is not set CONFIG_FEATURE_EDITING=y CONFIG_FEATURE_EDITING_MAX_LEN=1024 @@ -107,6 +108,7 @@ CONFIG_FEATURE_TAR_FROM=y CONFIG_FEATURE_TAR_GZIP=y CONFIG_FEATURE_TAR_COMPRESS=y CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y +CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY=y CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y CONFIG_FEATURE_TAR_LONG_OPTIONS=y CONFIG_UNCOMPRESS=y @@ -331,9 +333,10 @@ CONFIG_FEATURE_FIND_DEPTH=y CONFIG_FEATURE_FIND_PAREN=y CONFIG_FEATURE_FIND_SIZE=y CONFIG_FEATURE_FIND_PRUNE=y -# CONFIG_FEATURE_FIND_DELETE is not set +CONFIG_FEATURE_FIND_DELETE=y CONFIG_FEATURE_FIND_PATH=y CONFIG_FEATURE_FIND_REGEX=y +# CONFIG_FEATURE_FIND_CONTEXT is not set CONFIG_GREP=y CONFIG_FEATURE_GREP_EGREP_ALIAS=y CONFIG_FEATURE_GREP_FGREP_ALIAS=y @@ -374,6 +377,7 @@ CONFIG_GETTY=y CONFIG_FEATURE_UTMP=y CONFIG_FEATURE_WTMP=y CONFIG_LOGIN=y +# CONFIG_PAM is not set CONFIG_LOGIN_SCRIPTS=y CONFIG_FEATURE_NOLOGIN=y CONFIG_FEATURE_SECURETTY=y @@ -461,7 +465,7 @@ CONFIG_FEATURE_MKSWAP_V0=y CONFIG_MORE=y CONFIG_FEATURE_USE_TERMIOS=y CONFIG_MOUNT=y -# CONFIG_FEATURE_MOUNT_NFS is not set +CONFIG_FEATURE_MOUNT_NFS=y CONFIG_FEATURE_MOUNT_CIFS=y CONFIG_FEATURE_MOUNT_FLAGS=y CONFIG_FEATURE_MOUNT_FSTAB=y @@ -526,6 +530,7 @@ CONFIG_SETSID=y CONFIG_TASKSET=y CONFIG_FEATURE_TASKSET_FANCY=y CONFIG_TIME=y +CONFIG_TTYSIZE=y CONFIG_WATCHDOG=y # @@ -543,6 +548,7 @@ CONFIG_FTPPUT=y CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y CONFIG_HOSTNAME=y CONFIG_HTTPD=y +CONFIG_FEATURE_HTTPD_USE_SENDFILE=y # CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set # CONFIG_FEATURE_HTTPD_SETUID is not set CONFIG_FEATURE_HTTPD_BASIC_AUTH=y @@ -552,6 +558,7 @@ CONFIG_FEATURE_HTTPD_CGI=y CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y +CONFIG_FEATURE_HTTPD_ERROR_PAGES=y CONFIG_IFCONFIG=y CONFIG_FEATURE_IFCONFIG_STATUS=y CONFIG_FEATURE_IFCONFIG_SLIP=y @@ -594,13 +601,14 @@ CONFIG_NC=y CONFIG_NC_SERVER=y CONFIG_NC_EXTRA=y CONFIG_NETSTAT=y -# CONFIG_FEATURE_NETSTAT_WIDE is not set +CONFIG_FEATURE_NETSTAT_WIDE=y CONFIG_NSLOOKUP=y CONFIG_PING=y CONFIG_PING6=y CONFIG_PSCAN=y CONFIG_FEATURE_FANCY_PING=y CONFIG_ROUTE=y +CONFIG_SLATTACH=y CONFIG_TELNET=y CONFIG_FEATURE_TELNET_TTYPE=y CONFIG_FEATURE_TELNET_AUTOLOGIN=y @@ -618,6 +626,7 @@ CONFIG_TRACEROUTE=y CONFIG_APP_UDHCPD=y CONFIG_APP_DHCPRELAY=y CONFIG_APP_DUMPLEASES=y +CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY=y CONFIG_APP_UDHCPC=y # CONFIG_FEATURE_UDHCP_DEBUG is not set CONFIG_FEATURE_RFC3397=y @@ -726,13 +735,16 @@ CONFIG_SOFTLIMIT=y # CONFIG_GETSEBOOL is not set # CONFIG_LOAD_POLICY is not set # CONFIG_MATCHPATHCON is not set +# CONFIG_RESTORECON is not set # CONFIG_RUNCON is not set # CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set # CONFIG_SELINUXENABLED is not set # CONFIG_SETENFORCE is not set +# CONFIG_SETFILES is not set +# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set # # ipsvd utilities # -# CONFIG_TCPSVD is not set -# CONFIG_UDPSVD is not set +CONFIG_TCPSVD=y +CONFIG_UDPSVD=y diff --git a/scripts/trylink b/scripts/trylink index 5e962307b..4eaa334d5 100755 --- a/scripts/trylink +++ b/scripts/trylink @@ -72,8 +72,7 @@ done # .rodata : { *(.rodata SORT_BY_ALIGNMENT(.rodata.*) .gnu.linkonce.r.*) } # *(.data SORT_BY_ALIGNMENT(.data.*) .gnu.linkonce.d.*) # *(.bss SORT_BY_ALIGNMENT(.bss.*) .gnu.linkonce.b.*) - # This will eliminate most of the data padding. Use linker script - # by commenting "try" above and uncommenting this one (tested on i386): + # This will eliminate most of the data padding (~3kb). try "-Wl,--start-group $l_list -Wl,--end-group -Wl,--verbose -Wl,-T -Wl,busybox_ldscript" "$@" >busybox_ld.out fi ####}