diff --git a/packages/busybox/0001-clang-fix.patch b/packages/busybox/0001-clang-fix.patch
index e18ebdbca..672bc32d9 100644
--- a/packages/busybox/0001-clang-fix.patch
+++ b/packages/busybox/0001-clang-fix.patch
@@ -1,7 +1,51 @@
-diff -uNr busybox-1.31.1/libbb/lineedit.c busybox-1.31.1.mod/libbb/lineedit.c
---- busybox-1.31.1/libbb/lineedit.c	2019-06-10 13:50:53.000000000 +0300
-+++ busybox-1.31.1.mod/libbb/lineedit.c	2019-11-12 12:54:35.000425941 +0200
-@@ -2337,6 +2337,7 @@
+diff -uNr busybox-1.32.0/editors/awk.c busybox-1.32.0.mod/editors/awk.c
+--- busybox-1.32.0/editors/awk.c	2020-06-26 21:47:44.000000000 +0300
++++ busybox-1.32.0.mod/editors/awk.c	2020-10-02 21:43:17.208050022 +0300
+@@ -3190,6 +3190,7 @@
+ #undef files_happen
+ }
+ 
++#pragma clang optimize off
+ int awk_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+ int awk_main(int argc UNUSED_PARAM, char **argv)
+ {
+diff -uNr busybox-1.32.0/editors/diff.c busybox-1.32.0.mod/editors/diff.c
+--- busybox-1.32.0/editors/diff.c	2020-06-26 21:47:44.000000000 +0300
++++ busybox-1.32.0.mod/editors/diff.c	2020-10-02 21:43:17.208050022 +0300
+@@ -972,6 +972,7 @@
+ # define LONGOPTS
+ #endif
+ 
++#pragma clang optimize off
+ int diff_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+ int diff_main(int argc UNUSED_PARAM, char **argv)
+ {
+diff -uNr busybox-1.32.0/editors/ed.c busybox-1.32.0.mod/editors/ed.c
+--- busybox-1.32.0/editors/ed.c	2020-06-26 21:47:44.000000000 +0300
++++ busybox-1.32.0.mod/editors/ed.c	2020-10-02 21:43:17.208050022 +0300
+@@ -990,6 +990,7 @@
+ 	}
+ }
+ 
++#pragma clang optimize off
+ int ed_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+ int ed_main(int argc UNUSED_PARAM, char **argv)
+ {
+diff -uNr busybox-1.32.0/editors/vi.c busybox-1.32.0.mod/editors/vi.c
+--- busybox-1.32.0/editors/vi.c	2020-06-26 21:47:44.000000000 +0300
++++ busybox-1.32.0.mod/editors/vi.c	2020-10-02 21:43:17.208050022 +0300
+@@ -4314,6 +4314,7 @@
+ #undef cur_line
+ }
+ 
++#pragma clang optimize off
+ int vi_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+ int vi_main(int argc, char **argv)
+ {
+diff -uNr busybox-1.32.0/libbb/lineedit.c busybox-1.32.0.mod/libbb/lineedit.c
+--- busybox-1.32.0/libbb/lineedit.c	2020-06-26 21:47:44.000000000 +0300
++++ busybox-1.32.0.mod/libbb/lineedit.c	2020-10-02 21:43:08.191980579 +0300
+@@ -2348,6 +2348,7 @@
   * (in both cases the cursor remains on the input line, '\n' is not printed)
   * >0 length of input string, including terminating '\n'
   */
@@ -9,10 +53,10 @@ diff -uNr busybox-1.31.1/libbb/lineedit.c busybox-1.31.1.mod/libbb/lineedit.c
  int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *command, int maxsize)
  {
  	int len, n;
-diff -uNr busybox-1.31.1/miscutils/bc.c busybox-1.31.1.mod/miscutils/bc.c
---- busybox-1.31.1/miscutils/bc.c	2019-10-21 17:54:40.000000000 +0300
-+++ busybox-1.31.1.mod/miscutils/bc.c	2019-11-12 12:48:49.419098420 +0200
-@@ -7435,6 +7435,7 @@
+diff -uNr busybox-1.32.0/miscutils/bc.c busybox-1.32.0.mod/miscutils/bc.c
+--- busybox-1.32.0/miscutils/bc.c	2020-06-26 21:47:44.000000000 +0300
++++ busybox-1.32.0.mod/miscutils/bc.c	2020-10-02 21:43:08.195980610 +0300
+@@ -7440,6 +7440,7 @@
  }
  
  #if ENABLE_BC
