- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-78.1.0esr-10.0-1] Bug 1651680 - Support --enable-strip/--enable-install-strip on mingw. r=nalexander
by gk＠torproject.org 11 Aug '20

11 Aug '20

commit 8ebe00420de77ac6b8814359f6377e133f403494 Author: Mike Hommey <mh+mozilla(a)glandium.org> Date: Tue Aug 11 02:53:34 2020 +0000 Bug 1651680 - Support --enable-strip/--enable-install-strip on mingw. r=nalexander Differential Revision: https://phabricator.services.mozilla.com/D86649 --- moz.configure | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/moz.configure b/moz.configure index f22c7185f300..9b0e78460113 100755 --- a/moz.configure +++ b/moz.configure @@ -671,21 +671,30 @@ add_old_configure_assignment( 'MOZ_DISABLE_ICF', '1', when=depends('--enable-icf')(lambda x: not x)) -@depends(compile_environment, target) -def may_strip(compile_environment, target): - return compile_environment and target.kernel != 'WINNT' +js_option('--enable-strip', when=compile_environment, + help='Enable stripping of libs & executables') -js_option('--enable-strip', when=may_strip, help='Enable stripping of libs & executables') +# This should be handled as a `when` once bug 1617793 is fixed. +@depends('--enable-strip', c_compiler, when=compile_environment) +def enable_strip(strip, c_compiler): + if strip and c_compiler.type != 'clang-cl': + return True -set_config('ENABLE_STRIP', True, when='--enable-strip') +set_config('ENABLE_STRIP', enable_strip) -js_option('--disable-install-strip', when=may_strip, +js_option('--disable-install-strip', when=compile_environment, help='Enable stripping of libs & executables when packaging') -set_config('PKG_STRIP', True, when='--enable-install-strip') +# This should be handled as a `when` once bug 1617793 is fixed. +@depends('--enable-install-strip', c_compiler, when=compile_environment) +def enable_install_strip(strip, c_compiler): + if strip and c_compiler.type != 'clang-cl': + return True + +set_config('PKG_STRIP', enable_install_strip) -@depends('--enable-strip', '--enable-install-strip', when=may_strip) +@depends('--enable-strip', '--enable-install-strip', when=compile_environment) def strip(strip, install_strip): return strip or install_strip

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gkgl/bug_40037_v2'
by sysrqb＠torproject.org 10 Aug '20

10 Aug '20

commit 0de43304b95255095b66a93fe326f82f818dca6a Merge: 01cb89f 99c1bd0 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Aug 10 17:17:27 2020 +0000 Merge remote-tracking branch 'gkgl/bug_40037_v2' projects/{clang => clang-source}/43909.patch | 0 projects/clang-source/build | 31 ++++ projects/clang-source/config | 32 ++++ projects/clang/build | 18 +- projects/clang/config | 23 +-- projects/fenix-clang/build | 18 +- projects/fenix-clang/config | 23 +-- projects/macosx-toolchain/43909.patch | 252 --------------------------- projects/macosx-toolchain/build | 30 +--- projects/macosx-toolchain/config | 25 +-- projects/mingw-w64-clang/build | 39 ++--- projects/mingw-w64-clang/config | 17 +- 12 files changed, 100 insertions(+), 408 deletions(-)

1 0

[tor-browser-build/master] Bug 40037: Add clang-source project
by sysrqb＠torproject.org 10 Aug '20

10 Aug '20

commit 56eed81fdbfb786dc2248347d899cbbfd1c591b2 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Aug 9 10:32:26 2020 +0000 Bug 40037: Add clang-source project --- projects/clang-source/build | 36 ++++++++++++++++++++++++++++++++++++ projects/clang-source/config | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) diff --git a/projects/clang-source/build b/projects/clang-source/build new file mode 100644 index 0000000..5aebfb1 --- /dev/null +++ b/projects/clang-source/build @@ -0,0 +1,36 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +distdir=/var/tmp/dist/[% project %] +mkdir -p /var/tmp/dist +mkdir -p /var/tmp/build +cd /var/tmp/build +tar -xf $rootdir/[% c('input_files_by_name/llvm') %] +tar -xf $rootdir/[% c('input_files_by_name/clang') %] +tar -xf $rootdir/[% c('input_files_by_name/clang-tools-extra') %] +tar -xf $rootdir/[% c('input_files_by_name/libcxx') %] +tar -xf $rootdir/[% c('input_files_by_name/libcxxabi') %] +tar -xf $rootdir/[% c('input_files_by_name/lld') %] +tar -xf $rootdir/[% c('input_files_by_name/compiler-rt') %] +tar -xf $rootdir/[% c('input_files_by_name/libunwind') %] +mv llvm-* llvm +# LLVM has reproducibility issues when optimizing bitcode, which we need to +# patch. See: #32053 for more details. +patch -p1 < $rootdir/43909.patch +mv clang-* llvm/tools/clang +extra_dir=llvm/tools/clang/tools/extra +mkdir $extra_dir +mv clang-tools-extra-* $extra_dir +mv libcxx-* llvm/projects/libcxx +mv libcxxabi-* llvm/projects/libcxxabi +mv lld-* llvm/tools/lld +mv compiler-rt-* llvm/projects/compiler-rt +# We need libunwind only for mingw-w64-clang, don't include it as tightly by +# putting it into projects/ +mv libunwind-* llvm/libunwind +mv llvm $distdir + +cd /var/tmp/dist +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/clang-source/config b/projects/clang-source/config new file mode 100644 index 0000000..d0ae90c --- /dev/null +++ b/projects/clang-source/config @@ -0,0 +1,32 @@ +# vim: filetype=yaml sw=2 +version: 9.0.1 +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +gpg_keyring: clang.gpg +sig_ext: sig + +input_files: + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/llvm-[% c("version") %].src.tar.xz' + name: llvm + file_gpg_id: 1 + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/clang-[% c("version") %].src.tar.xz' + name: clang + file_gpg_id: 1 + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/clang-tools-extra-[% c("version") %].src.tar.xz' + name: clang-tools-extra + file_gpg_id: 1 + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/libcxx-[% c("version") %].src.tar.xz' + name: libcxx + file_gpg_id: 1 + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/libcxxabi-[% c("version") %].src.tar.xz' + name: libcxxabi + file_gpg_id: 1 + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/lld-[% c("version") %].src.tar.xz' + name: lld + file_gpg_id: 1 + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/compiler-rt-[% c("version") %].src.tar.xz' + name: compiler-rt + file_gpg_id: 1 + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/libunwind-[% c("version") %].src.tar.xz' + name: libunwind + file_gpg_id: 1 + - filename: 43909.patch

1 0

[tor-browser-build/master] Bug 40037: Move projects over to clang-source
by sysrqb＠torproject.org 10 Aug '20

10 Aug '20

