summaryrefslogtreecommitdiff
path: root/packages/busybox/busybox-static-1.2.1
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denis@denix.org>2009-03-17 14:32:59 -0400
committerDenys Dmytriyenko <denis@denix.org>2009-03-17 14:32:59 -0400
commit709c4d66e0b107ca606941b988bad717c0b45d9b (patch)
tree37ee08b1eb308f3b2b6426d5793545c38396b838 /packages/busybox/busybox-static-1.2.1
parentfa6cd5a3b993f16c27de4ff82b42684516d433ba (diff)
rename packages/ to recipes/ per earlier agreement
See links below for more details: http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326 http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816 Signed-off-by: Denys Dmytriyenko <denis@denix.org> Acked-by: Mike Westerhof <mwester@dls.net> Acked-by: Philip Balister <philip@balister.org> Acked-by: Khem Raj <raj.khem@gmail.com> Acked-by: Marcin Juszkiewicz <hrw@openembedded.org> Acked-by: Koen Kooi <koen@openembedded.org> Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'packages/busybox/busybox-static-1.2.1')
-rw-r--r--packages/busybox/busybox-static-1.2.1/add-getkey-applet.patch167
-rw-r--r--packages/busybox/busybox-static-1.2.1/angstrom-busybox-syslogd-conf.patch19
-rw-r--r--packages/busybox/busybox-static-1.2.1/below.patch46
-rwxr-xr-xpackages/busybox/busybox-static-1.2.1/busybox-mdev.sh69
-rw-r--r--packages/busybox/busybox-static-1.2.1/defconfig647
-rw-r--r--packages/busybox/busybox-static-1.2.1/df_rootfs.patch34
-rw-r--r--packages/busybox/busybox-static-1.2.1/dhcp-hostname.patch30
-rw-r--r--packages/busybox/busybox-static-1.2.1/dhcpretrytime.patch85
-rw-r--r--packages/busybox/busybox-static-1.2.1/fbset.patch24
-rw-r--r--packages/busybox/busybox-static-1.2.1/hdparm_M.patch47
-rw-r--r--packages/busybox/busybox-static-1.2.1/ifupdown-spurious-environ.patch12
-rw-r--r--packages/busybox/busybox-static-1.2.1/iproute-flush-cache.patch23
-rw-r--r--packages/busybox/busybox-static-1.2.1/mount-all-type.patch84
-rw-r--r--packages/busybox/busybox-static-1.2.1/readlink.patch85
-rw-r--r--packages/busybox/busybox-static-1.2.1/rmmod.patch40
-rw-r--r--packages/busybox/busybox-static-1.2.1/syslog.conf9
-rw-r--r--packages/busybox/busybox-static-1.2.1/udhcppidfile-breakage.patch57
-rw-r--r--packages/busybox/busybox-static-1.2.1/udhcppidfile.patch274
-rw-r--r--packages/busybox/busybox-static-1.2.1/udhcpscript.patch17
-rw-r--r--packages/busybox/busybox-static-1.2.1/wget-long-options.patch20
-rw-r--r--packages/busybox/busybox-static-1.2.1/xargs-double-size.patch13
21 files changed, 0 insertions, 1802 deletions
diff --git a/packages/busybox/busybox-static-1.2.1/add-getkey-applet.patch b/packages/busybox/busybox-static-1.2.1/add-getkey-applet.patch
deleted file mode 100644
index a75cf823c7..0000000000
--- a/packages/busybox/busybox-static-1.2.1/add-getkey-applet.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
-Index: busybox-1.1.0/console-tools/getkey.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ busybox-1.1.0/console-tools/getkey.c 2006-03-14 17:17:28.000000000 +0100
-@@ -0,0 +1,94 @@
-+/* vi: set sw=4 ts=4: */
-+/*
-+ * getkey.c - Michael 'Mickey' Lauer
-+ *
-+ * Version 0.1
-+ *
-+ * A simple keygrapper. Displays a configurable message and waits a dedicated number
-+ * of seconds for a keypress. Sets the exit code accordingly (SUCCESS on keypress).
-+ */
-+#include <stdio.h>
-+#include <fcntl.h>
-+#include <memory.h>
-+#include <stdlib.h>
-+#include <unistd.h>
-+#include <sys/types.h>
-+#include <errno.h>
-+#include <sys/ioctl.h>
-+#include <sys/kd.h>
-+#include "busybox.h"
-+
-+extern int getkey_main(int argc, char **argv)
-+{
-+ int status = EXIT_FAILURE;
-+
-+ if ( argc < 2 )
-+ {
-+ bb_show_usage();
-+ }
-+
-+ /*
-+ * If no terminal is attached it is quite useless
-+ * to treat it like one.
-+ */
-+ if( !isatty(STDIN_FILENO) )
-+ {
-+ goto error_hard;
-+ }
-+
-+ //bb_printf( "DEBUG: time = '%s'\n", argv[1] );
-+ //bb_printf( "DEBUG: mesg = '%s'\n", argv[2] );
-+
-+ struct termios orig;
-+ struct termios attr;
-+
-+ if ( tcgetattr(STDIN_FILENO, &orig) == -1 )
-+ {
-+ goto error_hard;
-+ }
-+
-+ attr = orig;
-+ attr.c_cc[VMIN] = 0;
-+ attr.c_cc[VTIME] = 0;
-+ attr.c_iflag |= INLCR;
-+ attr.c_oflag |= OPOST|ONLCR;
-+ attr.c_cflag &= ~PARENB;
-+ attr.c_lflag &= ~(ICANON/*|ECHO*/);
-+ if ( tcsetattr(STDIN_FILENO,TCSANOW,&attr) == -1 )
-+ {
-+ goto error_hard;
-+ }
-+
-+ fd_set rfds;
-+ struct timeval tv;
-+ int retval;
-+
-+ FD_ZERO(&rfds);
-+ FD_SET(0, &rfds);
-+
-+ tv.tv_sec = atoi( argv[1] );
-+ tv.tv_usec = 0;
-+
-+ if ( argc == 3 )
-+ {
-+ bb_printf( argv[2], tv.tv_sec );
-+ bb_printf( "\n" );
-+ fflush(stdout);
-+ }
-+ retval = select(1, &rfds, NULL, NULL, &tv);
-+ if (retval > 0)
-+ {
-+ status = EXIT_SUCCESS;
-+ }
-+
-+ if (tcsetattr(STDIN_FILENO,TCSANOW,&orig) == -1 )
-+ {
-+ goto error_hard;
-+ }
-+
-+ return status;
-+
-+error_hard :
-+ return EXIT_FAILURE;
-+};
-+
-Index: busybox-1.1.0/console-tools/Makefile.in
-===================================================================
---- busybox-1.1.0.orig/console-tools/Makefile.in 2006-01-11 06:43:57.000000000 +0100
-+++ busybox-1.1.0/console-tools/Makefile.in 2006-03-14 17:18:18.000000000 +0100
-@@ -21,6 +21,7 @@
- CONSOLETOOLS_DIR-$(CONFIG_OPENVT) += openvt.o
- CONSOLETOOLS_DIR-$(CONFIG_RESET) += reset.o
- CONSOLETOOLS_DIR-$(CONFIG_SETKEYCODES) += setkeycodes.o
-+CONSOLETOOLS_DIR-$(CONFIG_GETKEY) += getkey.o
-
- libraries-y+=$(CONSOLETOOLS_DIR)$(CONSOLETOOLS_AR)
-
-Index: busybox-1.1.0/console-tools/Config.in
-===================================================================
---- busybox-1.1.0.orig/console-tools/Config.in 2006-01-11 06:43:57.000000000 +0100
-+++ busybox-1.1.0/console-tools/Config.in 2006-03-14 17:17:28.000000000 +0100
-@@ -31,6 +31,14 @@
- This program dumps the kernel's keyboard translation table to
- stdout, in binary format. You can then use loadkmap to load it.
-
-+config CONFIG_GETKEY
-+ bool "getkey"
-+ default n
-+ help
-+ This program displays a configurable message and waits
-+ a dedicated number of seconds for a keypress. It sets
-+ the exit code accordingly, i.e. SUCCESS if there was a keypress.
-+
- config CONFIG_LOADFONT
- bool "loadfont"
- default n
-Index: busybox-1.1.0/include/applets.h
-===================================================================
---- busybox-1.1.0.orig/include/applets.h 2006-01-11 06:44:14.000000000 +0100
-+++ busybox-1.1.0/include/applets.h 2006-03-14 17:17:28.000000000 +0100
-@@ -261,6 +261,9 @@
- #ifdef CONFIG_FUSER
- APPLET(fuser, fuser_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)
- #endif
-+#ifdef CONFIG_GETKEY
-+ APPLET(getkey, getkey_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
-+#endif
- #ifdef CONFIG_GETOPT
- APPLET(getopt, getopt_main, _BB_DIR_BIN, _BB_SUID_NEVER)
- #endif
-Index: busybox-1.1.0/include/usage.h
-===================================================================
---- busybox-1.1.0.orig/include/usage.h 2006-01-11 06:44:14.000000000 +0100
-+++ busybox-1.1.0/include/usage.h 2006-03-14 17:19:11.000000000 +0100
-@@ -841,6 +841,13 @@
- "\t-p, --password Password to be used\n" \
- "\t-P, --port Port number to be used"
-
-+#define getkey_trivial_usage \
-+ "time [message]"
-+#define getkey_full_usage \
-+ "Display a message and wait for a keypress."
-+#define getkey_example_usage \
-+ "$ getkey 5 'Press a key within %d seconds to interrupt autoboot.'"
-+
- #define fuser_trivial_usage \
- "[options] file OR port/proto"
- #define fuser_full_usage \
diff --git a/packages/busybox/busybox-static-1.2.1/angstrom-busybox-syslogd-conf.patch b/packages/busybox/busybox-static-1.2.1/angstrom-busybox-syslogd-conf.patch
deleted file mode 100644
index c0afe5a07a..0000000000
--- a/packages/busybox/busybox-static-1.2.1/angstrom-busybox-syslogd-conf.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# old_revision [fdb3a990f25607c7b10b3ace56859b837e3e6a99]
-#
-# add_file "packages/busybox/busybox-1.2.1/angstrom/syslog.conf"
-# content [96581f5fbde2e5e5109328e8b42d14d53a5c2119]
-#
-============================================================
---- packages/busybox/busybox-1.2.1/angstrom/syslog.conf 96581f5fbde2e5e5109328e8b42d14d53a5c2119
-+++ packages/busybox/busybox-1.2.1/angstrom/syslog.conf 96581f5fbde2e5e5109328e8b42d14d53a5c2119
-@@ -0,0 +1,9 @@
-+DESTINATION="file" # log destinations (buffer file remote)
-+MARKINT=20 # interval between --mark-- entries [min]
-+REDUCE=no # reduced-size logging
-+BUFFERSIZE=64 # buffer: size of circular buffer [kByte]
-+LOGFILE=/var/log/messages # file: where to log
-+ROTATESIZE=32 # file: rotate log if grown beyond X [kByte] (busybox 1.2+)
-+ROTATEGENS=1 # file: keep X generations of rotated logs (busybox 1.2+)
-+REMOTE=loghost:514 # remote: where to log
-+FOREGROUND=no # run in foreground (don't use!)
diff --git a/packages/busybox/busybox-static-1.2.1/below.patch b/packages/busybox/busybox-static-1.2.1/below.patch
deleted file mode 100644
index 95e8376e46..0000000000
--- a/packages/busybox/busybox-static-1.2.1/below.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Index: busybox-1.1.0/modutils/modprobe.c
-===================================================================
---- busybox-1.1.0.orig/modutils/modprobe.c 2006-01-11 06:43:56.000000000 +0100
-+++ busybox-1.1.0/modutils/modprobe.c 2006-03-14 16:36:54.000000000 +0100
-@@ -509,6 +509,41 @@
- }
- }
- }
-+ else if ((strncmp (buffer, "below", 5) == 0) && isspace (buffer[5])) {
-+ char *mod, *deps;
-+ if (parse_tag_value (buffer + 6, &mod, &deps)) {
-+ struct dep_t *dt;
-+
-+ for (dt = first; dt; dt = dt->m_next) {
-+ if (strcmp (dt->m_name, mod) == 0)
-+ break;
-+ }
-+ if (dt) {
-+ char *pp;
-+ char *name;
-+
-+ pp = name = deps;
-+
-+ for (;;) {
-+ while (*pp != 0 && !isspace (*pp))
-+ pp++;
-+ if (isspace (*pp))
-+ *(pp++) = 0;
-+
-+ dt->m_depcnt++;
-+ dt->m_deparr = (char **) xrealloc (dt->m_deparr,
-+ sizeof (char *) * dt->m_depcnt);
-+ dt->m_deparr[dt->m_depcnt - 1] = bb_xstrdup (name);
-+
-+ while (isspace (*pp))
-+ pp++;
-+ name = pp;
-+ if (*pp == 0)
-+ break;
-+ }
-+ }
-+ }
-+ }
- }
- }
- close ( fd );
diff --git a/packages/busybox/busybox-static-1.2.1/busybox-mdev.sh b/packages/busybox/busybox-static-1.2.1/busybox-mdev.sh
deleted file mode 100755
index 9744322fa9..0000000000
--- a/packages/busybox/busybox-static-1.2.1/busybox-mdev.sh
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/sh
-MDEV=/sbin/mdev
-DESC="Busybox mdev setup"
-
-# Complain if thing's aren't right
-if [ ! -e /proc/filesystems ]; then
- echo "mdev requires a mounted procfs, not started."
- exit 1
-fi
-
-if ! grep -q '[[:space:]]tmpfs$' /proc/filesystems; then
- echo "mdev requires tmpfs support, not started."
- exit 1
-fi
-
-if [ ! -d /sys/class/ ]; then
- echo "mdev requires a mounted sysfs, not started."
- exit 1
-fi
-
-if [ ! -e /proc/sys/kernel/hotplug ]; then
- echo "mdev requires hotplug support, not started."
- exit 1
-fi
-
-# We need to unmount /dev/pts/ and remount it later over the tmpfs
-if mountpoint -q /dev/pts/; then
- umount -l /dev/pts/
-fi
-
-if mountpoint -q /dev/shm/; then
- umount -l /dev/shm/
-fi
-
-# Create tmpfs for /dev
-echo "Creating tmpfs at /dev"
-mount -t tmpfs tmpfs /dev -o size=800k
-
-# Register mdev as hotplug event helper
-echo "$MDEV" > /proc/sys/kernel/hotplug
-
-# Populate /dev from /sys info
-echo "Populating /dev using mdev"
-$MDEV -s
-
-# Touch .udev to inform scripts that /dev needs no further setup
-touch /dev/.udev
-
-# Mount devpts
-TTYGRP=5
-TTYMODE=620
-mkdir -m 755 -p /dev/pts
-if [ ! -e /dev/ptmx ]; then
- mknod -m 666 /dev/ptmx c 5 2
-fi
-mount -t devpts devpts /dev/pts -onoexec,nosuid,gid=$TTYGRP,mode=$TTYMODE
-
-# Make shm directory
-mkdir -m 755 -p /dev/shm
-
-# Make extraneous links
-ln -sf /proc/self/fd /dev/fd
-ln -sf /proc/self/fd/0 /dev/stdin
-ln -sf /proc/self/fd/1 /dev/stdout
-ln -sf /proc/self/fd/2 /dev/stderr
-ln -sf /proc/kcore /dev/core
-ln -sf /proc/asound/oss/sndstat /dev/sndstat
-
-exit 0
diff --git a/packages/busybox/busybox-static-1.2.1/defconfig b/packages/busybox/busybox-static-1.2.1/defconfig
deleted file mode 100644
index 5e0aa71614..0000000000
--- a/packages/busybox/busybox-static-1.2.1/defconfig
+++ /dev/null
@@ -1,647 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-HAVE_DOT_CONFIG=y
-
-#
-# Busybox Settings
-#
-
-#
-# General Configuration
-#
-# CONFIG_NITPICK is not set
-# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set
-# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
-# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
-CONFIG_SHOW_USAGE=y
-# CONFIG_FEATURE_VERBOSE_USAGE is not set
-# CONFIG_FEATURE_COMPRESS_USAGE is not set
-# CONFIG_FEATURE_INSTALLER is not set
-CONFIG_LOCALE_SUPPORT=y
-CONFIG_GETOPT_LONG=y
-CONFIG_FEATURE_DEVPTS=y
-# CONFIG_FEATURE_CLEAN_UP is not set
-# CONFIG_FEATURE_SUID is not set
-# CONFIG_FEATURE_SUID_CONFIG is not set
-# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
-# CONFIG_SELINUX is not set
-CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
-
-#
-# Build Options
-#
-# CONFIG_STATIC is not set
-# CONFIG_BUILD_LIBBUSYBOX is not set
-# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set
-# CONFIG_FEATURE_SHARED_BUSYBOX is not set
-CONFIG_LFS=y
-USING_CROSS_COMPILER=y
-CROSS_COMPILER_PREFIX="arm-angstrom-linux-gnueabi-"
-CONFIG_BUILD_AT_ONCE=y
-
-#
-# Debugging Options
-#
-# CONFIG_DEBUG is not set
-# CONFIG_DEBUG_PESSIMIZE is not set
-# CONFIG_NO_DEBUG_LIB is not set
-# CONFIG_DMALLOC is not set
-# CONFIG_EFENCE is not set
-CONFIG_DEBUG_YANK_SUSv2=y
-
-#
-# Installation Options
-#
-# CONFIG_INSTALL_NO_USR is not set
-CONFIG_INSTALL_APPLET_SYMLINKS=y
-# CONFIG_INSTALL_APPLET_HARDLINKS is not set
-# CONFIG_INSTALL_APPLET_DONT is not set
-PREFIX="./_install"
-
-#
-# Busybox Library Tuning
-#
-CONFIG_MD5_SIZE_VS_SPEED=2
-
-#
-# Applets
-#
-
-#
-# Archival Utilities
-#
-CONFIG_AR=y
-# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
-CONFIG_BUNZIP2=y
-CONFIG_CPIO=y
-# CONFIG_DPKG is not set
-# CONFIG_DPKG_DEB is not set
-# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
-CONFIG_GUNZIP=y
-# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set
-CONFIG_GZIP=y
-# CONFIG_RPM2CPIO is not set
-# CONFIG_RPM is not set
-CONFIG_TAR=y
-CONFIG_FEATURE_TAR_CREATE=y
-CONFIG_FEATURE_TAR_BZIP2=y
-# CONFIG_FEATURE_TAR_LZMA is not set
-CONFIG_FEATURE_TAR_FROM=y
-CONFIG_FEATURE_TAR_GZIP=y
-# CONFIG_FEATURE_TAR_COMPRESS is not set
-# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set
-CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
-# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
-# CONFIG_UNCOMPRESS is not set
-# CONFIG_UNLZMA is not set
-# CONFIG_FEATURE_LZMA_FAST is not set
-CONFIG_UNZIP=y
-
-#
-# Common options for cpio and tar
-#
-# CONFIG_FEATURE_UNARCHIVE_TAPE is not set
-# CONFIG_FEATURE_DEB_TAR_GZ is not set
-# CONFIG_FEATURE_DEB_TAR_BZ2 is not set
-# CONFIG_FEATURE_DEB_TAR_LZMA is not set
-
-#
-# Coreutils
-#
-CONFIG_BASENAME=y
-# CONFIG_CAL is not set
-CONFIG_CAT=y
-# CONFIG_CATV is not set
-CONFIG_CHGRP=y
-CONFIG_CHMOD=y
-CONFIG_CHOWN=y
-CONFIG_CHROOT=y
-# CONFIG_CKSUM is not set
-# CONFIG_CMP is not set
-# CONFIG_COMM is not set
-CONFIG_CP=y
-CONFIG_CUT=y
-CONFIG_DATE=y
-CONFIG_FEATURE_DATE_ISOFMT=y
-CONFIG_DD=y
-CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
-# CONFIG_FEATURE_DD_IBS_OBS is not set
-CONFIG_DF=y
-CONFIG_DIFF=y
-CONFIG_FEATURE_DIFF_BINARY=y
-CONFIG_FEATURE_DIFF_DIR=y
-# CONFIG_FEATURE_DIFF_MINIMAL is not set
-CONFIG_DIRNAME=y
-# CONFIG_DOS2UNIX is not set
-# CONFIG_UNIX2DOS is not set
-CONFIG_DU=y
-CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
-CONFIG_ECHO=y
-CONFIG_FEATURE_FANCY_ECHO=y
-CONFIG_ENV=y
-CONFIG_FEATURE_ENV_LONG_OPTIONS=y
-CONFIG_EXPR=y
-# CONFIG_EXPR_MATH_SUPPORT_64 is not set
-CONFIG_FALSE=y
-# CONFIG_FOLD is not set
-CONFIG_HEAD=y
-# CONFIG_FEATURE_FANCY_HEAD is not set
-# CONFIG_HOSTID is not set
-CONFIG_ID=y
-# CONFIG_INSTALL is not set
-# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set
-# CONFIG_LENGTH is not set
-CONFIG_LN=y
-CONFIG_LOGNAME=y
-CONFIG_LS=y
-CONFIG_FEATURE_LS_FILETYPES=y
-CONFIG_FEATURE_LS_FOLLOWLINKS=y
-CONFIG_FEATURE_LS_RECURSIVE=y
-CONFIG_FEATURE_LS_SORTFILES=y
-CONFIG_FEATURE_LS_TIMESTAMPS=y
-CONFIG_FEATURE_LS_USERNAME=y
-CONFIG_FEATURE_LS_COLOR=y
-# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set
-CONFIG_MD5SUM=y
-CONFIG_MKDIR=y
-CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
-CONFIG_MKFIFO=y
-CONFIG_MKNOD=y
-CONFIG_MV=y
-# CONFIG_FEATURE_MV_LONG_OPTIONS is not set
-# CONFIG_NICE is not set
-CONFIG_NOHUP=y
-CONFIG_OD=y
-# CONFIG_PRINTENV is not set
-CONFIG_PRINTF=y
-CONFIG_PWD=y
-CONFIG_REALPATH=y
-CONFIG_RM=y
-CONFIG_RMDIR=y
-CONFIG_SEQ=y
-# CONFIG_SHA1SUM is not set
-CONFIG_SLEEP=y
-CONFIG_FEATURE_FANCY_SLEEP=y
-CONFIG_SORT=y
-CONFIG_FEATURE_SORT_BIG=y
-# CONFIG_STAT is not set
-# CONFIG_FEATURE_STAT_FORMAT is not set
-CONFIG_STTY=y
-# CONFIG_SUM is not set
-CONFIG_SYNC=y
-CONFIG_TAIL=y
-CONFIG_FEATURE_FANCY_TAIL=y
-CONFIG_TEE=y
-# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set
-CONFIG_TEST=y
-# CONFIG_FEATURE_TEST_64 is not set
-CONFIG_TOUCH=y
-CONFIG_TR=y
-CONFIG_FEATURE_TR_CLASSES=y
-# CONFIG_FEATURE_TR_EQUIV is not set
-CONFIG_TRUE=y
-CONFIG_TTY=y
-CONFIG_UNAME=y
-CONFIG_UNIQ=y
-CONFIG_USLEEP=y
-# CONFIG_UUDECODE is not set
-# CONFIG_UUENCODE is not set
-CONFIG_WATCH=y
-CONFIG_WC=y
-CONFIG_WHO=y
-CONFIG_WHOAMI=y
-CONFIG_YES=y
-
-#
-# Common options for cp and mv
-#
-# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set
-
-#
-# Common options for ls, more and telnet
-#
-CONFIG_FEATURE_AUTOWIDTH=y
-
-#
-# Common options for df, du, ls
-#
-CONFIG_FEATURE_HUMAN_READABLE=y
-
-#
-# Common options for md5sum, sha1sum
-#
-CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
-
-#
-# Console Utilities
-#
-CONFIG_CHVT=y
-CONFIG_CLEAR=y
-CONFIG_DEALLOCVT=y
-CONFIG_DUMPKMAP=y
-CONFIG_LOADFONT=y
-CONFIG_LOADKMAP=y
-CONFIG_OPENVT=y
-CONFIG_RESET=y
-CONFIG_SETCONSOLE=y
-# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
-# CONFIG_SETKEYCODES is not set
-# CONFIG_SETLOGCONS is not set
-
-#
-# Debian Utilities
-#
-CONFIG_MKTEMP=y
-# CONFIG_PIPE_PROGRESS is not set
-CONFIG_READLINK=y
-CONFIG_FEATURE_READLINK_FOLLOW=y
-CONFIG_RUN_PARTS=y
-CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
-CONFIG_START_STOP_DAEMON=y
-CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
-CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y
-CONFIG_WHICH=y
-
-#
-# Editors
-#
-CONFIG_AWK=y
-CONFIG_FEATURE_AWK_MATH=y
-# CONFIG_ED is not set
-CONFIG_PATCH=y
-CONFIG_SED=y
-CONFIG_VI=y
-CONFIG_FEATURE_VI_COLON=y
-CONFIG_FEATURE_VI_YANKMARK=y
-CONFIG_FEATURE_VI_SEARCH=y
-CONFIG_FEATURE_VI_USE_SIGNALS=y
-# CONFIG_FEATURE_VI_DOT_CMD is not set
-# CONFIG_FEATURE_VI_READONLY is not set
-# CONFIG_FEATURE_VI_SETOPTS is not set
-# CONFIG_FEATURE_VI_SET is not set
-CONFIG_FEATURE_VI_WIN_RESIZE=y
-CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
-
-#
-# Finding Utilities
-#
-CONFIG_FIND=y
-CONFIG_FEATURE_FIND_PRINT0=y
-CONFIG_FEATURE_FIND_MTIME=y
-CONFIG_FEATURE_FIND_MMIN=y
-CONFIG_FEATURE_FIND_PERM=y
-CONFIG_FEATURE_FIND_TYPE=y
-CONFIG_FEATURE_FIND_XDEV=y
-CONFIG_FEATURE_FIND_NEWER=y
-# CONFIG_FEATURE_FIND_INUM is not set
-CONFIG_FEATURE_FIND_EXEC=y
-CONFIG_GREP=y
-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_QUOTES is not set
-# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set
-# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set
-
-#
-# Init Utilities
-#
-# CONFIG_INIT is not set
-# CONFIG_DEBUG_INIT is not set
-# CONFIG_FEATURE_USE_INITTAB is not set
-# CONFIG_FEATURE_INIT_SCTTY is not set
-# CONFIG_FEATURE_EXTRA_QUIET is not set
-# CONFIG_FEATURE_INIT_COREDUMPS is not set
-# CONFIG_FEATURE_INITRD is not set
-# CONFIG_HALT is not set
-# CONFIG_MESG is not set
-
-#
-# Login/Password Management Utilities
-#
-# CONFIG_FEATURE_SHADOWPASSWDS is not set
-# CONFIG_USE_BB_SHADOW is not set
-# CONFIG_USE_BB_PWD_GRP is not set
-# 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_UTMP=y
-# CONFIG_FEATURE_WTMP is not set
-# CONFIG_LOGIN is not set
-# CONFIG_FEATURE_SECURETTY is not set
-# CONFIG_PASSWD is not set
-# CONFIG_SU is not set
-# CONFIG_SULOGIN is not set
-# CONFIG_VLOCK is not set
-
-#
-# Linux Ext2 FS Progs
-#
-CONFIG_CHATTR=y
-CONFIG_E2FSCK=y
-CONFIG_FSCK=y
-# CONFIG_LSATTR is not set
-CONFIG_MKE2FS=y
-# CONFIG_TUNE2FS is not set
-# CONFIG_E2LABEL is not set
-# CONFIG_FINDFS is not set
-
-#
-# Linux Module Utilities
-#
-CONFIG_INSMOD=y
-# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
-# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
-# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
-# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
-# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
-CONFIG_RMMOD=y
-CONFIG_LSMOD=y
-# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set
-CONFIG_MODPROBE=y
-CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y
-
-#
-# Options common to multiple modutils
-#
-CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
-# CONFIG_FEATURE_2_4_MODULES is not set
-CONFIG_FEATURE_2_6_MODULES=y
-# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set
-
-#
-# Linux System Utilities
-#
-CONFIG_DMESG=y
-CONFIG_FBSET=y
-CONFIG_FEATURE_FBSET_FANCY=y
-CONFIG_FEATURE_FBSET_READMODE=y
-# CONFIG_FDFLUSH is not set
-# CONFIG_FDFORMAT is not set
-CONFIG_FDISK=y
-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=y
-CONFIG_MKFS_MINIX=y
-
-#
-# Minix filesystem support
-#
-CONFIG_FEATURE_MINIX2=y
-# CONFIG_GETOPT is not set
-CONFIG_HEXDUMP=y
-CONFIG_HWCLOCK=y
-CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y
-CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
-# CONFIG_IPCRM is not set
-# CONFIG_IPCS is not set
-CONFIG_LOSETUP=y
-# CONFIG_MDEV is not set
-# CONFIG_FEATURE_MDEV_CONF is not set
-# CONFIG_FEATURE_MDEV_EXEC is not set
-CONFIG_MKSWAP=y
-# CONFIG_FEATURE_MKSWAP_V0 is not set
-CONFIG_MORE=y
-CONFIG_FEATURE_USE_TERMIOS=y
-CONFIG_MOUNT=y
-CONFIG_FEATURE_MOUNT_NFS=y
-CONFIG_PIVOT_ROOT=y
-CONFIG_RDATE=y
-# CONFIG_READPROFILE is not set
-# CONFIG_SETARCH is not set
-CONFIG_SWAPONOFF=y
-CONFIG_SWITCH_ROOT=y
-CONFIG_UMOUNT=y
-# CONFIG_FEATURE_UMOUNT_ALL is not set
-
-#
-# Common options for mount/umount
-#
-CONFIG_FEATURE_MOUNT_LOOP=y
-# CONFIG_FEATURE_MTAB_SUPPORT is not set
-
-#
-# Miscellaneous Utilities
-#
-# CONFIG_ADJTIMEX is not set
-# CONFIG_BBCONFIG is not set
-# CONFIG_CROND is not set
-# CONFIG_DEBUG_CROND_OPTION is not set
-# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
-# CONFIG_CRONTAB is not set
-CONFIG_DC=y
-# CONFIG_DEVFSD is not set
-# CONFIG_DEVFSD_MODLOAD is not set
-# CONFIG_DEVFSD_FG_NP is not set
-# CONFIG_DEVFSD_VERBOSE is not set
-# CONFIG_FEATURE_DEVFS is not set
-# CONFIG_EJECT is not set
-# CONFIG_LAST is not set
-CONFIG_LESS=y
-CONFIG_FEATURE_LESS_BRACKETS=y
-CONFIG_FEATURE_LESS_FLAGS=y
-# CONFIG_FEATURE_LESS_FLAGCS is not set
-# CONFIG_FEATURE_LESS_MARKS is not set
-# CONFIG_FEATURE_LESS_REGEXP is not set
-# CONFIG_HDPARM is not set
-# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set
-# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
-# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set
-# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
-# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
-# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
-# CONFIG_MAKEDEVS is not set
-# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
-# CONFIG_FEATURE_MAKEDEVS_TABLE is not set
-# CONFIG_MOUNTPOINT is not set
-# CONFIG_MT is not set
-# CONFIG_RUNLEVEL is not set
-# CONFIG_RX is not set
-CONFIG_STRINGS=y
-# CONFIG_SETSID is not set
-# CONFIG_TASKSET is not set
-CONFIG_TIME=y
-# CONFIG_WATCHDOG is not set
-
-#
-# Networking Utilities
-#
-CONFIG_FEATURE_IPV6=y
-# CONFIG_ARPING is not set
-# CONFIG_DNSD is not set
-# CONFIG_ETHER_WAKE is not set
-# CONFIG_FAKEIDENTD is not set
-# CONFIG_FTPGET is not set
-# CONFIG_FTPPUT is not set
-# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
-CONFIG_HOSTNAME=y
-# CONFIG_HTTPD is not set
-# CONFIG_FEATURE_HTTPD_WITHOUT_INETD is not set
-# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set
-# CONFIG_FEATURE_HTTPD_SETUID is not set
-# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
-# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
-# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set
-# CONFIG_FEATURE_HTTPD_CGI is not set
-# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
-# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
-# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
-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=y
-# 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=y
-# CONFIG_FEATURE_IFUPDOWN_IPX is not set
-CONFIG_FEATURE_IFUPDOWN_MAPPING=y
-# CONFIG_INETD is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set
-# CONFIG_FEATURE_INETD_RPC is not set
-CONFIG_IP=y
-CONFIG_FEATURE_IP_ADDRESS=y
-CONFIG_FEATURE_IP_LINK=y
-CONFIG_FEATURE_IP_ROUTE=y
-CONFIG_FEATURE_IP_TUNNEL=y
-# CONFIG_FEATURE_IP_SHORT_FORMS is not set
-# CONFIG_IPADDR is not set
-# CONFIG_IPLINK is not set
-# CONFIG_IPROUTE is not set
-# CONFIG_IPTUNNEL is not set
-# CONFIG_IPCALC is not set
-# CONFIG_FEATURE_IPCALC_FANCY is not set
-# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
-# CONFIG_NAMEIF is not set
-CONFIG_NC=y
-# CONFIG_NC_GAPING_SECURITY_HOLE is not set
-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 is not set
-CONFIG_FEATURE_TELNET_AUTOLOGIN=y
-# CONFIG_TELNETD is not set
-# CONFIG_FEATURE_TELNETD_INETD is not set
-CONFIG_TFTP=y
-CONFIG_FEATURE_TFTP_GET=y
-CONFIG_FEATURE_TFTP_PUT=y
-# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
-# CONFIG_DEBUG_TFTP is not set
-CONFIG_TRACEROUTE=y
-# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
-# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
-# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
-
-#
-# udhcp Server/Client
-#
-CONFIG_APP_UDHCPD=y
-CONFIG_APP_UDHCPC=y
-CONFIG_APP_DUMPLEASES=y
-CONFIG_FEATURE_UDHCP_SYSLOG=y
-# CONFIG_FEATURE_UDHCP_DEBUG is not set
-# CONFIG_VCONFIG is not set
-CONFIG_WGET=y
-CONFIG_FEATURE_WGET_STATUSBAR=y
-CONFIG_FEATURE_WGET_AUTHENTICATION=y
-CONFIG_FEATURE_WGET_IP6_LITERAL=y
-CONFIG_FEATURE_WGET_LONG_OPTIONS=y
-# CONFIG_ZCIP is not set
-
-#
-# Process Utilities
-#
-CONFIG_FREE=y
-CONFIG_FUSER=y
-CONFIG_KILL=y
-CONFIG_KILLALL=y
-CONFIG_PIDOF=y
-# CONFIG_FEATURE_PIDOF_SINGLE is not set
-# CONFIG_FEATURE_PIDOF_OMIT is not set
-CONFIG_PS=y
-CONFIG_FEATURE_PS_WIDE=y
-CONFIG_RENICE=y
-CONFIG_BB_SYSCTL=y
-CONFIG_TOP=y
-CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
-CONFIG_UPTIME=y
-
-#
-# Shells
-#
-CONFIG_FEATURE_SH_IS_ASH=y
-# CONFIG_FEATURE_SH_IS_HUSH is not set
-# CONFIG_FEATURE_SH_IS_LASH is not set
-# CONFIG_FEATURE_SH_IS_MSH is not set
-# CONFIG_FEATURE_SH_IS_NONE is not set
-CONFIG_ASH=y
-
-#
-# Ash Shell Options
-#
-CONFIG_ASH_JOB_CONTROL=y
-CONFIG_ASH_READ_NCHARS=y
-CONFIG_ASH_READ_TIMEOUT=y
-CONFIG_ASH_ALIAS=y
-CONFIG_ASH_MATH_SUPPORT=y
-# CONFIG_ASH_MATH_SUPPORT_64 is not set
-CONFIG_ASH_GETOPTS=y
-# CONFIG_ASH_BUILTIN_ECHO is not set
-CONFIG_ASH_BUILTIN_TEST=y
-# CONFIG_ASH_CMDCMD is not set
-# CONFIG_ASH_MAIL is not set
-CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
-# CONFIG_ASH_RANDOM_SUPPORT is not set
-CONFIG_ASH_EXPAND_PRMT=y
-# CONFIG_HUSH is not set
-# CONFIG_LASH is not set
-# CONFIG_MSH is not set
-
-#
-# Bourne Shell Options
-#
-CONFIG_FEATURE_SH_EXTRA_QUIET=y
-# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set
-CONFIG_FEATURE_COMMAND_EDITING=y
-# CONFIG_FEATURE_COMMAND_EDITING_VI is not set
-CONFIG_FEATURE_COMMAND_HISTORY=63
-# 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
-
-#
-# System Logging Utilities
-#
-CONFIG_SYSLOGD=y
-CONFIG_FEATURE_ROTATE_LOGFILE=y
-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=y
-CONFIG_KLOGD=y
-CONFIG_LOGGER=y
diff --git a/packages/busybox/busybox-static-1.2.1/df_rootfs.patch b/packages/busybox/busybox-static-1.2.1/df_rootfs.patch
deleted file mode 100644
index 486318a2cf..0000000000
--- a/packages/busybox/busybox-static-1.2.1/df_rootfs.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- busybox-1.2.1/coreutils/df.c.orig 2006-11-11 13:25:00.000000000 -0600
-+++ busybox-1.2.1/coreutils/df.c 2006-11-11 13:23:15.000000000 -0600
-@@ -47,6 +47,7 @@
- struct statfs s;
- static const char hdr_1k[] = "1k-blocks"; /* default display is kilobytes */
- const char *disp_units_hdr = hdr_1k;
-+ int root_done = 0;
-
- #ifdef CONFIG_FEATURE_HUMAN_READABLE
- bb_opt_complementally = "h-km:k-hm:m-hk";
-@@ -112,16 +113,19 @@
- ) / (blocks_used + s.f_bavail);
- }
-
-- if (strcmp(device, "rootfs") == 0) {
-- continue;
-- } else if (strcmp(device, "/dev/root") == 0) {
-+ if (strcmp(device, "/dev/root") == 0 || strcmp(device, "rootfs") == 0) {
- /* Adjusts device to be the real root device,
- * or leaves device alone if it can't find it */
-- if ((device = find_block_device("/")) == NULL) {
-+ if ((device = find_block_device(mount_point)) == NULL) {
- goto SET_ERROR;
- }
- }
-
-+ if (strcmp(mount_point, "/") == 0) {
-+ if (root_done) continue;
-+ root_done = 1;
-+ }
-+
- #ifdef CONFIG_FEATURE_HUMAN_READABLE
- bb_printf("%-20s %9s ", device,
- make_human_readable_str(s.f_blocks, s.f_bsize, df_disp_hr));
diff --git a/packages/busybox/busybox-static-1.2.1/dhcp-hostname.patch b/packages/busybox/busybox-static-1.2.1/dhcp-hostname.patch
deleted file mode 100644
index e0adea662e..0000000000
--- a/packages/busybox/busybox-static-1.2.1/dhcp-hostname.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- busybox-1.01/networking/udhcp/dhcpc.c~dhcp-hostname
-+++ busybox-1.01/networking/udhcp/dhcpc.c
-@@ -193,6 +193,7 @@
- int max_fd;
- int sig;
- int no_clientid = 0;
-+ char hostbuf[256]; /* SUSv2: hostnames are <= 255 bytes */
-
- static const struct option arg_options[] = {
- {"clientid", required_argument, 0, 'c'},
-@@ -211,6 +212,14 @@
- {0, 0, 0, 0}
- };
-
-+ if (gethostname (hostbuf, sizeof (hostbuf)) == 0) {
-+ len = strlen (hostbuf);
-+ client_config.hostname = xmalloc (len + 2);
-+ client_config.hostname[OPT_CODE] = DHCP_HOST_NAME;
-+ client_config.hostname[OPT_LEN] = len;
-+ strncpy(client_config.hostname + 2, hostbuf, len);
-+ }
-+
- /* get options */
- while (1) {
- int option_index = 0;
diff --git a/packages/busybox/busybox-static-1.2.1/dhcpretrytime.patch b/packages/busybox/busybox-static-1.2.1/dhcpretrytime.patch
deleted file mode 100644
index 893e346acf..0000000000
--- a/packages/busybox/busybox-static-1.2.1/dhcpretrytime.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
-Index: busybox-1.1.0/networking/udhcp/dhcpc.c
-===================================================================
---- busybox-1.1.0.orig/networking/udhcp/dhcpc.c 2006-03-14 17:19:31.000000000 +0100
-+++ busybox-1.1.0/networking/udhcp/dhcpc.c 2006-03-14 17:20:45.000000000 +0100
-@@ -48,6 +48,7 @@
- static unsigned long requested_ip; /* = 0 */
- static unsigned long server_addr;
- static unsigned long timeout;
-+static unsigned long retrytime = 60;
- static int packet_num; /* = 0 */
- static int fd = -1;
-
-@@ -95,6 +96,7 @@
- " -r, --request=IP IP address to request (default: none)\n"
- " -s, --script=file Run file at dhcp events (default:\n"
- " " DEFAULT_SCRIPT ")\n"
-+" -t, --retrytime time to retry DHCP request (default 60s)\n")
- " -v, --version Display version\n"
- );
- exit(0);
-@@ -214,6 +216,7 @@
- {"quit", no_argument, 0, 'q'},
- {"request", required_argument, 0, 'r'},
- {"script", required_argument, 0, 's'},
-+ {"retrytime", required_argument, 0, 't'},
- {"version", no_argument, 0, 'v'},
- {0, 0, 0, 0}
- };
-@@ -229,7 +232,7 @@
- /* get options */
- while (1) {
- int option_index = 0;
-- c = getopt_long(argc, argv, "c:CV:fbH:h:F:i:np:qr:s:v", arg_options, &option_index);
-+ c = getopt_long(argc, argv, "c:CV:fbH:h:F:i:np:qr:s:t:v", arg_options, &option_index);
- if (c == -1) break;
-
- switch (c) {
-@@ -305,6 +308,9 @@
- case 's':
- client_config.script = optarg;
- break;
-+ case 't':
-+ retrytime = atol(optarg);
-+ break;
- case 'v':
- printf("udhcpcd, version %s\n\n", VERSION);
- return 0;
-@@ -394,7 +400,7 @@
- }
- /* wait to try again */
- packet_num = 0;
-- timeout = now + 60;
-+ timeout = now + retrytime;
- }
- break;
- case RENEW_REQUESTED:
-Index: busybox-1.1.0/networking/ifupdown.c
-===================================================================
---- busybox-1.1.0.orig/networking/ifupdown.c 2006-01-11 06:43:51.000000000 +0100
-+++ busybox-1.1.0/networking/ifupdown.c 2006-03-14 17:19:41.000000000 +0100
-@@ -506,7 +506,7 @@
- static int dhcp_up(struct interface_defn_t *ifd, execfn *exec)
- {
- if (execable("/sbin/udhcpc")) {
-- return( execute("udhcpc -n -p /var/run/udhcpc.%iface%.pid -i "
-+ return( execute("udhcpc -b -p /var/run/udhcpc.%iface%.pid -i "
- "%iface% [[-H %hostname%]] [[-c %clientid%]]", ifd, exec));
- } else if (execable("/sbin/pump")) {
- return( execute("pump -i %iface% [[-h %hostname%]] [[-l %leasehours%]]", ifd, exec));
-@@ -526,8 +526,8 @@
- /* SIGUSR2 forces udhcpc to release the current lease and go inactive,
- * and SIGTERM causes udhcpc to exit. Signals are queued and processed
- * sequentially so we don't need to sleep */
-- result = execute("kill -USR2 `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", ifd, exec);
-- result += execute("kill -TERM `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", ifd, exec);
-+ result = execute("kill -USR2 `cat /var/run/udhcpc.%iface%.pid 2>/dev/null` 2>/dev/null", ifd, exec);
-+ result += execute("kill -TERM `cat /var/run/udhcpc.%iface%.pid 2>/dev/null` 2>/dev/null", ifd, exec);
- } else if (execable("/sbin/pump")) {
- result = execute("pump -i %iface% -k", ifd, exec);
- } else if (execable("/sbin/dhclient")) {
diff --git a/packages/busybox/busybox-static-1.2.1/fbset.patch b/packages/busybox/busybox-static-1.2.1/fbset.patch
deleted file mode 100644
index d0609ce6f7..0000000000
--- a/packages/busybox/busybox-static-1.2.1/fbset.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- busybox/util-linux/fbset.c~ 2004-07-03 16:24:23.000000000 +0100
-+++ busybox/util-linux/fbset.c 2004-12-30 20:09:26.000000000 +0000
-@@ -337,7 +337,7 @@
- {
- struct fb_var_screeninfo var, varset;
- int fh, i;
-- char *fbdev = DEFAULTFBDEV;
-+ char *fbdev = NULL;
- char *modefile = DEFAULTFBMODE;
- char *thisarg, *mode = NULL;
-
-@@ -404,7 +404,12 @@
- }
- }
-
-+ if (fbdev == NULL)
-+ fbdev = DEFAULTFBDEV;
- if ((fh = open(fbdev, O_RDONLY)) < 0)
-+#ifdef CONFIG_FEATURE_DEVFS
-+ if ((fh = open("/dev/fb0", O_RDONLY)) < 0)
-+#endif
- bb_perror_msg_and_die("fbset(open)");
- if (ioctl(fh, FBIOGET_VSCREENINFO, &var))
- bb_perror_msg_and_die("fbset(ioctl)");
diff --git a/packages/busybox/busybox-static-1.2.1/hdparm_M.patch b/packages/busybox/busybox-static-1.2.1/hdparm_M.patch
deleted file mode 100644
index 9adcd36f92..0000000000
--- a/packages/busybox/busybox-static-1.2.1/hdparm_M.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Index: busybox-1.1.0/miscutils/hdparm.c
-===================================================================
---- busybox-1.1.0.orig/miscutils/hdparm.c 2006-01-11 06:44:13.000000000 +0100
-+++ busybox-1.1.0/miscutils/hdparm.c 2006-03-14 17:22:22.000000000 +0100
-@@ -1255,6 +1255,7 @@
- static unsigned long set_sleepnow, get_sleepnow;
- static unsigned long get_powermode;
- static unsigned long set_apmmode, get_apmmode, apmmode;
-+static unsigned long set_acoustic = 0, get_acoustic = 0, acoustic = 0;
- #endif
- #ifdef CONFIG_FEATURE_HDPARM_GET_IDENTITY
- static int get_IDentity;
-@@ -2124,6 +2125,20 @@
- }
- bb_ioctl(fd, HDIO_DRIVE_CMD, &args,"HDIO_DRIVE_CMD");
- }
-+ if (set_acoustic)
-+ {
-+ no_scsi();
-+ acoustic=check_if_min_and_set_val(acoustic,0);
-+ acoustic=check_if_maj_and_set_val(acoustic,254);
-+ if_printf(get_acoustic," setting AAM level to 0x%02lX (%ld)\n", acoustic, acoustic);
-+ bb_ioctl(fd, HDIO_SET_ACOUSTIC, (int*)acoustic,"HDIO_SET_ACOUSTIC");
-+ }
-+ if (get_acoustic)
-+ {
-+ no_scsi();
-+ bb_ioctl(fd, HDIO_GET_ACOUSTIC, (unsigned long*)&parm,"HDIO_GET_ACOUSTIC");
-+ printf(" acoustic = %2ld (128=quiet ... 254=fast)\n", parm);
-+ }
- if (set_wcache)
- {
- #ifdef DO_FLUSHCACHE
-@@ -2832,6 +2847,13 @@
- p = *argv++, --argc;
- p=GET_NUMBER(p,&set_readahead,&Xreadahead);
- break;
-+ case 'M':
-+ get_acoustic = noisy;
-+ noisy = 1;
-+ if (!*p && argc && isalnum(**argv))
-+ p = *argv++, --argc;
-+ p=GET_NUMBER(p,&set_acoustic,&acoustic);
-+ break;
- case 'B':
- get_apmmode = noisy;
- noisy = 1;
diff --git a/packages/busybox/busybox-static-1.2.1/ifupdown-spurious-environ.patch b/packages/busybox/busybox-static-1.2.1/ifupdown-spurious-environ.patch
deleted file mode 100644
index 8753315f2c..0000000000
--- a/packages/busybox/busybox-static-1.2.1/ifupdown-spurious-environ.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- busybox-1.00/networking/ifupdown.c.old 2005-06-11 19:51:59.000000000 +0100
-+++ busybox-1.00/networking/ifupdown.c 2005-06-11 19:52:19.000000000 +0100
-@@ -148,6 +148,9 @@
- struct mapping_defn_t *mappings;
- };
-
-+/* XXX */
-+#define environ local_environ
-+
- static char no_act = 0;
- static char verbose = 0;
- static char **environ = NULL;
diff --git a/packages/busybox/busybox-static-1.2.1/iproute-flush-cache.patch b/packages/busybox/busybox-static-1.2.1/iproute-flush-cache.patch
deleted file mode 100644
index f8becc3390..0000000000
--- a/packages/busybox/busybox-static-1.2.1/iproute-flush-cache.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: networking/libiproute/iproute.c
-===================================================================
-RCS file: /var/cvs/busybox/networking/libiproute/iproute.c,v
-retrieving revision 1.14
-diff -u -r1.14 iproute.c
---- networking/libiproute/iproute.c 11 Aug 2004 08:10:58 -0000 1.14
-+++ networking/libiproute/iproute.c 30 Nov 2004 20:43:44 -0000
-@@ -537,6 +537,15 @@
- } else if (matches(*argv, "match") == 0) {
- NEXT_ARG();
- get_prefix(&filter.mdst, *argv, do_ipv6);
-+ } else if (matches(*argv, "table") == 0) {
-+ NEXT_ARG();
-+ if (matches(*argv, "cache") == 0) {
-+ filter.tb = -1;
-+ } else if (matches(*argv, "main") != 0) {
-+ invarg("invalid \"table\"", *argv);
-+ }
-+ } else if (matches(*argv, "cache") == 0) {
-+ filter.tb = -1;
- } else {
- if (matches(*argv, "exact") == 0) {
- NEXT_ARG();
diff --git a/packages/busybox/busybox-static-1.2.1/mount-all-type.patch b/packages/busybox/busybox-static-1.2.1/mount-all-type.patch
deleted file mode 100644
index 476094a804..0000000000
--- a/packages/busybox/busybox-static-1.2.1/mount-all-type.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- busybox-1.00/.pc/mount-all-type.patch/util-linux/mount.c 2004-08-02 17:14:02.000000000 -0700
-+++ busybox-1.00/util-linux/mount.c 2005-05-13 00:17:19.054232796 -0700
-@@ -364,6 +364,56 @@
- exit(EXIT_SUCCESS);
- }
-
-+/* Does this file system type, from /etc/fstab, match the given
-+ * -t option value?
-+ */
-+static int match_fs(const char *option, const char *type)
-+{
-+ const int len = strlen(type);
-+ const int no = option[0] == 'n' && option[1] == 'o';
-+ const char *optp = option;
-+
-+ if (len > 0) do {
-+ const char *match = strstr(optp, type);
-+
-+ if (match == NULL) {
-+ /* No match, but if the option string starts 'no' no match
-+ * means yes.
-+ */
-+ return no;
-+ }
-+
-+ /* Match, may be partial, check for end-of-type in option string. */
-+ if (match[len] == 0 || match[len] == ',') {
-+ /* Ok, check for type or notype. */
-+ if (match == option) {
-+ /* Exact match at start (can't be 'no') */
-+ return 1;
-+ }
-+ if (match > option+1) {
-+ if (match[-1] == ',') {
-+ /* Exact match in middle, might be 'no' */
-+ return !no;
-+ }
-+ if (match == option+2 && no) {
-+ /* Exact match to 'notype' at start. */
-+ return 0;
-+ }
-+ if (match > option+2 && match[-3] == ',' &&
-+ match[-2] == 'n' && match[-1] == 'o') {
-+ return 0;
-+ }
-+ }
-+ }
-+
-+ /* Look for another match. */
-+ optp = match+1;
-+ } while (1);
-+
-+ /* zero length type in fstab (impossible?), don't match it. */
-+ return 0;
-+}
-+
- extern int mount_main(int argc, char **argv)
- {
- struct stat statbuf;
-@@ -371,6 +421,7 @@
- char *extra_opts;
- int flags = 0;
- char *filesystemType = "auto";
-+ char *filesystemOption = 0;
- int got_filesystemType = 0;
- char *device = xmalloc(PATH_MAX);
- char *directory = xmalloc(PATH_MAX);
-@@ -393,6 +444,7 @@
- break;
- case 't':
- filesystemType = optarg;
-+ filesystemOption = optarg;
- got_filesystemType = 1;
- break;
- case 'w':
-@@ -460,6 +512,8 @@
-
- strcpy(device, m->mnt_fsname);
- strcpy(directory, m->mnt_dir);
-+ if (all && filesystemOption != 0 && !match_fs(filesystemOption, m->mnt_type))
-+ continue;
- filesystemType = bb_xstrdup(m->mnt_type);
- singlemount:
- extra_opts = string_flags;
diff --git a/packages/busybox/busybox-static-1.2.1/readlink.patch b/packages/busybox/busybox-static-1.2.1/readlink.patch
deleted file mode 100644
index 0c5431085a..0000000000
--- a/packages/busybox/busybox-static-1.2.1/readlink.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-diff -p -u -r1.7 Config.in
---- busybox-1.00/debianutils/Config.in 15 Mar 2004 08:28:24 -0000 1.7
-+++ busybox-1.00-patched/debianutils/Config.in 16 Nov 2004 11:46:41 -0000
-@@ -24,6 +24,13 @@ config CONFIG_READLINK
- This program reads a symbolic link and returns the name
- of the file it points to
-
-+config CONFIG_FEATURE_READLINK_FOLLOW
-+ bool " Enable canonicalization by following all symlinks (-f)"
-+ default n
-+ depends on CONFIG_READLINK
-+ help
-+ Enable the readlink option (-f).
-+
- config CONFIG_RUN_PARTS
- bool "run-parts"
- default n
-diff -p -u -r1.2 readlink.c
---- busybox-1.00/debianutils/readlink.c 19 Mar 2003 09:11:41 -0000 1.2
-+++ busybox-1.00-patched/debianutils/readlink.c 16 Nov 2004 11:46:41 -0000
-@@ -23,18 +23,38 @@
- #include <errno.h>
- #include <unistd.h>
- #include <stdlib.h>
-+#include <getopt.h>
- #include "busybox.h"
-
-+#ifdef CONFIG_FEATURE_READLINK_FOLLOW
-+# define READLINK_FOLLOW "f"
-+# define READLINK_FLAG_f (1 << 0)
-+#else
-+# define READLINK_FOLLOW ""
-+#endif
-+
-+static const char readlink_options[] = READLINK_FOLLOW;
-+
- int readlink_main(int argc, char **argv)
- {
- char *buf = NULL;
-+ unsigned long opt = bb_getopt_ulflags(argc, argv, readlink_options);
-+#ifdef CONFIG_FEATURE_READLINK_FOLLOW
-+ RESERVE_CONFIG_BUFFER(resolved_path, PATH_MAX);
-+#endif
-
- /* no options, no getopt */
-
-- if (argc != 2)
-+ if (optind + 1 != argc)
- bb_show_usage();
-
-- buf = xreadlink(argv[1]);
-+#ifdef CONFIG_FEATURE_READLINK_FOLLOW
-+ if (opt & READLINK_FLAG_f) {
-+ buf = realpath(argv[optind], resolved_path);
-+ } else
-+#endif
-+ buf = xreadlink(argv[optind]);
-+
- if (!buf)
- return EXIT_FAILURE;
- puts(buf);
-diff -p -u -r1.222 usage.h
---- busybox-1.00/include/usage.h 14 Sep 2004 16:23:56 -0000 1.222
-+++ busybox-1.00-patched/include/usage.h 16 Nov 2004 11:46:42 -0000
-@@ -1985,10 +1985,18 @@
- "\t-s\tSet the system date and time (default).\n" \
- "\t-p\tPrint the date and time."
-
-+#ifdef CONFIG_FEATURE_READLINK_FOLLOW
-+#define USAGE_READLINK_FOLLOW(a) a
-+#else
-+#define USAGE_READLINK_FOLLOW(a)
-+#endif
-+
- #define readlink_trivial_usage \
-- ""
-+ USAGE_READLINK_FOLLOW("[-f] ") "FILE"
- #define readlink_full_usage \
-- "Displays the value of a symbolic link."
-+ "Displays the value of a symbolic link." \
-+ USAGE_READLINK_FOLLOW("\n\nOptions:\n" \
-+ "\t-f\tcanonicalize by following all symlinks")
-
- #define realpath_trivial_usage \
- "pathname ..."
diff --git a/packages/busybox/busybox-static-1.2.1/rmmod.patch b/packages/busybox/busybox-static-1.2.1/rmmod.patch
deleted file mode 100644
index 20770e0dc4..0000000000
--- a/packages/busybox/busybox-static-1.2.1/rmmod.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: busybox-1.1.0/modutils/rmmod.c
-===================================================================
---- busybox-1.1.0.orig/modutils/rmmod.c 2006-01-11 06:43:56.000000000 +0100
-+++ busybox-1.1.0/modutils/rmmod.c 2006-03-14 16:42:14.000000000 +0100
-@@ -29,6 +29,7 @@
- #include <string.h>
- #include <sys/utsname.h>
- #include <sys/syscall.h>
-+#include <sys/utsname.h>
- #include "busybox.h"
-
- #ifdef CONFIG_FEATURE_2_6_MODULES
-@@ -64,6 +65,16 @@
- but must get */
- size_t bufsize = sizeof(bb_common_bufsiz1);
- #endif
-+#ifdef CONFIG_FEATURE_2_6_MODULES
-+ int k_version = 0;
-+ struct utsname myuname;
-+
-+ if (uname(&myuname) == 0) {
-+ if (myuname.release[0] == '2') {
-+ k_version = myuname.release[2] - '0';
-+ }
-+ }
-+#endif
-
- /* Parse command line. */
- n = bb_getopt_ulflags(argc, argv, "wfa");
-@@ -109,6 +120,10 @@
- afterslash++;
- module_name = alloca(strlen(afterslash) + 1);
- filename2modname(module_name, afterslash);
-+ if (k_version != 4)
-+ filename2modname(module_name, afterslash);
-+ else
-+ strcpy(module_name, afterslash);
- #else
- #define module_name argv[n]
- #endif
diff --git a/packages/busybox/busybox-static-1.2.1/syslog.conf b/packages/busybox/busybox-static-1.2.1/syslog.conf
deleted file mode 100644
index 047e82419e..0000000000
--- a/packages/busybox/busybox-static-1.2.1/syslog.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-DESTINATION="file" # log destinations (buffer file remote)
-MARKINT=20 # interval between --mark-- entries [min]
-REDUCE=no # reduced-size logging
-BUFFERSIZE=64 # buffer: size of circular buffer [kByte]
-LOGFILE=/var/log/messages # file: where to log
-ROTATESIZE=32 # file: rotate log if grown beyond X [kByte] (busybox 1.2+)
-ROTATEGENS=1 # file: keep X generations of rotated logs (busybox 1.2+)
-REMOTE=loghost:514 # remote: where to log
-FOREGROUND=no # run in foreground (don't use!)
diff --git a/packages/busybox/busybox-static-1.2.1/udhcppidfile-breakage.patch b/packages/busybox/busybox-static-1.2.1/udhcppidfile-breakage.patch
deleted file mode 100644
index 031274908b..0000000000
--- a/packages/busybox/busybox-static-1.2.1/udhcppidfile-breakage.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- busybox-1.00/networking/udhcp/common.c~udhcppidfile2
-+++ busybox-1.00/networking/udhcp/common.c
-@@ -74,7 +74,7 @@
-
- if (pid > 0) {
- /* parent */
-- if (pidfile_reassign(pidfile, pid) < 0) {
-+ if (pidfile != NULL && pidfile_reassign(pidfile, pid) < 0) {
- (void)kill(pid, SIGKILL);
- exit(1);
- } else
-@@ -119,7 +119,7 @@
- sanitize_fds();
-
- /* do some other misc startup stuff while we are here to save bytes */
-- if (pidfile_acquire(pidfile) < 0)
-+ if (pidfile != NULL && pidfile_acquire(pidfile) < 0)
- exit(1);
-
- /* equivelent of doing a fflush after every \n */
-@@ -166,7 +166,7 @@
- sanitize_fds();
-
- /* do some other misc startup stuff while we are here to save bytes */
-- if (pidfile_acquire(pidfile) < 0)
-+ if (pidfile != NULL && pidfile_acquire(pidfile) < 0)
- exit(1);
-
- /* equivelent of doing a fflush after every \n */
---- busybox-1.00/networking/udhcp/pidfile.c~udhcppidfile2
-+++ busybox-1.00/networking/udhcp/pidfile.c
-@@ -141,7 +141,11 @@
- int pidfile_acquire(const char *pidfile)
- {
- int fd, result;
-- if (!pidfile) return (-1);
-+
-+ if (pidfile == NULL) {
-+ LOG(LOG_ERR, "pidfile_acquire: filename is NULL\n");
-+ return (-1);
-+ }
-
- if ((fd = pidfile_open(pidfile)) < 0)
- return (-1);
-@@ -170,7 +174,11 @@
- int pidfile_reassign(const char *pidfile, int pid)
- {
- int fd, result;
-- if (!pidfile) return (-1);
-+
-+ if (pidfile == NULL) {
-+ LOG(LOG_ERR, "pidfile_reassign: filename is NULL\n");
-+ return (-1);
-+ }
-
- if ((fd = pidfile_open(pidfile)) < 0)
- return (-1);
diff --git a/packages/busybox/busybox-static-1.2.1/udhcppidfile.patch b/packages/busybox/busybox-static-1.2.1/udhcppidfile.patch
deleted file mode 100644
index b4b86b8775..0000000000
--- a/packages/busybox/busybox-static-1.2.1/udhcppidfile.patch
+++ /dev/null
@@ -1,274 +0,0 @@
-Index: busybox-1.1.0/networking/udhcp/pidfile.h
-===================================================================
---- busybox-1.1.0.orig/networking/udhcp/pidfile.h 2006-01-11 06:43:50.000000000 +0100
-+++ busybox-1.1.0/networking/udhcp/pidfile.h 2006-03-14 17:15:45.000000000 +0100
-@@ -21,5 +21,5 @@
-
-
- int pidfile_acquire(const char *pidfile);
--void pidfile_write_release(int pid_fd);
-+int pidfile_reassign(const char *pidfile, int newpid);
-
-Index: busybox-1.1.0/networking/udhcp/pidfile.c
-===================================================================
---- busybox-1.1.0.orig/networking/udhcp/pidfile.c 2006-01-11 06:43:50.000000000 +0100
-+++ busybox-1.1.0/networking/udhcp/pidfile.c 2006-03-14 17:15:45.000000000 +0100
-@@ -25,6 +25,7 @@
- #include <unistd.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <errno.h>
-
- #include "pidfile.h"
- #include "common.h"
-@@ -37,39 +38,146 @@
- }
-
-
--int pidfile_acquire(const char *pidfile)
-+static int pidfile_open(const char *pidfile)
- {
-- int pid_fd;
-- if (!pidfile) return -1;
-+ int fd;
-
-- pid_fd = open(pidfile, O_CREAT | O_WRONLY, 0644);
-- if (pid_fd < 0) {
-- LOG(LOG_ERR, "Unable to open pidfile %s: %m\n", pidfile);
-- } else {
-- lockf(pid_fd, F_LOCK, 0);
-- if (!saved_pidfile)
-- atexit(pidfile_delete);
-- saved_pidfile = (char *) pidfile;
-+ if ((fd = open(pidfile, O_CREAT | O_RDWR, 0644)) < 0) {
-+ LOG(LOG_ERR, "pidfile_open: open %s failed: %m\n", pidfile);
-+ return (-1);
-+ }
-+
-+ /* NOTE: lockf is not inherited by child after fork */
-+ if (lockf(fd, F_LOCK, 0) < 0) {
-+ LOG(LOG_ERR, "pidfile_open: lock %s failed: %m\n", pidfile);
-+ close(fd);
-+ return (-1);
-+ }
-+
-+ return (fd);
-+}
-+
-+
-+static int pidfile_check(int fd, const char *pidfile)
-+{
-+ int len, pid;
-+ char buf[20];
-+
-+ if (lseek(fd, 0L, SEEK_SET) < 0) {
-+ LOG(LOG_ERR, "pidfile_check: lseek %s failed: %m\n", pidfile);
-+ return (-1);
-+ }
-+
-+ if ((len = read(fd, buf, sizeof buf - 1)) < 0) {
-+ LOG(LOG_ERR, "pidfile_check: read %s failed: %m\n", pidfile);
-+ return (-1);
-+ }
-+
-+ if (len == 0)
-+ return (0);
-+
-+ buf[len] = '\0';
-+
-+ if ((pid = atoi(buf)) <= 1) {
-+ LOG(LOG_WARNING,
-+ "pidfile_check: ignoring bogus pid (%s) in %s\n",
-+ buf, pidfile);
-+ return (0);
-+ }
-+
-+ if (kill((pid_t)pid, 0) == 0) {
-+ LOG(LOG_ERR, "pidfile_check: process %d exists (%s)\n",
-+ pid, pidfile);
-+ return (-1);
-+ }
-+
-+ if (errno != ESRCH) {
-+ LOG(LOG_ERR, "pidfile_check: kill %d failed (%s): %m\n",
-+ pid, pidfile);
-+ return (-1);
-+ }
-+
-+ return (0);
-+}
-+
-+
-+static int pidfile_store(int fd, const char *pidfile, int pid)
-+{
-+ int len;
-+ char buf[20];
-+
-+ if (lseek(fd, 0L, SEEK_SET) < 0) {
-+ LOG(LOG_ERR, "pidfile_store: lseek %s failed: %m\n", pidfile);
-+ return (-1);
-+ }
-+
-+ len = snprintf(buf, sizeof buf - 1, "%d\n", pid);
-+ buf[len] = '\0';
-+
-+ if (write(fd, buf, len) < 0) {
-+ LOG(LOG_ERR, "pidfile_store: write %s failed: %m\n",
-+ pidfile);
-+ return (-1);
-+ }
-+
-+ if (ftruncate(fd, len) < 0) {
-+ LOG(LOG_ERR, "pidfile_store: ftruncate %d failed (%s): %m\n",
-+ len, pidfile);
-+ return (-1);
- }
-
-- return pid_fd;
-+ return (0);
- }
-
-
--void pidfile_write_release(int pid_fd)
-+static void pidfile_close(int fd)
- {
-- FILE *out;
-+ (void)lseek(fd, 0L, SEEK_SET);
-+ (void)lockf(fd, F_ULOCK, 0);
-+ (void)close(fd);
-+}
-
-- if (pid_fd < 0) return;
-
-- if ((out = fdopen(pid_fd, "w")) != NULL) {
-- fprintf(out, "%d\n", getpid());
-- fclose(out);
-+int pidfile_acquire(const char *pidfile)
-+{
-+ int fd, result;
-+ if (!pidfile) return (-1);
-+
-+ if ((fd = pidfile_open(pidfile)) < 0)
-+ return (-1);
-+
-+ if ((result = pidfile_check(fd, pidfile)) == 0)
-+ result = pidfile_store(fd, pidfile, getpid());
-+
-+ pidfile_close(fd);
-+
-+ if (result == 0) {
-+ saved_pidfile = (char *) pidfile;
-+ atexit(pidfile_delete);
- }
-- lockf(pid_fd, F_UNLCK, 0);
-- close(pid_fd);
-+
-+ return (result);
- }
-
-
-+/*
-+ * reassign the pid in a pidfile - used just after a fork so a parent
-+ * can store the pid of its child into the file without any window
-+ * where the pid in the file is a dead process (which might let another
-+ * instance of the program start). Note the parent must use _exit() to
-+ * avoid triggering the unlink scheduled above in pidfile_acquire()
-+ */
-+int pidfile_reassign(const char *pidfile, int pid)
-+{
-+ int fd, result;
-+ if (!pidfile) return (-1);
-+
-+ if ((fd = pidfile_open(pidfile)) < 0)
-+ return (-1);
-
-+ result = pidfile_store(fd, pidfile, pid);
-
-+ pidfile_close(fd);
-+
-+ return (result);
-+}
-Index: busybox-1.1.0/networking/udhcp/common.c
-===================================================================
---- busybox-1.1.0.orig/networking/udhcp/common.c 2006-01-11 06:43:50.000000000 +0100
-+++ busybox-1.1.0/networking/udhcp/common.c 2006-03-14 17:15:45.000000000 +0100
-@@ -64,16 +64,34 @@
- #ifdef __uClinux__
- LOG(LOG_ERR, "Cannot background in uclinux (yet)");
- #else /* __uClinux__ */
-- int pid_fd;
-+ int pid, fd;
-
-- /* hold lock during fork. */
-- pid_fd = pidfile_acquire(pidfile);
-- if (daemon(0, 0) == -1) {
-+ /* NOTE: lockf is not inherited by the child after fork */
-+ if ((pid = fork()) < 0) {
- perror("fork");
- exit(1);
- }
-+
-+ if (pid > 0) {
-+ /* parent */
-+ if (pidfile_reassign(pidfile, pid) < 0) {
-+ (void)kill(pid, SIGKILL);
-+ exit(1);
-+ } else
-+ _exit(0);
-+ }
-+
-+ /* child */
-+ (void)chdir("/");
-+ if ((fd = open("/dev/null", O_RDWR)) >= 0) {
-+ (void)dup2(fd, 0);
-+ (void)dup2(fd, 1);
-+ (void)dup2(fd, 2);
-+ (void)close(fd);
-+ }
-+ (void)setsid();
-+
- daemonized++;
-- pidfile_write_release(pid_fd);
- #endif /* __uClinux__ */
- }
-
-@@ -97,14 +115,12 @@
-
- void start_log_and_pid(const char *client_server, const char *pidfile)
- {
-- int pid_fd;
--
- /* Make sure our syslog fd isn't overwritten */
- sanitize_fds();
-
- /* do some other misc startup stuff while we are here to save bytes */
-- pid_fd = pidfile_acquire(pidfile);
-- pidfile_write_release(pid_fd);
-+ if (pidfile_acquire(pidfile) < 0)
-+ exit(1);
-
- /* equivelent of doing a fflush after every \n */
- setlinebuf(stdout);
-@@ -150,8 +166,8 @@
- sanitize_fds();
-
- /* do some other misc startup stuff while we are here to save bytes */
-- pid_fd = pidfile_acquire(pidfile);
-- pidfile_write_release(pid_fd);
-+ if (pidfile_acquire(pidfile) < 0)
-+ exit(1);
-
- /* equivelent of doing a fflush after every \n */
- setlinebuf(stdout);
-Index: busybox-1.1.0/networking/udhcp/script.c
-===================================================================
---- busybox-1.1.0.orig/networking/udhcp/script.c 2006-01-11 06:43:50.000000000 +0100
-+++ busybox-1.1.0/networking/udhcp/script.c 2006-03-14 17:15:45.000000000 +0100
-@@ -229,6 +229,6 @@
- execle(client_config.script, client_config.script,
- name, NULL, envp);
- LOG(LOG_ERR, "script %s failed: %m", client_config.script);
-- exit(1);
-+ _exit(1);
- }
- }
diff --git a/packages/busybox/busybox-static-1.2.1/udhcpscript.patch b/packages/busybox/busybox-static-1.2.1/udhcpscript.patch
deleted file mode 100644
index fc21d440cd..0000000000
--- a/packages/busybox/busybox-static-1.2.1/udhcpscript.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- busybox-1.00-rc3/examples/udhcp/simple.script~udhcpscript
-+++ busybox-1.00-rc3/examples/udhcp/simple.script
-@@ -17,8 +17,7 @@
- /sbin/ifconfig $interface $ip $BROADCAST $NETMASK
-
- if [ -n "$router" ] ; then
-- echo "deleting routers"
-- while route del default gw 0.0.0.0 dev $interface ; do
-+ while route del default gw 0.0.0.0 dev $interface 2>/dev/null ; do
- :
- done
-
diff --git a/packages/busybox/busybox-static-1.2.1/wget-long-options.patch b/packages/busybox/busybox-static-1.2.1/wget-long-options.patch
deleted file mode 100644
index 3c5920a3cb..0000000000
--- a/packages/busybox/busybox-static-1.2.1/wget-long-options.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- busybox-1.2.1.orig/networking/wget.c
-+++ busybox-1.2.1/networking/wget.c
-@@ -136,7 +136,7 @@
- #define WGET_OPT_PREFIX 32
- #define WGET_OPT_PROXY 64
-
--#if ENABLE_WGET_LONG_OPTIONS
-+#if CONFIG_FEATURE_WGET_LONG_OPTIONS
- static const struct option wget_long_options[] = {
- { "continue", 0, NULL, 'c' },
- { "quiet", 0, NULL, 'q' },
-@@ -180,7 +180,7 @@
- * Crack command line.
- */
- bb_opt_complementally = "-1:\203::";
--#if ENABLE_WGET_LONG_OPTIONS
-+#if CONFIG_FEATURE_WGET_LONG_OPTIONS
- bb_applet_long_options = wget_long_options;
- #endif
- opt = bb_getopt_ulflags(argc, argv, "cq\213O:\203:P:Y:",
diff --git a/packages/busybox/busybox-static-1.2.1/xargs-double-size.patch b/packages/busybox/busybox-static-1.2.1/xargs-double-size.patch
deleted file mode 100644
index df64554ffc..0000000000
--- a/packages/busybox/busybox-static-1.2.1/xargs-double-size.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- busybox-1.2.1/findutils/xargs.c.org 2006-09-19 18:18:17.084592997 +0200
-+++ busybox-1.2.1/findutils/xargs.c 2006-09-19 18:18:09.820275793 +0200
-@@ -466,8 +466,8 @@
- have it at 1 meg). Things will work fine with a large ARG_MAX but it
- will probably hurt the system more than it needs to; an array of this
- size is allocated. */
-- if (orig_arg_max > 20 * 1024)
-- orig_arg_max = 20 * 1024;
-+ if (orig_arg_max > 40 * 1024)
-+ orig_arg_max = 40 * 1024;
- n_max_chars = orig_arg_max;
- }
- max_chars = xmalloc(n_max_chars);