From 5cb290c26a9c07ef2ba2309d848f41208efdc1c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D8=A3=D8=AD=D9=85=D8=AF=20=D8=A7=D9=84=D9=85=D8=AD=D9=85?= =?UTF-8?q?=D9=88=D8=AF=D9=8A=20=28Ahmed=20El-Mahmoudy=29?= Date: Wed, 15 Jul 2015 08:49:19 +0200 Subject: [PATCH] Orbot: Update to 15.0.1-RC-3 * Disable RC-1 build for archive policy * Bump archive policy to include builds for last stable release * x86_64 finally builds --- metadata/org.torproject.android.txt | 132 +++++++++++++++++++++++++++- 1 file changed, 129 insertions(+), 3 deletions(-) diff --git a/metadata/org.torproject.android.txt b/metadata/org.torproject.android.txt index 8f409f030b..c0372a1d73 100644 --- a/metadata/org.torproject.android.txt +++ b/metadata/org.torproject.android.txt @@ -227,6 +227,7 @@ Build:14.1.4-PIE,133 buildjni=no Build:15.0.1-RC-1-noPIE,15012101 + disable=archive policy commit=15.0.1-RC-1 submodules=yes patch=nobridge.diff @@ -241,6 +242,7 @@ Build:15.0.1-RC-1-noPIE,15012101 ndk=r10e Build:15.0.1-RC-1-noPIE,15012102 + disable=archive policy commit=15.0.1-RC-1 submodules=yes patch=nobridge.diff @@ -255,6 +257,7 @@ Build:15.0.1-RC-1-noPIE,15012102 ndk=r10e Build:15.0.1-RC-1-noPIE,15012103 + disable=archive policy commit=15.0.1-RC-1 submodules=yes patch=nobridge.diff,mipsfix.diff @@ -269,6 +272,7 @@ Build:15.0.1-RC-1-noPIE,15012103 ndk=r10e Build:15.0.1-RC-1-PIE,15012111 + disable=archive policy commit=15.0.1-RC-1 submodules=yes forcevercode=yes @@ -280,6 +284,7 @@ Build:15.0.1-RC-1-PIE,15012111 ndk=r10e Build:15.0.1-RC-1-PIE,15012112 + disable=archive policy commit=15.0.1-RC-1 submodules=yes patch=nobridge.diff @@ -292,6 +297,7 @@ Build:15.0.1-RC-1-PIE,15012112 ndk=r10e Build:15.0.1-RC-1-PIE,15012113 + disable=archive policy commit=15.0.1-RC-1 submodules=yes patch=nobridge.diff,mipsfix.diff @@ -304,6 +310,7 @@ Build:15.0.1-RC-1-PIE,15012113 ndk=r10e Build:15.0.1-RC-1-PIE,15012114 + disable=archive policy commit=15.0.1-RC-1 submodules=yes patch=nobridge.diff @@ -329,6 +336,7 @@ Build:15.0.1-RC-1-PIE,15012115 ndk=r10e Build:15.0.1-RC-1-PIE,15012116 + disable=archive policy commit=15.0.1-RC-1 submodules=yes patch=nobridge.diff @@ -454,11 +462,129 @@ Build:15.0.1-RC-2-PIE,15012216 buildjni=yes ndk=r10e +Build:15.0.1-RC-3-noPIE,15012301 + commit=15.0.1-RC-3 + submodules=yes + 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 + build=NDK_BASE=$$NDK$$ make -C external APP_ABI=armeabi PIEFLAGS="" + buildjni=yes + ndk=r10e + +Build:15.0.1-RC-3-noPIE,15012302 + commit=15.0.1-RC-3 + submodules=yes + 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 + build=NDK_BASE=$$NDK$$ make -C external APP_ABI=x86 PIEFLAGS="" + buildjni=yes + ndk=r10e + +Build:15.0.1-RC-3-noPIE,15012303 + commit=15.0.1-RC-3 + submodules=yes + 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/:=.*/:= 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 + ndk=r10e + +Build:15.0.1-RC-3-PIE,15012311 + commit=15.0.1-RC-3 + submodules=yes + forceversion=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 + build=NDK_BASE=$$NDK$$ make -C external APP_ABI=armeabi PIEFLAGS="-fPIE -pie" + buildjni=yes + ndk=r10e + +Build:15.0.1-RC-3-PIE,15012312 + commit=15.0.1-RC-3 + submodules=yes + 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 + build=NDK_BASE=$$NDK$$ make -C external APP_ABI=x86 PIEFLAGS="-fPIE -pie" + buildjni=yes + ndk=r10e + +Build:15.0.1-RC-3-PIE,15012313 + commit=15.0.1-RC-3 + submodules=yes + 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/:=.*/:= mips/' jni/Application.mk + build=NDK_BASE=$$NDK$$ make -C external APP_ABI=mips PIEFLAGS="-fPIE -pie" + buildjni=yes + ndk=r10e + +Build:15.0.1-RC-3-PIE,15012314 + commit=15.0.1-RC-3 + submodules=yes + 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/:=.*/:= 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 + ndk=r10e + +Build:15.0.1-RC-3-PIE,15012315 + commit=15.0.1-RC-3 + submodules=yes + 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_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 + ndk=r10e + +Build:15.0.1-RC-3-PIE,15012316 + commit=15.0.1-RC-3 + submodules=yes + 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/:=.*/:= 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 + ndk=r10e + Maintainer Notes: * meekclient & ofbs4proxy are prebuilt with PIE for arm archs only. Hence remove them for other archs & for non-PIE builds. -* mips & x86_64 builds fail * AUM will only build the default flavor. -* Bump archive policy on each release to match all new builds + all build of the previous version +* Bump archive policy on each release to match all new builds + all build of the previous version (during RC builds, also add builds for last stable version) * Bump CV/CVC when all builds have finished and we have tested whats possible... . @@ -474,7 +600,7 @@ Maintainer Notes: # +16: mips64 #Archive Policy:6 versions #Auto Update Mode:Version %v -Archive Policy:12 versions +Archive Policy:19 versions Auto Update Mode:None Update Check Mode:Tags ^[^-]*$ Current Version:14.1.4-PIE