Update Orbot to 15.0.1-RC-1 (15012110)
This commit is contained in:
أحمد المحمودي (Ahmed El-Mahmoudy)
parent
57dfb2ba6d
commit
86d33f128e
|
|
@ -223,14 +223,139 @@ Build:14.1.4-PIE,133
|
|||
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
|
||||
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
|
||||
build=NDK_BASE=$$NDK$$ make -C external APP_ABI=armeabi PIEFLAGS=""
|
||||
buildjni=yes
|
||||
forcevercode=yes
|
||||
forceversion=yes
|
||||
|
||||
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
|
||||
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
|
||||
build=NDK_BASE=$$NDK$$ make -C external APP_ABI=x86 PIEFLAGS=""
|
||||
buildjni=yes
|
||||
forcevercode=yes
|
||||
forceversion=yes
|
||||
|
||||
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
|
||||
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
|
||||
build=NDK_BASE=$$NDK$$ make -C external APP_ABI=mips PIEFLAGS=""
|
||||
buildjni=yes
|
||||
forcevercode=yes
|
||||
forceversion=yes
|
||||
|
||||
Build:15.0.1-RC-1-PIE,15012111
|
||||
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
|
||||
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
|
||||
build=NDK_BASE=$$NDK$$ make -C external APP_ABI=armeabi PIEFLAGS="-fPIE -pie"
|
||||
buildjni=yes
|
||||
forcevercode=yes
|
||||
|
||||
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
|
||||
prebuild=echo 'target=android-17' >> external/superuser-commands/RootCommands-Library/project.properties && \
|
||||
sed -i -e '/APP_ABI/ s/:=.*/:= x86/' jni/Application.mk
|
||||
ndk=r10e
|
||||
build=NDK_BASE=$$NDK$$ make -C external APP_ABI=x86 PIEFLAGS="-fPIE -pie"
|
||||
buildjni=yes
|
||||
forcevercode=yes
|
||||
|
||||
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
|
||||
prebuild=echo 'target=android-17' >> external/superuser-commands/RootCommands-Library/project.properties && \
|
||||
sed -i -e '/APP_ABI/ s/:=.*/:= mips/' jni/Application.mk
|
||||
ndk=r10e
|
||||
build=NDK_BASE=$$NDK$$ make -C external APP_ABI=mips PIEFLAGS="-fPIE -pie"
|
||||
buildjni=yes
|
||||
forcevercode=yes
|
||||
|
||||
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
|
||||
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
|
||||
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
|
||||
|
||||
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
|
||||
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
|
||||
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
|
||||
|
||||
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
|
||||
prebuild=echo 'target=android-17' >> external/superuser-commands/RootCommands-Library/project.properties && \
|
||||
sed -i -e '/APP_ABI/ s/:=.*/:= mips64/' jni/Application.mk
|
||||
ndk=r10e
|
||||
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
|
||||
|
||||
Maintainer Notes:
|
||||
UCM only picks up the noPIE version with lower VC. Also AUM will only build
|
||||
the default flavor.
|
||||
* 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.
|
||||
.
|
||||
|
||||
Archive Policy:6 versions
|
||||
# +0: vanilla
|
||||
# +1: arm (noPIE)
|
||||
# +2: x86 (noPIE)
|
||||
# +3: mips (noPIE)
|
||||
# +11: arm (PIE)
|
||||
# +12: x86 (PIE)
|
||||
# +13: mips (PIE)
|
||||
# +14: arm64-v8a
|
||||
# +15: x86_64
|
||||
# +16: mips64
|
||||
#Archive Policy:6 versions
|
||||
#Auto Update Mode:Version %v
|
||||
#Update Check Mode:Tags ^[^-]*$
|
||||
Update Check Mode:Tags ^[^-]*$
|
||||
Current Version:14.1.4-PIE
|
||||
Current Version Code:133
|
||||
|
||||
|
|
|
|||
13
metadata/org.torproject.android/mipsfix.diff
Normal file
13
metadata/org.torproject.android/mipsfix.diff
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/external/Makefile b/external/Makefile
|
||||
index c4b91b2..587fae4 100644
|
||||
--- a/external/Makefile
|
||||
+++ b/external/Makefile
|
||||
@@ -108,7 +108,7 @@ ifneq ($(filter mips%, $(NDK_ABI)),)
|
||||
ifneq ($(findstring 64, $(NDK_ABI)),)
|
||||
OPENSSL_CONF_FLAG+=-D_MIPS_SZLONG=64
|
||||
else
|
||||
- OPENSSL_CONF_FLAG+=-D_MIPS_SZLONG=32
|
||||
+ OPENSSL_CONF_FLAG+=-D_MIPS_SZLONG=32 -D__MIPSEL__
|
||||
endif
|
||||
endif
|
||||
|
||||
22
metadata/org.torproject.android/nobridge.diff
Normal file
22
metadata/org.torproject.android/nobridge.diff
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
diff --git a/src/org/torproject/android/service/TorResourceInstaller.java b/src/org/torproject/android/service/TorResourceInstaller.java
|
||||
index 648f752..b5f3449 100644
|
||||
--- a/src/org/torproject/android/service/TorResourceInstaller.java
|
||||
+++ b/src/org/torproject/android/service/TorResourceInstaller.java
|
||||
@@ -90,17 +90,6 @@ public class TorResourceInstaller implements TorServiceConstants {
|
||||
//only install if ARM (GoLang only supports ARM for now)
|
||||
if (Build.CPU_ABI.contains("arm"))
|
||||
{
|
||||
- is = context.getResources().openRawResource(R.raw.obfs4proxy);
|
||||
- outFile = new File(installFolder, OBFSCLIENT_ASSET_KEY);
|
||||
- shell.add(new SimpleCommand(COMMAND_RM_FORCE + outFile.getAbsolutePath())).waitForFinish();
|
||||
- streamToFile(is,outFile, false, true);
|
||||
- setExecutable(outFile);
|
||||
-
|
||||
- is = context.getResources().openRawResource(R.raw.meek);
|
||||
- outFile = new File(installFolder, MEEK_ASSET_KEY);
|
||||
- shell.add(new SimpleCommand(COMMAND_RM_FORCE + outFile.getAbsolutePath())).waitForFinish();
|
||||
- streamToFile(is,outFile, false, true);
|
||||
- setExecutable(outFile);
|
||||
|
||||
cpuPath = "armeabi";
|
||||
}
|
||||
Loading…
Reference in a new issue