From: Nicolas Thill <nico@openwrt.org>
Date: Wed, 19 May 2010 21:39:10 +0000 (+0000)
Subject: package/busybox: add upstream udhcp hostname truncation fix, bump release number
X-Git-Tag: reboot~19844
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f7d97234e23cb31940cfe5690ca8a4f32cbe08b6;p=openwrt%2Fstaging%2Fblogic.git

package/busybox: add upstream udhcp hostname truncation fix, bump release number

SVN-Revision: 21510
---

diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 3b93a0575d40..60daf8d7d4aa 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=busybox
 PKG_VERSION:=1.16.1
-PKG_RELEASE:=5
+PKG_RELEASE:=6
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.busybox.net/downloads \
diff --git a/package/busybox/patches/000-upstream-dhcpd.patch b/package/busybox/patches/000-upstream-dhcpd.patch
new file mode 100644
index 000000000000..eef33f80de74
--- /dev/null
+++ b/package/busybox/patches/000-upstream-dhcpd.patch
@@ -0,0 +1,11 @@
+--- a/networking/udhcp/leases.c
++++ b/networking/udhcp/leases.c
+@@ -64,6 +64,8 @@ struct dyn_lease* FAST_FUNC add_lease(
+ 		oldest->hostname[0] = '\0';
+ 		if (hostname) {
+ 			char *p;
++
++			hostname_len++; /* include NUL */
+ 			if (hostname_len > sizeof(oldest->hostname))
+ 				hostname_len = sizeof(oldest->hostname);
+ 			p = safe_strncpy(oldest->hostname, hostname, hostname_len);