commit 99c1bd0186171c06fc5f07136e9efbd9192fb35a Author: Georg Koppen <gk(a)torproject.org> Date: Sun Aug 9 10:40:38 2020 +0000 Bug 40037: Move projects over to clang-source --- projects/{clang => clang-source}/43909.patch | 0 projects/clang-source/build | 27 ++- projects/clang/build | 18 +- projects/clang/config | 23 +-- projects/fenix-clang/build | 18 +- projects/fenix-clang/config | 23 +-- projects/macosx-toolchain/43909.patch | 252 --------------------------- projects/macosx-toolchain/build | 30 +--- projects/macosx-toolchain/config | 25 +-- projects/mingw-w64-clang/build | 39 ++--- projects/mingw-w64-clang/config | 17 +- 11 files changed, 48 insertions(+), 424 deletions(-) diff --git a/projects/clang/43909.patch b/projects/clang-source/43909.patch similarity index 100% rename from projects/clang/43909.patch rename to projects/clang-source/43909.patch diff --git a/projects/clang-source/build b/projects/clang-source/build index 5aebfb1..860b8e4 100644 --- a/projects/clang-source/build +++ b/projects/clang-source/build @@ -1,9 +1,5 @@ #!/bin/bash [% c("var/set_default_env") -%] -distdir=/var/tmp/dist/[% project %] -mkdir -p /var/tmp/dist -mkdir -p /var/tmp/build -cd /var/tmp/build tar -xf $rootdir/[% c('input_files_by_name/llvm') %] tar -xf $rootdir/[% c('input_files_by_name/clang') %] tar -xf $rootdir/[% c('input_files_by_name/clang-tools-extra') %] @@ -12,24 +8,23 @@ tar -xf $rootdir/[% c('input_files_by_name/libcxxabi') %] tar -xf $rootdir/[% c('input_files_by_name/lld') %] tar -xf $rootdir/[% c('input_files_by_name/compiler-rt') %] tar -xf $rootdir/[% c('input_files_by_name/libunwind') %] -mv llvm-* llvm + +mv llvm-[% c("version") %].src llvm # LLVM has reproducibility issues when optimizing bitcode, which we need to # patch. See: #32053 for more details. patch -p1 < $rootdir/43909.patch -mv clang-* llvm/tools/clang -extra_dir=llvm/tools/clang/tools/extra -mkdir $extra_dir -mv clang-tools-extra-* $extra_dir -mv libcxx-* llvm/projects/libcxx -mv libcxxabi-* llvm/projects/libcxxabi -mv lld-* llvm/tools/lld -mv compiler-rt-* llvm/projects/compiler-rt +mv clang-[% c("version") %].src llvm/tools/clang +# Having clang-tidy available seems like a good idea +mv clang-tools-extra-[% c("version") %].src llvm/tools/clang/tools/extra +mv libcxx-[% c("version") %].src llvm/projects/libcxx +mv libcxxabi-[% c("version") %].src llvm/projects/libcxxabi +mv lld-[% c("version") %].src llvm/tools/lld +mv compiler-rt-[% c("version") %].src llvm/projects/compiler-rt # We need libunwind only for mingw-w64-clang, don't include it as tightly by # putting it into projects/ -mv libunwind-* llvm/libunwind -mv llvm $distdir +mv libunwind-[% c("version") %].src llvm/libunwind +mv llvm [% project %] -cd /var/tmp/dist [% c('tar', { tar_src => [ project ], tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), diff --git a/projects/clang/build b/projects/clang/build index d61ed43..33688e5 100644 --- a/projects/clang/build +++ b/projects/clang/build @@ -15,22 +15,8 @@ export PATH="/var/tmp/dist/cmake/bin:$PATH" [% END -%] mkdir -p /var/tmp/build cd /var/tmp/build -tar -xf $rootdir/[% c('input_files_by_name/llvm') %] -tar -xf $rootdir/[% c('input_files_by_name/clang') %] -tar -xf $rootdir/[% c('input_files_by_name/libcxx') %] -tar -xf $rootdir/[% c('input_files_by_name/libcxxabi') %] -tar -xf $rootdir/[% c('input_files_by_name/lld') %] -tar -xf $rootdir/[% c('input_files_by_name/compiler-rt') %] -mv llvm-* llvm -# LLVM has reproducibility issues when optimizing bitcode, which we need to -# patch. See: #32053 for more details. -patch -p1 < $rootdir/43909.patch -mv clang-* llvm/tools/clang -mv libcxx-* llvm/projects/libcxx -mv libcxxabi-* llvm/projects/libcxxabi -mv lld-* llvm/tools/lld -mv compiler-rt-* llvm/projects/compiler-rt -cd llvm +tar -xf $rootdir/[% c('input_files_by_name/clang-source') %] +cd clang-source export LLVM_HOME=$(pwd) mkdir build cd build diff --git a/projects/clang/config b/projects/clang/config index c4b7efc..46d308a 100644 --- a/projects/clang/config +++ b/projects/clang/config @@ -1,8 +1,6 @@ # vim: filetype=yaml sw=2 version: 9.0.1 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -gpg_keyring: clang.gpg -sig_ext: sig var: container: @@ -18,22 +16,5 @@ input_files: enable: '[% c("var/linux") %]' - project: cmake name: cmake - - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/llvm-[% c("version") %].src.tar.xz' - name: llvm - file_gpg_id: 1 - - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/clang-[% c("version") %].src.tar.xz' - name: clang - file_gpg_id: 1 - - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/libcxx-[% c("version") %].src.tar.xz' - name: libcxx - file_gpg_id: 1 - - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/libcxxabi-[% c("version") %].src.tar.xz' - name: libcxxabi - file_gpg_id: 1 - - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/lld-[% c("version") %].src.tar.xz' - name: lld - file_gpg_id: 1 - - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/compiler-rt-[% c("version") %].src.tar.xz' - name: compiler-rt - file_gpg_id: 1 - - filename: 43909.patch + - project: clang-source + name: clang-source diff --git a/projects/fenix-clang/build b/projects/fenix-clang/build index d61ed43..33688e5 100644 --- a/projects/fenix-clang/build +++ b/projects/fenix-clang/build @@ -15,22 +15,8 @@ export PATH="/var/tmp/dist/cmake/bin:$PATH" [% END -%] mkdir -p /var/tmp/build cd /var/tmp/build -tar -xf $rootdir/[% c('input_files_by_name/llvm') %] -tar -xf $rootdir/[% c('input_files_by_name/clang') %] -tar -xf $rootdir/[% c('input_files_by_name/libcxx') %] -tar -xf $rootdir/[% c('input_files_by_name/libcxxabi') %] -tar -xf $rootdir/[% c('input_files_by_name/lld') %] -tar -xf $rootdir/[% c('input_files_by_name/compiler-rt') %] -mv llvm-* llvm -# LLVM has reproducibility issues when optimizing bitcode, which we need to -# patch. See: #32053 for more details. -patch -p1 < $rootdir/43909.patch -mv clang-* llvm/tools/clang -mv libcxx-* llvm/projects/libcxx -mv libcxxabi-* llvm/projects/libcxxabi -mv lld-* llvm/tools/lld -mv compiler-rt-* llvm/projects/compiler-rt -cd llvm +tar -xf $rootdir/[% c('input_files_by_name/clang-source') %] +cd clang-source export LLVM_HOME=$(pwd) mkdir build cd build diff --git a/projects/fenix-clang/config b/projects/fenix-clang/config index c4b7efc..46d308a 100644 --- a/projects/fenix-clang/config +++ b/projects/fenix-clang/config @@ -1,8 +1,6 @@ # vim: filetype=yaml sw=2 version: 9.0.1 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -gpg_keyring: clang.gpg -sig_ext: sig var: container: @@ -18,22 +16,5 @@ input_files: enable: '[% c("var/linux") %]' - project: cmake name: cmake - - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/llvm-[% c("version") %].src.tar.xz' - name: llvm - file_gpg_id: 1 - - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/clang-[% c("version") %].src.tar.xz' - name: clang - file_gpg_id: 1 - - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/libcxx-[% c("version") %].src.tar.xz' - name: libcxx - file_gpg_id: 1 - - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/libcxxabi-[% c("version") %].src.tar.xz' - name: libcxxabi - file_gpg_id: 1 - - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/lld-[% c("version") %].src.tar.xz' - name: lld - file_gpg_id: 1 - - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/compiler-rt-[% c("version") %].src.tar.xz' - name: compiler-rt - file_gpg_id: 1 - - filename: 43909.patch + - project: clang-source + name: clang-source diff --git a/projects/macosx-toolchain/43909.patch b/projects/macosx-toolchain/43909.patch deleted file mode 100644 index 78d2a75..0000000 --- a/projects/macosx-toolchain/43909.patch +++ /dev/null @@ -1,252 +0,0 @@ -From c95310f2d4fd3c88241c3b5d6dbf6251d34a3256 Mon Sep 17 00:00:00 2001 -From: Nikita Popov <nikita.ppv(a)gmail.com> -Date: Sat, 16 Nov 2019 16:22:18 +0100 -Subject: [PATCH] Restructure caching - -Variant on D70103. The caching is switched to always use a BB to -cache entry map, which then contains per-value caches. A separate -set contains value handles with a deletion callback. This allows us -to properly invalidate overdefined values. - -A possible alternative would be to always cache by value first and -have per-BB maps/sets in the each cache entry. In that case we could -use a ValueMap and would avoid the separate value handle set. I went -with the BB indexing at the top level to make it easier to integrate -D69914, but possibly that's not the right choice. - -Differential Revision: https://reviews.llvm.org/D70376 - -diff --git a/llvm/lib/Analysis/LazyValueInfo.cpp b/llvm/lib/Analysis/LazyValueInfo.cpp -index 110c085d3f3..aa6862cb588 100644 ---- a/llvm/lib/Analysis/LazyValueInfo.cpp -+++ b/llvm/lib/Analysis/LazyValueInfo.cpp -@@ -133,12 +133,9 @@ namespace { - /// A callback value handle updates the cache when values are erased. - class LazyValueInfoCache; - struct LVIValueHandle final : public CallbackVH { -- // Needs to access getValPtr(), which is protected. -- friend struct DenseMapInfo<LVIValueHandle>; -- - LazyValueInfoCache *Parent; - -- LVIValueHandle(Value *V, LazyValueInfoCache *P) -+ LVIValueHandle(Value *V, LazyValueInfoCache *P = nullptr) - : CallbackVH(V), Parent(P) { } - - void deleted() override; -@@ -152,89 +149,63 @@ namespace { - /// This is the cache kept by LazyValueInfo which - /// maintains information about queries across the clients' queries. - class LazyValueInfoCache { -- /// This is all of the cached block information for exactly one Value*. -- /// The entries are sorted by the BasicBlock* of the -- /// entries, allowing us to do a lookup with a binary search. -- /// Over-defined lattice values are recorded in OverDefinedCache to reduce -- /// memory overhead. -- struct ValueCacheEntryTy { -- ValueCacheEntryTy(Value *V, LazyValueInfoCache *P) : Handle(V, P) {} -- LVIValueHandle Handle; -- SmallDenseMap<PoisoningVH<BasicBlock>, ValueLatticeElement, 4> BlockVals; -+ /// This is all of the cached information for one basic block. It contains -+ /// the per-value lattice elements, as well as a separate set for -+ /// overdefined values to reduce memory usage. -+ struct BlockCacheEntryTy { -+ SmallDenseMap<AssertingVH<Value>, ValueLatticeElement, 4> LatticeElements; -+ SmallDenseSet<AssertingVH<Value>, 4> OverDefined; - }; - -- /// This tracks, on a per-block basis, the set of values that are -- /// over-defined at the end of that block. -- typedef DenseMap<PoisoningVH<BasicBlock>, SmallPtrSet<Value *, 4>> -- OverDefinedCacheTy; -- /// Keep track of all blocks that we have ever seen, so we -- /// don't spend time removing unused blocks from our caches. -- DenseSet<PoisoningVH<BasicBlock> > SeenBlocks; -- -- /// This is all of the cached information for all values, -- /// mapped from Value* to key information. -- DenseMap<Value *, std::unique_ptr<ValueCacheEntryTy>> ValueCache; -- OverDefinedCacheTy OverDefinedCache; -- -+ /// Cached information per basic block. -+ DenseMap<PoisoningVH<BasicBlock>, BlockCacheEntryTy> BlockCache; -+ /// Set of value handles used to erase values from the cache on deletion. -+ DenseSet<LVIValueHandle, DenseMapInfo<Value *>> ValueHandles; - - public: - void insertResult(Value *Val, BasicBlock *BB, - const ValueLatticeElement &Result) { -- SeenBlocks.insert(BB); -- -+ auto &CacheEntry = BlockCache.try_emplace(BB).first->second; - // Insert over-defined values into their own cache to reduce memory - // overhead. - if (Result.isOverdefined()) -- OverDefinedCache[BB].insert(Val); -- else { -- auto It = ValueCache.find_as(Val); -- if (It == ValueCache.end()) { -- ValueCache[Val] = make_unique<ValueCacheEntryTy>(Val, this); -- It = ValueCache.find_as(Val); -- assert(It != ValueCache.end() && "Val was just added to the map!"); -- } -- It->second->BlockVals[BB] = Result; -- } -- } -- -- bool isOverdefined(Value *V, BasicBlock *BB) const { -- auto ODI = OverDefinedCache.find(BB); -- -- if (ODI == OverDefinedCache.end()) -- return false; -+ CacheEntry.OverDefined.insert(Val); -+ else -+ CacheEntry.LatticeElements.insert({ Val, Result }); - -- return ODI->second.count(V); -+ auto HandleIt = ValueHandles.find_as(Val); -+ if (HandleIt == ValueHandles.end()) -+ ValueHandles.insert({ Val, this }); - } - - bool hasCachedValueInfo(Value *V, BasicBlock *BB) const { -- if (isOverdefined(V, BB)) -- return true; -- -- auto I = ValueCache.find_as(V); -- if (I == ValueCache.end()) -+ auto It = BlockCache.find(BB); -+ if (It == BlockCache.end()) - return false; - -- return I->second->BlockVals.count(BB); -+ return It->second.OverDefined.count(V) || -+ It->second.LatticeElements.count(V); - } - - ValueLatticeElement getCachedValueInfo(Value *V, BasicBlock *BB) const { -- if (isOverdefined(V, BB)) -+ auto It = BlockCache.find(BB); -+ if (It == BlockCache.end()) -+ return ValueLatticeElement(); -+ -+ if (It->second.OverDefined.count(V)) - return ValueLatticeElement::getOverdefined(); - -- auto I = ValueCache.find_as(V); -- if (I == ValueCache.end()) -+ auto LatticeIt = It->second.LatticeElements.find(V); -+ if (LatticeIt == It->second.LatticeElements.end()) - return ValueLatticeElement(); -- auto BBI = I->second->BlockVals.find(BB); -- if (BBI == I->second->BlockVals.end()) -- return ValueLatticeElement(); -- return BBI->second; -+ -+ return LatticeIt->second; - } - - /// clear - Empty the cache. - void clear() { -- SeenBlocks.clear(); -- ValueCache.clear(); -- OverDefinedCache.clear(); -+ BlockCache.clear(); -+ ValueHandles.clear(); - } - - /// Inform the cache that a given value has been deleted. -@@ -248,23 +219,18 @@ namespace { - /// OldSucc might have (unless also overdefined in NewSucc). This just - /// flushes elements from the cache and does not add any. - void threadEdgeImpl(BasicBlock *OldSucc,BasicBlock *NewSucc); -- -- friend struct LVIValueHandle; - }; - } - - void LazyValueInfoCache::eraseValue(Value *V) { -- for (auto I = OverDefinedCache.begin(), E = OverDefinedCache.end(); I != E;) { -- // Copy and increment the iterator immediately so we can erase behind -- // ourselves. -- auto Iter = I++; -- SmallPtrSetImpl<Value *> &ValueSet = Iter->second; -- ValueSet.erase(V); -- if (ValueSet.empty()) -- OverDefinedCache.erase(Iter); -+ for (auto &Pair : BlockCache) { -+ Pair.second.LatticeElements.erase(V); -+ Pair.second.OverDefined.erase(V); - } - -- ValueCache.erase(V); -+ auto HandleIt = ValueHandles.find_as(V); -+ if (HandleIt != ValueHandles.end()) -+ ValueHandles.erase(HandleIt); - } - - void LVIValueHandle::deleted() { -@@ -274,18 +240,7 @@ void LVIValueHandle::deleted() { - } - - void LazyValueInfoCache::eraseBlock(BasicBlock *BB) { -- // Shortcut if we have never seen this block. -- DenseSet<PoisoningVH<BasicBlock> >::iterator I = SeenBlocks.find(BB); -- if (I == SeenBlocks.end()) -- return; -- SeenBlocks.erase(I); -- -- auto ODI = OverDefinedCache.find(BB); -- if (ODI != OverDefinedCache.end()) -- OverDefinedCache.erase(ODI); -- -- for (auto &I : ValueCache) -- I.second->BlockVals.erase(BB); -+ BlockCache.erase(BB); - } - - void LazyValueInfoCache::threadEdgeImpl(BasicBlock *OldSucc, -@@ -303,10 +258,11 @@ void LazyValueInfoCache::threadEdgeImpl(BasicBlock *OldSucc, - std::vector<BasicBlock*> worklist; - worklist.push_back(OldSucc); - -- auto I = OverDefinedCache.find(OldSucc); -- if (I == OverDefinedCache.end()) -+ auto I = BlockCache.find(OldSucc); -+ if (I == BlockCache.end() || I->second.OverDefined.empty()) - return; // Nothing to process here. -- SmallVector<Value *, 4> ValsToClear(I->second.begin(), I->second.end()); -+ SmallVector<Value *, 4> ValsToClear(I->second.OverDefined.begin(), -+ I->second.OverDefined.end()); - - // Use a worklist to perform a depth-first search of OldSucc's successors. - // NOTE: We do not need a visited list since any blocks we have already -@@ -320,10 +276,10 @@ void LazyValueInfoCache::threadEdgeImpl(BasicBlock *OldSucc, - if (ToUpdate == NewSucc) continue; - - // If a value was marked overdefined in OldSucc, and is here too... -- auto OI = OverDefinedCache.find(ToUpdate); -- if (OI == OverDefinedCache.end()) -+ auto OI = BlockCache.find(ToUpdate); -+ if (OI == BlockCache.end() || OI->second.OverDefined.empty()) - continue; -- SmallPtrSetImpl<Value *> &ValueSet = OI->second; -+ auto &ValueSet = OI->second.OverDefined; - - bool changed = false; - for (Value *V : ValsToClear) { -@@ -333,11 +289,6 @@ void LazyValueInfoCache::threadEdgeImpl(BasicBlock *OldSucc, - // If we removed anything, then we potentially need to update - // blocks successors too. - changed = true; -- -- if (ValueSet.empty()) { -- OverDefinedCache.erase(OI); -- break; -- } - } - - if (!changed) continue; --- -2.24.0 - diff --git a/projects/macosx-toolchain/build b/projects/macosx-toolchain/build index 0f67c38..5716a9e 100644 --- a/projects/macosx-toolchain/build +++ b/projects/macosx-toolchain/build @@ -2,19 +2,14 @@ [% c("var/set_default_env") -%] builddir=/var/tmp/build mkdir $builddir -distdir="/var/tmp/dist/[% project %]" +distdir=/var/tmp/dist/[% project %] mkdir -p "$distdir" tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/ninja') %] -tar -C /var/tmp/dist -xf [% c('input_files_by_name/clang_compiler') %] -tar -C $builddir -xf [% c('input_files_by_name/llvm') %] -tar -C $builddir -xf [% c('input_files_by_name/clang') %] -tar -C $builddir -xf [% c('input_files_by_name/libcxx') %] -tar -C $builddir -xf [% c('input_files_by_name/libcxxabi') %] -tar -C $builddir -xf [% c('input_files_by_name/lld') %] -tar -C $builddir -xf [% c('input_files_by_name/compiler-rt') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/clang') %] tar -C $distdir -xf [% c('input_files_by_name/SDK') %] tar -C $distdir -xf [% c('input_files_by_name/cctools') %] +tar -C $builddir -xf [% c('input_files_by_name/clang-source') %] clangdir=/var/tmp/dist/clang/bin cctoolsdir=$distdir/cctools/bin @@ -24,19 +19,10 @@ sysrootdir=$distdir/MacOSX10.11.sdk/ export PATH="/var/tmp/dist/ninja:/var/tmp/dist/cmake/bin:$cctoolsdir:$PATH" export MACOSX_DEPLOYMENT_TARGET=[% c("var/macosx_deployment_target") %] -cd $builddir -mv llvm-* llvm -# LLVM has reproducibility issues when optimizing bitcode, which we need to -# patch. See: #32053 for more details. -patch -p1 < $rootdir/43909.patch -mv clang-* llvm/tools/clang -mv libcxx-* llvm/projects/libcxx -mv libcxxabi-* llvm/projects/libcxxabi -mv lld-* llvm/tools/lld -mv compiler-rt-* compiler-rt +cd $builddir/clang-source/projects patch -p1 < $rootdir/compiler-rt-cross-compile.patch patch -p1 < $rootdir/compiler-rt-no-codesign.patch -mv compiler-rt llvm/projects +cd .. mkdir build cd build # We follow quite closely Mozilla's build/build-clang/build-clang.py with the @@ -68,7 +54,7 @@ cmake -GNinja \ -DCMAKE_SYSTEM_VERSION=10.10 \ -DLLVM_ENABLE_THREADS=OFF \ -DCOMPILER_RT_BUILD_XRAY=OFF \ - -DLIBCXXABI_LIBCXX_INCLUDES=$builddir/llvm/projects/libcxx/include \ + -DLIBCXXABI_LIBCXX_INCLUDES=$builddir/clang-source/projects/libcxx/include \ -DCMAKE_OSX_SYSROOT=$sysrootdir \ -DCMAKE_FIND_ROOT_PATH=$sysrootdir \ -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER \ @@ -78,13 +64,13 @@ cmake -GNinja \ -DCMAKE_OSX_ARCHITECTURES=x86_64 \ -DDARWIN_osx_ARCHS=x86_64 \ -DDARWIN_osx_SYSROOT=$sysrootdir \ - -DLLVM_DEFAULT_TARGET_TRIPLE=x86_64-apple-darwin $builddir/llvm + -DLLVM_DEFAULT_TARGET_TRIPLE=x86_64-apple-darwin $builddir/clang-source ninja install -v # We now have a native macosx64 toolchain. # What we want is a native linux64 toolchain which can target macosx64. # Overlay the linux64 toolchain that we used for this build. Note: we don't do -# any ASan builds for macOS (yet). Once we do we need to preserve at least +# any ASan builds for macOS (yet). Once we do that we need to preserve at least # `llvm-symbolizer` as that one seems to get shipped with sanitizer builds (at # least that's what Mozilla claims). cd $distdir diff --git a/projects/macosx-toolchain/config b/projects/macosx-toolchain/config index 937478b..95f650b 100644 --- a/projects/macosx-toolchain/config +++ b/projects/macosx-toolchain/config @@ -1,8 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' version: 10.11-1 -gpg_keyring: clang.gpg -sig_ext: sig var: container: use_container: 1 @@ -20,7 +18,7 @@ var: input_files: - project: container-image - - name: clang_compiler + - name: clang project: clang - name: cctools project: cctools @@ -33,24 +31,7 @@ input_files: - name: SDK URL: https://people.torproject.org/~gk/mirrors/sources/MacOSX10.11.sdk.tar.bz2 sha256sum: d11e410d757d023be66d2fe7eaa85a1d232da3ac04f177eff3d8b8275cd9ffca - - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% pc("clang", "version") %]/llvm-[% pc("clang", "version") %].src.tar.xz' - name: llvm - file_gpg_id: 1 - - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% pc("clang", "version") %]/clang-[% pc("clang", "version") %].src.tar.xz' - name: clang - file_gpg_id: 1 - - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% pc("clang", "version") %]/libcxx-[% pc("clang", "version") %].src.tar.xz' - name: libcxx - file_gpg_id: 1 - - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% pc("clang", "version") %]/libcxxabi-[% pc("clang", "version") %].src.tar.xz' - name: libcxxabi - file_gpg_id: 1 - - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% pc("clang", "version") %]/lld-[% pc("clang", "version") %].src.tar.xz' - name: lld - file_gpg_id: 1 - - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% pc("clang", "version") %]/compiler-rt-[% pc("clang", "version") %].src.tar.xz' - name: compiler-rt - file_gpg_id: 1 + - name: clang-source + project: clang-source - filename: compiler-rt-cross-compile.patch - filename: compiler-rt-no-codesign.patch - - filename: 43909.patch diff --git a/projects/mingw-w64-clang/build b/projects/mingw-w64-clang/build index ecb0e2c..44a913f 100644 --- a/projects/mingw-w64-clang/build +++ b/projects/mingw-w64-clang/build @@ -11,14 +11,7 @@ mkdir -p $builddir cd $builddir tar -xf $rootdir/mingw-w64-clang-[% c('version') %].tar.gz mv mingw-w64-clang-[% c('version') %] mingw-w64-clang -tar -xf $rootdir/[% c('input_files_by_name/libcxx') %] -mv libcxx-* libcxx -tar -xf $rootdir/[% c('input_files_by_name/libcxxabi') %] -mv libcxxabi-* libcxxabi -tar -xf $rootdir/[% c('input_files_by_name/libunwind') %] -mv libunwind-* libunwind -tar -xf $rootdir/[% c('input_files_by_name/compiler-rt') %] -mv compiler-rt-* compiler-rt +tar -xf $rootdir/[% c('input_files_by_name/clang-source') %] tar -xf $rootdir/[% c('input_files_by_name/llvm-mingw') %] # Adding the wrappers and symlinks we need @@ -98,9 +91,8 @@ make -j[% c("buildconf/num_procs") %] make -j[% c("buildconf/num_procs") %] install # compiler-rt -cd $builddir/compiler-rt +cd $builddir/clang-source/projects/compiler-rt mkdir build && cd build -CLANG_VERSION=$(basename $(dirname $(dirname $(dirname $($CC --print-libgcc-file-name -rtlib=compiler-rt))))) cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_C_COMPILER=$CC \ -DCMAKE_SYSTEM_NAME=Windows \ @@ -109,13 +101,14 @@ cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_C_COMPILER_WORKS=1 \ -DCMAKE_C_COMPILER_TARGET=$compiler_rt_machine-windows-gnu \ -DCOMPILER_RT_DEFAULT_TARGET_ONLY=TRUE \ - $builddir/compiler-rt/lib/builtins + $builddir/clang-source/projects/compiler-rt/lib/builtins make -j[% c("buildconf/num_procs") %] - mkdir -p $distdir/lib/clang/$CLANG_VERSION/lib/windows - cp lib/windows/libclang_rt.builtins-$compiler_rt_machine.a $distdir/lib/clang/$CLANG_VERSION/lib/windows/ + rtdir=$distdir/lib/clang/[% pc("clang-source", "version") %]/lib/windows + mkdir -p $rtdir + cp lib/windows/libclang_rt.builtins-$compiler_rt_machine.a $rtdir/ # libunwind -cd $builddir/libunwind +cd $builddir/clang-source/libunwind mkdir build && cd build cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$distdir/[% c("arch") %]-w64-mingw32 \ @@ -136,14 +129,14 @@ cmake -DCMAKE_BUILD_TYPE=Release \ -DLIBUNWIND_ENABLE_THREADS=TRUE \ -DLIBUNWIND_ENABLE_SHARED=FALSE \ -DLIBUNWIND_ENABLE_CROSS_UNWINDING=FALSE \ - -DCMAKE_CXX_FLAGS="-Wno-dll-attribute-on-redeclaration -nostdinc++ -I$builddir/libcxx/include -DPSAPI_VERSION=2" \ + -DCMAKE_CXX_FLAGS="-Wno-dll-attribute-on-redeclaration -nostdinc++ -I$builddir/clang-source/projects/libcxx/include -DPSAPI_VERSION=2" \ -DCMAKE_C_FLAGS="-Wno-dll-attribute-on-redeclaration" \ - $builddir/libunwind + $builddir/clang-source/libunwind make -j[% c("buildconf/num_procs") %] make -j[% c("buildconf/num_procs") %] install # libcxxabi -cd $builddir/libcxxabi +cd $builddir/clang-source/projects/libcxxabi mkdir build && cd build cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$distdir/[% c("arch") %]-w64-mingw32 \ @@ -162,16 +155,16 @@ cmake -DCMAKE_BUILD_TYPE=Release \ -DLIBCXXABI_ENABLE_THREADS=ON \ -DLIBCXXABI_TARGET_TRIPLE=[% c("arch") %]-w64-mingw32 \ -DLIBCXXABI_ENABLE_SHARED=OFF \ - -DLIBCXXABI_LIBCXX_INCLUDES=$builddir/libcxx/include \ + -DLIBCXXABI_LIBCXX_INCLUDES=$builddir/clang-source/projects/libcxx/include \ -DLLVM_NO_OLD_LIBSTDCXX=TRUE \ -DCXX_SUPPORTS_CXX11=TRUE \ -DCXX_SUPPORTS_CXX_STD=True \ -DCMAKE_CXX_FLAGS="-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS -D_LIBCPP_HAS_THREAD_API_WIN32" \ - $builddir/libcxxabi + $builddir/clang-source/projects/libcxxabi make -j[% c("buildconf/num_procs") %] VERBOSE=1 # libcxx -cd $builddir/libcxx +cd $builddir/clang-source/projects/libcxx mkdir build && cd build cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$distdir/[% c("arch") %]-w64-mingw32 \ @@ -197,10 +190,10 @@ cmake -DCMAKE_BUILD_TYPE=Release \ -DLIBCXX_ENABLE_FILESYSTEM=OFF \ -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=TRUE \ -DLIBCXX_CXX_ABI=libcxxabi \ - -DLIBCXX_CXX_ABI_INCLUDE_PATHS=$builddir/libcxxabi/include \ - -DLIBCXX_CXX_ABI_LIBRARY_PATH=$builddir/libcxxabi/build/lib \ + -DLIBCXX_CXX_ABI_INCLUDE_PATHS=$builddir/clang-source/projects/libcxxabi/include \ + -DLIBCXX_CXX_ABI_LIBRARY_PATH=$builddir/clang-source/projects/libcxxabi/build/lib \ -DCMAKE_CXX_FLAGS="-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS" \ - $builddir/libcxx + $builddir/clang-source/projects/libcxx make -j[% c("buildconf/num_procs") %] VERBOSE=1 make -j[% c("buildconf/num_procs") %] install diff --git a/projects/mingw-w64-clang/config b/projects/mingw-w64-clang/config index 9ae0e61..1bf5954 100644 --- a/projects/mingw-w64-clang/config +++ b/projects/mingw-w64-clang/config @@ -3,9 +3,6 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: https://git.code.sf.net/p/mingw-w64/mingw-w64 git_hash: 1b373beec6d07478ffba33726bb3bb21f32e4411 version: '[% c("abbrev") %]' -llvm_version: 9.0.1 -gpg_keyring: clang.gpg -sig_ext: sig var: container: @@ -21,18 +18,8 @@ input_files: name: clang - project: cmake name: cmake - - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("llvm_version") %]/libcxx-[% c("llvm_version") %].src.tar.xz' - name: libcxx - file_gpg_id: 1 - - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("llvm_version") %]/libcxxabi-[% c("llvm_version") %].src.tar.xz' - name: libcxxabi - file_gpg_id: 1 - - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("llvm_version") %]/libunwind-[% c("llvm_version") %].src.tar.xz' - name: libunwind - file_gpg_id: 1 - - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("llvm_version") %]/compiler-rt-[% c("llvm_version") %].src.tar.xz' - name: compiler-rt - file_gpg_id: 1 + - project: clang-source + name: clang-source - project: llvm-mingw name: llvm-mingw - filename: mingw-winrt.patch

