busybox: bump 1.14.x version

	string

	default "1.12.4"	if BR2_BUSYBOX_VERSION_1_12_X

	default "1.13.4"	if BR2_BUSYBOX_VERSION_1_13_X

	default "1.14.0"	if BR2_BUSYBOX_VERSION_1_14_X

	default "1.14.1"	if BR2_BUSYBOX_VERSION_1_14_X

config BR2_PACKAGE_BUSYBOX_FULLINSTALL

	bool "Run BusyBox's own full installation"

--- busybox-1.14.0/util-linux/acpid.c	Tue Apr 14 01:43:11 2009

+++ busybox-1.14.0-acpid/util-linux/acpid.c	Sat Apr 18 13:33:19 2009

@@ -78,8 +78,8 @@

 	// goto configuration directory

 	xchdir(opt_conf);

-//	// setup signals

-//	bb_signals(BB_FATAL_SIGS, record_signo);

+	// prevent zombies

+	signal(SIGCHLD, SIG_IGN);

 	// no explicit evdev files given? -> use proc event interface

 	if (!*argv) {

--- busybox-1.14.0/editors/awk.c	Tue Apr 14 01:43:09 2009

+++ busybox-1.14.0-awk/editors/awk.c	Mon May 18 23:49:29 2009

@@ -1571,13 +1571,14 @@

 				n++; /* we saw yet another delimiter */

 			} else {

 				pmatch[0].rm_eo = l;

-				if (s[l]) pmatch[0].rm_eo++;

+				if (s[l])

+					pmatch[0].rm_eo++;

 			}

 			memcpy(s1, s, l);

 			/* make sure we remove *all* of the separator chars */

-			while (l < pmatch[0].rm_eo) {

-				s1[l++] = '\0';

-			}

+			do {

+				s1[l] = '\0';

+			} while (++l < pmatch[0].rm_eo);

 			nextword(&s1);

 			s += pmatch[0].rm_eo;

 		} while (*s);

--- busybox-1.14.0/scripts/defconfig	Tue Apr 14 01:42:52 2009

+++ busybox-1.14.0-defconfig/scripts/defconfig	Fri Apr 17 01:08:24 2009

@@ -579,7 +579,7 @@

 CONFIG_EJECT=y

 CONFIG_FEATURE_EJECT_SCSI=y

 CONFIG_FBSPLASH=y

-CONFIG_FLASH_ERASEALL=y

+# CONFIG_FLASH_ERASEALL is not set

 CONFIG_IONICE=y

 # CONFIG_INOTIFYD is not set

 CONFIG_LAST=y

--- busybox-1.14.0/modutils/depmod.c	Tue Apr 14 01:42:55 2009

+++ busybox-1.14.0-depmod/modutils/depmod.c	Mon May 18 22:37:14 2009

@@ -40,26 +40,28 @@

 	ARG_r = (1<<6)  /* Compat dummy. Linux Makefile uses it */

 };

-static int FAST_FUNC parse_module(const char *fname, struct stat *sb,

-				  void *data, int UNUSED_PARAM depth)

+static int FAST_FUNC parse_module(const char *fname, struct stat *sb UNUSED_PARAM,

+				  void *data, int depth UNUSED_PARAM)

 {

+	char modname[MODULE_NAME_LEN];

 	module_info **first = (module_info **) data;

 	char *image, *ptr;

 	module_info *info;

-	size_t len = sb->st_size;

+	/* Arbitrary. Was sb->st_size, but that breaks .gz etc */

+	size_t len = (64*1024*1024 - 4096);

 	if (strrstr(fname, ".ko") == NULL)

 		return TRUE;

 	image = xmalloc_open_zipped_read_close(fname, &len);

-	info = xzalloc(sizeof(module_info));

+	info = xzalloc(sizeof(*info));

 	info->next = *first;

 	*first = info;

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

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

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

+	info->modname = xstrdup(filename2modname(fname, modname));

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

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

 			char *u;

@@ -69,12 +71,14 @@

 				if (*u == '-')

 					*u = '_';

 			ptr += string_to_llist(ptr, &info->dependencies, ",");

-		} else if (ENABLE_FEATURE_MODUTILS_ALIAS &&

-			   strncmp(ptr, "alias=", 6) == 0) {

+		} else if (ENABLE_FEATURE_MODUTILS_ALIAS

+		 && strncmp(ptr, "alias=", 6) == 0

+		) {

 			llist_add_to(&info->aliases, xstrdup(ptr + 6));

 			ptr += strlen(ptr);

-		} else if (ENABLE_FEATURE_MODUTILS_SYMBOLS &&

-			   strncmp(ptr, "__ksymtab_", 10) == 0) {

+		} else if (ENABLE_FEATURE_MODUTILS_SYMBOLS

+		 && strncmp(ptr, "__ksymtab_", 10) == 0

+		) {

 			ptr += 10;

 			if (strncmp(ptr, "gpl", 3) == 0 ||

 			    strcmp(ptr, "strings") == 0)

@@ -199,10 +203,17 @@

 	if (!(option_mask32 & ARG_n))

 		xfreopen_write("modules.alias", stdout);

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

+		const char *fname = bb_basename(m->name);

+		int fnlen = strchrnul(fname, '.') - fname;

 		while (m->aliases) {

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

+			/* Last word can well be m->modname instead,

+			 * but depmod from module-init-tools 3.4

+			 * uses module basename, i.e., no s/-/_/g.

+			 * (pathname and .ko.* are still stripped)

+			 * Mimicking that... */

+			printf("alias %s %.*s\n",

 				(char*)llist_pop(&m->aliases),

-				m->modname);

+				fnlen, fname);

 		}

 	}

 #endif

@@ -210,10 +221,12 @@

 	if (!(option_mask32 & ARG_n))

 		xfreopen_write("modules.symbols", stdout);

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

+		const char *fname = bb_basename(m->name);

+		int fnlen = strchrnul(fname, '.') - fname;

 		while (m->symbols) {

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

+			printf("alias symbol:%s %.*s\n",

 				(char*)llist_pop(&m->symbols),

-				m->modname);

+				fnlen, fname);

 		}

 	}

 #endif