August 2020 - tor-commits - lists.torproject.org

[stem/master] Client side authentication for HSv3
by atagar＠torproject.org 07 Aug '20

07 Aug '20

commit 31d25caffccf3ad94d196243acd62b14d99dc82a Merge: 2946016e 6af714a4 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Aug 6 16:59:44 2020 -0700 Client side authentication for HSv3 Thanks to mig5 adding support for tor's new ONION_CLIENT_AUTH_ADD, ONION_CLIENT_AUTH_REMOVE, and ONION_CLIENT_AUTH_VIEW features. These add support for authenticating *to* a version 3 hidden service. https://github.com/torproject/stem/issues/66 Implementation uncovered some rough edges within tor... * Controllers cannot create authenticated services https://gitlab.torproject.org/tpo/core/tor/-/issues/40084 * Client names apparently don't work https://gitlab.torproject.org/tpo/core/tor/-/issues/40089 * Credential persistence either doesn't work or vague error response https://gitlab.torproject.org/tpo/core/tor/-/issues/40090 docs/change_log.rst | 1 + stem/control.py | 99 ++++++++++++++++++++++++++++++++++++++ stem/interpreter/settings.cfg | 12 +++++ stem/response/__init__.py | 31 +++++++----- stem/response/onion_client_auth.py | 65 +++++++++++++++++++++++++ test/integ/control/controller.py | 68 ++++++++++++++++++++++++++ 6 files changed, 265 insertions(+), 11 deletions(-)

1 0

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

06 Aug '20

commit dd4db33fe9cd9eeffd21a239593a15221c8a1e7e Merge: efd0d09 97b5bc0 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Aug 6 23:19:42 2020 +0000 Merge remote-tracking branch 'gkgl/bug_40019_v3' projects/firefox/build | 5 - projects/firefox/config | 6 - projects/macosx-toolchain/43909.patch | 252 +++++++++++++++++++++ projects/macosx-toolchain/build | 95 +++++++- .../compiler-rt-cross-compile.patch | 15 ++ .../macosx-toolchain/compiler-rt-no-codesign.patch | 21 ++ projects/macosx-toolchain/config | 29 ++- 7 files changed, 405 insertions(+), 18 deletions(-)

1 0

[tor-browser-build/master] Bug 40019: Ship our own runtime library for macOS
by sysrqb＠torproject.org 06 Aug '20

06 Aug '20

