- tbb-commits - lists.torproject.org

[rbm/master] Bug 33990: Initialize step in non-build commands
by gk＠torproject.org 27 Apr '20

27 Apr '20

commit 18b396fb08ee9ee9311de7b8224197282f0935fe Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 24 16:01:23 2020 +0200 Bug 33990: Initialize step in non-build commands When using the build command, step gets initialized to 'build'. However this was not done in some of the other non-build commands where the value of step was left to rbm_init. --- rbm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rbm b/rbm index 5d6417b..6b31185 100755 --- a/rbm +++ b/rbm @@ -109,6 +109,9 @@ sub set_options { } RBM::load_system_config(@_); RBM::load_local_config(@_); + if (!defined $val{step} && @_) { + $RBM::config->{step} = RBM::project_config($_[0], 'pkg_type'); + } return $RBM::config->{run}{args} = \@_; } @@ -172,9 +175,9 @@ sub build_script { my $script_name = shift; usageexit($_[0]) unless @_ >= 2; my $cmd = shift; - my $args = set_options(@_); + my $args = set_options("--step=$script_name", @_); usageexit($cmd) unless @$args == 1; - $script_name = $RBM::config->{step} if $RBM::config->{step} ne 'rbm_init'; + $script_name = $RBM::config->{step}; RBM::build_pkg($args->[0], { pkg_type => $script_name }); }

1 0

[tor-browser-build/master] Bug 33802: Remove obsolete --enabled-secure-api
by boklm＠torproject.org 19 Apr '20

19 Apr '20

commit f9eef9924b8e748d436fd27b15cf0c2617b44249 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 3 07:03:49 2020 +0000 Bug 33802: Remove obsolete --enabled-secure-api --- projects/mingw-w64-clang/build | 1 - projects/mingw-w64/build | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/projects/mingw-w64-clang/build b/projects/mingw-w64-clang/build index fa059da..302975d 100644 --- a/projects/mingw-w64-clang/build +++ b/projects/mingw-w64-clang/build @@ -72,7 +72,6 @@ cd mingw-w64-headers mkdir build && cd build ../configure --host=[% c("arch") %]-w64-mingw32 \ --enable-sdk=all \ - --enable-secure-api \ --enable-idl \ --with-default-msvcrt=ucrt \ --with-default-win32-winnt=$default_win32_winnt \ diff --git a/projects/mingw-w64/build b/projects/mingw-w64/build index 9e504ba..c5fcda6 100644 --- a/projects/mingw-w64/build +++ b/projects/mingw-w64/build @@ -15,7 +15,7 @@ mkdir -p builddir/mingw-w64/mingw-w64-headers32 cd builddir/mingw-w64/mingw-w64-headers32 /var/tmp/build/[% project %]-[% c("version") %]/mingw-w64-headers/configure \ --prefix=$distdir/[% c("arch") %]-w64-mingw32 --host=[% c("arch") %]-w64-mingw32 \ - --enable-sdk=all --enable-secure-api --enable-idl + --enable-sdk=all --enable-idl make install cd /var/tmp/build

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gk/bug_33802'
by boklm＠torproject.org 19 Apr '20

19 Apr '20

commit 6b60066bddd5d93442fc2d4fe553b779dcf8a045 Merge: 49319fa f9eef99 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sun Apr 19 15:55:32 2020 +0200 Merge remote-tracking branch 'gk/bug_33802' projects/mingw-w64-clang/build | 1 - projects/mingw-w64/build | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)

1 0

[tor-browser-bundle-testsuite/master] Bug 33926: Add a LICENSE file ("3-clause BSD" license)
by gk＠torproject.org 17 Apr '20

17 Apr '20

commit 2357de09b5e66dddf749a4fec042940abcafabca Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 17 15:16:11 2020 +0200 Bug 33926: Add a LICENSE file ("3-clause BSD" license) --- LICENSE | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..a8acdf3 --- /dev/null +++ b/LICENSE @@ -0,0 +1,29 @@ +Copyright (c) 2020, The Tor Project, Inc. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + + * Neither the names of the copyright owners nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

1 0

[tor-browser-build/master] Bug 32038: Add a LICENSE file
by gk＠torproject.org 17 Apr '20

17 Apr '20