@@ -20,7 +64,7 @@ diff -uNr busybox-1.31.1/miscutils/bc.c busybox-1.31.1.mod/miscutils/bc.c
  int bc_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
  int bc_main(int argc UNUSED_PARAM, char **argv)
  {
-@@ -7454,6 +7455,7 @@
+@@ -7459,6 +7460,7 @@
  #endif
  
  #if ENABLE_DC
@@ -28,9 +72,9 @@ diff -uNr busybox-1.31.1/miscutils/bc.c busybox-1.31.1.mod/miscutils/bc.c
  int dc_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
  int dc_main(int argc UNUSED_PARAM, char **argv)
  {
-diff -uNr busybox-1.31.1/miscutils/less.c busybox-1.31.1.mod/miscutils/less.c
---- busybox-1.31.1/miscutils/less.c	2019-06-10 13:50:53.000000000 +0300
-+++ busybox-1.31.1.mod/miscutils/less.c	2019-11-12 03:30:59.054944977 +0200
+diff -uNr busybox-1.32.0/miscutils/less.c busybox-1.32.0.mod/miscutils/less.c
+--- busybox-1.32.0/miscutils/less.c	2018-12-30 17:14:20.000000000 +0200
++++ busybox-1.32.0.mod/miscutils/less.c	2020-10-02 21:43:08.195980610 +0300
 @@ -1803,6 +1803,7 @@
  }
  #endif
@@ -39,9 +83,9 @@ diff -uNr busybox-1.31.1/miscutils/less.c busybox-1.31.1.mod/miscutils/less.c
  int less_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
  int less_main(int argc, char **argv)
  {
-diff -uNr busybox-1.31.1/networking/ftpd.c busybox-1.31.1.mod/networking/ftpd.c
---- busybox-1.31.1/networking/ftpd.c	2019-06-10 13:50:53.000000000 +0300
-+++ busybox-1.31.1.mod/networking/ftpd.c	2019-11-12 04:05:11.739983958 +0200
+diff -uNr busybox-1.32.0/networking/ftpd.c busybox-1.32.0.mod/networking/ftpd.c
+--- busybox-1.32.0/networking/ftpd.c	2018-12-05 16:44:34.000000000 +0200
++++ busybox-1.32.0.mod/networking/ftpd.c	2020-10-02 21:43:08.195980610 +0300
 @@ -1169,6 +1169,7 @@
  	OPT_w = (1 << (BIT_A + 3)) * ENABLE_FEATURE_FTPD_WRITE,
  };
@@ -50,9 +94,9 @@ diff -uNr busybox-1.31.1/networking/ftpd.c busybox-1.31.1.mod/networking/ftpd.c
  int ftpd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
  int ftpd_main(int argc UNUSED_PARAM, char **argv)
  {
-diff -uNr busybox-1.31.1/networking/httpd.c busybox-1.31.1.mod/networking/httpd.c
---- busybox-1.31.1/networking/httpd.c	2019-06-10 13:50:53.000000000 +0300
-+++ busybox-1.31.1.mod/networking/httpd.c	2019-11-12 03:30:08.104709323 +0200
+diff -uNr busybox-1.32.0/networking/httpd.c busybox-1.32.0.mod/networking/httpd.c
+--- busybox-1.32.0/networking/httpd.c	2020-06-26 21:47:44.000000000 +0300
++++ busybox-1.32.0.mod/networking/httpd.c	2020-10-02 21:43:08.195980610 +0300
 @@ -2663,7 +2663,7 @@
  	OPT_VERBOSE     = 1 << p_opt_verbose,
  };
@@ -62,10 +106,21 @@ diff -uNr busybox-1.31.1/networking/httpd.c busybox-1.31.1.mod/networking/httpd.
  int httpd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
  int httpd_main(int argc UNUSED_PARAM, char **argv)
  {
-diff -uNr busybox-1.31.1/procps/nmeter.c busybox-1.31.1.mod/procps/nmeter.c
---- busybox-1.31.1/procps/nmeter.c	2019-06-10 13:50:53.000000000 +0300
-+++ busybox-1.31.1.mod/procps/nmeter.c	2019-11-12 12:59:16.564931184 +0200
-@@ -821,6 +821,7 @@
+diff -uNr busybox-1.32.0/networking/wget.c busybox-1.32.0.mod/networking/wget.c
+--- busybox-1.32.0/networking/wget.c	2020-06-26 21:47:44.000000000 +0300
++++ busybox-1.32.0.mod/networking/wget.c	2020-10-02 21:43:54.148335280 +0300
+@@ -1430,6 +1430,7 @@
+ 	free(redirected_path);
+ }
+ 
++#pragma clang optimize off
+ int wget_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+ int wget_main(int argc UNUSED_PARAM, char **argv)
+ {
+diff -uNr busybox-1.32.0/procps/nmeter.c busybox-1.32.0.mod/procps/nmeter.c
+--- busybox-1.32.0/procps/nmeter.c	2020-06-26 21:47:44.000000000 +0300
++++ busybox-1.32.0.mod/procps/nmeter.c	2020-10-02 21:43:08.195980610 +0300
+@@ -853,6 +853,7 @@
  	init_cr
  };
  
@@ -73,9 +128,9 @@ diff -uNr busybox-1.31.1/procps/nmeter.c busybox-1.31.1.mod/procps/nmeter.c
  int nmeter_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
  int nmeter_main(int argc UNUSED_PARAM, char **argv)
  {
-diff -uNr busybox-1.31.1/runit/svlogd.c busybox-1.31.1.mod/runit/svlogd.c
---- busybox-1.31.1/runit/svlogd.c	2019-06-10 13:50:53.000000000 +0300
-+++ busybox-1.31.1.mod/runit/svlogd.c	2019-11-12 03:28:11.214155815 +0200
+diff -uNr busybox-1.32.0/runit/svlogd.c busybox-1.32.0.mod/runit/svlogd.c
+--- busybox-1.32.0/runit/svlogd.c	2020-06-26 21:47:44.000000000 +0300
++++ busybox-1.32.0.mod/runit/svlogd.c	2020-10-02 21:43:08.195980610 +0300
 @@ -1034,6 +1034,7 @@
  	}
  }