commit 97b5bc037774a88bb881a4e0c7d5ff5a18889348 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 4 07:22:38 2020 +0000 Bug 40019: Ship our own runtime library for macOS --- projects/firefox/build | 5 - projects/firefox/config | 6 - projects/macosx-toolchain/43909.patch | 252 +++++++++++++++++++++ projects/macosx-toolchain/build | 95 +++++++- .../compiler-rt-cross-compile.patch | 15 ++ .../macosx-toolchain/compiler-rt-no-codesign.patch | 21 ++ projects/macosx-toolchain/config | 29 ++- 7 files changed, 405 insertions(+), 18 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index daedf7f..5ddd4de 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -14,11 +14,6 @@ mkdir -p [% dest_dir _ '/' _ c('filename') %] cp /var/tmp/dist/mingw-w64/gcclibs/{libssp.a,libssp_nonshared.a} /var/tmp/dist/mingw-w64-clang/[% c("arch") %]-w64-mingw32/lib/ [% END -%] -[% IF c("var/osx") %] - mkdir -p /var/tmp/dist/macosx-toolchain/clang/lib/clang/[% pc("clang", "version") %]/lib/darwin - mv libclang_rt.osx.a /var/tmp/dist/macosx-toolchain/clang/lib/clang/[% pc("clang", "version") %]/lib/darwin -[% END -%] - tar -C /var/tmp/dist -xf [% c('input_files_by_name/rust') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/cbindgen') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/nasm') %] diff --git a/projects/firefox/config b/projects/firefox/config index 2ee16e4..9876240 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -182,9 +182,3 @@ input_files: # TorButton patch authored by Arthur Edelstein, from https://github.com/arthuredelstein/torbutton/ branch 2.1.10-namecoin - filename: namecoin-etld.patch enable: '[% c("var/namecoin") %]' - # The library is extracted from Mozilla's officially used Clang, downloaded - # from https://firefox-ci-tc.services.mozilla.com/api/queue/v1/task/TYTqgyybSLmp0O…. - # Its SHA-256 sum is 7b0a6e60f102d3dbf618ae9e25d990d4dc72c76eb5accb5974ec70c11ff7e049. - - URL: https://people.torproject.org/~gk/mirrors/sources/libclang_rt.osx.a - sha256sum: 33541fb054e7dc372b5e9708bbcc175561d7fdbc9b00bf964e0c60b82bd8165a - enable: '[% c("var/osx") %]' diff --git a/projects/macosx-toolchain/43909.patch b/projects/macosx-toolchain/43909.patch new file mode 100644 index 0000000..78d2a75 --- /dev/null +++ b/projects/macosx-toolchain/43909.patch @@ -0,0 +1,252 @@ +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 cd19c1d..0f67c38 100644 --- a/projects/macosx-toolchain/build +++ b/projects/macosx-toolchain/build @@ -1,17 +1,100 @@ #!/bin/bash [% c("var/set_default_env") -%] +builddir=/var/tmp/build +mkdir $builddir distdir="/var/tmp/dist/[% project %]" mkdir -p "$distdir" -tar xjf [% c('input_files_by_name/SDK') %] -mv MacOSX10.11.sdk "$distdir/" -tar xf [% c('input_files_by_name/clang') %] -mv clang "$distdir/clang" +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 $distdir -xf [% c('input_files_by_name/SDK') %] tar -C $distdir -xf [% c('input_files_by_name/cctools') %] -cd $distdir/cctools/bin + +clangdir=/var/tmp/dist/clang/bin +cctoolsdir=$distdir/cctools/bin +sysrootdir=$distdir/MacOSX10.11.sdk/ +# We still need to put the cctoolsdir on the path. That's because of `lipo`. See +# the respective comment in the cctools build script. +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 +patch -p1 < $rootdir/compiler-rt-cross-compile.patch +patch -p1 < $rootdir/compiler-rt-no-codesign.patch +mv compiler-rt llvm/projects +mkdir build +cd build +# We follow quite closely Mozilla's build/build-clang/build-clang.py with the +# clang-macosx64.json flavor. This currently implies disabling Xray as it +# requires an OSX 10.12 SDK (see: https://bugs.llvm.org/show_bug.cgi?id=38959) +cmake -GNinja \ + -DCMAKE_C_COMPILER=$clangdir/clang \ + -DCMAKE_CXX_COMPILER=$clangdir/clang++ \ + -DCMAKE_ASM_COMPILER=$clangdir/clang \ + -DCMAKE_LINKER=$clangdir/clang \ + -DCMAKE_AR=$cctoolsdir/x86_64-apple-darwin-ar \ + -DCMAKE_C_FLAGS="[% c('var/FLAGS') %] -I$sysrootdir/usr/include -iframework $sysrootdir/System/Library/Frameworks" \ + -DCMAKE_CXX_FLAGS="-stdlib=libc++ [% c('var/FLAGS') %] -I$sysrootdir/usr/include -iframework $sysrootdir/System/Library/Frameworks" \ + -DCMAKE_ASM_FLAGS="[% c('var/FLAGS') %] -I$sysrootdir/usr/include -iframework $sysrootdir/System/Library/Frameworks" \ + -DCMAKE_EXE_LINKER_FLAGS="[% c('var/LDFLAGS') %]" \ + -DCMAKE_SHARED_LINKER_FLAGS="[% c('var/LDFLAGS') %]" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=$distdir/clang \ + -DLLVM_TARGETS_TO_BUILD="X86;ARM;AArch64" \ + -DLLVM_ENABLE_ASSERTIONS=OFF \ + -DPYTHON_EXECUTABLE=/usr/bin/python2.7 \ + -DLLVM_TOOL_LIBCXX_BUILD=ON \ + -DLLVM_ENABLE_BINDINGS=OFF \ + -DLLVM_ENABLE_LIBXML2=FORCE_ON \ + -DLLVM_LINK_LLVM_DYLIB=ON \ + -DCMAKE_RANLIB=$cctoolsdir/x86_64-apple-darwin-ranlib \ + -DCMAKE_LIBTOOL=$cctoolsdir/x86_64-apple-darwin-libtool \ + -DCMAKE_SYSTEM_NAME=Darwin \ + -DCMAKE_SYSTEM_VERSION=10.10 \ + -DLLVM_ENABLE_THREADS=OFF \ + -DCOMPILER_RT_BUILD_XRAY=OFF \ + -DLIBCXXABI_LIBCXX_INCLUDES=$builddir/llvm/projects/libcxx/include \ + -DCMAKE_OSX_SYSROOT=$sysrootdir \ + -DCMAKE_FIND_ROOT_PATH=$sysrootdir \ + -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER \ + -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \ + -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \ + -DCMAKE_MACOSX_RPATH=ON \ + -DCMAKE_OSX_ARCHITECTURES=x86_64 \ + -DDARWIN_osx_ARCHS=x86_64 \ + -DDARWIN_osx_SYSROOT=$sysrootdir \ + -DLLVM_DEFAULT_TARGET_TRIPLE=x86_64-apple-darwin $builddir/llvm +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 +# `llvm-symbolizer` as that one seems to get shipped with sanitizer builds (at +# least that's what Mozilla claims). +cd $distdir +cp --remove-destination -lr /var/tmp/dist/clang/* clang/ + +cd cctools/bin ln -s ../../clang/bin/clang x86_64-apple-darwin-clang ln -s ../../clang/bin/clang++ x86_64-apple-darwin-clang++ -cd "/var/tmp/dist" +cd /var/tmp/dist [% c('tar', { tar_src => [ project ], tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), diff --git a/projects/macosx-toolchain/compiler-rt-cross-compile.patch b/projects/macosx-toolchain/compiler-rt-cross-compile.patch new file mode 100644 index 0000000..4ab2495 --- /dev/null +++ b/projects/macosx-toolchain/compiler-rt-cross-compile.patch @@ -0,0 +1,15 @@ +Add `-target x86_64-apple-darwin' to the compiler-rt overridden CFLAGS + +diff --git a/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake b/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake +index 28d398672..aac68bf36 100644 +--- a/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake ++++ b/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake +@@ -265,7 +265,7 @@ endfunction() + macro(darwin_add_builtin_libraries) + set(DARWIN_EXCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Darwin-excludes) + +- set(CFLAGS "-fPIC -O3 -fvisibility=hidden -DVISIBILITY_HIDDEN -Wall -fomit-frame-pointer") ++ set(CFLAGS "-fPIC -O3 -fvisibility=hidden -DVISIBILITY_HIDDEN -Wall -fomit-frame-pointer -target x86_64-apple-darwin -isysroot ${CMAKE_OSX_SYSROOT} -I${CMAKE_OSX_SYSROOT}/usr/include") + set(CMAKE_C_FLAGS "") + set(CMAKE_CXX_FLAGS "") + set(CMAKE_ASM_FLAGS "") diff --git a/projects/macosx-toolchain/compiler-rt-no-codesign.patch b/projects/macosx-toolchain/compiler-rt-no-codesign.patch new file mode 100644 index 0000000..99d3f7e --- /dev/null +++ b/projects/macosx-toolchain/compiler-rt-no-codesign.patch @@ -0,0 +1,21 @@ +Disable codesign for macosx cross-compile toolchain. Codesign only works on OSX. + +Index: cmake/Modules/AddCompilerRT.cmake +=================================================================== +--- a/compiler-rt/cmake/Modules/AddCompilerRT.cmake ++++ b/compiler-rt/cmake/Modules/AddCompilerRT.cmake +@@ -321,14 +321,6 @@ + set_target_properties(${libname} PROPERTIES IMPORT_PREFIX "") + set_target_properties(${libname} PROPERTIES IMPORT_SUFFIX ".lib") + endif() +- if(APPLE) +- # Ad-hoc sign the dylibs +- add_custom_command(TARGET ${libname} +- POST_BUILD +- COMMAND codesign --sign - $<TARGET_FILE:${libname}> +- WORKING_DIRECTORY ${COMPILER_RT_LIBRARY_OUTPUT_DIR} +- ) +- endif() + endif() + + set(parent_target_arg) diff --git a/projects/macosx-toolchain/config b/projects/macosx-toolchain/config index 29f7c4b..937478b 100644 --- a/projects/macosx-toolchain/config +++ b/projects/macosx-toolchain/config @@ -1,6 +1,8 @@ # 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 @@ -18,12 +20,37 @@ var: input_files: - project: container-image - - name: clang + - name: clang_compiler project: clang - name: cctools project: cctools + - name: cmake + project: cmake + - name: ninja + project: ninja # Instructions on how to create the SDK tarball can be found at: # build/macosx/cross-mozconfig.common - 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 + - filename: compiler-rt-cross-compile.patch + - filename: compiler-rt-no-codesign.patch + - filename: 43909.patch

