busybox: bump 1.11.x and 1.12.x versions

	default "1.8.3"		if BR2_BUSYBOX_VERSION_1_8_X

	default "1.9.2"		if BR2_BUSYBOX_VERSION_1_9_X

	default "1.10.4"	if BR2_BUSYBOX_VERSION_1_10_X

	default "1.11.2"	if BR2_BUSYBOX_VERSION_1_11_X

	default "1.12.0"	if BR2_BUSYBOX_VERSION_1_12_X

	default "1.11.3"	if BR2_BUSYBOX_VERSION_1_11_X

	default "1.12.1"	if BR2_BUSYBOX_VERSION_1_12_X

config BR2_PACKAGE_BUSYBOX_FULLINSTALL

	bool "Run BusyBox's own full installation"

--- busybox-1.11.2/console-tools/kbd_mode.c	Thu Aug 21 21:40:12 2008

+++ busybox-1.11.2-kbdmode/console-tools/kbd_mode.c	Wed Sep  3 23:52:26 2008

@@ -2,7 +2,7 @@

 /*

  * Mini kbd_mode implementation for busybox

  *

- * Copyright (C) 2007 Loc Greni <loic.grenie@gmail.com>

+ * Copyright (C) 2007 Loic Grenie <loic.grenie@gmail.com>

  *   written using Andries Brouwer <aeb@cwi.nl>'s kbd_mode from

  *   console-utils v0.2.3, licensed under GNU GPLv2

  *

@@ -46,7 +46,8 @@

 		printf("The keyboard is in %s mode\n", mode);

 	} else {

 		opt = opt & UNICODE ? 3 : opt >> 1;

-		xioctl(fd, KDSKBMODE, opt);

+		/* double cast prevents warnings about widening conversion */

+		xioctl(fd, KDSKBMODE, (void*)(ptrdiff_t)opt);

 	}

 	if (ENABLE_FEATURE_CLEAN_UP)

--- busybox-1.12.0/editors/awk.c	Wed Aug  6 00:56:11 2008

+++ busybox-1.12.0-awk/editors/awk.c	Fri Aug 29 01:17:05 2008

@@ -973,7 +973,12 @@

 		} else if (*p == '.' || isdigit(*p)) {

 			/* it's a number */

-			t_double = strtod(p, &p);

+#if ENABLE_DESKTOP

+			if (p[0] == '0' && (p[1] | 0x20) == 'x')

+				t_double = strtoll(p, &p, 0);

+			else

+#endif

+				t_double = strtod(p, &p);

 			if (*p == '.')

 				syntax_error(EMSG_UNEXP_TOKEN);

 			tc = TC_NUMBER;

@@ -2034,28 +2039,30 @@

 		setvar_p(res, s);

 		break;

+	/* Bitwise ops must assume that operands are unsigned. GNU Awk 3.1.5:

+	 * awk '{ print or(-1,1) }' gives "4.29497e+09", not "-2.xxxe+09" */

 	case B_an:

-		setvar_i(res, (long)getvar_i(av[0]) & (long)getvar_i(av[1]));

+		setvar_i(res, (unsigned long)getvar_i(av[0]) & (unsigned long)getvar_i(av[1]));

 		break;

 	case B_co:

-		setvar_i(res, ~(long)getvar_i(av[0]));

+		setvar_i(res, ~(unsigned long)getvar_i(av[0]));

 		break;

 	case B_ls:

-		setvar_i(res, (long)getvar_i(av[0]) << (long)getvar_i(av[1]));

+		setvar_i(res, (unsigned long)getvar_i(av[0]) << (unsigned long)getvar_i(av[1]));

 		break;

 	case B_or:

-		setvar_i(res, (long)getvar_i(av[0]) | (long)getvar_i(av[1]));

+		setvar_i(res, (unsigned long)getvar_i(av[0]) | (unsigned long)getvar_i(av[1]));

 		break;

 	case B_rs:

-		setvar_i(res, (long)((unsigned long)getvar_i(av[0]) >> (unsigned long)getvar_i(av[1])));

+		setvar_i(res, (unsigned long)getvar_i(av[0]) >> (unsigned long)getvar_i(av[1]));

 		break;

 	case B_xo:

-		setvar_i(res, (long)getvar_i(av[0]) ^ (long)getvar_i(av[1]));

+		setvar_i(res, (unsigned long)getvar_i(av[0]) ^ (unsigned long)getvar_i(av[1]));

 		break;

 	case B_lo:

--- busybox-1.12.0/editors/vi.c	Wed Aug  6 00:56:11 2008

+++ busybox-1.12.0-crontab_vi/editors/vi.c	Sun Sep 21 17:30:47 2008

@@ -147,10 +147,10 @@

 #endif

 	smallint editing;        // >0 while we are editing a file

-	                         // [code audit says "can be 0 or 1 only"]

+	                         // [code audit says "can be 0, 1 or 2 only"]

 	smallint cmd_mode;       // 0=command  1=insert 2=replace

 	int file_modified;       // buffer contents changed (counter, not flag!)

-	int last_file_modified; // = -1;

+	int last_file_modified;  // = -1;

 	int fn_start;            // index of first cmd line file name

 	int save_argc;           // how many file names on cmd line

 	int cmdcnt;              // repetition count

@@ -623,7 +623,7 @@

 		// These are commands that change text[].

 		// Remember the input for the "." command

 		if (!adding2q && ioq_start == NULL

-		 && strchr(modifying_cmds, c)

+		 && c != '\0' && strchr(modifying_cmds, c)

 		) {

 			start_new_cmd_q(c);

 		}

@@ -645,8 +645,8 @@

 	}

 	//-------------------------------------------------------------------

