busybox: support only one version

	  The 7.5 version of gdb has been removed. Use a newer version

	  instead.

config BR2_BUSYBOX_VERSION_1_19_X

	bool "busybox version selection has been removed"

	select BR2_LEGACY

	help

	  The possibility of selecting the Busybox version has been

	  removed. Use the latest version provided by the Busybox

	  package instead.

config BR2_BUSYBOX_VERSION_1_20_X

	bool "busybox version selection has been removed"

	select BR2_LEGACY

	help

	  The possibility of selecting the Busybox version has been

	  removed. Use the latest version provided by the Busybox

	  package instead.

config BR2_BUSYBOX_VERSION_1_21_X

	bool "busybox version selection has been removed"

	select BR2_LEGACY

	help

	  The possibility of selecting the Busybox version has been

	  removed. Use the latest version provided by the Busybox

	  package instead.

config BR2_PACKAGE_LIBV4L_DECODE_TM6000

	bool "decode_tm6000"

	select BR2_PACKAGE_LIBV4L_UTILS

--- busybox-1.19.4/networking/udhcp/common.c

+++ busybox-1.19.4-udhcp/networking/udhcp/common.c

@@ -29,16 +29,16 @@ const struct dhcp_optflag dhcp_optflags[

 //	{ OPTION_IP | OPTION_LIST                 , 0x07 }, /* DHCP_LOG_SERVER    */

 //	{ OPTION_IP | OPTION_LIST                 , 0x08 }, /* DHCP_COOKIE_SERVER */

 	{ OPTION_IP | OPTION_LIST                 , 0x09 }, /* DHCP_LPR_SERVER    */

-	{ OPTION_STRING               | OPTION_REQ, 0x0c }, /* DHCP_HOST_NAME     */

+	{ OPTION_STRING_HOST          | OPTION_REQ, 0x0c }, /* DHCP_HOST_NAME     */

 	{ OPTION_U16                              , 0x0d }, /* DHCP_BOOT_SIZE     */

-	{ OPTION_STRING               | OPTION_REQ, 0x0f }, /* DHCP_DOMAIN_NAME   */

+	{ OPTION_STRING_HOST          | OPTION_REQ, 0x0f }, /* DHCP_DOMAIN_NAME   */

 	{ OPTION_IP                               , 0x10 }, /* DHCP_SWAP_SERVER   */

 	{ OPTION_STRING                           , 0x11 }, /* DHCP_ROOT_PATH     */

 	{ OPTION_U8                               , 0x17 }, /* DHCP_IP_TTL        */

 	{ OPTION_U16                              , 0x1a }, /* DHCP_MTU           */

 	{ OPTION_IP                   | OPTION_REQ, 0x1c }, /* DHCP_BROADCAST     */

 	{ OPTION_IP_PAIR | OPTION_LIST            , 0x21 }, /* DHCP_ROUTES        */

-	{ OPTION_STRING                           , 0x28 }, /* DHCP_NIS_DOMAIN    */

+	{ OPTION_STRING_HOST                      , 0x28 }, /* DHCP_NIS_DOMAIN    */

 	{ OPTION_IP | OPTION_LIST                 , 0x29 }, /* DHCP_NIS_SERVER    */

 	{ OPTION_IP | OPTION_LIST     | OPTION_REQ, 0x2a }, /* DHCP_NTP_SERVER    */

 	{ OPTION_IP | OPTION_LIST                 , 0x2c }, /* DHCP_WINS_SERVER   */

@@ -46,7 +46,7 @@ const struct dhcp_optflag dhcp_optflags[

 	{ OPTION_IP                               , 0x36 }, /* DHCP_SERVER_ID     */

 	{ OPTION_STRING                           , 0x38 }, /* DHCP_ERR_MESSAGE   */

 //TODO: must be combined with 'sname' and 'file' handling:

-	{ OPTION_STRING                           , 0x42 }, /* DHCP_TFTP_SERVER_NAME */

+	{ OPTION_STRING_HOST                      , 0x42 }, /* DHCP_TFTP_SERVER_NAME */

 	{ OPTION_STRING                           , 0x43 }, /* DHCP_BOOT_FILE     */

 //TODO: not a string, but a set of LASCII strings:

 //	{ OPTION_STRING                           , 0x4D }, /* DHCP_USER_CLASS    */

@@ -143,6 +143,7 @@ const uint8_t dhcp_option_lengths[] ALIG

 	[OPTION_IP_PAIR] = 8,

 //	[OPTION_BOOLEAN] = 1,

 	[OPTION_STRING] =  1,  /* ignored by udhcp_str2optset */

+	[OPTION_STRING_HOST] = 1,  /* ignored by udhcp_str2optset */

 #if ENABLE_FEATURE_UDHCP_RFC3397

 	[OPTION_DNS_STRING] = 1,  /* ignored by both udhcp_str2optset and xmalloc_optname_optval */

 	[OPTION_SIP_SERVERS] = 1,

@@ -411,7 +412,9 @@ static NOINLINE void attach_option(

 			/* actually 255 is ok too, but adding a space can overlow it */

 			existing->data = xrealloc(existing->data, OPT_DATA + 1 + old_len + length);

-			if ((optflag->flags & OPTION_TYPE_MASK) == OPTION_STRING) {

+			if ((optflag->flags & OPTION_TYPE_MASK) == OPTION_STRING

+			 || (optflag->flags & OPTION_TYPE_MASK) == OPTION_STRING_HOST

+			) {

 				/* add space separator between STRING options in a list */

 				existing->data[OPT_DATA + old_len] = ' ';

 				old_len++;

@@ -475,6 +478,7 @@ int FAST_FUNC udhcp_str2optset(const cha

 				retval = udhcp_str2nip(val, buffer + 4);

 			break;

 		case OPTION_STRING:

+		case OPTION_STRING_HOST:

 #if ENABLE_FEATURE_UDHCP_RFC3397

 		case OPTION_DNS_STRING:

 #endif

--- busybox-1.19.4/networking/udhcp/common.h

+++ busybox-1.19.4-udhcp/networking/udhcp/common.h

@@ -80,6 +80,9 @@ enum {

 	OPTION_IP = 1,

 	OPTION_IP_PAIR,

 	OPTION_STRING,

+	/* Opts of STRING_HOST type will be sanitized before they are passed

+	 * to udhcpc script's environment: */

+	OPTION_STRING_HOST,

 //	OPTION_BOOLEAN,

 	OPTION_U8,

 	OPTION_U16,

--- busybox-1.19.4/networking/udhcp/dhcpc.c

+++ busybox-1.19.4-udhcp/networking/udhcp/dhcpc.c

@@ -101,6 +101,7 @@ static const uint8_t len_of_option_as_st

 	[OPTION_IP_PAIR         ] = sizeof("255.255.255.255 ") * 2,

 	[OPTION_STATIC_ROUTES   ] = sizeof("255.255.255.255/32 255.255.255.255 "),

 	[OPTION_STRING          ] = 1,

+	[OPTION_STRING_HOST     ] = 1,

 #if ENABLE_FEATURE_UDHCP_RFC3397

 	[OPTION_DNS_STRING      ] = 1, /* unused */

 	/* Hmmm, this severely overestimates size if SIP_SERVERS option

@@ -135,6 +136,63 @@ static int mton(uint32_t mask)

 	return i;

 }

+/* Check if a given label represents a valid DNS label

+ * Return pointer to the first character after the label upon success,

+ * NULL otherwise.

+ * See RFC1035, 2.3.1

+ */

+/* We don't need to be particularly anal. For example, allowing _, hyphen

+ * at the end, or leading and trailing dots would be ok, since it

+ * can't be used for attacks. (Leading hyphen can be, if someone uses

+ * cmd "$hostname"

+ * in the script: then hostname may be treated as an option)

+ */

+static const char *valid_domain_label(const char *label)

+{

+	unsigned char ch;

+	unsigned pos = 0;

+

+	for (;;) {

+		ch = *label;

+		if ((ch|0x20) < 'a' || (ch|0x20) > 'z') {

+			if (pos == 0) {

+				/* label must begin with letter */

+				return NULL;

+			}

+			if (ch < '0' || ch > '9') {

+				if (ch == '\0' || ch == '.')

+					return label;

+				/* DNS allows only '-', but we are more permissive */

+				if (ch != '-' && ch != '_')

+					return NULL;

+			}

+		}

+		label++;

+		pos++;

+		//Do we want this?

+		//if (pos > 63) /* NS_MAXLABEL; labels must be 63 chars or less */

+		//	return NULL;

+	}

+}

+

+/* Check if a given name represents a valid DNS name */

+/* See RFC1035, 2.3.1 */

+static int good_hostname(const char *name)

+{

+	//const char *start = name;

+

+	for (;;) {

+		name = valid_domain_label(name);

+		if (!name)

+			return 0;

+		if (!name[0])

+			return 1;

+			//Do we want this?

+			//return ((name - start) < 1025); /* NS_MAXDNAME */

+		name++;

+	}

+}

+

 /* Create "opt_name=opt_value" string */

 static NOINLINE char *xmalloc_optname_optval(uint8_t *option, const struct dhcp_optflag *optflag, const char *opt_name)

 {

@@ -185,8 +243,11 @@ static NOINLINE char *xmalloc_optname_op

 			break;

 		}

 		case OPTION_STRING:

+		case OPTION_STRING_HOST:

 			memcpy(dest, option, len);

 			dest[len] = '\0';

+			if (type == OPTION_STRING_HOST && !good_hostname(dest))

+				safe_strncpy(dest, "bad", len);

 			return ret;	 /* Short circuit this case */

 		case OPTION_STATIC_ROUTES: {

 			/* Option binary format:

@@ -314,6 +375,7 @@ static char **fill_envp(struct dhcp_pack

 	/* +1 element for each option, +2 for subnet option: */

 	if (packet) {

 		/* note: do not search for "pad" (0) and "end" (255) options */

+//TODO: change logic to scan packet _once_

 		for (i = 1; i < 255; i++) {

 			temp = udhcp_get_option(packet, i);

 			if (temp) {

--- busybox-1.20.2/libbb/kernel_version.c

+++ busybox-1.20.2-kernel_ver/libbb/kernel_version.c

@@ -20,18 +20,15 @@

 int FAST_FUNC get_linux_version_code(void)

 {

 	struct utsname name;

-	char *s;

+	char *s, *t;

 	int i, r;

-	if (uname(&name) == -1) {

-		bb_perror_msg("can't get system information");

-		return 0;

-	}

-

+	uname(&name); /* never fails */

 	s = name.release;

 	r = 0;

 	for (i = 0; i < 3; i++) {

-		r = r * 256 + atoi(strtok(s, "."));

+		t = strtok(s, ".");

+		r = r * 256 + (t ? atoi(t) : 0);

 		s = NULL;

 	}

 	return r;

--- busybox-1.20.2/networking/ntpd.c

+++ busybox-1.20.2-ntpd/networking/ntpd.c

@@ -1840,7 +1840,7 @@ recv_and_process_client_pkt(void /*int f

 	/* Build a reply packet */

 	memset(&msg, 0, sizeof(msg));

-	msg.m_status = G.stratum < MAXSTRAT ? G.ntp_status : LI_ALARM;

+	msg.m_status = G.stratum < MAXSTRAT ? (G.ntp_status & LI_MASK) : LI_ALARM;

 	msg.m_status |= (query_status & VERSION_MASK);

 	msg.m_status |= ((query_status & MODE_MASK) == MODE_CLIENT) ?

 			 MODE_SERVER : MODE_SYM_PAS;

From b1cec5003b73080a8aa7ea277621bf1c71c3e8d6 Mon Sep 17 00:00:00 2001

From: Mike Frysinger <vapier@gentoo.org>

Date: Sat, 20 Oct 2012 15:01:26 -0400

Subject: [PATCH] build system: use pkg-config to look up selinux libs

Newer versions of libselinux has started linking against more libs.

Rather than continuing hardcoding things, switch to using pkg-config

to query for its dependencies.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

---

 Makefile       |  1 +

 Makefile.flags | 12 +++++++++++-

 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile

index fccde4a..3a0a5e1 100644

--- a/Makefile

+++ b/Makefile

@@ -297,6 +297,7 @@ NM		= $(CROSS_COMPILE)nm

 STRIP		= $(CROSS_COMPILE)strip

 OBJCOPY		= $(CROSS_COMPILE)objcopy

 OBJDUMP		= $(CROSS_COMPILE)objdump

+PKG_CONFIG	?= $(CROSS_COMPILE)pkg-config

 AWK		= awk

 GENKSYMS	= scripts/genksyms/genksyms

 DEPMOD		= /sbin/depmod

diff --git a/Makefile.flags b/Makefile.flags

index c43c8dc..15dcc1f 100644

--- a/Makefile.flags

+++ b/Makefile.flags

@@ -74,6 +74,12 @@ ARCH_FPIC ?= -fpic

 ARCH_FPIE ?= -fpie

 ARCH_PIE ?= -pie

+# Usage: $(eval $(call pkg_check_modules,VARIABLE-PREFIX,MODULES))

+define pkg_check_modules

+$(1)_CFLAGS := $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --cflags $(2))

+$(1)_LIBS := $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --libs $(2))

+endef

+

 ifeq ($(CONFIG_BUILD_LIBBUSYBOX),y)

 # on i386: 14% smaller libbusybox.so

 # (code itself is 9% bigger, we save on relocs/PLT/GOT)

@@ -85,6 +91,7 @@ endif

 ifeq ($(CONFIG_STATIC),y)

 CFLAGS_busybox += -static

+PKG_CONFIG_FLAGS += --static

 endif

 ifeq ($(CONFIG_PIE),y)

@@ -127,7 +134,10 @@ LDLIBS += pam pam_misc pthread

 endif

 ifeq ($(CONFIG_SELINUX),y)

-LDLIBS += selinux sepol

+SELINUX_PC_MODULES = libselinux libsepol

+$(eval $(call pkg_check_modules,SELINUX,$(SELINUX_PC_MODULES)))

+CPPFLAGS += $(SELINUX_CFLAGS)

+LDLIBS += $(if $(SELINUX_LIBS),$(SELINUX_LIBS:-l%=%),$(SELINUX_PC_MODULES:lib%=%))

 endif

 ifeq ($(CONFIG_EFENCE),y)

-- 

1.7.12