diff options
| -rw-r--r-- | openwrt/Makefile | 2 | ||||
| -rw-r--r-- | openwrt/package/busybox/busybox.config | 209 | ||||
| -rw-r--r-- | openwrt/package/busybox/busybox.mk | 2 | ||||
| -rw-r--r-- | openwrt/package/busybox/patches/100-killall5.patch | 87 | ||||
| -rw-r--r-- | openwrt/package/busybox/patches/110-telnetd.patch | 53 | ||||
| -rw-r--r-- | openwrt/package/busybox/patches/120-no_login_for_telnetd.patch | 12 | ||||
| -rw-r--r-- | openwrt/target/squashfs/Config.in | 6 | ||||
| -rw-r--r-- | openwrt/target/squashfs/Makefile.in | 3 | ||||
| -rw-r--r-- | openwrt/target/squashfs/squashfsroot.mk | 50 | ||||
| -rw-r--r-- | openwrt/toolchain/uClibc/uClibc.config | 11 |
10 files changed, 327 insertions, 108 deletions
diff --git a/openwrt/Makefile b/openwrt/Makefile index dc52dfd9c8..c2e628051a 100644 --- a/openwrt/Makefile +++ b/openwrt/Makefile @@ -105,7 +105,7 @@ $(STAGING_DIR): @ln -sf ../lib $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/lib $(TARGET_DIR): - zcat target/default/skel.tar.gz | tar -C $(BUILD_DIR) -xf - + @mkdir -p $(TARGET_DIR) cp -a target/default/target_skeleton/* $(TARGET_DIR)/ -find $(TARGET_DIR) -type d -name CVS -exec rm -rf {} \; > /dev/null 2>&1 diff --git a/openwrt/package/busybox/busybox.config b/openwrt/package/busybox/busybox.config index 7335635f70..1b78d20c24 100644 --- a/openwrt/package/busybox/busybox.config +++ b/openwrt/package/busybox/busybox.config @@ -12,7 +12,7 @@ CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y CONFIG_FEATURE_VERBOSE_USAGE=y # CONFIG_FEATURE_INSTALLER is not set # CONFIG_LOCALE_SUPPORT is not set -# CONFIG_FEATURE_DEVFS is not set +CONFIG_FEATURE_DEVFS=y CONFIG_FEATURE_DEVPTS=y # CONFIG_FEATURE_CLEAN_UP is not set CONFIG_FEATURE_SUID=y @@ -24,8 +24,9 @@ CONFIG_FEATURE_SUID=y # # CONFIG_STATIC is not set CONFIG_LFS=y -# USING_CROSS_COMPILER is not set -EXTRA_CFLAGS_OPTIONS="" +USING_CROSS_COMPILER=y +CROSS_COMPILER_PREFIX="mipsel-uclibc-" +EXTRA_CFLAGS_OPTIONS="-Os " # # Installation Options @@ -42,7 +43,7 @@ CONFIG_BUNZIP2=y # CONFIG_DPKG is not set # CONFIG_DPKG_DEB is not set CONFIG_GUNZIP=y -# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set +CONFIG_FEATURE_GUNZIP_UNCOMPRESS=y CONFIG_GZIP=y # CONFIG_RPM2CPIO is not set # CONFIG_RPM is not set @@ -56,7 +57,7 @@ CONFIG_FEATURE_TAR_GZIP=y CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y # CONFIG_FEATURE_TAR_LONG_OPTIONS is not set # CONFIG_UNCOMPRESS is not set -CONFIG_UNZIP=y +# CONFIG_UNZIP is not set # # Common options for cpio and tar @@ -73,18 +74,16 @@ CONFIG_CHGRP=y CONFIG_CHMOD=y CONFIG_CHOWN=y CONFIG_CHROOT=y -CONFIG_CMP=y +# CONFIG_CMP is not set CONFIG_CP=y CONFIG_CUT=y CONFIG_DATE=y CONFIG_FEATURE_DATE_ISOFMT=y CONFIG_DD=y CONFIG_DF=y -CONFIG_DIRNAME=y -CONFIG_DOS2UNIX=y -CONFIG_UNIX2DOS=y -CONFIG_DU=y -CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K=y +# CONFIG_DIRNAME is not set +# CONFIG_DOS2UNIX is not set +# CONFIG_DU is not set CONFIG_ECHO=y CONFIG_FEATURE_FANCY_ECHO=y CONFIG_ENV=y @@ -94,11 +93,11 @@ CONFIG_FALSE=y CONFIG_HEAD=y # CONFIG_FEATURE_FANCY_HEAD is not set CONFIG_HOSTID=y -CONFIG_ID=y +# CONFIG_ID is not set CONFIG_INSTALL=y -# CONFIG_LENGTH is not set +CONFIG_LENGTH=y CONFIG_LN=y -CONFIG_LOGNAME=y +# CONFIG_LOGNAME is not set CONFIG_LS=y CONFIG_FEATURE_LS_FILETYPES=y CONFIG_FEATURE_LS_FOLLOWLINKS=y @@ -109,8 +108,8 @@ CONFIG_FEATURE_LS_USERNAME=y CONFIG_FEATURE_LS_COLOR=y CONFIG_MD5SUM=y CONFIG_MKDIR=y -# CONFIG_MKFIFO is not set -CONFIG_MKNOD=y +CONFIG_MKFIFO=y +# CONFIG_MKNOD is not set CONFIG_MV=y # CONFIG_OD is not set # CONFIG_PRINTF is not set @@ -119,35 +118,35 @@ CONFIG_PWD=y CONFIG_RM=y CONFIG_RMDIR=y # CONFIG_SEQ is not set -CONFIG_SHA1SUM=y +# CONFIG_SHA1SUM is not set CONFIG_SLEEP=y -# CONFIG_FEATURE_FANCY_SLEEP is not set +CONFIG_FEATURE_FANCY_SLEEP=y CONFIG_SORT=y -CONFIG_STTY=y +# CONFIG_STTY is not set CONFIG_SYNC=y CONFIG_TAIL=y CONFIG_FEATURE_FANCY_TAIL=y CONFIG_TEE=y CONFIG_FEATURE_TEE_USE_BLOCK_IO=y CONFIG_TEST=y -CONFIG_FEATURE_TEST_64=y # # test (forced enabled for use with shell) # +# CONFIG_FEATURE_TEST_64 is not set CONFIG_TOUCH=y # CONFIG_TR is not set CONFIG_TRUE=y -CONFIG_TTY=y +# CONFIG_TTY is not set CONFIG_UNAME=y CONFIG_UNIQ=y -CONFIG_USLEEP=y -CONFIG_UUDECODE=y -CONFIG_UUENCODE=y +# CONFIG_USLEEP is not set +# CONFIG_UUDECODE is not set +# CONFIG_UUENCODE is not set # CONFIG_WATCH is not set CONFIG_WC=y # CONFIG_WHO is not set -CONFIG_WHOAMI=y +# CONFIG_WHOAMI is not set CONFIG_YES=y # @@ -173,13 +172,13 @@ CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y # # Console Utilities # -CONFIG_CHVT=y +# CONFIG_CHVT is not set CONFIG_CLEAR=y -CONFIG_DEALLOCVT=y +# CONFIG_DEALLOCVT is not set # CONFIG_DUMPKMAP is not set # CONFIG_LOADFONT is not set # CONFIG_LOADKMAP is not set -CONFIG_OPENVT=y +# CONFIG_OPENVT is not set CONFIG_RESET=y # CONFIG_SETKEYCODES is not set @@ -188,16 +187,16 @@ CONFIG_RESET=y # CONFIG_MKTEMP=y # CONFIG_PIPE_PROGRESS is not set -CONFIG_READLINK=y -CONFIG_FEATURE_READLINK_FOLLOW=y +# CONFIG_READLINK is not set CONFIG_RUN_PARTS=y -CONFIG_START_STOP_DAEMON=y +# CONFIG_START_STOP_DAEMON is not set CONFIG_WHICH=y # # Editors # -# CONFIG_AWK is not set +CONFIG_AWK=y +CONFIG_FEATURE_AWK_MATH=y # CONFIG_PATCH is not set CONFIG_SED=y CONFIG_VI=y @@ -216,7 +215,7 @@ CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y # Finding Utilities # CONFIG_FIND=y -CONFIG_FEATURE_FIND_MTIME=y +# CONFIG_FEATURE_FIND_MTIME is not set CONFIG_FEATURE_FIND_PERM=y CONFIG_FEATURE_FIND_TYPE=y CONFIG_FEATURE_FIND_XDEV=y @@ -227,7 +226,7 @@ CONFIG_FEATURE_GREP_EGREP_ALIAS=y CONFIG_FEATURE_GREP_FGREP_ALIAS=y CONFIG_FEATURE_GREP_CONTEXT=y CONFIG_XARGS=y -# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set +CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y @@ -237,48 +236,49 @@ CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y # CONFIG_INIT=y CONFIG_FEATURE_USE_INITTAB=y -CONFIG_FEATURE_INITRD=y +# CONFIG_FEATURE_INITRD is not set # CONFIG_FEATURE_INIT_COREDUMPS is not set -CONFIG_FEATURE_EXTRA_QUIET=y -CONFIG_HALT=y -CONFIG_POWEROFF=y +# CONFIG_FEATURE_EXTRA_QUIET is not set +# CONFIG_HALT is not set +# CONFIG_POWEROFF is not set CONFIG_REBOOT=y -# CONFIG_MESG is not set +CONFIG_MESG=y # # Login/Password Management Utilities # # CONFIG_USE_BB_PWD_GRP is not set -CONFIG_ADDGROUP=y -CONFIG_DELGROUP=y -CONFIG_ADDUSER=y -CONFIG_DELUSER=y -CONFIG_GETTY=y +# CONFIG_ADDGROUP is not set +# CONFIG_DELGROUP is not set +# CONFIG_ADDUSER is not set +# CONFIG_DELUSER is not set +# CONFIG_GETTY is not set # CONFIG_FEATURE_U_W_TMP is not set -CONFIG_LOGIN=y -CONFIG_FEATURE_SECURETTY=y +# CONFIG_LOGIN is not set +# CONFIG_FEATURE_SECURETTY is not set CONFIG_PASSWD=y -CONFIG_SU=y -CONFIG_SULOGIN=y -CONFIG_VLOCK=y +# CONFIG_SU is not set +# CONFIG_SULOGIN is not set +# CONFIG_VLOCK is not set # # Common options for adduser, deluser, login, su # -CONFIG_FEATURE_SHADOWPASSWDS=y +# CONFIG_FEATURE_SHADOWPASSWDS is not set # # Miscellaneous Utilities # # CONFIG_ADJTIMEX is not set -# CONFIG_CROND is not set -# CONFIG_CRONTAB is not set -CONFIG_DC=y +CONFIG_CROND=y +# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set +CONFIG_CRONTAB=y +# CONFIG_DC is not set # CONFIG_DEVFSD is not set # CONFIG_LAST is not set # CONFIG_HDPARM is not set # CONFIG_MAKEDEVS is not set -CONFIG_MT=y +# CONFIG_MT is not set # CONFIG_RX is not set CONFIG_STRINGS=y CONFIG_TIME=y @@ -296,65 +296,70 @@ CONFIG_FEATURE_2_4_MODULES=y # CONFIG_FEATURE_INSMOD_LOAD_MAP is not set CONFIG_LSMOD=y CONFIG_FEATURE_QUERY_MODULE_INTERFACE=y -CONFIG_MODPROBE=y +# CONFIG_MODPROBE is not set CONFIG_RMMOD=y -CONFIG_FEATURE_CHECK_TAINTED_MODULE=y +# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set # # Networking Utilities # -# CONFIG_FEATURE_IPV6 is not set -# CONFIG_ARPING is not set +CONFIG_FEATURE_IPV6=y +CONFIG_ARPING=y # CONFIG_FTPGET is not set # CONFIG_FTPPUT is not set -CONFIG_HOSTNAME=y -# CONFIG_HTTPD is not set +# CONFIG_HOSTNAME is not set +CONFIG_HTTPD=y +# CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY is not set +CONFIG_FEATURE_HTTPD_BASIC_AUTH=y +CONFIG_FEATURE_HTTPD_AUTH_MD5=y +CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP=y +# CONFIG_FEATURE_HTTPD_SETUID is not set +CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES=y +CONFIG_FEATURE_HTTPD_CGI=y +CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y +CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y CONFIG_IFCONFIG=y CONFIG_FEATURE_IFCONFIG_STATUS=y # CONFIG_FEATURE_IFCONFIG_SLIP is not set # CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set -# CONFIG_FEATURE_IFCONFIG_HW is not set -# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set -CONFIG_IFUPDOWN=y -# CONFIG_FEATURE_IFUPDOWN_IP is not set -CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y -CONFIG_FEATURE_IFUPDOWN_IPV4=y -# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set -# CONFIG_FEATURE_IFUPDOWN_IPX is not set -# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set +CONFIG_FEATURE_IFCONFIG_HW=y +CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y +# CONFIG_IFUPDOWN is not set # CONFIG_INETD is not set # CONFIG_IP is not set -# CONFIG_IPCALC is not set +CONFIG_IPCALC=y +CONFIG_FEATURE_IPCALC_FANCY=y # CONFIG_IPADDR is not set # CONFIG_IPLINK is not set # CONFIG_IPROUTE is not set # CONFIG_IPTUNNEL is not set # CONFIG_NAMEIF is not set -# CONFIG_NC is not set +CONFIG_NC=y CONFIG_NETSTAT=y CONFIG_NSLOOKUP=y CONFIG_PING=y CONFIG_FEATURE_FANCY_PING=y +CONFIG_PING6=y +CONFIG_FEATURE_FANCY_PING6=y CONFIG_ROUTE=y -CONFIG_TELNET=y -CONFIG_FEATURE_TELNET_TTYPE=y -# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set -# CONFIG_TELNETD is not set +# CONFIG_TELNET is not set +CONFIG_TELNETD=y +# CONFIG_FEATURE_TELNETD_INETD is not set # CONFIG_TFTP is not set -# CONFIG_TRACEROUTE is not set -# CONFIG_VCONFIG is not set +CONFIG_TRACEROUTE=y +CONFIG_FEATURE_TRACEROUTE_VERBOSE=y +CONFIG_VCONFIG=y CONFIG_WGET=y CONFIG_FEATURE_WGET_STATUSBAR=y CONFIG_FEATURE_WGET_AUTHENTICATION=y -# CONFIG_FEATURE_WGET_IP6_LITERAL is not set +CONFIG_FEATURE_WGET_IP6_LITERAL=y # # udhcp Server/Client # -CONFIG_UDHCPD=y +# CONFIG_UDHCPD is not set CONFIG_UDHCPC=y -CONFIG_DUMPLEASES=y -CONFIG_FEATURE_UDHCP_SYSLOG=y +# CONFIG_FEATURE_UDHCP_SYSLOG is not set # CONFIG_FEATURE_UDHCP_DEBUG is not set # @@ -363,12 +368,14 @@ CONFIG_FEATURE_UDHCP_SYSLOG=y CONFIG_FREE=y CONFIG_KILL=y CONFIG_KILLALL=y +CONFIG_KILLALL5=y CONFIG_PIDOF=y CONFIG_PS=y # CONFIG_RENICE is not set -# CONFIG_TOP is not set +CONFIG_TOP=y +FEATURE_CPU_USAGE_PERCENTAGE=y CONFIG_UPTIME=y -# CONFIG_SYSCTL is not set +CONFIG_SYSCTL=y # # Another Bourne-like Shell @@ -386,9 +393,9 @@ CONFIG_ASH=y CONFIG_ASH_JOB_CONTROL=y CONFIG_ASH_ALIAS=y CONFIG_ASH_MATH_SUPPORT=y -CONFIG_ASH_MATH_SUPPORT_64=y -# CONFIG_ASH_GETOPTS is not set -# CONFIG_ASH_CMDCMD is not set +# CONFIG_ASH_MATH_SUPPORT_64 is not set +CONFIG_ASH_GETOPTS=y +CONFIG_ASH_CMDCMD=y # CONFIG_ASH_MAIL is not set CONFIG_ASH_OPTIMIZE_FOR_SIZE=y # CONFIG_ASH_RANDOM_SUPPORT is not set @@ -403,7 +410,7 @@ CONFIG_ASH_OPTIMIZE_FOR_SIZE=y # CONFIG_FEATURE_SH_STANDALONE_SHELL is not set CONFIG_FEATURE_COMMAND_EDITING=y CONFIG_FEATURE_COMMAND_HISTORY=15 -CONFIG_FEATURE_COMMAND_SAVEHISTORY=y +# CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y # CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set CONFIG_FEATURE_SH_FANCY_PROMPT=y @@ -413,8 +420,11 @@ CONFIG_FEATURE_SH_FANCY_PROMPT=y # CONFIG_SYSLOGD=y CONFIG_FEATURE_ROTATE_LOGFILE=y -# CONFIG_FEATURE_REMOTE_LOG is not set -# CONFIG_FEATURE_IPC_SYSLOG is not set +CONFIG_FEATURE_REMOTE_LOG=y +CONFIG_FEATURE_IPC_SYSLOG=y +CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 +CONFIG_LOGREAD=y +# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set CONFIG_KLOGD=y CONFIG_LOGGER=y @@ -424,33 +434,26 @@ CONFIG_LOGGER=y CONFIG_DMESG=y # CONFIG_FBSET is not set # CONFIG_FDFLUSH is not set -CONFIG_FDFORMAT=y -CONFIG_FDISK=y +# CONFIG_FDFORMAT is not set +# CONFIG_FDISK is not set FDISK_SUPPORT_LARGE_DISKS=y -CONFIG_FEATURE_FDISK_WRITABLE=y -# CONFIG_FEATURE_AIX_LABEL is not set -# CONFIG_FEATURE_SGI_LABEL is not set -# CONFIG_FEATURE_SUN_LABEL is not set -# CONFIG_FEATURE_OSF_LABEL is not set -# CONFIG_FEATURE_FDISK_ADVANCED is not set # CONFIG_FREERAMDISK is not set # CONFIG_FSCK_MINIX is not set # CONFIG_MKFS_MINIX is not set -CONFIG_GETOPT=y +# CONFIG_GETOPT is not set CONFIG_HEXDUMP=y -CONFIG_HWCLOCK=y -CONFIG_FEATURE_HWCLOCK_LONGOPTIONS=y +# CONFIG_HWCLOCK is not set # CONFIG_LOSETUP is not set # CONFIG_MKSWAP is not set CONFIG_MORE=y CONFIG_FEATURE_USE_TERMIOS=y CONFIG_PIVOT_ROOT=y CONFIG_RDATE=y -CONFIG_SWAPONOFF=y +# CONFIG_SWAPONOFF is not set CONFIG_MOUNT=y -# CONFIG_NFSMOUNT is not set +CONFIG_NFSMOUNT=y CONFIG_UMOUNT=y -# CONFIG_FEATURE_MOUNT_FORCE is not set +CONFIG_FEATURE_MOUNT_FORCE=y # # Common options for mount/umount diff --git a/openwrt/package/busybox/busybox.mk b/openwrt/package/busybox/busybox.mk index ae9abf1332..84c4a1cd7f 100644 --- a/openwrt/package/busybox/busybox.mk +++ b/openwrt/package/busybox/busybox.mk @@ -26,7 +26,7 @@ busybox-source: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_CONFIG) $(BUSYBOX_DIR)/.unpacked: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_UNZIP) $(DL_DIR)/$(BUSYBOX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - # Allow busybox patches. - toolchain/patch-kernel.sh $(BUSYBOX_DIR) package/busybox busybox-\*.patch + toolchain/patch-kernel.sh $(BUSYBOX_DIR) package/busybox/patches touch $(BUSYBOX_DIR)/.unpacked $(BUSYBOX_DIR)/.configured: $(BUSYBOX_DIR)/.unpacked $(BUSYBOX_CONFIG) diff --git a/openwrt/package/busybox/patches/100-killall5.patch b/openwrt/package/busybox/patches/100-killall5.patch new file mode 100644 index 0000000000..161b7e6f25 --- /dev/null +++ b/openwrt/package/busybox/patches/100-killall5.patch @@ -0,0 +1,87 @@ +diff -urN busybox-dist/include/applets.h busybox/include/applets.h +--- busybox-dist/include/applets.h 2004-03-13 02:33:09.000000000 -0600 ++++ busybox/include/applets.h 2004-03-16 09:45:29.000000000 -0600 +@@ -313,6 +313,9 @@ + #ifdef CONFIG_KILLALL + APPLET(killall, kill_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) + #endif ++#ifdef CONFIG_KILLALL5 ++ APPLET(killall5, kill_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) ++#endif + #ifdef CONFIG_KLOGD + APPLET(klogd, klogd_main, _BB_DIR_SBIN, _BB_SUID_NEVER) + #endif +diff -urN busybox-dist/include/usage.h busybox/include/usage.h +--- busybox-dist/include/usage.h 2004-03-13 02:33:09.000000000 -0600 ++++ busybox/include/usage.h 2004-03-16 09:45:29.000000000 -0600 +@@ -1389,6 +1389,13 @@ + #define killall_example_usage \ + "$ killall apache\n" + ++#define killall5_trivial_usage \ ++ "" ++#define killall5_full_usage \ ++ "" ++#define killall5_example_usage \ ++ "" ++ + #define klogd_trivial_usage \ + "[-c n] [-n]" + #define klogd_full_usage \ +diff -urN busybox-dist/procps/Config.in busybox/procps/Config.in +--- busybox-dist/procps/Config.in 2003-12-24 00:02:11.000000000 -0600 ++++ busybox/procps/Config.in 2004-03-16 09:45:29.000000000 -0600 +@@ -30,6 +30,11 @@ + specified commands. If no signal name is specified, SIGTERM is + sent. + ++config CONFIG_KILLALL5 ++ bool "killall5" ++ default n ++ depends on CONFIG_KILL ++ + config CONFIG_PIDOF + bool "pidof" + default n +diff -urN busybox-dist/procps/kill.c busybox/procps/kill.c +--- busybox-dist/procps/kill.c 2004-03-15 02:29:03.000000000 -0600 ++++ busybox/procps/kill.c 2004-03-16 09:45:29.000000000 -0600 +@@ -34,6 +34,7 @@ + + #define KILL 0 + #define KILLALL 1 ++#define KILLALL5 2 + + extern int kill_main(int argc, char **argv) + { +@@ -47,6 +48,9 @@ + #else + whichApp = KILL; + #endif ++#ifdef CONFIG_KILLALL5 ++ whichApp = (strcmp(bb_applet_name, "killall5") == 0)? KILLALL5 : whichApp; ++#endif + + /* Parse any options */ + if (argc < 2) +@@ -119,6 +123,20 @@ + } + + } ++#ifdef CONFIG_KILLALL5 ++ else if (whichApp == KILLALL5) { ++ procps_status_t * p; ++ pid_t myPid=getpid(); ++ while ((p = procps_scan(0)) != 0) { ++ if (p->pid != 1 && p->pid != myPid && p->pid != p->ppid) { ++ if (kill(p->pid, signo) != 0) { ++ bb_perror_msg( "Could not kill pid '%d'", p->pid); ++ errors++; ++ } ++ } ++ } ++ } ++#endif + #ifdef CONFIG_KILLALL + else { + pid_t myPid=getpid(); diff --git a/openwrt/package/busybox/patches/110-telnetd.patch b/openwrt/package/busybox/patches/110-telnetd.patch new file mode 100644 index 0000000000..e95757ee4e --- /dev/null +++ b/openwrt/package/busybox/patches/110-telnetd.patch @@ -0,0 +1,53 @@ +diff -urN busybox-1.00-pre8/networking/telnetd.c busybox-1.00-pre8-openwrt/networking/telnetd.c +--- busybox-1.00-pre8/networking/telnetd.c 2004-02-22 03:45:57.000000000 -0600 ++++ busybox-1.00-pre8-openwrt/networking/telnetd.c 2004-03-05 01:32:57.000000000 -0600 +@@ -44,6 +44,8 @@ + #include <arpa/telnet.h> + #include <ctype.h> + #include <sys/syslog.h> ++#include <net/if.h> ++ + + #include "busybox.h" + +@@ -384,11 +386,13 @@ + int portnbr = 23; + #endif /* CONFIG_FEATURE_TELNETD_INETD */ + int c; ++ char *interface_name = NULL; ++ struct ifreq interface; + static const char options[] = + #ifdef CONFIG_FEATURE_TELNETD_INETD +- "f:l:"; +-#else /* CONFIG_EATURE_TELNETD_INETD */ +- "f:l:p:"; ++ "i:f:l:"; ++#else /* CONFIG_FEATURE_TELNETD_INETD */ ++ "i:f:l:p:"; + #endif /* CONFIG_FEATURE_TELNETD_INETD */ + int maxlen, w, r; + +@@ -403,6 +407,9 @@ + case 'f': + issuefile = strdup (optarg); + break; ++ case 'i': ++ interface_name = strdup(optarg); ++ break; + case 'l': + loginpath = strdup (optarg); + break; +@@ -442,6 +449,13 @@ + sa.sin_family = AF_INET; + sa.sin_port = htons(portnbr); + ++ /* Set it to listen on the specified interface */ ++ if (interface_name) { ++ strncpy(interface.ifr_ifrn.ifrn_name, interface_name, IFNAMSIZ); ++ (void)setsockopt(master_fd, SOL_SOCKET, ++ SO_BINDTODEVICE, &interface, sizeof(interface)); ++ } ++ + if (bind(master_fd, (struct sockaddr *) &sa, sizeof(sa)) < 0) { + bb_perror_msg_and_die("bind"); + } diff --git a/openwrt/package/busybox/patches/120-no_login_for_telnetd.patch b/openwrt/package/busybox/patches/120-no_login_for_telnetd.patch new file mode 100644 index 0000000000..3c31f1a231 --- /dev/null +++ b/openwrt/package/busybox/patches/120-no_login_for_telnetd.patch @@ -0,0 +1,12 @@ +diff -ur busybox.orig/networking/Config.in busybox/networking/Config.in +--- busybox.orig/networking/Config.in 2004-09-23 22:08:46.000000000 +0200 ++++ busybox/networking/Config.in 2004-10-31 20:09:54.622922408 +0100 +@@ -492,7 +492,7 @@ + config CONFIG_TELNETD + bool "telnetd" + default n +- select CONFIG_LOGIN ++ #select CONFIG_LOGIN + help + A daemon for the TELNET protocol, allowing you to log onto the host + running the daemon. Please keep in mind that the TELNET protocol diff --git a/openwrt/target/squashfs/Config.in b/openwrt/target/squashfs/Config.in new file mode 100644 index 0000000000..a4cb4d8b6b --- /dev/null +++ b/openwrt/target/squashfs/Config.in @@ -0,0 +1,6 @@ +config BR2_TARGET_ROOTFS_SQUASHFS + bool "squashfs (ro) root filesystem for the target device" + default n + help + Build a squashfs root filesystem + diff --git a/openwrt/target/squashfs/Makefile.in b/openwrt/target/squashfs/Makefile.in new file mode 100644 index 0000000000..f78961776a --- /dev/null +++ b/openwrt/target/squashfs/Makefile.in @@ -0,0 +1,3 @@ +ifeq ($(strip $(BR2_TARGET_ROOTFS_SQUASHFS)),y) +TARGETS+=squashfsroot openwrt-code.bin.squashfs +endif diff --git a/openwrt/target/squashfs/squashfsroot.mk b/openwrt/target/squashfs/squashfsroot.mk new file mode 100644 index 0000000000..f3d2808592 --- /dev/null +++ b/openwrt/target/squashfs/squashfsroot.mk @@ -0,0 +1,50 @@ +############################################################# +# +# squashfs target +# +############################################################# + +SQUASHFS_DIR=$(BUILD_DIR)/squashfs2.1-r2 +SQUASHFS_SOURCE=squashfs2.1-r2.tar.gz +SQUASHFS_SITE=http://dl.sourceforge.net/sourceforge/squashfs + +$(DL_DIR)/$(SQUASHFS_SOURCE): + $(WGET) -P $(DL_DIR) $(SQUASHFS_SITE)/$(SQUASHFS_SOURCE) + +$(SQUASHFS_DIR)/.unpacked: $(DL_DIR)/$(SQUASHFS_SOURCE) + zcat $(DL_DIR)/$(SQUASHFS_SOURCE) | tar -C $(BUILD_DIR) -xvf - + touch $(SQUASHFS_DIR)/.unpacked + +$(SQUASHFS_DIR)/squashfs-tools/mksquashfs: $(SQUASHFS_DIR)/.unpacked + $(MAKE) -C $(SQUASHFS_DIR)/squashfs-tools; + +squashfs: $(SQUASHFS_DIR)/squashfs-tools/mksquashfs + +squashfs-source: $(DL_DIR)/$(SQUASHFS_SOURCE) + +squashfs-clean: + -$(MAKE) -C $(SQUASHFS_DIR)/squashfs-tools clean + +squashfs-dirclean: + rm -rf $(SQUASHFS_DIR) + + +############################################################# +# +# Build the squashfs root filesystem image +# +############################################################# + +squashfsroot: squashfs + @rm -rf $(TARGET_DIR)/usr/man + @rm -rf $(TARGET_DIR)/usr/info + $(SQUASHFS_DIR)/squashfs-tools/mksquashfs $(TARGET_DIR) $(IMAGE).squashfs -noappend -root-owned -le + +squashfsroot-source: squashfs-source + +squashfsroot-clean: + -$(MAKE) -C $(SQUASHFS_DIR) clean + +squashfsroot-dirclean: + rm -rf $(SQUASHFS_DIR) + diff --git a/openwrt/toolchain/uClibc/uClibc.config b/openwrt/toolchain/uClibc/uClibc.config index 4c3c5a1792..0d96520d11 100644 --- a/openwrt/toolchain/uClibc/uClibc.config +++ b/openwrt/toolchain/uClibc/uClibc.config @@ -3,6 +3,7 @@ # # TARGET_alpha is not set # TARGET_arm is not set +# TARGET_bfin is not set # TARGET_cris is not set # TARGET_e1 is not set # TARGET_frv is not set @@ -41,7 +42,7 @@ UCLIBC_HAS_FLOATS=y HAS_FPU=y DO_C99_MATH=y WARNINGS="-Wall" -KERNEL_SOURCE="/usr/src/cvs/new/buildroot/toolchain_build_mipsel/linux" +KERNEL_SOURCE="/home/wbx/DIPLOM/experimental/buildroot/toolchain_build_mipsel/linux" C_SYMBOL_PREFIX="" HAVE_DOT_CONFIG=y @@ -60,10 +61,9 @@ LDSO_CACHE_SUPPORT=y # LDSO_PRELOAD_FILE_SUPPORT is not set LDSO_BASE_FILENAME="ld.so" UCLIBC_CTOR_DTOR=y -# UCLIBC_PROPOLICE is not set # HAS_NO_THREADS is not set UCLIBC_HAS_THREADS=y -PTHREADS_DEBUG_SUPPORT=y +# PTHREADS_DEBUG_SUPPORT is not set UCLIBC_HAS_LFS=y # MALLOC is not set # MALLOC_SIMPLE is not set @@ -141,6 +141,11 @@ RUNTIME_PREFIX="/" DEVEL_PREFIX="/usr/" # +# uClibc security related options +# +# UCLIBC_SECURITY is not set + +# # uClibc development/debugging options # # DODEBUG is not set |