1 0

[translation/tba-torbrowserstringsdtd] https://gitweb.torproject.org/translation.git/commit/?h=tba-torbrowserstringsdtd
by translation＠torproject.org 06 Aug '20

06 Aug '20

commit 9928d2fc7bd139a4c83b9a53a4fc84764467bebb Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 6 21:46:40 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tba-torbrowserstrin… --- he/torbrowser_strings.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/he/torbrowser_strings.dtd b/he/torbrowser_strings.dtd index 2dbe16bbd2..77ec5bc525 100644 --- a/he/torbrowser_strings.dtd +++ b/he/torbrowser_strings.dtd @@ -1,6 +1,6 @@  <!ENTITY firstrun_welcome_tab_title "ברוך בואך"> -<!ENTITY firstrun_welcome_title "את/ה מוכן/ה."> +<!ENTITY firstrun_welcome_title "הנך מוכן/ה."> <!ENTITY firstrun_welcome_message "דפדפן Tor מציע את התקן הגבוה ביותר של פרטיות ואבטחה בזמן גלישה ברשת. אתה מוגן כעת מפני מעקב, ציתות וצנזורה. ביאור מהיר זה יראה לך איך."> <!ENTITY firstrun_welcome_next "התחל עכשיו"> <!ENTITY firstrun_privacy_tab_title "פרטיות"> @@ -24,7 +24,7 @@ <!ENTITY firstrun_onionservices_message "שירותי בצל הם אתרים המסתיימים עם .onion המספקים הגנות אקסטרה אל מפרסמים ומבקרים, כולל אמצעיי הגנה שהתווספו נגד צנזורה. שירותי בצל מתירים לכל אחד לספק תוכן ושירותים באופן אלמוני."> <!ENTITY firstrun_onionservices_next "לך לסייר"> -<!ENTITY tor_bootstrap_swipe_for_logs "החלק שמאלה כדי לראות רישומי Tor"> +<!ENTITY tor_bootstrap_swipe_for_logs "יש להחליק שמאלה כדי לראות רישומי Tor"> <!ENTITY tor_bootstrap_connect "התחבר"> <!ENTITY tor_bootstrap_starting_status "אנחנו מתחברים אל רשת Tor…"> @@ -53,6 +53,6 @@ <!ENTITY pref_tor_network_using_multiple_provided_bridges "אתה משתמש בגשרים מותאמים אישית רבים."> <!ENTITY pref_tor_network_using_a_provided_bridge "אתה משתמש בגשר &formatS;."> -<!ENTITY tor_notify_user_about_error "שגיאה התרחשה, אנא החלק למידע נוסף."> +<!ENTITY tor_notify_user_about_error "שגיאה התרחשה, נא להחליק למידע נוסף."> -<!ENTITY sync_not_supported "סינכרון אינו נתמך כרגע בדפדפן Tor על Android"> +<!ENTITY sync_not_supported "סנכרון אינו נתמך כרגע בדפדפן Tor על Android">

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 06 Aug '20