@@ -84,10 +139,10 @@ diff -uNr busybox-1.31.1/runit/svlogd.c busybox-1.31.1.mod/runit/svlogd.c
  int svlogd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
  int svlogd_main(int argc, char **argv)
  {
-diff -uNr busybox-1.31.1/shell/ash.c busybox-1.31.1.mod/shell/ash.c
---- busybox-1.31.1/shell/ash.c	2019-10-21 17:54:40.000000000 +0300
-+++ busybox-1.31.1.mod/shell/ash.c	2019-11-12 03:24:39.613095056 +0200
-@@ -14278,6 +14278,7 @@
+diff -uNr busybox-1.32.0/shell/ash.c busybox-1.32.0.mod/shell/ash.c
+--- busybox-1.32.0/shell/ash.c	2020-06-26 21:47:44.000000000 +0300
++++ busybox-1.32.0.mod/shell/ash.c	2020-10-02 21:43:08.199980641 +0300
+@@ -14378,6 +14378,7 @@
   * exception occurs.  When an exception occurs the variable "state"
   * is used to figure out how far we had gotten.
   */
diff --git a/packages/busybox/build.sh b/packages/busybox/build.sh
index 4d88f54e3..086ef9c78 100644
--- a/packages/busybox/build.sh
+++ b/packages/busybox/build.sh
@@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://busybox.net/
 TERMUX_PKG_DESCRIPTION="Tiny versions of many common UNIX utilities into a single small executable"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=1.32.0
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=https://busybox.net/downloads/busybox-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=c35d87f1d04b2b153d33c275c2632e40d388a88f19a9e71727e0bbbff51fe689
 TERMUX_PKG_BUILD_IN_SRC=true
diff --git a/packages/busybox/fixeditors_built_with_clang.patch b/packages/busybox/fixeditors_built_with_clang.patch
deleted file mode 100644
index 910fafed7..000000000
--- a/packages/busybox/fixeditors_built_with_clang.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- ./editors/vi.c.orig	2020-08-06 23:54:05.454464571 +0000
-+++ ./editors/vi.c	2020-08-06 23:54:59.007378601 +0000
-@@ -4314,6 +4314,7 @@
- #undef cur_line
- }
- 
-+#pragma clang optimize off
- int vi_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
- int vi_main(int argc, char **argv)
- {
---- ./editors/ed.c.orig	2020-08-06 23:55:28.927889014 +0000
-+++ ./editors/ed.c	2020-08-06 23:55:36.836023886 +0000
-@@ -990,6 +990,7 @@
- 	}
- }
- 
-+#pragma clang optimize off
- int ed_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
- int ed_main(int argc UNUSED_PARAM, char **argv)
- {
---- ./editors/awk.c.orig	2020-08-06 23:57:12.149648346 +0000
-+++ ./editors/awk.c	2020-08-06 23:57:31.737981962 +0000
-@@ -3190,6 +3190,7 @@
- #undef files_happen
- }
- 
-+#pragma clang optimize off
- int awk_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
- int awk_main(int argc UNUSED_PARAM, char **argv)
- {
---- ./editors/diff.c.orig	2020-08-06 23:58:55.919414780 +0000
-+++ ./editors/diff.c	2020-08-06 23:59:09.719649530 +0000
-@@ -972,6 +972,7 @@
- # define LONGOPTS
- #endif
- 
-+#pragma clang optimize off
- int diff_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
- int diff_main(int argc UNUSED_PARAM, char **argv)
- {