-	place_cursor(rows, 0, FALSE);	// go to bottom of screen

-	clear_to_eol();		// Erase to end of line

+	place_cursor(rows - 1, 0, FALSE); // go to bottom of screen

+	clear_to_eol(); // erase to end of line

 	cookmode();

 #undef cur_line

 }

@@ -2009,9 +2009,9 @@

 {

 	// get buffer for new cmd

 	// if there is a current cmd count put it in the buffer first

-	if (cmdcnt > 0)

+	if (cmdcnt > 0) {

 		lmc_len = sprintf(last_modifying_cmd, "%d%c", cmdcnt, c);

-	else { // just save char c onto queue

+	} else { // just save char c onto queue

 		last_modifying_cmd[0] = c;

 		lmc_len = 1;

 	}

@@ -2157,21 +2157,21 @@

 //----- Come here when we get a continue signal -------------------

 static void cont_sig(int sig UNUSED_PARAM)

 {

-	rawmode();			// terminal to "raw"

-	last_status_cksum = 0;	// force status update

-	redraw(TRUE);		// re-draw the screen

+	rawmode(); // terminal to "raw"

+	last_status_cksum = 0; // force status update

+	redraw(TRUE); // re-draw the screen

 	signal(SIGTSTP, suspend_sig);

 	signal(SIGCONT, SIG_DFL);

-	kill(my_pid, SIGCONT);

+	kill(my_pid, SIGCONT); // huh? why? we are already "continued"...

 }

 //----- Come here when we get a Suspend signal -------------------

 static void suspend_sig(int sig UNUSED_PARAM)

 {

-	place_cursor(rows - 1, 0, FALSE);	// go to bottom of screen

-	clear_to_eol();		// Erase to end of line

-	cookmode();			// terminal to "cooked"

+	place_cursor(rows - 1, 0, FALSE); // go to bottom of screen

+	clear_to_eol(); // erase to end of line

+	cookmode(); // terminal to "cooked"

 	signal(SIGCONT, cont_sig);

 	signal(SIGTSTP, SIG_DFL);

@@ -2247,18 +2247,20 @@

 	fflush(stdout);

 	n = chars_to_parse;

-	// get input from User- are there already input chars in Q?

+	// get input from User - are there already input chars in Q?

 	if (n <= 0) {

 		// the Q is empty, wait for a typed char

+ again:

 		n = safe_read(STDIN_FILENO, readbuffer, sizeof(readbuffer));

-		if (n < 0) {

-			if (errno == EBADF || errno == EFAULT || errno == EINVAL

-			 || errno == EIO)

-				editing = 0; // want to exit

-			errno = 0;

+		if (n <= 0) {

+			place_cursor(rows - 1, 0, FALSE); // go to bottom of screen

+			clear_to_eol(); // erase to end of line

+			cookmode(); // terminal to "cooked"

+			bb_error_msg_and_die("can't read user input");

 		}

-		if (n <= 0)

-			return 0;       // error

+		/* elsewhere we can get very confused by NULs */

+		if (readbuffer[0] == '\0')

+			goto again;

 		if (readbuffer[0] == 27) {

 			// This is an ESC char. Is this Esc sequence?

 			// Could be bare Esc key. See if there are any

--- busybox-1.12.0/miscutils/crontab.c	Wed Aug  6 00:56:08 2008

+++ busybox-1.12.0-crontab_vi/miscutils/crontab.c	Sun Sep 21 17:30:47 2008

@@ -93,6 +93,7 @@

 	char *new_fname;

 	char *user_name;  /* -u USER */

 	int fd;

+	int src_fd;

 	int opt_ler;

 	/* file [opts]     Replace crontab from file

@@ -144,15 +145,15 @@

 		bb_show_usage();

 	/* Read replacement file under user's UID/GID/group vector */

+	src_fd = STDIN_FILENO;

 	if (!opt_ler) { /* Replace? */

 		if (!argv[0])

 			bb_show_usage();

 		if (NOT_LONE_DASH(argv[0])) {

-			fd = open_as_user(pas, argv[0]);

-			if (fd < 0)

+			src_fd = open_as_user(pas, argv[0]);

+			if (src_fd < 0)

 				bb_error_msg_and_die("user %s cannot read %s",

 						pas->pw_name, argv[0]);

-			xmove_fd(fd, STDIN_FILENO);

 		}

 	}

@@ -180,23 +181,23 @@

 		tmp_fname = xasprintf("%s.%u", crontab_dir, (unsigned)getpid());

 		/* No O_EXCL: we don't want to be stuck if earlier crontabs

 		 * were killed, leaving stale temp file behind */

-		fd = xopen3(tmp_fname, O_RDWR|O_CREAT|O_TRUNC, 0600);

-		xmove_fd(fd, STDIN_FILENO);

-		fchown(STDIN_FILENO, pas->pw_uid, pas->pw_gid);

+		src_fd = xopen3(tmp_fname, O_RDWR|O_CREAT|O_TRUNC, 0600);

+		fchown(src_fd, pas->pw_uid, pas->pw_gid);

 		fd = open(pas->pw_name, O_RDONLY);

 		if (fd >= 0) {

-			bb_copyfd_eof(fd, STDIN_FILENO);

+			bb_copyfd_eof(fd, src_fd);

 			close(fd);

+			xlseek(src_fd, 0, SEEK_SET);

 		}

+		close_on_exec_on(src_fd); /* don't want editor to see this fd */

 		edit_file(pas, tmp_fname);

-		xlseek(STDIN_FILENO, 0, SEEK_SET);

 		/* fall through */

 	case 0: /* Replace (no -l, -e, or -r were given) */

 		new_fname = xasprintf("%s.new", pas->pw_name);

 		fd = open(new_fname, O_WRONLY|O_CREAT|O_TRUNC|O_APPEND, 0600);

 		if (fd >= 0) {

-			bb_copyfd_eof(STDIN_FILENO, fd);

+			bb_copyfd_eof(src_fd, fd);

 			close(fd);

 			xrename(new_fname, pas->pw_name);

 		} else {

--- busybox-1.12.0/networking/udhcp/dhcpc.c	Wed Aug  6 00:55:58 2008

+++ busybox-1.12.0-dhcp/networking/udhcp/dhcpc.c	Thu Aug 28 00:05:23 2008

@@ -259,9 +259,10 @@

 	if (opt & OPT_o)

 		client_config.no_default_options = 1;

 	while (list_O) {

-		int n = index_in_strings(dhcp_option_strings, llist_pop(&list_O));

+		char *optstr = llist_pop(&list_O);

+		int n = index_in_strings(dhcp_option_strings, optstr);

 		if (n < 0)

-			bb_error_msg_and_die("unknown option '%s'", list_O->data);

+			bb_error_msg_and_die("unknown option '%s'", optstr);

 		n = dhcp_options[n].code;

 		client_config.opt_mask[n >> 3] |= 1 << (n & 7);

 	}