busybox: bump 1.13.x version

	default "1.10.4"	if BR2_BUSYBOX_VERSION_1_10_X

	default "1.11.3"	if BR2_BUSYBOX_VERSION_1_11_X

	default "1.12.4"	if BR2_BUSYBOX_VERSION_1_12_X

	default "1.13.2"	if BR2_BUSYBOX_VERSION_1_13_X

	default "1.13.3"	if BR2_BUSYBOX_VERSION_1_13_X

config BR2_PACKAGE_BUSYBOX_FULLINSTALL

	bool "Run BusyBox's own full installation"

diff -urpN busybox-1.13.2/editors/awk.c busybox-1.13.2-awk/editors/awk.c

--- busybox-1.13.2/editors/awk.c	2008-11-09 18:28:21.000000000 +0100

+++ busybox-1.13.2-awk/editors/awk.c	2009-02-26 12:17:05.000000000 +0100

@@ -392,8 +392,12 @@ static const uint16_t PRIMES[] ALIGN2 = 

 /* Globals. Split in two parts so that first one is addressed

- * with (mostly short) negative offsets */

+ * with (mostly short) negative offsets.

+ * NB: it's unsafe to put members of type "double"

+ * into globals2 (gcc may fail to align them).

+ */

 struct globals {

+	double t_double;

 	chain beginseq, mainseq, endseq;

 	chain *seq;

 	node *break_ptr, *continue_ptr;

@@ -442,16 +446,16 @@ struct globals2 {

 	tsplitter exec_builtin__tspl;

 	/* biggest and least used members go last */

-	double t_double;

 	tsplitter fsplitter, rsplitter;

 };

 #define G1 (ptr_to_globals[-1])

 #define G (*(struct globals2 *)ptr_to_globals)

 /* For debug. nm --size-sort awk.o | grep -vi ' [tr] ' */

-/* char G1size[sizeof(G1)]; - 0x6c */

-/* char Gsize[sizeof(G)]; - 0x1cc */

+/*char G1size[sizeof(G1)]; - 0x74 */

+/*char Gsize[sizeof(G)]; - 0x1c4 */

 /* Trying to keep most of members accessible with short offsets: */

-/* char Gofs_seed[offsetof(struct globals2, evaluate__seed)]; - 0x90 */

+/*char Gofs_seed[offsetof(struct globals2, evaluate__seed)]; - 0x90 */

+#define t_double     (G1.t_double    )

 #define beginseq     (G1.beginseq    )

 #define mainseq      (G1.mainseq     )

 #define endseq       (G1.endseq      )

@@ -479,7 +483,6 @@ struct globals2 {

 #define t_info       (G.t_info      )

 #define t_tclass     (G.t_tclass    )

 #define t_string     (G.t_string    )

-#define t_double     (G.t_double    )

 #define t_lineno     (G.t_lineno    )

 #define t_rollback   (G.t_rollback  )

 #define intvar       (G.intvar      )

--- busybox-1.13.2/modutils/depmod.c	Sun Nov  9 18:28:03 2008

+++ busybox-1.13.2-depmod/modutils/depmod.c	Mon Jan 12 23:12:59 2009

@@ -33,7 +33,7 @@

 enum {

 	ARG_a = (1<<0), /* All modules, ignore mods in argv */

 	ARG_A = (1<<1), /* Only emit .ko that are newer than modules.dep file */

-	ARG_b = (1<<2), /* not /lib/modules/$(uname -r)/ but this base-dir */

+	ARG_b = (1<<2), /* base directory when modules are in staging area */

 	ARG_e = (1<<3), /* with -F, print unresolved symbols */

 	ARG_F = (1<<4), /* System.map that contains the symbols */

 	ARG_n = (1<<5)  /* dry-run, print to stdout only */

@@ -57,7 +57,7 @@

 	*first = info;

 	info->dnext = info->dprev = info;

-	info->name = xstrdup(fname);

+	info->name = xasprintf("/%s", fname);

 	info->modname = filename2modname(fname, NULL);

 	for (ptr = image; ptr < image + len - 10; ptr++) {

 		if (strncmp(ptr, "depends=", 8) == 0) {

@@ -123,44 +123,61 @@

 	}

 }

+static void xfreopen_write(const char *file, FILE *f)

+{

+	if (freopen(file, "w", f) == NULL)

+		bb_perror_msg_and_die("can't open '%s'", file);

+}

+

 int depmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;

 int depmod_main(int argc UNUSED_PARAM, char **argv)

 {

 	module_info *modules = NULL, *m, *dep;

-	char *moddir_base = (char *)CONFIG_DEFAULT_MODULES_DIR;

+	const char *moddir_base = "/";

+	char *moddir, *version;

+	struct utsname uts;

 	int tmp;

 	getopt32(argv, "aAb:eF:n", &moddir_base, NULL);

 	argv += optind;

 	/* goto modules location */

+	xchdir(moddir_base);

 	/* If a version is provided, then that kernel version's module directory

 	 * is used, rather than the current kernel version (as returned by

 	 * "uname -r").  */

-	xchdir(moddir_base);

-	if (*argv && (sscanf(*argv, "%d.%d.%d", &tmp, &tmp, &tmp) == 3)) {

-		xchdir(*argv++);

+	if (*argv && sscanf(*argv, "%d.%d.%d", &tmp, &tmp, &tmp) == 3) {

+		version = *argv++;

 	} else {

-		struct utsname uts;

 		uname(&uts);

-		xchdir(uts.release);

+		version = uts.release;

 	}

-	/* If no modules are given on the command-line, -a is on per default.  */

-	option_mask32 |= *argv == NULL;

+	moddir = concat_path_file(&CONFIG_DEFAULT_MODULES_DIR[1], version);

 	/* Scan modules */

-	moddir_base = xrealloc_getcwd_or_warn(NULL);

-	do {

-		recursive_action((option_mask32 & ARG_a) ? moddir_base : *argv,

-				ACTION_RECURSE, parse_module, NULL,  &modules, 0);

-	} while (!(option_mask32 & ARG_a) && *(++argv));

+	if (*argv) {

+		char *modfile;

+		struct stat sb;

+		do {

+			modfile = concat_path_file(moddir, *argv);

+			xstat(modfile, &sb);

+			parse_module(modfile, &sb, &modules, 0);

+			free(modfile);

+		} while (*(++argv));

+	} else {

+		recursive_action(moddir, ACTION_RECURSE,

+				 parse_module, NULL, &modules, 0);

+	}

+

+	/* Prepare for writing out the dep files */

+	xchdir(moddir);

 	if (ENABLE_FEATURE_CLEAN_UP)

-		free(moddir_base);

+		free(moddir);

 	/* Generate dependency and alias files */

 	if (!(option_mask32 & ARG_n))

-		freopen(CONFIG_DEFAULT_DEPMOD_FILE, "w", stdout);

+		xfreopen_write(CONFIG_DEFAULT_DEPMOD_FILE, stdout);

 	for (m = modules; m != NULL; m = m->next) {

 		printf("%s:", m->name);

@@ -174,12 +191,12 @@

 			dep->dprev->dnext = dep->dnext;

 			dep->dnext = dep->dprev = dep;

 		}

-		puts("");

+		bb_putchar('\n');

 	}

 #if ENABLE_FEATURE_MODUTILS_ALIAS

 	if (!(option_mask32 & ARG_n))

-		freopen("modules.alias", "w", stdout);

+		xfreopen_write("modules.alias", stdout);

 	for (m = modules; m != NULL; m = m->next) {

 		while (m->aliases) {

 			printf("alias %s %s\n",

@@ -190,7 +207,7 @@

 #endif

 #if ENABLE_FEATURE_MODUTILS_SYMBOLS

 	if (!(option_mask32 & ARG_n))

-		freopen("modules.symbols", "w", stdout);

+		xfreopen_write("modules.symbols", stdout);

 	for (m = modules; m != NULL; m = m->next) {

 		while (m->symbols) {

 			printf("alias symbol:%s %s\n",

--- busybox-1.13.2/init/init.c	Wed Dec 31 04:06:45 2008

+++ busybox-1.13.2-init/init/init.c	Thu Jan 29 03:02:13 2009

@@ -671,15 +671,14 @@

  */

 static void parse_inittab(void)

 {

+#if ENABLE_FEATURE_USE_INITTAB

 	char *token[4];

-	/* order must correspond to SYSINIT..RESTART constants */

-	static const char actions[] ALIGN1 =

-		"sysinit\0""respawn\0""askfirst\0""wait\0""once\0"

-		"ctrlaltdel\0""shutdown\0""restart\0";

+	parser_t *parser = config_open2("/etc/inittab", fopen_for_read);

-	parser_t *parser = config_open2(INITTAB, fopen_for_read);

-	/* No inittab file -- set up some default behavior */

-	if (parser == NULL) {

+	if (parser == NULL)

+#endif

+	{

+		/* No inittab file -- set up some default behavior */

 		/* Reboot on Ctrl-Alt-Del */

 		new_init_action(CTRLALTDEL, "reboot", "");

 		/* Umount all filesystems on halt/reboot */

@@ -699,11 +698,17 @@

 		new_init_action(SYSINIT, INIT_SCRIPT, "");

 		return;

 	}

+

+#if ENABLE_FEATURE_USE_INITTAB

 	/* optional_tty:ignored_runlevel:action:command

 	 * Delims are not to be collapsed and need exactly 4 tokens

 	 */

 	while (config_read(parser, token, 4, 0, "#:",

 				PARSE_NORMAL & ~(PARSE_TRIM | PARSE_COLLAPSE))) {

+		/* order must correspond to SYSINIT..RESTART constants */

+		static const char actions[] ALIGN1 =

+			"sysinit\0""respawn\0""askfirst\0""wait\0""once\0"

+			"ctrlaltdel\0""shutdown\0""restart\0";

 		int action;

 		char *tty = token[0];

@@ -727,6 +732,7 @@

 				parser->lineno);

 	}

 	config_close(parser);

+#endif

 }

 #if ENABLE_FEATURE_USE_INITTAB

--- busybox-1.13.2/include/libbb.h	Wed Dec 31 04:06:45 2008

+++ busybox-1.13.2-killall/include/libbb.h	Sat Feb 14 02:41:18 2009

@@ -1275,7 +1275,13 @@

 	PSSCAN_UTIME    = 1 << 13,

 	PSSCAN_TTY      = 1 << 14,

 	PSSCAN_SMAPS	= (1 << 15) * ENABLE_FEATURE_TOPMEM,

-	PSSCAN_ARGVN    = (1 << 16) * (ENABLE_PGREP || ENABLE_PKILL || ENABLE_PIDOF),

+	/* NB: used by find_pid_by_name(). Any applet using it

+	 * needs to be mentioned here. */

+	PSSCAN_ARGVN    = (1 << 16) * (ENABLE_KILLALL

+				|| ENABLE_PGREP || ENABLE_PKILL

+				|| ENABLE_PIDOF

+				|| ENABLE_SESTATUS 

+				),

 	USE_SELINUX(PSSCAN_CONTEXT = 1 << 17,)

 	PSSCAN_START_TIME = 1 << 18,

 	PSSCAN_CPU      = 1 << 19,