From 900b436756d88ef1a14fdfd6a983f2f2cba1c532 Mon Sep 17 00:00:00 2001 From: F-Droid Builder Date: Fri, 10 Jul 2015 03:45:41 +0200 Subject: [PATCH] Update CV of Orbot to 14.1.4-PIE (132) --- metadata/org.torproject.android.txt | 96 +++++++++++++++-------------- 1 file changed, 50 insertions(+), 46 deletions(-) diff --git a/metadata/org.torproject.android.txt b/metadata/org.torproject.android.txt index c31b51967d..31818e154b 100644 --- a/metadata/org.torproject.android.txt +++ b/metadata/org.torproject.android.txt @@ -206,136 +206,139 @@ Build:14.1.3-PIE,130 Build:14.1.4-noPIE,132 commit=v14.1.4 - init=git cherry-pick -n 7ee0622a5eaafba284dac81fe58aeb15a478c9c2 && git submodule update --init submodules=yes + init=git cherry-pick -n 7ee0622a5eaafba284dac81fe58aeb15a478c9c2 && \ + git submodule update --init rm=libs/jtorctl.jar,external/superuser-commands/RootCommands-Demo - prebuild=mv AndroidManifest.KITKAT_AND_LOWER.xml AndroidManifest.xml && echo 'target=android-17' >> external/superuser-commands/RootCommands-Library/project.properties + prebuild=mv AndroidManifest.KITKAT_AND_LOWER.xml AndroidManifest.xml && \ + echo 'target=android-17' >> external/superuser-commands/RootCommands-Library/project.properties build=NDK_BASE=$$NDK$$ make -C external buildjni=no Build:14.1.4-PIE,133 commit=v14.1.4 - init=git cherry-pick -n 7ee0622a5eaafba284dac81fe58aeb15a478c9c2 && git submodule update --init submodules=yes + init=git cherry-pick -n 7ee0622a5eaafba284dac81fe58aeb15a478c9c2 && \ + git submodule update --init + forcevercode=yes rm=libs/jtorctl.jar,external/superuser-commands/RootCommands-Demo prebuild=echo 'target=android-17' >> external/superuser-commands/RootCommands-Library/project.properties build=NDK_BASE=$$NDK$$ make -C external PIEFLAGS="-fPIE -pie" buildjni=no - forcevercode=yes Build:15.0.1-RC-1-noPIE,15012101 commit=15.0.1-RC-1 submodules=yes - rm=libs/,external/superuser-commands/RootCommands-Demo,external/pluto/plugins/meek/assets/meek-client,external/pluto/plugins/obfs4/assets/obfs4proxy,res/raw/meek.mp3,res/raw/obfs4proxy.mp3 patch=nobridge.diff + forceversion=yes + forcevercode=yes + rm=libs/,external/superuser-commands/RootCommands-Demo,external/pluto/plugins/meek/assets/meek-client,external/pluto/plugins/obfs4/assets/obfs4proxy,res/raw/meek.mp3,res/raw/obfs4proxy.mp3 prebuild=echo 'target=android-17' >> external/superuser-commands/RootCommands-Library/project.properties && \ - sed -i -e '/APP_ABI/ s/:=.*/:= armeabi armeabi-v7a/' jni/Application.mk && \ - sed -i -e 's#uses-sdk.*#uses-sdk android:minSdkVersion="9" android:maxSdkVersion="15" android:targetSdkVersion="15"/>#' AndroidManifest.xml - ndk=r10e + sed -i -e '/APP_ABI/ s/:=.*/:= armeabi armeabi-v7a/' jni/Application.mk && \ + sed -i -e 's#uses-sdk.*#uses-sdk android:minSdkVersion="9" android:maxSdkVersion="15" android:targetSdkVersion="15"/>#' AndroidManifest.xml build=NDK_BASE=$$NDK$$ make -C external APP_ABI=armeabi PIEFLAGS="" buildjni=yes - forcevercode=yes - forceversion=yes + ndk=r10e Build:15.0.1-RC-1-noPIE,15012102 commit=15.0.1-RC-1 submodules=yes - rm=libs/,external/superuser-commands/RootCommands-Demo,external/pluto/plugins/meek/assets/meek-client,external/pluto/plugins/obfs4/assets/obfs4proxy,res/raw/meek.mp3,res/raw/obfs4proxy.mp3 patch=nobridge.diff + forceversion=yes + forcevercode=yes + rm=libs/,external/superuser-commands/RootCommands-Demo,external/pluto/plugins/meek/assets/meek-client,external/pluto/plugins/obfs4/assets/obfs4proxy,res/raw/meek.mp3,res/raw/obfs4proxy.mp3 prebuild=echo 'target=android-17' >> external/superuser-commands/RootCommands-Library/project.properties && \ - sed -i -e '/APP_ABI/ s/:=.*/:= x86/' jni/Application.mk && \ - sed -i -e 's#uses-sdk.*#uses-sdk android:minSdkVersion="9" android:maxSdkVersion="15" android:targetSdkVersion="15"/>#' AndroidManifest.xml - ndk=r10e + sed -i -e '/APP_ABI/ s/:=.*/:= x86/' jni/Application.mk && \ + sed -i -e 's#uses-sdk.*#uses-sdk android:minSdkVersion="9" android:maxSdkVersion="15" android:targetSdkVersion="15"/>#' AndroidManifest.xml build=NDK_BASE=$$NDK$$ make -C external APP_ABI=x86 PIEFLAGS="" buildjni=yes - forcevercode=yes - forceversion=yes + ndk=r10e Build:15.0.1-RC-1-noPIE,15012103 commit=15.0.1-RC-1 submodules=yes - rm=libs/,external/superuser-commands/RootCommands-Demo,external/pluto/plugins/meek/assets/meek-client,external/pluto/plugins/obfs4/assets/obfs4proxy,res/raw/meek.mp3,res/raw/obfs4proxy.mp3 patch=nobridge.diff,mipsfix.diff + forceversion=yes + forcevercode=yes + rm=libs/,external/superuser-commands/RootCommands-Demo,external/pluto/plugins/meek/assets/meek-client,external/pluto/plugins/obfs4/assets/obfs4proxy,res/raw/meek.mp3,res/raw/obfs4proxy.mp3 prebuild=echo 'target=android-17' >> external/superuser-commands/RootCommands-Library/project.properties && \ - sed -i -e '/APP_ABI/ s/:=.*/:= mips/' jni/Application.mk && \ - sed -i -e 's#uses-sdk.*#uses-sdk android:minSdkVersion="9" android:maxSdkVersion="15" android:targetSdkVersion="15"/>#' AndroidManifest.xml - ndk=r10e + sed -i -e '/APP_ABI/ s/:=.*/:= mips/' jni/Application.mk && \ + sed -i -e 's#uses-sdk.*#uses-sdk android:minSdkVersion="9" android:maxSdkVersion="15" android:targetSdkVersion="15"/>#' AndroidManifest.xml build=NDK_BASE=$$NDK$$ make -C external APP_ABI=mips PIEFLAGS="" buildjni=yes - forcevercode=yes - forceversion=yes + ndk=r10e Build:15.0.1-RC-1-PIE,15012111 commit=15.0.1-RC-1 submodules=yes + forcevercode=yes rm=libs/,external/superuser-commands/RootCommands-Demo,external/pluto/plugins/meek/assets/meek-client,external/pluto/plugins/obfs4/assets/obfs4proxy prebuild=echo 'target=android-17' >> external/superuser-commands/RootCommands-Library/project.properties && \ - sed -i -e '/APP_ABI/ s/:=.*/:= armeabi armeabi-v7a/' jni/Application.mk - ndk=r10e + sed -i -e '/APP_ABI/ s/:=.*/:= armeabi armeabi-v7a/' jni/Application.mk build=NDK_BASE=$$NDK$$ make -C external APP_ABI=armeabi PIEFLAGS="-fPIE -pie" buildjni=yes - forcevercode=yes + ndk=r10e Build:15.0.1-RC-1-PIE,15012112 commit=15.0.1-RC-1 submodules=yes - rm=libs/,external/superuser-commands/RootCommands-Demo,external/pluto/plugins/meek/assets/meek-client,external/pluto/plugins/obfs4/assets/obfs4proxy,res/raw/meek.mp3,res/raw/obfs4proxy.mp3 patch=nobridge.diff + forcevercode=yes + rm=libs/,external/superuser-commands/RootCommands-Demo,external/pluto/plugins/meek/assets/meek-client,external/pluto/plugins/obfs4/assets/obfs4proxy,res/raw/meek.mp3,res/raw/obfs4proxy.mp3 prebuild=echo 'target=android-17' >> external/superuser-commands/RootCommands-Library/project.properties && \ - sed -i -e '/APP_ABI/ s/:=.*/:= x86/' jni/Application.mk - ndk=r10e + sed -i -e '/APP_ABI/ s/:=.*/:= x86/' jni/Application.mk build=NDK_BASE=$$NDK$$ make -C external APP_ABI=x86 PIEFLAGS="-fPIE -pie" buildjni=yes - forcevercode=yes + ndk=r10e Build:15.0.1-RC-1-PIE,15012113 commit=15.0.1-RC-1 submodules=yes - rm=libs/,external/superuser-commands/RootCommands-Demo,external/pluto/plugins/meek/assets/meek-client,external/pluto/plugins/obfs4/assets/obfs4proxy,res/raw/meek.mp3,res/raw/obfs4proxy.mp3 patch=nobridge.diff,mipsfix.diff + forcevercode=yes + rm=libs/,external/superuser-commands/RootCommands-Demo,external/pluto/plugins/meek/assets/meek-client,external/pluto/plugins/obfs4/assets/obfs4proxy,res/raw/meek.mp3,res/raw/obfs4proxy.mp3 prebuild=echo 'target=android-17' >> external/superuser-commands/RootCommands-Library/project.properties && \ - sed -i -e '/APP_ABI/ s/:=.*/:= mips/' jni/Application.mk - ndk=r10e + sed -i -e '/APP_ABI/ s/:=.*/:= mips/' jni/Application.mk build=NDK_BASE=$$NDK$$ make -C external APP_ABI=mips PIEFLAGS="-fPIE -pie" buildjni=yes - forcevercode=yes + ndk=r10e Build:15.0.1-RC-1-PIE,15012114 commit=15.0.1-RC-1 submodules=yes - rm=libs/,external/superuser-commands/RootCommands-Demo,external/pluto/plugins/meek/assets/meek-client,external/pluto/plugins/obfs4/assets/obfs4proxy,res/raw/meek.mp3,res/raw/obfs4proxy.mp3 patch=nobridge.diff + forcevercode=yes + rm=libs/,external/superuser-commands/RootCommands-Demo,external/pluto/plugins/meek/assets/meek-client,external/pluto/plugins/obfs4/assets/obfs4proxy,res/raw/meek.mp3,res/raw/obfs4proxy.mp3 prebuild=echo 'target=android-17' >> external/superuser-commands/RootCommands-Library/project.properties && \ - sed -i -e '/APP_ABI/ s/:=.*/:= arm64-v8a/' jni/Application.mk - ndk=r10e + sed -i -e '/APP_ABI/ s/:=.*/:= arm64-v8a/' jni/Application.mk build=NDK_BASE=$$NDK$$ make -C external APP_ABI=arm64-v8a PIEFLAGS="-fPIE -pie" NDK_PLATFORM_LEVEL=21 NDK_TOOLCHAIN_VERSION=4.9 buildjni=yes - forcevercode=yes + ndk=r10e Build:15.0.1-RC-1-PIE,15012115 disable=libcrypto.a(eng_rsax.o):eng_rsax.c:function e_rsax_bn_mod_exp: error: undefined reference to 'mod_exp_512' commit=15.0.1-RC-1 submodules=yes - rm=libs/,external/superuser-commands/RootCommands-Demo,external/pluto/plugins/meek/assets/meek-client,external/pluto/plugins/obfs4/assets/obfs4proxy,res/raw/meek.mp3,res/raw/obfs4proxy.mp3 patch=nobridge.diff + forcevercode=yes + rm=libs/,external/superuser-commands/RootCommands-Demo,external/pluto/plugins/meek/assets/meek-client,external/pluto/plugins/obfs4/assets/obfs4proxy,res/raw/meek.mp3,res/raw/obfs4proxy.mp3 prebuild=echo 'target=android-17' >> external/superuser-commands/RootCommands-Library/project.properties && \ - sed -i -e '/APP_ABI/ s/:=.*/:= x86_64/' jni/Application.mk - ndk=r10e + sed -i -e '/APP_ABI/ s/:=.*/:= x86_64/' jni/Application.mk build=NDK_BASE=$$NDK$$ make -C external APP_ABI=x86_64 PIEFLAGS="-fPIE -pie" NDK_PLATFORM_LEVEL=21 NDK_TOOLCHAIN_VERSION=4.9 buildjni=yes - forcevercode=yes + ndk=r10e Build:15.0.1-RC-1-PIE,15012116 commit=15.0.1-RC-1 submodules=yes - rm=libs/,external/superuser-commands/RootCommands-Demo,external/pluto/plugins/meek/assets/meek-client,external/pluto/plugins/obfs4/assets/obfs4proxy,res/raw/meek.mp3,res/raw/obfs4proxy.mp3 patch=nobridge.diff + forcevercode=yes + rm=libs/,external/superuser-commands/RootCommands-Demo,external/pluto/plugins/meek/assets/meek-client,external/pluto/plugins/obfs4/assets/obfs4proxy,res/raw/meek.mp3,res/raw/obfs4proxy.mp3 prebuild=echo 'target=android-17' >> external/superuser-commands/RootCommands-Library/project.properties && \ - sed -i -e '/APP_ABI/ s/:=.*/:= mips64/' jni/Application.mk - ndk=r10e + sed -i -e '/APP_ABI/ s/:=.*/:= mips64/' jni/Application.mk build=NDK_BASE=$$NDK$$ make -C external APP_ABI=mips64 PIEFLAGS="-fPIE -pie" NDK_PLATFORM_LEVEL=21 NDK_TOOLCHAIN_VERSION=4.9 buildjni=yes - forcevercode=yes + ndk=r10e Maintainer Notes: * meekclient & ofbs4proxy are prebuilt with PIE for arm archs only. Hence remove them for other archs & for non-PIE builds. @@ -358,7 +361,8 @@ Maintainer Notes: #Archive Policy:6 versions #Auto Update Mode:Version %v Archive Policy:12 versions +Auto Update Mode:None Update Check Mode:Tags ^[^-]*$ Current Version:14.1.4-PIE -Current Version Code:133 +Current Version Code:132