diff options
Diffstat (limited to 'packages/busybox/busybox-1.00')
37 files changed, 0 insertions, 5458 deletions
diff --git a/packages/busybox/busybox-1.00/.mtn2git_empty b/packages/busybox/busybox-1.00/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/busybox/busybox-1.00/.mtn2git_empty +++ /dev/null diff --git a/packages/busybox/busybox-1.00/add-getkey-applet.patch b/packages/busybox/busybox-1.00/add-getkey-applet.patch deleted file mode 100644 index 6ce0df21bd..0000000000 --- a/packages/busybox/busybox-1.00/add-getkey-applet.patch +++ /dev/null @@ -1,157 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- /dev/null -+++ busybox-1.00/console-tools/getkey.c -@@ -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; -+}; -+ ---- busybox-1.00/console-tools/Makefile.in~add-getkey-applet.patch -+++ busybox-1.00/console-tools/Makefile.in -@@ -28,6 +28,7 @@ - CONSOLETOOLS_DIR-$(CONFIG_CLEAR) += clear.o - CONSOLETOOLS_DIR-$(CONFIG_DEALLOCVT) += deallocvt.o - CONSOLETOOLS_DIR-$(CONFIG_DUMPKMAP) += dumpkmap.o -+CONSOLETOOLS_DIR-$(CONFIG_GETKEY) += getkey.o - CONSOLETOOLS_DIR-$(CONFIG_LOADFONT) += loadfont.o - CONSOLETOOLS_DIR-$(CONFIG_LOADKMAP) += loadkmap.o - CONSOLETOOLS_DIR-$(CONFIG_OPENVT) += openvt.o ---- busybox-1.00/console-tools/Config.in~add-getkey-applet.patch -+++ busybox-1.00/console-tools/Config.in -@@ -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 ---- busybox-1.00/include/applets.h~add-getkey-applet.patch -+++ busybox-1.00/include/applets.h -@@ -223,6 +223,9 @@ - #ifdef CONFIG_FTPPUT - APPLET(ftpput, ftpgetput_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 ---- busybox-1.00/include/usage.h~add-getkey-applet.patch -+++ busybox-1.00/include/usage.h -@@ -734,6 +734,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 getopt_trivial_usage \ - "[OPTIONS]..." - #define getopt_full_usage \ diff --git a/packages/busybox/busybox-1.00/below.patch b/packages/busybox/busybox-1.00/below.patch deleted file mode 100644 index ec97b29962..0000000000 --- a/packages/busybox/busybox-1.00/below.patch +++ /dev/null @@ -1,49 +0,0 @@ -Index: modutils/modprobe.c -=================================================================== -RCS file: /var/cvs/busybox/modutils/modprobe.c,v -retrieving revision 1.41 -diff -u -r1.41 modprobe.c ---- busybox/modutils/modprobe.c 24 Sep 2004 09:18:55 -0000 1.41 -+++ busybox/modutils/modprobe.c 29 Dec 2004 11:56:07 -0000 -@@ -357,6 +357,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-1.00/celf-ash-builtins.patch b/packages/busybox/busybox-1.00/celf-ash-builtins.patch deleted file mode 100644 index ec1925e6ad..0000000000 --- a/packages/busybox/busybox-1.00/celf-ash-builtins.patch +++ /dev/null @@ -1,431 +0,0 @@ -diff -Naur busybox-1.00-pre3.orig/coreutils/echo.c busybox-1.00-pre3/coreutils/echo.c ---- busybox-1.00-pre3.orig/coreutils/echo.c 2003-03-19 12:11:33.000000000 +0300 -+++ busybox-1.00-pre3/coreutils/echo.c 2003-11-07 17:47:35.000000000 +0300 -@@ -122,7 +122,11 @@ - #endif - - DONE: -- bb_fflush_stdout_and_exit(EXIT_SUCCESS); -+#ifdef CONFIG_FEATURE_BUILTIN_ECHO -+ return EXIT_SUCCESS; -+#else -+ bb_fflush_stdout_and_exit(EXIT_SUCCESS); -+#endif - } - - /*- -diff -Naur busybox-1.00-pre3.orig/coreutils/test.c busybox-1.00-pre3/coreutils/test.c ---- busybox-1.00-pre3.orig/coreutils/test.c 2003-07-15 01:20:45.000000000 +0400 -+++ busybox-1.00-pre3/coreutils/test.c 2003-11-07 17:47:35.000000000 +0300 -@@ -188,19 +188,19 @@ - /* Implement special cases from POSIX.2, section 4.62.4 */ - switch (argc) { - case 1: -- exit(1); -+ return (1); - case 2: -- exit(*argv[1] == '\0'); -+ return (*argv[1] == '\0'); - case 3: - if (argv[1][0] == '!' && argv[1][1] == '\0') { -- exit(!(*argv[2] == '\0')); -+ return (!(*argv[2] == '\0')); - } - break; - case 4: - if (argv[1][0] != '!' || argv[1][1] != '\0') { - if (t_lex(argv[2]), t_wp_op && t_wp_op->op_type == BINOP) { - t_wp = &argv[1]; -- exit(binop() == 0); -+ return (binop() == 0); - } - } - break; -@@ -208,7 +208,7 @@ - if (argv[1][0] == '!' && argv[1][1] == '\0') { - if (t_lex(argv[3]), t_wp_op && t_wp_op->op_type == BINOP) { - t_wp = &argv[2]; -- exit(!(binop() == 0)); -+ return (!(binop() == 0)); - } - } - break; -diff -Naur busybox-1.00-pre3.orig/include/usage.h busybox-1.00-pre3/include/usage.h ---- busybox-1.00-pre3.orig/include/usage.h 2003-08-29 18:18:26.000000000 +0400 -+++ busybox-1.00-pre3/include/usage.h 2003-11-07 17:47:59.000000000 +0300 -@@ -1760,6 +1760,13 @@ - "quit\n" \ - "221 foobar closing connection\n" - -+#define nice_trivial_usage \ -+ "[OPTION] [COMMAND [ARG]...]" -+#define nice_full_usage \ -+ "Run COMMAND with an adjusted scheduling priority." -+#define nice_example_usage \ -+ "$ nice -n 0 /tmp/foo \n" -+ - #define netstat_trivial_usage \ - "[-laenrtuwx]" - #define netstat_full_usage \ -diff -Naur busybox-1.00-pre3.orig/shell/Config.in busybox-1.00-pre3/shell/Config.in ---- busybox-1.00-pre3.orig/shell/Config.in 2003-09-12 08:51:25.000000000 +0400 -+++ busybox-1.00-pre3/shell/Config.in 2003-11-07 17:47:59.000000000 +0300 -@@ -53,6 +53,34 @@ - help - Enable job control in the ash shell. - -+config CONFIG_ASH_PIPE_OPTIMIZATION -+ bool " Enable ash pipe optimization " -+ default y -+ depends on CONFIG_ASH -+ help -+ Eliminate cat at the beginning of the pipe. -+ -+config CONFIG_FEATURE_BUILTIN_TEST -+ bool " Builtin test command" -+ default y -+ depends on CONFIG_ASH -+ help -+ Builtin test command" -+ -+config CONFIG_FEATURE_BUILTIN_ECHO -+ bool " Builtin echo command" -+ default y -+ depends on CONFIG_ASH -+ help -+ Builtin echo command" -+ -+config CONFIG_FEATURE_BUILTIN_PIDOF -+ bool " Builtin pidof command" -+ default y -+ depends on CONFIG_ASH && CONFIG_PIDOF -+ help -+ Builtin pidof command" -+ - config CONFIG_ASH_ALIAS - bool " Enable alias support" - default y -diff -Naur busybox-1.00-pre3.orig/shell/ash.c busybox-1.00-pre3/shell/ash.c ---- busybox-1.00-pre3.orig/shell/ash.c 2003-09-02 06:36:17.000000000 +0400 -+++ busybox-1.00-pre3/shell/ash.c 2003-11-07 17:47:59.000000000 +0300 -@@ -1259,6 +1259,16 @@ - #ifdef JOBS - static int killcmd(int, char **); - #endif -+#ifdef CONFIG_FEATURE_BUILTIN_TEST -+static int testcmd(int, char **); -+#endif -+#ifdef CONFIG_FEATURE_BUILTIN_ECHO -+static int echocmd(int, char**); -+#endif -+#ifdef CONFIG_FEATURE_BUILTIN_PIDOF -+static int pidofcmd(int, char **); -+#endif -+ - - /* $NetBSD: mail.h,v 1.9 2002/11/24 22:35:40 christos Exp $ */ - -@@ -1281,39 +1291,6 @@ - /* unsigned flags; */ - }; - --#ifdef CONFIG_ASH_CMDCMD --# ifdef JOBS --# ifdef CONFIG_ASH_ALIAS --# define COMMANDCMD (builtincmd + 7) --# define EXECCMD (builtincmd + 10) --# else --# define COMMANDCMD (builtincmd + 6) --# define EXECCMD (builtincmd + 9) --# endif --# else /* ! JOBS */ --# ifdef CONFIG_ASH_ALIAS --# define COMMANDCMD (builtincmd + 6) --# define EXECCMD (builtincmd + 9) --# else --# define COMMANDCMD (builtincmd + 5) --# define EXECCMD (builtincmd + 8) --# endif --# endif /* JOBS */ --#else /* ! CONFIG_ASH_CMDCMD */ --# ifdef JOBS --# ifdef CONFIG_ASH_ALIAS --# define EXECCMD (builtincmd + 9) --# else --# define EXECCMD (builtincmd + 8) --# endif --# else /* ! JOBS */ --# ifdef CONFIG_ASH_ALIAS --# define EXECCMD (builtincmd + 8) --# else --# define EXECCMD (builtincmd + 7) --# endif --# endif /* JOBS */ --#endif /* CONFIG_ASH_CMDCMD */ - - #define BUILTIN_NOSPEC "0" - #define BUILTIN_SPECIAL "1" -@@ -1328,65 +1305,21 @@ - #define IS_BUILTIN_REGULAR(builtincmd) ((builtincmd)->name[0] & 2) - - static const struct builtincmd builtincmd[] = { -- { BUILTIN_SPEC_REG ".", dotcmd }, -- { BUILTIN_SPEC_REG ":", truecmd }, --#ifdef CONFIG_ASH_ALIAS -- { BUILTIN_REG_ASSG "alias", aliascmd }, --#endif --#ifdef JOBS -- { BUILTIN_REGULAR "bg", bgcmd }, --#endif -- { BUILTIN_SPEC_REG "break", breakcmd }, -- { BUILTIN_REGULAR "cd", cdcmd }, -- { BUILTIN_NOSPEC "chdir", cdcmd }, --#ifdef CONFIG_ASH_CMDCMD -- { BUILTIN_REGULAR "command", commandcmd }, --#endif -- { BUILTIN_SPEC_REG "continue", breakcmd }, -- { BUILTIN_SPEC_REG "eval", evalcmd }, -- { BUILTIN_SPEC_REG "exec", execcmd }, -- { BUILTIN_SPEC_REG "exit", exitcmd }, -- { BUILTIN_SPEC_REG_ASSG "export", exportcmd }, -- { BUILTIN_REGULAR "false", falsecmd }, --#ifdef JOBS -- { BUILTIN_REGULAR "fg", fgcmd }, --#endif --#ifdef CONFIG_ASH_GETOPTS -- { BUILTIN_REGULAR "getopts", getoptscmd }, --#endif -- { BUILTIN_NOSPEC "hash", hashcmd }, --#ifndef CONFIG_FEATURE_SH_EXTRA_QUIET -- { BUILTIN_NOSPEC "help", helpcmd }, --#endif --#ifdef JOBS -- { BUILTIN_REGULAR "jobs", jobscmd }, -- { BUILTIN_REGULAR "kill", killcmd }, --#endif --#ifdef CONFIG_ASH_MATH_SUPPORT -- { BUILTIN_NOSPEC "let", letcmd }, --#endif -- { BUILTIN_ASSIGN "local", localcmd }, -- { BUILTIN_NOSPEC "pwd", pwdcmd }, -- { BUILTIN_REGULAR "read", readcmd }, -- { BUILTIN_SPEC_REG_ASSG "readonly", exportcmd }, -- { BUILTIN_SPEC_REG "return", returncmd }, -- { BUILTIN_SPEC_REG "set", setcmd }, -- { BUILTIN_SPEC_REG "shift", shiftcmd }, -- { BUILTIN_SPEC_REG "times", timescmd }, -- { BUILTIN_SPEC_REG "trap", trapcmd }, -- { BUILTIN_REGULAR "true", truecmd }, -- { BUILTIN_NOSPEC "type", typecmd }, -- { BUILTIN_NOSPEC "ulimit", ulimitcmd }, -- { BUILTIN_REGULAR "umask", umaskcmd }, --#ifdef CONFIG_ASH_ALIAS -- { BUILTIN_REGULAR "unalias", unaliascmd }, --#endif -- { BUILTIN_SPEC_REG "unset", unsetcmd }, -- { BUILTIN_REGULAR "wait", waitcmd }, -+#define BUILTIN_COMMAND_SPEC(code, str, func) {str, func}, -+#include "ash.d" -+{} - }; - --#define NUMBUILTINS (sizeof (builtincmd) / sizeof (struct builtincmd) ) -+enum { -+#define BUILTIN_COMMAND_SPEC(code, str, func) code, -+#include "ash.d" -+NUMBUILTINS -+}; - -+#ifdef CONFIG_ASH_CMDCMD -+#define COMMANDCMD (builtincmd + COMMAND_CMD) -+#endif -+#define EXECCMD (builtincmd + EXEC_CMD) - - - struct cmdentry { -@@ -1678,7 +1611,8 @@ - - /* from input.c: */ - { -- basepf.nextc = basepf.buf = basebuf; -+ struct parsefile* pf = &basepf; -+ pf->nextc = pf->buf = basebuf; - } - - /* from trap.c: */ -@@ -2678,6 +2612,14 @@ - * Called to reset things after an exception. - */ - -+#ifdef CONFIG_FEATURE_BUILTIN_ECHO -+static int -+echocmd(int argc, char **argv) -+{ -+ return echo_main(argc, argv); -+} -+#endif -+ - /* - * The eval commmand. - */ -@@ -3028,6 +2970,23 @@ - } - - -+static int -+cat_file(union node *n) -+{ -+#ifdef CONFIG_ASH_PIPE_OPTIMIZATION -+ if (n->type == NCMD -+ && n->ncmd.args != NULL -+ && strcmp(n->ncmd.args->narg.text, "cat") == 0 -+ && n->ncmd.args->narg.next != NULL -+ && *n->ncmd.args->narg.next->narg.text != '-' -+ && n->ncmd.args->narg.next->narg.next == NULL) -+ { -+ return open(n->ncmd.args->narg.next->narg.text, O_RDONLY); -+ } -+#endif -+ return -1; -+} -+ - - /* - * Evaluate a pipeline. All the processes in the pipeline are children -@@ -3057,7 +3016,11 @@ - prehash(lp->n); - pip[1] = -1; - if (lp->next) { -- if (pipe(pip) < 0) { -+ if (prevfd < 0 && (prevfd = cat_file(lp->n)) >= 0) { -+ // it is cat at the beginning of the pipe -+ continue; -+ } -+ if (pipe(pip) < 0) { - close(prevfd); - error("Pipe call failed"); - } -@@ -3104,11 +3067,11 @@ - { - int saveherefd; - -- result->fd = -1; -+ result->fd = cat_file(n); - result->buf = NULL; - result->nleft = 0; - result->jp = NULL; -- if (n == NULL) { -+ if (n == NULL || result->fd >= 0) { - goto out; - } - -@@ -3562,6 +3525,24 @@ - } - } - -+#ifdef CONFIG_FEATURE_BUILTIN_TEST -+static int -+testcmd(int argc, char** argv) -+{ -+ bb_applet_name = argv[0]; -+ return test_main(argc, argv); -+} -+#endif -+ -+#ifdef CONFIG_FEATURE_BUILTIN_PIDOF -+static int -+pidofcmd(int argc, char** argv) -+{ -+ bb_applet_name = argv[0]; -+ return pidof_main(argc, argv); -+} -+#endif -+ - - static int - falsecmd(int argc, char **argv) -@@ -4943,7 +4924,9 @@ - ckfree(in.buf); - if (in.fd >= 0) { - close(in.fd); -- back_exitstatus = waitforjob(in.jp); -+ if (in.jp != NULL) { -+ back_exitstatus = waitforjob(in.jp); -+ } - } - INTON; - -diff -Naur busybox-1.00-pre3.orig/shell/ash.d busybox-1.00-pre3/shell/ash.d ---- busybox-1.00-pre3.orig/shell/ash.d 1970-01-01 03:00:00.000000000 +0300 -+++ busybox-1.00-pre3/shell/ash.d 2003-11-07 17:47:59.000000000 +0300 -@@ -0,0 +1,70 @@ -+BUILTIN_COMMAND_SPEC(DOT_CMD, BUILTIN_SPEC_REG ".", dotcmd) -+BUILTIN_COMMAND_SPEC(COMMA_CMD, BUILTIN_SPEC_REG ":", truecmd) -+#ifdef CONFIG_FEATURE_BUILTIN_TEST -+BUILTIN_COMMAND_SPEC(RPAR_CMD, BUILTIN_REGULAR "[", testcmd) -+#endif -+#ifdef CONFIG_ASH_ALIAS -+BUILTIN_COMMAND_SPEC(ALIAS_CMD, BUILTIN_REG_ASSG "alias", aliascmd) -+#endif -+#ifdef JOBS -+BUILTIN_COMMAND_SPEC(BG_CMD, BUILTIN_REGULAR "bg", bgcmd) -+#endif -+BUILTIN_COMMAND_SPEC(BREAK_CMD, BUILTIN_SPEC_REG "break", breakcmd) -+BUILTIN_COMMAND_SPEC(CD_CMD, BUILTIN_REGULAR "cd", cdcmd) -+BUILTIN_COMMAND_SPEC(CHDIR_CMD, BUILTIN_NOSPEC "chdir", cdcmd) -+#ifdef CONFIG_ASH__CMD_CMD -+BUILTIN_COMMAND_SPEC(COMMAND_CMD, BUILTIN_REGULAR "command", commandcmd) -+#endif -+BUILTIN_COMMAND_SPEC(CONTINUE_CMD,BUILTIN_SPEC_REG "continue", breakcmd) -+#ifdef CONFIG_FEATURE_BUILTIN_ECHO -+BUILTIN_COMMAND_SPEC(ECHO_CMD, BUILTIN_REGULAR "echo", echocmd) -+#endif -+BUILTIN_COMMAND_SPEC(EVAL_CMD, BUILTIN_SPEC_REG "eval", evalcmd) -+BUILTIN_COMMAND_SPEC(EXEC_CMD, BUILTIN_SPEC_REG "exec", execcmd) -+BUILTIN_COMMAND_SPEC(EXIT_CMD, BUILTIN_SPEC_REG "exit", exitcmd) -+BUILTIN_COMMAND_SPEC(EXPORT_CMD, BUILTIN_SPEC_REG_ASSG "export", exportcmd) -+BUILTIN_COMMAND_SPEC(FALSE_CMD, BUILTIN_REGULAR "false", falsecmd) -+#ifdef JOBS -+BUILTIN_COMMAND_SPEC(FG_CMD, BUILTIN_REGULAR "fg", fgcmd) -+#endif -+#ifdef CONFIG_ASH_GETOPTS -+BUILTIN_COMMAND_SPEC(GETOPTS_CMD, BUILTIN_REGULAR "getopts", getoptscmd) -+#endif -+BUILTIN_COMMAND_SPEC(HASH_CMD, BUILTIN_NOSPEC "hash", hashcmd) -+#ifndef CONFIG_FEATURE_SH_EXTRA_QUIET -+BUILTIN_COMMAND_SPEC(HELP_CMD, BUILTIN_NOSPEC "help", helpcmd) -+#endif -+#ifdef JOBS -+BUILTIN_COMMAND_SPEC(JOBS_CMD, BUILTIN_REGULAR "jobs", jobscmd) -+BUILTIN_COMMAND_SPEC(KILL_CMD, BUILTIN_REGULAR "kill", killcmd) -+#endif -+#ifdef CONFIG_ASH_MATH_SUPPORT -+BUILTIN_COMMAND_SPEC(LET_CMD, BUILTIN_NOSPEC "let", letcmd) -+#endif -+BUILTIN_COMMAND_SPEC(LOCAL_CMD, BUILTIN_ASSIGN "local", localcmd) -+#ifdef CONFIG_FEATURE_BUILTIN_PIDOF -+BUILTIN_COMMAND_SPEC(PIDOF_CMD, BUILTIN_REGULAR "pidof", pidofcmd) -+#endif -+BUILTIN_COMMAND_SPEC(PWD_CMD, BUILTIN_NOSPEC "pwd", pwdcmd) -+BUILTIN_COMMAND_SPEC(READ_CMD, BUILTIN_REGULAR "read", readcmd) -+BUILTIN_COMMAND_SPEC(READONLY_CMD,BUILTIN_SPEC_REG_ASSG "readonly", exportcmd) -+BUILTIN_COMMAND_SPEC(RETURN_CMD, BUILTIN_SPEC_REG "return", returncmd) -+BUILTIN_COMMAND_SPEC(SET_CMD, BUILTIN_SPEC_REG "set", setcmd) -+BUILTIN_COMMAND_SPEC(SHIFT_CMD, BUILTIN_SPEC_REG "shift", shiftcmd) -+#ifdef CONFIG_FEATURE_BUILTIN_TEST -+BUILTIN_COMMAND_SPEC(TEST_CMD, BUILTIN_REGULAR "test", testcmd) -+#endif -+BUILTIN_COMMAND_SPEC(TIMES_CMD, BUILTIN_SPEC_REG "times", timescmd) -+BUILTIN_COMMAND_SPEC(TRAP_CMD, BUILTIN_SPEC_REG "trap", trapcmd) -+BUILTIN_COMMAND_SPEC(TRUE_CMD, BUILTIN_REGULAR "true", truecmd) -+BUILTIN_COMMAND_SPEC(TYPE_CMD, BUILTIN_NOSPEC "type", typecmd) -+BUILTIN_COMMAND_SPEC(ULIMIT_CMD, BUILTIN_NOSPEC "ulimit", ulimitcmd) -+BUILTIN_COMMAND_SPEC(UMASK_CMD, BUILTIN_REGULAR "umask", umaskcmd) -+#ifdef CONFIG_ASH_ALIAS -+BUILTIN_COMMAND_SPEC(UNALIAS_CMD, BUILTIN_REGULAR "unalias", unaliascmd) -+#endif -+BUILTIN_COMMAND_SPEC(UNSET_CMD, BUILTIN_SPEC_REG "unset", unsetcmd) -+BUILTIN_COMMAND_SPEC(WAIT_CMD, BUILTIN_REGULAR "wait", waitcmd) -+ -+ -+#undef BUILTIN_COMMAND_SPEC diff --git a/packages/busybox/busybox-1.00/console.patch b/packages/busybox/busybox-1.00/console.patch deleted file mode 100644 index d57bdfbe89..0000000000 --- a/packages/busybox/busybox-1.00/console.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- busybox-1.00-pre2/libbb/get_console.c~console -+++ busybox-1.00-pre2/libbb/get_console.c -@@ -86,10 +86,6 @@ - { - int fd; - -- if (-1 == (fd = open_a_console("/dev/console"))) -- return -1; -- else -- return fd; - fd = open_a_console(CURRENT_TTY); - if (fd >= 0) - return fd; diff --git a/packages/busybox/busybox-1.00/defconfig b/packages/busybox/busybox-1.00/defconfig deleted file mode 100644 index 8b8212c54a..0000000000 --- a/packages/busybox/busybox-1.00/defconfig +++ /dev/null @@ -1,476 +0,0 @@ -# -# Automatically generated make config: don't edit -# -HAVE_DOT_CONFIG=y - -# -# General Configuration -# -CONFIG_FEATURE_BUFFERS_USE_MALLOC=y -# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set -# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set -# CONFIG_FEATURE_VERBOSE_USAGE is not set -# CONFIG_FEATURE_INSTALLER is not set -# CONFIG_LOCALE_SUPPORT is not set -CONFIG_FEATURE_DEVFS=y -CONFIG_FEATURE_DEVPTS=y -# CONFIG_FEATURE_CLEAN_UP is not set -# CONFIG_FEATURE_SUID is not set -# CONFIG_SELINUX is not set - -# -# Build Options -# -# CONFIG_STATIC is not set -CONFIG_LFS=y -# USING_CROSS_COMPILER is not set -EXTRA_CFLAGS_OPTIONS="" - -# -# Installation Options -# -# CONFIG_INSTALL_NO_USR is not set -PREFIX="./_install" - -# -# 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_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_FROM=y -CONFIG_FEATURE_TAR_GZIP=y -# CONFIG_FEATURE_TAR_COMPRESS is not set -CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY=y -CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y -# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set -# CONFIG_UNCOMPRESS is not set -CONFIG_UNZIP=y - -# -# Common options for cpio and tar -# -# CONFIG_FEATURE_UNARCHIVE_TAPE is not set - -# -# Coreutils -# -CONFIG_BASENAME=y -# CONFIG_CAL is not set -CONFIG_CAT=y -CONFIG_CHGRP=y -CONFIG_CHMOD=y -CONFIG_CHOWN=y -CONFIG_CHROOT=y -# CONFIG_CMP is not set -CONFIG_CP=y -CONFIG_CUT=y -CONFIG_DATE=y - -# -# date (forced enabled for use with watch) -# -# CONFIG_FEATURE_DATE_ISOFMT is not set -CONFIG_DD=y -CONFIG_DF=y -CONFIG_DIRNAME=y -# CONFIG_DOS2UNIX is not set -CONFIG_DU=y -CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K=y -CONFIG_ECHO=y -CONFIG_FEATURE_FANCY_ECHO=y -CONFIG_ENV=y -CONFIG_EXPR=y -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_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 is not set -CONFIG_FEATURE_LS_SORTFILES=y -CONFIG_FEATURE_LS_TIMESTAMPS=y -CONFIG_FEATURE_LS_USERNAME=y -CONFIG_FEATURE_LS_COLOR=y -CONFIG_MD5SUM=y -CONFIG_MKDIR=y -CONFIG_MKFIFO=y -CONFIG_MKNOD=y -CONFIG_MV=y -CONFIG_OD=y -CONFIG_PRINTF=y -CONFIG_PWD=y -# CONFIG_REALPATH is not set -CONFIG_RM=y -CONFIG_RMDIR=y -CONFIG_SEQ=y -# CONFIG_SHA1SUM is not set -CONFIG_SLEEP=y -# CONFIG_FEATURE_FANCY_SLEEP is not set -CONFIG_SORT=y -CONFIG_STTY=y -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 - -# -# test (forced enabled for use with shell) -# -# CONFIG_FEATURE_TEST_64 is not set -CONFIG_TOUCH=y -CONFIG_TR=y -CONFIG_TRUE=y -CONFIG_TTY=y -CONFIG_UNAME=y -CONFIG_UNIQ=y -# CONFIG_USLEEP is not set -# 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 and more -# -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 is not set - -# -# Console Utilities -# -CONFIG_CHVT=y -CONFIG_CLEAR=y -CONFIG_DEALLOCVT=y -CONFIG_DUMPKMAP=y -CONFIG_GETKEY=y -CONFIG_LOADFONT=y -CONFIG_LOADKMAP=y -CONFIG_OPENVT=y -CONFIG_RESET=y -# CONFIG_SETKEYCODES 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_START_STOP_DAEMON=y -CONFIG_WHICH=y - -# -# Editors -# -CONFIG_AWK=y -CONFIG_FEATURE_AWK_MATH=y -# CONFIG_PATCH is not set -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_MTIME=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_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_HALT is not set -# CONFIG_POWEROFF is not set -# CONFIG_REBOOT is not set -# CONFIG_MESG is not set - -# -# Login/Password Management Utilities -# -# 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_U_W_TMP=y -# CONFIG_LOGIN is not set -# CONFIG_PASSWD is not set -# CONFIG_SU is not set -# CONFIG_SULOGIN is not set -# CONFIG_VLOCK is not set - -# -# Miscellaneous Utilities -# -# CONFIG_ADJTIMEX is not set -# CONFIG_CROND is not set -# CONFIG_CRONTAB is not set -CONFIG_DC=y -# CONFIG_DEVFSD is not set -# CONFIG_LAST is not set -# CONFIG_HDPARM is not set -# CONFIG_MAKEDEVS is not set -# CONFIG_MT is not set -# CONFIG_RX is not set -CONFIG_STRINGS=y -# CONFIG_TIME is not set -# CONFIG_WATCHDOG is not set - -# -# Linux Module Utilities -# -CONFIG_INSMOD=y -CONFIG_FEATURE_2_4_MODULES=y -CONFIG_FEATURE_2_6_MODULES=y -# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set -CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS=y -# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set -CONFIG_FEATURE_INSMOD_LOAD_MAP=y -CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL=y -CONFIG_LSMOD=y -CONFIG_MODPROBE=y -CONFIG_RMMOD=y -CONFIG_FEATURE_CHECK_TAINTED_MODULE=y - -# -# Networking Utilities -# -CONFIG_FEATURE_IPV6=y -# CONFIG_ARPING is not set -# CONFIG_FTPGET is not set -# CONFIG_FTPPUT is not set -CONFIG_HOSTNAME=y -# CONFIG_HTTPD 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_IP=y -CONFIG_FEATURE_IP_ADDRESS=y -CONFIG_FEATURE_IP_LINK=y -CONFIG_FEATURE_IP_ROUTE=y -CONFIG_FEATURE_IP_TUNNEL=y -# CONFIG_IPCALC is not set -# 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=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 is not set -CONFIG_FEATURE_TELNET_AUTOLOGIN=y -# CONFIG_TELNETD is not set -CONFIG_TFTP=y -CONFIG_TRACEROUTE=y -# CONFIG_FEATURE_TRACEROUTE_VERBOSE 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 - -# -# udhcp Server/Client -# -CONFIG_UDHCPD=y -CONFIG_UDHCPC=y -CONFIG_FEATURE_UDHCP_SYSLOG=y -# CONFIG_FEATURE_UDHCP_DEBUG is not set - -# -# Process Utilities -# -CONFIG_FREE=y -CONFIG_KILL=y -CONFIG_KILLALL=y -# CONFIG_PIDOF is not set -CONFIG_PS=y -CONFIG_RENICE=y -CONFIG_TOP=y -FEATURE_CPU_USAGE_PERCENTAGE=y -CONFIG_UPTIME=y -# CONFIG_SYSCTL is not set - -# -# Another Bourne-like Shell -# -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_ALIAS=y -CONFIG_ASH_MATH_SUPPORT=y -# CONFIG_ASH_MATH_SUPPORT_64 is not set -CONFIG_ASH_GETOPTS=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_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_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 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 - -# -# Linux System Utilities -# -CONFIG_DMESG=y -CONFIG_FBSET=y -CONFIG_FEATURE_FBSET_FANCY=y -# CONFIG_FEATURE_FBSET_READMODE is not set -# 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_LONGOPTIONS=y -CONFIG_LOSETUP=y -CONFIG_MKSWAP=y -CONFIG_MORE=y -CONFIG_FEATURE_USE_TERMIOS=y -CONFIG_PIVOT_ROOT=y -# CONFIG_RDATE is not set -CONFIG_SWAPONOFF=y -CONFIG_MOUNT=y -CONFIG_NFSMOUNT=y -CONFIG_UMOUNT=y -CONFIG_FEATURE_MOUNT_FORCE=y - -# -# Common options for mount/umount -# -CONFIG_FEATURE_MOUNT_LOOP=y -# CONFIG_FEATURE_MTAB_SUPPORT is not set - -# -# Debugging Options -# -# CONFIG_DEBUG is not set diff --git a/packages/busybox/busybox-1.00/df.patch b/packages/busybox/busybox-1.00/df.patch deleted file mode 100644 index 49888293fd..0000000000 --- a/packages/busybox/busybox-1.00/df.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- busybox-1.00/coreutils/df.c.orig 2006-07-14 09:50:47.914912750 -0400 -+++ busybox-1.00/coreutils/df.c 2006-07-14 09:52:32.613456000 -0400 -@@ -60,6 +60,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_complementaly = "h-km:k-hm:m-hk"; -@@ -125,14 +126,14 @@ - ) / (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) { -+ if (root_done) continue; - /* Adjusts device to be the real root device, - * or leaves device alone if it can't find it */ - if ((device = find_real_root_device_name()) == NULL) { - goto SET_ERROR; - } -+ root_done = 1; - } - - #ifdef CONFIG_FEATURE_HUMAN_READABLE diff --git a/packages/busybox/busybox-1.00/dhcp-hostname.patch b/packages/busybox/busybox-1.00/dhcp-hostname.patch deleted file mode 100644 index 5eb77a8e10..0000000000 --- a/packages/busybox/busybox-1.00/dhcp-hostname.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- busybox/networking/udhcp/dhcpc.c 2005-05-25 11:49:24.000000000 +0100 -+++ busybox/networking/udhcp/dhcpc.c 2005-05-25 12:54:30.000000000 +0100 -@@ -193,6 +193,7 @@ - long now; - int max_fd; - int sig; -+ 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-1.00/dhcpretrytime.patch b/packages/busybox/busybox-1.00/dhcpretrytime.patch deleted file mode 100644 index c55a38552f..0000000000 --- a/packages/busybox/busybox-1.00/dhcpretrytime.patch +++ /dev/null @@ -1,81 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- busybox-1.00-rc3/networking/udhcp/dhcpc.c~dhcpretrytime -+++ busybox-1.00-rc3/networking/udhcp/dhcpc.c -@@ -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; - -@@ -90,6 +91,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); -@@ -204,6 +206,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} - }; -@@ -211,7 +214,7 @@ - /* get options */ - while (1) { - int option_index = 0; -- c = getopt_long(argc, argv, "c:fbH:h:i:np:qr:s:v", arg_options, &option_index); -+ c = getopt_long(argc, argv, "c:fbH:h:i:np:qr:s:t:v", arg_options, &option_index); - if (c == -1) break; - - switch (c) { -@@ -257,6 +260,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; -@@ -335,7 +341,7 @@ - } - /* wait to try again */ - packet_num = 0; -- timeout = now + 60; -+ timeout = now + retrytime; - } - break; - case RENEW_REQUESTED: ---- busybox-1.00-rc3/networking/ifupdown.c~dhcpretrytime -+++ busybox-1.00-rc3/networking/ifupdown.c -@@ -538,7 +538,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)); -@@ -558,8 +558,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-1.00/fbset.patch b/packages/busybox/busybox-1.00/fbset.patch deleted file mode 100644 index d0609ce6f7..0000000000 --- a/packages/busybox/busybox-1.00/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-1.00/gzip-spurious-const.patch b/packages/busybox/busybox-1.00/gzip-spurious-const.patch deleted file mode 100644 index 114a284e99..0000000000 --- a/packages/busybox/busybox-1.00/gzip-spurious-const.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- busybox-1.00/archival/gzip.c.old 2005-06-05 22:57:32.000000000 +0100 -+++ busybox-1.00/archival/gzip.c 2005-06-05 22:57:38.000000000 +0100 -@@ -2162,7 +2162,7 @@ - * Construct the Huffman tree for the bit lengths and return the index in - * bl_order of the last bit length code to send. - */ --static const int build_bl_tree() -+static int build_bl_tree() - { - int max_blindex; /* index of last bit length code of non zero freq */ - diff --git a/packages/busybox/busybox-1.00/hdparm_M.patch b/packages/busybox/busybox-1.00/hdparm_M.patch deleted file mode 100644 index 170906535e..0000000000 --- a/packages/busybox/busybox-1.00/hdparm_M.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -Naur busybox-1.00/miscutils/hdparm.c busybox-1.00-patched/miscutils/hdparm.c ---- busybox-1.00/miscutils/hdparm.c 2004-07-21 00:53:59.000000000 +0200 -+++ busybox-1.00-patched/miscutils/hdparm.c 2004-10-21 15:17:13.000000000 +0200 -@@ -1254,6 +1254,7 @@ - static unsigned long set_sleepnow = 0, get_sleepnow = 0; - static unsigned long get_powermode = 0; - static unsigned long set_apmmode = 0, get_apmmode= 0, apmmode = 0; -+static unsigned long set_acoustic = 0, get_acoustic = 0, acoustic = 0; - #endif - #ifdef CONFIG_FEATURE_HDPARM_GET_IDENTITY - static int get_IDentity = 0; -@@ -2123,6 +2124,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 -@@ -2831,6 +2846,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-1.00/ifupdown-spurious-environ.patch b/packages/busybox/busybox-1.00/ifupdown-spurious-environ.patch deleted file mode 100644 index 8753315f2c..0000000000 --- a/packages/busybox/busybox-1.00/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-1.00/iproute-flush-cache.patch b/packages/busybox/busybox-1.00/iproute-flush-cache.patch deleted file mode 100644 index f8becc3390..0000000000 --- a/packages/busybox/busybox-1.00/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-1.00/linux-types.patch b/packages/busybox/busybox-1.00/linux-types.patch deleted file mode 100644 index e312073c9e..0000000000 --- a/packages/busybox/busybox-1.00/linux-types.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- busybox-1.00/libbb/loop.c.org 2006-09-19 18:18:17.084592997 +0200 -+++ busybox-1.00/libbb/loop.c 2006-09-19 18:18:09.820275793 +0200 -@@ -19,6 +19,7 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -+#include <linux/types.h> - #include <asm/posix_types.h> - #include <stdio.h> - #include <errno.h> diff --git a/packages/busybox/busybox-1.00/mount-all-type.patch b/packages/busybox/busybox-1.00/mount-all-type.patch deleted file mode 100644 index 476094a804..0000000000 --- a/packages/busybox/busybox-1.00/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-1.00/nylon/.mtn2git_empty b/packages/busybox/busybox-1.00/nylon/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/busybox/busybox-1.00/nylon/.mtn2git_empty +++ /dev/null diff --git a/packages/busybox/busybox-1.00/nylon/defconfig b/packages/busybox/busybox-1.00/nylon/defconfig deleted file mode 100644 index 7efd042cdc..0000000000 --- a/packages/busybox/busybox-1.00/nylon/defconfig +++ /dev/null @@ -1,458 +0,0 @@ -# -# Automatically generated make config: don't edit -# -HAVE_DOT_CONFIG=y - -# -# General Configuration -# -CONFIG_FEATURE_BUFFERS_USE_MALLOC=y -# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set -# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set -CONFIG_FEATURE_VERBOSE_USAGE=y -# CONFIG_FEATURE_INSTALLER is not set -# CONFIG_LOCALE_SUPPORT is not set -CONFIG_FEATURE_DEVFS=y -CONFIG_FEATURE_DEVPTS=y -# CONFIG_FEATURE_CLEAN_UP is not set -CONFIG_FEATURE_SUID=y -CONFIG_FEATURE_SUID_CONFIG=y -CONFIG_FEATURE_SUID_CONFIG_QUIET=y -# CONFIG_SELINUX is not set - -# -# Build Options -# -# CONFIG_STATIC is not set -# CONFIG_LFS is not set -# USING_CROSS_COMPILER is not set -EXTRA_CFLAGS_OPTIONS="" - -# -# Installation Options -# -# CONFIG_INSTALL_NO_USR is not set -PREFIX="./_install" - -# -# Archival Utilities -# -CONFIG_AR=y -CONFIG_FEATURE_AR_LONG_FILENAMES=y -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=y -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 is not set -CONFIG_FEATURE_TAR_FROM=y -CONFIG_FEATURE_TAR_GZIP=y -CONFIG_FEATURE_TAR_COMPRESS=y -CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY=y -CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y -CONFIG_FEATURE_TAR_LONG_OPTIONS=y -CONFIG_UNCOMPRESS=y -CONFIG_UNZIP=y - -# -# Common options for cpio and tar -# -# CONFIG_FEATURE_UNARCHIVE_TAPE is not set - -# -# Common options for dpkg and dpkg_deb -# -CONFIG_FEATURE_DEB_TAR_GZ=y -CONFIG_FEATURE_DEB_TAR_BZ2=y - -# -# Coreutils -# -CONFIG_BASENAME=y -CONFIG_CAL=y -CONFIG_CAT=y -CONFIG_CHGRP=y -CONFIG_CHMOD=y -CONFIG_CHOWN=y -CONFIG_CHROOT=y -CONFIG_CMP=y -CONFIG_CP=y -CONFIG_CUT=y -CONFIG_DATE=y - -# -# date (forced enabled for use with watch) -# -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_ECHO=y -CONFIG_FEATURE_FANCY_ECHO=y -CONFIG_ENV=y -CONFIG_EXPR=y -CONFIG_FALSE=y -CONFIG_FOLD=y -CONFIG_HEAD=y -CONFIG_FEATURE_FANCY_HEAD=y -CONFIG_HOSTID=y -CONFIG_ID=y -CONFIG_INSTALL=y -CONFIG_LENGTH=y -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_MD5SUM=y -CONFIG_MKDIR=y -CONFIG_MKFIFO=y -CONFIG_MKNOD=y -CONFIG_MV=y -CONFIG_OD=y -CONFIG_PRINTF=y -CONFIG_PWD=y -CONFIG_REALPATH=y -CONFIG_RM=y -CONFIG_RMDIR=y -CONFIG_SEQ=y -CONFIG_SHA1SUM=y -CONFIG_SLEEP=y -CONFIG_FEATURE_FANCY_SLEEP=y -CONFIG_SORT=y -CONFIG_STTY=y -CONFIG_SYNC=y -CONFIG_TAIL=y -CONFIG_FEATURE_FANCY_TAIL=y -CONFIG_TEE=y -CONFIG_FEATURE_TEE_USE_BLOCK_IO=y -# CONFIG_TEST is not set -CONFIG_TOUCH=y -CONFIG_TR=y -CONFIG_TRUE=y -CONFIG_TTY=y -CONFIG_UNAME=y -CONFIG_UNIQ=y -CONFIG_USLEEP=y -CONFIG_UUDECODE=y -CONFIG_UUENCODE=y -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 and more -# -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 is not set -CONFIG_CLEAR=y -# CONFIG_DEALLOCVT is not set -CONFIG_DUMPKMAP=y -CONFIG_GETKEY=y -# CONFIG_LOADFONT is not set -CONFIG_LOADKMAP=y -# CONFIG_OPENVT is not set -CONFIG_RESET=y -CONFIG_SETKEYCODES=y - -# -# Debian Utilities -# -CONFIG_MKTEMP=y -CONFIG_PIPE_PROGRESS=y -CONFIG_READLINK=y -CONFIG_FEATURE_READLINK_FOLLOW=y -CONFIG_RUN_PARTS=y -CONFIG_START_STOP_DAEMON=y -CONFIG_WHICH=y - -# -# Editors -# -CONFIG_AWK=y -CONFIG_FEATURE_AWK_MATH=y -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=y -CONFIG_FEATURE_VI_READONLY=y -CONFIG_FEATURE_VI_SETOPTS=y -CONFIG_FEATURE_VI_SET=y -CONFIG_FEATURE_VI_WIN_RESIZE=y -CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y - -# -# Finding Utilities -# -CONFIG_FIND=y -CONFIG_FEATURE_FIND_MTIME=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=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=y -CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y -CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y -CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y - -# -# Init Utilities -# -# CONFIG_INIT is not set -# CONFIG_HALT is not set -# CONFIG_POWEROFF is not set -# CONFIG_REBOOT is not set -# CONFIG_MESG is not set - -# -# Login/Password Management Utilities -# -# 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_U_W_TMP=y -# CONFIG_LOGIN is not set -# CONFIG_PASSWD is not set -# CONFIG_SU is not set -# CONFIG_SULOGIN is not set -# CONFIG_VLOCK is not set - -# -# Miscellaneous Utilities -# -# CONFIG_ADJTIMEX is not set -CONFIG_CROND=y -# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set -CONFIG_CRONTAB=y -CONFIG_DC=y -# CONFIG_DEVFSD is not set -# CONFIG_LAST is not set -# CONFIG_HDPARM is not set -# CONFIG_MAKEDEVS is not set -# CONFIG_MT is not set -# CONFIG_RX is not set -CONFIG_STRINGS=y -CONFIG_TIME=y -CONFIG_WATCHDOG=y - -# -# Linux Module Utilities -# -# CONFIG_INSMOD is not set -# CONFIG_LSMOD is not set -# CONFIG_MODPROBE is not set -# CONFIG_RMMOD is not set - -# -# Networking Utilities -# -CONFIG_FEATURE_IPV6=y -CONFIG_ARPING=y -# CONFIG_FTPGET is not set -# CONFIG_FTPPUT is not set -CONFIG_HOSTNAME=y -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=y -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=y -CONFIG_FEATURE_IFCONFIG_HW=y -CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y -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=y -CONFIG_FEATURE_INETD_SUPPORT_BILTIN_ECHO=y -CONFIG_FEATURE_INETD_SUPPORT_BILTIN_DISCARD=y -CONFIG_FEATURE_INETD_SUPPORT_BILTIN_TIME=y -CONFIG_FEATURE_INETD_SUPPORT_BILTIN_DAYTIME=y -CONFIG_FEATURE_INETD_SUPPORT_BILTIN_CHARGEN=y -# CONFIG_IP 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=y -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=y -# CONFIG_TELNETD is not set -CONFIG_TFTP=y -CONFIG_FEATURE_TFTP_GET=y -CONFIG_FEATURE_TFTP_PUT=y -CONFIG_FEATURE_TFTP_BLOCKSIZE=y -# CONFIG_FEATURE_TFTP_DEBUG 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=y - -# -# udhcp Server/Client -# -CONFIG_UDHCPD=y -CONFIG_UDHCPC=y -CONFIG_DUMPLEASES=y -CONFIG_FEATURE_UDHCP_SYSLOG=y -# CONFIG_FEATURE_UDHCP_DEBUG is not set - -# -# Process Utilities -# -CONFIG_FREE=y -CONFIG_KILL=y -CONFIG_KILLALL=y -CONFIG_PIDOF=y -CONFIG_PS=y -CONFIG_RENICE=y -CONFIG_TOP=y -FEATURE_CPU_USAGE_PERCENTAGE=y -CONFIG_UPTIME=y -CONFIG_SYSCTL=y - -# -# Another Bourne-like Shell -# -# CONFIG_FEATURE_SH_IS_ASH is not set -# 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=y -# CONFIG_ASH is not set -# CONFIG_HUSH is not set -# CONFIG_LASH is not set -# CONFIG_MSH is not set - -# -# 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 is not set -CONFIG_KLOGD=y -CONFIG_LOGGER=y - -# -# 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=y -# CONFIG_FSCK_MINIX is not set -# CONFIG_MKFS_MINIX is not set -# CONFIG_GETOPT is not set -CONFIG_HEXDUMP=y -# CONFIG_HWCLOCK is not set -CONFIG_LOSETUP=y -CONFIG_MKSWAP=y -# CONFIG_MORE is not set -CONFIG_PIVOT_ROOT=y -# CONFIG_RDATE is not set -CONFIG_SWAPONOFF=y -CONFIG_MOUNT=y -CONFIG_NFSMOUNT=y -CONFIG_UMOUNT=y -CONFIG_FEATURE_MOUNT_FORCE=y - -# -# Common options for mount/umount -# -CONFIG_FEATURE_MOUNT_LOOP=y -# CONFIG_FEATURE_MTAB_SUPPORT is not set - -# -# Debugging Options -# -# CONFIG_DEBUG is not set diff --git a/packages/busybox/busybox-1.00/openmn/.mtn2git_empty b/packages/busybox/busybox-1.00/openmn/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/busybox/busybox-1.00/openmn/.mtn2git_empty +++ /dev/null diff --git a/packages/busybox/busybox-1.00/openmn/defconfig b/packages/busybox/busybox-1.00/openmn/defconfig deleted file mode 100644 index f98af91853..0000000000 --- a/packages/busybox/busybox-1.00/openmn/defconfig +++ /dev/null @@ -1,475 +0,0 @@ -# -# Automatically generated make config: don't edit -# -HAVE_DOT_CONFIG=y - -# -# General Configuration -# -CONFIG_FEATURE_BUFFERS_USE_MALLOC=y -# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set -# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set -# CONFIG_FEATURE_VERBOSE_USAGE is not set -# CONFIG_FEATURE_INSTALLER is not set -# CONFIG_LOCALE_SUPPORT is not set -CONFIG_FEATURE_DEVFS=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 - -# -# Build Options -# -# CONFIG_STATIC is not set -# CONFIG_LFS is not set -# USING_CROSS_COMPILER is not set -EXTRA_CFLAGS_OPTIONS="" - -# -# Installation Options -# -# CONFIG_INSTALL_NO_USR is not set -PREFIX="./_install" - -# -# 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_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_FROM=y -CONFIG_FEATURE_TAR_GZIP=y -# CONFIG_FEATURE_TAR_COMPRESS is not set -CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY=y -CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y -# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set -# CONFIG_UNCOMPRESS is not set -CONFIG_UNZIP=y - -# -# Common options for cpio and tar -# -# CONFIG_FEATURE_UNARCHIVE_TAPE is not set - -# -# Coreutils -# -CONFIG_BASENAME=y -# CONFIG_CAL is not set -CONFIG_CAT=y -CONFIG_CHGRP=y -CONFIG_CHMOD=y -CONFIG_CHOWN=y -CONFIG_CHROOT=y -CONFIG_CMP=y -CONFIG_CP=y -CONFIG_CUT=y -CONFIG_DATE=y - -# -# date (forced enabled for use with watch) -# -CONFIG_FEATURE_DATE_ISOFMT=y -CONFIG_DD=y -CONFIG_DF=y -CONFIG_DIRNAME=y -# CONFIG_DOS2UNIX is not set -CONFIG_DU=y -CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K=y -CONFIG_ECHO=y -CONFIG_FEATURE_FANCY_ECHO=y -CONFIG_ENV=y -CONFIG_EXPR=y -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_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 is not set -CONFIG_MD5SUM=y -CONFIG_MKDIR=y -CONFIG_MKFIFO=y -CONFIG_MKNOD=y -CONFIG_MV=y -CONFIG_OD=y -CONFIG_PRINTF=y -CONFIG_PWD=y -# CONFIG_REALPATH is not set -CONFIG_RM=y -CONFIG_RMDIR=y -CONFIG_SEQ=y -# CONFIG_SHA1SUM is not set -CONFIG_SLEEP=y -# CONFIG_FEATURE_FANCY_SLEEP is not set -CONFIG_SORT=y -CONFIG_STTY=y -CONFIG_SYNC=y -CONFIG_TAIL=y -# CONFIG_FEATURE_FANCY_TAIL is not set -CONFIG_TEE=y -# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set -CONFIG_TEST=y - -# -# test (forced enabled for use with shell) -# -# CONFIG_FEATURE_TEST_64 is not set -CONFIG_TOUCH=y -CONFIG_TR=y -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 and more -# -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 is not set - -# -# Console Utilities -# -CONFIG_CHVT=y -CONFIG_CLEAR=y -CONFIG_DEALLOCVT=y -CONFIG_DUMPKMAP=y -CONFIG_GETKEY=y -CONFIG_LOADFONT=y -CONFIG_LOADKMAP=y -CONFIG_OPENVT=y -CONFIG_RESET=y -CONFIG_SETKEYCODES=y - -# -# Debian Utilities -# -CONFIG_MKTEMP=y -# CONFIG_PIPE_PROGRESS is not set -CONFIG_READLINK=y -CONFIG_FEATURE_READLINK_FOLLOW=y -CONFIG_RUN_PARTS=y -CONFIG_START_STOP_DAEMON=y -CONFIG_WHICH=y - -# -# Editors -# -CONFIG_AWK=y -CONFIG_FEATURE_AWK_MATH=y -# CONFIG_PATCH is not set -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_MTIME=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_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=y - -# -# Init Utilities -# -# CONFIG_INIT is not set -# CONFIG_HALT is not set -# CONFIG_POWEROFF is not set -# CONFIG_REBOOT is not set -# CONFIG_MESG is not set - -# -# 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_FEATURE_U_W_TMP=y -CONFIG_LOGIN=y -# CONFIG_FEATURE_SECURETTY is not set -CONFIG_PASSWD=y -CONFIG_SU=y -CONFIG_SULOGIN=y -CONFIG_VLOCK=y - -# -# Common options for adduser, deluser, login, su -# -CONFIG_FEATURE_SHADOWPASSWDS=y - -# -# Miscellaneous Utilities -# -# CONFIG_ADJTIMEX is not set -# CONFIG_CROND is not set -# CONFIG_CRONTAB is not set -CONFIG_DC=y -# CONFIG_DEVFSD is not set -# CONFIG_LAST is not set -# CONFIG_HDPARM is not set -# CONFIG_MAKEDEVS is not set -# CONFIG_MT is not set -# CONFIG_RX is not set -CONFIG_STRINGS=y -CONFIG_TIME=y -# CONFIG_WATCHDOG is not set - -# -# Linux Module Utilities -# -CONFIG_INSMOD=y -CONFIG_FEATURE_2_4_MODULES=y -CONFIG_FEATURE_2_6_MODULES=y -# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set -CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS=y -# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set -CONFIG_FEATURE_INSMOD_LOAD_MAP=y -CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL=y -CONFIG_LSMOD=y -CONFIG_MODPROBE=y -CONFIG_RMMOD=y -# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set - -# -# Networking Utilities -# -# CONFIG_FEATURE_IPV6 is not set -CONFIG_ARPING=y -# CONFIG_FTPGET is not set -CONFIG_FTPPUT=y -CONFIG_HOSTNAME=y -# CONFIG_HTTPD 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 is not set -# CONFIG_FEATURE_IFUPDOWN_IPX is not set -# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set -# CONFIG_INETD 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 is not set -# CONFIG_IPCALC is not set -# 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=y -CONFIG_NETSTAT=y -CONFIG_NSLOOKUP=y -CONFIG_PING=y -CONFIG_FEATURE_FANCY_PING=y -CONFIG_ROUTE=y -CONFIG_TELNET=y -# CONFIG_FEATURE_TELNET_TTYPE is not set -# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set -# CONFIG_TELNETD is not set -# CONFIG_TFTP is not set -CONFIG_TRACEROUTE=y -# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set -# CONFIG_VCONFIG is not set -CONFIG_WGET=y -# CONFIG_FEATURE_WGET_STATUSBAR is not set -CONFIG_FEATURE_WGET_AUTHENTICATION=y -# CONFIG_FEATURE_WGET_IP6_LITERAL is not set - -# -# udhcp Server/Client -# -# CONFIG_UDHCPD is not set -CONFIG_UDHCPC=y -CONFIG_FEATURE_UDHCP_SYSLOG=y -# CONFIG_FEATURE_UDHCP_DEBUG is not set - -# -# Process Utilities -# -CONFIG_FREE=y -CONFIG_KILL=y -CONFIG_KILLALL=y -# CONFIG_PIDOF is not set -CONFIG_PS=y -CONFIG_RENICE=y -CONFIG_TOP=y -FEATURE_CPU_USAGE_PERCENTAGE=y -CONFIG_UPTIME=y -# CONFIG_SYSCTL is not set - -# -# Another Bourne-like Shell -# -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_ALIAS=y -CONFIG_ASH_MATH_SUPPORT=y -# CONFIG_ASH_MATH_SUPPORT_64 is not set -CONFIG_ASH_GETOPTS=y -# CONFIG_ASH_CMDCMD is not set -# CONFIG_ASH_MAIL is not set -# CONFIG_ASH_OPTIMIZE_FOR_SIZE is not set -# CONFIG_ASH_RANDOM_SUPPORT is not set -# 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_HISTORY=31 -# 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 is not set -# CONFIG_FEATURE_REMOTE_LOG is not set -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 - -# -# Linux System Utilities -# -CONFIG_DMESG=y -# CONFIG_FBSET is not set -# CONFIG_FDFLUSH is not set -# CONFIG_FDFORMAT is not set -CONFIG_FDISK=y -# FDISK_SUPPORT_LARGE_DISKS is not set -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_HEXDUMP=y -CONFIG_HWCLOCK=y -CONFIG_FEATURE_HWCLOCK_LONGOPTIONS=y -CONFIG_LOSETUP=y -CONFIG_MKSWAP=y -CONFIG_MORE=y -CONFIG_FEATURE_USE_TERMIOS=y -CONFIG_PIVOT_ROOT=y -# CONFIG_RDATE is not set -# CONFIG_SWAPONOFF is not set -CONFIG_MOUNT=y -CONFIG_NFSMOUNT=y -CONFIG_UMOUNT=y -CONFIG_FEATURE_MOUNT_FORCE=y - -# -# Common options for mount/umount -# -CONFIG_FEATURE_MOUNT_LOOP=y -# CONFIG_FEATURE_MTAB_SUPPORT is not set - -# -# Debugging Options -# -# CONFIG_DEBUG is not set diff --git a/packages/busybox/busybox-1.00/readlink.patch b/packages/busybox/busybox-1.00/readlink.patch deleted file mode 100644 index 0c5431085a..0000000000 --- a/packages/busybox/busybox-1.00/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-1.00/rmmod.patch b/packages/busybox/busybox-1.00/rmmod.patch deleted file mode 100644 index 5a557ef35d..0000000000 --- a/packages/busybox/busybox-1.00/rmmod.patch +++ /dev/null @@ -1,44 +0,0 @@ -Index: modutils/rmmod.c -=================================================================== -RCS file: /var/cvs/busybox/modutils/rmmod.c,v -retrieving revision 1.31 -diff -u -r1.31 rmmod.c ---- busybox/modutils/rmmod.c 20 Jul 2004 18:36:51 -0000 1.31 -+++ busybox/modutils/rmmod.c 10 Dec 2004 22:56:36 -0000 -@@ -28,6 +28,7 @@ - #include <fcntl.h> - #include <string.h> - #include <sys/syscall.h> -+#include <sys/utsname.h> - #include "busybox.h" - - #ifdef CONFIG_FEATURE_2_6_MODULES -@@ -63,6 +64,16 @@ - void *buf; /* hold the module names which we ignore but must get */ - size_t bufsize = 0; - #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. */ - while ((n = getopt(argc, argv, "a")) != EOF) { -@@ -109,7 +120,10 @@ - for (n = optind; n < argc; n++) { - #ifdef CONFIG_FEATURE_2_6_MODULES - char module_name[strlen(argv[n]) + 1]; -- filename2modname(module_name, argv[n]); -+ if (k_version != 4) -+ filename2modname(module_name, argv[n]); -+ else -+ strcpy(module_name, argv[n]); - #else - #define module_name argv[n] - #endif diff --git a/packages/busybox/busybox-1.00/slugos/.mtn2git_empty b/packages/busybox/busybox-1.00/slugos/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/busybox/busybox-1.00/slugos/.mtn2git_empty +++ /dev/null diff --git a/packages/busybox/busybox-1.00/slugos/defconfig b/packages/busybox/busybox-1.00/slugos/defconfig deleted file mode 100644 index 7debaeced2..0000000000 --- a/packages/busybox/busybox-1.00/slugos/defconfig +++ /dev/null @@ -1,461 +0,0 @@ -# -# Automatically generated make config: don't edit -# -HAVE_DOT_CONFIG=y - -# -# General Configuration -# -# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set -CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y -# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set -CONFIG_FEATURE_VERBOSE_USAGE=y -# CONFIG_FEATURE_INSTALLER is not set -# CONFIG_LOCALE_SUPPORT is not set -CONFIG_FEATURE_DEVFS=y -CONFIG_FEATURE_DEVPTS=y -# CONFIG_FEATURE_CLEAN_UP is not set -# CONFIG_FEATURE_SUID is not set -# CONFIG_SELINUX is not set - -# -# Build Options -# -# CONFIG_STATIC is not set -CONFIG_LFS=y -# USING_CROSS_COMPILER is not set -EXTRA_CFLAGS_OPTIONS="" - -# -# Installation Options -# -# CONFIG_INSTALL_NO_USR is not set -PREFIX="./_install" - -# -# Archival Utilities -# -CONFIG_AR=y -# CONFIG_FEATURE_AR_LONG_FILENAMES is not set -CONFIG_BUNZIP2=y -# CONFIG_CPIO is not set -# CONFIG_DPKG is not set -# CONFIG_DPKG_DEB 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_FROM=y -CONFIG_FEATURE_TAR_GZIP=y -# CONFIG_FEATURE_TAR_COMPRESS is not set -CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY=y -CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y -# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set -# CONFIG_UNCOMPRESS is not set -CONFIG_UNZIP=y - -# -# Common options for cpio and tar -# -# CONFIG_FEATURE_UNARCHIVE_TAPE is not set - -# -# Coreutils -# -CONFIG_BASENAME=y -# CONFIG_CAL is not set -CONFIG_CAT=y -CONFIG_CHGRP=y -CONFIG_CHMOD=y -CONFIG_CHOWN=y -CONFIG_CHROOT=y -# CONFIG_CMP is not set -CONFIG_CP=y -CONFIG_CUT=y -CONFIG_DATE=y - -# -# date (forced enabled for use with watch) -# -# CONFIG_FEATURE_DATE_ISOFMT is not set -CONFIG_DD=y -CONFIG_DF=y -CONFIG_DIRNAME=y -# CONFIG_DOS2UNIX is not set -CONFIG_DU=y -CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K=y -CONFIG_ECHO=y -CONFIG_FEATURE_FANCY_ECHO=y -CONFIG_ENV=y -CONFIG_EXPR=y -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_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_MD5SUM=y -CONFIG_MKDIR=y -CONFIG_MKFIFO=y -CONFIG_MKNOD=y -CONFIG_MV=y -CONFIG_OD=y -CONFIG_PRINTF=y -CONFIG_PWD=y -# CONFIG_REALPATH is not set -CONFIG_RM=y -CONFIG_RMDIR=y -CONFIG_SEQ=y -# CONFIG_SHA1SUM is not set -CONFIG_SLEEP=y -# CONFIG_FEATURE_FANCY_SLEEP is not set -CONFIG_SORT=y -CONFIG_STTY=y -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 - -# -# test (forced enabled for use with shell) -# -# CONFIG_FEATURE_TEST_64 is not set -CONFIG_TOUCH=y -CONFIG_TR=y -CONFIG_TRUE=y -CONFIG_TTY=y -CONFIG_UNAME=y -CONFIG_UNIQ=y -# CONFIG_USLEEP is not set -# 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 and more -# -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 is not set - -# -# Console Utilities -# -CONFIG_CHVT=y -CONFIG_CLEAR=y -CONFIG_DEALLOCVT=y -CONFIG_DUMPKMAP=y -CONFIG_GETKEY=y -CONFIG_LOADFONT=y -CONFIG_LOADKMAP=y -CONFIG_OPENVT=y -CONFIG_RESET=y -# CONFIG_SETKEYCODES 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_START_STOP_DAEMON=y -CONFIG_WHICH=y - -# -# Editors -# -CONFIG_AWK=y -CONFIG_FEATURE_AWK_MATH=y -# CONFIG_PATCH is not set -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 is not set -CONFIG_GREP=y -CONFIG_FEATURE_GREP_EGREP_ALIAS=y -CONFIG_FEATURE_GREP_FGREP_ALIAS=y -CONFIG_FEATURE_GREP_CONTEXT=y -# CONFIG_XARGS is not set - -# -# Init Utilities -# -# CONFIG_INIT is not set -# CONFIG_HALT is not set -# CONFIG_POWEROFF is not set -# CONFIG_REBOOT is not set -# CONFIG_MESG is not set - -# -# Login/Password Management Utilities -# -# 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_U_W_TMP=y -# CONFIG_LOGIN is not set -# CONFIG_PASSWD is not set -# CONFIG_SU is not set -# CONFIG_SULOGIN is not set -# CONFIG_VLOCK is not set - -# -# Miscellaneous Utilities -# -# CONFIG_ADJTIMEX is not set -# CONFIG_CROND is not set -# CONFIG_CRONTAB is not set -CONFIG_DC=y -# CONFIG_DEVFSD is not set -# CONFIG_LAST is not set -# CONFIG_HDPARM is not set -# CONFIG_MAKEDEVS is not set -# CONFIG_MT is not set -# CONFIG_RX is not set -CONFIG_STRINGS=y -CONFIG_TIME=y -# CONFIG_WATCHDOG is not set - -# -# Linux Module Utilities -# -# CONFIG_INSMOD is not set -# CONFIG_LSMOD is not set -# CONFIG_MODPROBE is not set -# CONFIG_RMMOD is not set - -# -# Networking Utilities -# -CONFIG_FEATURE_IPV6=y -# CONFIG_ARPING is not set -# CONFIG_FTPGET is not set -# CONFIG_FTPPUT is not set -CONFIG_HOSTNAME=y -# CONFIG_HTTPD 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 is not set -# CONFIG_INETD 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_IPCALC is not set -# 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=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 is not set -CONFIG_FEATURE_TELNET_AUTOLOGIN=y -# CONFIG_TELNETD is not set -CONFIG_TFTP=y -CONFIG_FEATURE_TFTP_GET=y -CONFIG_FEATURE_TFTP_PUT=y -# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set -# CONFIG_FEATURE_TFTP_DEBUG is not set -CONFIG_TRACEROUTE=y -# CONFIG_FEATURE_TRACEROUTE_VERBOSE 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 - -# -# udhcp Server/Client -# -# CONFIG_UDHCPD is not set -CONFIG_UDHCPC=y -CONFIG_FEATURE_UDHCP_SYSLOG=y -# CONFIG_FEATURE_UDHCP_DEBUG is not set - -# -# Process Utilities -# -CONFIG_FREE=y -CONFIG_KILL=y -CONFIG_KILLALL=y -CONFIG_PIDOF=y -CONFIG_PS=y -CONFIG_RENICE=y -CONFIG_TOP=y -FEATURE_CPU_USAGE_PERCENTAGE=y -CONFIG_UPTIME=y -# CONFIG_SYSCTL is not set - -# -# Another Bourne-like Shell -# -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_PIPE_OPTIMIZATION=y -CONFIG_FEATURE_BUILTIN_TEST=y -CONFIG_FEATURE_BUILTIN_ECHO=y -CONFIG_FEATURE_BUILTIN_PIDOF=y -CONFIG_ASH_ALIAS=y -CONFIG_ASH_MATH_SUPPORT=y -# CONFIG_ASH_MATH_SUPPORT_64 is not set -CONFIG_ASH_GETOPTS=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_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_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 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 - -# -# Linux System Utilities -# -CONFIG_DMESG=y -CONFIG_FBSET=y -CONFIG_FEATURE_FBSET_FANCY=y -# CONFIG_FEATURE_FBSET_READMODE is not set -# 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 is not set -# CONFIG_MKFS_MINIX is not set -# CONFIG_GETOPT is not set -CONFIG_HEXDUMP=y -CONFIG_HWCLOCK=y -CONFIG_FEATURE_HWCLOCK_LONGOPTIONS=y -CONFIG_LOSETUP=y -CONFIG_MKSWAP=y -CONFIG_MORE=y -CONFIG_FEATURE_USE_TERMIOS=y -CONFIG_PIVOT_ROOT=y -# CONFIG_RDATE is not set -CONFIG_SWAPONOFF=y -CONFIG_MOUNT=y -CONFIG_NFSMOUNT=y -CONFIG_UMOUNT=y -CONFIG_FEATURE_MOUNT_FORCE=y - -# -# Common options for mount/umount -# -CONFIG_FEATURE_MOUNT_LOOP=y -# CONFIG_FEATURE_MTAB_SUPPORT is not set - -# -# Debugging Options -# -# CONFIG_DEBUG is not set diff --git a/packages/busybox/busybox-1.00/slugos/udhcpscript.patch b/packages/busybox/busybox-1.00/slugos/udhcpscript.patch deleted file mode 100644 index 2f58632378..0000000000 --- a/packages/busybox/busybox-1.00/slugos/udhcpscript.patch +++ /dev/null @@ -1,133 +0,0 @@ ---- busybox-1.00/.pc/udhcpscript.patch/examples/udhcp/simple.script 2004-10-13 00:18:05.000000000 -0700 -+++ busybox-1.00/examples/udhcp/simple.script 2005-06-05 15:08:28.432605118 -0700 -@@ -1,40 +1,101 @@ - #!/bin/sh -+# slugos UDHCP client script -+# this must set the HW address (MAC) on the interface -+# -+. /etc/default/functions - --# udhcpc script edited by Tim Riker <Tim@Rikers.org> - --[ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1 -+echodns(){ -+ local dns -+ if test $# -gt 0 -+ then -+ for dns in "$@" -+ do -+ echo "nameserver $dns" -+ done -+ fi -+} -+ -+# Output the correct contents for resolv.conf -+mkresolv() { -+ test -n "$domain" && echo "search $domain" -+ echodns $dns -+} -+ -+# checksum of a file (or stdin if -) -+md5strm() { -+ md5sum $1 2>/dev/null | sed -n 's/^\([0-9A-Za-z]*\).*$/\1/p' -+} -+ -+bind() { -+ local B N metric i olddomain -+ B= -+ test -n "$broadcast" && B="broadcast $broadcast" -+ N= -+ test -n "$subnet" && N="netmask $subnet" -+ ifconfig "$interface" "$ip" $B $N up -+ -+ # If given router information delete the old information and -+ # enter new stuff, routers get metrics incremented by 1 -+ # between each (this is somewhat arbitrary) -+ if test -n "$router" -+ then -+ while route del default gw 0.0.0.0 dev $interface 2>/dev/null -+ do -+ : -+ done - --RESOLV_CONF="/etc/resolv.conf" --[ -n "$broadcast" ] && BROADCAST="broadcast $broadcast" --[ -n "$subnet" ] && NETMASK="netmask $subnet" -+ metric=0 -+ for i in $router -+ do -+ route add default gw "$i" dev "$interface" metric $((metric++)) -+ done -+ fi -+ -+ olddomain= -+ test -r /etc/defaultdomain && olddomain="$(cat /etc/defaultdomain)" -+ if test -n "$domain" -a "$domain" != "$olddomain" -+ then -+ echo "$domain" >/etc/defaultdomain -+ # and update the kernel view too -+ echo "$domain" >/proc/sys/kernel/domainname -+ fi -+ -+ # Update /etc/resolv.conf to reflect domain and dns information, -+ # this always clears resolv.conf if none is given -+ md5old="$(md5strm /etc/resolv.conf)" -+ md5new="$(mkresolv | md5strm -)" -+ test "$md5old" != "$md5new" && mkresolv >/etc/resolv.conf -+} - - case "$1" in -- deconfig) -- /sbin/ifconfig $interface 0.0.0.0 -- ;; -- -- renew|bound) -- /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 -- : -- done -- -- metric=0 -- for i in $router ; do -- route add default gw $i dev $interface metric $((metric++)) -- done -+deconfig) -+ # Bring the interface up (without inet at this point) -+ ifconfig "$interface" up;; -+ -+renew|bound) -+ bind;; -+ -+leasefail) -+ # Pull the values from the config data if (only only if) this -+ # is the config interface -+ if test "$interface" = "$(config iface)" -+ then -+ ip="$(config ip)" -+ if test -n "$ip" -+ then -+ router="$(config gateway)" -+ subnet="$(config netmask)" -+ broadcast="$(config broadcast)" -+ domain="$(config domain)" -+ dns="$(config dns)" -+ -+ bind - fi -+ fi;; - -- echo -n > $RESOLV_CONF -- [ -n "$domain" ] && echo search $domain >> $RESOLV_CONF -- for i in $dns ; do -- echo adding dns $i -- echo nameserver $i >> $RESOLV_CONF -- done -- ;; -+*) echo "udhcpc: $*: unknown command" >&2 -+ exit 1;; - esac - - exit 0 diff --git a/packages/busybox/busybox-1.00/sparc/.mtn2git_empty b/packages/busybox/busybox-1.00/sparc/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/busybox/busybox-1.00/sparc/.mtn2git_empty +++ /dev/null diff --git a/packages/busybox/busybox-1.00/sparc/defconfig b/packages/busybox/busybox-1.00/sparc/defconfig deleted file mode 100644 index 8b8cbfc839..0000000000 --- a/packages/busybox/busybox-1.00/sparc/defconfig +++ /dev/null @@ -1,467 +0,0 @@ -# -# Automatically generated make config: don't edit -# -HAVE_DOT_CONFIG=y - -# -# General Configuration -# -CONFIG_FEATURE_BUFFERS_USE_MALLOC=y -# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set -# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set -# CONFIG_FEATURE_VERBOSE_USAGE is not set -# CONFIG_FEATURE_INSTALLER is not set -# CONFIG_LOCALE_SUPPORT is not set -CONFIG_FEATURE_DEVFS=y -CONFIG_FEATURE_DEVPTS=y -# CONFIG_FEATURE_CLEAN_UP is not set -# CONFIG_FEATURE_SUID is not set -# CONFIG_SELINUX is not set - -# -# Build Options -# -# CONFIG_STATIC is not set -# CONFIG_LFS is not set -# USING_CROSS_COMPILER is not set -EXTRA_CFLAGS_OPTIONS="" - -# -# Installation Options -# -# CONFIG_INSTALL_NO_USR is not set -PREFIX="./_install" - -# -# 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_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_FROM=y -CONFIG_FEATURE_TAR_GZIP=y -# CONFIG_FEATURE_TAR_COMPRESS is not set -CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY=y -CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y -# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set -# CONFIG_UNCOMPRESS is not set -CONFIG_UNZIP=y - -# -# Common options for cpio and tar -# -# CONFIG_FEATURE_UNARCHIVE_TAPE is not set - -# -# Coreutils -# -CONFIG_BASENAME=y -# CONFIG_CAL is not set -CONFIG_CAT=y -CONFIG_CHGRP=y -CONFIG_CHMOD=y -CONFIG_CHOWN=y -CONFIG_CHROOT=y -# CONFIG_CMP is not set -CONFIG_CP=y -CONFIG_CUT=y -CONFIG_DATE=y - -# -# date (forced enabled for use with watch) -# -# CONFIG_FEATURE_DATE_ISOFMT is not set -CONFIG_DD=y -CONFIG_DF=y -CONFIG_DIRNAME=y -# CONFIG_DOS2UNIX is not set -CONFIG_DU=y -CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K=y -CONFIG_ECHO=y -CONFIG_FEATURE_FANCY_ECHO=y -CONFIG_ENV=y -CONFIG_EXPR=y -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_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 is not set -CONFIG_FEATURE_LS_SORTFILES=y -CONFIG_FEATURE_LS_TIMESTAMPS=y -CONFIG_FEATURE_LS_USERNAME=y -CONFIG_FEATURE_LS_COLOR=y -CONFIG_MD5SUM=y -CONFIG_MKDIR=y -CONFIG_MKFIFO=y -CONFIG_MKNOD=y -CONFIG_MV=y -CONFIG_OD=y -CONFIG_PRINTF=y -CONFIG_PWD=y -# CONFIG_REALPATH is not set -CONFIG_RM=y -CONFIG_RMDIR=y -CONFIG_SEQ=y -# CONFIG_SHA1SUM is not set -CONFIG_SLEEP=y -# CONFIG_FEATURE_FANCY_SLEEP is not set -CONFIG_SORT=y -CONFIG_STTY=y -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 - -# -# test (forced enabled for use with shell) -# -# CONFIG_FEATURE_TEST_64 is not set -CONFIG_TOUCH=y -CONFIG_TR=y -CONFIG_TRUE=y -CONFIG_TTY=y -CONFIG_UNAME=y -CONFIG_UNIQ=y -# CONFIG_USLEEP is not set -# 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 and more -# -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 is not set - -# -# Console Utilities -# -CONFIG_CHVT=y -CONFIG_CLEAR=y -CONFIG_DEALLOCVT=y -CONFIG_DUMPKMAP=y -CONFIG_GETKEY=y -CONFIG_LOADFONT=y -CONFIG_LOADKMAP=y -CONFIG_OPENVT=y -CONFIG_RESET=y -# CONFIG_SETKEYCODES is not set - -# -# Debian Utilities -# -CONFIG_MKTEMP=y -# CONFIG_PIPE_PROGRESS is not set -CONFIG_READLINK=y -CONFIG_RUN_PARTS=y -CONFIG_START_STOP_DAEMON=y -CONFIG_WHICH=y - -# -# Editors -# -CONFIG_AWK=y -CONFIG_FEATURE_AWK_MATH=y -# CONFIG_PATCH is not set -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_MTIME=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_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_HALT is not set -# CONFIG_POWEROFF is not set -# CONFIG_REBOOT is not set -# CONFIG_MESG is not set - -# -# Login/Password Management Utilities -# -# 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_U_W_TMP=y -# CONFIG_LOGIN is not set -# CONFIG_PASSWD is not set -# CONFIG_SU is not set -# CONFIG_SULOGIN is not set -# CONFIG_VLOCK is not set - -# -# Miscellaneous Utilities -# -# CONFIG_ADJTIMEX is not set -# CONFIG_CROND is not set -# CONFIG_CRONTAB is not set -CONFIG_DC=y -# CONFIG_DEVFSD is not set -# CONFIG_LAST is not set -# CONFIG_HDPARM is not set -CONFIG_MAKEDEVS=y -# CONFIG_MT is not set -# CONFIG_RX is not set -CONFIG_STRINGS=y -# CONFIG_TIME is not set -# CONFIG_WATCHDOG is not set - -# -# Linux Module Utilities -# -# CONFIG_INSMOD is not set -# CONFIG_LSMOD is not set -# CONFIG_MODPROBE is not set -# CONFIG_RMMOD is not set - -# -# Networking Utilities -# -CONFIG_FEATURE_IPV6=y -# CONFIG_ARPING is not set -# CONFIG_FTPGET is not set -# CONFIG_FTPPUT is not set -CONFIG_HOSTNAME=y -# CONFIG_HTTPD 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 is not set -# CONFIG_INETD 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_IPCALC is not set -# 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=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 is not set -CONFIG_FEATURE_TELNET_AUTOLOGIN=y -# CONFIG_TELNETD is not set -# CONFIG_TFTP is not set -CONFIG_TRACEROUTE=y -# CONFIG_FEATURE_TRACEROUTE_VERBOSE 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 - -# -# udhcp Server/Client -# -# CONFIG_UDHCPD is not set -CONFIG_UDHCPC=y -CONFIG_FEATURE_UDHCP_SYSLOG=y -# CONFIG_FEATURE_UDHCP_DEBUG is not set - -# -# Process Utilities -# -CONFIG_FREE=y -CONFIG_KILL=y -CONFIG_KILLALL=y -CONFIG_PIDOF=y -CONFIG_PS=y -CONFIG_RENICE=y -CONFIG_TOP=y -FEATURE_CPU_USAGE_PERCENTAGE=y -CONFIG_UPTIME=y -# CONFIG_SYSCTL is not set - -# -# Another Bourne-like Shell -# -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_ALIAS=y -CONFIG_ASH_MATH_SUPPORT=y -# CONFIG_ASH_MATH_SUPPORT_64 is not set -CONFIG_ASH_GETOPTS=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_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_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 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 - -# -# Linux System Utilities -# -CONFIG_DMESG=y -CONFIG_FBSET=y -CONFIG_FEATURE_FBSET_FANCY=y -# CONFIG_FEATURE_FBSET_READMODE is not set -# 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_LONGOPTIONS=y -# CONFIG_LOSETUP is not set -CONFIG_MKSWAP=y -CONFIG_MORE=y -CONFIG_FEATURE_USE_TERMIOS=y -CONFIG_PIVOT_ROOT=y -# CONFIG_RDATE is not set -CONFIG_SWAPONOFF=y -CONFIG_MOUNT=y -CONFIG_NFSMOUNT=y -CONFIG_UMOUNT=y -CONFIG_FEATURE_MOUNT_FORCE=y - -# -# Common options for mount/umount -# -# CONFIG_FEATURE_MOUNT_LOOP is not set -# CONFIG_FEATURE_MTAB_SUPPORT is not set - -# -# Debugging Options -# -# CONFIG_DEBUG is not set diff --git a/packages/busybox/busybox-1.00/start-stop-daemon-oknodo-support.patch b/packages/busybox/busybox-1.00/start-stop-daemon-oknodo-support.patch deleted file mode 100644 index 1b8debb021..0000000000 --- a/packages/busybox/busybox-1.00/start-stop-daemon-oknodo-support.patch +++ /dev/null @@ -1,73 +0,0 @@ ---- busybox-1.00/debianutils/start_stop_daemon.c.orig 2006-07-23 00:06:14.000000000 +0200 -+++ busybox-1.00/debianutils/start_stop_daemon.c 2006-07-23 00:21:39.000000000 +0200 -@@ -160,7 +160,7 @@ - } - - --static void -+static int - do_stop(void) - { - char what[1024]; -@@ -183,7 +183,7 @@ - if (!found) { - if (!quiet) - printf("no %s found; none killed.\n", what); -- return; -+ return -1; - } - for (p = found; p; p = p->next) { - if (kill(p->pid, signal_nr) == 0) { -@@ -200,6 +200,7 @@ - printf(" %d", -p->pid); - printf(").\n"); - } -+ return killed; - } - - -@@ -209,6 +210,7 @@ - { "background", 0, NULL, 'b' }, - { "quiet", 0, NULL, 'q' }, - { "make-pidfile", 0, NULL, 'm' }, -+ { "oknodo", 0, NULL, 'o' }, - { "startas", 1, NULL, 'a' }, - { "name", 1, NULL, 'n' }, - { "signal", 1, NULL, 's' }, -@@ -223,6 +225,7 @@ - #define SSD_OPT_BACKGROUND 4 - #define SSD_OPT_QUIET 8 - #define SSD_OPT_MAKEPID 16 -+#define SSD_OPT_OKNODO 32 - - int - start_stop_daemon_main(int argc, char **argv) -@@ -234,7 +237,7 @@ - bb_applet_long_options = ssd_long_options; - - bb_opt_complementaly = "K~S:S~K"; -- opt = bb_getopt_ulflags(argc, argv, "KSbqma:n:s:u:x:p:", -+ opt = bb_getopt_ulflags(argc, argv, "KSbqmoa:n:s:u:x:p:", - &startas, &cmdname, &signame, &userspec, &execname, &pidfile); - - /* Check one and only one context option was given */ -@@ -265,8 +268,8 @@ - user_id = my_getpwnam(userspec); - - if (opt & SSD_CTX_STOP) { -- do_stop(); -- return EXIT_SUCCESS; -+ int i = do_stop(); -+ return (opt & SSD_OPT_OKNODO) ? 0 : (i <= 0); - } - - do_procinit(); -@@ -274,7 +277,7 @@ - if (found) { - if (!quiet) - printf("%s already running.\n%d\n", execname ,found->pid); -- return EXIT_SUCCESS; -+ return (opt & SSD_OPT_OKNODO) ? EXIT_SUCCESS : EXIT_FAILURE; - } - *--argv = startas; - if (opt & SSD_OPT_BACKGROUND) { diff --git a/packages/busybox/busybox-1.00/uclibc_posix.patch b/packages/busybox/busybox-1.00/uclibc_posix.patch deleted file mode 100644 index aefb994068..0000000000 --- a/packages/busybox/busybox-1.00/uclibc_posix.patch +++ /dev/null @@ -1,20 +0,0 @@ -see http://www.busybox.net/lists/busybox/2004-December/013276.html - ---- busybox-old/libbb/loop.c 2004-08-16 04:36:28.000000000 -0400 -+++ busybox/libbb/loop.c 2004-12-04 23:45:58.000000000 -0500 -@@ -19,6 +19,7 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -+#include <asm/posix_types.h> - #include <stdio.h> - #include <errno.h> - #include <fcntl.h> -@@ -30,7 +31,6 @@ - /* Grumble... The 2.6.x kernel breaks asm/posix_types.h - * so we get to try and cope as best we can... */ - #include <linux/version.h> --#include <asm/posix_types.h> - - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) - #define __bb_kernel_dev_t __kernel_old_dev_t diff --git a/packages/busybox/busybox-1.00/udhcppidfile-breakage.patch b/packages/busybox/busybox-1.00/udhcppidfile-breakage.patch deleted file mode 100644 index 031274908b..0000000000 --- a/packages/busybox/busybox-1.00/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-1.00/udhcppidfile.patch b/packages/busybox/busybox-1.00/udhcppidfile.patch deleted file mode 100644 index fb2b2ec19a..0000000000 --- a/packages/busybox/busybox-1.00/udhcppidfile.patch +++ /dev/null @@ -1,276 +0,0 @@ ---- busybox-1.00/networking/udhcp/pidfile.h-dist 2004-04-15 03:51:26.000000000 +1000 -+++ busybox-1.00/networking/udhcp/pidfile.h 2004-10-27 15:46:38.000000000 +1000 -@@ -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); - ---- busybox-1.00/networking/udhcp/pidfile.c-dist 2004-04-15 03:51:25.000000000 +1000 -+++ busybox-1.00/networking/udhcp/pidfile.c 2004-10-27 19:43:40.000000000 +1000 -@@ -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); -+} ---- busybox-1.00/networking/udhcp/common.c-dist 2004-05-19 19:18:04.000000000 +1000 -+++ busybox-1.00/networking/udhcp/common.c 2004-10-27 19:58:10.000000000 +1000 -@@ -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); ---- busybox-1.00/networking/udhcp/common.h-dist 2004-05-19 18:29:05.000000000 +1000 -+++ busybox-1.00/networking/udhcp/common.h 2004-10-27 15:10:16.000000000 +1000 -@@ -42,7 +42,6 @@ - long uptime(void); - void background(const char *pidfile); - void start_log_and_pid(const char *client_server, const char *pidfile); --void background(const char *pidfile); - void udhcp_logging(int level, const char *fmt, ...); - - #define LOG(level, str, args...) udhcp_logging(level, str, ## args) ---- busybox-1.00/networking/udhcp/script.c-dist 2004-05-19 17:45:47.000000000 +1000 -+++ busybox-1.00/networking/udhcp/script.c 2004-10-27 15:54:04.000000000 +1000 -@@ -228,6 +228,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-1.00/udhcpscript.patch b/packages/busybox/busybox-1.00/udhcpscript.patch deleted file mode 100644 index fc21d440cd..0000000000 --- a/packages/busybox/busybox-1.00/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-1.00/unzip-endian-fixes.patch b/packages/busybox/busybox-1.00/unzip-endian-fixes.patch deleted file mode 100644 index 56af433c30..0000000000 --- a/packages/busybox/busybox-1.00/unzip-endian-fixes.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- archival/unzip.c.orig 2005-03-17 18:42:45.000000000 -0500 -+++ archival/unzip.c 2005-03-17 17:46:45.000000000 -0500 -@@ -46,10 +46,28 @@ - #include "unarchive.h" - #include "busybox.h" - --#define ZIP_FILEHEADER_MAGIC 0x04034b50 --#define ZIP_CDS_MAGIC 0x02014b50 --#define ZIP_CDS_END_MAGIC 0x06054b50 --#define ZIP_DD_MAGIC 0x08074b50 -+#if (BYTE_ORDER == BIG_ENDIAN) -+static inline unsigned short -+__swap16(unsigned short x) { -+ return (((uint16_t)(x) & 0xFF) << 8) | (((uint16_t)(x) & 0xFF00) >> 8); -+} -+ -+static inline uint32_t -+__swap32(uint32_t x) { -+ return (((x & 0xFF) << 24) | -+ ((x & 0xFF00) << 8) | -+ ((x & 0xFF0000) >> 8) | -+ ((x & 0xFF000000) >> 24)); -+} -+#else -+#define __swap16(x) (x) -+#define __swap32(x) (x) -+#endif -+ -+#define ZIP_FILEHEADER_MAGIC __swap32(0x04034b50) -+#define ZIP_CDS_MAGIC __swap32(0x02014b50) -+#define ZIP_CDS_END_MAGIC __swap32(0x06054b50) -+#define ZIP_DD_MAGIC __swap32(0x08074b50) - - extern unsigned int gunzip_crc; - extern unsigned int gunzip_bytes_out; -@@ -249,6 +267,18 @@ - - /* Read the file header */ - unzip_read(src_fd, zip_header.raw, 26); -+#if (BYTE_ORDER == BIG_ENDIAN) -+ zip_header.formated.version = __swap16(zip_header.formated.version); -+ zip_header.formated.flags = __swap16(zip_header.formated.flags); -+ zip_header.formated.method = __swap16(zip_header.formated.method); -+ zip_header.formated.modtime = __swap16(zip_header.formated.modtime); -+ zip_header.formated.moddate = __swap16(zip_header.formated.moddate); -+ zip_header.formated.crc32 = __swap32(zip_header.formated.crc32); -+ zip_header.formated.cmpsize = __swap32(zip_header.formated.cmpsize); -+ zip_header.formated.ucmpsize = __swap32(zip_header.formated.ucmpsize); -+ zip_header.formated.filename_len = __swap16(zip_header.formated.filename_len); -+ zip_header.formated.extra_len = __swap16(zip_header.formated.extra_len); -+#endif - if ((zip_header.formated.method != 0) && (zip_header.formated.method != 8)) { - bb_error_msg_and_die("Unsupported compression method %d", zip_header.formated.method); - } diff --git a/packages/busybox/busybox-1.00/unzip-enhancement-and-fixes.patch b/packages/busybox/busybox-1.00/unzip-enhancement-and-fixes.patch deleted file mode 100644 index 49542cab1d..0000000000 --- a/packages/busybox/busybox-1.00/unzip-enhancement-and-fixes.patch +++ /dev/null @@ -1,878 +0,0 @@ - -Index: archival/unzip.c -=================================================================== -RCS file: /var/cvs/busybox/archival/unzip.c,v -retrieving revision 1.8 -diff -u -r1.8 unzip.c ---- archival/unzip.c 6 Jun 2004 10:22:43 -0000 1.8 -+++ archival/unzip.c 18 Oct 2004 01:32:25 -0000 -@@ -2,7 +2,10 @@ - /* - * Mini unzip implementation for busybox - * -- * Copyright (C) 2001 by Laurence Anderson -+ * Copyright (C) 2004 by Ed Clark -+ * -+ * Loosely based on original busybox unzip applet by Laurence Anderson. -+ * All options and features should work in this version. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -21,17 +24,25 @@ - */ - - /* For reference see -- * http://www.pkware.com/products/enterprise/white_papers/appnote.txt -+ * http://www.pkware.com/company/standards/appnote/ - * http://www.info-zip.org/pub/infozip/doc/appnote-iz-latest.zip - */ - --/* TODO Endian issues, exclude, should we accept input from stdin ? */ -+/* TODO -+ * Endian issues -+ * Zip64 + other methods -+ * Improve handling of zip format, ie. -+ * - deferred CRC, comp. & uncomp. lengths (zip header flags bit 3) -+ * - unix file permissions, etc. -+ * - central directory -+ */ - - #include <fcntl.h> - #include <getopt.h> - #include <stdlib.h> - #include <string.h> - #include <unistd.h> -+#include <errno.h> - #include "unarchive.h" - #include "busybox.h" - -@@ -43,205 +54,353 @@ - extern unsigned int gunzip_crc; - extern unsigned int gunzip_bytes_out; - --static void header_list_unzip(const file_header_t *file_header) -+typedef union { -+ unsigned char raw[26]; -+ struct { -+ unsigned short version; /* 0-1 */ -+ unsigned short flags; /* 2-3 */ -+ unsigned short method; /* 4-5 */ -+ unsigned short modtime; /* 6-7 */ -+ unsigned short moddate; /* 8-9 */ -+ unsigned int crc32 __attribute__ ((packed)); /* 10-13 */ -+ unsigned int cmpsize __attribute__ ((packed)); /* 14-17 */ -+ unsigned int ucmpsize __attribute__ ((packed)); /* 18-21 */ -+ unsigned short filename_len; /* 22-23 */ -+ unsigned short extra_len; /* 24-25 */ -+ } formated __attribute__ ((packed)); -+} zip_header_t; -+ -+static void unzip_skip(int fd, off_t skip) - { -- printf(" inflating: %s\n", file_header->name); -+ if (lseek(fd, skip, SEEK_CUR) == (off_t)-1) { -+ if ((errno != ESPIPE) || (bb_copyfd_size(fd, -1, skip) != skip)) { -+ bb_error_msg_and_die("Seek failure"); -+ } -+ } - } - --static void header_verbose_list_unzip(const file_header_t *file_header) -+static void unzip_read(int fd, void *buf, size_t count) - { -- unsigned int dostime = (unsigned int) file_header->mtime; -+ if (bb_xread(fd, buf, count) != count) { -+ bb_error_msg_and_die("Read failure"); -+ } -+} - -- /* can printf arguments cut of the decade component ? */ -- unsigned short year = 1980 + ((dostime & 0xfe000000) >> 25); -- while (year >= 100) { -- year -= 100; -- } -- -- printf("%9u %02u-%02u-%02u %02u:%02u %s\n", -- (unsigned int) file_header->size, -- (dostime & 0x01e00000) >> 21, -- (dostime & 0x001f0000) >> 16, -- year, -- (dostime & 0x0000f800) >> 11, -- (dostime & 0x000007e0) >> 5, -- file_header->name); -+static void unzip_create_leading_dirs(char *fn) -+{ -+ /* Create all leading directories */ -+ char *name = bb_xstrdup(fn); -+ if (bb_make_directory(dirname(name), 0777, FILEUTILS_RECUR)) { -+ bb_error_msg_and_die("Failed to create directory"); -+ } -+ free(name); - } - --extern int unzip_main(int argc, char **argv) -+static void unzip_extract(zip_header_t *zip_header, int src_fd, int dst_fd) - { -- union { -- unsigned char raw[26]; -- struct { -- unsigned short version; /* 0-1 */ -- unsigned short flags; /* 2-3 */ -- unsigned short method; /* 4-5 */ -- unsigned short modtime; /* 6-7 */ -- unsigned short moddate; /* 8-9 */ -- unsigned int crc32 __attribute__ ((packed)); /* 10-13 */ -- unsigned int cmpsize __attribute__ ((packed));; /* 14-17 */ -- unsigned int ucmpsize __attribute__ ((packed));; /* 18-21 */ -- unsigned short filename_len; /* 22-23 */ -- unsigned short extra_len; /* 24-25 */ -- } formated __attribute__ ((packed)); -- } zip_header; -+ if (zip_header->formated.method == 0) { -+ /* Method 0 - stored (not compressed) */ -+ int size = zip_header->formated.ucmpsize; -+ if (size && (bb_copyfd_size(src_fd, dst_fd, size) != size)) { -+ bb_error_msg_and_die("Cannot complete extraction"); -+ } -+ -+ } else { -+ /* Method 8 - inflate */ -+ inflate_init(zip_header->formated.cmpsize); -+ inflate_unzip(src_fd, dst_fd); -+ inflate_cleanup(); -+ /* Validate decompression - crc */ -+ if (zip_header->formated.crc32 != (gunzip_crc ^ 0xffffffffL)) { -+ bb_error_msg("Invalid compressed data--crc error"); -+ } -+ /* Validate decompression - size */ -+ if (zip_header->formated.ucmpsize != gunzip_bytes_out) { -+ bb_error_msg("Invalid compressed data--length error"); -+ } -+ } -+} - -- archive_handle_t *archive_handle; -+extern int unzip_main(int argc, char **argv) -+{ -+ zip_header_t zip_header; -+ enum {v_silent, v_normal, v_list} verbosity = v_normal; -+ enum {o_prompt, o_never, o_always} overwrite = o_prompt; - unsigned int total_size = 0; - unsigned int total_entries = 0; -+ int src_fd = -1, dst_fd = -1; -+ char *src_fn = NULL, *dst_fn = NULL; -+ llist_t *accept = NULL; -+ llist_t *reject = NULL; - char *base_dir = NULL; -- int opt = 0; -- -- /* Initialise */ -- archive_handle = init_handle(); -- archive_handle->action_data = NULL; -- archive_handle->action_header = header_list_unzip; -- -- while ((opt = getopt(argc, argv, "lnopqd:")) != -1) { -- switch (opt) { -- case 'l': /* list */ -- archive_handle->action_header = header_verbose_list_unzip; -- archive_handle->action_data = data_skip; -- break; -- case 'n': /* never overwright existing files */ -+ int i, opt, opt_range = 0, list_header_done = 0; -+ char key_buf[512]; -+ struct stat stat_buf; -+ -+ while((opt = getopt(argc, argv, "-d:lnopqx")) != -1) { -+ switch(opt_range) { -+ case 0: /* Options */ -+ switch(opt) { -+ case 'l': /* List */ -+ verbosity = v_list; - break; -- case 'o': -- archive_handle->flags = ARCHIVE_EXTRACT_UNCONDITIONAL; -+ -+ case 'n': /* Never overwrite existing files */ -+ overwrite = o_never; - break; -- case 'p': /* extract files to stdout */ -- archive_handle->action_data = data_extract_to_stdout; -+ -+ case 'o': /* Always overwrite existing files */ -+ overwrite = o_always; - break; -- case 'q': /* Extract files quietly */ -- archive_handle->action_header = header_skip; -+ -+ case 'p': /* Extract files to stdout and fall through to set verbosity */ -+ dst_fd = STDOUT_FILENO; -+ -+ case 'q': /* Be quiet */ -+ verbosity = (verbosity == v_normal) ? v_silent : verbosity; - break; -- case 'd': /* Extract files to specified base directory*/ -- base_dir = optarg; -- break; --#if 0 -- case 'x': /* Exclude the specified files */ -- archive_handle->filter = filter_accept_reject_list; -+ -+ case 1 : /* The zip file */ -+ src_fn = bb_xstrndup(optarg, strlen(optarg)+4); -+ opt_range++; - break; --#endif -+ - default: - bb_show_usage(); -+ -+ } -+ break; -+ -+ case 1: /* Include files */ -+ if (opt == 1) { -+ accept = llist_add_to(accept, optarg); -+ -+ } else if (opt == 'd') { -+ base_dir = optarg; -+ opt_range += 2; -+ -+ } else if (opt == 'x') { -+ opt_range++; -+ -+ } else { -+ bb_show_usage(); -+ } -+ break; -+ -+ case 2 : /* Exclude files */ -+ if (opt == 1) { -+ reject = llist_add_to(reject, optarg); -+ -+ } else if (opt == 'd') { /* Extract to base directory */ -+ base_dir = optarg; -+ opt_range++; -+ -+ } else { -+ bb_show_usage(); -+ } -+ break; -+ -+ default: -+ bb_show_usage(); - } - } -- -- if (argc == optind) { -+ -+ if (src_fn == NULL) { - bb_show_usage(); - } - -- printf("Archive: %s\n", argv[optind]); -- if (archive_handle->action_header == header_verbose_list_unzip) { -- printf(" Length Date Time Name\n"); -- printf(" -------- ---- ---- ----\n"); -- } -- -- if (*argv[optind] == '-') { -- archive_handle->src_fd = STDIN_FILENO; -- archive_handle->seek = seek_by_char; -+ /* Open input file */ -+ if (strcmp("-", src_fn) == 0) { -+ src_fd = STDIN_FILENO; -+ /* Cannot use prompt mode since zip data is arriving on STDIN */ -+ overwrite = (overwrite == o_prompt) ? o_never : overwrite; -+ - } else { -- archive_handle->src_fd = bb_xopen(argv[optind++], O_RDONLY); -+ char *extn[] = {"", ".zip", ".ZIP"}; -+ int orig_src_fn_len = strlen(src_fn); -+ for(i = 0; (i < 3) && (src_fd == -1); i++) { -+ strcpy(src_fn + orig_src_fn_len, extn[i]); -+ src_fd = open(src_fn, O_RDONLY); -+ } -+ if (src_fd == -1) { -+ src_fn[orig_src_fn_len] = 0; -+ bb_error_msg_and_die("Cannot open %s, %s.zip, %s.ZIP", src_fn, src_fn, src_fn); -+ } - } - -- if ((base_dir) && (chdir(base_dir))) { -- bb_perror_msg_and_die("Couldnt chdir"); -+ /* Change dir if necessary */ -+ if (base_dir && chdir(base_dir)) { -+ bb_perror_msg_and_die("Cannot chdir"); - } - -- while (optind < argc) { -- archive_handle->filter = filter_accept_list; -- archive_handle->accept = llist_add_to(archive_handle->accept, argv[optind]); -- optind++; -- } -+ if (verbosity != v_silent) -+ printf("Archive: %s\n", src_fn); - - while (1) { - unsigned int magic; -- int dst_fd; -- -- /* TODO Endian issues */ -- archive_xread_all(archive_handle, &magic, 4); -- archive_handle->offset += 4; - -+ /* Check magic number */ -+ unzip_read(src_fd, &magic, 4); - if (magic == ZIP_CDS_MAGIC) { - break; -+ } else if (magic != ZIP_FILEHEADER_MAGIC) { -+ bb_error_msg_and_die("Invalid zip magic %08X", magic); - } -- else if (magic != ZIP_FILEHEADER_MAGIC) { -- bb_error_msg_and_die("Invlaide zip magic"); -- } -- -+ - /* Read the file header */ -- archive_xread_all(archive_handle, zip_header.raw, 26); -- archive_handle->offset += 26; -- archive_handle->file_header->mode = S_IFREG | 0777; -- -- if (zip_header.formated.method != 8) { -- bb_error_msg_and_die("Unsupported compression method %d\n", zip_header.formated.method); -+ unzip_read(src_fd, zip_header.raw, 26); -+ if ((zip_header.formated.method != 0) && (zip_header.formated.method != 8)) { -+ bb_error_msg_and_die("Unsupported compression method %d", zip_header.formated.method); - } - - /* Read filename */ -- archive_handle->file_header->name = xmalloc(zip_header.formated.filename_len + 1); -- archive_xread_all(archive_handle, archive_handle->file_header->name, zip_header.formated.filename_len); -- archive_handle->offset += zip_header.formated.filename_len; -- archive_handle->file_header->name[zip_header.formated.filename_len] = '\0'; -- -- /* Skip extra header bits */ -- archive_handle->file_header->size = zip_header.formated.extra_len; -- data_skip(archive_handle); -- archive_handle->offset += zip_header.formated.extra_len; -- -- /* Handle directories */ -- archive_handle->file_header->mode = S_IFREG | 0777; -- if (last_char_is(archive_handle->file_header->name, '/')) { -- archive_handle->file_header->mode ^= S_IFREG; -- archive_handle->file_header->mode |= S_IFDIR; -- } -- -- /* Data section */ -- archive_handle->file_header->size = zip_header.formated.cmpsize; -- if (archive_handle->action_data) { -- archive_handle->action_data(archive_handle); -- } else { -- dst_fd = bb_xopen(archive_handle->file_header->name, O_WRONLY | O_CREAT); -- inflate_init(zip_header.formated.cmpsize); -- inflate_unzip(archive_handle->src_fd, dst_fd); -- close(dst_fd); -- chmod(archive_handle->file_header->name, archive_handle->file_header->mode); -- -- /* Validate decompression - crc */ -- if (zip_header.formated.crc32 != (gunzip_crc ^ 0xffffffffL)) { -- bb_error_msg("Invalid compressed data--crc error"); -- } -- -- /* Validate decompression - size */ -- if (gunzip_bytes_out != zip_header.formated.ucmpsize) { -- bb_error_msg("Invalid compressed data--length error"); -- } -+ free(dst_fn); -+ dst_fn = xmalloc(zip_header.formated.filename_len + 1); -+ unzip_read(src_fd, dst_fn, zip_header.formated.filename_len); -+ dst_fn[zip_header.formated.filename_len] = 0; -+ -+ /* Skip extra header bytes */ -+ unzip_skip(src_fd, zip_header.formated.extra_len); -+ -+ if ((verbosity == v_list) && !list_header_done){ -+ printf(" Length Date Time Name\n"); -+ printf(" -------- ---- ---- ----\n"); -+ list_header_done = 1; - } - -- /* local file descriptor section */ -- archive_handle->offset += zip_header.formated.cmpsize; -- /* This ISNT unix time */ -- archive_handle->file_header->mtime = zip_header.formated.modtime | (zip_header.formated.moddate << 16); -- archive_handle->file_header->size = zip_header.formated.ucmpsize; -- total_size += archive_handle->file_header->size; -- total_entries++; -+ /* Filter zip entries */ -+ if (find_list_entry(reject, dst_fn) || -+ (accept && !find_list_entry(accept, dst_fn))) { /* Skip entry */ -+ i = 'n'; -+ -+ } else { /* Extract entry */ -+ total_size += zip_header.formated.ucmpsize; -+ -+ if (verbosity == v_list) { /* List entry */ -+ unsigned int dostime = zip_header.formated.modtime | (zip_header.formated.moddate << 16); -+ printf("%9u %02u-%02u-%02u %02u:%02u %s\n", -+ zip_header.formated.ucmpsize, -+ (dostime & 0x01e00000) >> 21, -+ (dostime & 0x001f0000) >> 16, -+ (((dostime & 0xfe000000) >> 25) + 1980) % 100, -+ (dostime & 0x0000f800) >> 11, -+ (dostime & 0x000007e0) >> 5, -+ dst_fn); -+ total_entries++; -+ i = 'n'; -+ -+ } else if (dst_fd == STDOUT_FILENO) { /* Extracting to STDOUT */ -+ i = -1; -+ -+ } else if (last_char_is(dst_fn, '/')) { /* Extract directory */ -+ if (stat(dst_fn, &stat_buf) == -1) { -+ if (errno != ENOENT) { -+ bb_perror_msg_and_die("Cannot stat '%s'",dst_fn); -+ } -+ if (verbosity == v_normal) { -+ printf(" creating: %s\n", dst_fn); -+ } -+ unzip_create_leading_dirs(dst_fn); -+ if (bb_make_directory(dst_fn, 0777, 0)) { -+ bb_error_msg_and_die("Failed to create directory"); -+ } -+ } else { -+ if (!S_ISDIR(stat_buf.st_mode)) { -+ bb_error_msg_and_die("'%s' exists but is not directory", dst_fn); -+ } -+ } -+ i = 'n'; -+ -+ } else { /* Extract file */ -+ _check_file: -+ if (stat(dst_fn, &stat_buf) == -1) { /* File does not exist */ -+ if (errno != ENOENT) { -+ bb_perror_msg_and_die("Cannot stat '%s'",dst_fn); -+ } -+ i = 'y'; -+ -+ } else { /* File already exists */ -+ if (overwrite == o_never) { -+ i = 'n'; -+ -+ } else if (S_ISREG(stat_buf.st_mode)) { /* File is regular file */ -+ if (overwrite == o_always) { -+ i = 'y'; -+ } else { -+ printf("replace %s? [y]es, [n]o, [A]ll, [N]one, [r]ename: ", dst_fn); -+ if (!fgets(key_buf, 512, stdin)) { -+ bb_perror_msg_and_die("Cannot read input"); -+ } -+ i = key_buf[0]; -+ } -+ -+ } else { /* File is not regular file */ -+ bb_error_msg_and_die("'%s' exists but is not regular file",dst_fn); -+ } -+ } -+ } -+ } - -- archive_handle->action_header(archive_handle->file_header); -+ switch (i) { -+ case 'A': -+ overwrite = o_always; -+ case 'y': /* Open file and fall into unzip */ -+ unzip_create_leading_dirs(dst_fn); -+ dst_fd = bb_xopen(dst_fn, O_WRONLY | O_CREAT); -+ case -1: /* Unzip */ -+ if (verbosity == v_normal) { -+ printf(" inflating: %s\n", dst_fn); -+ } -+ unzip_extract(&zip_header, src_fd, dst_fd); -+ if (dst_fd != STDOUT_FILENO) { -+ /* closing STDOUT is potentially bad for future business */ -+ close(dst_fd); -+ } -+ break; - -+ case 'N': -+ overwrite = o_never; -+ case 'n': -+ /* Skip entry data */ -+ unzip_skip(src_fd, zip_header.formated.cmpsize); -+ break; -+ -+ case 'r': -+ /* Prompt for new name */ -+ printf("new name: "); -+ if (!fgets(key_buf, 512, stdin)) { -+ bb_perror_msg_and_die("Cannot read input"); -+ } -+ free(dst_fn); -+ dst_fn = bb_xstrdup(key_buf); -+ chomp(dst_fn); -+ goto _check_file; -+ -+ default: -+ printf("error: invalid response [%c]\n",(char)i); -+ goto _check_file; -+ } -+ - /* Data descriptor section */ - if (zip_header.formated.flags & 4) { - /* skip over duplicate crc, compressed size and uncompressed size */ -- unsigned char data_description[12]; -- archive_xread_all(archive_handle, data_description, 12); -- archive_handle->offset += 12; -+ unzip_skip(src_fd, 12); - } - } -- /* Central directory section */ - -- if (archive_handle->action_header == header_verbose_list_unzip) { -+ if (verbosity == v_list) { - printf(" -------- -------\n"); - printf("%9d %d files\n", total_size, total_entries); - } -- -+ - return(EXIT_SUCCESS); - } -+ -+/* END CODE */ -+/* -+Local Variables: -+c-file-style: "linux" -+c-basic-offset: 4 -+tab-width: 4 -+End: -+*/ -Index: archival/libunarchive/decompress_unzip.c -=================================================================== -RCS file: /var/cvs/busybox/archival/libunarchive/decompress_unzip.c,v -retrieving revision 1.35 -diff -u -r1.35 decompress_unzip.c ---- archival/libunarchive/decompress_unzip.c 25 Apr 2004 05:11:13 -0000 1.35 -+++ archival/libunarchive/decompress_unzip.c 18 Oct 2004 01:32:29 -0000 -@@ -16,6 +16,11 @@ - * - * read_gz interface + associated hacking by Laurence Anderson - * -+ * Fixed huft_build() so decoding end-of-block code does not grab more bits -+ * than necessary (this is required by unzip applet), added inflate_cleanup() -+ * to free leaked bytebuffer memory (used in unzip.c), and some minor style -+ * guide cleanups by Ed Clark -+ * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or -@@ -116,26 +121,26 @@ - /* Copy lengths for literal codes 257..285 */ - static const unsigned short cplens[] = { - 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, 35, 43, 51, 59, -- 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0 -+ 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0 - }; - - /* note: see note #13 above about the 258 in this list. */ - /* Extra bits for literal codes 257..285 */ - static const unsigned char cplext[] = { - 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, -- 5, 5, 5, 0, 99, 99 -+ 5, 5, 5, 0, 99, 99 - }; /* 99==invalid */ - - /* Copy offsets for distance codes 0..29 */ - static const unsigned short cpdist[] = { - 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, 257, 385, 513, -- 769, 1025, 1537, 2049, 3073, 4097, 6145, 8193, 12289, 16385, 24577 -+ 769, 1025, 1537, 2049, 3073, 4097, 6145, 8193, 12289, 16385, 24577 - }; - - /* Extra bits for distance codes */ - static const unsigned char cpdext[] = { - 0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, -- 11, 11, 12, 12, 13, 13 -+ 11, 11, 12, 12, 13, 13 - }; - - /* Tables for deflate from PKZIP's appnote.txt. */ -@@ -184,8 +189,8 @@ - table_entry = (table_entry >> 1) ^ poly; - } else { - table_entry >>= 1; -- } -- } -+ } -+ } - gunzip_crc_table[i] = table_entry; - } - } -@@ -225,70 +230,59 @@ - * t: result: starting table - * m: maximum lookup bits, returns actual - */ --static int huft_build(unsigned int *b, const unsigned int n, -- const unsigned int s, const unsigned short *d, -- const unsigned char *e, huft_t ** t, int *m) -+int huft_build(unsigned int *b, const unsigned int n, -+ const unsigned int s, const unsigned short *d, -+ const unsigned char *e, huft_t ** t, int *m) - { -- unsigned a; /* counter for codes of length k */ -+ unsigned a; /* counter for codes of length k */ - unsigned c[BMAX + 1]; /* bit length count table */ -- unsigned f; /* i repeats in table every f entries */ -- int g; /* maximum code length */ -- int h; /* table level */ -+ unsigned eob_len; /* length of end-of-block code (value 256) */ -+ unsigned f; /* i repeats in table every f entries */ -+ int g; /* maximum code length */ -+ int h; /* table level */ - register unsigned i; /* counter, current code */ - register unsigned j; /* counter */ -- register int k; /* number of bits in current code */ -- int l; /* bits per table (returned in m) */ -+ register int k; /* number of bits in current code */ - register unsigned *p; /* pointer into c[], b[], or v[] */ -- register huft_t *q; /* points to current table */ -- huft_t r; /* table entry for structure assignment */ -- huft_t *u[BMAX]; /* table stack */ -- unsigned v[N_MAX]; /* values in order of bit length */ -- register int w; /* bits before this table == (l * h) */ -+ register huft_t *q; /* points to current table */ -+ huft_t r; /* table entry for structure assignment */ -+ huft_t *u[BMAX]; /* table stack */ -+ unsigned v[N_MAX]; /* values in order of bit length */ -+ int ws[BMAX+1]; /* bits decoded stack */ -+ register int w; /* bits decoded */ - unsigned x[BMAX + 1]; /* bit offsets, then code stack */ -- unsigned *xp; /* pointer into x */ -- int y; /* number of dummy codes added */ -- unsigned z; /* number of entries in current table */ -+ unsigned *xp; /* pointer into x */ -+ int y; /* number of dummy codes added */ -+ unsigned z; /* number of entries in current table */ -+ -+ /* Length of EOB code, if any */ -+ eob_len = n > 256 ? b[256] : BMAX; - - /* Generate counts for each bit length */ -- memset((void *) (c), 0, sizeof(c)); -+ memset((void *)c, 0, sizeof(c)); - p = b; - i = n; - do { -- c[*p]++; /* assume all entries <= BMAX */ -- p++; /* Can't combine with above line (Solaris bug) */ -+ c[*p]++; /* assume all entries <= BMAX */ -+ p++; /* Can't combine with above line (Solaris bug) */ - } while (--i); -- if (c[0] == n) { /* null input--all zero length codes */ -+ if (c[0] == n) { /* null input--all zero length codes */ - *t = (huft_t *) NULL; - *m = 0; - return 0; - } - - /* Find minimum and maximum length, bound *m by those */ -- l = *m; -- for (j = 1; j <= BMAX; j++) { -- if (c[j]) { -- break; -- } -- } -- k = j; /* minimum code length */ -- if ((unsigned) l < j) { -- l = j; -- } -- for (i = BMAX; i; i--) { -- if (c[i]) { -- break; -- } -- } -- g = i; /* maximum code length */ -- if ((unsigned) l > i) { -- l = i; -- } -- *m = l; -+ for (j = 1; (c[j] == 0) && (j <= BMAX); j++); -+ k = j; /* minimum code length */ -+ for (i = BMAX; (c[i] == 0) && i; i--); -+ g = i; /* maximum code length */ -+ *m = (*m < j) ? j : ((*m > i) ? i : *m); - - /* Adjust last length count to fill out codes, if needed */ - for (y = 1 << j; j < i; j++, y <<= 1) { - if ((y -= c[j]) < 0) { -- return 2; /* bad input: more codes than bits */ -+ return 2; /* bad input: more codes than bits */ - } - } - if ((y -= c[i]) < 0) { -@@ -300,7 +294,7 @@ - x[1] = j = 0; - p = c + 1; - xp = x + 2; -- while (--i) { /* note that i == g from above */ -+ while (--i) { /* note that i == g from above */ - *xp++ = (j += *p++); - } - -@@ -314,13 +308,13 @@ - } while (++i < n); - - /* Generate the Huffman codes and for each, make the table entries */ -- x[0] = i = 0; /* first Huffman code is zero */ -- p = v; /* grab values in bit order */ -- h = -1; /* no tables yet--level -1 */ -- w = -l; /* bits decoded == (l * h) */ -+ x[0] = i = 0; /* first Huffman code is zero */ -+ p = v; /* grab values in bit order */ -+ h = -1; /* no tables yet--level -1 */ -+ w = ws[0] = 0; /* bits decoded */ - u[0] = (huft_t *) NULL; /* just to keep compilers happy */ - q = (huft_t *) NULL; /* ditto */ -- z = 0; /* ditto */ -+ z = 0; /* ditto */ - - /* go through the bit lengths (k already is bits in shortest code) */ - for (; k <= g; k++) { -@@ -328,52 +322,52 @@ - while (a--) { - /* here i is the Huffman code of length k bits for value *p */ - /* make tables up to required level */ -- while (k > w + l) { -- h++; -- w += l; /* previous table always l bits */ -- -- /* compute minimum size table less than or equal to l bits */ -- z = (z = g - w) > (unsigned) l ? l : z; /* upper limit on table size */ -- if ((f = 1 << (j = k - w)) > a + 1) { /* try a k-w bit table *//* too few codes for k-w bit table */ -- f -= a + 1; /* deduct codes from patterns left */ -+ while (k > ws[h + 1]) { -+ w = ws[++h]; -+ -+ /* compute minimum size table less than or equal to *m bits */ -+ z = (z = g - w) > *m ? *m : z; /* upper limit on table size */ -+ if ((f = 1 << (j = k - w)) > a + 1) { /* try a k-w bit table */ -+ /* too few codes for k-w bit table */ -+ f -= a + 1; /* deduct codes from patterns left */ - xp = c + k; -- while (++j < z) { /* try smaller tables up to z bits */ -+ while (++j < z) { /* try smaller tables up to z bits */ - if ((f <<= 1) <= *++xp) { -- break; /* enough codes to use up j bits */ -+ break; /* enough codes to use up j bits */ - } -- f -= *xp; /* else deduct codes from patterns */ -+ f -= *xp; /* else deduct codes from patterns */ - } - } -+ j = (w + j > eob_len && w < eob_len) ? eob_len - w : j; /* make EOB code end at table */ - z = 1 << j; /* table entries for j-bit table */ -+ ws[h+1] = w + j; /* set bits decoded in stack */ - - /* allocate and link in new table */ - q = (huft_t *) xmalloc((z + 1) * sizeof(huft_t)); -- - *t = q + 1; /* link to list for huft_free() */ - *(t = &(q->v.t)) = NULL; - u[h] = ++q; /* table starts after link */ - - /* connect to last table, if there is one */ - if (h) { -- x[h] = i; /* save pattern for backing up */ -- r.b = (unsigned char) l; /* bits to dump before this table */ -- r.e = (unsigned char) (16 + j); /* bits in this table */ -- r.v.t = q; /* pointer to this table */ -- j = i >> (w - l); /* (get around Turbo C bug) */ -- u[h - 1][j] = r; /* connect to last table */ -+ x[h] = i; /* save pattern for backing up */ -+ r.b = (unsigned char) (w - ws[h - 1]); /* bits to dump before this table */ -+ r.e = (unsigned char) (16 + j); /* bits in this table */ -+ r.v.t = q; /* pointer to this table */ -+ j = (i & ((1 << w) - 1)) >> ws[h - 1]; -+ u[h - 1][j] = r; /* connect to last table */ - } - } -- -+ - /* set up table entry in r */ - r.b = (unsigned char) (k - w); - if (p >= v + n) { -- r.e = 99; /* out of values--invalid code */ -+ r.e = 99; /* out of values--invalid code */ - } else if (*p < s) { -- r.e = (unsigned char) (*p < 256 ? 16 : 15); /* 256 is end-of-block code */ -- r.v.n = (unsigned short) (*p); /* simple code is just the value */ -- p++; /* one compiler does not like *p++ */ -+ r.e = (unsigned char) (*p < 256 ? 16 : 15); /* 256 is EOB code */ -+ r.v.n = (unsigned short) (*p++); /* simple code is just the value */ - } else { -- r.e = (unsigned char) e[*p - s]; /* non-simple--look up in lists */ -+ r.e = (unsigned char) e[*p - s]; /* non-simple--look up in lists */ - r.v.n = d[*p++ - s]; - } - -@@ -391,11 +385,14 @@ - - /* backup over finished tables */ - while ((i & ((1 << w) - 1)) != x[h]) { -- h--; /* don't need to update q */ -- w -= l; -+ w = ws[--h]; - } - } - } -+ -+ /* return actual size of base table */ -+ *m = ws[1]; -+ - /* Return true (1) if we were given an incomplete table */ - return y != 0 && g != 1; - } -@@ -901,6 +898,11 @@ - bytebuffer_size = 0; - } - -+extern void inflate_cleanup(void) -+{ -+ free(bytebuffer); -+} -+ - extern int inflate_unzip(int in, int out) - { - ssize_t nwrote; -Index: include/unarchive.h -=================================================================== -RCS file: /var/cvs/busybox/include/unarchive.h,v -retrieving revision 1.23 -diff -u -r1.23 unarchive.h ---- include/unarchive.h 15 Mar 2004 08:28:38 -0000 1.23 -+++ include/unarchive.h 18 Oct 2004 01:32:30 -0000 -@@ -98,6 +98,7 @@ - - extern int uncompressStream(int src_fd, int dst_fd); - extern void inflate_init(unsigned int bufsize); -+extern void inflate_cleanup(void); - extern int inflate_unzip(int in, int out); - extern int inflate_gunzip(int in, int out); - -_________________________________________________________________ -Express yourself instantly with MSN Messenger! Download today it's FREE! -http://messenger.msn.com/ - - ---===============0046497949== -Content-Type: text/plain; charset="iso-8859-1" -MIME-Version: 1.0 -Content-Transfer-Encoding: quoted-printable -Content-Disposition: inline - -_______________________________________________ -busybox mailing list -busybox@mail.busybox.net -http://codepoet.org/mailman/listinfo/busybox - ---===============0046497949==-- diff --git a/packages/busybox/busybox-1.00/wrt54/.mtn2git_empty b/packages/busybox/busybox-1.00/wrt54/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/busybox/busybox-1.00/wrt54/.mtn2git_empty +++ /dev/null diff --git a/packages/busybox/busybox-1.00/wrt54/defconfig b/packages/busybox/busybox-1.00/wrt54/defconfig deleted file mode 100644 index 7f1aef4ef9..0000000000 --- a/packages/busybox/busybox-1.00/wrt54/defconfig +++ /dev/null @@ -1,476 +0,0 @@ -# -# Automatically generated make config: don't edit -# -HAVE_DOT_CONFIG=y - -# -# General Configuration -# -# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set -CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y -# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set -CONFIG_FEATURE_VERBOSE_USAGE=y -# CONFIG_FEATURE_INSTALLER is not set -# CONFIG_LOCALE_SUPPORT is not set -CONFIG_FEATURE_DEVFS=y -CONFIG_FEATURE_DEVPTS=y -# CONFIG_FEATURE_CLEAN_UP is not set -CONFIG_FEATURE_SUID=y -# CONFIG_FEATURE_SUID_CONFIG is not set -# CONFIG_SELINUX is not set - -# -# Build Options -# -# CONFIG_STATIC is not set -CONFIG_LFS=y -USING_CROSS_COMPILER=y -CROSS_COMPILER_PREFIX="mipsel-uclibc-" -EXTRA_CFLAGS_OPTIONS="-Os " - -# -# Installation Options -# -# CONFIG_INSTALL_NO_USR is not set -PREFIX="./_install" - -# -# Archival Utilities -# -# CONFIG_AR is not set -CONFIG_BUNZIP2=y -# CONFIG_CPIO is not set -# CONFIG_DPKG is not set -# CONFIG_DPKG_DEB is not set -CONFIG_GUNZIP=y -CONFIG_FEATURE_GUNZIP_UNCOMPRESS=y -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_FROM=y -CONFIG_FEATURE_TAR_GZIP=y -# CONFIG_FEATURE_TAR_COMPRESS is not set -# CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY is not set -CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y -# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set -# CONFIG_UNCOMPRESS is not set -# CONFIG_UNZIP is not set - -# -# Common options for cpio and tar -# -# CONFIG_FEATURE_UNARCHIVE_TAPE is not set - -# -# Coreutils -# -CONFIG_BASENAME=y -# CONFIG_CAL is not set -CONFIG_CAT=y -CONFIG_CHGRP=y -CONFIG_CHMOD=y -CONFIG_CHOWN=y -CONFIG_CHROOT=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 is not set -CONFIG_DU=y -CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K=y -CONFIG_ECHO=y -CONFIG_FEATURE_FANCY_ECHO=y -CONFIG_ENV=y -CONFIG_EXPR=y -CONFIG_FALSE=y -# CONFIG_FOLD is not set -CONFIG_HEAD=y -CONFIG_FEATURE_FANCY_HEAD=y -CONFIG_HOSTID=y -CONFIG_ID=y -# CONFIG_INSTALL is not set -CONFIG_LENGTH=y -CONFIG_LN=y -# CONFIG_LOGNAME is not set -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_MD5SUM=y -CONFIG_MKDIR=y -CONFIG_MKFIFO=y -# CONFIG_MKNOD is not set -CONFIG_MV=y -# CONFIG_OD is not set -# CONFIG_PRINTF is not set -CONFIG_PWD=y -# CONFIG_REALPATH is not set -CONFIG_RM=y -CONFIG_RMDIR=y -# CONFIG_SEQ is not set -# CONFIG_SHA1SUM is not set -CONFIG_SLEEP=y -CONFIG_FEATURE_FANCY_SLEEP=y -CONFIG_SORT=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 - -# -# test (forced enabled for use with shell) -# -# CONFIG_FEATURE_TEST_64 is not set -CONFIG_TOUCH=y -CONFIG_TR=y -CONFIG_TRUE=y -# CONFIG_TTY is not set -CONFIG_UNAME=y -CONFIG_UNIQ=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 is not set -CONFIG_YES=y - -# -# Common options for cp and mv -# -CONFIG_FEATURE_PRESERVE_HARDLINKS=y - -# -# Common options for ls and more -# -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 is not set -CONFIG_CLEAR=y -# CONFIG_DEALLOCVT is not set -# CONFIG_DUMPKMAP is not set -# CONFIG_GETKEY is not set -# CONFIG_LOADFONT is not set -# CONFIG_LOADKMAP is not set -# CONFIG_OPENVT is not set -CONFIG_RESET=y -# CONFIG_SETKEYCODES is not set - -# -# Debian Utilities -# -CONFIG_MKTEMP=y -# CONFIG_PIPE_PROGRESS is not set -# CONFIG_READLINK is not set -CONFIG_RUN_PARTS=y -CONFIG_START_STOP_DAEMON=y -CONFIG_WHICH=y - -# -# Editors -# -CONFIG_AWK=y -CONFIG_FEATURE_AWK_MATH=y -# CONFIG_PATCH is not set -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=y -CONFIG_FEATURE_VI_READONLY=y -CONFIG_FEATURE_VI_SETOPTS=y -CONFIG_FEATURE_VI_SET=y -CONFIG_FEATURE_VI_WIN_RESIZE=y -CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y - -# -# Finding Utilities -# -CONFIG_FIND=y -# CONFIG_FEATURE_FIND_MTIME is not set -CONFIG_FEATURE_FIND_PERM=y -CONFIG_FEATURE_FIND_TYPE=y -CONFIG_FEATURE_FIND_XDEV=y -# CONFIG_FEATURE_FIND_NEWER is not set -# CONFIG_FEATURE_FIND_INUM is not set -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=y -CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y -CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y -CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y - -# -# Init Utilities -# -CONFIG_INIT=y -CONFIG_FEATURE_USE_INITTAB=y -# CONFIG_FEATURE_INITRD is not set -# CONFIG_FEATURE_INIT_COREDUMPS is not set -# CONFIG_FEATURE_EXTRA_QUIET is not set -# CONFIG_HALT is not set -# CONFIG_POWEROFF is not set -CONFIG_REBOOT=y -CONFIG_MESG=y - -# -# Login/Password Management Utilities -# -# 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_U_W_TMP is not set -CONFIG_LOGIN=y -CONFIG_FEATURE_SECURETTY=y -CONFIG_PASSWD=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 is not set - -# -# Miscellaneous Utilities -# -# CONFIG_ADJTIMEX is not set -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 is not set -# CONFIG_RX is not set -CONFIG_STRINGS=y -CONFIG_TIME=y -# CONFIG_WATCHDOG is not set - -# -# Linux Module Utilities -# -CONFIG_INSMOD=y -CONFIG_FEATURE_2_4_MODULES=y -# CONFIG_FEATURE_2_6_MODULES is not set -# 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_LSMOD=y -CONFIG_FEATURE_QUERY_MODULE_INTERFACE=y -# CONFIG_MODPROBE is not set -CONFIG_RMMOD=y -CONFIG_FEATURE_CHECK_TAINTED_MODULE=y - -# -# Networking Utilities -# -CONFIG_FEATURE_IPV6=y -CONFIG_ARPING=y -# CONFIG_FTPGET is not set -# CONFIG_FTPPUT 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=y -CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y -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_INETD is not set -# CONFIG_IP 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=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 is not set -# CONFIG_TELNETD is not set -# CONFIG_TFTP 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=y - -# -# udhcp Server/Client -# -# CONFIG_UDHCPD is not set -CONFIG_UDHCPC=y -# CONFIG_FEATURE_UDHCP_SYSLOG is not set -# CONFIG_FEATURE_UDHCP_DEBUG is not set - -# -# Process Utilities -# -CONFIG_FREE=y -CONFIG_KILL=y -CONFIG_KILLALL=y -CONFIG_PIDOF=y -CONFIG_PS=y -# CONFIG_RENICE is not set -CONFIG_TOP=y -FEATURE_CPU_USAGE_PERCENTAGE=y -CONFIG_UPTIME=y -CONFIG_SYSCTL=y - -# -# Another Bourne-like Shell -# -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_PIPE_OPTIMIZATION=y -CONFIG_FEATURE_BUILTIN_TEST=y -CONFIG_FEATURE_BUILTIN_ECHO=y -CONFIG_FEATURE_BUILTIN_PIDOF=y -CONFIG_ASH_ALIAS=y -CONFIG_ASH_MATH_SUPPORT=y -# CONFIG_ASH_MATH_SUPPORT_64 is not set -CONFIG_ASH_GETOPTS=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_HUSH is not set -# CONFIG_LASH is not set -# CONFIG_MSH is not set - -# -# Bourne Shell Options -# -# CONFIG_FEATURE_SH_EXTRA_QUIET is not set -# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set -CONFIG_FEATURE_COMMAND_EDITING=y -CONFIG_FEATURE_COMMAND_HISTORY=15 -# 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 is not set -CONFIG_KLOGD=y -CONFIG_LOGGER=y - -# -# Linux System Utilities -# -CONFIG_DMESG=y -# CONFIG_FBSET is not set -# CONFIG_FDFLUSH is not set -# CONFIG_FDFORMAT is not set -# CONFIG_FDISK is not set -FDISK_SUPPORT_LARGE_DISKS=y -# CONFIG_FREERAMDISK is not set -# CONFIG_FSCK_MINIX is not set -# CONFIG_MKFS_MINIX is not set -# CONFIG_GETOPT is not set -CONFIG_HEXDUMP=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 is not set -CONFIG_MOUNT=y -CONFIG_NFSMOUNT=y -CONFIG_UMOUNT=y -CONFIG_FEATURE_MOUNT_FORCE=y - -# -# Common options for mount/umount -# -CONFIG_FEATURE_MOUNT_LOOP=y -# CONFIG_FEATURE_MTAB_SUPPORT is not set - -# -# Debugging Options -# -# CONFIG_DEBUG is not set diff --git a/packages/busybox/busybox-1.00/xargs-double-size.patch b/packages/busybox/busybox-1.00/xargs-double-size.patch deleted file mode 100644 index c7dc900cdd..0000000000 --- a/packages/busybox/busybox-1.00/xargs-double-size.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- busybox-1.00/findutils/xargs.c.org 2006-09-19 18:18:17.084592997 +0200 -+++ busybox-1.00/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); |