busybox: Bump to 1.17.2

	Kconfig infrastructure rebased against 2.6.36-rc1, bringing

	misc fixes + nconfig and savedefconfig targets.

	Updated/fixed packages: busybox

2010.08: Released August 31th, 2010:

	Fixes all over the tree.

	default "1.14.4"	if BR2_BUSYBOX_VERSION_1_14_X

	default "1.15.3"	if BR2_BUSYBOX_VERSION_1_15_X

	default "1.16.2"	if BR2_BUSYBOX_VERSION_1_16_X

	default "1.17.1"	if BR2_BUSYBOX_VERSION_1_17_X

	default "1.17.2"	if BR2_BUSYBOX_VERSION_1_17_X

config BR2_PACKAGE_BUSYBOX_FULLINSTALL

	bool "Run BusyBox's own full installation"

diff -urpN busybox-1.17.1/findutils/grep.c busybox-1.17.1-grep/findutils/grep.c

--- busybox-1.17.1/findutils/grep.c	2010-07-06 04:25:54.000000000 +0200

+++ busybox-1.17.1-grep/findutils/grep.c	2010-08-23 02:37:08.000000000 +0200

@@ -461,15 +461,19 @@ static int grep_file(FILE *file)

 						if (found)

 							print_line(gl->pattern, strlen(gl->pattern), linenum, ':');

 					} else while (1) {

+						unsigned start = gl->matched_range.rm_so;

 						unsigned end = gl->matched_range.rm_eo;

+						unsigned len = end - start;

 						char old = line[end];

 						line[end] = '\0';

-						print_line(line + gl->matched_range.rm_so,

-								end - gl->matched_range.rm_so,

-								linenum, ':');

+						/* Empty match is not printed: try "echo test | grep -o ''" */

+						if (len != 0)

+							print_line(line + start, len, linenum, ':');

 						if (old == '\0')

 							break;

 						line[end] = old;

+						if (len == 0)

+							end++;

 #if !ENABLE_EXTRA_COMPAT

 						if (regexec(&gl->compiled_regex, line + end,

 								1, &gl->matched_range, REG_NOTBOL) != 0)

diff -urpN busybox-1.17.1/testsuite/grep.tests busybox-1.17.1-grep/testsuite/grep.tests

--- busybox-1.17.1/testsuite/grep.tests	2010-07-06 04:25:54.000000000 +0200

+++ busybox-1.17.1-grep/testsuite/grep.tests	2010-08-23 02:37:08.000000000 +0200

@@ -98,5 +98,9 @@ testing "grep -o does not loop forever" 

 	'grep -o "[^/]*$"' \

 	"test\n" \

 	"" "/var/test\n"

+testing "grep -o does not loop forever on zero-length match" \

+	'grep -o "" | head -n1' \

+	"" \

+	"" "test\n"

 exit $FAILCOUNT

diff -urpN busybox-1.17.1/Makefile busybox-1.17.1-make/Makefile

--- busybox-1.17.1/Makefile	2010-07-25 00:13:44.000000000 +0200

+++ busybox-1.17.1-make/Makefile	2010-08-22 09:30:33.000000000 +0200

@@ -433,7 +433,12 @@ ifeq ($(config-targets),1)

 -include $(srctree)/arch/$(ARCH)/Makefile

 export KBUILD_DEFCONFIG

-config %config: scripts_basic outputmakefile gen_build_files FORCE

+config: scripts_basic outputmakefile gen_build_files FORCE

+	$(Q)mkdir -p include

+	$(Q)$(MAKE) $(build)=scripts/kconfig $@

+	$(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease

+

+%config: scripts_basic outputmakefile gen_build_files FORCE

 	$(Q)mkdir -p include

 	$(Q)$(MAKE) $(build)=scripts/kconfig $@

 	$(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease

@@ -1285,9 +1290,13 @@ endif

 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)

 # Modules

-/ %/: prepare scripts FORCE

+%/: prepare scripts FORCE

 	$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \

 	$(build)=$(build-dir)

+/: prepare scripts FORCE

+	$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \

+	$(build)=$(build-dir)

+

 %.ko: prepare scripts FORCE

 	$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1)   \

 	$(build)=$(build-dir) $(@:.ko=.o)

diff -urpN busybox-1.17.1/testsuite/mdev.tests busybox-1.17.1-mdev/testsuite/mdev.tests

--- busybox-1.17.1/testsuite/mdev.tests	2010-07-06 04:25:54.000000000 +0200

+++ busybox-1.17.1-mdev/testsuite/mdev.tests	2010-08-23 02:38:21.000000000 +0200

@@ -38,6 +38,16 @@ brw-rw---- 1 0 0 8,0 sda

 SKIP=

 # continuing to use directory structure from prev test

+optional STATIC FEATURE_MDEV_CONF FEATURE_LS_TIMESTAMPS FEATURE_LS_USERNAME

+testing "mdev deletes /block/sda" \

+	"env - PATH=$PATH ACTION=remove DEVPATH=/block/sda chroot mdev.testdir /mdev 2>&1;

+	ls -ln mdev.testdir/dev | $FILTER_LS" \

+"\

+" \

+	"" ""

+SKIP=

+

+# continuing to use directory structure from prev test

 rm -rf mdev.testdir/dev/*

 echo ".* 1:1 666" >mdev.testdir/etc/mdev.conf

 echo "sda 2:2 444" >>mdev.testdir/etc/mdev.conf

diff -urpN busybox-1.17.1/util-linux/mdev.c busybox-1.17.1-mdev/util-linux/mdev.c

--- busybox-1.17.1/util-linux/mdev.c	2010-07-06 04:25:54.000000000 +0200

+++ busybox-1.17.1-mdev/util-linux/mdev.c	2010-08-23 02:38:21.000000000 +0200

@@ -132,6 +132,7 @@ static void make_device(char *path, int 

 			major = -1;

 		}

 	}

+	/* else: for delete, -1 still deletes the node, but < -1 suppresses that */

 	/* Determine device name, type, major and minor */

 	device_name = (char*) bb_basename(path);

@@ -279,7 +280,7 @@ static void make_device(char *path, int 

 				if (aliaslink == '!' && s == a+1) {

 					val = st;

 					/* "!": suppress node creation/deletion */

-					major = -1;

+					major = -2;

 				}

 				else if (aliaslink == '>' || aliaslink == '=') {

 					val = st;

@@ -379,7 +380,7 @@ static void make_device(char *path, int 

 				free(command);

 			}

-			if (delete && major >= 0) {

+			if (delete && major >= -1) {

 				if (ENABLE_FEATURE_MDEV_RENAME && alias) {

 					if (aliaslink == '>')

 						unlink(device_name);