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

busybox: remove two obsolete patches

Browse source 
They either work around missing implementations in uClibc 0.9.30 and
earlier and add already present functionality.

Closes #11210, #11211.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>

SVN-Revision: 35710
This commit is contained in:
Jonas Gorski 2013-02-21 11:45:10 +00:00
parent 55f65c5c1d
commit 5636037cff
8 changed files with 13 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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=") */

29
package/busybox/patches/480-mount_union.patch
View file

@ -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.

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

@ -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)