frida: update to 16.1.1

This commit is contained in:
termux-pacman-bot
2023-07-08 21:01:21 +00:00
parent 8bedd58a0c
commit 7a75960cd8
5 changed files with 127 additions and 33 deletions

View File

@@ -3,10 +3,9 @@ TERMUX_PKG_DESCRIPTION="Dynamic instrumentation toolkit for developers, reverse-
TERMUX_PKG_LICENSE="wxWindows"
TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91"
_MAJOR_VERSION=16
_MINOR_VERSION=0
_MICRO_VERSION=2
_MINOR_VERSION=1
_MICRO_VERSION=1
TERMUX_PKG_VERSION=${_MAJOR_VERSION}.${_MINOR_VERSION}.${_MICRO_VERSION}
TERMUX_PKG_REVISION=1
TERMUX_PKG_GIT_BRANCH=$TERMUX_PKG_VERSION
TERMUX_PKG_SRCURL=git+https://github.com/frida/frida
TERMUX_PKG_DEPENDS="libiconv"
@@ -18,6 +17,22 @@ TERMUX_PKG_CONFFILES="var/service/frida-server/run var/service/frida-server/down
TERMUX_PKG_CONFLICTS="frida-tools (<< 15.1.24-1)"
TERMUX_PKG_BREAKS="frida-server (<< 15.1.24)"
TERMUX_PKG_REPLACES="frida-tools (<< 15.1.24-1), frida-server (<< 15.1.24)"
TERMUX_PKG_HOSTBUILD=true
termux_step_host_build() {
termux_setup_nodejs
# make and save frida-resource-compiler in hostbuild step,
# otherwise the one that is compiled in termux_step_make
# segfaults (seem to be some tool in termux's toolchain bin
# dir that causes it, removing our bin/ dir from PATH fixes
# the issue)
cd $TERMUX_PKG_SRCDIR
make core-linux-x86_64 ${TERMUX_PKG_EXTRA_MAKE_ARGS}
cp build/tmp-linux-x86_64/frida-core/tools/frida-resource-compiler \
$TERMUX_PKG_HOSTBUILD_DIR/
}
termux_step_pre_configure () {
termux_setup_nodejs
@@ -37,6 +52,8 @@ termux_step_make () {
arch=${TERMUX_ARCH}
fi
export PATH=$TERMUX_PKG_HOSTBUILD_DIR:$PATH
CC=gcc CXX=g++ make python-android-${arch} ${TERMUX_PKG_EXTRA_MAKE_ARGS}
CC=gcc CXX=g++ make tools-android-${arch} ${TERMUX_PKG_EXTRA_MAKE_ARGS}
}

View File

@@ -1,12 +1,12 @@
--- ./releng/driver-wrapper-android.sh.in.orig 2022-10-30 12:52:48.190659491 +0100
+++ ./releng/driver-wrapper-android.sh.in 2022-10-30 12:52:56.173992267 +0100
--- ../cache/tmp-checkout/releng/driver-wrapper-android.sh.in 2023-01-17 15:01:26.670736293 +0000
+++ ./releng/driver-wrapper-android.sh.in 2023-01-17 15:04:46.718529580 +0000
@@ -69,10 +69,4 @@
"@driver@" "${base_argv[@]}" "${argv[@]}" || exit $?
-case $output_type in
- executable|shlib)
- "@elf_cleaner@" "$output_path" || exit $?
- "@elf_cleaner@" --api-level @api@ --quiet "$output_path" || exit $?
- ;;
-esac
-

View File

@@ -6,16 +6,16 @@
if host_os_family == 'darwin'
extra_link_args += ['-Wl,-exported_symbol,_' + python_plugin_export_name]
elif host_os_family != 'windows'
--- ./Makefile.linux.mk.orig 2020-07-22 19:15:43.163995037 +0000
+++ ./Makefile.linux.mk 2020-07-22 19:19:19.060924976 +0000
@@ -310,8 +310,8 @@
$$(call meson-setup-for-env,$1,$$*) \
--- ./Makefile.linux.mk.orig 2023-07-08 18:12:09.428217335 +0000
+++ ./Makefile.linux.mk 2023-07-08 18:14:09.617238973 +0000
@@ -320,8 +320,8 @@
--prefix $$(FRIDA)/build/$1-$$* \
--libdir $$(FRIDA)/build/$1-$$*/lib \
$$(FRIDA_FLAGS_COMMON) \
- -Dpython=$$(PYTHON) \
- -Dpython_incdir=$$(PYTHON_INCDIR) \
+ -Dpython=/usr/bin/python@PYTHON_VERSION@ \
+ -Dpython_incdir=@TERMUX_PREFIX@/include/python@PYTHON_VERSION@ \
frida-python $$$$builddir || exit 1; \
fi; \
$$(MESON) install -C $$$$builddir || exit 1; \
$$(MESON) install -C $$$$builddir || exit 1

View File