06 Aug '20

commit 58322e0f522fa4c41f2af1b1f81abafe650af044 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 6 21:18:03 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ar.po | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/contents+ar.po b/contents+ar.po index 1ed1c2a8a9..ebec538ebf 100644 --- a/contents+ar.po +++ b/contents+ar.po @@ -2350,12 +2350,12 @@ msgstr "" msgid "" "The best defense is to be vigilant and extremely cautious when filling out " "web forms." -msgstr "" +msgstr "أفضل دفاع هو أن تكون يقظًا وحذرًا للغاية عند ملء نماذج الويب." #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) msgid "### Don't torrent over Tor" -msgstr "" +msgstr "### لا تستخدم torrent عن طريق Tor" #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) @@ -2363,6 +2363,8 @@ msgid "" "Torrent file-sharing applications have been observed to ignore proxy " "settings and make direct connections even when they are told to use Tor." msgstr "" +"تمت ملاحظة تطبيقات مشاركة ملفات Torrent لتجاهل إعدادات الوكيل وإجراء اتصالات" +" مباشرة حتى عندما يُطلب منهم استخدام Tor." #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) @@ -2371,6 +2373,9 @@ msgid "" "send out your real IP address in the tracker GET request, because that's how" " torrents work." msgstr "" +"حتى إذا كان تطبيق torrent الخاص بك يتصل فقط من خلال Tor ، فغالبًا ما سترسل " +"عنوان IP الحقيقي الخاص بك في طلب GET للمتتبع ، لأن هذه هي الطريقة التي تعمل " +"بها السيول." #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) @@ -2380,6 +2385,9 @@ msgid "" "over-tor-isnt-good-idea) this way, you also slow down the entire Tor network" " for everyone else." msgstr "" +"لا يقتصر الأمر على [جعل اسمك مروريًا لحركة torrent الخاصة بك وحركة الويب " +"الأخرى المتزامنة على Tor] (https://blog.torproject.org/blog/bittorrent-over-" +"tor-isnt-good-idea) بهذه الطريقة ، بل تبطئ أيضًا شبكة Tor كاملة لأي شخص آخر." #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description)

