From 95fb230b8ca760b1274a469502860bcea8a5fb99 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Mon, 22 Nov 2021 19:46:52 -0800
Subject: [PATCH] Update to BusyBox 1.34.1

---
 native/jni/external/Android.mk         | 58 +++++++++++++-------------
 native/jni/external/busybox            |  2 +-
 native/jni/external/pcre               |  2 +-
 native/jni/external/pcre2_workaround.c |  4 ++
 4 files changed, 35 insertions(+), 31 deletions(-)
 create mode 100644 native/jni/external/pcre2_workaround.c

diff --git a/native/jni/external/Android.mk b/native/jni/external/Android.mk
index 459e16d5c..0acb6d7ef 100644
--- a/native/jni/external/Android.mk
+++ b/native/jni/external/Android.mk
@@ -326,38 +326,38 @@ include $(BUILD_STATIC_LIBRARY)
 include $(CLEAR_VARS)
 LIBPCRE2 := $(LOCAL_PATH)/pcre/include
 LOCAL_MODULE:= libpcre2
-LOCAL_CFLAGS := -DHAVE_CONFIG_H
+LOCAL_CFLAGS := -DHAVE_CONFIG_H -DPCRE2_CODE_UNIT_WIDTH=8
 LOCAL_C_INCLUDES := $(LIBPCRE2) $(LIBPCRE2)_internal
 LOCAL_EXPORT_C_INCLUDES := $(LIBPCRE2)
 LOCAL_SRC_FILES := \
-    pcre/dist2/src/pcre2_auto_possess.c \
-    pcre/dist2/src/pcre2_chartables.c \
-    pcre/dist2/src/pcre2_compile.c \
-    pcre/dist2/src/pcre2_config.c \
-    pcre/dist2/src/pcre2_context.c \
-    pcre/dist2/src/pcre2_convert.c \
-    pcre/dist2/src/pcre2_dfa_match.c \
-    pcre/dist2/src/pcre2_error.c \
-    pcre/dist2/src/pcre2_extuni.c \
-    pcre/dist2/src/pcre2_find_bracket.c \
-    pcre/dist2/src/pcre2_fuzzsupport.c \
-    pcre/dist2/src/pcre2_jit_compile.c \
-    pcre/dist2/src/pcre2_maketables.c \
-    pcre/dist2/src/pcre2_match.c \
-    pcre/dist2/src/pcre2_match_data.c \
-    pcre/dist2/src/pcre2_newline.c \
-    pcre/dist2/src/pcre2_ord2utf.c \
-    pcre/dist2/src/pcre2_pattern_info.c \
-    pcre/dist2/src/pcre2_script_run.c \
-    pcre/dist2/src/pcre2_serialize.c \
-    pcre/dist2/src/pcre2_string_utils.c \
-    pcre/dist2/src/pcre2_study.c \
-    pcre/dist2/src/pcre2_substitute.c \
-    pcre/dist2/src/pcre2_substring.c \
-    pcre/dist2/src/pcre2_tables.c \
-    pcre/dist2/src/pcre2_ucd.c \
-    pcre/dist2/src/pcre2_valid_utf.c \
-    pcre/dist2/src/pcre2_xclass.c
+    pcre/src/pcre2_auto_possess.c \
+    pcre/src/pcre2_compile.c \
+    pcre/src/pcre2_config.c \
+    pcre/src/pcre2_context.c \
+    pcre/src/pcre2_convert.c \
+    pcre/src/pcre2_dfa_match.c \
+    pcre/src/pcre2_error.c \
+    pcre/src/pcre2_extuni.c \
+    pcre/src/pcre2_find_bracket.c \
+    pcre/src/pcre2_fuzzsupport.c \
+    pcre/src/pcre2_maketables.c \
+    pcre/src/pcre2_match.c \
+    pcre/src/pcre2_match_data.c \
+    pcre/src/pcre2_jit_compile.c \
+    pcre/src/pcre2_newline.c \
+    pcre/src/pcre2_ord2utf.c \
+    pcre/src/pcre2_pattern_info.c \
+    pcre/src/pcre2_script_run.c \
+    pcre/src/pcre2_serialize.c \
+    pcre/src/pcre2_string_utils.c \
+    pcre/src/pcre2_study.c \
+    pcre/src/pcre2_substitute.c \
+    pcre/src/pcre2_substring.c \
+    pcre/src/pcre2_tables.c \
+    pcre/src/pcre2_ucd.c \
+    pcre/src/pcre2_valid_utf.c \
+    pcre/src/pcre2_xclass.c \
+    pcre2_workaround.c
 include $(BUILD_STATIC_LIBRARY)
 
 # libxhook.a
diff --git a/native/jni/external/busybox b/native/jni/external/busybox
index 41288302e..78f06dcf1 160000
--- a/native/jni/external/busybox
+++ b/native/jni/external/busybox
@@ -1 +1 @@
-Subproject commit 41288302eda410e0834aebdec4d83be4ab9e4435
+Subproject commit 78f06dcf1ea2a52de3d08f913333720abd59c58b
diff --git a/native/jni/external/pcre b/native/jni/external/pcre
index 465fb3954..8e12681a1 160000
--- a/native/jni/external/pcre
+++ b/native/jni/external/pcre
@@ -1 +1 @@
-Subproject commit 465fb3954c063a938aafdec7ed9a15b3cd196086
+Subproject commit 8e12681a1a252fd581830b2f65d1e154a2030bb9
diff --git a/native/jni/external/pcre2_workaround.c b/native/jni/external/pcre2_workaround.c
new file mode 100644
index 000000000..5fea7619f
--- /dev/null
+++ b/native/jni/external/pcre2_workaround.c
@@ -0,0 +1,4 @@
+// Workaround pcre2_chartables.c symlink to pcre2_chartables.c.dist failing on Windows NDK if Cygwin git used,
+// and NDK not directly accepting a .c.dist file in LOCAL_SRC_FILES list.
+
+#include "pcre/src/pcre2_chartables.c.dist"