From 084cc11ca10a11c81ce158a3063a188e0fb2b29f Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Fri, 22 Jan 2021 23:47:50 -0800 Subject: [PATCH 1/5] Fix #315 and #306 --- src/helper/darwin/install_helper | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/helper/darwin/install_helper b/src/helper/darwin/install_helper index 9998f8a..3b27587 100755 --- a/src/helper/darwin/install_helper +++ b/src/helper/darwin/install_helper @@ -9,7 +9,7 @@ cp "$RES_PATH/geosite.dat" "$INSTALL_PATH" cp "$RES_PATH/geo.mmdb" "$INSTALL_PATH" cp "$RES_PATH/core" "$INSTALL_PATH" cp "$RES_PATH/md5sum" "$INSTALL_PATH" -cp "$RES_PATH/route" "$INSTALL_PATH" +cp /sbin/route "$INSTALL_PATH" chown root "$INSTALL_PATH/core" chown root "$INSTALL_PATH/md5sum" From e006b5b4bca75902b202c53264d81a407ea82e97 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Fri, 22 Jan 2021 23:49:47 -0800 Subject: [PATCH 2/5] Remove unused route executable --- src/helper/darwin/route | Bin 33584 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100755 src/helper/darwin/route diff --git a/src/helper/darwin/route b/src/helper/darwin/route deleted file mode 100755 index 080369317409ff684b237a7326db299966476949..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 33584 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

~!R`|dO)YRFP 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 Lk2UcBng;$4?%mw| From b5261aa474922e01dd74b48f8344ca3fe5cd7ca7 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Thu, 10 Nov 2022 13:50:06 -0800 Subject: [PATCH 3/5] As a workaround for macOS 13, create a wrapper to set argv[0] --- src/helper/darwin/install_helper | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/helper/darwin/install_helper b/src/helper/darwin/install_helper index 3b27587..09ee189 100755 --- a/src/helper/darwin/install_helper +++ b/src/helper/darwin/install_helper @@ -9,7 +9,17 @@ cp "$RES_PATH/geosite.dat" "$INSTALL_PATH" cp "$RES_PATH/geo.mmdb" "$INSTALL_PATH" cp "$RES_PATH/core" "$INSTALL_PATH" cp "$RES_PATH/md5sum" "$INSTALL_PATH" -cp /sbin/route "$INSTALL_PATH" + +# /sbin/route from macOS 13 will crash if argv[0] is not /sbin/route +# As a workaround, the following wrapper is created to set argv[0] +clang -o "$INSTALL_PATH/route" -x c - <<'EOF' +#include +int main(int argc, char ** const argv) { + argv[0] = "/sbin/route"; + execv(argv[0], argv); +} +EOF + chown root "$INSTALL_PATH/core" chown root "$INSTALL_PATH/md5sum" From 877a6d6979b32caaa54af52929e88e10c81906d3 Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Thu, 10 Nov 2022 13:52:28 -0800 Subject: [PATCH 4/5] Fix indent --- src/helper/darwin/install_helper | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/helper/darwin/install_helper b/src/helper/darwin/install_helper index 09ee189..a2837b0 100755 --- a/src/helper/darwin/install_helper +++ b/src/helper/darwin/install_helper @@ -16,7 +16,7 @@ clang -o "$INSTALL_PATH/route" -x c - <<'EOF' #include int main(int argc, char ** const argv) { argv[0] = "/sbin/route"; - execv(argv[0], argv); + execv(argv[0], argv); } EOF From 1b7121d077b8d0d272b343ad205a223eaa9f354d Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Thu, 10 Nov 2022 14:07:03 -0800 Subject: [PATCH 5/5] Update install_helper --- src/helper/darwin/install_helper | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/helper/darwin/install_helper b/src/helper/darwin/install_helper index a2837b0..3b40459 100755 --- a/src/helper/darwin/install_helper +++ b/src/helper/darwin/install_helper @@ -14,7 +14,7 @@ cp "$RES_PATH/md5sum" "$INSTALL_PATH" # As a workaround, the following wrapper is created to set argv[0] clang -o "$INSTALL_PATH/route" -x c - <<'EOF' #include -int main(int argc, char ** const argv) { +int main(int argc, char *argv[]) { argv[0] = "/sbin/route"; execv(argv[0], argv); }