KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

busybox 1.19.4 update patch

Browse source 
This patch updates busybox to 1.19.4 and refreshes all patches.

Signed-off-by: Peter Wagner <tripolar@gmx.at>

SVN-Revision: 30985
This commit is contained in:
Jo-Philipp Wich 2012-03-18 19:46:52 +00:00
parent 7aefa1da37
commit 0a18161da1
9 changed files with 15 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
package/busybox/Makefile
View file

@ -8,14 +8,14 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=busybox
PKG_VERSION:=1.19.3
PKG_RELEASE:=10
PKG_VERSION:=1.19.4
PKG_RELEASE:=1
PKG_FLAGS:=essential
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://www.busybox.net/downloads \
http://distfiles.gentoo.org/distfiles/
PKG_MD5SUM:=c3938e1ac59602387009bbf1dd1af7f6
PKG_MD5SUM:=9c0cae5a0379228e7b55e5b29528df8e
PKG_BUILD_DEPENDS:=BUSYBOX_USE_LIBRPC:librpc
PKG_BUILD_PARALLEL:=1

12
package/busybox/patches/000-upstream-getty.patch
View file

@ -1,12 +0,0 @@
--- a/loginutils/getty.c
+++ b/loginutils/getty.c
@@ -271,7 +271,9 @@ static void termios_init(int speed)
#ifdef CMSPAR
| CMSPAR /* mark or space parity */
#endif
+#ifdef CBAUD
| CBAUD /* (output) baud rate */
+#endif
#ifdef CBAUDEX
| CBAUDEX /* (output) baud rate */
#endif

10
package/busybox/patches/000-upstream-modinfo.patch
View file

@ -1,10 +0,0 @@
--- a/modutils/modinfo.c
+++ b/modutils/modinfo.c
@@ -13,6 +13,7 @@
//config:config MODINFO
//config: bool "modinfo"
//config: default y
+//config: select PLATFORM_LINUX
//config: help
//config: Show information about a Linux Kernel module

2
package/busybox/patches/004-upstream-percent_decode_in_place.patch
View file

@ -222,7 +222,7 @@ Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
h->host = sp + 1;
}
@@ -660,12 +665,6 @@ static void download_one_url(const char
@@ -661,12 +666,6 @@ static void download_one_url(const char
#if ENABLE_FEATURE_WGET_AUTHENTICATION
if (target.user) {

2
package/busybox/patches/110-wget_getopt_fix.patch
View file

@ -1,6 +1,6 @@
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -871,7 +871,7 @@ int wget_main(int argc UNUSED_PARAM, cha
@@ -873,7 +873,7 @@ int wget_main(int argc UNUSED_PARAM, cha
/* Ignored: */
// "tries\0" Required_argument "t"
/* Ignored (we always use PASV): */

12
package/busybox/patches/244-udhcpc_add_6rd_option.patch
View file

@ -9,7 +9,7 @@
{ OPTION_STRING , 0xfc }, /* DHCP_WPAD */
/* Options below have no match in dhcp_option_strings[],
@@ -127,6 +129,8 @@ const char dhcp_option_strings[] ALIGN1
@@ -127,6 +129,8 @@ const char dhcp_option_strings[] ALIGN1
"vlanpriority" "\0"/* DHCP_VLAN_PRIORITY */
#endif
"msstaticroutes""\0"/* DHCP_MS_STATIC_ROUTES */
@ -46,7 +46,7 @@
[OPTION_STRING ] = 1,
#if ENABLE_FEATURE_UDHCP_RFC3397
[OPTION_DNS_STRING ] = 1, /* unused */
@@ -123,6 +124,23 @@ static int sprint_nip(char *dest, const
@@ -123,6 +124,23 @@ static int sprint_nip(char *dest, const
return sprintf(dest, "%s%u.%u.%u.%u", pre, ip[0], ip[1], ip[2], ip[3]);
}
@ -70,10 +70,11 @@
/* really simple implementation, just count the bits */
static int mton(uint32_t mask)
{
@@ -232,6 +250,70 @@ static NOINLINE char *xmalloc_optname_op
@@ -231,6 +249,70 @@ static NOINLINE char *xmalloc_optname_op
}
return ret;
}
+ }
+ case OPTION_6RD: {
+ /* Option binary format:
+ * 0 1 2 3
@ -137,7 +138,6 @@
+ }
+
+ return ret;
+ }
}
#if ENABLE_FEATURE_UDHCP_RFC3397
case OPTION_DNS_STRING:
/* unpack option into dest; use ret for prefix (i.e., "optname=") */

2
package/busybox/patches/310-passwd_access.patch
View file

@ -3,7 +3,7 @@
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -1700,21 +1700,32 @@ static int check_user_passwd(const char
@@ -1700,21 +1700,32 @@ static int check_user_passwd(const char
if (ENABLE_FEATURE_HTTPD_AUTH_MD5) {
char *md5_passwd;

2
package/busybox/patches/340-lock_util.patch
View file

@ -1,6 +1,6 @@
--- a/include/applets.src.h
+++ b/include/applets.src.h
@@ -218,6 +218,7 @@ IF_LN(APPLET_NOEXEC(ln, ln, BB_DIR_BIN,
@@ -218,6 +218,7 @@ IF_LN(APPLET_NOEXEC(ln, ln, BB_DIR_BIN,
IF_LOAD_POLICY(APPLET(load_policy, BB_DIR_USR_SBIN, BB_SUID_DROP))
IF_LOADFONT(APPLET(loadfont, BB_DIR_USR_SBIN, BB_SUID_DROP))
IF_LOADKMAP(APPLET(loadkmap, BB_DIR_SBIN, BB_SUID_DROP))

4
package/busybox/patches/803-id_getgrouplist.patch
View file

@ -31,7 +31,7 @@ Signed-off-by: Nicolas Thill <nico@openwrt.org>
/* I guess *n < 0 might indicate error. Anyway,
* malloc'ing -1 bytes won't be good, so: */
if (*n < 0)
@@ -210,6 +216,7 @@ int id_main(int argc UNUSED_PARAM, char
@@ -210,6 +216,7 @@ int id_main(int argc UNUSED_PARAM, char
if (egid != rgid)
status |= print_group(egid, " ");
}
@ -39,7 +39,7 @@ Signed-off-by: Nicolas Thill <nico@openwrt.org>
/* We are supplying largish buffer, trying
* to not run get_groups() twice. That might be slow
* ("user database in remote SQL server" case) */
@@ -236,6 +243,7 @@ int id_main(int argc UNUSED_PARAM, char
@@ -236,6 +243,7 @@ int id_main(int argc UNUSED_PARAM, char
}
if (ENABLE_FEATURE_CLEAN_UP)
free(groups);