busybox: update to 1.22.1

[openwrt.git] / package / utils / busybox / patches / 250-ash_export-n.patch

diff --git a/package/utils/busybox/patches/250-ash_export-n.patch b/package/utils/busybox/patches/250-ash_export-n.patch
deleted file mode 100644 (file)
index ddbe74e..0000000
--- a/package/utils/busybox/patches/250-ash_export-n.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/shell/ash.c
-+++ b/shell/ash.c
-@@ -12611,8 +12611,17 @@ exportcmd(int argc UNUSED_PARAM, char **
-       const char *p;
-       char **aptr;
-       int flag = argv[0][0] == 'r' ? VREADONLY : VEXPORT;
-+      int mask = ~0;
-+      int nopt;
-+      while ((nopt = nextopt("np"))) {
-+              if (nopt == 'n') {
-+                              mask = ~flag;
-+              } else { /* p */
-+                      break;
-+              }
-+      }
- 
--      if (nextopt("p") != 'p') {
-+      if (nopt != 'p') {
-               aptr = argptr;
-               name = *aptr;
-               if (name) {
-@@ -12624,10 +12633,11 @@ exportcmd(int argc UNUSED_PARAM, char **
-                                       vp = *findvar(hashvar(name), name);
-                                       if (vp) {
-                                               vp->flags |= flag;
-+                                              vp->flags &= mask;
-                                               continue;
-                                       }
-                               }
--                              setvar(name, p, flag);
-+                              setvar(name, p, flag & mask);
-                       } while ((name = *++aptr) != NULL);
-                       return 0;
-               }