From b6b8f4a05b7ca6bbd8283fec990fadf136256740 Mon Sep 17 00:00:00 2001
From: Henrik Grimler <Henrik@Grimler.se>
Date: Sat, 29 Sep 2018 18:33:27 +0200
Subject: [PATCH] frida-server: update to 12.2.6

---
 .../frida-server/Makefile.linux.mk.patch      | 16 ++----
 root-packages/frida-server/build.sh           | 51 ++++++++++---------
 root-packages/frida-server/setup-env.sh.patch | 49 ++++++++----------
 3 files changed, 50 insertions(+), 66 deletions(-)

diff --git a/root-packages/frida-server/Makefile.linux.mk.patch b/root-packages/frida-server/Makefile.linux.mk.patch
index 040cefbb2..0961bf280 100644
--- a/root-packages/frida-server/Makefile.linux.mk.patch
+++ b/root-packages/frida-server/Makefile.linux.mk.patch
@@ -1,16 +1,6 @@
---- ../Makefile.linux.mk.orig	2018-06-12 20:38:08.118306747 +0000
-+++ ./Makefile.linux.mk	2018-06-12 20:39:14.502269610 +0000
-@@ -108,7 +108,7 @@
- define make-gum-rules
- build/.$1-gum-npm-stamp: build/$1-env-linux-$$(build_arch).rc
- 	@$$(NPM) --version &>/dev/null || (echo -e "\033[31mOops. It appears Node.js is not installed.\nWe need it for processing JavaScript code at build-time.\nCheck PATH or set NODE to the absolute path of your Node.js binary.\033[0m"; exit 1;)
--	. build/$1-env-linux-$$(build_arch).rc && cd frida-gum/bindings/gumjs && npm install
-+	. build/$1-env-linux-$$(build_arch).rc && cd frida-gum/bindings/gumjs && $(NPM) install
- 	@touch $$@
- 
- build/$1-%/lib/pkgconfig/frida-gum-1.0.pc: build/.frida-gum-submodule-stamp build/.$1-gum-npm-stamp build/$1-%/lib/pkgconfig/capstone.pc
-
-@@ -380,7 +380,7 @@
+--- ../Makefile.linux.mk.orig	2018-09-29 16:18:35.746616912 +0200
++++ ./Makefile.linux.mk	2018-09-29 16:31:30.127393352 +0200
+@@ -401,7 +401,7 @@
  server-armhf: build/frida-linux-armhf/lib/pkgconfig/frida-core-1.0.pc ##@server Build for arm
  server-mips: build/frida-linux-mips/lib/pkgconfig/frida-core-1.0.pc ##@server Build for mips
  server-mipsel: build/frida-linux-mipsel/lib/pkgconfig/frida-core-1.0.pc ##@server Build for mipsel
diff --git a/root-packages/frida-server/build.sh b/root-packages/frida-server/build.sh
index 363efa00b..91724b0ae 100644
--- a/root-packages/frida-server/build.sh
+++ b/root-packages/frida-server/build.sh
@@ -1,29 +1,30 @@
 TERMUX_PKG_HOMEPAGE=https://www.frida.re
 TERMUX_PKG_DESCRIPTION="Dynamic instrumentation toolkit for developers, reverse-engineers, and security researchers"
-_MAJOR_VERSION=11
-_MINOR_VERSION=0
-_MICRO_VERSION=12
+_MAJOR_VERSION=12
+_MINOR_VERSION=2
+_MICRO_VERSION=6
 TERMUX_PKG_VERSION=()
 TERMUX_PKG_SHA256=()
 TERMUX_PKG_VERSION+=($_MAJOR_VERSION.$_MINOR_VERSION.$_MICRO_VERSION) # frida
 # Sort of abusive use of $TERMUX_PKG_VERSION:
-TERMUX_PKG_VERSION+=(a1a383436ba147767af1887c2015e5a863359669) # capstone
-TERMUX_PKG_VERSION+=(29a784e39a4306a42dced23d5f29bfdef78e2af9) # frida-core
-TERMUX_PKG_VERSION+=(97b135889d237bde25d124b2dc50e781d02fe3d0) # frida-gum
-TERMUX_PKG_VERSION+=(cf4033d9067b7926d1449bc2324deb1d9ea7e43c) # frida-python
-TERMUX_PKG_VERSION+=(e3260d8f0c749372c4ab4fbb243cfe2c4e0f1eef) # frida-clr
-TERMUX_PKG_VERSION+=(af6fde67449bad7aec1d36071ba7cbc7ef2f2dc7) # frida-qml
-TERMUX_PKG_VERSION+=(4fe0b0891430bd28ce9faeb62b6b29644e97f06e) # frida-swift
-TERMUX_PKG_VERSION+=(00a48399a1f5f2dab637bb7dca74dd27980becdc) # releng/meson
-TERMUX_PKG_SHA256+=(4ef25eff488b8283ef50ea28b8f40c4da197b13601f78a1a508b7373a7ef7ca0) # frida
-TERMUX_PKG_SHA256+=(e3267fa036a84c695d371a08830701702b82fa32a961b0f5ecaa65a56eaf5dcc) # capstone
-TERMUX_PKG_SHA256+=(999f2cf06778d0844edc30029920b1fd1917f8e71c87e5798ddfccf1fc8ad47f) # frida-core
-TERMUX_PKG_SHA256+=(f8d647e73d52a9cce79e6089c2438e36dd518dda01937597fd4da4760089d640) # frida-gum
-TERMUX_PKG_SHA256+=(ba8ff5c3c170143734308734ced12fa3ed245ade19e9149912cdaf301ef92bda) # frida-python
-TERMUX_PKG_SHA256+=(273975246bdd36cc45f7f2c6ea65f079336902e701aa4cad2e462e81d3437afa) # frida-clr
-TERMUX_PKG_SHA256+=(61484407afbb89306f874f2af3275db8f8955376a5acf6cb947cb89b1ff757a9) # frida-qml
-TERMUX_PKG_SHA256+=(0ac156bfa8063a53ee42a42d77414a257f283500edc1b94ff335abc4ffc9bfff) # frida-swift
-TERMUX_PKG_SHA256+=(1e54e6d56dd7f5d9430849f23ba3653d5a4a137c4bfbaacf8aef8fdefc6df68c) # releng/meson
+TERMUX_PKG_VERSION+=(7388bf76dc65d1962d7d514c92de8d6be7555599) # capstone
+TERMUX_PKG_VERSION+=(206c13bf1aaf191a3ff0c110e153ad279c0d4cee) # frida-core
+TERMUX_PKG_VERSION+=(f44f021cbe755885ac78cd13e750a65510ed6934) # frida-gum
+TERMUX_PKG_VERSION+=(2ed895b881f69206df28854791ffb84d301709a6) # frida-python
+TERMUX_PKG_VERSION+=(7754b239601babc0dcbad4f8ee31681235981adb) # frida-clr
+TERMUX_PKG_VERSION+=(94063f61d8be76c6ab108413105c5fafedf1b987) # frida-qml
+TERMUX_PKG_VERSION+=(2c9cc1f87b839b8621afdfce43e44da29deaafab) # frida-swift
+TERMUX_PKG_VERSION+=(931f387786fbc92fa9c678bf72b60fc040ce895a) # releng/meson
+
+TERMUX_PKG_SHA256+=(b07b96d8703cdd9753d33cdd43e5cdc2f15acfb0b86e6ab4d21482fd9cf8d60f) # frida
+TERMUX_PKG_SHA256+=(43ef0cc72fc19b72393be94d01dcad48835f98a72475aea8187f47ff8475014d) # capstone
+TERMUX_PKG_SHA256+=(7c8873db3c23e5746d02146d6401be3bd88e2a5fd6ab66906757f2d100bb2fdb) # frida-core
+TERMUX_PKG_SHA256+=(2fffd21b52a9066b1769bdbd6310f9fcd97dfc333e7acb22e1ebbdb94c2c938a) # frida-gum
+TERMUX_PKG_SHA256+=(32f0e9108c7a09f6ffff7c542dcc6352a48c852186bb59d8ff384298bf105ba7) # frida-python
+TERMUX_PKG_SHA256+=(0a60f97a32ea1c926b5bf060a822a0d6d44f5e047b80269e7ea6fbc16a178640) # frida-clr
+TERMUX_PKG_SHA256+=(90eebc1cce8f50bb954366870e8abfef62d3096095ce2aa5ad8394f29440d485) # frida-qml
+TERMUX_PKG_SHA256+=(9e5fe8463dfaa829d95787a77f613eef45e15e094e54e7df3c944acedbd76693) # frida-swift
+TERMUX_PKG_SHA256+=(42fc33147373f7ee8293486a420d32abc7aea956adfba5c7e98ccdacb1c6cf07) # releng/meson
 _modules=(frida capstone frida-core frida-gum frida-python frida-clr frida-qml frida-swift meson)
 TERMUX_PKG_SRCURL=(https://github.com/frida/frida/archive/$TERMUX_PKG_VERSION.tar.gz
 		   https://github.com/frida/capstone/archive/${TERMUX_PKG_VERSION[1]}.zip
@@ -41,9 +42,11 @@ TERMUX_PKG_EXTRA_MAKE_ARGS="ANDROID_NDK_ROOT=$HOME/lib/android-ndk"
 TERMUX_PKG_HOSTBUILD=yes
 
 termux_step_host_build () {
-	termux_download https://nodejs.org/dist/v8.11.3/node-v8.11.3-linux-x64.tar.xz \
-		    $TERMUX_PKG_CACHEDIR/node-v8.11.3-linux-x64.tar.xz
-	tar -xf $TERMUX_PKG_CACHEDIR/node-v8.11.3-linux-x64.tar.xz --strip-components=1
+	local node_version=8.12.0
+	termux_download https://nodejs.org/dist/v${node_version}/node-v${node_version}-linux-x64.tar.xz \
+			$TERMUX_PKG_CACHEDIR/node-v${node_version}-linux-x64.tar.xz \
+			29a20479cd1e3a03396a4e74a1784ccdd1cf2f96928b56f6ffa4c8dae40c88f2
+	tar -xf $TERMUX_PKG_CACHEDIR/node-v${node_version}-linux-x64.tar.xz --strip-components=1
 }
 
 termux_step_post_extract_package () {
@@ -74,7 +77,7 @@ termux_step_make () {
 	fi
 	# Build only for desired architecture:
 	sed -i "s/@TERMUX_ARCH@/$arch/g" $TERMUX_PKG_SRCDIR/Makefile.linux.mk
-	NODE=$TERMUX_PKG_HOSTBUILD_DIR/bin/node make server-android ${TERMUX_PKG_EXTRA_MAKE_ARGS}
+	PATH=$TERMUX_PKG_HOSTBUILD_DIR/bin:$PATH make server-android ${TERMUX_PKG_EXTRA_MAKE_ARGS}
 }
 
 termux_step_make_install () {
diff --git a/root-packages/frida-server/setup-env.sh.patch b/root-packages/frida-server/setup-env.sh.patch
index 3ac0a18dd..3ee1bd07e 100644
--- a/root-packages/frida-server/setup-env.sh.patch
+++ b/root-packages/frida-server/setup-env.sh.patch
@@ -1,40 +1,31 @@
-Use termux' NDK
---- ./releng/setup-env.sh	2018-02-26 19:22:57.000000000 +0000
-+++ ../setup-env.sh	2018-03-05 12:49:07.583020888 +0000
-@@ -92,8 +92,8 @@
+--- ../setup-env.sh.orig	2018-09-29 15:28:12.911222116 +0200
++++ ./releng/setup-env.sh	2018-09-29 17:11:50.761826956 +0200
+@@ -97,8 +97,8 @@
  fi
  
  if [ $host_platform = android ]; then
--  ndk_required_name=r15c
--  ndk_required_version=15.2.4203891
-+  ndk_required_name=r17
-+  ndk_required_version=17.0.4754217
+-  ndk_required_name=r17b
+-  ndk_required_version=17.1.4828580
++  ndk_required_name=r18
++  ndk_required_version=18.0.5002713
    if [ -n "$ANDROID_NDK_ROOT" ]; then
      if [ -f "$ANDROID_NDK_ROOT/source.properties" ]; then
        ndk_installed_version=$(grep Pkg.Revision "$ANDROID_NDK_ROOT/source.properties" | awk '{ print $NF; }')
-@@ -370,7 +370,7 @@
+@@ -414,7 +414,7 @@
  
      case $host_arch in
        x86)
--        android_target_platform=14
-+        android_target_platform=21
-         android_host_abi=x86
-         android_host_target=i686-none-linux-android
-         android_host_toolchain=x86-4.9
-@@ -388,7 +388,7 @@
-         android_host_ldflags="-fuse-ld=gold"
+-        android_api=14
++        android_api=21
+         host_triplet="i686-linux-android"
+         host_arch_flags="-march=i686"
+         host_ldflags="-fuse-ld=gold"
+@@ -426,7 +426,7 @@
+         host_ldflags="-fuse-ld=gold"
          ;;
        arm)
--        android_target_platform=14
-+        android_target_platform=21
-         android_host_abi=armeabi-v7a
-         android_host_target=armv7-none-linux-androideabi
-         android_host_toolchain=arm-linux-androideabi-4.9
-@@ -527,7 +527,6 @@
-     if [ $android_have_unwind == yes ]; then
-       meson_cpp_link_args="$meson_cpp_link_args, '$cxx_libdir/libunwind.a'"
-     fi
--    meson_cpp_link_args="$meson_cpp_link_args, '$cxx_libdir/libandroid_support.a'"
-     if [ $android_have_unwind == yes ]; then
-       meson_cpp_link_args="$meson_cpp_link_args, '-Wl,--exclude-libs,$cxx_libdir/libunwind.a'"
-     fi
+-        android_api=14
++        android_api=21
+         host_triplet="arm-linux-androideabi"
+         host_arch_flags="-march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16"
+         host_ldflags="-fuse-ld=gold -Wl,--fix-cortex-a8 -Wl,--icf=safe"