1 0

[tor-browser-build/master] Bug 40010: Add NSS for application-services
by sysrqb＠torproject.org 10 Aug '20

10 Aug '20

commit 53131fdc6d54bdd3bda261c64aa81fc3e8fbe228 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jun 30 10:12:32 2020 +0000 Bug 40010: Add NSS for application-services --- projects/nss/bug_13028.patch | 79 ++++++++++++++++++++++++ projects/nss/build | 139 +++++++++++++++++++++++++++++++++++++++++++ projects/nss/config | 27 +++++++++ projects/nss/config.patch | 37 ++++++++++++ projects/nss/configure.patch | 11 ++++ 5 files changed, 293 insertions(+) diff --git a/projects/nss/bug_13028.patch b/projects/nss/bug_13028.patch new file mode 100644 index 0000000..60bbd35 --- /dev/null +++ b/projects/nss/bug_13028.patch @@ -0,0 +1,79 @@ +From 2f0888c348561249d3083555db33c5619840dbfa Mon Sep 17 00:00:00 2001 +From: Mike Perry <mikeperry-git(a)torproject.org> +Date: Mon, 29 Sep 2014 14:30:19 -0700 +Subject: [PATCH] Bug 13028: Prevent potential proxy bypass cases. + +It looks like these cases should only be invoked in the NSS command line +tools, and not the browser, but I decided to patch them anyway because there +literally is a maze of network function pointers being passed around, and it's +very hard to tell if some random code might not pass in the proper proxied +versions of the networking code here by accident. + +diff --git a/security/nss/lib/certhigh/ocsp.c b/security/nss/lib/certhigh/ocsp.c +index cea8456606bf..86fa971cfbef 100644 +--- a/security/nss/lib/certhigh/ocsp.c ++++ b/security/nss/lib/certhigh/ocsp.c +@@ -2932,6 +2932,14 @@ ocsp_ConnectToHost(const char *host, PRUint16 port) + PRNetAddr addr; + char *netdbbuf = NULL; + ++ // XXX: Do we need a unittest ifdef here? We don't want to break the tests, but ++ // we want to ensure nothing can ever hit this code in production. ++#if 1 ++ printf("Tor Browser BUG: Attempted OSCP direct connect to %s, port %u\n", host, ++ port); ++ goto loser; ++#endif ++ + sock = PR_NewTCPSocket(); + if (sock == NULL) + goto loser; +diff --git a/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c b/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c +index e8698376b5be..85791d84a932 100644 +--- a/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c ++++ b/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c +@@ -1334,6 +1334,13 @@ pkix_pl_Socket_Create( + plContext), + PKIX_COULDNOTCREATESOCKETOBJECT); + ++ // XXX: Do we need a unittest ifdef here? We don't want to break the tests, but ++ // we want to ensure nothing can ever hit this code in production. ++#if 1 ++ printf("Tor Browser BUG: Attempted pkix direct socket connect\n"); ++ PKIX_ERROR(PKIX_PRNEWTCPSOCKETFAILED); ++#endif ++ + socket->isServer = isServer; + socket->timeout = timeout; + socket->clientSock = NULL; +@@ -1433,6 +1440,13 @@ pkix_pl_Socket_CreateByName( + + localCopyName = PL_strdup(serverName); + ++ // XXX: Do we need a unittest ifdef here? We don't want to break the tests, but ++ // we want to ensure nothing can ever hit this code in production. ++#if 1 ++ printf("Tor Browser BUG: Attempted pkix direct connect to %s\n", serverName); ++ PKIX_ERROR(PKIX_PRNEWTCPSOCKETFAILED); ++#endif ++ + sepPtr = strchr(localCopyName, ':'); + /* First strip off the portnum, if present, from the end of the name */ + if (sepPtr) { +@@ -1582,6 +1596,13 @@ pkix_pl_Socket_CreateByHostAndPort( + PKIX_ENTER(SOCKET, "pkix_pl_Socket_CreateByHostAndPort"); + PKIX_NULLCHECK_THREE(hostname, pStatus, pSocket); + ++ // XXX: Do we need a unittest ifdef here? We don't want to break the tests, but ++ // we want to ensure nothing can ever hit this code in production. ++#if 1 ++ printf("Tor Browser BUG: Attempted pkix direct connect to %s, port %u\n", hostname, ++ portnum); ++ PKIX_ERROR(PKIX_PRNEWTCPSOCKETFAILED); ++#endif + + prstatus = PR_GetHostByName(hostname, buf, sizeof(buf), &hostent); + +-- +2.27.0 + diff --git a/projects/nss/build b/projects/nss/build new file mode 100644 index 0000000..791a680 --- /dev/null +++ b/projects/nss/build @@ -0,0 +1,139 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] +distdir=/var/tmp/dist/nss +builddir=/var/tmp/build/[% project %] +mkdir /var/tmp/build +tar -C /var/tmp/dist -xf [% c('input_files_by_name/ninja') %] +export PATH=/var/tmp/dist/ninja:$PATH + +# application-services uses a newer NDK, 21d, than all the other projects... +export ANDROID_NDK_API_VERSION=[% pc("fenix-android-toolchain", "var/android_ndk_version") %][% pc('fenix-android-toolchain', 'var/android_ndk_revision') %] +export ANDROID_NDK_HOME=/var/tmp/dist/[% c('var/compiler') %]/android-ndk/android-ndk-r$ANDROID_NDK_API_VERSION +# We need to add the new path to our build tools to PATH +export PATH=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH +export ANDROID_NDK_ROOT=$ANDROID_NDK_HOME +export NDK_HOST_TAG=linux-x86_64 + +nspr_64="" +[% IF c("var/configure_host") == "arm-linux-androideabi" -%] + gyp_arch="arm" +[% ELSIF c("var/configure_host") == "i686-linux-android" -%] + gyp_arch="ia32" +[% ELSIF c("var/configure_host") == "x86_64-linux-android" -%] + gyp_arch="x64" + nspr_64="--enable-64bit" +[% ELSIF c("var/configure_host") == "aarch64-linux-android" -%] + gyp_arch="arm64" + nspr_64="--enable-64bit" +[% END -%] + +export AR="[% c('var/cross_prefix') %]-ar" +# XXX: Mozilla really uses the NDK_API_VERSION here, which is weird. +export CC="[% c('var/cross_prefix') %][% pc('fenix-android-toolchain', 'var/android_ndk_version') %]-clang" +export CXX="[% c('var/cross_prefix') %][% pc('fenix-android-toolchain', 'var/android_ndk_version') %]-clang++" +export LD="[% c('var/cross_prefix') %]-ld" +export NM="[% c('var/cross_prefix') %]-nm" +export RANLIB="[% c('var/cross_prefix') %]-ranlib" +export READELF="[% c('var/cross_prefix') %]-readelf" + +tar -C /var/tmp/build -xf [% c('input_files_by_name/nss') %] +mv /var/tmp/build/[% project %]-[% c('version') %] $builddir +cd $builddir +# Early return hack to prevent NSPR Android setup +# which does not work with ndk unified headers and clang. See: +# application-services/libs/build-all.sh +cat $rootdir/configure.patch | patch nspr/configure +# Some NSS symbols clash with OpenSSL symbols, rename them using +# C preprocessor define macros. See: +# application-services/libs/build-all.sh +patch -p2 < $rootdir/config.patch +# Let's apply our proxy bypass defense-in-depth here as well to be on the safe +# side. +patch -p2 < $rootdir/bug_13028.patch + +# Building NSPR +mkdir $builddir/nspr_build +cd $builddir/nspr_build +../nspr/configure \ + $nspr_64 \ + --target=[% c("var/configure_host") %] \ + --disable-debug \ + --enable-optimize +make +cd .. + +# Building NSS +mkdir $builddir/nss_build +gyp -f ninja-android "$builddir/nss/nss.gyp" \ + --depth "$builddir/nss/" \ + --generator-output=. \ + -DOS=android \ + -Dnspr_lib_dir="$builddir/nspr_build/dist/lib" \ + -Dnspr_include_dir="$builddir/nspr_build/dist/include/nspr" \ + -Dnss_dist_dir="$builddir/nss_build" \ + -Dnss_dist_obj_dir="$builddir/nss_build" \ + -Dhost_arch="$gyp_arch" \ + -Dtarget_arch="$gyp_arch" \ + -Dstatic_libs=1 \ + -Ddisable_dbm=1 \ + -Dsign_libs=0 \ + -Denable_sslkeylogfile=0 \ + -Ddisable_tests=1 \ + -Ddisable_libpkix=1 + +gendir="$builddir/nss/out/Release" +ninja -C "$gendir" + +mkdir -p $distdir/include/nss +mkdir -p $distdir/lib +cp -p -L "$builddir/nss_build/lib/libcertdb.a" "$distdir/lib" +cp -p -L "$builddir/nss_build/lib/libcerthi.a" "$distdir/lib" +cp -p -L "$builddir/nss_build/lib/libcryptohi.a" "$distdir/lib" +cp -p -L "$builddir/nss_build/lib/libfreebl_static.a" "$distdir/lib" +cp -p -L "$builddir/nss_build/lib/libnss_static.a" "$distdir/lib" +cp -p -L "$builddir/nss_build/lib/libnssb.a" "$distdir/lib" +cp -p -L "$builddir/nss_build/lib/libnssdev.a" "$distdir/lib" +cp -p -L "$builddir/nss_build/lib/libnsspki.a" "$distdir/lib" +cp -p -L "$builddir/nss_build/lib/libnssutil.a" "$distdir/lib" +cp -p -L "$builddir/nss_build/lib/libpk11wrap_static.a" "$distdir/lib" +cp -p -L "$builddir/nss_build/lib/libpkcs12.a" "$distdir/lib" +cp -p -L "$builddir/nss_build/lib/libpkcs7.a" "$distdir/lib" +cp -p -L "$builddir/nss_build/lib/libsmime.a" "$distdir/lib" +cp -p -L "$builddir/nss_build/lib/libsoftokn_static.a" "$distdir/lib" +cp -p -L "$builddir/nss_build/lib/libssl.a" "$distdir/lib" + +# HW specific. +# https://searchfox.org/nss/rev/08c4d05078d00089f8d7540651b0717a9d66f87e/lib/… +[% IF c("var/configure_host") == "i686-linux-android" || c("var/configure_host") == "x86_64-linux-android"-%] + cp -p -L "$builddir/nss_build/lib/libgcm-aes-x86_c_lib.a" "$distdir/lib" +[% END %] +[% IF c("var/configure_host") == "arm-linux-androideabi" || c("var/configure_host") == "aarch64-linux-android"-%] + cp -p -L "$builddir/nss_build/lib/libarmv8_c_lib.a" "$distdir/lib" +[% END %] +[% IF c("var/configure_host") == "aarch64-linux-android" -%] + cp -p -L "$builddir/nss_build/lib/libgcm-aes-aarch64_c_lib.a" "$distdir/lib" +[% END %] +[% IF c("var/configure_host") == "arm-linux-androideabi" -%] + cp -p -L "$builddir/nss_build/lib/libgcm-aes-arm32-neon_c_lib.a" "$distdir/lib" +[% END %] +# https://searchfox.org/nss/rev/08c4d05078d00089f8d7540651b0717a9d66f87e/lib/… +# https://searchfox.org/nss/rev/08c4d05078d00089f8d7540651b0717a9d66f87e/lib/… +[% IF c("var/configure_host") == "x86_64-linux-android"-%] + cp -p -L "$builddir/nss_build/lib/libintel-gcm-wrap_c_lib.a" "$distdir/lib" + cp -p -L "$builddir/nss_build/lib/libintel-gcm-s_lib.a" "$distdir/lib" + cp -p -L "$builddir/nss_build/lib/libhw-acc-crypto-avx.a" "$distdir/lib" + cp -p -L "$builddir/nss_build/lib/libhw-acc-crypto-avx2.a" "$distdir/lib" +[% END %] +cp -p -L "$builddir/nspr_build/dist/lib/libplc4.a" "$distdir/lib" +cp -p -L "$builddir/nspr_build/dist/lib/libplds4.a" "$distdir/lib" +cp -p -L "$builddir/nspr_build/dist/lib/libnspr4.a" "$distdir/lib" + +cp -p -L -R "$builddir/nss_build/public/nss/"* "$distdir/include/nss" +cp -p -L -R "$builddir/nspr_build/dist/include/nspr/"* "$distdir/include/nss" + +cd /var/tmp/dist +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/nss/config b/projects/nss/config new file mode 100644 index 0000000..e2b875e --- /dev/null +++ b/projects/nss/config @@ -0,0 +1,27 @@ +# vim: filetype=yaml sw=2 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +# The required versions for application-services can be found at the respective +# commit in libs/build-all.sh +version: 3.54 +# XXX: maybe that's extractable automatically from `version` somehow? +version_path: 3_54 +nspr_version: 4.26 +var: + container: + use_container: 1 + deps: + - build-essential + - gyp + +input_files: + - project: container-image + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + - name: ninja + project: ninja + - URL: 'https://ftp.mozilla.org/pub/security/nss/releases/NSS_[% c("version_path") %]_RTM/src/nss-[% c("version") %]-with-nspr-[% c("nspr_version") %].tar.gz' + name: nss + sha256sum: e0e81f0ff264d810f130d3cd9334722f7f883c752430483131d1ca5ac62d3f70 + - filename: configure.patch + - filename: config.patch + - filename: bug_13028.patch diff --git a/projects/nss/config.patch b/projects/nss/config.patch new file mode 100644 index 0000000..e7f5012 --- /dev/null +++ b/projects/nss/config.patch @@ -0,0 +1,37 @@ +From c11dc3a73349fc7d8fa451f9e3a4e3952aa54fd2 Mon Sep 17 00:00:00 2001 +From: Georg Koppen <gk(a)torproject.org> +Date: Wed, 1 Jul 2020 09:57:01 +0000 +Subject: [PATCH] Patch for building NSS for application-services + +See: application-services/libs/build-all.sh + +diff --git a/security/nss/coreconf/config.gypi b/security/nss/coreconf/config.gypi +index 62d3cc71ecaf..dd30de079081 100644 +--- a/security/nss/coreconf/config.gypi ++++ b/security/nss/coreconf/config.gypi +@@ -144,6 +144,23 @@ + '<(nspr_include_dir)', + '<(nss_dist_dir)/private/<(module)', + ], ++ 'defines': [ ++ 'HMAC_Update=NSS_HMAC_Update', ++ 'HMAC_Init=NSS_HMAC_Init', ++ 'CMAC_Update=NSS_CMAC_Update', ++ 'CMAC_Init=NSS_CMAC_Init', ++ 'MD5_Update=NSS_MD5_Update', ++ 'SHA1_Update=NSS_SHA1_Update', ++ 'SHA256_Update=NSS_SHA256_Update', ++ 'SHA224_Update=NSS_SHA224_Update', ++ 'SHA512_Update=NSS_SHA512_Update', ++ 'SHA384_Update=NSS_SHA384_Update', ++ 'SEED_set_key=NSS_SEED_set_key', ++ 'SEED_encrypt=NSS_SEED_encrypt', ++ 'SEED_decrypt=NSS_SEED_decrypt', ++ 'SEED_ecb_encrypt=NSS_SEED_ecb_encrypt', ++ 'SEED_cbc_encrypt=NSS_SEED_cbc_encrypt', ++ ], + 'conditions': [ + [ 'mozpkix_only==1 and OS=="linux"', { + 'include_dirs': [ +-- +2.27.0 diff --git a/projects/nss/configure.patch b/projects/nss/configure.patch new file mode 100644 index 0000000..4ce8465 --- /dev/null +++ b/projects/nss/configure.patch @@ -0,0 +1,11 @@ +@@ -2662,6 +2662,9 @@ + + case "$target" in + *-android*|*-linuxandroid*) ++ $as_echo "#define ANDROID 1" >>confdefs.h ++ ;; ++ unreachable) + if test -z "$android_ndk" ; then + as_fn_error $? "You must specify --with-android-ndk=/path/to/ndk when targeting Android." "$LINENO" 5 + fi +