1 0

[translation/tor-launcher-properties] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-properties
by translation＠torproject.org 06 Aug '20

06 Aug '20

commit 62a8c9cdba8f71c4cac39c1b971295039ab36639 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 6 21:17:35 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-proper… --- he/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/he/torlauncher.properties b/he/torlauncher.properties index fd464c5d9b..15925a41e6 100644 --- a/he/torlauncher.properties +++ b/he/torlauncher.properties @@ -16,7 +16,7 @@ torlauncher.unable_to_start_tor=לא היה ניתן להתחיל את Tor.\n\n% torlauncher.tor_missing=קובץ ההפעלה של Tor חסר. torlauncher.torrc_missing=קובץ ה-torrc חסר ולא היה יכול להיווצר. torlauncher.datadir_missing=תיקיית הנתונים של Tor אינה קיימת ולא יכלה להיווצר. -torlauncher.onionauthdir_missing=סיפריית אימות הבצל של Tor אינה קיימת ולא יכלה להיווצר. +torlauncher.onionauthdir_missing=ספריית אימות הבצל של Tor אינה קיימת ולא יכלה להיווצר. torlauncher.password_hash_missing=נכשל בהשגת סיסמה מעורבלת. torlauncher.failed_to_get_settings=לא היה ניתן לאחזר הגדרות Tor.\n\n%S

1 0

