aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2007-08-24 10:27:41 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2007-08-24 10:27:41 +0000
commitf87f495e65bd0ab8ae3f7f2a60b9a6361aa62186 (patch)
treeee5e0e3e2ceda68477c0dd323c78b5edf05012d5
parent028f2d651c046128feec491c2dd77ad33ad601cd (diff)
downloadbusybox-w32-f87f495e65bd0ab8ae3f7f2a60b9a6361aa62186.tar.gz
busybox-w32-f87f495e65bd0ab8ae3f7f2a60b9a6361aa62186.tar.bz2
busybox-w32-f87f495e65bd0ab8ae3f7f2a60b9a6361aa62186.zip
Update defconfig; fix comments
-rw-r--r--ipsvd/tcpudp.c4
-rw-r--r--scripts/defconfig24
-rwxr-xr-xscripts/trylink3
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 {
98 98
99static void connection_status(void) 99static void connection_status(void)
100{ 100{
101 /* "only 1 client max" don't need this */ 101 /* "only 1 client max" desn't need this */
102 if (cmax > 1) 102 if (cmax > 1)
103 printf("%s: info: status %u/%u\n", applet_name, cnum, cmax); 103 printf("%s: info: status %u/%u\n", applet_name, cnum, cmax);
104} 104}
@@ -341,7 +341,7 @@ int tcpudpsvd_main(int argc, char **argv)
341 * we cannot replace fd #0 - we will lose pending packet 341 * we cannot replace fd #0 - we will lose pending packet
342 * which is already buffered for us! And we cannot use fd #1 342 * which is already buffered for us! And we cannot use fd #1
343 * instead - it will "intercept" all following packets, but child 343 * instead - it will "intercept" all following packets, but child
344 * do not expect data coming *from fd #1*! */ 344 * does not expect data coming *from fd #1*! */
345#if 0 345#if 0
346 /* Make it so that local addr is fixed to localp->sa 346 /* Make it so that local addr is fixed to localp->sa
347 * and we don't accidentally accept packets to other local IPs. */ 347 * 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
30# CONFIG_FEATURE_PREFER_APPLETS is not set 30# CONFIG_FEATURE_PREFER_APPLETS is not set
31CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" 31CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
32CONFIG_FEATURE_SYSLOG=y 32CONFIG_FEATURE_SYSLOG=y
33# CONFIG_FEATURE_HAVE_RPC is not set 33CONFIG_FEATURE_HAVE_RPC=y
34 34
35# 35#
36# Build Options 36# Build Options
@@ -66,6 +66,7 @@ CONFIG_PREFIX="./_install"
66# 66#
67CONFIG_PASSWORD_MINLEN=6 67CONFIG_PASSWORD_MINLEN=6
68CONFIG_MD5_SIZE_VS_SPEED=2 68CONFIG_MD5_SIZE_VS_SPEED=2
69CONFIG_FEATURE_FAST_TOP=y
69# CONFIG_FEATURE_ETC_NETWORKS is not set 70# CONFIG_FEATURE_ETC_NETWORKS is not set
70CONFIG_FEATURE_EDITING=y 71CONFIG_FEATURE_EDITING=y
71CONFIG_FEATURE_EDITING_MAX_LEN=1024 72CONFIG_FEATURE_EDITING_MAX_LEN=1024
@@ -107,6 +108,7 @@ CONFIG_FEATURE_TAR_FROM=y
107CONFIG_FEATURE_TAR_GZIP=y 108CONFIG_FEATURE_TAR_GZIP=y
108CONFIG_FEATURE_TAR_COMPRESS=y 109CONFIG_FEATURE_TAR_COMPRESS=y
109CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y 110CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y
111CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY=y
110CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y 112CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
111CONFIG_FEATURE_TAR_LONG_OPTIONS=y 113CONFIG_FEATURE_TAR_LONG_OPTIONS=y
112CONFIG_UNCOMPRESS=y 114CONFIG_UNCOMPRESS=y
@@ -331,9 +333,10 @@ CONFIG_FEATURE_FIND_DEPTH=y
331CONFIG_FEATURE_FIND_PAREN=y 333CONFIG_FEATURE_FIND_PAREN=y
332CONFIG_FEATURE_FIND_SIZE=y 334CONFIG_FEATURE_FIND_SIZE=y
333CONFIG_FEATURE_FIND_PRUNE=y 335CONFIG_FEATURE_FIND_PRUNE=y
334# CONFIG_FEATURE_FIND_DELETE is not set 336CONFIG_FEATURE_FIND_DELETE=y
335CONFIG_FEATURE_FIND_PATH=y 337CONFIG_FEATURE_FIND_PATH=y
336CONFIG_FEATURE_FIND_REGEX=y 338CONFIG_FEATURE_FIND_REGEX=y
339# CONFIG_FEATURE_FIND_CONTEXT is not set
337CONFIG_GREP=y 340CONFIG_GREP=y
338CONFIG_FEATURE_GREP_EGREP_ALIAS=y 341CONFIG_FEATURE_GREP_EGREP_ALIAS=y
339CONFIG_FEATURE_GREP_FGREP_ALIAS=y 342CONFIG_FEATURE_GREP_FGREP_ALIAS=y
@@ -374,6 +377,7 @@ CONFIG_GETTY=y
374CONFIG_FEATURE_UTMP=y 377CONFIG_FEATURE_UTMP=y
375CONFIG_FEATURE_WTMP=y 378CONFIG_FEATURE_WTMP=y
376CONFIG_LOGIN=y 379CONFIG_LOGIN=y
380# CONFIG_PAM is not set
377CONFIG_LOGIN_SCRIPTS=y 381CONFIG_LOGIN_SCRIPTS=y
378CONFIG_FEATURE_NOLOGIN=y 382CONFIG_FEATURE_NOLOGIN=y
379CONFIG_FEATURE_SECURETTY=y 383CONFIG_FEATURE_SECURETTY=y
@@ -461,7 +465,7 @@ CONFIG_FEATURE_MKSWAP_V0=y
461CONFIG_MORE=y 465CONFIG_MORE=y
462CONFIG_FEATURE_USE_TERMIOS=y 466CONFIG_FEATURE_USE_TERMIOS=y
463CONFIG_MOUNT=y 467CONFIG_MOUNT=y
464# CONFIG_FEATURE_MOUNT_NFS is not set 468CONFIG_FEATURE_MOUNT_NFS=y
465CONFIG_FEATURE_MOUNT_CIFS=y 469CONFIG_FEATURE_MOUNT_CIFS=y
466CONFIG_FEATURE_MOUNT_FLAGS=y 470CONFIG_FEATURE_MOUNT_FLAGS=y
467CONFIG_FEATURE_MOUNT_FSTAB=y 471CONFIG_FEATURE_MOUNT_FSTAB=y
@@ -526,6 +530,7 @@ CONFIG_SETSID=y
526CONFIG_TASKSET=y 530CONFIG_TASKSET=y
527CONFIG_FEATURE_TASKSET_FANCY=y 531CONFIG_FEATURE_TASKSET_FANCY=y
528CONFIG_TIME=y 532CONFIG_TIME=y
533CONFIG_TTYSIZE=y
529CONFIG_WATCHDOG=y 534CONFIG_WATCHDOG=y
530 535
531# 536#
@@ -543,6 +548,7 @@ CONFIG_FTPPUT=y
543CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y 548CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y
544CONFIG_HOSTNAME=y 549CONFIG_HOSTNAME=y
545CONFIG_HTTPD=y 550CONFIG_HTTPD=y
551CONFIG_FEATURE_HTTPD_USE_SENDFILE=y
546# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set 552# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set
547# CONFIG_FEATURE_HTTPD_SETUID is not set 553# CONFIG_FEATURE_HTTPD_SETUID is not set
548CONFIG_FEATURE_HTTPD_BASIC_AUTH=y 554CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
@@ -552,6 +558,7 @@ CONFIG_FEATURE_HTTPD_CGI=y
552CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y 558CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y
553CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y 559CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y
554CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y 560CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y
561CONFIG_FEATURE_HTTPD_ERROR_PAGES=y
555CONFIG_IFCONFIG=y 562CONFIG_IFCONFIG=y
556CONFIG_FEATURE_IFCONFIG_STATUS=y 563CONFIG_FEATURE_IFCONFIG_STATUS=y
557CONFIG_FEATURE_IFCONFIG_SLIP=y 564CONFIG_FEATURE_IFCONFIG_SLIP=y
@@ -594,13 +601,14 @@ CONFIG_NC=y
594CONFIG_NC_SERVER=y 601CONFIG_NC_SERVER=y
595CONFIG_NC_EXTRA=y 602CONFIG_NC_EXTRA=y
596CONFIG_NETSTAT=y 603CONFIG_NETSTAT=y
597# CONFIG_FEATURE_NETSTAT_WIDE is not set 604CONFIG_FEATURE_NETSTAT_WIDE=y
598CONFIG_NSLOOKUP=y 605CONFIG_NSLOOKUP=y
599CONFIG_PING=y 606CONFIG_PING=y
600CONFIG_PING6=y 607CONFIG_PING6=y
601CONFIG_PSCAN=y 608CONFIG_PSCAN=y
602CONFIG_FEATURE_FANCY_PING=y 609CONFIG_FEATURE_FANCY_PING=y
603CONFIG_ROUTE=y 610CONFIG_ROUTE=y
611CONFIG_SLATTACH=y
604CONFIG_TELNET=y 612CONFIG_TELNET=y
605CONFIG_FEATURE_TELNET_TTYPE=y 613CONFIG_FEATURE_TELNET_TTYPE=y
606CONFIG_FEATURE_TELNET_AUTOLOGIN=y 614CONFIG_FEATURE_TELNET_AUTOLOGIN=y
@@ -618,6 +626,7 @@ CONFIG_TRACEROUTE=y
618CONFIG_APP_UDHCPD=y 626CONFIG_APP_UDHCPD=y
619CONFIG_APP_DHCPRELAY=y 627CONFIG_APP_DHCPRELAY=y
620CONFIG_APP_DUMPLEASES=y 628CONFIG_APP_DUMPLEASES=y
629CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY=y
621CONFIG_APP_UDHCPC=y 630CONFIG_APP_UDHCPC=y
622# CONFIG_FEATURE_UDHCP_DEBUG is not set 631# CONFIG_FEATURE_UDHCP_DEBUG is not set
623CONFIG_FEATURE_RFC3397=y 632CONFIG_FEATURE_RFC3397=y
@@ -726,13 +735,16 @@ CONFIG_SOFTLIMIT=y
726# CONFIG_GETSEBOOL is not set 735# CONFIG_GETSEBOOL is not set
727# CONFIG_LOAD_POLICY is not set 736# CONFIG_LOAD_POLICY is not set
728# CONFIG_MATCHPATHCON is not set 737# CONFIG_MATCHPATHCON is not set
738# CONFIG_RESTORECON is not set
729# CONFIG_RUNCON is not set 739# CONFIG_RUNCON is not set
730# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set 740# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
731# CONFIG_SELINUXENABLED is not set 741# CONFIG_SELINUXENABLED is not set
732# CONFIG_SETENFORCE is not set 742# CONFIG_SETENFORCE is not set
743# CONFIG_SETFILES is not set
744# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
733 745
734# 746#
735# ipsvd utilities 747# ipsvd utilities
736# 748#
737# CONFIG_TCPSVD is not set 749CONFIG_TCPSVD=y
738# CONFIG_UDPSVD is not set 750CONFIG_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
72 # .rodata : { *(.rodata SORT_BY_ALIGNMENT(.rodata.*) .gnu.linkonce.r.*) } 72 # .rodata : { *(.rodata SORT_BY_ALIGNMENT(.rodata.*) .gnu.linkonce.r.*) }
73 # *(.data SORT_BY_ALIGNMENT(.data.*) .gnu.linkonce.d.*) 73 # *(.data SORT_BY_ALIGNMENT(.data.*) .gnu.linkonce.d.*)
74 # *(.bss SORT_BY_ALIGNMENT(.bss.*) .gnu.linkonce.b.*) 74 # *(.bss SORT_BY_ALIGNMENT(.bss.*) .gnu.linkonce.b.*)
75 # This will eliminate most of the data padding. Use linker script 75 # This will eliminate most of the data padding (~3kb).
76 # by commenting "try" above and uncommenting this one (tested on i386):
77 try "-Wl,--start-group $l_list -Wl,--end-group -Wl,--verbose -Wl,-T -Wl,busybox_ldscript" "$@" >busybox_ld.out 76 try "-Wl,--start-group $l_list -Wl,--end-group -Wl,--verbose -Wl,-T -Wl,busybox_ldscript" "$@" >busybox_ld.out
78 fi 77 fi
79####} 78####}