diff options
8 files changed, 13 insertions, 91 deletions
diff --git a/package/busybox/patches/004-upstream-percent_decode_in_place.patch b/package/busybox/patches/004-upstream-percent_decode_in_place.patch index bef4a9079..d94ee4790 100644 --- a/package/busybox/patches/004-upstream-percent_decode_in_place.patch +++ b/package/busybox/patches/004-upstream-percent_decode_in_place.patch @@ -222,7 +222,7 @@ Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com> h->host = sp + 1; } -@@ -661,12 +666,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) { diff --git a/package/busybox/patches/007-upstream_mkfs_ext2_fixes.patch b/package/busybox/patches/007-upstream_mkfs_ext2_fixes.patch index e48883895..8528ee87f 100644 --- a/package/busybox/patches/007-upstream_mkfs_ext2_fixes.patch +++ b/package/busybox/patches/007-upstream_mkfs_ext2_fixes.patch @@ -575,7 +575,7 @@ --- a/e2fsprogs/old_e2fsprogs/e2fsck.c +++ b/e2fsprogs/old_e2fsprogs/e2fsck.c -@@ -11577,7 +11577,7 @@ static void check_resize_inode(e2fsck_t +@@ -11577,7 +11577,7 @@ static void check_resize_inode(e2fsck_t * s_reserved_gdt_blocks must be zero. */ if (!(fs->super->s_feature_compat & @@ -584,7 +584,7 @@ if (fs->super->s_reserved_gdt_blocks) { pctx.num = fs->super->s_reserved_gdt_blocks; if (fix_problem(ctx, PR_0_NONZERO_RESERVED_GDT_BLOCKS, -@@ -11593,7 +11593,7 @@ static void check_resize_inode(e2fsck_t +@@ -11593,7 +11593,7 @@ static void check_resize_inode(e2fsck_t retval = ext2fs_read_inode(fs, EXT2_RESIZE_INO, &inode); if (retval) { if (fs->super->s_feature_compat & @@ -593,7 +593,7 @@ ctx->flags |= E2F_FLAG_RESIZE_INODE; return; } -@@ -11603,7 +11603,7 @@ static void check_resize_inode(e2fsck_t +@@ -11603,7 +11603,7 @@ static void check_resize_inode(e2fsck_t * the resize inode is cleared; then we're done. */ if (!(fs->super->s_feature_compat & diff --git a/package/busybox/patches/244-udhcpc_add_6rd_option.patch b/package/busybox/patches/244-udhcpc_add_6rd_option.patch index b423ec98c..2f0eadb16 100644 --- a/package/busybox/patches/244-udhcpc_add_6rd_option.patch +++ b/package/busybox/patches/244-udhcpc_add_6rd_option.patch @@ -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, [OPTION_STRING_HOST ] = 1, #if ENABLE_FEATURE_UDHCP_RFC3397 -@@ -124,6 +125,23 @@ static int sprint_nip(char *dest, const +@@ -124,6 +125,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) { -@@ -293,6 +311,70 @@ static NOINLINE char *xmalloc_optname_op +@@ -292,6 +310,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=") */ diff --git a/package/busybox/patches/260-vconfig_proc.patch b/package/busybox/patches/260-vconfig_proc.patch index 5d6c26b98..7ac52abbf 100644 --- a/package/busybox/patches/260-vconfig_proc.patch +++ b/package/busybox/patches/260-vconfig_proc.patch @@ -1,6 +1,6 @@ --- a/networking/vconfig.c +++ b/networking/vconfig.c -@@ -116,8 +116,6 @@ static const char name_types[] ALIGN1 = +@@ -116,8 +116,6 @@ static const char name_types[] ALIGN1 = '_', 'N', 'O', '_', 'P', 'A', 'D', 0, }; diff --git a/package/busybox/patches/310-passwd_access.patch b/package/busybox/patches/310-passwd_access.patch index b995599de..daa1b9998 100644 --- a/package/busybox/patches/310-passwd_access.patch +++ b/package/busybox/patches/310-passwd_access.patch @@ -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; diff --git a/package/busybox/patches/340-lock_util.patch b/package/busybox/patches/340-lock_util.patch index fd657b698..eb346421a 100644 --- a/package/busybox/patches/340-lock_util.patch +++ b/package/busybox/patches/340-lock_util.patch @@ -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)) diff --git a/package/busybox/patches/480-mount_union.patch b/package/busybox/patches/480-mount_union.patch deleted file mode 100644 index 2f236a152..000000000 --- a/package/busybox/patches/480-mount_union.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/util-linux/mount.c -+++ b/util-linux/mount.c -@@ -136,6 +136,10 @@ - # include <rpc/pmap_clnt.h> - #endif - -+#ifndef MS_UNION -+#define MS_UNION 0x100 /* 256: Mount on top of a union */ -+#endif -+ - - #if defined(__dietlibc__) - // 16.12.2006, Sampo Kellomaki (sampo@iki.fi) -@@ -254,6 +258,7 @@ static const int32_t mount_options[] = { - /* "rslave" */ MS_SLAVE|MS_RECURSIVE, - /* "rprivate" */ MS_PRIVATE|MS_RECURSIVE, - /* "runbindable" */ MS_UNBINDABLE|MS_RECURSIVE, -+ /* "union" */ MS_UNION, - ) - - // Always understood. -@@ -310,6 +315,7 @@ static const char mount_option_str[] = - "make-rslave\0" - "make-rprivate\0" - "make-runbindable\0" -+ "make-union\0" - ) - - // Always understood. diff --git a/package/busybox/patches/803-id_getgrouplist.patch b/package/busybox/patches/803-id_getgrouplist.patch deleted file mode 100644 index 66c184959..000000000 --- a/package/busybox/patches/803-id_getgrouplist.patch +++ /dev/null @@ -1,49 +0,0 @@ -This patch disable supplementary groups handling in id with uClibc versions -prior to v0.9.30, which are lacking the 'getgrouplist' function. - -Signed-off-by: Nicolas Thill <nico@openwrt.org> - ---- a/coreutils/id.c -+++ b/coreutils/id.c -@@ -63,10 +63,12 @@ - - /* This is a NOEXEC applet. Be very careful! */ - -+#define HAVE_GETGROUPLIST 1 -+ - #if !ENABLE_USE_BB_PWD_GRP - #if defined(__UCLIBC_MAJOR__) && (__UCLIBC_MAJOR__ == 0) - #if (__UCLIBC_MINOR__ < 9) || (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ < 30) --#error "Sorry, you need at least uClibc version 0.9.30 for id applet to build" -+#undef HAVE_GETGROUPLIST - #endif - #endif - #endif -@@ -128,7 +130,11 @@ static int get_groups(const char *userna - /* If the user is a member of more than - * *n groups, then -1 is returned. Otherwise >= 0. - * (and no defined way of detecting errors?!) */ -+#if HAVE_GETGROUPLIST - m = getgrouplist(username, rgid, groups, n); -+#else -+ *n = -1; -+#endif - /* 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 - if (egid != rgid) - status |= print_group(egid, " "); - } -+#if HAVE_GETGROUPLIST - /* 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 - } - if (ENABLE_FEATURE_CLEAN_UP) - free(groups); -+#endif - #if ENABLE_SELINUX - if (is_selinux_enabled()) { - if (getcon(&scontext) == 0) |