[translation/tba-torbrowserstringsdtd] https://gitweb.torproject.org/translation.git/commit/?h=tba-torbrowserstringsdtd
by translation＠torproject.org 06 Aug '20

06 Aug '20

commit 1bea4a6f41a877a20a0ddbfe38bc44ff4f2b6f38 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 6 21:16:46 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tba-torbrowserstrin… --- he/torbrowser_strings.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/he/torbrowser_strings.dtd b/he/torbrowser_strings.dtd index cebfbb0a6b..2dbe16bbd2 100644 --- a/he/torbrowser_strings.dtd +++ b/he/torbrowser_strings.dtd @@ -1,6 +1,6 @@  -<!ENTITY firstrun_welcome_tab_title "ברוך הבא"> -<!ENTITY firstrun_welcome_title "אתה מוכן."> +<!ENTITY firstrun_welcome_tab_title "ברוך בואך"> +<!ENTITY firstrun_welcome_title "את/ה מוכן/ה."> <!ENTITY firstrun_welcome_message "דפדפן Tor מציע את התקן הגבוה ביותר של פרטיות ואבטחה בזמן גלישה ברשת. אתה מוגן כעת מפני מעקב, ציתות וצנזורה. ביאור מהיר זה יראה לך איך."> <!ENTITY firstrun_welcome_next "התחל עכשיו"> <!ENTITY firstrun_privacy_tab_title "פרטיות"> @@ -36,7 +36,7 @@ <!ENTITY pref_category_tor_bridge_summary "גשרים הם ממסרי Tor בלתי כתובים המקשים לחסום חיבורים אל רשת Tor. בגלל הדרך שבה מספר מדינות מנסות לחסום את Tor, גשרים מסוימים עובדים במספר מדינות אבל גשרים אחרים לא."> <!ENTITY pref_choice_tor_bridges_enabled_title "האינטרנט מצונזר כאן"> -<!ENTITY pref_choice_tor_bridges_enabled_summary "הקש כדי לתצר גשר להתחבר אל Tor"> +<!ENTITY pref_choice_tor_bridges_enabled_summary "יש להקיש לתצורת גשר התחברות אל Tor"> <!ENTITY pref_tor_bridges_provide_manual_button_title "סַפֵּק גשר שאני מכיר"> <!ENTITY pref_tor_bridges_provide_select_text_title "בחר גשר">

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 06 Aug '20

06 Aug '20

