busybox: additional 1.12.1 patches

1 files changed, 185 insertions, 0 deletions

diff --git a/package/busybox/busybox-1.12.1-standalone.patch b/package/busybox/busybox-1.12.1-standalone.patch
new file mode 100644
index 000000000..f1827c74e
--- /dev/null
+++ b/package/busybox/busybox-1.12.1-standalone.patch
@@ -0,0 +1,185 @@
+diff -urpN busybox-1.12.1/coreutils/env.c busybox-1.12.1-standalone/coreutils/env.c
+--- busybox-1.12.1/coreutils/env.c	2008-09-28 20:04:18.000000000 +0200
++++ busybox-1.12.1-standalone/coreutils/env.c	2008-10-20 10:21:54.000000000 +0200
+@@ -29,6 +29,8 @@
+  * - use xfunc_error_retval
+  */
+ 
++/* This is a NOEXEC applet. Be very careful! */
++
+ #include "libbb.h"
+ 
+ #if ENABLE_FEATURE_ENV_LONG_OPTIONS
+@@ -119,5 +121,3 @@ int env_main(int argc UNUSED_PARAM, char
+  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+  * SUCH DAMAGE.
+  */
+-
+-
+diff -urpN busybox-1.12.1/include/applets.h busybox-1.12.1-standalone/include/applets.h
+--- busybox-1.12.1/include/applets.h	2008-09-28 20:04:26.000000000 +0200
++++ busybox-1.12.1-standalone/include/applets.h	2008-10-20 10:21:54.000000000 +0200
+@@ -136,7 +136,7 @@ USE_ECHO(APPLET_NOFORK(echo, echo, _BB_D
+ USE_ED(APPLET(ed, _BB_DIR_BIN, _BB_SUID_NEVER))
+ USE_FEATURE_GREP_EGREP_ALIAS(APPLET_ODDNAME(egrep, grep, _BB_DIR_BIN, _BB_SUID_NEVER, egrep))
+ USE_EJECT(APPLET(eject, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
+-USE_ENV(APPLET(env, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
++USE_ENV(APPLET_NOEXEC(env, env, _BB_DIR_USR_BIN, _BB_SUID_NEVER, env))
+ USE_ENVDIR(APPLET_ODDNAME(envdir, chpst, _BB_DIR_USR_BIN, _BB_SUID_NEVER, envdir))
+ USE_ENVUIDGID(APPLET_ODDNAME(envuidgid, chpst, _BB_DIR_USR_BIN, _BB_SUID_NEVER, envuidgid))
+ USE_ETHER_WAKE(APPLET_ODDNAME(ether-wake, ether_wake, _BB_DIR_USR_BIN, _BB_SUID_NEVER, ether_wake))
+@@ -171,7 +171,7 @@ USE_GREP(APPLET(grep, _BB_DIR_BIN, _BB_S
+ USE_GUNZIP(APPLET(gunzip, _BB_DIR_BIN, _BB_SUID_NEVER))
+ USE_GZIP(APPLET(gzip, _BB_DIR_BIN, _BB_SUID_NEVER))
+ USE_HALT(APPLET(halt, _BB_DIR_SBIN, _BB_SUID_NEVER))
+-USE_HD(APPLET_ODDNAME(hd, hexdump, _BB_DIR_USR_BIN, _BB_SUID_NEVER, hd))
++USE_HD(APPLET_NOEXEC(hd, hexdump, _BB_DIR_USR_BIN, _BB_SUID_NEVER, hd))
+ USE_HDPARM(APPLET(hdparm, _BB_DIR_SBIN, _BB_SUID_NEVER))
+ USE_HEAD(APPLET(head, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
+ USE_HEXDUMP(APPLET_NOEXEC(hexdump, hexdump, _BB_DIR_USR_BIN, _BB_SUID_NEVER, hexdump))
+diff -urpN busybox-1.12.1/libbb/getopt32.c busybox-1.12.1-standalone/libbb/getopt32.c
+--- busybox-1.12.1/libbb/getopt32.c	2008-09-28 20:04:20.000000000 +0200
++++ busybox-1.12.1-standalone/libbb/getopt32.c	2008-10-20 10:21:34.000000000 +0200
+@@ -515,28 +515,6 @@ getopt32(char **argv, const char *applet
+ 		}
+ 	}
+ 
+-	/* In case getopt32 was already called:
+-	 * reset the libc getopt() function, which keeps internal state.
+-	 *
+-	 * BSD-derived getopt() functions require that optind be set to 1 in
+-	 * order to reset getopt() state.  This used to be generally accepted
+-	 * way of resetting getopt().  However, glibc's getopt()
+-	 * has additional getopt() state beyond optind, and requires that
+-	 * optind be set to zero to reset its state.  So the unfortunate state of
+-	 * affairs is that BSD-derived versions of getopt() misbehave if
+-	 * optind is set to 0 in order to reset getopt(), and glibc's getopt()
+-	 * will core dump if optind is set 1 in order to reset getopt().
+-	 *
+-	 * More modern versions of BSD require that optreset be set to 1 in
+-	 * order to reset getopt().   Sigh.  Standards, anyone?
+-	 */
+-#ifdef __GLIBC__
+-	optind = 0;
+-#else /* BSD style */
+-	optind = 1;
+-	/* optreset = 1; */
+-#endif
+-	/* optarg = NULL; opterr = 0; optopt = 0; - do we need this?? */
+ 	pargv = NULL;
+ 
+ 	/* Note: just "getopt() <= 0" will not work well for
+diff -urpN busybox-1.12.1/libbb/vfork_daemon_rexec.c busybox-1.12.1-standalone/libbb/vfork_daemon_rexec.c
+--- busybox-1.12.1/libbb/vfork_daemon_rexec.c	2008-09-28 20:04:20.000000000 +0200
++++ busybox-1.12.1-standalone/libbb/vfork_daemon_rexec.c	2008-10-20 10:21:34.000000000 +0200
+@@ -125,6 +125,7 @@ int FAST_FUNC run_nofork_applet_prime(st
+ 	int rc, argc;
+ 
+ 	applet_name = APPLET_NAME(applet_no);
++
+ 	xfunc_error_retval = EXIT_FAILURE;
+ 
+ 	/* Special flag for xfunc_die(). If xfunc will "die"
+@@ -132,7 +133,30 @@ int FAST_FUNC run_nofork_applet_prime(st
+ 	 * die_sleep and longjmp here instead. */
+ 	die_sleep = -1;
+ 
+-	/* option_mask32 = 0; - not needed */
++	/* In case getopt() or getopt32() was already called:
++	 * reset the libc getopt() function, which keeps internal state.
++	 *
++	 * BSD-derived getopt() functions require that optind be set to 1 in
++	 * order to reset getopt() state.  This used to be generally accepted
++	 * way of resetting getopt().  However, glibc's getopt()
++	 * has additional getopt() state beyond optind, and requires that
++	 * optind be set to zero to reset its state.  So the unfortunate state of
++	 * affairs is that BSD-derived versions of getopt() misbehave if
++	 * optind is set to 0 in order to reset getopt(), and glibc's getopt()
++	 * will core dump if optind is set 1 in order to reset getopt().
++	 *
++	 * More modern versions of BSD require that optreset be set to 1 in
++	 * order to reset getopt().  Sigh.  Standards, anyone?
++	 */
++#ifdef __GLIBC__
++	optind = 0;
++#else /* BSD style */
++	optind = 1;
++	/* optreset = 1; */
++#endif
++	/* optarg = NULL; opterr = 1; optopt = 63; - do we need this too? */
++	/* (values above are what they initialized to in glibc and uclibc) */
++	/* option_mask32 = 0; - not needed, no applet depends on it being 0 */
+ 
+ 	argc = 1;
+ 	while (argv[argc])
+@@ -161,8 +185,16 @@ int FAST_FUNC run_nofork_applet_prime(st
+ 			rc = 0;
+ 	}
+ 
+-	/* Restoring globals */
++	/* Restoring some globals */
+ 	restore_nofork_data(old);
++
++	/* Other globals can be simply reset to defaults */
++#ifdef __GLIBC__
++	optind = 0;
++#else /* BSD style */
++	optind = 1;
++#endif
++
+ 	return rc & 0xff; /* don't confuse people with "exitcodes" >255 */
+ }
+ 
+diff -urpN busybox-1.12.1/shell/ash.c busybox-1.12.1-standalone/shell/ash.c
+--- busybox-1.12.1/shell/ash.c	2008-09-28 20:04:18.000000000 +0200
++++ busybox-1.12.1-standalone/shell/ash.c	2008-10-20 10:21:54.000000000 +0200
+@@ -6964,8 +6964,11 @@ tryexec(USE_FEATURE_SH_STANDALONE(int ap
+ 
+ #if ENABLE_FEATURE_SH_STANDALONE
+ 	if (applet_no >= 0) {
+-		if (APPLET_IS_NOEXEC(applet_no))
++		if (APPLET_IS_NOEXEC(applet_no)) {
++			while (*envp)
++				putenv(*envp++);
+ 			run_applet_no_and_exit(applet_no, argv);
++		}
+ 		/* re-exec ourselves with the new arguments */
+ 		execve(bb_busybox_exec_path, argv, envp);
+ 		/* If they called chroot or otherwise made the binary no longer
+@@ -12014,7 +12017,7 @@ exportcmd(int argc UNUSED_PARAM, char **
+ 	char *name;
+ 	const char *p;
+ 	char **aptr;
+-	int flag = argv[0][0] == 'r'? VREADONLY : VEXPORT;
++	int flag = argv[0][0] == 'r' ? VREADONLY : VEXPORT;
+ 
+ 	if (nextopt("p") != 'p') {
+ 		aptr = argptr;
+diff -urpN busybox-1.12.1/util-linux/getopt.c busybox-1.12.1-standalone/util-linux/getopt.c
+--- busybox-1.12.1/util-linux/getopt.c	2008-09-28 20:04:30.000000000 +0200
++++ busybox-1.12.1-standalone/util-linux/getopt.c	2008-10-20 10:21:34.000000000 +0200
+@@ -142,7 +142,8 @@ static const char *normalize(const char 
+  * Other settings are found in global variables.
+  */
+ #if !ENABLE_GETOPT_LONG
+-#define generate_output(argv,argc,optstr,longopts) generate_output(argv,argc,optstr)
++#define generate_output(argv,argc,optstr,longopts) \
++	generate_output(argv,argc,optstr)
+ #endif
+ static int generate_output(char **argv, int argc, const char *optstr, const struct option *longopts)
+ {
+@@ -156,14 +157,6 @@ static int generate_output(char **argv, 
+ 	if (quiet_errors) /* No error reporting from getopt(3) */
+ 		opterr = 0;
+ 
+-	/* Reset getopt(3) (see libbb/getopt32.c for long rant) */
+-#ifdef __GLIBC__
+-	optind = 0;
+-#else /* BSD style */
+-	optind = 1;
+-	/* optreset = 1; */
+-#endif
+-
+ 	while (1) {
+ 		opt =
+ #if ENABLE_GETOPT_LONG