1 0

[tor-browser-build/master] Bug 40011: Add SQLCipher for application-services
by sysrqb＠torproject.org 10 Aug '20

10 Aug '20

commit 01cb89f0a1c6e46db7add953cfb63b1924ee8377 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jul 1 14:32:40 2020 +0000 Bug 40011: Add SQLCipher for application-services --- projects/sqlcipher/build | 131 ++++++++++++++++++++++++++++++++++++++++++++++ projects/sqlcipher/config | 21 ++++++++ 2 files changed, 152 insertions(+) diff --git a/projects/sqlcipher/build b/projects/sqlcipher/build new file mode 100644 index 0000000..d364000 --- /dev/null +++ b/projects/sqlcipher/build @@ -0,0 +1,131 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] +distdir=/var/tmp/dist/sqlcipher +builddir=/var/tmp/build/[% project %] +mkdir /var/tmp/build +tar -C /var/tmp/dist -xf [% c('input_files_by_name/nss') %] + +# application-services uses a newer NDK, 21d, than all the other projects... +export ANDROID_NDK_API_VERSION=[% pc("fenix-android-toolchain", "var/android_ndk_version") %][% pc('fenix-android-toolchain', 'var/android_ndk_revision') %] +export ANDROID_NDK_HOME=/var/tmp/dist/[% c('var/compiler') %]/android-ndk/android-ndk-r$ANDROID_NDK_API_VERSION +# We need to add the new path to our build tools to PATH +export PATH=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH +export ANDROID_NDK_ROOT=$ANDROID_NDK_HOME +export NDK_HOST_TAG=linux-x86_64 + +export AR="[% c('var/cross_prefix') %]-ar" +# XXX: Mozilla really uses the NDK_API_VERSION here, which is weird. +export CC="[% c('var/cross_prefix') %][% pc('fenix-android-toolchain', 'var/android_ndk_version') %]-clang" +export CXX="[% c('var/cross_prefix') %][% pc('fenix-android-toolchain', 'var/android_ndk_version') %]-clang++" +export LD="[% c('var/cross_prefix') %]-ld" +export RANLIB="[% c('var/cross_prefix') %]-ranlib" + +host="" +[% IF c("var/configure_host") == "arm-linux-androideabi" -%] + host="arm-linux" +[% ELSIF c("var/configure_host") == "i686-linux-android" -%] + host="i686-linux" +[% ELSIF c("var/configure_host") == "x86_64-linux-android" -%] + host="x86_64-linux" +[% ELSIF c("var/configure_host") == "aarch64-linux-android" -%] + host="arm-linux" +[% END -%] + +SQLCIPHER_CFLAGS=" \ + -DSQLITE_HAS_CODEC \ + -DSQLITE_SOUNDEX \ + -DHAVE_USLEEP=1 \ + -DSQLITE_MAX_VARIABLE_NUMBER=99999 \ + -DSQLITE_THREADSAFE=1 \ + -DSQLITE_DEFAULT_JOURNAL_SIZE_LIMIT=1048576 \ + -DNDEBUG=1 \ + -DSQLITE_ENABLE_MEMORY_MANAGEMENT=1 \ + -DSQLITE_ENABLE_LOAD_EXTENSION \ + -DSQLITE_ENABLE_COLUMN_METADATA \ + -DSQLITE_ENABLE_UNLOCK_NOTIFY \ + -DSQLITE_ENABLE_RTREE \ + -DSQLITE_ENABLE_STAT3 \ + -DSQLITE_ENABLE_STAT4 \ + -DSQLITE_ENABLE_JSON1 \ + -DSQLITE_ENABLE_FTS3_PARENTHESIS \ + -DSQLITE_ENABLE_FTS4 \ + -DSQLITE_ENABLE_FTS5 \ + -DSQLCIPHER_CRYPTO_NSS \ + -DSQLITE_ENABLE_DBSTAT_VTAB \ + -DSQLITE_SECURE_DELETE \ + -DSQLITE_DEFAULT_PAGE_SIZE=32768 \ + -DSQLITE_MAX_DEFAULT_PAGE_SIZE=32768 \ + -I/var/tmp/dist/nss/include \ +" + +LIBS="\ + -lcertdb \ + -lcerthi \ + -lcryptohi \ + -lfreebl_static \ + -lnspr4 \ + -lnss_static \ + -lnssb \ + -lnssdev \ + -lnsspki \ + -lnssutil \ + -lpk11wrap_static \ + -lplc4 \ + -lplds4 \ + -lsoftokn_static \ +" + +[% IF c("var/configure_host") == "i686-linux-android" || c("var/configure_host") == "x86_64-linux-android"-%] + LIBS="${LIBS} -lgcm-aes-x86_c_lib" +[% END %] +[% IF c("var/configure_host") == "arm-linux-android" || c("var/configure_host") == "aarch64-linux-android"-%] + LIBS="${LIBS} -larmv8_c_lib" +[% END %] +[% IF c("var/configure_host") == "aarch64-linux-android" -%] + LIBS="${LIBS} -lgcm-aes-aarch64_c_lib" +[% END %] +[% IF c("var/configure_host") == "arm-linux-androideabi" -%] + LIBS="${LIBS} -lgcm-aes-arm32-neon_c_lib" +[% END %] +[% IF c("var/configure_host") == "x86_64-linux-android"-%] + LIBS="${LIBS} -lintel-gcm-wrap_c_lib -lintel-gcm-s_lib -lhw-acc-crypto-avx -lhw-acc-crypto-avx2" +[% END %] + +tar -C /var/tmp/build -xf [% c('input_files_by_name/sqlcipher') %] +mv /var/tmp/build/[% project %]-[% c('version') %] $builddir +cd $builddir + +mkdir $builddir/build +cd build +../configure \ + --host="$host" \ + --with-pic \ + --verbose \ + --disable-shared \ + --with-crypto-lib=none \ + --disable-tcl \ + --enable-tempstore=yes \ + CFLAGS="${SQLCIPHER_CFLAGS}" \ + LDFLAGS="-L/var/tmp/dist/nss/lib" \ + LIBS="${LIBS} -llog -lm" + +make sqlite3.h +make sqlite3ext.h +make libsqlcipher.la + +mkdir -p $distdir/include/sqlcipher +mkdir -p $distdir/lib + +cp -p "$builddir/build/sqlite3.h" "$distdir/include/sqlcipher" +cp -p "$builddir/build/sqlite3ext.h" "$distdir/include/sqlcipher" +cp -p "$builddir/build/.libs/libsqlcipher.a" "$distdir/lib" + +# Just in case, ensure that the created binaries are not -w. +chmod +w "$distdir/lib/libsqlcipher.a" + +cd /var/tmp/dist +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/sqlcipher/config b/projects/sqlcipher/config new file mode 100644 index 0000000..fb4ae3a --- /dev/null +++ b/projects/sqlcipher/config @@ -0,0 +1,21 @@ +# vim: filetype=yaml sw=2 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +# The required versions for application-services can be found at the respective +# commit in libs/build-all.sh +version: 4.4.0 +var: + container: + use_container: 1 + deps: + - build-essential + - tcl + +input_files: + - project: container-image + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + - name: nss + project: nss + - URL: 'https://github.com/sqlcipher/sqlcipher/archive/v[% c("version") %].tar.gz' + name: sqlcipher + sha256sum: 0924b2ae1079717954498bda78a30de20ce2a6083076b16214a711567821d148