commit 141fa0b4ee9d22a2542973b34f7646da18943b89 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 6 20:48:15 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ar.po | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/contents+ar.po b/contents+ar.po index 0f23b4aa42..1ed1c2a8a9 100644 --- a/contents+ar.po +++ b/contents+ar.po @@ -2254,7 +2254,7 @@ msgstr "" #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) msgid "### Use Tor Browser and software specifically configured for Tor." -msgstr "" +msgstr "### استخدم متصفح Tor والبرامج التي تم تكوينها خصيصًا لـ Tor." #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) @@ -2262,6 +2262,7 @@ msgid "" "Tor does not protect all of your computer's Internet traffic when you run " "it." msgstr "" +"لا يحمي Tor جميع انشطة الإنترنت على جهاز الكمبيوتر الخاص بك عند تشغيله." #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) @@ -2269,42 +2270,44 @@ msgid "" "Tor only protects applications that are properly configured to send their " "Internet traffic through Tor." msgstr "" +"يحمي Tor فقط التطبيقات التي تم تكوينها بشكل صحيح لإرسال انشطة الإنترنت " +"الخاصة بهم عبر Tor." #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) msgid "Web browsing:" -msgstr "" +msgstr "تصفح الويب:" #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) msgid "- Safe: [Tor Browser](https://www.torproject.org/download/)" -msgstr "" +msgstr "- آمن: [متصفح Tor] (https://www.torproject.org/download/)" #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) msgid "" "- Unsafe: [Any other browser configured to use Tor as a proxy](/tbb/tbb-9)" -msgstr "" +msgstr "- غير آمن: [أي متصفح آخر مهيأ لاستخدام Tor كوكيل] (/ tbb / tbb-9)" #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) msgid "File sharing:" -msgstr "" +msgstr "مشاركة الملفات:" #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) msgid "- Safe: [OnionShare](/misc/misc-12)" -msgstr "" +msgstr "- آمن: [OnionShare] (/ misc / misc-12)" #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) msgid "- Unsafe: [BitTorret over Tor](/misc/misc-4)" -msgstr "" +msgstr "- غير آمن: [BitTorrent عن طريق Tor] (/ misc / misc-4)" #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) msgid "### Control what information you provide through web forms." -msgstr "" +msgstr "### التحكم في المعلومات التي تقدمها عبر نماذج الويب." #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) @@ -2312,6 +2315,8 @@ msgid "" "If you visit a website using Tor Browser, they don't know who you are or " "your true location." msgstr "" +"إذا قمت بزيارة موقع ويب باستخدام متصفح Tor ، فلن يعرفوا من أنت أو موقعك " +"الحقيقي." #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) @@ -2319,6 +2324,8 @@ msgid "" "Unfortunately many sites ask for more personal information than they need " "through web forms." msgstr "" +"للأسف ، تطلب العديد من المواقع معلومات شخصية أكثر مما تحتاجه من خلال نماذج " +"الويب." #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) @@ -2326,6 +2333,8 @@ msgid "" "If you sign in to that website, they still don't know your location but they" " know who you are." msgstr "" +"إذا قمت بتسجيل الدخول إلى موقع الويب هذا ، فلا يزالون لا يعرفون موقعك ولكنهم" +" يعرفون من أنت." #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) @@ -2333,6 +2342,8 @@ msgid "" "Further, if you provide: name, email, address, phone number, or any other " "personal information, you are no longer anonymous to that website." msgstr "" +"علاوة على ذلك ، إذا قدمت: الاسم أو البريد الإلكتروني أو العنوان أو رقم " +"الهاتف أو أي معلومات شخصية أخرى ، فأنت لم تعد مجهولاً لهذا الموقع." #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description)

1 0

[tor-browser-build/master] Bug 40061: Omit the Windows default browser agent from the build
by gk＠torproject.org 06 Aug '20

06 Aug '20

commit 5765d7385f797ae2d55ec5b277cb36a6eac81b49 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Aug 6 11:13:37 2020 -0400 Bug 40061: Omit the Windows default browser agent from the build --- projects/firefox/mozconfig-windows-i686 | 1 + projects/firefox/mozconfig-windows-x86_64 | 1 + 2 files changed, 2 insertions(+) diff --git a/projects/firefox/mozconfig-windows-i686 b/projects/firefox/mozconfig-windows-i686 index eb4e212..f32db84 100644 --- a/projects/firefox/mozconfig-windows-i686 +++ b/projects/firefox/mozconfig-windows-i686 @@ -40,3 +40,4 @@ ac_add_options --disable-tests # Disable telemetry ac_add_options MOZ_TELEMETRY_REPORTING= +ac_add_options --disable-default-browser-agent diff --git a/projects/firefox/mozconfig-windows-x86_64 b/projects/firefox/mozconfig-windows-x86_64 index 655ca12..8dac1e8 100644 --- a/projects/firefox/mozconfig-windows-x86_64 +++ b/projects/firefox/mozconfig-windows-x86_64 @@ -40,3 +40,4 @@ ac_add_options --disable-tests # Disable telemetry ac_add_options MOZ_TELEMETRY_REPORTING= +ac_add_options --disable-default-browser-agent

1 0

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

06 Aug '20

commit efd0d09ea041ec81494afeee716d15d58d99e654 Merge: 219a86f 5765d73 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 6 19:49:09 2020 +0000 Merge remote-tracking branch 'gitlab/merge-requests/22' into master projects/firefox/mozconfig-windows-i686 | 1 + projects/firefox/mozconfig-windows-x86_64 | 1 + 2 files changed, 2 insertions(+)

1 0