commit 49319fa1afea0f0f0e2ce16b7d61da95f39c79b2 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Mar 31 20:28:27 2020 +0200 Bug 32038: Add a LICENSE file --- LICENSE | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..ee29ae2 --- /dev/null +++ b/LICENSE @@ -0,0 +1,37 @@ +This file contains the license for the build recipes and tools used in +the Tor Browser development process, that are included in this repository. + +For the license of specific components included in Tor Browser, see +directory projects/tor-browser/Bundle-Data/Docs/Licenses. + +=============================================================================== + +Copyright (c) 2020, The Tor Project, Inc. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + + * Neither the names of the copyright owners nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

1 0

[tor-browser-build/master] Bug 32788: Specify version for test builds
by gk＠torproject.org 17 Apr '20

17 Apr '20

commit 3310abeac20111775407177fb95f4ede3d50251c Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 17 06:46:29 2020 +0000 Bug 32788: Specify version for test builds With our switch to including a date into our nightly build versioning (#25009) testing patches with test builds got harder. The firefox part has to be rebuilt every day now as it includes the version number, even if no code changes occurred. That slows down testing of patches significantly. We hardcode "testing" as the test build version number to fix that and use "20010101010101" for the build date. Thanks to boklm for help. --- projects/firefox/get-moz-build-date | 4 ++++ rbm.conf | 11 ++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/projects/firefox/get-moz-build-date b/projects/firefox/get-moz-build-date index e6989ff..a43f2f7 100755 --- a/projects/firefox/get-moz-build-date +++ b/projects/firefox/get-moz-build-date @@ -8,6 +8,10 @@ my ($year, $version) = @ARGV; my $date; if ($version =~ m/^tbb-nightly\.([^\.]+)\.([^\.]+)\.([^\.]+)$/) { $date = sprintf("%d%02d%02d010101", $1, $2, $3); +} elsif ($version eq 'testbuild') { + # There is no need for an increasing build date in test builds. Just hardcode + # it. + $date = 20010101010101; } else { my @v = split(/[\.ab]/, $version); push @v, '0' if @v < 4; diff --git a/rbm.conf b/rbm.conf index cd17da9..94f9fcc 100644 --- a/rbm.conf +++ b/rbm.conf @@ -151,7 +151,16 @@ targets: var: nightly: 1 channel: nightly - torbrowser_version: '[% ENV.TORBROWSER_NIGHTLY_VERSION ? ENV.TORBROWSER_NIGHTLY_VERSION : c("var_p/nightly_torbrowser_version") %]' + torbrowser_version: | + [% + IF ENV.TORBROWSER_NIGHTLY_VERSION; + GET ENV.TORBROWSER_NIGHTLY_VERSION; + ELSIF c("var/testbuild"); + GET "testbuild"; + ELSE; + GET c("var_p/nightly_torbrowser_version"); + END; + -%] # For nightly builds, we support updates for a limited set of locales mar_locales: - de

1 0

[tor-browser-build/master] Bug 33359: Use latest Version of TOPL and Remove Patches
by gk＠torproject.org 17 Apr '20

17 Apr '20

commit d567f0f9fc3cebd4f57ee928b6b2c185137403d5 Author: sisbell <shane.isbell(a)gmail.com> Date: Mon Feb 17 21:56:11 2020 -0800 Bug 33359: Use latest Version of TOPL and Remove Patches --- ...ustom-obfs4-bridge-does-not-work-on-Tor-B.patch | 146 --------------------- projects/tor-onion-proxy-library/build | 2 - .../tor-onion-proxy-library/canceldormant.patch | 46 ------- projects/tor-onion-proxy-library/config | 4 +- 4 files changed, 1 insertion(+), 197 deletions(-) diff --git a/projects/tor-onion-proxy-library/0001-Bug-30767-Custom-obfs4-bridge-does-not-work-on-Tor-B.patch b/projects/tor-onion-proxy-library/0001-Bug-30767-Custom-obfs4-bridge-does-not-work-on-Tor-B.patch deleted file mode 100644 index 2d1bc51..0000000 --- a/projects/tor-onion-proxy-library/0001-Bug-30767-Custom-obfs4-bridge-does-not-work-on-Tor-B.patch +++ /dev/null @@ -1,146 +0,0 @@ -From 0a482a749fd770827d3d6c71debb112a07e7fae3 Mon Sep 17 00:00:00 2001 -From: sisbell <shane.isbell(a)gmail.com> -Date: Thu, 14 Nov 2019 13:43:09 -0800 -Subject: [PATCH] Bug 30767: Custom obfs4 bridge does not work on Tor Browser - for Android - -TOPL fixes #134 ---- - .../thali/toronionproxy/TorConfigBuilder.java | 63 ++++++++----------- - 1 file changed, 26 insertions(+), 37 deletions(-) - -diff --git a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java -index e324d9f..da9a6a2 100644 ---- a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java -+++ b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java -@@ -99,25 +99,32 @@ public final class TorConfigBuilder { - return this; - } - -+ @SettingsConfig -+ public TorConfigBuilder bridgesFromSettings() { -+ try { -+ addBridgesFromResources(); -+ } catch (IOException e) { -+ e.printStackTrace(); -+ } -+ return this; -+ } -+ - public TorConfigBuilder configurePluggableTransportsFromSettings(File pluggableTransportClient) throws IOException { -- List<String> supportedBridges = settings.getListOfSupportedBridges(); -- if (pluggableTransportClient == null || !settings.hasBridges() || supportedBridges.size() < 1) { -+ if (pluggableTransportClient == null) { - return this; - } - -- if (!pluggableTransportClient.exists() || !pluggableTransportClient.canExecute()) { -+ if (!pluggableTransportClient.exists()) { - throw new IOException("Bridge binary does not exist: " + pluggableTransportClient - .getCanonicalPath()); - } - -- if (supportedBridges.contains("obfs3") || supportedBridges.contains("obfs4")) { -- transportPluginObfs(pluggableTransportClient.getCanonicalPath()); -- } -- if (supportedBridges.contains("meek")) { -- transportPluginMeek(pluggableTransportClient.getCanonicalPath()); -+ if (!pluggableTransportClient.canExecute()) { -+ throw new IOException("Bridge binary is not executable: " + pluggableTransportClient -+ .getCanonicalPath()); - } -- String type = supportedBridges.contains("meek") ? "meek_lite" : "obfs4"; -- addBridgesFromResources(type, 2); -+ -+ transportPlugin(pluggableTransportClient.getCanonicalPath()); - return this; - } - -@@ -471,14 +478,8 @@ public final class TorConfigBuilder { - return transPort(settings.transPort()); - } - -- public TorConfigBuilder transportPluginMeek(String clientPath) { -- buffer.append("ClientTransportPlugin meek_lite exec ").append(clientPath).append('\n'); -- return this; -- } -- -- public TorConfigBuilder transportPluginObfs(String clientPath) { -- buffer.append("ClientTransportPlugin obfs3 exec ").append(clientPath).append('\n'); -- buffer.append("ClientTransportPlugin obfs4 exec ").append(clientPath).append('\n'); -+ public TorConfigBuilder transportPlugin(String clientPath) { -+ buffer.append("ClientTransportPlugin meek_lite,obfs3,obfs4 exec ").append(clientPath).append('\n'); - return this; - } - -@@ -489,7 +490,7 @@ public final class TorConfigBuilder { - - @SettingsConfig - public TorConfigBuilder useBridgesFromSettings() { -- return !settings.hasBridges() ? dontUseBridges() : this; -+ return settings.hasBridges() ? useBridges() : this; - } - - public TorConfigBuilder virtualAddressNetwork(String address) { -@@ -518,12 +519,12 @@ public final class TorConfigBuilder { - * </code> - * - */ -- TorConfigBuilder addBridgesFromResources(String type, int maxBridges) throws IOException { -+ TorConfigBuilder addBridgesFromResources() throws IOException { - if(settings.hasBridges()) { - InputStream bridgesStream = context.getInstaller().openBridgesStream(); - int formatType = bridgesStream.read(); -- if(formatType == 0) { -- addBridges(bridgesStream, type, maxBridges); -+ if (formatType == 0) { -+ addBridges(bridgesStream); - } else { - addCustomBridges(bridgesStream); - } -@@ -534,23 +535,14 @@ public final class TorConfigBuilder { - /** - * Add bridges from bridges.txt file. - */ -- private void addBridges(InputStream input, String bridgeType, int maxBridges) { -- if (input == null || isNullOrEmpty(bridgeType) || maxBridges < 1) { -+ private void addBridges(InputStream input) { -+ if (input == null) { - return; - } -- boolean hasAddedBridge = false; - List<Bridge> bridges = readBridgesFromStream(input); -- Collections.shuffle(bridges, new Random(System.nanoTime())); -- int bridgeCount = 0; - for (Bridge b : bridges) { -- if (b.type.equals(bridgeType)) { -- bridge(b.type, b.config); -- hasAddedBridge = true; -- if (++bridgeCount > maxBridges) -- break; -- } -+ bridge(b.type, b.config); - } -- if(hasAddedBridge) useBridges(); - } - - /** -@@ -560,15 +552,12 @@ public final class TorConfigBuilder { - if (input == null) { - return; - } -- boolean hasAddedBridge = false; - List<Bridge> bridges = readCustomBridgesFromStream(input); - for (Bridge b : bridges) { - if (b.type.equals("custom")) { - bridgeCustom(b.config); -- hasAddedBridge = true; - } - } -- if(hasAddedBridge) useBridges(); - } - - private static List<Bridge> readBridgesFromStream(InputStream input) { --- -2.20.1 - diff --git a/projects/tor-onion-proxy-library/build b/projects/tor-onion-proxy-library/build index 9a8b31e..21c8f7a 100644 --- a/projects/tor-onion-proxy-library/build +++ b/projects/tor-onion-proxy-library/build @@ -20,8 +20,6 @@ cd /var/tmp/build/[% project %]-[% c('version') %] # Gradle patch provided so that when generating a gradle dependency list, the # build will pull down the correct android tool versions patch -p1 < $rootdir/gradle.patch -patch -p1 < $rootdir/canceldormant.patch -patch -p1 < $rootdir/0001-Bug-30767-Custom-obfs4-bridge-does-not-work-on-Tor-B.patch # Extract obfs4proxy from TorBrowser/Tor/PluggableTransports/obfs4proxy tar --strip-components=4 -xf $rootdir/[% c('input_files_by_name/obfs4') %] diff --git a/projects/tor-onion-proxy-library/canceldormant.patch b/projects/tor-onion-proxy-library/canceldormant.patch deleted file mode 100644 index 8d48af1..0000000 --- a/projects/tor-onion-proxy-library/canceldormant.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/universal/src/main/java/com/msopentech/thali/toronionproxy/DefaultSettings.java b/universal/src/main/java/com/msopentech/thali/toronionproxy/DefaultSettings.java -index 5f5adac..da6747f 100644 ---- a/universal/src/main/java/com/msopentech/thali/toronionproxy/DefaultSettings.java -+++ b/universal/src/main/java/com/msopentech/thali/toronionproxy/DefaultSettings.java -@@ -187,4 +187,9 @@ public class DefaultSettings implements TorSettings { - public boolean useSocks5() { - return false; - } -+ -+ @Override -+ public boolean hasDormantCanceledByStartup() { -+ return false; -+ } - } -diff --git a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java -index e324d9f..99e5693 100644 ---- a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java -+++ b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java -@@ -503,6 +503,16 @@ public final class TorConfigBuilder { - return virtualAddressNetwork(settings.getVirtualAddressNetwork()); - } - -+ public TorConfigBuilder dormantCanceledByStartup() { -+ buffer.append("DormantCanceledByStartup 1").append('\n'); -+ return this; -+ } -+ -+ @SettingsConfig -+ public TorConfigBuilder domantCanceledByStartupFromSettings() { -+ return settings.hasDormantCanceledByStartup() ? dormantCanceledByStartup() : this; -+ } -+ - /** - * Adds bridges from a resource stream. This relies on the TorInstaller to know how to obtain this stream. - * These entries may be type-specified like: -diff --git a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorSettings.java b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorSettings.java -index 2d515d1..43f01ef 100644 ---- a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorSettings.java -+++ b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorSettings.java -@@ -77,4 +77,6 @@ public interface TorSettings { - String transPort(); - - boolean useSocks5(); -+ -+ boolean hasDormantCanceledByStartup(); - } diff --git a/projects/tor-onion-proxy-library/config b/projects/tor-onion-proxy-library/config index c682078..080f0c2 100644 --- a/projects/tor-onion-proxy-library/config +++ b/projects/tor-onion-proxy-library/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]' -git_hash: a720e25bcdada2e6ba5c8cb1f566a6b633b79dc5 +git_hash: aeb63ebd079b646a3ec1b7b84d755653baa467d7 git_url: https://github.com/thaliproject/Tor_Onion_Proxy_Library.git git_submodule: 1 @@ -25,5 +25,3 @@ input_files: name: gradle-dependencies exec: '[% INCLUDE "fetch-gradle-dependencies" %]' - filename: gradle.patch - - filename: canceldormant.patch - - filename: 0001-Bug-30767-Custom-obfs4-bridge-does-not-work-on-Tor-B.patch

1 0

[tor-browser/tor-browser-68.7.0esr-9.5-1] fixup! Bug 23247: Communicating security expectations for .onion
by boklm＠torproject.org 15 Apr '20

15 Apr '20

commit dcae22191c42bdb1948a6e55c7c50e0ab97dbf70 Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Mar 25 18:33:57 2020 +0100 fixup! Bug 23247: Communicating security expectations for .onion --- dom/security/nsMixedContentBlocker.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dom/security/nsMixedContentBlocker.cpp b/dom/security/nsMixedContentBlocker.cpp index cf060b67d68f..2bbc2e8aecb3 100644 --- a/dom/security/nsMixedContentBlocker.cpp +++ b/dom/security/nsMixedContentBlocker.cpp @@ -794,6 +794,11 @@ nsresult nsMixedContentBlocker::ShouldLoad( return NS_OK; } + if (isHttpScheme && IsPotentiallyTrustworthyOrigin(innerContentLocation)) { + *aDecision = ACCEPT; + return NS_OK; + } + // The page might have set the CSP directive 'upgrade-insecure-requests'. In // such a case allow the http: load to succeed with the promise that the // channel will get upgraded to https before fetching any data from the

1 0

[tor-browser-build/master] Bug 28766: Tor Build for Android
by boklm＠torproject.org 15 Apr '20

15 Apr '20

commit 7894190b275b412c8d4f9cf7cad281601594da24 Author: sisbell <shane.isbell(a)gmail.com> Date: Wed Jan 15 21:48:13 2020 -0800 Bug 28766: Tor Build for Android --- projects/tor/build | 27 ++++++++++++++++++++++----- projects/tor/config | 10 +++++++++- 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/projects/tor/build b/projects/tor/build index 0235da7..30ecc7e 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -4,6 +4,12 @@ distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/build +[% IF c("var/android") %] + TORCONFIGDIR="$distdir/assets/common" + libsdir=$distdir/jniLibs/[% c("var/abi") %] + mkdir -p $libsdir $TORCONFIGDIR "$distdir/Tor" +[% END %] + [% IF c("var/linux") || c("var/windows") %] TORCONFIGDIR="$distdir/Data/Tor" mkdir -p $TORCONFIGDIR @@ -22,12 +28,19 @@ mkdir -p /var/tmp/build mkdir -p $TORCONFIGDIR [% END %] -tar -C /var/tmp/dist -xf [% c('input_files_by_name/openssl') %] -tar -C /var/tmp/dist -xf [% c('input_files_by_name/libevent') %] +[% IF c("var/windows") || c("var/android") %] + tar -C /var/tmp/dist -xf [% c('input_files_by_name/zlib') %] + zlibdir=/var/tmp/dist/zlib +[% END %] +[% IF c("var/android") %] + tar -C /var/tmp/dist -xf [% c('input_files_by_name/zstd') %] +[% END %] [% IF !c("var/android") && c("var/nightly") %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/rust') %] export PATH=/var/tmp/dist/rust/bin:$PATH [% END %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/openssl') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/libevent') %] tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz libeventdir=/var/tmp/dist/libevent openssldir=/var/tmp/dist/openssl/openssl @@ -37,8 +50,6 @@ openssldir=/var/tmp/dist/openssl/openssl # We are compiling Tor with Rust enabled for nightlies. export TOR_RUST_TARGET=[% c("arch") %]-pc-windows-gnu [% END %] - tar -C /var/tmp/build -xf [% c('input_files_by_name/zlib') %] - zlibdir=/var/tmp/build/zlib # XXX: It's a bit unfortunate but we need the pthread dll here as libevent # gets compiled with pthread support once it is enabled in GCC, which we need # to do as otherwise the Rust compilaton breaks. @@ -86,7 +97,7 @@ echo '"[% c("abbrev", { abbrev_length => 16 }) %]"' > micro-revision.i find -type f -print0 | xargs -0 [% c("var/touch") %] [% IF !c("var/android") && c("var/nightly") %]TOR_RUST_DEPENDENCIES=`pwd`/src/ext/rust/crates[% END %] ./configure --disable-asciidoc --with-libevent-dir="$libeventdir" --with-openssl-dir="$openssldir" \ [% IF c("var/asan") %]--enable-fragile-hardening[% END %] \ - [% IF c("var/windows") %]--with-zlib-dir="$zlibdir"[% END %] \ + [% IF c("var/windows") || c("var/android") %]--with-zlib-dir="$zlibdir"[% END %] \ [% IF c("var/osx") %]--enable-static-openssl[% END %] \ [% IF !c("var/android") && c("var/nightly") %]--enable-rust[% END %] \ --prefix="$distdir" [% c("var/configure_opt") %] @@ -132,6 +143,10 @@ cd $distdir done [% END %] +[% IF c("var/android") %] + install -s --strip-program=[% c("var/configure_host") %]-strip $distdir/bin/tor $libsdir/libTor.so +[% END %] + mkdir -p [% dest_dir _ '/' _ c('filename') %] [% IF c("var/expert_bundle"); @@ -143,6 +158,8 @@ mkdir -p [% dest_dir _ '/' _ c('filename') %] ELSE; IF c("var/osx"); SET tarsrcdir = [ 'Contents' ]; + ELSIF c("var/android"); + SET tarsrcdir = [ 'assets', 'jniLibs' ]; ELSE; SET tarsrcdir = [ 'Data', 'Tor', ]; END; diff --git a/projects/tor/config b/projects/tor/config index a491ba0..3bd3999 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -45,6 +45,11 @@ targets: var: expert_bundle: 1 flag_mwindows: '' + android: + var: + configure_opt_project: --libdir=$ANDROID_NDK_HOME/[% c("var/toolchain_arch") %]/lib --enable-android --enable-static-openssl --enable-static-libevent --enable-zstd --disable-tool-name-check --disable-system-torrc --disable-system-torrc + arch_deps: + - libtinfo5 input_files: - project: container-image @@ -54,9 +59,12 @@ input_files: project: libevent - name: zlib project: zlib - enable: '[% c("var/windows") %]' + enable: '[% c("var/windows") || c("var/android") %]' - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - name: rust project: rust enable: '[% !c("var/android") && c("var/nightly") %]' + - name: zstd + project: zstd + enable: '[% c("var/android") %]'

1 0

[tor-browser-build/master] Bug 32993: Package Tor With Tor Android Service Project
by boklm＠torproject.org 15 Apr '20

15 Apr '20

commit 4b2a1dcfba4bb57d8ace4f7ffaaff18bfed7a535 Author: sisbell <shane.isbell(a)gmail.com> Date: Sun Jan 19 21:12:07 2020 -0800 Bug 32993: Package Tor With Tor Android Service Project --- projects/tor-android-service/build | 8 ++++++-- projects/tor-android-service/config | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/projects/tor-android-service/build b/projects/tor-android-service/build index 8f8d16d..1a623e5 100644 --- a/projects/tor-android-service/build +++ b/projects/tor-android-service/build @@ -14,9 +14,13 @@ mkdir -p /var/tmp/build $output_dir tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] -patch -p1 < $rootdir/remove-native-build.patch -# Remove native files, otherwise build will fail after gradle.patch +# Replace pre-packaged tor library with the latest build +rm -fR service/src/main/jniLibs/* +tar -C service/src/main -xf $rootdir/[% c('input_files_by_name/tor') %]/tor.tar.gz + +# Patch native build. Then remove native files, otherwise build will fail after gradle.patch +patch -p1 < $rootdir/remove-native-build.patch rm -fR service/src/main/jni # Replace libraries with the config dependencies diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index c2994b7..2f8dd3e 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -22,4 +22,6 @@ input_files: exec: '[% INCLUDE "fetch-gradle-dependencies" %]' - project: tor-onion-proxy-library name: topl + - project: tor + name: tor - filename: remove-native-build.patch

1 0