1 0

[tor-browser/tor-browser-78.1.0esr-10.0-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by gk＠torproject.org 10 Aug '20

10 Aug '20

commit 09628dac32ee9a839cfeef284e8531ddb161e15d Author: Georg Koppen <gk(a)torproject.org> Date: Mon Aug 10 07:35:16 2020 +0000 fixup! Bug 10760: Integrate TorButton to TorBrowser core --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 6a779b549e59..f55f5953c6ad 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 6a779b549e59dbb72ca81e0808619643a1a1926e +Subproject commit f55f5953c6adb6d75cad74fbb6c3b8fa2d617004

1 0

[tor-browser/tor-browser-78.1.0esr-10.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 07 Aug '20

07 Aug '20

commit 502fe9064244210138e634bdb44b1a1712092d21 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Aug 5 15:07:30 2020 -0400 fixup! TB4: Tor Browser's Firefox preference overrides. Fixes #40066. --- browser/app/profile/000-tor-browser.js | 10 +--------- mobile/android/app/000-tor-browser-android.js | 10 ---------- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index e86252ccd98c..3be6e460b628 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -33,10 +33,6 @@ pref("app.releaseNotesURL", "about:blank"); pref("app.update.staging.enabled", false); #endif -// No need to contact the Kinto-based blocklist system in addition to the old -// one which is still used, see bug 22071. -pref("services.blocklist.update_enabled", false); - // Disable "Slow startup" warnings and associated disk history // (bug #13346) pref("browser.slowStartup.notificationDisabled", true); @@ -73,7 +69,7 @@ pref("browser.ssb.enabled", false); // Misc privacy: Remote pref("browser.send_pings", false); pref("geo.enabled", false); -pref("geo.wifi.uri", ""); +pref("geo.provider.network.url", ""); pref("browser.search.suggest.enabled", false); pref("browser.safebrowsing.malware.enabled", false); pref("browser.safebrowsing.phishing.enabled", false); @@ -94,9 +90,6 @@ pref("datareporting.policy.dataSubmissionEnabled", false); pref("toolkit.telemetry.unified", false); pref("toolkit.telemetry.enabled", false); pref("toolkit.telemetry.updatePing.enabled", false); // Make sure updater telemetry is disabled; see #25909. -// No experiments, use Tor Browser. See 21797. -pref("experiments.enabled", false); -pref("browser.syncPromoViewsLeftMap", "{\"addons\":0, \"passwords\":0, \"bookmarks\":0}"); // Don't promote sync pref("identity.fxaccounts.enabled", false); // Disable sync by default pref("services.sync.engine.prefs", false); // Never sync prefs, addons, or tabs with other browsers pref("services.sync.engine.addons", false); @@ -133,7 +126,6 @@ pref("dom.w3c_pointer_events.enabled", false); pref("dom.vr.enabled", false); // Bug 21607: Disable WebVR for now // Disable randomised Firefox HTTP cache decay user test groups (Bug: 13575) pref("security.webauth.webauthn", false); // Bug 26614: Disable Web Authentication API for now -pref("browser.cache.frecency_experiment", -1); // Disable intermediate preloading (Bug 30682) pref("security.remote_settings.intermediates.enabled", false); // Bug 2874: Block Components.interfaces from content diff --git a/mobile/android/app/000-tor-browser-android.js b/mobile/android/app/000-tor-browser-android.js index db9e23063738..23fd39beac77 100644 --- a/mobile/android/app/000-tor-browser-android.js +++ b/mobile/android/app/000-tor-browser-android.js @@ -24,19 +24,9 @@ pref("privacy.clearOnShutdown.passwords",true); pref("privacy.clearOnShutdown.sessions",true); pref("privacy.clearOnShutdown.siteSettings",true); -// Disable Control media casting & mirroring features -pref("browser.casting.enabled", false); - // controls if we want camera support -pref("device.camera.enabled", false); pref("media.realtime_decoder.enabled", false); -// Do not fetch updated per-site user-agent strings from Mozilla -// See ua-update.json.in for the packaged UA override list -// See https://bugzilla.mozilla.org/show_bug.cgi?id=897221 -pref("general.useragent.updates.enabled", false); -pref("general.useragent.updates.url", ""); - // Enable touch events on Android (highlighting text, etc) pref("dom.w3c_touch_events.enabled", 2);

1 0

[tor-browser-build/master] Bug 40016: update Snowflake to discover NAT type
by gk＠torproject.org 07 Aug '20

07 Aug '20

commit 251a6f767679b14b4e13b09920fe909d41462814 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Thu Jul 9 13:03:30 2020 +0000 Bug 40016: update Snowflake to discover NAT type This updates Snowflake and the set of default stun servers used by the Snowflake client. --- projects/pion-stun/config | 2 +- projects/snowflake/config | 2 +- .../tor-browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix | 2 +- projects/tor-browser/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix | 2 +- .../tor-browser/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix | 2 +- .../tor-onion-proxy-library/0001-Bug-30318-Add-snowflake-support.patch | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/projects/pion-stun/config b/projects/pion-stun/config index 37405eb..546e379 100644 --- a/projects/pion-stun/config +++ b/projects/pion-stun/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/stun -git_hash: 51fef3542ed793994ff3da9c9b897fb23d744503 # v0.3.3 +git_hash: 4fa7a9d658b6037114fd35b6cb257979ed474a9b # v0.3.5 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' diff --git a/projects/snowflake/config b/projects/snowflake/config index 898fe70..10fe1cc 100644 --- a/projects/snowflake/config +++ b/projects/snowflake/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://git.torproject.org/pluggable-transports/snowflake.git -git_hash: 7043a055f9fb0680281ecffd7d458a43f2ce65b5 +git_hash: 82031289a3362ff3fa199628276d76e840491431 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix b/projects/tor-browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix index ac89698..411c6e1 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix +++ b/projects/tor-browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix @@ -2,4 +2,4 @@ ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec ./TorBrowser/Tor/PluggableTransports/obfs4proxy ## snowflake configuration -ClientTransportPlugin snowflake exec ./TorBrowser/Tor/PluggableTransports/snowflake-client -url https://snowflake-broker.azureedge.net/ -front ajax.aspnetcdn.com -ice stun:stun.l.google.com:19302 +ClientTransportPlugin snowflake exec ./TorBrowser/Tor/PluggableTransports/snowflake-client -url https://snowflake-broker.azureedge.net/ -front ajax.aspnetcdn.com -ice stun:stun.l.google.com:19302,stun:stun.voip.blackberry.com:3478,stun:stun.altar.com.pl:3478,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.sonetel.net:3478,stun:stun.stunprotocol.org:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix b/projects/tor-browser/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix index 154bda4..baa0a6e 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix +++ b/projects/tor-browser/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix @@ -2,4 +2,4 @@ ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec PluggableTransports/obfs4proxy ## snowflake configuration -ClientTransportPlugin snowflake exec PluggableTransports/snowflake-client -url https://snowflake-broker.azureedge.net/ -front ajax.aspnetcdn.com -ice stun:stun.l.google.com:19302 +ClientTransportPlugin snowflake exec PluggableTransports/snowflake-client -url https://snowflake-broker.azureedge.net/ -front ajax.aspnetcdn.com -ice stun:stun.l.google.com:19302,stun:stun.voip.blackberry.com:3478,stun:stun.altar.com.pl:3478,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.sonetel.net:3478,stun:stun.stunprotocol.org:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix b/projects/tor-browser/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix index af16b3c..42502f4 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix +++ b/projects/tor-browser/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix @@ -2,4 +2,4 @@ ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec TorBrowser\Tor\PluggableTransports\obfs4proxy.exe ## snowflake configuration -ClientTransportPlugin snowflake exec TorBrowser\Tor\PluggableTransports\snowflake-client.exe -url https://snowflake-broker.azureedge.net/ -front ajax.aspnetcdn.com -ice stun:stun.l.google.com:19302 +ClientTransportPlugin snowflake exec TorBrowser\Tor\PluggableTransports\snowflake-client.exe -url https://snowflake-broker.azureedge.net/ -front ajax.aspnetcdn.com -ice stun:stun.l.google.com:19302,stun:stun.voip.blackberry.com:3478,stun:stun.altar.com.pl:3478,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.sonetel.net:3478,stun:stun.stunprotocol.org:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 diff --git a/projects/tor-onion-proxy-library/0001-Bug-30318-Add-snowflake-support.patch b/projects/tor-onion-proxy-library/0001-Bug-30318-Add-snowflake-support.patch index 03e06aa..f168eed 100644 --- a/projects/tor-onion-proxy-library/0001-Bug-30318-Add-snowflake-support.patch +++ b/projects/tor-onion-proxy-library/0001-Bug-30318-Add-snowflake-support.patch @@ -71,7 +71,7 @@ index 2405097..bcb6a37 100644 - buffer.append("ClientTransportPlugin meek_lite,obfs3,obfs4 exec ").append(clientPath).append('\n'); + public TorConfigBuilder transportPlugin(String obfsPath, String snowPath) { + buffer.append("ClientTransportPlugin meek_lite,obfs3,obfs4 exec ").append(obfsPath).append('\n'); -+ buffer.append("ClientTransportPlugin snowflake exec ").append(snowPath).append(" -url https://snowflake-broker.azureedge.net/ -front ajax.aspnetcdn.com -ice stun:stun.l.google.com:19302\n"); ++ buffer.append("ClientTransportPlugin snowflake exec ").append(snowPath).append(" -url https://snowflake-broker.azureedge.net/ -front ajax.aspnetcdn.com -ice stun:stun.l.google.com:19302,stun:stun.voip.blackberry.com:3478,stun:stun.altar.com.pl:3478,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.sonetel.net:3478,stun:stun.stunprotocol.org:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478\n"); return this; }

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gitlab/merge-requests/11' into master
by gk＠torproject.org 07 Aug '20

07 Aug '20

commit de185dd7b4e5188905ed972496e69dd537bd0534 Merge: eeb2153 251a6f7 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 7 18:27:14 2020 +0000 Merge remote-tracking branch 'gitlab/merge-requests/11' into master projects/pion-stun/config | 2 +- projects/snowflake/config | 2 +- .../tor-browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix | 2 +- projects/tor-browser/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix | 2 +- .../tor-browser/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix | 2 +- .../tor-onion-proxy-library/0001-Bug-30318-Add-snowflake-support.patch | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-)

1 0