@@ -0,0 +1,78 @@
--- ./frida-core/src/meson.build.orig 2023-07-08 18:52:38.331205357 +0000
+++ ./frida-core/src/meson.build 2023-07-08 19:06:13.169997295 +0000
@@ -50,7 +50,7 @@
'frida-data-darwin-blob.S',
],
command: [
- resource_compiler,
+ 'frida-resource-compiler',
'--toolchain=apple',
'-c', '@INPUT0@',
'-o', join_paths(meson.current_build_dir(), 'frida-data-darwin'),
@@ -160,7 +160,7 @@
helper_legacy,
meson.current_build_dir(),
host_os,
- resource_compiler,
+ 'frida-resource-compiler',
'@INPUT0@',
lipo,
],
@@ -198,7 +198,7 @@
'frida-data-android-blob.S',
],
command: [
- resource_compiler,
+ 'frida-resource-compiler',
'--toolchain=gnu',
'-c', '@INPUT0@',
'-o', join_paths(meson.current_build_dir(), 'frida-data-android'),
@@ -242,7 +242,7 @@
'frida-data-helper-backend-blob.S',
],
command: [
- resource_compiler,
+ 'frida-resource-compiler',
'--toolchain=gnu',
'-c', '@INPUT0@',
'-o', join_paths(meson.current_build_dir(), 'frida-data-helper-backend'),
@@ -322,7 +322,7 @@
helper_legacy,
meson.current_build_dir(),
host_os,
- resource_compiler,
+ 'frida-resource-compiler',
'@INPUT@',
lipo,
],
@@ -381,7 +381,7 @@
get_option('agent_emulated_legacy'),
meson.current_build_dir(),
host_os,
- resource_compiler,
+ 'frida-resource-compiler',
'@INPUT0@',
lipo,
],
--- ./frida-core/src/compiler/meson.build.orig 2023-07-08 18:26:27.876229170 +0000
+++ ./frida-core/src/compiler/meson.build 2023-07-08 18:27:58.369131825 +0000
@@ -47,7 +47,7 @@
'frida-data-compiler-blob.S',
],
command: [
- resource_compiler,
+ 'frida-resource-compiler',
'--toolchain=' + host_toolchain,
'-c', '@INPUT0@',
'-o', join_paths(meson.current_build_dir(), 'frida-data-compiler'),
--- ./frida-core/src/barebone/meson.build.orig 2023-07-08 19:11:24.044787115 +0000
+++ ./frida-core/src/barebone/meson.build 2023-07-08 19:11:34.556886099 +0000
@@ -49,7 +49,7 @@
'frida-data-barebone-blob.S',
],
command: [
- resource_compiler,
+ 'frida-resource-compiler',
'--toolchain=' + host_toolchain,
'-c', '@INPUT0@',
'-o', join_paths(meson.current_build_dir(), 'frida-data-barebone'),

View File

@@ -1,6 +1,6 @@
--- ./releng/setup-env.sh.orig 2022-10-30 12:24:03.607549465 +0100
+++ ./releng/setup-env.sh 2022-10-30 12:25:00.977548248 +0100
@@ -703,7 +703,7 @@
--- ./releng/setup-env.sh.orig 2023-07-08 11:27:56.712118591 +0000
+++ ./releng/setup-env.sh 2023-07-08 11:32:05.717812811 +0000
@@ -650,7 +650,7 @@
host_cxxlibs="c++_static c++abi"
case $host_arch in
x86)
@@ -8,40 +8,39 @@
+ android_api=24
android_abi="x86"
android_target="i686-none-linux-android${android_api}"
android_clang_arch="i386"
@@ -714,7 +714,7 @@
host_cxxlibs="$host_cxxlibs android_support"
host_clang_arch="i386"
@@ -660,14 +660,14 @@
c_like_flags+=("-mfpmath=sse" "-mstackrealign")
;;
x86_64)
- android_api=21
+ android_api=24
android_abi="x86_64"
android_target="x86_64-none-linux-android${android_api}"
android_clang_arch="x86_64"
@@ -722,7 +722,7 @@
host_ldflags=""
host_clang_arch="x86_64"
host_compiler_triplet="x86_64-linux-android"
;;
arm)
- android_api=19
+ android_api=24
android_abi="armeabi-v7a"
android_target="armv7-none-linux-androideabi${android_api}"
android_clang_arch="arm"
@@ -733,7 +733,7 @@
host_cxxlibs="$host_cxxlibs android_support"
host_clang_arch="arm"
@@ -678,7 +678,7 @@
linker_flags+=("-Wl,--fix-cortex-a8")
;;
arm64)
- android_api=21
+ android_api=24
android_abi="arm64-v8a"
android_target="aarch64-none-linux-android${android_api}"
android_clang_arch="aarch64"
@@ -805,7 +805,7 @@
selected_nm="${android_toolroot}/bin/llvm-nm"
selected_ranlib="${android_toolroot}/bin/llvm-ranlib"
selected_strip="${android_toolroot}/bin/llvm-strip"
- strip_flags="--strip-all"
+ strip_flags="--strip-unneeded --preserve-dates"
selected_readelf="${android_toolroot}/bin/llvm-readelf"
selected_objcopy="${android_toolroot}/bin/llvm-objcopy"
selected_objdump="${android_toolroot}/bin/llvm-objdump"
host_clang_arch="aarch64"
@@ -806,7 +806,7 @@
ar=("$qnx_toolchain_prefix-ar")
nm=("$qnx_toolchain_prefix-nm")
ranlib=("$qnx_toolchain_prefix-ranlib")
- strip=("$qnx_toolchain_prefix-strip" "--strip-all")
+ strip=("$qnx_toolchain_prefix-strip" "--strip-unneeded --preserve-dates")
readelf=("$qnx_toolchain_prefix-readelf")
objcopy=("$qnx_toolchain_prefix-objcopy")