- tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 26370: Don't copy msvcr100.dll and libssp-0.dll twice
by gk＠torproject.org 14 Jun '18

14 Jun '18

commit 37d406206a0d7ec43ae4bcd35889a97fc85eff32 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Jun 14 11:04:43 2018 +0200 Bug 26370: Don't copy msvcr100.dll and libssp-0.dll twice --- projects/firefox/build | 5 ----- 1 file changed, 5 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index 3ca8b32..0fd3da2 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -213,11 +213,6 @@ cd $distdir [% c("var/rezip", { rezip_file => '"Tor Browser.app/Contents/Resources/browser/omni.ja"' }) %] [% END %] -[% IF c("var/windows") %] - cp $rootdir/msvcr100.dll Browser/ - cp $gcclibs/libssp-0.dll Browser/ -[% END %] - mkdir -p [% dest_dir _ '/' _ c('filename') %] [%

1 0

[tor-browser/tor-browser-60.0.1esr-8.0-1] Bug 1463509 - SOCKS support for Alternative Services r=valentin
by gk＠torproject.org 14 Jun '18

14 Jun '18

commit 8a68f975ee5faa39efa26a79062476ab50dd18ab Author: Patrick McManus <mcmanus(a)ducksong.com> Date: Tue May 22 13:50:56 2018 -0400 Bug 1463509 - SOCKS support for Alternative Services r=valentin MozReview-Commit-ID: 1oXnQuzOqsC --HG-- extra : rebase_source : 84bfaec48c5fc216da6586e7f06f118292d3fb17 --- netwerk/base/nsSocketTransport2.cpp | 32 +++++++++++++++++++++-------- netwerk/protocol/http/AlternateServices.cpp | 8 +++++++- netwerk/protocol/http/AlternateServices.h | 4 ++++ netwerk/protocol/http/nsHttpChannel.cpp | 5 ++--- 4 files changed, 37 insertions(+), 12 deletions(-) diff --git a/netwerk/base/nsSocketTransport2.cpp b/netwerk/base/nsSocketTransport2.cpp index df01e62f55d3..aa9232f4698c 100644 --- a/netwerk/base/nsSocketTransport2.cpp +++ b/netwerk/base/nsSocketTransport2.cpp @@ -1170,7 +1170,7 @@ nsSocketTransport::BuildSocket(PRFileDesc *&fd, bool &proxyTransparent, bool &us uint32_t controlFlags = 0; uint32_t i; - for (i=0; i<mTypeCount; ++i) { + for (i = 0; i < mTypeCount; ++i) { nsCOMPtr<nsISocketProvider> provider; SOCKET_LOG((" pushing io layer [%u:%s]\n", i, mTypes[i])); @@ -1199,12 +1199,30 @@ nsSocketTransport::BuildSocket(PRFileDesc *&fd, bool &proxyTransparent, bool &us // if this is the first type, we'll want the // service to allocate a new socket + // Most layers _ESPECIALLY_ PSM want the origin name here as they + // will use it for secure checks, etc.. and any connection management + // differences between the origin name and the routed name can be + // taken care of via DNS. However, SOCKS is a special case as there is + // no DNS. in the case of SOCKS and PSM the PSM is a separate layer + // and receives the origin name. + const char *socketProviderHost = host; + int32_t socketProviderPort = port; + if (mProxyTransparentResolvesHost && + (!strcmp(mTypes[0], "socks") || !strcmp(mTypes[0], "socks4"))) { + SOCKET_LOG(("SOCKS %d Host/Route override: %s:%d -> %s:%d\n", + mHttpsProxy, + socketProviderHost, socketProviderPort, + mHost.get(), mPort)); + socketProviderHost = mHost.get(); + socketProviderPort = mPort; + } + // when https proxying we want to just connect to the proxy as if // it were the end host (i.e. expect the proxy's cert) rv = provider->NewSocket(mNetAddr.raw.family, - mHttpsProxy ? mProxyHost.get() : host, - mHttpsProxy ? mProxyPort : port, + mHttpsProxy ? mProxyHost.get() : socketProviderHost, + mHttpsProxy ? mProxyPort : socketProviderPort, proxyInfo, mOriginAttributes, controlFlags, mTlsFlags, &fd, getter_AddRefs(secinfo)); @@ -1213,8 +1231,7 @@ nsSocketTransport::BuildSocket(PRFileDesc *&fd, bool &proxyTransparent, bool &us NS_NOTREACHED("NewSocket succeeded but failed to create a PRFileDesc"); rv = NS_ERROR_UNEXPECTED; } - } - else { + } else { // the socket has already been allocated, // so we just want the service to add itself // to the stack (such as pushing an io layer) @@ -1245,9 +1262,8 @@ nsSocketTransport::BuildSocket(PRFileDesc *&fd, bool &proxyTransparent, bool &us secCtrl->SetNotificationCallbacks(callbacks); // remember if socket type is SSL so we can ProxyStartSSL if need be. usingSSL = isSSL; - } - else if ((strcmp(mTypes[i], "socks") == 0) || - (strcmp(mTypes[i], "socks4") == 0)) { + } else if ((strcmp(mTypes[i], "socks") == 0) || + (strcmp(mTypes[i], "socks4") == 0)) { // since socks is transparent, any layers above // it do not have to worry about proxy stuff proxyInfo = nullptr; diff --git a/netwerk/protocol/http/AlternateServices.cpp b/netwerk/protocol/http/AlternateServices.cpp index 2ce3d333d60d..f4cfa800715b 100644 --- a/netwerk/protocol/http/AlternateServices.cpp +++ b/netwerk/protocol/http/AlternateServices.cpp @@ -46,6 +46,12 @@ SchemeIsHTTPS(const nsACString &originScheme, bool &outIsHTTPS) return NS_OK; } +bool +AltSvcMapping::AcceptableProxy(nsProxyInfo *proxyInfo) +{ + return !proxyInfo || proxyInfo->IsDirect() || proxyInfo->IsSOCKS(); +} + void AltSvcMapping::ProcessHeader(const nsCString &buf, const nsCString &originScheme, const nsCString &originHost, int32_t originPort, @@ -59,7 +65,7 @@ AltSvcMapping::ProcessHeader(const nsCString &buf, const nsCString &originScheme return; } - if (proxyInfo && !proxyInfo->IsDirect()) { + if (!AcceptableProxy(proxyInfo)) { LOG(("AltSvcMapping::ProcessHeader ignoring due to proxy\n")); return; } diff --git a/netwerk/protocol/http/AlternateServices.h b/netwerk/protocol/http/AlternateServices.h index 051f010801b4..688586ba5b89 100644 --- a/netwerk/protocol/http/AlternateServices.h +++ b/netwerk/protocol/http/AlternateServices.h @@ -66,6 +66,10 @@ public: nsIInterfaceRequestor *callbacks, nsProxyInfo *proxyInfo, uint32_t caps, const OriginAttributes &originAttributes); + // AcceptableProxy() decides whether a particular proxy configuration (pi) is suitable + // for use with Alt-Svc. No proxy (including a null pi) is suitable. + static bool AcceptableProxy(nsProxyInfo *pi); + const nsCString &AlternateHost() const { return mAlternateHost; } const nsCString &OriginHost() const { return mOriginHost; } uint32_t OriginPort() const { return mOriginPort; } diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp index 28ff7709863e..35b4b4dfeb1e 100644 --- a/netwerk/protocol/http/nsHttpChannel.cpp +++ b/netwerk/protocol/http/nsHttpChannel.cpp @@ -6163,9 +6163,8 @@ nsHttpChannel::BeginConnect() RefPtr<AltSvcMapping> mapping; if (!mConnectionInfo && mAllowAltSvc && // per channel !(mLoadFlags & LOAD_FRESH_CONNECTION) && - (scheme.EqualsLiteral("http") || - scheme.EqualsLiteral("https")) && - (!proxyInfo || proxyInfo->IsDirect()) && + AltSvcMapping::AcceptableProxy(proxyInfo) && + (scheme.EqualsLiteral("http") || scheme.EqualsLiteral("https")) && (mapping = gHttpHandler->GetAltServiceMapping(scheme, host, port, mPrivateBrowsing,

1 0

[tor-browser/tor-browser-60.0.1esr-8.0-1] Bug 26045: Add new MAR signing keys
by gk＠torproject.org 13 Jun '18

13 Jun '18

commit 1f78032d48850e0197608ac1d9906a095e2a4c06 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jun 13 09:03:59 2018 +0000 Bug 26045: Add new MAR signing keys We need to have new MAR singning keys for our watershed update: both keys we shipped so far need to get replaced by news ones, now using SHA-384 as their hash algorithm. --- toolkit/mozapps/update/updater/release_primary.der | Bin 1225 -> 1229 bytes toolkit/mozapps/update/updater/release_secondary.der | Bin 1225 -> 1229 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/toolkit/mozapps/update/updater/release_primary.der b/toolkit/mozapps/update/updater/release_primary.der index 1d94f88ad73b..ec74f89dc807 100644 Binary files a/toolkit/mozapps/update/updater/release_primary.der and b/toolkit/mozapps/update/updater/release_primary.der differ diff --git a/toolkit/mozapps/update/updater/release_secondary.der b/toolkit/mozapps/update/updater/release_secondary.der index 474706c4b73c..0103a171de88 100644 Binary files a/toolkit/mozapps/update/updater/release_secondary.der and b/toolkit/mozapps/update/updater/release_secondary.der differ

1 0

[tor-browser/tor-browser-60.0.1esr-8.0-1] Revert "Bug 23916: Add new MAR signing key"
by gk＠torproject.org 13 Jun '18

13 Jun '18

commit d77a0ec835e8ee8e4beab614722c02fa7fd96119 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jun 13 08:58:27 2018 +0000 Revert "Bug 23916: Add new MAR signing key" This reverts commit e984b8c54c7592057c060f7a2e13b378a355b1d0. --- toolkit/mozapps/update/updater/release_primary.der | Bin 1229 -> 1225 bytes toolkit/mozapps/update/updater/release_secondary.der | Bin 1229 -> 1225 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/toolkit/mozapps/update/updater/release_primary.der b/toolkit/mozapps/update/updater/release_primary.der index cce786025698..1d94f88ad73b 100644 Binary files a/toolkit/mozapps/update/updater/release_primary.der and b/toolkit/mozapps/update/updater/release_primary.der differ diff --git a/toolkit/mozapps/update/updater/release_secondary.der b/toolkit/mozapps/update/updater/release_secondary.der index caf3eca56804..474706c4b73c 100644 Binary files a/toolkit/mozapps/update/updater/release_secondary.der and b/toolkit/mozapps/update/updater/release_secondary.der differ

1 0

[tor-browser-build/master] Bug 26354: check for SSE2 support in start-tor-browser
by gk＠torproject.org 13 Jun '18

13 Jun '18

commit fb3315fbc961f924012dcf97d346ce9527f85505 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Jun 12 20:02:49 2018 +0200 Bug 26354: check for SSE2 support in start-tor-browser --- projects/tor-browser/RelativeLink/start-tor-browser | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/projects/tor-browser/RelativeLink/start-tor-browser b/projects/tor-browser/RelativeLink/start-tor-browser index 0590eed..6639f44 100755 --- a/projects/tor-browser/RelativeLink/start-tor-browser +++ b/projects/tor-browser/RelativeLink/start-tor-browser @@ -96,6 +96,11 @@ if [ "`id -u`" -eq 0 ]; then exit 1 fi +if ! grep -q '^flags\s*:.* sse2' /proc/cpuinfo; then + complain "Tor Browser requires a CPU with SSE2 support. Exiting." + exit 1 +fi + tbb_usage () { printf "\nTor Browser Script Options\n" printf " --verbose Display Tor and Firefox output in the terminal\n"

1 0

[tor-browser-build/master] Bug 26354: check for SSE2 support before updating Linux users
by gk＠torproject.org 13 Jun '18

13 Jun '18

commit 17d7ca8fb2be71b72b429c59fed8a10c042a4a49 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Jun 12 20:09:56 2018 +0200 Bug 26354: check for SSE2 support before updating Linux users We were setting the minSupportedInstructionSet attribute for the win32 updates only. We now set it on all platforms. --- projects/release/update_responses_config.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml index 1a9b0cf..6861124 100644 --- a/projects/release/update_responses_config.yml +++ b/projects/release/update_responses_config.yml @@ -38,8 +38,7 @@ versions: osx32: osx64 migrate_langs: pt-PT: pt-BR - win32: - minSupportedInstructionSet: SSE2 + minSupportedInstructionSet: SSE2 osx32: minSupportedOSVersion: 13.0.0 osx64:

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_26354'
by gk＠torproject.org 13 Jun '18

13 Jun '18

commit f606f5d9d55a171e0a6f57ad58e1052c9f7c149d Merge: 3cab74a 17d7ca8 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jun 13 09:35:34 2018 +0000 Merge remote-tracking branch 'boklm/bug_26354' projects/release/update_responses_config.yml | 3 +-- projects/tor-browser/RelativeLink/start-tor-browser | 5 +++++ 2 files changed, 6 insertions(+), 2 deletions(-)

1 0

[tor-browser-build/master] Bug 26234: add update_responses option to specify rewrite rules
by gk＠torproject.org 13 Jun '18

13 Jun '18

commit 3cab74acf8a2f2a311c133544ccc8c00a43e00a2 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jun 11 17:49:03 2018 +0200 Bug 26234: add update_responses option to specify rewrite rules Add the htaccess_rewrite_rules option which can be used to specify rewrite rules to be added to the generated .htaccess files. --- tools/update-responses/update_responses | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 1df35b3..77b9c96 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -376,6 +376,7 @@ sub write_htaccess { my $flags = "[last]"; foreach my $channel (@channels) { my $htaccess = "RewriteEngine On\n"; + $htaccess .= $config->{htaccess_rewrite_rules}{$channel} // ''; my $version = $config->{channels}{$channel}; my $migrate_langs = $config->{versions}{$version}{migrate_langs} // {}; my $files = $config->{versions}{$version}{files};

1 0

[tor-browser-build/maint-7.5] Release preparations for 7.5.5
by gk＠torproject.org 08 Jun '18

08 Jun '18

commit d0e565d00e236e331f8ebf040b4225b6875d471f Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 8 21:25:47 2018 +0000 Release preparations for 7.5.5 Changelog update and versions bump --- projects/firefox/config | 4 ++-- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 5 +++++ rbm.conf | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 886cfdc..e91d1ca 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,13 +1,13 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg var: - firefox_platform_version: 52.8.0 + firefox_platform_version: 52.8.1 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 7.5 torbrowser_update_channel: alpha diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 7f5a736..5d52b10 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,8 @@ +Tor Browser 7.5.5 -- June 10 2018 + * All platforms + * Update Firefox to 52.8.1esr + * Bug 26098: Remove amazon-meek + Tor Browser 7.5.4 -- May 9 2018 * All platforms * Update Firefox to 52.8.0esr diff --git a/rbm.conf b/rbm.conf index ca427f9..4329958 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,10 +15,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '7.5.4' + torbrowser_version: '7.5.5' torbrowser_build: 'build1' torbrowser_incremental_from: - - 7.5.3 + - 7.5.4 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/master] Bug 24632: Make sure to use "Tor Browser.app" for `browserdir` on macOS
by gk＠torproject.org 07 Jun '18

07 Jun '18

commit fcb2a3707af71bcd564bf0dd8a563835eeea6b9b Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 7 10:40:47 2018 +0000 Bug 24632: Make sure to use "Tor Browser.app" for `browserdir` on macOS --- projects/tor-browser/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index d807633..19aa657 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -311,7 +311,7 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ SET xpi = '$rootdir/' _ c('input_files_by_name/firefox-langpacks') _ '/' _ lang _ '.xpi'; SET tbdir = '$distdir/tor-browser_' _ lang; IF c("var/osx"); - SET browserdir = tbdir _ '/TorBrowser.app'; + SET browserdir = tbdir _ '/Tor Browser.app'; ELSIF c("var/windows"); SET browserdir = tbdir _ '/Tor Browser/Browser'; ELSE;

1 0

[tor-browser-build/master] Bug 24632: Install xz-utils for macOS MAR file creation
by gk＠torproject.org 07 Jun '18

07 Jun '18

commit aabed936170b9ea88df2037e8d452dc5d9915f20 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 7 10:39:48 2018 +0000 Bug 24632: Install xz-utils for macOS MAR file creation --- projects/tor-browser/config | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 62ed70c..225a0bb 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -24,6 +24,7 @@ targets: - python - bzip2 - faketime + - xz-utils windows: var: arch_deps:

1 0

[tor-browser-build/master] Bug 26153: Enable selfrando for 64bit only for now
by gk＠torproject.org 07 Jun '18

07 Jun '18

commit 8b30ee00debb11a1c165435d304a406c8408f216 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 7 06:02:16 2018 +0000 Bug 26153: Enable selfrando for 64bit only for now The 32bit toolchain is not able to link libxul anymore with selfrando enabled as the linker is running out of address space. We therefore disable selfrando for 32bit for now. --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index b3dd729..de5102d 100644 --- a/rbm.conf +++ b/rbm.conf @@ -165,7 +165,7 @@ targets: # We only build snowflake for linux on the alpha and nightly channels for now. snowflake: '[% c("var/alpha") || c("var/nightly") %]' fteproxy: 1 - selfrando: '[% ! c("var/release") %]' + selfrando: '[% c("var/linux-x86_64") && ! c("var/release") %]' container: suite: wheezy deps:

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_22242'
by gk＠torproject.org 06 Jun '18

06 Jun '18

commit 2dfbef2eecb1ca19467b095b16c18f9c78d28445 Merge: 4074cbc 6063d5c Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jun 6 19:09:08 2018 +0000 Merge remote-tracking branch 'boklm/bug_22242' projects/firefox/build | 6 +++++- projects/firefox/config | 4 +++- rbm.conf | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) diff --cc projects/firefox/config index 97efc7b,21efac7..6cb17c7 --- a/projects/firefox/config +++ b/projects/firefox/config @@@ -83,11 -84,9 +85,11 @@@ input_files enable: '[% c("var/linux") %]' - project: selfrando name: selfrando - enable: '[% c("var/linux") && ! c("var/release") %]' + enable: '[% c("var/selfrando") %]' - filename: fix-info-plist.py enable: '[% c("var/osx") %]' + - filename: no-dmg.patch + enable: '[% c("var/osx") %]' - URL: https://people.torproject.org/~gk/mirrors/sources/msvcr100.dll sha256sum: 8793353461826fbd48f25ea8b835be204b758ce7510db2af631b28850355bd18 enable: '[% c("var/windows-i686") %]' diff --cc rbm.conf index 28ce6f9,c1b49f0..b3dd729 --- a/rbm.conf +++ b/rbm.conf @@@ -162,9 -162,11 +162,10 @@@ targets var: linux: 1 compiler: gcc - # We only build snowflake for linux and osx on the alpha and nightly - # channels for now. + # We only build snowflake for linux on the alpha and nightly channels for now. snowflake: '[% c("var/alpha") || c("var/nightly") %]' fteproxy: 1 + selfrando: '[% ! c("var/release") %]' container: suite: wheezy deps:

1 0

[tor-browser-build/master] Bug 22242: use chrpath to remove RUNPATH added by selfrando
by gk＠torproject.org 06 Jun '18

06 Jun '18

commit 6063d5c6433a294176593a070138350cc723dbfa Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed May 23 16:39:25 2018 +0200 Bug 22242: use chrpath to remove RUNPATH added by selfrando At the same time we add a var/selfrando variable to make it easier to enable/disable selfrando. --- projects/firefox/build | 6 +++++- projects/firefox/config | 4 +++- rbm.conf | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index a7441bd..ea3826d 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -23,7 +23,7 @@ mkdir -p /var/tmp/build export PATH="/var/tmp/dist/binutils/bin:$PATH" [% END -%] -[% IF c("var/linux") && ! c("var/release") -%] +[% IF c("var/selfrando") -%] tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/selfrando') %] # Selfrando wrapper export PATH="/var/tmp/dist/selfrando/Tools/TorBrowser/tc-wrapper/:$PATH" @@ -161,6 +161,10 @@ cd $distdir objcopy --only-keep-debug $LIB Debug/$LIB strip $LIB objcopy --add-gnu-debuglink=./Debug/$LIB $LIB + [% IF c("var/selfrando") -%] + # remove RUNPATH added by selfrando (see #22242) + chrpath -d $LIB + [% END -%] done [% END %] diff --git a/projects/firefox/config b/projects/firefox/config index 4458d48..21efac7 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -48,6 +48,8 @@ targets: - libx11-xcb-dev # We built GCC but not the libmpc2, thus we need to install it - libmpc2 + # needed to remove RUNPATH added by selfrando (see #22242) + - chrpath linux-x86_64: var: martools_filename: mar-tools-linux64.zip @@ -82,7 +84,7 @@ input_files: enable: '[% c("var/linux") %]' - project: selfrando name: selfrando - enable: '[% c("var/linux") && ! c("var/release") %]' + enable: '[% c("var/selfrando") %]' - filename: fix-info-plist.py enable: '[% c("var/osx") %]' - URL: https://people.torproject.org/~gk/mirrors/sources/msvcr100.dll diff --git a/rbm.conf b/rbm.conf index bb53bcb..c1b49f0 100644 --- a/rbm.conf +++ b/rbm.conf @@ -166,6 +166,7 @@ targets: # channels for now. snowflake: '[% c("var/alpha") || c("var/nightly") %]' fteproxy: 1 + selfrando: '[% ! c("var/release") %]' container: suite: wheezy deps:

1 0

[tor-browser-build/master] Bug 26153: Selfrando builds broken for Firefox 60 ESR
by gk＠torproject.org 06 Jun '18

06 Jun '18

commit d161cb720ea36ccd547acd385752fe353279761f Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed Jun 6 11:01:19 2018 -0400 Bug 26153: Selfrando builds broken for Firefox 60 ESR This commit fixes #26153 by bumping the selfrando version to 0.4.2 --- projects/firefox/build | 14 +++++++------- projects/firefox/config | 6 +++--- projects/selfrando/config | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index 62186d1..cbd9250 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -40,13 +40,13 @@ EOF export PATH="/var/tmp/dist/binutils/bin:$PATH" [% END -%] -#[% IF c("var/linux") && ! c("var/release") -%] -# tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/selfrando') %] -# # Selfrando wrapper -# export PATH="/var/tmp/dist/selfrando/Tools/TorBrowser/tc-wrapper/:$PATH" -# # We need to avoid the shuffling while building as this breaks compilation -# export SELFRANDO_skip_shuffle= -#[% END -%] +[% IF c("var/linux") && ! c("var/release") -%] + tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/selfrando') %] + # Selfrando wrapper + export PATH="/var/tmp/dist/selfrando/Tools/TorBrowser/tc-wrapper/:$PATH" + # We need to avoid the shuffling while building as this breaks compilation + export SELFRANDO_skip_shuffle= +[% END -%] [% IF c("var/linux") %] mkdir -p /var/tmp/dist diff --git a/projects/firefox/config b/projects/firefox/config index d6b8313..418daa3 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -81,9 +81,9 @@ input_files: - project: binutils name: binutils enable: '[% c("var/linux") %]' -# - project: selfrando -# name: selfrando -# enable: '[% c("var/linux") && ! c("var/release") %]' + - project: selfrando + name: selfrando + enable: '[% c("var/linux") && ! c("var/release") %]' - filename: fix-info-plist.py enable: '[% c("var/osx") %]' - URL: https://people.torproject.org/~gk/mirrors/sources/msvcr100.dll diff --git a/projects/selfrando/config b/projects/selfrando/config index 07195f7..82acc23 100644 --- a/projects/selfrando/config +++ b/projects/selfrando/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -version: 0.4.1 +version: 0.4.2 git_hash: 'tb-v[% c("version") %]' git_url: https://github.com/immunant/selfrando.git gpg_keyring: selfrando.gpg

1 0

[tor-browser-build/master] Merge remote-tracking branch 'sukhe/bug-26153'
by gk＠torproject.org 06 Jun '18

06 Jun '18

commit 4074cbc2a727daf51ff9fdab29e0a0da3ec078aa Merge: e76952c d161cb7 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jun 6 19:02:02 2018 +0000 Merge remote-tracking branch 'sukhe/bug-26153' projects/firefox/build | 14 +++++++------- projects/firefox/config | 6 +++--- projects/selfrando/config | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --cc projects/firefox/build index 8278c14,cbd9250..83a7691 --- a/projects/firefox/build +++ b/projects/firefox/build @@@ -40,15 -40,15 +40,15 @@@ EO export PATH="/var/tmp/dist/binutils/bin:$PATH" [% END -%] - #[% IF c("var/linux") && ! c("var/release") -%] - # tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/selfrando') %] - # # Selfrando wrapper - # export PATH="/var/tmp/dist/selfrando/Tools/TorBrowser/tc-wrapper/:$PATH" - # # We need to avoid the shuffling while building as this breaks compilation - # export SELFRANDO_skip_shuffle= - #[% END -%] + [% IF c("var/linux") && ! c("var/release") -%] + tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/selfrando') %] + # Selfrando wrapper + export PATH="/var/tmp/dist/selfrando/Tools/TorBrowser/tc-wrapper/:$PATH" + # We need to avoid the shuffling while building as this breaks compilation + export SELFRANDO_skip_shuffle= + [% END -%] -[% IF c("var/linux") %] +[% IF ! c("var/windows") %] mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf [% c('input_files_by_name/rust') %] export PATH="/var/tmp/dist/rust/bin:$PATH" diff --cc projects/firefox/config index 927fb0b,418daa3..97efc7b --- a/projects/firefox/config +++ b/projects/firefox/config @@@ -81,13 -81,11 +81,13 @@@ input_files - project: binutils name: binutils enable: '[% c("var/linux") %]' - # - project: selfrando - # name: selfrando - # enable: '[% c("var/linux") && ! c("var/release") %]' + - project: selfrando + name: selfrando + enable: '[% c("var/linux") && ! c("var/release") %]' - filename: fix-info-plist.py enable: '[% c("var/osx") %]' + - filename: no-dmg.patch + enable: '[% c("var/osx") %]' - URL: https://people.torproject.org/~gk/mirrors/sources/msvcr100.dll sha256sum: 8793353461826fbd48f25ea8b835be204b758ce7510db2af631b28850355bd18 enable: '[% c("var/windows-i686") %]'

1 0

[tor-browser-build/master] Bug 24632: Adapt firefox and tor-browser to new macOS toolchain
by gk＠torproject.org 06 Jun '18

06 Jun '18

commit e76952c389487d657c3f52fede5e9ca56ec02397 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jun 6 18:22:41 2018 +0000 Bug 24632: Adapt firefox and tor-browser to new macOS toolchain After building Firefox we now get a 'Tor Browser.app' instead of a 'TorBrowser.app'. This patch makes sure the additional whitespace in the app name is correctly handled by the build script and the one that deals with packaging the final bundle. We need to ship a fix for the Firefox packaging step as well as |./mach package| wants to build the final .dmg in that step, too, which breaks: there is no .dmg creation tool available. Setting `INNER_MAKE_PACKAGE` to `true` does not seem to work anymore. That part of this patch is currently only a workaround to get the nightly builds going. We should come up with a better solution that allows us to skip that part of the Firefox packaging step on all supported platforms. --- projects/firefox/build | 25 ++++++++++------ projects/firefox/config | 4 ++- projects/firefox/no-dmg.patch | 29 ++++++++++++++++++ projects/tor-browser/build | 70 +++++++++++++++++++++---------------------- 4 files changed, 83 insertions(+), 45 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index 62186d1..8278c14 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -48,10 +48,13 @@ EOF # export SELFRANDO_skip_shuffle= #[% END -%] -[% IF c("var/linux") %] +[% IF ! c("var/windows") %] mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf [% c('input_files_by_name/rust') %] export PATH="/var/tmp/dist/rust/bin:$PATH" +[% END -%] + +[% IF c("var/linux") %] # Add llvm so stylo can build tar -C /var/tmp/dist -xf [% c('input_files_by_name/llvm') %] export LLVM_CONFIG="/var/tmp/dist/llvm/bin/llvm-config" @@ -60,7 +63,7 @@ EOF tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz [% IF c("var/osx") %] - mkdir -p $distdir/TorBrowser.app/Contents/MacOS + mkdir -p "$distdir/Tor Browser.app/Contents/MacOS" [% ELSE %] mkdir -p $distdir/Browser [% END %] @@ -118,6 +121,10 @@ fi patch -p1 < $rootdir/STL_win64.patch [% END -%] +[% IF c("var/osx") %] + patch -p1 < $rootdir/no-dmg.patch +[% END -%] + rm -f configure rm -f js/src/configure @@ -128,12 +135,12 @@ rm -f js/src/configure [% IF c("var/osx") %] cp -a obj-macos/dist/firefox/* $distdir # Remove firefox-bin (we don't use it, see ticket #10126) - rm -f $distdir/TorBrowser.app/Contents/MacOS/firefox-bin + rm -f "$distdir/Tor Browser.app/Contents/MacOS/firefox-bin" # Adjust the Info.plist file - INFO_PLIST=$distdir/TorBrowser.app/Contents/Info.plist - mv $INFO_PLIST tmp.plist - python $rootdir/fix-info-plist.py '[% c("var/torbrowser_version") %]' '[% c("var/copyright_year") %]' < tmp.plist > $INFO_PLIST + INFO_PLIST="$distdir/Tor Browser.app/Contents/Info.plist" + mv "$INFO_PLIST" tmp.plist + python $rootdir/fix-info-plist.py '[% c("var/torbrowser_version") %]' '[% c("var/copyright_year") %]' < tmp.plist > "$INFO_PLIST" rm -f tmp.plist [% END %] @@ -198,8 +205,8 @@ cd $distdir [% c("var/rezip", { rezip_file => 'Browser/omni.ja' }) %] [% c("var/rezip", { rezip_file => 'Browser/browser/omni.ja' }) %] [% ELSIF c("var/osx") %] - [% c("var/rezip", { rezip_file => 'TorBrowser.app/Contents/Resources/omni.ja' }) %] - [% c("var/rezip", { rezip_file => 'TorBrowser.app/Contents/Resources/browser/omni.ja' }) %] + [% c("var/rezip", { rezip_file => '"Tor Browser.app/Contents/Resources/omni.ja"' }) %] + [% c("var/rezip", { rezip_file => '"Tor Browser.app/Contents/Resources/browser/omni.ja"' }) %] [% END %] [% IF c("var/windows") %] @@ -211,7 +218,7 @@ mkdir -p [% dest_dir _ '/' _ c('filename') %] [% IF c("var/osx"); - SET browserdir='TorBrowser.app/Contents'; + SET browserdir='"Tor Browser.app/Contents"'; ELSE; SET browserdir='Browser'; END; diff --git a/projects/firefox/config b/projects/firefox/config index d6b8313..927fb0b 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -86,6 +86,8 @@ input_files: # enable: '[% c("var/linux") && ! c("var/release") %]' - filename: fix-info-plist.py enable: '[% c("var/osx") %]' + - filename: no-dmg.patch + enable: '[% c("var/osx") %]' - URL: https://people.torproject.org/~gk/mirrors/sources/msvcr100.dll sha256sum: 8793353461826fbd48f25ea8b835be204b758ce7510db2af631b28850355bd18 enable: '[% c("var/windows-i686") %]' @@ -99,7 +101,7 @@ input_files: enable: '[% c("var/windows-x86_64") %]' - project: rust name: rust - enable: '[% c("var/linux") %]' + enable: '[% ! c("var/windows") %]' - project: llvm name: llvm enable: '[% c("var/linux") %]' diff --git a/projects/firefox/no-dmg.patch b/projects/firefox/no-dmg.patch new file mode 100644 index 0000000..1e722af --- /dev/null +++ b/projects/firefox/no-dmg.patch @@ -0,0 +1,29 @@ +From 7204fc9191a55dbbd3b94ee2d64ece8d9910cf23 Mon Sep 17 00:00:00 2001 +From: Georg Koppen <gk(a)torproject.org> +Date: Thu, 31 May 2018 19:15:18 +0000 +Subject: [PATCH] Don't create a .dmg yet + + +diff --git a/toolkit/mozapps/installer/upload-files.mk b/toolkit/mozapps/installer/upload-files.mk +index 8ace9703a160..82df89d1f431 100644 +--- a/toolkit/mozapps/installer/upload-files.mk ++++ b/toolkit/mozapps/installer/upload-files.mk +@@ -216,14 +216,7 @@ ifeq ($(MOZ_PKG_FORMAT),DMG) + + _ABS_MOZSRCDIR = $(shell cd $(MOZILLA_DIR) && pwd) + PKG_DMG_SOURCE = $(MOZ_PKG_DIR) +- INNER_MAKE_PACKAGE = \ +- $(call py_action,make_dmg, \ +- $(if $(MOZ_PKG_MAC_DSSTORE),--dsstore '$(MOZ_PKG_MAC_DSSTORE)') \ +- $(if $(MOZ_PKG_MAC_BACKGROUND),--background '$(MOZ_PKG_MAC_BACKGROUND)') \ +- $(if $(MOZ_PKG_MAC_ICON),--icon '$(MOZ_PKG_MAC_ICON)') \ +- --volume-name '$(MOZ_APP_DISPLAYNAME)' \ +- '$(PKG_DMG_SOURCE)' '$(PACKAGE)' \ +- ) ++ INNER_MAKE_PACKAGE = true + INNER_UNMAKE_PACKAGE = \ + $(call py_action,unpack_dmg, \ + $(if $(MOZ_PKG_MAC_DSSTORE),--dsstore '$(MOZ_PKG_MAC_DSSTORE)') \ +-- +2.17.0 + diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 4d1be00..d807633 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -14,7 +14,7 @@ mkdir -p $OUTDIR TB_STAGE_DIR=$distdir/tor-browser-stage [% IF c("var/osx") %] - TBDIR=$TB_STAGE_DIR/TorBrowser.app + TBDIR="$TB_STAGE_DIR/Tor Browser.app" DOCSPATH=Contents/Resources/TorBrowser/Docs EXTSPATH=Contents/Resources/distribution/extensions @@ -34,11 +34,11 @@ TB_STAGE_DIR=$distdir/tor-browser-stage EXTOVERRIDESPATH=TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js MEEKPROFILEPATH=TorBrowser/Data/Browser/profile.meek-http-helper - mkdir -p $TBDIR/TorBrowser/Data/Browser/Caches + mkdir -p "$TBDIR/TorBrowser/Data/Browser/Caches" [% END %] -mkdir -p $TBDIR/$EXTSPATH -mkdir -p $TBDIR/$MEEKPROFILEPATH/extensions +mkdir -p "$TBDIR/$EXTSPATH" +mkdir -p "$TBDIR/$MEEKPROFILEPATH/extensions" # Extract the MAR tools. unzip -d $rootdir $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip @@ -49,23 +49,23 @@ MARTOOLS=$rootdir/mar-tools unzip -d $rootdir $rootdir/mar-tools-linux32.zip [% END -%] -mv [% c('input_files_by_name/tor-launcher') %] $TBDIR/$EXTSPATH/tor-launcher(a)torproject.org.xpi -mv [% c('input_files_by_name/torbutton') %] $TBDIR/$EXTSPATH/torbutton(a)torproject.org.xpi -mv [% c('input_files_by_name/https-everywhere') %] $TBDIR/$EXTSPATH/https-everywhere-eff(a)eff.org.xpi -mv [% c('input_files_by_name/noscript') %] $TBDIR/$EXTSPATH/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi +mv [% c('input_files_by_name/tor-launcher') %] "$TBDIR/$EXTSPATH/tor-launcher(a)torproject.org.xpi" +mv [% c('input_files_by_name/torbutton') %] "$TBDIR/$EXTSPATH/torbutton(a)torproject.org.xpi" +mv [% c('input_files_by_name/https-everywhere') %] "$TBDIR/$EXTSPATH/https-everywhere-eff(a)eff.org.xpi" +mv [% c('input_files_by_name/noscript') %] "$TBDIR/$EXTSPATH/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi" -tar -C $TBDIR -xf [% c('input_files_by_name/obfs4') %] -tar -C $TBDIR -xf [% c('input_files_by_name/meek') %] -mv $TBDIR/meek-http-helper(a)bamsoftware.com.xpi $TBDIR/$MEEKPROFILEPATH/extensions/ +tar -C "$TBDIR" -xf [% c('input_files_by_name/obfs4') %] +tar -C "$TBDIR" -xf [% c('input_files_by_name/meek') %] +mv "$TBDIR/meek-http-helper(a)bamsoftware.com.xpi" "$TBDIR/$MEEKPROFILEPATH/extensions/" [% IF c("var/snowflake") %] - tar -C $TBDIR -xf [% c('input_files_by_name/snowflake') -%] + tar -C "$TBDIR" -xf [% c('input_files_by_name/snowflake') -%] [% END -%] [% IF c("var/fteproxy") -%] - tar -C $TBDIR -xf [% c('input_files_by_name/fteproxy') %] + tar -C "$TBDIR" -xf [% c('input_files_by_name/fteproxy') %] [% END -%] -tar -C $TBDIR[% IF c("var/osx") %]/Contents/Resources[% END %] -xf [% c('input_files_by_name/fonts') %] +tar -C "$TBDIR[% IF c("var/osx") %]/Contents/Resources[% END %]" -xf [% c('input_files_by_name/fonts') %] [% IF c("var/linux") %] cp RelativeLink/* ${TB_STAGE_DIR}/Browser/ @@ -77,7 +77,7 @@ RBM_TB_EOF [% END %] tar -C ${TB_STAGE_DIR} -xf [% c('input_files_by_name/firefox') %]/tor-browser.tar.gz -tar -C $TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %] -xf [% c('input_files_by_name/tor') %]/tor.tar.gz +tar -C "$TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %]" -xf [% c('input_files_by_name/tor') %]/tor.tar.gz [% IF c("var/linux"); SET bundledata_osname = 'linux'; @@ -107,8 +107,8 @@ tar -C $TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %] -xf [% c('input_files_b mv $SKELETON_TMP Bundle-Data/mac # Install a "tor" shim that sets the working directory. See #10030. - mv $TBDIR/$TORBINPATH/tor $TBDIR/$TORBINPATH/tor.real - cp Bundle-Data/mac-tor.sh $TBDIR/$TORCONFIGPATH/tor + mv "$TBDIR/$TORBINPATH/tor" "$TBDIR/$TORBINPATH/tor.real" + cp Bundle-Data/mac-tor.sh "$TBDIR/$TORCONFIGPATH/tor" [% IF ! c("var/release") -%] SANDBOX_FOLDER="$TB_STAGE_DIR/Sandboxed Tor Browser" @@ -118,17 +118,17 @@ tar -C $TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %] -xf [% c('input_files_b tar -C Bundle-Data/mac-applications.dmg -c . | tar -C $TB_STAGE_DIR -x [% END %] -mkdir -p $TBDIR/$DOCSPATH -cp -a Bundle-Data/Docs/* $TBDIR/$DOCSPATH -tar -C Bundle-Data/[% bundledata_osname %] -c . | tar -C $TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %] -x +mkdir -p "$TBDIR/$DOCSPATH" +cp -a Bundle-Data/Docs/* "$TBDIR/$DOCSPATH" +tar -C Bundle-Data/[% bundledata_osname %] -c . | tar -C "$TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %]" -x -cat Bundle-Data/PTConfigs/[% bundledata_osname %]/torrc-defaults-appendix >> $TBDIR/$TORCONFIGPATH/torrc-defaults +cat Bundle-Data/PTConfigs/[% bundledata_osname %]/torrc-defaults-appendix >> "$TBDIR/$TORCONFIGPATH/torrc-defaults" [% IF c("var/linux") -%] [% IF ! c("var/snowflake") %] grep -v 'default_bridge\.snowflake' Bundle-Data/PTConfigs/bridge_prefs.js \ - >> $TBDIR/$EXTOVERRIDESPATH + >> "$TBDIR/$EXTOVERRIDESPATH" [% ELSE %] - cat Bundle-Data/PTConfigs/bridge_prefs.js >> $TBDIR/$EXTOVERRIDESPATH + cat Bundle-Data/PTConfigs/bridge_prefs.js >> "$TBDIR/$EXTOVERRIDESPATH" [% END %] [% END -%] [% IF c("var/windows") -%] @@ -136,18 +136,18 @@ cat Bundle-Data/PTConfigs/[% bundledata_osname %]/torrc-defaults-appendix >> $TB # We don't have fte available on Windows x86_64 yet grep -v 'default_bridge\.snowflake' Bundle-Data/PTConfigs/bridge_prefs.js \ [% IF c("var/windows-x86_64") %]| grep -v 'default_bridge\.fte' [% END %] \ - >> $TBDIR/$EXTOVERRIDESPATH + >> "$TBDIR/$EXTOVERRIDESPATH" [% END -%] [% IF c("var/osx") -%] # FTE is temporarily removed due to bug 18495. grep -Ev 'default_bridge\.fte' Bundle-Data/PTConfigs/bridge_prefs.js \ [% IF ! c("var/snowflake") %]| grep -v 'default_bridge\.snowflake' [% END %] \ - >> $TBDIR/$EXTOVERRIDESPATH + >> "$TBDIR/$EXTOVERRIDESPATH" [% END -%] -cat Bundle-Data/PTConfigs/meek-http-helper-user.js >> $TBDIR/$MEEKPROFILEPATH/user.js +cat Bundle-Data/PTConfigs/meek-http-helper-user.js >> "$TBDIR/$MEEKPROFILEPATH/user.js" [% IF c("var/osx") %] - pushd $TBDIR + pushd "$TBDIR" # Create the meek-template-sha256sum.txt file by generating a list # of hashes (one for each file within the meek-http-helper profile) and # and then generating one final hash from the contents of the list. @@ -156,8 +156,8 @@ cat Bundle-Data/PTConfigs/meek-http-helper-user.js >> $TBDIR/$MEEKPROFILEPATH/us [% END %] [% IF ! c("var/multi_lingual") %] - echo 'pref("extensions.torlauncher.prompt_for_locale", false);' >> $TBDIR/$EXTOVERRIDESPATH - echo 'pref("intl.locale.matchOS", false);' >> $TBDIR/$EXTOVERRIDESPATH + echo 'pref("extensions.torlauncher.prompt_for_locale", false);' >> "$TBDIR/$EXTOVERRIDESPATH" + echo 'pref("intl.locale.matchOS", false);' >> "$TBDIR/$EXTOVERRIDESPATH" [% END %] [% IF c("var/linux") %] @@ -178,7 +178,7 @@ cat Bundle-Data/PTConfigs/meek-http-helper-user.js >> $TBDIR/$MEEKPROFILEPATH/us [% END %] -pushd $TBDIR[% IF c("var/osx") %]/Contents/Resources[% END %]/browser/ +pushd "$TBDIR[% IF c("var/osx") %]/Contents/Resources[% END %]/browser/" # For the proper search engines in our language packs unzip omni.ja chrome/en-US/locale/browser/searchplugins* || [ $? -lt 3 ] mv chrome/en-US/locale/browser/searchplugins $rootdir @@ -223,7 +223,7 @@ popd }) %] # If we are building a multi-lingual package, add all of the language packs. [% IF c("var/multi_lingual") %] - cp [% xpi %] $TBDIR/$EXTSPATH/langpack-[% lang %](a)firefox.mozilla.org.xpi + cp [% xpi %] "$TBDIR/$EXTSPATH/langpack-[% lang %](a)firefox.mozilla.org.xpi" [% END %] cd .. rm -rf prep_[% lang %] @@ -232,7 +232,7 @@ popd [% IF c("var/multi_lingual") %] # Set the update.locale (it is used to replace %LOCALE% within # app.update.url). - pushd $TBDIR[% IF c("var/osx") %]/Contents/Resources/[% END %] + pushd "$TBDIR[% IF c("var/osx") %]/Contents/Resources/[% END %]" echo ${PKG_LOCALE} > update.locale [% c("var/touch") %] update.locale zip -Xm omni.ja update.locale @@ -253,11 +253,11 @@ popd cp -a ${TB_STAGE_DIR} $distdir/$PKG_DIR [% IF c("var/windows") %] - TBDIR=$distdir/$PKG_DIR/"Tor Browser"/Browser + TBDIR="$distdir/$PKG_DIR/Tor Browser/Browser" [% ELSIF c("var/osx") %] - TBDIR=$distdir/$PKG_DIR/TorBrowser.app + TBDIR="$distdir/$PKG_DIR/Tor Browser.app" [% ELSE %] - TBDIR=$distdir/$PKG_DIR/Browser + TBDIR="$distdir/$PKG_DIR/Browser" [% END %] pushd "$TBDIR[% IF c("var/osx") %]/Contents/Resources/[% END %]"

1 0

[tor-browser-build/master] Bug 24632: Disable snowflake for macOS for now
by boklm＠torproject.org 06 Jun '18

06 Jun '18

commit 3db16b9c473ec950452126700fc1e22f71ed8190 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jun 4 06:15:20 2018 +0000 Bug 24632: Disable snowflake for macOS for now The snowflake build system is pretty complicated. We disable this pluggable transport for now to get time to adapt it to the new macOS toolchain while not blocking our nightly builds. See bug 26251 for work on that. --- rbm.conf | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/rbm.conf b/rbm.conf index 9a30353..28ce6f9 100644 --- a/rbm.conf +++ b/rbm.conf @@ -162,8 +162,7 @@ targets: var: linux: 1 compiler: gcc - # We only build snowflake for linux and osx on the alpha and nightly - # channels for now. + # We only build snowflake for linux on the alpha and nightly channels for now. snowflake: '[% c("var/alpha") || c("var/nightly") %]' fteproxy: 1 container: @@ -244,9 +243,8 @@ targets: FLAGS: "-target x86_64-apple-darwin11 -B $cctoolsdir -isysroot $sysrootdir" LDFLAGS: "-Wl,-syslibroot,$sysrootdir -Wl,-dead_strip -Wl,-pie" locale_ja: ja-JP-mac - # We only build snowflake for linux and osx on the alpha and nightly - # channels for now. - snowflake: '[% c("var/alpha") || c("var/nightly") %]' + # We only build snowflake for linux on the alpha and nightly channels for now. + snowflake: 0 #'[% c("var/alpha") || c("var/nightly") %]' deps: - build-essential - python

1 0

[tor-browser-build/master] Bug 24632: Adapt tor and OpenSSL for new macOS toolchain
by boklm＠torproject.org 06 Jun '18

06 Jun '18

commit 3b5038d90cac5cfcf6856cc0786cfa99adbc775a Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jun 4 06:03:09 2018 +0000 Bug 24632: Adapt tor and OpenSSL for new macOS toolchain --- projects/openssl/build | 2 +- projects/openssl/config | 2 +- projects/tor/build | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/openssl/build b/projects/openssl/build index 3851346..a3ff092 100644 --- a/projects/openssl/build +++ b/projects/openssl/build @@ -10,7 +10,7 @@ export CC='gcc -m32' [% END %] [% IF c("var/osx") -%] # Tricking OpenSSL into using our clang as cross-compiler - ln -s $clangdir/bin/clang $clangdir/bin/x86_64-apple-darwin10-cc + ln -s $clangdir/bin/clang $clangdir/bin/x86_64-apple-darwin11-cc export CC="cc [% c("var/FLAGS") %]" [% END -%] ./Configure --prefix=$distdir [% c('var/configure_opts') %] diff --git a/projects/openssl/config b/projects/openssl/config index 3489d42..fe1c5fa 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -19,7 +19,7 @@ targets: configure_opts: '-shared --cross-compile-prefix=[% c("arch") %]-w64-mingw32- mingw[% IF c("var/windows-x86_64") %]64[% END %] "[% c("var/CFLAGS") %] [% c("var/LDFLAGS") %]"' osx-x86_64: var: - configure_opts: --cross-compile-prefix=x86_64-apple-darwin10- darwin64-x86_64-cc enable-ec_nistp_64_gcc_128 + configure_opts: --cross-compile-prefix=x86_64-apple-darwin11- darwin64-x86_64-cc enable-ec_nistp_64_gcc_128 input_files: - project: container-image diff --git a/projects/tor/build b/projects/tor/build index c6d9895..3f845ea 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -88,7 +88,7 @@ cp $distdir/share/tor/geoip6 $TORCONFIGDIR cd $distdir cp bin/tor $TORBINDIR/ cd $TORBINDIR/ - x86_64-apple-darwin10-install_name_tool -change $libeventdir/lib/$LIBEVENT_FILE @executable_path/$LIBEVENT_FILE tor + x86_64-apple-darwin11-install_name_tool -change $libeventdir/lib/$LIBEVENT_FILE @executable_path/$LIBEVENT_FILE tor [% END %] cd $distdir

1 0

[tor-browser-build/master] Bug 24632: Bump clang version in go build script comment
by boklm＠torproject.org 06 Jun '18

06 Jun '18

commit a0130c9a178ae919a400ad014d7f855a282c72b4 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jun 4 06:13:36 2018 +0000 Bug 24632: Bump clang version in go build script comment --- projects/go/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/go/build b/projects/go/build index 5ab4c0c..b9057a5 100644 --- a/projects/go/build +++ b/projects/go/build @@ -52,7 +52,7 @@ cd /var/tmp/dist/go/src # http://golang.org/doc/install/source#environment export GOOS=darwin export GOARCH=amd64 - # faketime is needed because clang 3.8.0 on Darwin embeds the timestamps of + # faketime is needed because clang 3.9.1 on Darwin embeds the timestamps of # certain intermediate object files (including those that arise here while # compiling the Go runtime itself). Without this, variable timestamps would # end up in snowflake-client.

1 0

[tor-browser-build/master] Bug 24632: Use our new toolchain for rustc compilation
by boklm＠torproject.org 06 Jun '18

06 Jun '18

commit 7997d2322347f742e7f4ede47379119faeb03bdd Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 1 06:54:29 2018 +0000 Bug 24632: Use our new toolchain for rustc compilation --- projects/rust/build | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/projects/rust/build b/projects/rust/build index 69bc3a7..74ce74a 100644 --- a/projects/rust/build +++ b/projects/rust/build @@ -17,21 +17,21 @@ export PATH="$distdir-rust-old/bin:$PATH" # (i.e. Linux). unset CC unset LDFLAGS - # Target 10.6 as our toolchain does. Without this explicit declaration Bad + # Target 10.7 as our toolchain does. Without this explicit declaration Bad # Things will happen, as a lot of dependent code then assumes that the # official macOS target, x86_64-apple-darwin, essentially means 10.4. - export MACOSX_DEPLOYMENT_TARGET=10.6 + export MACOSX_DEPLOYMENT_TARGET=10.7 # The Rust target for macOS is x86_64-apple-darwin, yet our toolchain is built - # for x86_64-apple-darwin10. We can't mix those targets as clang gets confused - # that way. Changing the Rust target to x86_64-apple-darwin10 would require a - # fair amount of patching, thus we create symlinks to prvoide Rust with the - # necessary tools while using our toolchain underneath, targeting 10.6. + # for x86_64-apple-darwin11. We can't mix those targets as clang gets confused + # that way. Changing the Rust target to x86_64-apple-darwin11 would require a + # fair amount of patching, thus we create symlinks to provide Rust with the + # necessary tools while using our toolchain underneath, targeting 10.7. cd $cctoolsdir - for f in `ls x86_64-apple-darwin10-*`; do - ln -s $f ${f//x86_64-apple-darwin10/x86_64-apple-darwin} + for f in `ls x86_64-apple-darwin11-*`; do + ln -s $f ${f//x86_64-apple-darwin11/x86_64-apple-darwin} done cd .. - ln -s x86_64-apple-darwin10 x86_64-apple-darwin + ln -s x86_64-apple-darwin11 x86_64-apple-darwin mkdir -p $distdir/helper # We need to adapt our CFLAGS and make sure our flags are passed down to all @@ -40,7 +40,7 @@ export PATH="$distdir-rust-old/bin:$PATH" cat > $distdir/helper/x86_64-apple-darwin-clang << 'EOF' #!/bin/sh BASEDIR=/var/tmp/dist/macosx-toolchain -$BASEDIR/cctools/bin/x86_64-apple-darwin-clang -target x86_64-apple-darwin -mlinker-version=136 -B $BASEDIR/cctools/bin -isysroot $BASEDIR/SDK/ -Wl,-syslibroot,$BASEDIR/SDK/ -Wl,-dead_strip -Wl,-pie "$@" +$BASEDIR/cctools/bin/x86_64-apple-darwin-clang -target x86_64-apple-darwin -B $BASEDIR/cctools/bin -isysroot $BASEDIR/SDK/ -Wl,-syslibroot,$BASEDIR/SDK/ -Wl,-dead_strip -Wl,-pie "$@" EOF chmod +x $distdir/helper/x86_64-apple-darwin-clang

1 0

[tor-browser-build/master] Bug 26003: Clean up our mozconfig-osx-x86_64 file
by boklm＠torproject.org 04 Jun '18

04 Jun '18

commit 92aa4276c02c1619a9cf70d317c46092ef3ba7c0 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 1 20:18:12 2018 +0000 Bug 26003: Clean up our mozconfig-osx-x86_64 file --- projects/firefox/mozconfig-osx-x86_64 | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/projects/firefox/mozconfig-osx-x86_64 b/projects/firefox/mozconfig-osx-x86_64 index 9ac3ac8..1e30084 100644 --- a/projects/firefox/mozconfig-osx-x86_64 +++ b/projects/firefox/mozconfig-osx-x86_64 @@ -1,24 +1,21 @@ +TOOLCHAIN_DIR=/var/tmp/dist/macosx-toolchain + # ld needs libLTO.so from llvm -mk_add_options "export LD_LIBRARY_PATH=/var/tmp/dist/macosx-toolchain/clang/lib" +mk_add_options "export LD_LIBRARY_PATH=$TOOLCHAIN_DIR/clang/lib" -TOOLCHAIN_DIR=/var/tmp/dist/macosx-toolchain CROSS_CCTOOLS_PATH=$TOOLCHAIN_DIR/cctools CROSS_SYSROOT=$TOOLCHAIN_DIR/SDK CROSS_PRIVATE_FRAMEWORKS=$CROSS_SYSROOT/System/Library/PrivateFrameworks HARDENING_FLAGS="-Werror=format -Werror=format-security -fstack-protector-strong -D_FORTIFY_SOURCE=2" -FLAGS="-target x86_64-apple-darwin10 -mlinker-version=136 -B $CROSS_CCTOOLS_PATH/bin -isysroot $CROSS_SYSROOT $HARDENING_FLAGS" +FLAGS="-target x86_64-apple-darwin11 -B $CROSS_CCTOOLS_PATH/bin -isysroot $CROSS_SYSROOT $HARDENING_FLAGS" export CC="$TOOLCHAIN_DIR/clang/bin/clang $FLAGS" export CXX="$TOOLCHAIN_DIR/clang/bin/clang++ $FLAGS" export CPP="$TOOLCHAIN_DIR/clang/bin/clang $FLAGS -E" export LLVMCONFIG=$TOOLCHAIN_DIR/clang/bin/llvm-config export LDFLAGS="-Wl,-syslibroot,$CROSS_SYSROOT -Wl,-dead_strip -Wl,-pie" -export TOOLCHAIN_PREFIX=$CROSS_CCTOOLS_PATH/bin/x86_64-apple-darwin10- -#TODO: bug 1184202 - would be nice if these could be detected with TOOLCHAIN_PREFIX automatically -export AR=${TOOLCHAIN_PREFIX}ar -export RANLIB=${TOOLCHAIN_PREFIX}ranlib -export STRIP=${TOOLCHAIN_PREFIX}strip -export OTOOL=${TOOLCHAIN_PREFIX}otool +export BINDGEN_CFLAGS="$FLAGS" +export TOOLCHAIN_PREFIX=$CROSS_CCTOOLS_PATH/bin/x86_64-apple-darwin11- export DSYMUTIL="$TOOLCHAIN_DIR/clang/bin/llvm-dsymutil" export HOST_CC="$TOOLCHAIN_DIR/clang/bin/clang"

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gk/bug_26003'
by boklm＠torproject.org 04 Jun '18

04 Jun '18

commit f3e479d86a4ef945279b6a2df4e997ad8a935b0a Merge: 5cf384c 92aa427 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jun 4 14:21:09 2018 +0200 Merge remote-tracking branch 'gk/bug_26003' projects/firefox/mozconfig-osx-x86_64 | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)

1 0

[tor-browser-build/master] Bug 26195: Use new cctools for macOS toolchain
by boklm＠torproject.org 04 Jun '18

04 Jun '18

commit 5cf384c54a0dfd3edd44373bb9370e549fcf64f8 Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 31 16:10:53 2018 +0000 Bug 26195: Use new cctools for macOS toolchain --- projects/macosx-toolchain/build | 9 +++++---- projects/macosx-toolchain/config | 5 ++--- rbm.conf | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/projects/macosx-toolchain/build b/projects/macosx-toolchain/build index 94954c5..d1d8c34 100644 --- a/projects/macosx-toolchain/build +++ b/projects/macosx-toolchain/build @@ -8,10 +8,11 @@ tar xf [% c('input_files_by_name/llvm') %] mv llvm "$distdir/clang" tar -C $distdir -xf [% c('input_files_by_name/cctools') %] cd $distdir/cctools/bin -ln -s ../../clang/bin/clang x86_64-apple-darwin10-clang -ln -s ../../clang/bin/clang++ x86_64-apple-darwin10-clang++ -# "go link" expects to find a program called "dsymutil" exactly. -ln -sf x86_64-apple-darwin10-dsymutil dsymutil +ln -s ../../clang/bin/clang x86_64-apple-darwin11-clang +ln -s ../../clang/bin/clang++ x86_64-apple-darwin11-clang++ +# "go link", libevent, and the jemalloc cross-compilation during the Rust build +# expect to find a program called "dsymutil" exactly. +ln -s ../../clang/bin/llvm-dsymutil dsymutil cd "/var/tmp/dist" [% c('tar', { diff --git a/projects/macosx-toolchain/config b/projects/macosx-toolchain/config index ff31abf..8502f57 100644 --- a/projects/macosx-toolchain/config +++ b/projects/macosx-toolchain/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -version: 10.7-1 +version: 10.11-1 var: container: use_container: 1 @@ -20,8 +20,7 @@ input_files: - name: llvm project: llvm - name: cctools - URL: https://people.torproject.org/~gk/mirrors/sources/cctools.tar.gz - sha256sum: e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 + project: cctools - name: SDK URL: https://people.torproject.org/~gk/mirrors/sources/MacOSX10.11.sdk.tar.bz2 sha256sum: d11e410d757d023be66d2fe7eaa85a1d232da3ac04f177eff3d8b8275cd9ffca diff --git a/rbm.conf b/rbm.conf index 19bee8e..9a30353 100644 --- a/rbm.conf +++ b/rbm.conf @@ -240,8 +240,8 @@ targets: suite: jessie arch: amd64 compiler: 'macosx-toolchain' - configure_opt: '--host=x86_64-apple-darwin10 CC="x86_64-apple-darwin10-clang [% c("var/FLAGS") %]" CXX="x86_64-apple-darwin10-clang++ [% c("var/FLAGS") %]"' - FLAGS: "-target x86_64-apple-darwin10 -mlinker-version=136 -B $cctoolsdir -isysroot $sysrootdir" + configure_opt: '--host=x86_64-apple-darwin11 CC="x86_64-apple-darwin11-clang [% c("var/FLAGS") %]" CXX="x86_64-apple-darwin11-clang++ [% c("var/FLAGS") %]"' + FLAGS: "-target x86_64-apple-darwin11 -B $cctoolsdir -isysroot $sysrootdir" LDFLAGS: "-Wl,-syslibroot,$sysrootdir -Wl,-dead_strip -Wl,-pie" locale_ja: ja-JP-mac # We only build snowflake for linux and osx on the alpha and nightly

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gk/bug_25548_v2'
by boklm＠torproject.org 04 Jun '18

04 Jun '18

commit 90aa993289db466f928244443d2acdf6c8a2652d Merge: ddc77b4 a593f15 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jun 4 13:58:10 2018 +0200 Merge remote-tracking branch 'gk/bug_25548_v2' projects/macosx-toolchain/build | 4 ++-- projects/macosx-toolchain/config | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)

1 0

[tor-browser-build/master] Bug 25548: Use macOS SDK 10.11 for our toolchain
by boklm＠torproject.org 04 Jun '18

04 Jun '18

commit a593f155b82759be202f69f6ba21c793926c7b31 Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 24 20:34:50 2018 +0000 Bug 25548: Use macOS SDK 10.11 for our toolchain --- projects/macosx-toolchain/build | 4 ++-- projects/macosx-toolchain/config | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/macosx-toolchain/build b/projects/macosx-toolchain/build index f974cfc..94954c5 100644 --- a/projects/macosx-toolchain/build +++ b/projects/macosx-toolchain/build @@ -2,8 +2,8 @@ [% c("var/set_default_env") -%] distdir="/var/tmp/dist/[% project %]" mkdir -p "$distdir" -tar xzf [% c('input_files_by_name/SDK') %] -mv MacOSX10.7.sdk "$distdir/SDK" +tar xjf [% c('input_files_by_name/SDK') %] +mv MacOSX10.11.sdk "$distdir/SDK" tar xf [% c('input_files_by_name/llvm') %] mv llvm "$distdir/clang" tar -C $distdir -xf [% c('input_files_by_name/cctools') %] diff --git a/projects/macosx-toolchain/config b/projects/macosx-toolchain/config index bfdbdb6..ff31abf 100644 --- a/projects/macosx-toolchain/config +++ b/projects/macosx-toolchain/config @@ -23,5 +23,5 @@ input_files: URL: https://people.torproject.org/~gk/mirrors/sources/cctools.tar.gz sha256sum: e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 - name: SDK - URL: https://people.torproject.org/~mikeperry/mirrors/sources/MacOSX10.7.sdk.tar… - sha256sum: da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf + URL: https://people.torproject.org/~gk/mirrors/sources/MacOSX10.11.sdk.tar.bz2 + sha256sum: d11e410d757d023be66d2fe7eaa85a1d232da3ac04f177eff3d8b8275cd9ffca

1 0

[tor-browser-build/master] Bug 25554: Bump mingw-w64 version for Firefox 60 ESR
by boklm＠torproject.org 04 Jun '18

04 Jun '18

commit 4c1f78c312aa10ff54e5b07de4ef3278ab2ed01e Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jun 4 11:11:56 2018 +0000 Bug 25554: Bump mingw-w64 version for Firefox 60 ESR --- projects/mingw-w64/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config index fb9ef21..b9185f3 100644 --- a/projects/mingw-w64/config +++ b/projects/mingw-w64/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: https://git.code.sf.net/p/mingw-w64/mingw-w64 -git_hash: 1259532ff8f5a7ac625b2f28d499ee93a0c0841e +git_hash: ee9fc3d0b8c8868280e38384edd968067b8e71fc version: '[% c("abbrev") %]' var: container:

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gk/bug_25554_v2'
by boklm＠torproject.org 04 Jun '18

04 Jun '18

commit ddc77b4d679b3027924b89350dce9b672967e625 Merge: ba7b30a 4c1f78c Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jun 4 13:44:20 2018 +0200 Merge remote-tracking branch 'gk/bug_25554_v2' projects/mingw-w64/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor-browser-build/master] Bug 25860: Clean up OpenSSL's configure options for Windows
by gk＠torproject.org 04 Jun '18

04 Jun '18

commit ba7b30a920172233392fd9dc176631c3da25d5f0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri May 25 18:53:40 2018 +0200 Bug 25860: Clean up OpenSSL's configure options for Windows Avoid duplicating Windows CFLAGS and LDFLAGS. Instead, use the flags defined in rbm.conf. This also means we are now using -fstack-protector-strong instead of -fstack-protector-all for building openssl. We update the CFLAGS/LDFLAGS defined in rbm.conf to move var/flag_mwindows at the end, because openssl's Configure script does not like having an argument starting with a space. --- projects/openssl/config | 3 ++- rbm.conf | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/projects/openssl/config b/projects/openssl/config index 9c191fa..3489d42 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -15,7 +15,8 @@ targets: configure_opts: -shared linux-generic32 windows: var: - configure_opts: '-shared --cross-compile-prefix=[% c("arch") %]-w64-mingw32- mingw[% IF c("var/windows-x86_64") %]64[% END %] "-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$gcclibs"' + flag_mwindows: '' + configure_opts: '-shared --cross-compile-prefix=[% c("arch") %]-w64-mingw32- mingw[% IF c("var/windows-x86_64") %]64[% END %] "[% c("var/CFLAGS") %] [% c("var/LDFLAGS") %]"' osx-x86_64: var: configure_opts: --cross-compile-prefix=x86_64-apple-darwin10- darwin64-x86_64-cc enable-ec_nistp_64_gcc_128 diff --git a/rbm.conf b/rbm.conf index 0d6de69..19bee8e 100644 --- a/rbm.conf +++ b/rbm.conf @@ -216,8 +216,8 @@ targets: container: suite: jessie configure_opt: '--host=[% c("arch") %]-w64-mingw32 CFLAGS="[% c("var/CFLAGS") %]" LDFLAGS="[% c("var/LDFLAGS") %]"' - CFLAGS: '[% c("var/flag_mwindows") %] -fstack-protector-strong -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security' - LDFLAGS: '[% c("var/flag_mwindows") %] -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$gcclibs' + CFLAGS: '-fstack-protector-strong -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security [% c("var/flag_mwindows") %]' + LDFLAGS: '-Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$gcclibs [% c("var/flag_mwindows") %]' flag_mwindows: '-mwindows' compiler: mingw-w64 deps:

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_25859_v4'
by gk＠torproject.org 04 Jun '18

04 Jun '18

commit fb97d6c9141d3a824954b2e2952974daeada26d7 Merge: 4d5e3d2 0e483da Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jun 4 10:50:51 2018 +0000 Merge remote-tracking branch 'boklm/bug_25859_v4' projects/zlib/build | 6 ++---- projects/zlib/config | 1 + 2 files changed, 3 insertions(+), 4 deletions(-)

1 0

[tor-browser-build/master] Bug 25859: Clean up zlib's build script
by gk＠torproject.org 04 Jun '18

04 Jun '18

commit 0e483da11bd8de64b3b881ef3484ae77f69759ed Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri May 25 19:48:38 2018 +0200 Bug 25859: Clean up zlib's build script CFLAGS and LDFLAGS were unused. We are now defining them in LOC, using the definition of CFLAGS and LDFLAGS from rbm.conf. We also don't hardcode anymore -j4. --- projects/zlib/build | 6 ++---- projects/zlib/config | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/projects/zlib/build b/projects/zlib/build index ef26882..fe1377f 100644 --- a/projects/zlib/build +++ b/projects/zlib/build @@ -5,10 +5,8 @@ distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] -export CFLAGS="[% c("var/CFLAGS") %]" -export LDFLAGS="[% c("var/LDFLAGS") %]" -make BINARY_PATH=$distdir/lib INCLUDE_PATH=$distdir/include LIBRARY_PATH=$distdir/lib -f win32/Makefile.gcc PREFIX=[% c("arch") %]-w64-mingw32- -j4 SHARED_MODE=1 LOC="-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$gcclibs" -make BINARY_PATH=$distdir/lib INCLUDE_PATH=$distdir/include LIBRARY_PATH=$distdir/lib -f win32/Makefile.gcc PREFIX=[% c("arch") %]-w64-mingw32- -j4 SHARED_MODE=1 LOC="-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$gcclibs" install +make BINARY_PATH=$distdir/lib INCLUDE_PATH=$distdir/include LIBRARY_PATH=$distdir/lib -f win32/Makefile.gcc PREFIX=[% c("arch") %]-w64-mingw32- -j[% c("buildconf/num_procs") %] SHARED_MODE=1 LOC="[% c("var/CFLAGS") %] [% c("var/LDFLAGS") %]" +make BINARY_PATH=$distdir/lib INCLUDE_PATH=$distdir/include LIBRARY_PATH=$distdir/lib -f win32/Makefile.gcc PREFIX=[% c("arch") %]-w64-mingw32- -j[% c("buildconf/num_procs") %] SHARED_MODE=1 LOC="[% c("var/CFLAGS") %] [% c("var/LDFLAGS") %]" install cd /var/tmp/dist [% c('tar', { diff --git a/projects/zlib/config b/projects/zlib/config index 3ad562c..4ac96c9 100644 --- a/projects/zlib/config +++ b/projects/zlib/config @@ -7,6 +7,7 @@ gpg_keyring: zlib.gpg tag_gpg_id: 1 var: + flag_mwindows: '' container: use_container: 1

1 0

[tor-browser-build/master] Bug 25894: Get a Rust cross-compiler for Windows
by boklm＠torproject.org 04 Jun '18

04 Jun '18

commit 4d5e3d2ba5422b931a2e32a9498feabec6ecc23e Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 30 21:58:41 2018 +0000 Bug 25894: Get a Rust cross-compiler for Windows --- projects/rust/build | 14 +++++++++++--- projects/rust/config | 9 +++++++++ projects/rust/panic-abort.patch | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 3 deletions(-) diff --git a/projects/rust/build b/projects/rust/build index 4c81ad8..69bc3a7 100644 --- a/projects/rust/build +++ b/projects/rust/build @@ -10,9 +10,7 @@ cd /var/tmp/dist/rust-[% c('var/prev_version') %]-[% c('arch') %]-unknown-linux- ./install.sh --prefix=$distdir-rust-old export PATH="$distdir-rust-old/bin:$PATH" -[% IF ! c("var/windows") %] - [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] -[% END -%] +[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] [% IF c("var/osx") %] # We need to clear `CC` and `LDFLAGS` as they are used for the host platform @@ -61,6 +59,16 @@ cd /var/tmp/build/rustc-[% c('version') %]-src patch -p1 < $rootdir/binaryen.patch [% END %] +[% IF c("var/windows-i686") %] + # Cross-compiling for Windows 32bit is currently not possible without any + # patches. The reason for that is libstd expecting DWARF unwinding while most + # toolchains on Linux, targeting Windows 32bit, use SjLj unwinding. + # See: https://github.com/rust-lang/rust/issues/12859 for discussion about + # that and https://github.com/rust-lang/rust/pull/49633 for a newer attempt to + # fix this problem. + patch -p1 < $rootdir/panic-abort.patch +[% END %] + mkdir build cd build ../configure --prefix=$distdir [% c("var/configure_opt") %] diff --git a/projects/rust/config b/projects/rust/config index ae2290b..9d3030d 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -48,6 +48,13 @@ targets: - pkg-config configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=x86_64-apple-darwin --set=target.x86_64-apple-darwin.cc=x86_64-apple-darwin-clang + windows: + var: + arch_deps: + - libssl-dev + - pkg-config + configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=[% c("arch") %]-pc-windows-gnu + input_files: - project: container-image - project: cmake @@ -66,3 +73,5 @@ input_files: gpg_keyring: rust.gpg - filename: binaryen.patch enable: '[% c("var/linux") %]' + - filename: panic-abort.patch + enable: '[% c("var/windows-i686") %]' diff --git a/projects/rust/panic-abort.patch b/projects/rust/panic-abort.patch new file mode 100644 index 0000000..1711ff7 --- /dev/null +++ b/projects/rust/panic-abort.patch @@ -0,0 +1,36 @@ +From 2fe471643721f3967f1bdf28907b0a7247fdb705 Mon Sep 17 00:00:00 2001 +From: Georg Koppen <gk(a)torproject.org> +Date: Thu, 26 Apr 2018 13:18:27 +0000 +Subject: [PATCH] Avoid cross-compilation breakage due to unwinding + incompatibilities + + +diff --git a/src/bootstrap/bin/rustc.rs b/src/bootstrap/bin/rustc.rs +index 55d104b182..85330f973b 100644 +--- a/src/bootstrap/bin/rustc.rs ++++ b/src/bootstrap/bin/rustc.rs +@@ -143,7 +143,8 @@ fn main() { + // workaround undefined references to `rust_eh_unwind_resume` generated + // otherwise, see issue https://github.com/rust-lang/rust/issues/43095. + if crate_name == "panic_abort" || +- crate_name == "compiler_builtins" && stage != "0" { ++ crate_name == "compiler_builtins" && stage != "0" || ++ target == "i686-pc-windows-gnu" { + cmd.arg("-C").arg("panic=abort"); + } + +diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs +index 9ea5f39b71..bb689120af 100644 +--- a/src/libtest/lib.rs ++++ b/src/libtest/lib.rs +@@ -45,7 +45,6 @@ extern crate getopts; + extern crate term; + #[cfg(any(unix, target_os = "cloudabi"))] + extern crate libc; +-extern crate panic_unwind; + + pub use self::TestFn::*; + pub use self::ColorConfig::*; +-- +2.17.0 +

1 0

[tor-browser-build/master] Bug 25832: Enable pthread support for mingw-w64
by boklm＠torproject.org 04 Jun '18

04 Jun '18

commit 9af1ea49a225b3a8582be29172cc3f25ef5c215b Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 18 08:20:33 2018 +0000 Bug 25832: Enable pthread support for mingw-w64 Since bug 1406542 landed on Mozilla central pthread support is required for mingw-w64. This patch adds it and removes a wrong sed command related to our msvcrt->msvcr100 replacement. --- projects/mingw-w64/build | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/projects/mingw-w64/build b/projects/mingw-w64/build index b0ce69d..502ea94 100644 --- a/projects/mingw-w64/build +++ b/projects/mingw-w64/build @@ -22,15 +22,14 @@ cd /var/tmp/build mkdir gcc cd gcc tar xJf $rootdir/gcc-[% c("var/gcc_version") %].tar.xz -# We don't want to link against msvcrt.dll due to bug 9084. +# We don't want to link against msvcrt.dll due to bug 9084 and want to use +# pthreads, too, as this is needed for ESR60, at least due to bug 1406542. [% c("arch") %]-w64-mingw32-g++ -dumpspecs > $distdir/msvcr100.spec -sed 's/msvcrt/msvcr100/' -i $distdir/msvcr100.spec -# Linking libgcc against msvcrt is hard-coded... -sed 's/msvcrt/msvcr100/' -i gcc-[% c("var/gcc_version") %]/gcc/config/i386/t-mingw-w32 +sed 's/msvcrt/msvcr100 -lpthread/' -i $distdir/msvcr100.spec # LDFLAGS_FOR_TARGET does not work for some reason. Thus, we take # CFLAGS_FOR_TARGET. export CFLAGS_FOR_TARGET="-specs=$distdir/msvcr100.spec -Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-insert-timestamp" -gcc-[% c("var/gcc_version") %]/configure --prefix=$distdir --target=[% c("arch") %]-w64-mingw32 --disable-multilib --enable-languages=c,c++ +gcc-[% c("var/gcc_version") %]/configure --prefix=$distdir --target=[% c("arch") %]-w64-mingw32 --with-gnu-ld --with-gnu-as --disable-multilib --enable-threads=posix --enable-languages=c,c++ make -j[% c("buildconf/num_procs") %] all-gcc make install-gcc @@ -41,6 +40,13 @@ cd /var/tmp/build/builddir/mingw-w64/mingw-w64-crt32 make -j[% c("buildconf/num_procs") %] make install +mkdir -p /var/tmp/build/builddir/mingw-w64/mingw-w64-pthread +cd /var/tmp/build/builddir/mingw-w64/mingw-w64-pthread +/var/tmp/build/[% project %]-[% c("version") %]/mingw-w64-libraries/winpthreads/configure \ + --host=[% c("arch") %]-w64-mingw32 --prefix=$distdir/[% c("arch") %]-w64-mingw32 +make -j[% c("buildconf/num_procs") %] +make install + mkdir -p /var/tmp/build/builddir/mingw-w64/widl32 cd /var/tmp/build/builddir/mingw-w64/widl32 /var/tmp/build/[% project %]-[% c("version") %]/mingw-w64-tools/widl/configure \

1 0

[tor-browser-build/master] Bug 9711: Build own cctools for macOS cross-compilation
by boklm＠torproject.org 01 Jun '18

01 Jun '18

commit 94b31b1822961b25fec66078bcf48a279d6e9aa6 Author: Georg Koppen <gk(a)torproject.org> Date: Mon May 21 14:13:40 2018 +0000 Bug 9711: Build own cctools for macOS cross-compilation --- projects/cctools/build | 24 ++++++++++++++++++++++++ projects/cctools/config | 16 ++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/projects/cctools/build b/projects/cctools/build new file mode 100644 index 0000000..cad9e3a --- /dev/null +++ b/projects/cctools/build @@ -0,0 +1,24 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +distdir=/var/tmp/dist/[% project %] +mkdir -p /var/tmp/dist +tar -C /var/tmp/dist -xf [% c('input_files_by_name/llvm') %] +export PATH="/var/tmp/dist/llvm/bin:$PATH" +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz +cd /var/tmp/build/[% project %]-[% c('version') %]/cctools + +export CC=clang +export CXX=clang++ +./autogen.sh +./configure --prefix=$distdir --target=x86_64-apple-darwin11 --with-llvm-config=llvm-config +export LDFLAGS=-lpthread + +make -j[% c("buildconf/num_procs") %] install + +cd /var/tmp/dist +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] + diff --git a/projects/cctools/config b/projects/cctools/config new file mode 100644 index 0000000..cb84ec4 --- /dev/null +++ b/projects/cctools/config @@ -0,0 +1,16 @@ +# vim: filetype=yaml sw=2 +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +version: '[% c("abbrev") %]' +# This can be found in +# browser/config/tooltool-manifest/macosx64/clang.manifest +git_hash: 8e9c3f2506b51cf56725eaa60b6e90e240e249ca +git_url: https://github.com/tpoechtrager/cctools-port + +var: + container: + use_container: 1 + +input_files: + - project: container-image + - name: llvm + project: llvm

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gk/bug_9711_v2'
by boklm＠torproject.org 01 Jun '18

01 Jun '18

commit 966c55d754aaf7d181e85d73474d4014eb72a6ac Merge: ef90f3c 94b31b1 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Jun 1 12:51:24 2018 +0200 Merge remote-tracking branch 'gk/bug_9711_v2' projects/cctools/build | 24 ++++++++++++++++++++++++ projects/cctools/config | 16 ++++++++++++++++ 2 files changed, 40 insertions(+)

1 0

[tor-browser-build/master] Bug 26249: Update libevent to fix macOS cross-compilation
by boklm＠torproject.org 01 Jun '18

01 Jun '18

commit ef90f3c7881467df0500674dae84d44e247d459c Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 31 15:34:56 2018 +0000 Bug 26249: Update libevent to fix macOS cross-compilation --- keyring/libevent.gpg | Bin 61408 -> 1782 bytes projects/libevent/autotools-openssl-mac.patch | 26 ++++++++++++++++++++++++++ projects/libevent/build | 3 +++ projects/libevent/config | 4 +++- projects/tor/build | 2 +- 5 files changed, 33 insertions(+), 2 deletions(-) diff --git a/keyring/libevent.gpg b/keyring/libevent.gpg index ca92300..b287e04 100644 Binary files a/keyring/libevent.gpg and b/keyring/libevent.gpg differ diff --git a/projects/libevent/autotools-openssl-mac.patch b/projects/libevent/autotools-openssl-mac.patch new file mode 100644 index 0000000..1ee2964 --- /dev/null +++ b/projects/libevent/autotools-openssl-mac.patch @@ -0,0 +1,26 @@ +From 506df426dbeb0187bbd3654bd286b4100628fb16 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Carlo=20Marcelo=20Arenas=20Bel=C3=B3n?= <carenas(a)gmail.com> +Date: Tue, 29 Aug 2017 00:44:57 -0700 +Subject: [PATCH] autotools: confirm openssl is working before using + +latest versions of macOS provide pkg-config and libraries for an ancient +version of openssl as part of the system, but no headers + +diff --git a/m4/libevent_openssl.m4 b/m4/libevent_openssl.m4 +index c2040595..7b458134 100644 +--- a/m4/libevent_openssl.m4 ++++ b/m4/libevent_openssl.m4 +@@ -39,6 +39,10 @@ case "$enable_openssl" in + done + ;; + esac ++ CPPFLAGS_SAVE=$CPPFLAGS ++ CPPFLAGS+=$OPENSSL_INCS ++ AC_CHECK_HEADERS([openssl/ssl.h], [], [have_openssl=no]) ++ CPPFLAGS=$CPPFLAGS_SAVE + AC_SUBST(OPENSSL_INCS) + AC_SUBST(OPENSSL_LIBS) + case "$have_openssl" in +-- +2.17.0 + diff --git a/projects/libevent/build b/projects/libevent/build index a38422a..00ee78c 100644 --- a/projects/libevent/build +++ b/projects/libevent/build @@ -5,6 +5,9 @@ distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] +[% IF c("var/osx") -%] + patch -p1 < $rootdir/autotools-openssl-mac.patch +[% END -%] ./autogen.sh ./configure --disable-static [% c("var/configure_opt") %] --prefix=$distdir [% IF c("var/osx") -%] diff --git a/projects/libevent/config b/projects/libevent/config index 46cbb7e..386f746 100644 --- a/projects/libevent/config +++ b/projects/libevent/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2.0.22 +version: 2.1.8 git_url: https://github.com/libevent/libevent.git git_hash: 'release-[% c("version") %]-stable' tag_gpg_id: 1 @@ -20,3 +20,5 @@ input_files: - project: container-image - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' + - filename: autotools-openssl-mac.patch + enable: '[% c("var/osx") %]' diff --git a/projects/tor/build b/projects/tor/build index bf7db83..c6d9895 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -39,7 +39,7 @@ openssldir=/var/tmp/dist/openssl mkdir -p "$distdir/Debug/Tor" cp $openssldir/lib/libssl.so.1.0.0 "$distdir/Tor/" cp $openssldir/lib/libcrypto.so.1.0.0 "$distdir/Tor/" - cp $libeventdir/lib/libevent-2.0.so.5 "$distdir/Tor/" + cp $libeventdir/lib/libevent-2.1.so.6 "$distdir/Tor/" # We need to copy the libstdc++.so.6 for Tor Browser on older Linux distros. # Copying it into /Browser, which feels more natural, and amending # LD_LIBRARY_PATH breaks updates from a Tor Browser with the old

1 0

[torbutton/master] Update translations
by gk＠torproject.org 30 May '18

30 May '18

commit 1b8977f5e497512feeebd810bbbca0f41f7874d1 Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 30 11:26:28 2018 +0000 Update translations --- src/chrome/locale/ar/aboutDialog.dtd | 8 ++-- src/chrome/locale/ar/aboutTBUpdate.dtd | 6 +-- src/chrome/locale/ar/aboutTor.dtd | 6 +-- src/chrome/locale/ar/aboutTor.properties | 16 ++++---- src/chrome/locale/ar/torbutton.dtd | 49 ++++++++++++----------- src/chrome/locale/ar/torbutton.properties | 59 +++++++++++++++------------- src/chrome/locale/da/torbutton.dtd | 3 +- src/chrome/locale/da/torbutton.properties | 5 ++- src/chrome/locale/de/torbutton.dtd | 3 +- src/chrome/locale/de/torbutton.properties | 5 ++- src/chrome/locale/es/torbutton.dtd | 5 ++- src/chrome/locale/es/torbutton.properties | 5 ++- src/chrome/locale/eu/torbutton.dtd | 3 +- src/chrome/locale/eu/torbutton.properties | 5 ++- src/chrome/locale/fa/torbutton.dtd | 3 +- src/chrome/locale/fa/torbutton.properties | 3 ++ src/chrome/locale/fr/torbutton.dtd | 3 +- src/chrome/locale/fr/torbutton.properties | 5 ++- src/chrome/locale/it/torbutton.dtd | 3 +- src/chrome/locale/it/torbutton.properties | 5 ++- src/chrome/locale/ja/torbutton.dtd | 3 +- src/chrome/locale/ja/torbutton.properties | 3 ++ src/chrome/locale/ko/torbutton.dtd | 3 +- src/chrome/locale/ko/torbutton.properties | 5 ++- src/chrome/locale/nl/torbutton.dtd | 3 +- src/chrome/locale/nl/torbutton.properties | 5 ++- src/chrome/locale/pl/torbutton.dtd | 3 +- src/chrome/locale/pl/torbutton.properties | 5 ++- src/chrome/locale/pt-BR/torbutton.dtd | 3 +- src/chrome/locale/pt-BR/torbutton.properties | 5 ++- src/chrome/locale/ru/torbutton.dtd | 3 +- src/chrome/locale/ru/torbutton.properties | 5 ++- src/chrome/locale/sv/torbutton.dtd | 3 +- src/chrome/locale/sv/torbutton.properties | 5 ++- src/chrome/locale/tr/torbutton.dtd | 3 +- src/chrome/locale/tr/torbutton.properties | 5 ++- src/chrome/locale/vi/torbutton.dtd | 3 +- src/chrome/locale/vi/torbutton.properties | 5 ++- src/chrome/locale/zh-CN/torbutton.dtd | 3 +- src/chrome/locale/zh-CN/torbutton.properties | 3 ++ 40 files changed, 174 insertions(+), 102 deletions(-) diff --git a/src/chrome/locale/ar/aboutDialog.dtd b/src/chrome/locale/ar/aboutDialog.dtd index 5046d11..fbd16ae 100644 --- a/src/chrome/locale/ar/aboutDialog.dtd +++ b/src/chrome/locale/ar/aboutDialog.dtd @@ -1,7 +1,7 @@ -<!ENTITY project.start "ÙØ·ÙÙØ± ÙÙ Ø·Ø±Ù &brandShortName;"> +<!ENTITY project.start "Ø·ÙÙØ± &brandShortName;">  -<!ENTITY project.tpoLink "Ø§Ù&vendorShortNameØ"> -<!ENTITY project.end "ÙØ§ØªÙØ¯Ù ÙÙØ±ØšØ ØªØ¹ÙÙ Ø¹ÙÙ ØÙØ§ÙØ© Ø®ØµÙØµÙØªÙ ÙØØ±ÙØªÙ Ø¹ÙÙ Ø§ÙØ£ÙØªØ±ÙØª"> +<!ENTITY project.tpoLink "&vendorShortNameØ"> +<!ENTITY project.end "Ø ÙØ€Ø³Ø³Ø© ØºÙØ± ÙØ§Ø¯ÙØ© ÙÙØ±ØšØ ØªØ¹ÙÙ Ø¹ÙÙ ØÙØ§ÙØ© Ø®ØµÙØµÙØªÙ ÙØØ±ÙØªÙ Ø¹ÙÙ Ø§ÙØ¥ÙØªØ±ÙØª."> <!ENTITY help.start "ÙÙ ØªØ±ØºØš ÙÙ Ø§ÙÙØ³Ø§Ø¹Ø¯Ø©Ø">  @@ -13,7 +13,7 @@  <!ENTITY bottomLinks.questions "Ø£ÙØ© Ø£Ø³ØŠÙØ©Ø">  -<!ENTITY bottomLinks.grow "Ø³Ø§Ø¹Ø¯ ØŽØšÙØ© ØªÙØ± Ø¹ÙÙ Ø§ÙÙÙÙ !"> +<!ENTITY bottomLinks.grow "Ø³Ø§Ø¹Ø¯ ØŽØšÙØ© ØªÙØ± Ø¹ÙÙ Ø§ÙÙÙÙ.">  <!ENTITY bottomLinks.license "ÙØ¹ÙÙÙØ§Øª Ø§ÙØªØ±Ø®ÙØµ"> <!ENTITY tor.TrademarkStatement ""ØªÙØ±" Ù "ØŽØ¹Ø§Ø± Ø§ÙØšØµÙØ©" Ø¹ÙØ§ÙØ§Øª ØªØ¬Ø§Ø±ÙØ© ÙØ³Ø¬ÙØ© ØšØ§Ø³Ù ØŽØ±ÙØ© ÙØŽØ±ÙØ¹ ØªÙØ± Ø§ÙÙØØ¯ÙØ¯Ø©"> diff --git a/src/chrome/locale/ar/aboutTBUpdate.dtd b/src/chrome/locale/ar/aboutTBUpdate.dtd index 41fd873..ee153f6 100644 --- a/src/chrome/locale/ar/aboutTBUpdate.dtd +++ b/src/chrome/locale/ar/aboutTBUpdate.dtd @@ -1,6 +1,6 @@ <!ENTITY aboutTBUpdate.title "ØªØØ¯ÙØ« ÙØªØµÙØ ØªÙØ±"> -<!ENTITY aboutTBUpdate.updated "ÙÙØ¯ ØªÙ ØªØØ¯ÙØ« ÙØªØµÙØ ØªÙØ±."> -<!ENTITY aboutTBUpdate.linkPrefix "ÙÙØØµÙÙ Ø¹ÙÙ Ø£ØØ¯Ø« Ø§ÙÙØ¹ÙÙÙØ§Øª ØÙÙ ÙØ°Ø§ Ø§ÙØ¥ØµØ¯Ø§Ø±."> +<!ENTITY aboutTBUpdate.updated "ØªÙ ØªØØ¯ÙØ« ÙØªØµÙØ ØªÙØ±."> +<!ENTITY aboutTBUpdate.linkPrefix "ÙÙØØµÙÙ Ø¹ÙÙ Ø£ØØ¯Ø« Ø§ÙÙØ¹ÙÙÙØ§Øª ØÙÙ ÙØ°Ø§ Ø§ÙØ¥ØµØ¯Ø§Ø±Ø"> <!ENTITY aboutTBUpdate.linkLabel "Ø²ÙØ± ÙÙÙØ¹ÙØ§"> <!ENTITY aboutTBUpdate.linkSuffix "."> -<!ENTITY aboutTBUpdate.changeLogHeading "ØªØºÙØ± Ø³Ø¬Ù:"> +<!ENTITY aboutTBUpdate.changeLogHeading "Ø³Ø¬Ù Ø§ÙØªØºÙÙØ±Ø§Øª:"> diff --git a/src/chrome/locale/ar/aboutTor.dtd b/src/chrome/locale/ar/aboutTor.dtd index c64915a..86fe2cd 100644 --- a/src/chrome/locale/ar/aboutTor.dtd +++ b/src/chrome/locale/ar/aboutTor.dtd @@ -13,7 +13,7 @@ <!ENTITY aboutTor.check.label "Ø§Ø®ØªØšØ± Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª ØŽØšÙØ© ØªÙØ±."> <!ENTITY aboutTor.success.label "Ø£ÙÙØ§Ù ØšÙ ÙÙ ÙØªØµÙØ ØªÙØ±"> -<!ENTITY aboutTor.success2.label "ØªÙ Ø§ÙØ¥ØªØµØ§Ù ØšØŽØšÙØ© ØªÙØ±"> +<!ENTITY aboutTor.success2.label "ÙØªØµÙ ØšØŽØšÙØ© ØªÙØ±"> <!ENTITY aboutTor.success3.label "ÙÙÙÙÙ Ø§ÙØ¢Ù ØªØµÙØ Ø§ÙØ§ÙØªØ±ÙØª ØšØŽÙÙ ÙØÙÙ ÙÙÙØªÙ."> <!ENTITY aboutTor.failure.label "ØØ¯Ø« Ø®Ø·Ø£ ÙØ§!"> <!ENTITY aboutTor.failure2.label "ØªÙØ± ÙØ§ ÙØ¹ÙÙ ÙÙ ÙØ°Ø§ Ø§ÙÙØªØµÙØ."> @@ -29,8 +29,8 @@ <!ENTITY aboutTor.whatnextAnswer.label "ÙØ§ ÙÙØ«Ù ØªÙØ± ÙÙ ÙØ§ ØªØØªØ§Ø¬Ù ÙÙØªØµÙØ ØšØŽÙÙ ÙØÙÙ ÙÙÙØªÙ! ÙØ¯ ØªØØªØ§Ø¬ ÙØªØºÙÙØ± ØšØ¹Ø¯ Ø¹Ø§Ø¯Ø§ØªÙ Ø£Ø«ÙØ§Ø¡ Ø§ÙØªØµÙÙØ ÙØ¶ÙØ§Ù Ø³Ø±ÙØ© ÙÙÙØªÙ."> <!ENTITY aboutTor.whatnext.label "ÙØµØ§ØŠØ ÙÙØÙØ§Øž Ø¹ÙÙ Ø³Ø±ÙÙØ© ÙÙÙØªÙ Â»"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> -<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Ø¯ÙÙÙ Ø§Ø³ØªØ®Ø¯Ø§Ù ÙØªØµÙÙØ Tor"> +<!ENTITY aboutTor.torbrowser_user_manual.accesskey "Ø³"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Ø¯ÙÙÙ Ø§Ø³ØªØ®Ø¯Ø§Ù ÙØªØµÙÙØ ØªÙØ±"> <!ENTITY aboutTor.helpInfo1.label "ØšØ¥ÙÙØ§ÙÙ Ø§ÙÙØ³Ø§Ø¹Ø¯Ø©!"> <!ENTITY aboutTor.helpInfo2.label "ÙÙÙÙÙ ÙØ³Ø§Ø¹Ø¯Ø© ØŽØšÙØ© ØªÙØ± Ù Ø¬Ø¹ÙÙØ§ Ø£ÙØ«Ø± Ø³Ø±Ø¹Ø© Ù ÙÙÙØ© ØšØ¥ØØ¯Ù Ø§ÙØ·Ø±Ù Ø§ÙØ¢ØªÙØ©:"> <!ENTITY aboutTor.helpInfo3.label "ØŽØºÙÙ ÙÙØ·Ø© ØªÙØ± Â»"> diff --git a/src/chrome/locale/ar/aboutTor.properties b/src/chrome/locale/ar/aboutTor.properties index 369c257..07d82ff 100644 --- a/src/chrome/locale/ar/aboutTor.properties +++ b/src/chrome/locale/ar/aboutTor.properties @@ -2,19 +2,19 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchDDG.privacy=Ø§ØšØØ« <a href="%1$S">Ø¢ÙÙØ§</a> ÙØ¹ <a href="%2$S">DuckDuckGo</a>. +aboutTor.searchDDG.privacy=Ø§ØšØØ« <a href="%1$S">ØšØ£ÙØ§Ù</a> ÙØ¹ <a href="%2$S">DuckDuckGo</a>. # The following string is a link which replaces %1$S above. aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ -aboutTor.donationBanner.donate=ØªØšØ±Ø¹ Ø§ÙØ¢Ù ! +aboutTor.donationBanner.donate=ØªØšØ±Ø¹ Ø§ÙØ¢Ù -aboutTor.donationBanner.slogan=ØªÙØ± : Ø¯Ø¹Ù Ø§ÙØµÙÙØ¯ Ø§ÙØ±ÙÙÙ -aboutTor.donationBanner.mozilla=Ø§Ø¹Ø·Ù Ø§ÙÙÙÙ ÙÙÙØ¯Ø²ÙÙØ§ Ø³ØªØ±ÙØ¯ ÙÙ Ø§ÙÙØ¯ÙØ© +aboutTor.donationBanner.slogan=ØªÙØ±: Ø¯Ø¹Ù Ø§ÙØµÙÙØ¯ Ø§ÙØ±ÙÙÙ +aboutTor.donationBanner.mozilla=Ø£Ø¹Ø·Ù Ø§ÙÙÙÙ ÙÙÙØ²ÙÙØ§ Ø³ØªØ¹Ø·Ù ÙØ«ÙÙ -aboutTor.donationBanner.tagline1=ØÙØ§ÙØ© Ø§ÙØµØØ§ÙÙÙÙ Ø Ø§ÙÙÙØ®ØšØ±ÙÙ ÙØ§ÙÙÙØŽØ·Ø§Ø¡ ÙÙØ° Ø¹Ø§Ù 2006 +aboutTor.donationBanner.tagline1=ÙØÙÙ Ø§ÙØµØÙÙÙÙØ ÙÙØ§ØŽÙÙ Ø§ÙÙØ³Ø§Ø¯Ø ÙØ§ÙÙÙØŽØ·Ø§Ø¡ ÙÙØ° Ù¢Ù Ù ÙŠ aboutTor.donationBanner.tagline2=ØØ±ÙØ© Ø§ÙØªÙØ§ØµÙ Ø§ÙØŽØšÙÙ Ø§ÙØ¹Ø§ÙÙÙØ© -aboutTor.donationBanner.tagline3=Freedom Online -aboutTor.donationBanner.tagline4=ØªØ¹Ø²ÙØ² ØØ±ÙØ© Ø§ÙØªØ¹ØšÙØ± Ø¹Ø§ÙÙÙØ§Ù -aboutTor.donationBanner.tagline5=ØªØÙÙ Ø®ØµÙØµÙØ© Ø§ÙÙÙØ§ÙÙÙ ÙÙ Ø§ÙØ£ØŽØ®Ø§Øµ ÙÙ ÙÙÙ +aboutTor.donationBanner.tagline3=Ø§ÙØØ±ÙØ© Ø¹ÙÙ Ø§ÙØ¥ÙØªØ±ÙØª +aboutTor.donationBanner.tagline4=ÙØ¹Ø²ÙØ² ØØ±ÙØ© Ø§ÙØªØ¹ØšÙØ± Ø¹Ø§ÙÙÙÙØ§ +aboutTor.donationBanner.tagline5=ÙØÙÙ Ø®ØµÙØµÙØ© Ø§ÙÙÙØ§ÙÙÙ ÙÙ Ø§ÙØ£ØŽØ®Ø§Øµ ÙÙ ÙÙÙ diff --git a/src/chrome/locale/ar/torbutton.dtd b/src/chrome/locale/ar/torbutton.dtd index 1605070..9bf013f 100644 --- a/src/chrome/locale/ar/torbutton.dtd +++ b/src/chrome/locale/ar/torbutton.dtd @@ -2,7 +2,7 @@ <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "Ø¯Ø§ØŠØ±Ø© ØªÙØ± Ø¬Ø¯ÙØ¯Ø© ÙÙØ°Ø§ Ø§ÙÙÙÙØ¹"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.preferences "Ø§ÙØ¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§ÙØ£ÙÙÙØ© ..."> +<!ENTITY torbutton.context_menu.preferences "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§ÙØ£ÙØ§Ù..."> <!ENTITY torbutton.context_menu.preferences.key "S"> <!ENTITY torbutton.context_menu.networksettings "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª ØŽØšÙØ© ØªÙØ±..."> <!ENTITY torbutton.context_menu.networksettings.key "N"> @@ -11,9 +11,9 @@ <!ENTITY torbutton.context_menu.cookieProtections "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø£ÙØ§Ù ÙÙÙØ§Øª ØªØ¹Ø±ÙÙ Ø§ÙØ§Ø±ØªØšØ§Ø·..."> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Ø§ÙÙØ± ÙØšØ¯Ø¡ Ø²Ø± ØªÙØ±"> -<!ENTITY torbutton.prefs.security_settings "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§ÙØ£ÙØ§Ù ÙÙØªØµÙØ Ø·ÙØ±"> -<!ENTITY torbutton.prefs.restore_defaults "Ø¥Ø¹Ø§Ø¯Ø© Ø§ÙØªØ¹ÙÙÙ"> -<!ENTITY torbutton.prefs.custom_warning "Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels."> +<!ENTITY torbutton.prefs.security_settings "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø£ÙØ§Ù ÙØªØµÙØ Ø·ÙØ±"> +<!ENTITY torbutton.prefs.restore_defaults "Ø§Ø³ØªØ¹Ø¯ Ø§ÙØ¥Ø¹Ø§Ø¯Ø§Øª Ø§ÙÙØšØ¯ØŠÙØ©"> +<!ENTITY torbutton.prefs.custom_warning "ØªÙØ¶ÙÙØ§ØªÙ Ø§ÙØ®Ø§ØµØ© ÙÙÙØªØµÙØ ØªØ³ØšØšØª ÙÙ Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø£ÙØ§Ù ØºÙØ± ÙØ¹ØªØ§Ø¯Ø©. ÙØ£ÙØ§Ù ÙØ®ØµÙØµÙØ© Ø£ÙØ¶Ù ÙÙØµØ ØšØ§Ø³ØªØ®Ø¯Ø§Ù Ø£ØØ¯ ÙØ³ØªÙÙØ§Øª Ø§ÙØ£ÙØ§Ù Ø§ÙÙØšØ¯ØŠÙØ©."> <!ENTITY torbutton.cookiedialog.title "Ø¥Ø¯Ø§Ø±Ø© Ø¥Ø¹Ø¯Ø§Ø¯Øª Ø§ÙØÙØ§ÙØ© ÙÙÙÙØ§Øª ØªØ¹Ø±ÙÙ Ø§ÙØ§Ø±ØªØšØ§Ø·"> <!ENTITY torbutton.cookiedialog.lockCol "ÙØÙÙØ©"> <!ENTITY torbutton.cookiedialog.domainCol "Ø§Ø³ØªØ¶Ø§ÙØ©"> @@ -22,29 +22,30 @@ <!ENTITY torbutton.cookiedialog.protectCookie "Ø§ØÙ ÙÙÙ ØªØ¹Ø±ÙÙ Ø§ÙØ§Ø±ØªØšØ§Ø· (ÙÙÙÙ)"> <!ENTITY torbutton.cookiedialog.removeCookie "Ø¥Ø²Ø§ÙØ© ÙÙÙ ØªØ¹Ø±ÙÙ Ø§ÙØ§Ø±ØªØšØ§Ø· (ÙÙÙÙ)"> <!ENTITY torbutton.cookiedialog.unprotectCookie "Ø¥ÙØºØ§Ø¡ ØÙØ§ÙØ© ÙÙÙ ØªØ¹Ø±ÙÙ Ø§ÙØ§Ø±ØªØšØ§Ø· (ÙÙÙÙ)"> -<!ENTITY torbutton.cookiedialog.removeAllBut "Ø¥Ø²Ø§ÙØ© Ø§ÙÙÙ ÙÙÙ Ø§Ø³ØªÙØ± ÙÙ Ø§ÙØÙØ§ÙØ©"> +<!ENTITY torbutton.cookiedialog.removeAllBut "Ø£Ø²ÙÙ Ø§ÙÙÙ ÙÙÙ Ø§Ø³ØªÙØ± ÙÙ Ø§ÙØÙØ§ÙØ©"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Ø§ØÙ ÙÙÙØ§Øª ØªØ¹Ø±ÙÙ Ø§ÙØ§Ø±ØªØšØ§Ø· Ø§ÙØ¬Ø¯ÙØ¯Ø©"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ÙØ§ ØªØÙ ÙÙÙØ§Øª ØªØ¹Ø±ÙÙ Ø§ÙØ§Ø±ØªØšØ§Ø· Ø§ÙØ¬Ø¯ÙØ¯Ø©"> <!ENTITY torbutton.prefs.restrict_thirdparty "ØªÙÙÙØ¯ Ø§ÙÙCookies Ø§ÙØ®Ø§ØµØ© ØšØ§ÙØ·Ø±Ù Ø§ÙØ«Ø§ÙØ« Ù ØšÙØ§ÙØ§Øª Ø§ÙØªØªØšØ¹ Ø§ÙØ£Ø®Ø±Ù."> -<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R"> -<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets."> -<!ENTITY torbutton.prefs.resist_fingerprinting "ØªØºÙÙØ± Ø§ÙØªÙØ§ØµÙÙ Ø§ÙØªÙ ØªÙÙØ²Ù Ø¹Ù Ø§ÙÙØ³ØªØ®Ø¯ÙÙÙ Ø§ÙØ¢Ø®Ø±ÙÙ ÙÙØªØµÙØ ØªÙØ±"> -<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> -<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities."> +<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "Ù"> +<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Ø§ØªØ±Ù ÙØ°Ø§ Ø§ÙÙØ±ØšØ¹ ÙØ€ØŽØ±Ø§ ÙÙÙØ¹ Ø¥Ø³Ø§Ø¡Ø© Ø§Ø³ØªØ®Ø¯Ø§Ù Ø§ÙØ¹Ø¯ÙØ¯ ÙÙ Ø®ØµØ§ØŠØµ Ø§ÙÙØªØµÙØ ÙÙ ØªØ¹ÙØšÙ Ø£Ø«ÙØ§Ø¡ ØªØµÙØÙ ÙÙÙØš. Ø§ÙØ®ØµØ§ØŠØµ Ø§ÙÙØ¹Ø¯ÙÙØ© ØªØŽÙÙ ÙØ³Ø§Ø±Ø§Øª Ø§ÙÙØ§ØŠÙØ§ØªØ ÙÙÙÙØ§Øª Ø§ÙØšØ«Ø ÙØ®ØšÙØŠØ© Ø§ÙÙØªØµÙØØ ÙØ§ÙÙØ¹ÙØ§ØªØ ÙØ£ÙÙÙÙØ§Øª Ø§ÙÙÙØ§ÙØ¹Ø ÙØªØ±ÙÙØ³Ø§Øª Ø§Ø³ØªÙØ«Ø§Ù HTTPØ ÙØ§ÙØ§ØªØµØ§Ù Ø§ÙÙØ³ØšÙ ØšØ§ÙØ±ÙØ§ØšØ·Ø Ø§ÙØªØ®Ø²ÙÙ Ø§ÙÙØÙÙØ ÙÙØ³Ø§Ø±Ø§Øª Ø§ÙÙØ³Ø§ØŠØ·Ø ÙØ·ÙØšØ§Øª OCSPØ ÙSharedWorkersØ ÙØšØ·Ø§ÙØ§Øª Ø¬ÙØ³Ø§Øª TLS."> +<!ENTITY torbutton.prefs.resist_fingerprinting "ØºÙÙØ± Ø§ÙØªÙØ§ØµÙÙ Ø§ÙØªÙ ØªÙÙØ²Ù Ø¹Ù ÙØ³ØªØ®Ø¯ÙÙ ÙØªØµÙØ ØªÙØ± Ø§ÙØ¢Ø®Ø±ÙÙ"> +<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "Øº"> +<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Ø§ØªØ±Ù ÙØ°Ø§ Ø§ÙÙØ±ØšØ¹ ÙØ€ØŽØ±Ø§ ÙØªØ®ÙÙ Ø¹Ù ÙÙØ§ÙØ¹ Ø§ÙÙØš Ø§ÙØ£ØŽÙØ§Ø¡ Ø§ÙØªÙ ØªÙÙØ²Ù Ø¹Ù ØºÙØ±ÙØ ÙØ«Ù Ø£Ø¯Ø§Ø¡ ØØ§Ø³ÙØšÙØ ÙØªØ®Ø·ÙØ· ÙÙØØ© Ø§ÙÙÙØ§ØªÙØØ ÙØ§ÙÙØºØ©Ø ÙÙÙØ§Ù ØªÙØµÙØš Ø§ÙÙÙØÙØ§ØªØ ÙÙØ§ØŠÙØ© Ø§ÙÙÙØÙØ§Øª Ø§ÙÙÙØµØšØ©Ø ÙØØ§ÙØ© Ø§ÙØŽØšÙØ©Ø ÙØ§ØªØ¬Ø§Ù Ø§ÙØŽØ§ØŽØ© ÙØØ¬ÙÙØ§Ø ÙÙØ³ØªÙÙØ§Øª Ø§ÙØªÙØ±ÙØš ÙÙÙ ÙÙÙØ¹Ø ÙØ£ÙÙØ§Ø¹ Ø§ÙÙÙÙØ§Øª Ø§ÙÙØ¯Ø¹ÙÙØ©Ø ÙØ£ÙÙØ§Ù Ø§ÙÙØžØ§ÙØ ÙØ¥ÙÙØ§ÙØ§Øª WebGL."> <!ENTITY torbutton.prefs.sec_caption "ÙØ³ØªÙÙ Ø§ÙØ£ÙØ§Ù"> -<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts."> +<!ENTITY torbutton.prefs.sec_caption_tooltip "ÙØªÙØ ÙÙ ØŽØ±ÙØ· ØªÙØ±ÙØ± ÙØ³ØªÙÙ Ø§ÙØ£ÙØ§Ù ØªØ¹Ø·ÙÙ ØšØ¹Ø¶ ÙÙ ÙÙÙØ²Ø§Øª ÙØªØµÙØÙ ØªØ¬Ø¹ÙÙ Ø£ÙØ«Ø± Ø¹Ø±Ø¶Ø© ÙÙØ§Ø®ØªØ±Ø§Ù."> <!ENTITY torbutton.prefs.sec_standard_label "Ø¹Ø§Ø¯Ù"> -<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled."> -<!ENTITY torbutton.prefs.sec_safer_label "Ø¢ÙÙÙ Ø¬Ø¯Ø§"> -<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality."> -<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:"> -<!ENTITY torbutton.prefs.sec_safest_label "Ø¬ÙØ¯Ù Ø¢ÙÙÙ"> -<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts."> -<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:"> +<!ENTITY torbutton.prefs.sec_standard_description "ÙÙ Ø®ØµØ§ØŠØµ ÙØªØµÙØ ØªÙØ± ÙÙÙØ§ÙØ¹ Ø§ÙÙØš ÙÙØ¹ÙØ©"> +<!ENTITY torbutton.prefs.sec_safer_label "Ø¢ÙÙÙ"> +<!ENTITY torbutton.prefs.sec_safer_description "ÙØ¹Ø·Ù ÙÙÙØ²Ø§Øª ÙÙØ§ÙØ¹ Ø§ÙÙØš Ø§ÙØªÙ Ø¹Ø§Ø¯Ø© ÙØ§ ØªÙÙÙ Ø®Ø·ÙØ±Ø©. ÙØªØ³ØšØš ÙÙ ØªØ¹Ø·Ù Ø®ØµØ§ØŠØµ ØšØ¹Ø¶ Ø§ÙÙÙØ§ÙØ¹."> +<!ENTITY torbutton.prefs.sec_safer_list_label "ÙÙ Ø§ÙØ¥Ø¹Ø¯Ø§Ø¯ Ø§ÙØ¢ÙÙ:"> +<!ENTITY torbutton.prefs.sec_safest_label "Ø§ÙØ£ÙØ«Ø± Ø£ÙÙØ§"> +<!ENTITY torbutton.prefs.sec_safest_description "Ø§Ø³ÙØ ÙÙØ· ØšØ§ÙØ®ØµØ§ØŠØµ Ø§ÙÙØ·ÙÙØšØ© ÙÙÙÙØ§ÙØ¹ ØºÙØ± Ø§ÙØ¯ÙÙØ§ÙÙÙÙØ© ÙØ§ÙØ®Ø¯ÙØ§Øª Ø§ÙØ£Ø³Ø§Ø³ÙØ©. ØªØ€Ø«Ø± ÙØ°Ù Ø§ÙØªØºÙÙØ±Ø§Øª Ø¹ÙÙ Ø§ÙØµÙØ± ÙØ§ÙÙØ³Ø§ØŠØ· ÙØ§ÙÙØµÙØµ Ø§ÙØšØ±ÙØ¬ÙØ©."> +<!ENTITY torbutton.prefs.sec_safest_list_label "ÙÙ Ø§ÙØ¥Ø¹Ø¯Ø§Ø¯ Ø§ÙØ£ÙØ«Ø± Ø£ÙÙØ§:"> <!ENTITY torbutton.prefs.sec_learn_more_label "ØªØ¹Ø±ÙÙ Ø¹ÙÙ Ø§ÙÙØ²ÙØ¯"> -<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites."> -<!ENTITY torbutton.prefs.sec_js_disabled "Ø¬Ø§ÙØ§ Ø³ÙØ±ÙØšØª ÙØ¹Ø·Ù ØšØŽÙÙ Ø§ÙØªØ±Ø§Ø¶Ù Ø¹ÙÙ Ø¬ÙÙØ¹ Ø§ÙÙÙØ§ÙØ¹."> -<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled."> -<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled."> -<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play."> -<!ENTITY torbutton.circuit_display.title "Ø¯Ø§ØŠØ±Ø© ØªÙØ± ÙÙØ°Ø§ Ø§ÙÙÙÙØ¹"> +<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "ØªØ¹Ø·Ù Ø¬Ø§ÙØ§ Ø³ÙØ±ØšØª Ø¹ÙÙ Ø§ÙÙÙØ§ÙØ¹ Ø§ÙØªÙ ÙØ§ ØªØ³ØªØ®Ø¯Ù HTTPS"> +<!ENTITY torbutton.prefs.sec_js_disabled "ØªØ¹Ø·Ù Ø¬Ø§ÙØ§ Ø³ÙØ±ØšØª ÙØšØ¯ØŠÙØ§ Ø¹ÙÙ Ø¬ÙÙØ¹ Ø§ÙÙÙØ§ÙØ¹."> +<!ENTITY torbutton.prefs.sec_limit_typography "ØªØ¹Ø·ÙÙ ØšØ¹Ø¶ Ø§ÙØ®Ø·ÙØ· ÙØ§ÙØ±ÙÙØ² Ø§ÙØ±ÙØ§Ø¶ÙØ©."> +<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "ØªØ¹Ø·ÙÙ ØšØ¹Ø¶ Ø§ÙØ®Ø·ÙØ· ÙØ§ÙØ£ÙÙÙÙØ§Øª ÙØ§ÙØ±ÙÙØ² Ø§ÙØ±ÙØ§Ø¶ÙØ© ÙØ§ÙØµÙØ±."> +<!ENTITY torbutton.prefs.sec_click_to_play_media "Ø§ÙØµÙØª ÙØ§ÙÙÙØ¯ÙÙ ÙØØªØ§Ø¬ ÙÙÙÙØ± ÙØªØŽØºÙÙÙ."> +<!ENTITY torbutton.circuit_display.title "Ø¯Ø§ØŠØ±Ø© ØªÙØ±"> +<!ENTITY torbutton.circuit_display.new_circuit "Ø¯Ø§ØŠØ±Ø© ØªÙØ± Ø¬Ø¯ÙØ¯Ø© ÙÙØ°Ø§ Ø§ÙÙÙÙØ¹"> diff --git a/src/chrome/locale/ar/torbutton.properties b/src/chrome/locale/ar/torbutton.properties index fb18bee..afa0b93 100644 --- a/src/chrome/locale/ar/torbutton.properties +++ b/src/chrome/locale/ar/torbutton.properties @@ -1,51 +1,54 @@ torbutton.circuit_display.internet = Ø§ÙØªØ±ÙØª torbutton.circuit_display.ip_unknown = IP ØºÙØ± ÙØ¹Ø±ÙÙ -torbutton.circuit_display.onion_site = ÙÙÙØ¹ Ø§ÙÙÙÙÙ +torbutton.circuit_display.onion_site = ÙÙÙØ¹ Ø£ÙÙÙÙÙ torbutton.circuit_display.this_browser = ÙØ°Ø§ Ø§ÙÙØªØµÙØ -torbutton.circuit_display.relay = ÙÙØ±ØÙ +torbutton.circuit_display.relay = ØªØÙÙÙØ© torbutton.circuit_display.tor_bridge = Ø¬Ø³Ø± torbutton.circuit_display.unknown_country = ØšÙØ¯ ØºÙØ± ÙØ¹Ø±ÙÙ -torbutton.content_sizer.margin_tooltip = ÙØ¶ÙÙ ÙØªØµÙØ ØªÙØ± ÙØ°Ø§ Ø§ÙÙØ§ÙØŽ ÙØ§ØšÙØ§Ø¡ ÙØ§ÙØ°ØªÙ ØºÙØ± ÙÙÙØ²ÙØ ÙØªÙÙÙÙ Ø§ÙÙØ§ÙÙÙ ØªÙÙÙÙ Ø¹ØšØ± Ø§ÙØ§ÙØªØ±ÙØª. +torbutton.circuit_display.guard = ØØ§Ø±Ø³ +torbutton.circuit_display.guard_note = ÙØ§ ÙÙÙÙ ØªØºÙÙØ± Ø§ÙØ¹ÙØ¯Ø© Ø§ÙØ®Ø§Ø±Ø³Ø© +torbutton.circuit_display.learn_more = ØªØ¹Ø±ÙÙ Ø¹ÙÙ Ø§ÙÙØ²ÙØ¯ +torbutton.content_sizer.margin_tooltip = ÙØ¶ÙÙ ÙØªØµÙØ ØªÙØ± ÙØ°Ø§ Ø§ÙÙØ§ÙØŽ ÙØ¬Ø¹Ù Ø¹Ø±Ø¶ ÙØ§Ø±ØªÙØ§Ø¹ ÙØ§ÙØ°ØªÙ ØºÙØ± ÙÙÙØ²ÙÙØ ÙØªÙÙÙÙ Ø¥ÙÙØ§ÙÙØ© Ø§ÙØªÙØ§Ø¡ Ø£Ø«Ø±Ù Ø¹ØšØ± Ø§ÙØ¥ÙØªØ±ÙØª. torbutton.panel.tooltip.disabled = Ø§ÙÙØ± ÙØªÙØ¹ÙÙ ØªÙØ± torbutton.panel.tooltip.enabled = Ø§ÙÙØ± ÙØªØ¹Ø·ÙÙ ØªÙØ± torbutton.panel.label.disabled = ØªÙØ± ÙØ¹Ø·ÙÙ torbutton.panel.label.enabled = ØªÙØ± ÙÙØ¹ÙÙ extensions.torbutton(a)torproject.org.description = Ø²Ø± ØªÙØ± ÙÙÙØ± Ø²Ø± ÙØªØ¹Ø¯ÙÙ Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª ØªÙØ± ÙØ§ÙØ¶Ø§Ù ÙÙØ³Ø ØšÙØ§ÙØ§Øª Ø§ÙØªØµÙØ Ø§ÙØ®Ø§ØµØ© ØšÙ ØšØ³Ø±Ø¹Ø© ÙØšØ³ÙÙÙØ©. -torbutton.popup.external.title = ÙÙ ØªØ±ÙØ¯ ØªÙØ²ÙÙ ÙÙÙØ§Ù ÙÙ ÙÙØ¹ Ø§ÙÙØµÙØ© Ø§ÙØ®Ø§Ø±Ø¬ÙØ©Ø -torbutton.popup.external.app = ÙØ§ ÙÙÙÙ ÙÙØªØµÙÙØ ØªÙØ± Ø¹Ø±Ø¶ ÙØ°Ù Ø§ÙÙÙÙ, ÙØ¬Øš Ø¹ÙÙÙ Ø£Ù ØªÙØªØÙ ØšØ§Ø³ØªØ¹ÙØ§Ù ØªØ·ØšÙÙ Ø£Ø®Ø±.\n\n -torbutton.popup.external.note = ØšØ¹Ø¶ Ø§ÙØ£ÙÙØ§Ø¹ ÙÙ Ø§ÙÙÙÙØ§Øª ÙØ¯ ØªØ¹ÙÙ Ø¹ÙÙ Ø¥Ø¹Ø·Ø§Ø¡ ØšØ¹Ø¶ Ø§ÙØªØ·ØšÙÙØ§Øª Ø§ÙØ¥ÙÙØ§ÙÙÙØ© ÙÙØ§ØªØµØ§Ù ØšØ§ÙØ¥ÙØªØ±ÙØª Ø¯ÙÙ Ø§Ø³ØªØ¹ÙØ§Ù ØªÙØ±.\n\n -torbutton.popup.external.suggest = ÙØ³ÙØ§ÙØªÙ, ÙØ¬Øš Ø¹ÙÙÙ ÙØªØ Ø§ÙÙÙÙØ§Øª Ø§ÙÙÙØ²ÙÙØ© ÙØ³ØšÙØ§Ù Ø¹ÙØ¯ ÙÙÙÙ ØºÙØ± ÙØªØµÙØ§Ù ØšØ§ÙØ¥ÙØªØ±ÙØª, Ø£Ù Ø§Ø³ØªØ¹ÙÙ ÙØ±Øµ ÙØ¶ØºÙØ· ÙÙ Tor Life , ÙØ«Ù Tails.\n +torbutton.popup.external.title = ÙÙ ØªØ±ÙØ¯ ØªÙØ²ÙÙ ÙÙÙ Ø®Ø§Ø±Ø¬ÙØ +torbutton.popup.external.app = ÙØ§ ÙÙÙÙ ÙÙØªØµÙÙØ ØªÙØ± Ø¹Ø±Ø¶ ÙØ°Ù Ø§ÙÙÙÙØ ÙØ¬Øš Ø¹ÙÙÙ Ø£Ù ØªÙØªØÙ ØšØ§Ø³ØªØ¹ÙØ§Ù ØªØ·ØšÙÙ Ø¢Ø®Ø±.\n\n +torbutton.popup.external.note = ØšØ¹Ø¶ Ø£ÙÙØ§Ø¹ ÙÙ Ø§ÙÙÙÙØ§Øª ÙØ¯ ØªØªØ³ØšØš ÙÙ Ø§ØªØµØ§Ù Ø§ÙØªØ·ØšÙÙØ§Øª ØšØ§ÙØ¥ÙØªØ±ÙØª Ø¯ÙÙ Ø§Ø³ØªØ¹ÙØ§Ù ØªÙØ±.\n\n +torbutton.popup.external.suggest = ÙØ³ÙØ§ÙØªÙ, ÙØ¬Øš Ø¹ÙÙÙ ÙØªØ Ø§ÙÙÙÙØ§Øª Ø§ÙÙÙØ²ÙÙØ© ÙØ£ÙØª ØºÙØ± ÙØªØµÙ ØšØ§ÙØ¥ÙØªØ±ÙØªØ Ø£Ù Ø§Ø³ØªØ¹ÙÙ ÙØ±Øµ ØªÙØ± ØÙ ÙØ«Ù Tails.\n torbutton.popup.launch = ØªØÙÙÙ Ø§ÙÙÙÙ torbutton.popup.cancel = Ø¥ÙØºØ§Ø¡ -torbutton.popup.dontask = Ø£ÙØ²Ù Ø§ÙÙÙÙØ§Øª ØšØŽÙÙÙ Ø£ÙØªÙÙØ§ØªÙÙÙÙ ÙÙ Ø§ÙØ£Ù ÙØµØ§Ø¹Ø¯Ø§Ù -torbutton.popup.prompted_language = ØØªÙ ÙÙÙØÙ Ø²Ø± ØªÙØ± ÙØ²ÙØ¯Ø§Ù ÙÙ Ø§ÙØ®ØµÙØµÙØ©Ø ÙØ³ØªØ·ÙØ¹ Ø²Ø± ØªÙØ± Ø·ÙØš Ø§ÙÙØ³Ø® Ø§ÙØ¥ÙØ¬ÙÙØ²ÙØ© ÙÙ ØµÙØØ§Øª Ø§ÙØ§ÙØªØ±ÙØª. ÙÙØ¯ ÙÙØªØ¬ Ø¹Ù Ø°ÙÙ Ø¹Ø±Ø¶ Ø§ÙØµÙØØ§Øª Ø§ÙØªÙ ØªÙØ¶Ù ÙØ±Ø§Ø¡ØªÙØ§ ØšÙØºØªÙ Ø§ÙØ£Ù ØšØ§ÙÙØºØ© Ø§ÙØ¥ÙØ¬ÙÙØ²ÙØ©.\n\nÙÙ ØªØ±ÙØ¯ Ø·ÙØš ØµÙØØ§Øª Ø§ÙÙØš ØšØ§ÙÙØºØ© Ø§ÙØ¥ÙØ¬ÙÙØ²ÙØ© ÙØ®ØµÙØµÙØ© Ø§ÙØ¶ÙØ -torbutton.popup.no_newnym = ÙØ§ ÙÙÙÙ ÙØ²Ø± ØªÙØ± Ø£Ù ÙØ¹Ø·ÙÙ ÙÙÙØ© Ø¬Ø¯ÙØ¯Ø© ØšØŽÙÙ Ø¢ÙÙØ ÙÙØ°Ø§ ÙØ§Ù Ø²Ø± ØªÙØ± ÙØ§ ÙØ³ØªØ·ÙØ¹ Ø§ÙÙØµÙÙ Ø¥ÙÙ ÙÙÙØ° Ø§ÙØªØÙÙ Ø§ÙØ®Ø§Øµ ØšØªÙØ±.\n\nÙÙ ØªØ³ØªØ®Ø¯Ù ØØ²ÙØ© ÙØªØµÙØ ØªÙØ± ØØ§ÙÙØ§ÙØ -torbutton.title.prompt_torbrowser = ÙØ¹ÙÙÙØ§Øª ÙØ§ÙØ© Ø¹Ù ØªÙØ± -torbutton.popup.prompt_torbrowser = ÙÙØ¯ ØªØºÙØ±Øª Ø·Ø±ÙÙØ© Ø¹ÙÙ Ø²Ø± ØªÙØ± Ø§ÙØ§Ù: ÙØ§ ÙÙÙÙÙ Ø¥ÙÙØ§ÙÙ Ø§ÙØ§Ù \n\nÙÙÙØ§ ØšÙØ°Ø§ Ø§ÙØªØºÙÙØ± ÙØ§ÙÙ Ø§ØµØšØ ÙÙ ØºÙØ± Ø§ÙØ¢ÙÙ Ø§Ø³ØªØ®Ø¯Ø§Ù Ø²Ø± ØªÙØ± ÙÙ Ø§ÙÙØªØµÙØ Ø§ÙØ°Ù ÙØ³ØªØ®Ø¯Ù ÙÙ Ø§ÙØªØµÙØ Ø®Ø§Ø±Ø¬ ØªÙØ±. ÙØ§Ù ÙÙØ§Ù Ø§ÙØ¹Ø¯ÙØ¯ ÙÙ Ø§ÙØ¹ÙÙ Ù Ø§ÙØªÙ ÙÙ ÙÙÙÙ ÙÙ Ø§ÙÙÙÙÙ ÙØ¹Ø§ÙØ¬ØªÙØ§ ØšØ§Ù Ø·Ø±ÙÙØ© Ø§Ø®Ø±Ù.\n\nØ¥Ø°Ø§ Ø§Ø±Ø¯Øª Ø§ÙØ§Ø³ØªÙØ±Ø§Ø± ÙÙ Ø§Ø³ØªØ®Ø¯Ø§Ù ÙØ§ÙØ±ÙÙÙØ³ ØªÙÙÙØ¯ÙØ§ÙØ ÙØªÙØ¬Øš Ø¹ÙÙÙ Ø¥Ø²Ø§ÙØ© Ø²Ø± ØªÙØ± Ù ØªØÙÙÙ ØØ²ÙØ© ÙØªØµÙØ ØªÙØ±. ÙÙØ§ Ø§Ù Ø®ØµØ§ØŠØµ Ø§ÙØ®ØµÙØµÙØ© ÙÙØªØµÙØ ØªÙØ± ØªØªÙÙÙ Ø¹ÙÙ ØªÙÙ Ø§ÙØªÙ ÙÙ ÙØªØµÙØ ÙØ§ÙØ±ÙÙÙØ³ Ø§ÙØªÙÙÙØ¯ÙØ ØØªÙ ÙÙ ØªÙ Ø§Ø³ØªØ®Ø¯Ø§Ù ÙØªØµÙØ ÙØ§ÙØ±ÙÙÙØ³ ÙØ¹ Ø²Ø± ØªÙØ±.\n\nÙØ¥Ø²Ø§ÙØ© Ø²Ø± ØªÙØ±Ø Ø§Ø°ÙØš Ø¥ÙÙ Ø£Ø¯ÙØ§Øª->Ø¥Ø¶Ø§ÙØ§Øª->ÙØÙÙØ§Øª Ø Ø«Ù Ø¥Ø¶ØºØ· Ø¹ÙÙ Ø²Ø± Ø¥Ø²Ø§ÙØ© Ø§ÙØ°Ù ØšØ¬Ø§ÙØš Ø ²Ø± ØªÙØ±. -torbutton.popup.short_torbrowser = ÙØ¹ÙÙÙØ§Øª ÙØ§ÙØ© Ø¹Ù Ø²Ø± ØªÙØ± \n\nØªÙ ØªÙÙÙÙ Ø²Ø± ØªÙØ± ÙÙØ¹ÙÙ ØšØ§Ø³ØªÙØ±Ø§Ø± Ø§ÙØ§Ù\n\nØ§Ø¶ØºØ· Ø¹ÙÙ Ø²Ø± ØªÙØ± ÙÙÙØ²ÙØ¯ ÙÙ Ø§ÙÙØ¹ÙÙÙØ§Øª +torbutton.popup.dontask = ÙØ²ÙÙ Ø§ÙÙÙÙØ§Øª ØªÙÙØ§ØŠÙØ§ ÙÙ Ø§ÙØ¢Ù ÙØµØ§Ø¹Ø¯ÙØ§ +torbutton.popup.prompted_language = ÙÙÙÙØÙ Ø²Ø± ØªÙØ± ÙØ²ÙØ¯ÙØ§ ÙÙ Ø§ÙØ®ØµÙØµÙØ©Ø ÙÙÙÙÙ Ø£Ù ÙØ·ÙØš Ø§ÙÙØ³Ø® Ø§ÙØ¥ÙØ¬ÙÙØ²ÙØ© ÙÙ ØµÙØØ§Øª Ø§ÙØ¥ÙØªØ±ÙØª. ÙØ¯ ÙÙØªØ¬ Ø¹Ù Ø°ÙÙ Ø¹Ø±Ø¶ Ø§ÙØµÙØØ§Øª Ø§ÙØªÙ ØªÙØ¶Ù ÙØ±Ø§Ø¡ØªÙØ§ ØšÙØºØªÙ Ø§ÙØ£Ù ØšØ§ÙÙØºØ© Ø§ÙØ¥ÙØ¬ÙÙØ²ÙØ©.\n\nÙÙ ØªØ±ÙØ¯ Ø·ÙØš ØµÙØØ§Øª Ø§ÙÙØš ØšØ§ÙÙØºØ© Ø§ÙØ¥ÙØ¬ÙÙØ²ÙØ© ÙØ®ØµÙØµÙØ© Ø£ÙØ¶ÙØ +torbutton.popup.no_newnym = ÙØ§ ÙÙÙÙ ÙØ²Ø± ØªÙØ± Ø£Ù ÙØ¹Ø·ÙÙ ÙÙÙØ© Ø¬Ø¯ÙØ¯Ø© ØšØŽÙÙ Ø¢ÙÙØ ÙØ£ÙÙ ÙØ§ ÙØ³ØªØ·ÙØ¹ Ø§ÙÙØµÙÙ Ø¥ÙÙ ÙÙÙØ° ØªØÙÙ ØªÙØ±.\n\nÙÙ ØªØ³ØªØ®Ø¯Ù ØØ²ÙØ© ÙØªØµÙØ ØªÙØ± ØØ§ÙÙØ§ÙØ +torbutton.title.prompt_torbrowser = ÙØ¹ÙÙÙØ§Øª ÙØ§ÙØ© Ø¹Ù Ø²Ø± ØªÙØ± +torbutton.popup.prompt_torbrowser = ÙÙØ¯ ØªØºÙØ±Øª Ø·Ø±ÙÙØ© Ø¹ÙÙ Ø²Ø± ØªÙØ±: ÙÙ ÙØ¹Ø¯ ØšØ¥ÙÙØ§ÙÙ Ø¥ÙÙØ§ÙÙ.\n\nØ£Ø¬Ø±ÙÙØ§ ÙØ°Ø§ Ø§ÙØªØºÙÙØ± ÙØ£ÙÙ ÙÙ ØºÙØ± Ø§ÙØ¢ÙÙ Ø§Ø³ØªØ®Ø¯Ø§Ù Ø²Ø± ØªÙØ± ÙÙ Ø§ÙÙØªØµÙØ Ø§ÙØ°Ù ÙØ³ØªØ®Ø¯Ù ÙÙ Ø§ÙØªØµÙØ Ø®Ø§Ø±Ø¬ ØªÙØ±. ÙÙØ§Ù Ø§ÙØ¹Ø¯ÙØ¯ ÙÙ Ø§ÙØ¹ÙÙ Ø§ÙØªÙ ÙØ§ ÙÙÙÙ ÙØ¹Ø§ÙØ¬ØªÙØ§ ØšØ£Ù Ø·Ø±ÙÙØ© Ø£Ø®Ø±Ù.\n\nØ¥Ø°Ø§ Ø£Ø±Ø¯Øª Ø§ÙØ§Ø³ØªÙØ±Ø§Ø± ÙÙ Ø§Ø³ØªØ®Ø¯Ø§Ù ÙÙÙÙØ±ÙÙÙØ³ Ø¹Ø§Ø¯ÙØ§Ø ÙØ¹ÙÙÙ Ø¥Ø²Ø§ÙØ© Ø²Ø± ØªÙØ± ÙØªÙØ²ÙÙ ØØ²ÙØ© ÙØªØµÙØ ØªÙØ±. ÙÙØ§ Ø£Ù Ø®ØµØ§ØŠØµ Ø§ÙØ®ØµÙØµÙØ© ÙÙØªØµÙØ ØªÙØ± ØªØªÙÙÙ Ø¹ÙÙ ØªÙÙ Ø§ÙØªÙ ÙÙ ÙØªØµÙØ ÙÙÙÙØ±ÙÙÙØ³ Ø§ÙØ¹Ø§Ø¯ÙØ ØØªÙ Ø¹ÙØ¯ Ø§Ø³ØªØ®Ø¯Ø§ÙÙ ÙØ¹ Ø²Ø± ØªÙØ±.\n\nÙØ¥Ø²Ø§ÙØ© Ø²Ø± ØªÙØ±Ø Ø§Ø°ÙØš Ø¥ÙÙ Ø£Ø¯ÙØ§Øª->Ø¥Ø¶Ø§ÙØ§Øª->ÙØÙÙØ§Øª Ø Ø«Ù Ø§Ø¶ØºØ· Ø¹ÙÙ Ø²Ø± Ø¥Ø²Ø§ÙØ© Ø§ÙØ°Ù ØšØ¬Ø§ÙØš Ø²Ø± ØªÙØ±. +torbutton.popup.short_torbrowser = ÙØ¹ÙÙÙØ§Øª ÙØ§ÙØ© Ø¹Ù Ø²Ø± ØªÙØ±.\n\nØ²Ø± ØªÙØ± ÙÙØ¹ÙÙ Ø¯Ø§ØŠÙØ§ Ø§ÙØ¢Ù.\n\nØ§Ø¶ØºØ· Ø¹ÙÙ Ø²Ø± ØªÙØ± ÙÙÙØ²ÙØ¯ ÙÙ Ø§ÙÙØ¹ÙÙÙØ§Øª. -torbutton.popup.confirm_plugins = Ø§ÙØšØ±Ø§ÙØ¬ Ø§ÙØ¥Ø¶Ø§ÙÙØ© ÙØ«Ù ÙÙØ§ØŽ ØªØ³ØªØ·ÙØ¹ Ø§Ù ØªØ¶Ø± ØšØ®ØµÙØµÙØªÙ Ù ØªÙØŽÙ ÙÙÙØªÙ.\n\nÙ ØªØ³ØªØ·ÙØ¹ Ø§ÙØ¶Ø§ Ø§Ù ØªØªØ¬ÙØš ØªÙØ± Ù ØªÙØŽÙ Ø¹Ù ÙÙØ§ÙÙ Ø§ÙØØ§ÙÙ Ù Ø¹ÙÙØ§Ù Ø§ÙØ£Ù ØšÙ Ø§ÙØ®Ø§Øµ ØšÙ.\n\nÙÙ Ø£ÙØª ÙØªØ£ÙØ¯ Ø£ÙÙ ØªØ±ÙØ¯ ØªÙØ¹ÙÙ Ø§ÙØšØ±Ø§ÙØ¬ Ø§ÙØ¥Ø¶Ø§ÙÙØ©Ø\n\n -torbutton.popup.never_ask_again = ÙØ§ ØªØ³Ø£ÙÙÙ ÙØ±Ø© Ø§Ø®Ø±Ù -torbutton.popup.confirm_newnym = ÙØªØµÙØ ØªÙØ± +torbutton.popup.confirm_plugins = Ø§ÙÙÙØÙØ§Øª ÙØ«Ù ÙÙØ§ØŽ ÙÙÙÙ Ø£Ù ØªØ¶Ø± ØšØ®ØµÙØµÙØªÙ ÙØªÙØŽÙ ÙÙÙØªÙ.\n\nÙÙØ§ ÙÙÙÙÙØ§ Ø£Ù ØªØªØ¬ÙØš ØªÙØ± Ù ØªÙØŽÙ Ø¹Ù ÙÙØ§ÙÙ Ø§ÙØØ§ÙÙ Ù Ø¹ÙÙØ§Ù Ø§ÙØ¥ÙØªØ±ÙØª (IP).\n\nÙÙ Ø£ÙØª ÙØªØ£ÙØ¯ Ø£ÙÙ ØªØ±ÙØ¯ ØªÙØ¹ÙÙ Ø§ÙÙÙØÙØ§ØªØ\n\n +torbutton.popup.never_ask_again = ÙØ§ ØªØ³Ø£ÙÙÙ ÙØ±Ø© Ø£Ø®Ø±Ù +torbutton.popup.confirm_newnym = Ø³ÙØºÙÙ ÙØªØµÙØ ØªÙØ± ÙÙ Ø§ÙÙÙØ§ÙØ° ÙØ§ÙØ£ÙØ³ÙØ©Ø ÙÙØ§ Ø³ØªÙØ³Ø ÙÙ Ø¬ÙØ³Ø§Øª Ø§ÙÙÙØ§ÙØ¹.\n\nØ£ØªØ±ÙØ¯ Ø¥Ø¹Ø§Ø¯Ø© ØªØŽØºÙÙ ÙØªØµÙØ ØªÙØ± Ø§ÙØ¢Ù Ø£Ù ØªØºÙÙØ± ÙÙÙØªÙØ\n\n -torbutton.slider_notification = ÙØ§ØŠÙØ© Ø§ÙØšØµÙØ© Ø§ÙØ®Ø¶Ø±Ø§Ø¡ ÙØ¯ÙÙØ§ Ø§ÙØ¢Ù ÙÙØ²ÙÙ Ø£ÙÙÙ Ø§ÙØ°Ù ÙÙÙÙÙ ÙÙ Ø¶ØšØ· ÙØ³ØªÙÙ Ø£ÙØ§ÙÙ. ØªØÙÙ ÙÙ Ø°ÙÙ! -torbutton.slider_notification_button = ÙØªØ Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§ÙØ£ÙØ§Ù +torbutton.slider_notification = ÙØ§ØŠÙØ© Ø§ÙØšØµÙØ© Ø§ÙØ®Ø¶Ø±Ø§Ø¡ ØšÙØ§ Ø§ÙØ¢Ù ØŽØ±ÙØ· ØªÙØ±ÙØ± Ø£ÙÙÙ ÙØªÙØ ÙÙ Ø¶ØšØ· ÙØ³ØªÙÙ Ø£ÙØ§ÙÙ. ØªØÙÙ ÙÙ Ø°ÙÙ! +torbutton.slider_notification_button = Ø§ÙØªØ Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§ÙØ£ÙØ§Ù torbutton.maximize_warning = ØªÙØšÙØ± ÙØªØµÙØ ØªÙØ± ÙØ¯ ÙØ³ÙØ ÙØšØ¹Ø¶ Ø§ÙÙÙØ§ÙØ¹ ØšØ§ÙØªØ¹Ø±Ù Ø¹ÙÙ ØØ¬Ù ØŽØ§ØŽØªÙØ ÙØ§Ø³ØªØ®Ø¯Ø§Ù ÙØ°Ù Ø§ÙÙØ¹ÙÙÙØ§Øª ÙØªÙÙÙÙ. ÙÙØµÙ ØšØ§ØšÙØ§Ø¡ ÙØ§ÙØ°Ù ÙØªØµÙ ØªÙØ± Ø¹ÙÙ ØØ¬ÙÙØ§ Ø§ÙØ§ÙØªØ±Ø§Ø¶Ù. # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=ÙØ°Ø§ Ø§ÙÙÙÙØ¹ (Ùª S) ØØ§ÙÙ Ø§Ø³ØªØ®Ø±Ø§Ø¬ ØšÙØ§ÙØ§Øª Ø§ÙØµÙØ±Ø© HTML5Ø ÙØ§ÙØªÙ ÙÙÙÙ Ø§Ø³ØªØ®Ø¯Ø§ÙÙØ§ ÙØªØØ¯ÙØ¯ ÙÙØ§ÙÙ ÙØªØØ¯ÙØ¯ Ø§ÙÙÙÙØšÙÙØªØ±.\n\nÙÙ ØªØ±ÙØ¯ Ø£Ù ÙØ³ÙØ ÙØªØµÙØ Tor ÙÙØ°Ø§ Ø§ÙÙÙÙØ¹ ÙØ§Ø³ØªØ®Ø±Ø§Ø¬ ØšÙØ§ÙØ§Øª Ø§ÙØµÙØ±Ø© Ø canvas.notNow=ÙÙ ÙÙØª Ø¢Ø®Ø± -canvas.notNowAccessKey=Ø§ÙÙÙÙ -canvas.allow=Ø§ÙØ³ÙØ§Ø ÙÙ Ø§ÙÙØ³ØªÙØšÙ -canvas.allowAccessKey=Ø§ -canvas.never=ÙÙØ³ ÙÙÙÙÙØ¹ ÙØ°Ø§ Ø§ØšØ¯Ø§Ù (ÙØ³ØªØØš) -canvas.neverAccessKey=Ø· +canvas.notNowAccessKey=Ù +canvas.allow=Ø§Ø³ÙØ ÙÙ Ø§ÙÙØ³ØªÙØšÙ +canvas.allowAccessKey=Ø³ +canvas.never=ÙØ§ ØªØ³ÙØ ÙÙØ°Ø§ Ø§ÙÙÙÙØ¹ Ø£ØšØ¯ÙØ§ (ÙØ³ØªØØ³Ù) +canvas.neverAccessKey=Ø¯ # Profile/startup error messages. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S is the application name. -profileProblemTitle=%SÙØŽÙÙÙ ÙÙ ÙÙÙ ØŽØ®ØµÙ -profileReadOnly=ÙØ§ ÙÙÙÙÙ ØªØŽØºÙÙ %S ÙÙ ÙØžØ§Ù ÙÙÙØ§Øª Ø®Ø§Øµ ØšØ§ÙÙØ±Ø§Ø¡Ø© ÙÙØ·. ÙØ±Ø¬Ù ÙØ³Ø® %S Ø¥ÙÙ ÙÙÙØ¹ Ø¢Ø®Ø± ÙØšÙ ÙØØ§ÙÙØ© Ø§Ø³ØªØ®Ø¯Ø§ÙÙØ§. -profileReadOnlyMac=ÙØ§ ÙÙÙÙÙ ØªØŽØºÙÙ %S ÙÙ ÙØžØ§Ù ÙÙÙØ§Øª Ø®Ø§Øµ ØšØ§ÙÙØ±Ø§Ø¡Ø© ÙÙØ·. ÙØ±Ø¬Ù ÙØ³Ø® %S Ø¥ÙÙ Ø³Ø·Ø Ø§ÙÙÙØªØš Ø£Ù ÙØ¬ÙØ¯ Ø§ÙØªØ·ØšÙÙØ§Øª ÙØšÙ ÙØØ§ÙÙØ© Ø§Ø³ØªØ®Ø¯Ø§ÙÙØ§. -profileAccessDenied=%S does not have permission to access the profile. Please adjust your file system permissions and try again. -profileMigrationFailed=Migration of your existing %S profile failed.\nNew settings will be used. +profileProblemTitle=ÙØŽÙÙØ© ÙÙ ÙÙÙ Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª %S +profileReadOnly=ÙØ§ ÙÙÙÙÙ ØªØŽØºÙÙ %S ÙÙ ÙØžØ§Ù ÙÙÙØ§Øª Ø®Ø§Øµ ØšØ§ÙÙØ±Ø§Ø¡Ø© ÙÙØ·. ÙØ±Ø¬Ù ÙØ³Ø® %S Ø¥ÙÙ ÙÙÙØ¹ Ø¢Ø®Ø± ÙØšÙ ÙØØ§ÙÙØ© Ø§Ø³ØªØ®Ø¯Ø§ÙÙ. +profileReadOnlyMac=ÙØ§ ÙÙÙÙÙ ØªØŽØºÙÙ %S ÙÙ ÙØžØ§Ù ÙÙÙØ§Øª Ø®Ø§Øµ ØšØ§ÙÙØ±Ø§Ø¡Ø© ÙÙØ·. ÙØ±Ø¬Ù ÙØ³Ø® %S Ø¥ÙÙ Ø³Ø·Ø Ø§ÙÙÙØªØš Ø£Ù ÙØ¬ÙØ¯ Ø§ÙØªØ·ØšÙÙØ§Øª ÙØšÙ ÙØØ§ÙÙØ© Ø§Ø³ØªØ®Ø¯Ø§ÙÙ. +profileAccessDenied=ÙØ§ ÙÙØªÙÙ %S Ø§ÙØµÙØ§ØÙØ§Øª Ø§ÙÙØ·ÙÙØšØ© ÙÙÙÙ Ø¥Ø¹Ø¯Ø§Ø¯Ø§ØªÙ. ÙØ±Ø¬Ù Ø¶ØšØ· ØµÙØ§ØÙØ§Øª ÙØžØ§Ù Ø§ÙÙÙÙØ§Øª Ø«Ù Ø¥Ø¹Ø§Ø¯Ø© Ø§ÙÙØØ§ÙÙØ©. +profileMigrationFailed=ÙØŽÙ ÙÙÙ ÙÙÙ Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª %S Ø§ÙÙÙØ¬ÙØ¯ Ø¥ÙÙ Ø§ÙØ¥ØµØ¯Ø§Ø±Ø© Ø§ÙØ¬Ø¯ÙØ¯Ø©.\nØ³ÙØ³ØªØ®Ø¯Ù ÙÙÙ Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø¬Ø¯ÙØ¯. diff --git a/src/chrome/locale/da/torbutton.dtd b/src/chrome/locale/da/torbutton.dtd index 5a82f18..7936505 100644 --- a/src/chrome/locale/da/torbutton.dtd +++ b/src/chrome/locale/da/torbutton.dtd @@ -47,4 +47,5 @@ <!ENTITY torbutton.prefs.sec_limit_typography "Nogle skrifttyper og matematiksymboler er deaktiverede."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Nogle skrifttyper, ikoner, matematiksymboler og billeder er deaktiveret."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Lyd og video (HTML5-medier) er klik-for-at-afspille."> -<!ENTITY torbutton.circuit_display.title "Tor-kredslÃžb for dette websted"> +<!ENTITY torbutton.circuit_display.title "Tor-kredslÃžb"> +<!ENTITY torbutton.circuit_display.new_circuit "Nyt kredslÃžb til dette sted"> diff --git a/src/chrome/locale/da/torbutton.properties b/src/chrome/locale/da/torbutton.properties index 54df12c..d3be2cc 100644 --- a/src/chrome/locale/da/torbutton.properties +++ b/src/chrome/locale/da/torbutton.properties @@ -2,9 +2,12 @@ torbutton.circuit_display.internet = Internet torbutton.circuit_display.ip_unknown = Ukendt IP-adresse torbutton.circuit_display.onion_site = LÃžg side torbutton.circuit_display.this_browser = Denne browser -torbutton.circuit_display.relay = relÃŠ +torbutton.circuit_display.relay = RelÃŠ torbutton.circuit_display.tor_bridge = Bro torbutton.circuit_display.unknown_country = Ukendt land +torbutton.circuit_display.guard = Vagt +torbutton.circuit_display.guard_note = Dit [Vagt]-knudepunkt mÃ¥ ikke ÃŠndres. +torbutton.circuit_display.learn_more = LÃŠr mere torbutton.content_sizer.margin_tooltip = Tor Browser tilfÃžjer denne margin for at gÃžre dit vindues hÃžjde og bredde mindre genkendeligt, hvilket reducerer muligheden for at andre spore dig online. torbutton.panel.tooltip.disabled = Klik for at aktivere Tor torbutton.panel.tooltip.enabled = Klik for at deaktivere Tor diff --git a/src/chrome/locale/de/torbutton.dtd b/src/chrome/locale/de/torbutton.dtd index b4fb858..7fbb0f1 100644 --- a/src/chrome/locale/de/torbutton.dtd +++ b/src/chrome/locale/de/torbutton.dtd @@ -48,4 +48,5 @@ <!ENTITY torbutton.prefs.sec_limit_typography "Einige Schriftarten und mathematische Symbole sind deaktiviert."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Einige Schriftarten, Symbole, mathematische Symbole und Bilder sind deaktiviert."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Audio und Video (HTML5-Medien) mÃŒssen zur Wiedergabe angeklickt werden."> -<!ENTITY torbutton.circuit_display.title "Tor-Kanal fÃŒr diese Seite"> +<!ENTITY torbutton.circuit_display.title "Tor Circuit"> +<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site"> diff --git a/src/chrome/locale/de/torbutton.properties b/src/chrome/locale/de/torbutton.properties index 1e38c45..e3c33c7 100644 --- a/src/chrome/locale/de/torbutton.properties +++ b/src/chrome/locale/de/torbutton.properties @@ -2,9 +2,12 @@ torbutton.circuit_display.internet = Internet torbutton.circuit_display.ip_unknown = IP ist unbekannt torbutton.circuit_display.onion_site = Onion-Seite torbutton.circuit_display.this_browser = Dieser Browser -torbutton.circuit_display.relay = Relais +torbutton.circuit_display.relay = Verteiler torbutton.circuit_display.tor_bridge = BrÃŒcke torbutton.circuit_display.unknown_country = Unbekanntes Land +torbutton.circuit_display.guard = Guard +torbutton.circuit_display.guard_note = Your [Guard] node may not change. +torbutton.circuit_display.learn_more = Erfahren Sie mehr torbutton.content_sizer.margin_tooltip = Tor Browser fÃŒgt diese Begrenzung hinzu, um die Breite und HÃ¶he Ihres Fensters weniger einzigartig zu machen. Dadurch wird es anderen erschwert, Sie im Internet zu verfolgen. torbutton.panel.tooltip.disabled = Klicken, um Tor zu aktivieren torbutton.panel.tooltip.enabled = Klicken, um Tor zu deaktivieren diff --git a/src/chrome/locale/es/torbutton.dtd b/src/chrome/locale/es/torbutton.dtd index 5408736..465fea8 100644 --- a/src/chrome/locale/es/torbutton.dtd +++ b/src/chrome/locale/es/torbutton.dtd @@ -32,7 +32,7 @@ <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "H"> <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Mantenga esta casilla marcada para ocultar cosas a los sitios web que podrÃan ser Ãºnicas acerca de usted, incluyendo el rendimiento de su equipo, plano de teclado, localizaciÃ³n, lista y ubicacion de complementos instalados, estado de su red, orientaciÃ³n de pantalla, tamaÃ±o de pantalla, niveles de zoom especÃfico del sitio, tipos de fichero soportados, colores del sistema, y capacidades WebGL. "> <!ENTITY torbutton.prefs.sec_caption "Nivel de seguridad"> -<!ENTITY torbutton.prefs.sec_caption_tooltip "El control deslizante del nivel de seguridad le permite deshabilitar ciertas caracterÃsticas del navegador que pueden hacerlo mÃ¡s vulnerable a tentativas de hackeo."> +<!ENTITY torbutton.prefs.sec_caption_tooltip "El control deslizante del nivel de seguridad te permite deshabilitar ciertas caracterÃsticas del navegador que pueden hacerlo mÃ¡s vulnerable a tentativas de hackeo."> <!ENTITY torbutton.prefs.sec_standard_label "EstÃ¡ndar"> <!ENTITY torbutton.prefs.sec_standard_description "EstÃ¡n habilitadas todas las caracterÃsticas de Navegador Tor y sitio web."> <!ENTITY torbutton.prefs.sec_safer_label "MÃ¡s segura"> @@ -47,4 +47,5 @@ <!ENTITY torbutton.prefs.sec_limit_typography "Algunas fuentes y sÃmbolos matemÃ¡ticos estÃ¡n deshabilitados."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Algunas fuentes, iconos, sÃmbolos matemÃ¡ticos, e imÃ¡genes estÃ¡n deshabilitados."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Audio y vÃdeo (medios HTML5) son de tipo pulsar-para-reproducir."> -<!ENTITY torbutton.circuit_display.title "Circuito Tor para este sitio"> +<!ENTITY torbutton.circuit_display.title "Circuito Tor"> +<!ENTITY torbutton.circuit_display.new_circuit "Nuevo Circuito para este Sitio"> diff --git a/src/chrome/locale/es/torbutton.properties b/src/chrome/locale/es/torbutton.properties index 35a796a..5463ea1 100644 --- a/src/chrome/locale/es/torbutton.properties +++ b/src/chrome/locale/es/torbutton.properties @@ -2,9 +2,12 @@ torbutton.circuit_display.internet = Internet torbutton.circuit_display.ip_unknown = IP desconocida torbutton.circuit_display.onion_site = Sitio onion torbutton.circuit_display.this_browser = Este navegador -torbutton.circuit_display.relay = repetidor +torbutton.circuit_display.relay = Relay torbutton.circuit_display.tor_bridge = Repetidor puente (bridge) torbutton.circuit_display.unknown_country = PaÃs desconocido +torbutton.circuit_display.guard = ProtecciÃ³n +torbutton.circuit_display.guard_note = Tu nodo [de protecciÃ³n] no puede cambiar. +torbutton.circuit_display.learn_more = Conocer mÃ¡s torbutton.content_sizer.margin_tooltip = El Navegador Tor aÃ±ade este margen para hacer el ancho y el alto de tu ventana menos especial, y reducir de esta forma la posibilidad de rastrearte en lÃnea. torbutton.panel.tooltip.disabled = Haga clic para habilitar Tor torbutton.panel.tooltip.enabled = Haga clic para deshabilitar Tor diff --git a/src/chrome/locale/eu/torbutton.dtd b/src/chrome/locale/eu/torbutton.dtd index 94062c1..fc95c71 100644 --- a/src/chrome/locale/eu/torbutton.dtd +++ b/src/chrome/locale/eu/torbutton.dtd @@ -47,4 +47,5 @@ <!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play."> -<!ENTITY torbutton.circuit_display.title "Gune honetako Tor zirkuitua"> +<!ENTITY torbutton.circuit_display.title "Tor Circuit"> +<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site"> diff --git a/src/chrome/locale/eu/torbutton.properties b/src/chrome/locale/eu/torbutton.properties index 0799da2..e77d04a 100644 --- a/src/chrome/locale/eu/torbutton.properties +++ b/src/chrome/locale/eu/torbutton.properties @@ -2,9 +2,12 @@ torbutton.circuit_display.internet = Internet torbutton.circuit_display.ip_unknown = IP ezezaguna torbutton.circuit_display.onion_site = Onion webgunea torbutton.circuit_display.this_browser = Nagibatzaile hau -torbutton.circuit_display.relay = errele +torbutton.circuit_display.relay = Errele torbutton.circuit_display.tor_bridge = Zubia torbutton.circuit_display.unknown_country = Herrialde ezezaguna +torbutton.circuit_display.guard = Guard +torbutton.circuit_display.guard_note = Your [Guard] node may not change. +torbutton.circuit_display.learn_more = Learn more torbutton.content_sizer.margin_tooltip = Tor nabigatzaileak marjin hau gehitzen du zure lehioaren zabalera eta altuera ez hain bereizgarria egiteko, horrela norbaitek zure jarraipena egiteko gaitasuna murriztuz. torbutton.panel.tooltip.disabled = Sakatu Tor gaitzeko torbutton.panel.tooltip.enabled = Sakatu Tor ezgaitzeko diff --git a/src/chrome/locale/fa/torbutton.dtd b/src/chrome/locale/fa/torbutton.dtd index 9972010..61323e6 100644 --- a/src/chrome/locale/fa/torbutton.dtd +++ b/src/chrome/locale/fa/torbutton.dtd @@ -47,4 +47,5 @@ <!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play."> -<!ENTITY torbutton.circuit_display.title "ÙØ¯Ø§Ø± ØªÙØ± ØšØ±Ø§Û Ø§ÛÙ Ø³Ø§ÛØª"> +<!ENTITY torbutton.circuit_display.title "Tor Circuit"> +<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site"> diff --git a/src/chrome/locale/fa/torbutton.properties b/src/chrome/locale/fa/torbutton.properties index e21d475..7b282da 100644 --- a/src/chrome/locale/fa/torbutton.properties +++ b/src/chrome/locale/fa/torbutton.properties @@ -5,6 +5,9 @@ torbutton.circuit_display.this_browser = Ø§ÛÙ ÙØ±ÙØ±Ú¯Ø± torbutton.circuit_display.relay = ØšØ§Ø²ÙŸØ®ØŽ torbutton.circuit_display.tor_bridge = ÙŸÙ torbutton.circuit_display.unknown_country = Ú©ØŽÙØ± ÙØ§ØŽÙØ§Ø®ØªÙ +torbutton.circuit_display.guard = Guard +torbutton.circuit_display.guard_note = Your [Guard] node may not change. +torbutton.circuit_display.learn_more = Ø§Ø·ÙØ§Ø¹Ø§Øª ØšÛØŽØªØ± torbutton.content_sizer.margin_tooltip = ÙØ±ÙØ±Ú¯Ø± Tor Ø§Ø¶Ø§ÙÙ ÙÛ Ú©ÙØ¯ Ø§ÛÙ ØØ§ØŽÛÙ Ø±Ø§ ØšÙ Ø¹Ø±Ø¶ Ù Ø§Ø±ØªÙØ§Ø¹ ÙŸÙØ¬Ø±Ù ØŽÙØ§ Ú©Ù Ú©ÙØªØ± ÙØŽØ®Øµ ØŽÙØ¯Ø Ù Ø¯Ø± ÙØªÛØ¬Ù ØšØ§Ø¹Ø« Ú©Ø§ÙØŽ ØªÙØ§ÙØ§ÛÛ ØšÙ Ø±Ø¯ÛØ§ØšÛ Ø¢ÙÙØ§ÛÙ ØŽÙØ§ ØŽÙØ¯. torbutton.panel.tooltip.disabled = ØšØ±Ø§Û ÙØ¹Ø§Ù Ú©Ø±Ø¯Ù ØªÙØ± Ú©ÙÙÚ© Ú©ÙÙØ¯ torbutton.panel.tooltip.enabled = ØšØ±Ø§Û ØºÙØ±ÙØ¹Ø§Ù Ú©Ø±Ø¯Ù ØªÙØ± Ú©ÙÙÚ© Ú©ÙÙØ¯ diff --git a/src/chrome/locale/fr/torbutton.dtd b/src/chrome/locale/fr/torbutton.dtd index 895d922..052b0ad 100644 --- a/src/chrome/locale/fr/torbutton.dtd +++ b/src/chrome/locale/fr/torbutton.dtd @@ -47,4 +47,5 @@ <!ENTITY torbutton.prefs.sec_limit_typography "Certaines polices et certains symboles mathÃ©matiques sont dÃ©sactivÃ©s."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Certaines polices, icÃŽnes, images et certains symboles mathÃ©matiques sont dÃ©sactivÃ©s."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Le son et la vidÃ©o (mÃ©diasÂ HTML5) sont Â«Â cliquer pour lireÂ Â»."> -<!ENTITY torbutton.circuit_display.title "Circuit Tor pour ce site"> +<!ENTITY torbutton.circuit_display.title "Circuit Tor"> +<!ENTITY torbutton.circuit_display.new_circuit "Nouveau circuit pour ce site"> diff --git a/src/chrome/locale/fr/torbutton.properties b/src/chrome/locale/fr/torbutton.properties index f293385..5b7b344 100644 --- a/src/chrome/locale/fr/torbutton.properties +++ b/src/chrome/locale/fr/torbutton.properties @@ -2,9 +2,12 @@ torbutton.circuit_display.internet = Internet torbutton.circuit_display.ip_unknown = IP inconnue torbutton.circuit_display.onion_site = Site Oignon torbutton.circuit_display.this_browser = Ce navigateur -torbutton.circuit_display.relay = relayer +torbutton.circuit_display.relay = Relais torbutton.circuit_display.tor_bridge = Pont torbutton.circuit_display.unknown_country = Pays inconnu +torbutton.circuit_display.guard = Garde +torbutton.circuit_display.guard_note = Votre nÅud de [Guard] ne peut pas changer. +torbutton.circuit_display.learn_more = En apprendre davantage torbutton.content_sizer.margin_tooltip = Le Navigateur Tor ajoute cette marge pour rendre la largeur et la hauteur de votre fenÃªtre moins distinctives, et pour rÃ©duire par consÃ©quent la possibilitÃ© que lâon vous suive Ã la trace en ligne. torbutton.panel.tooltip.disabled = Cliquer pour activer Tor torbutton.panel.tooltip.enabled = Cliquer pour dÃ©sactiver Tor diff --git a/src/chrome/locale/it/torbutton.dtd b/src/chrome/locale/it/torbutton.dtd index 746ead5..b1cc844 100644 --- a/src/chrome/locale/it/torbutton.dtd +++ b/src/chrome/locale/it/torbutton.dtd @@ -47,4 +47,5 @@ <!ENTITY torbutton.prefs.sec_limit_typography "Alcuni caratteri e simboli matematici sono disattivati."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Alcuni caratteri, icone, simboli matematici e immagini sono disattivati."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Audio e video (media HTML5) sono click-to-play."> -<!ENTITY torbutton.circuit_display.title "Circuito Tor per questo sito"> +<!ENTITY torbutton.circuit_display.title "Circuito Tor"> +<!ENTITY torbutton.circuit_display.new_circuit "Nuovo circuito per questo sito"> diff --git a/src/chrome/locale/it/torbutton.properties b/src/chrome/locale/it/torbutton.properties index d83c43a..37034ed 100644 --- a/src/chrome/locale/it/torbutton.properties +++ b/src/chrome/locale/it/torbutton.properties @@ -2,9 +2,12 @@ torbutton.circuit_display.internet = Internet torbutton.circuit_display.ip_unknown = IP sconosciuto torbutton.circuit_display.onion_site = sito Onion torbutton.circuit_display.this_browser = Questo browser -torbutton.circuit_display.relay = relay +torbutton.circuit_display.relay = Ripetitore torbutton.circuit_display.tor_bridge = Bridge torbutton.circuit_display.unknown_country = Paese sconosciuto +torbutton.circuit_display.guard = Guard +torbutton.circuit_display.guard_note = Your [Guard] node may not change. +torbutton.circuit_display.learn_more = Per saperne di piÃ¹ torbutton.content_sizer.margin_tooltip = Il browser Tor aggiunge questo margine per rendere l'ampiezza e altezza della tua finestra meno distintiva, cosÃ¬ si riduce la possibilitÃ di che tu sia tracciato in linea. torbutton.panel.tooltip.disabled = Fai clic per attivare Tor torbutton.panel.tooltip.enabled = Fai clic per disattivare Tor diff --git a/src/chrome/locale/ja/torbutton.dtd b/src/chrome/locale/ja/torbutton.dtd index 04549c0..359dcf4 100644 --- a/src/chrome/locale/ja/torbutton.dtd +++ b/src/chrome/locale/ja/torbutton.dtd @@ -47,4 +47,5 @@ <!ENTITY torbutton.prefs.sec_limit_typography "ããã€ãã®ãã©ã³ããšæ°åŠèšå·ãç¡å¹åãããŸãã"> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "ããã€ãã®ã¢ã€ã³ã³ãæ°åŠèšå·ããã³ç»åãç¡å¹åãããŸãã"> <!ENTITY torbutton.prefs.sec_click_to_play_media "ãªãŒãã£ãªãšãããª(HTML5ã¡ãã£ã¢)ã¯ã¯ãªãã¯ãããšåçãããŸãã"> -<!ENTITY torbutton.circuit_display.title "ãã®ãµã€ãçšã® Tor ãµãŒããã"> +<!ENTITY torbutton.circuit_display.title "Tor Circuit"> +<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site"> diff --git a/src/chrome/locale/ja/torbutton.properties b/src/chrome/locale/ja/torbutton.properties index b8735d0..dec68bf 100644 --- a/src/chrome/locale/ja/torbutton.properties +++ b/src/chrome/locale/ja/torbutton.properties @@ -5,6 +5,9 @@ torbutton.circuit_display.this_browser = ãã®ãã©ãŠã¶ãŒ torbutton.circuit_display.relay = ãªã¬ãŒ torbutton.circuit_display.tor_bridge = ããªããž torbutton.circuit_display.unknown_country = äžæãªåœ +torbutton.circuit_display.guard = Guard +torbutton.circuit_display.guard_note = Your [Guard] node may not change. +torbutton.circuit_display.learn_more = ããã«ç¥ã torbutton.content_sizer.margin_tooltip = Tor Browser ã¯ãŠã£ã³ããŠã®ãµã€ãºãå¹³å¡ã«ããããã«ãã®ããŒãžã³ãè¿œå ããŸããããã«ãããããªãã®ããšããªã³ã©ã€ã³ã§è¿œè·¡ãã«ããããŸãã torbutton.panel.tooltip.disabled = ã¯ãªãã¯ããŠTorãæå¹ã«ãã torbutton.panel.tooltip.enabled = ã¯ãªãã¯ããŠTorãç¡å¹ã«ãã diff --git a/src/chrome/locale/ko/torbutton.dtd b/src/chrome/locale/ko/torbutton.dtd index f3f2093..835a7cc 100644 --- a/src/chrome/locale/ko/torbutton.dtd +++ b/src/chrome/locale/ko/torbutton.dtd @@ -47,4 +47,5 @@ <!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play."> -<!ENTITY torbutton.circuit_display.title "ìŽ ì¬ìŽíž ìì ì Tor íë¡"> +<!ENTITY torbutton.circuit_display.title "Tor Circuit"> +<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site"> diff --git a/src/chrome/locale/ko/torbutton.properties b/src/chrome/locale/ko/torbutton.properties index 1f1054a..7ec0238 100644 --- a/src/chrome/locale/ko/torbutton.properties +++ b/src/chrome/locale/ko/torbutton.properties @@ -2,9 +2,12 @@ torbutton.circuit_display.internet = ìží°ë· torbutton.circuit_display.ip_unknown = ë¯žíìž IP torbutton.circuit_display.onion_site = Onion ì¬ìŽíž torbutton.circuit_display.this_browser = ìŽ ëžëŒì°ì -torbutton.circuit_display.relay = ì€ê³ +torbutton.circuit_display.relay = ì€ê³ìë² torbutton.circuit_display.tor_bridge = ëžëŠ¿ì§ torbutton.circuit_display.unknown_country = ë¯žíìž êµê° +torbutton.circuit_display.guard = Guard +torbutton.circuit_display.guard_note = Your [Guard] node may not change. +torbutton.circuit_display.learn_more = ë ììë³Žêž° torbutton.content_sizer.margin_tooltip = Tor ëžëŒì°ì ë ìŽ ì¬ë°±ì ì¶ê°íì¬ ì°œì ëë¹ì ëìŽë¥Œ ìŒë°í ììŒ ìšëŒìžìì ì¬ì©ìë¥Œ ì¶ì íë êž°ë¥ì ìœí ìíµëë€. torbutton.panel.tooltip.disabled = Torë¥Œ íì±ííë €ë©Ž íŽëŠ torbutton.panel.tooltip.enabled = Torë¥Œ ë¹íì±ííë €ë©Ž íŽëŠ diff --git a/src/chrome/locale/nl/torbutton.dtd b/src/chrome/locale/nl/torbutton.dtd index ce0e13a..7b7e6db 100644 --- a/src/chrome/locale/nl/torbutton.dtd +++ b/src/chrome/locale/nl/torbutton.dtd @@ -47,4 +47,5 @@ <!ENTITY torbutton.prefs.sec_limit_typography "Sommige lettertypen en wiskundige symbolen zijn uitgeschakeld."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Sommige lettertypen, pictogrammen, wiskundige symbolen en afbeeldingen zijn uitgeschakeld."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Audio en video (HTML5-media) zijn klik-bij-afspelen."> -<!ENTITY torbutton.circuit_display.title "Tor-circuit voor deze website"> +<!ENTITY torbutton.circuit_display.title "Tor Circuit"> +<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site"> diff --git a/src/chrome/locale/nl/torbutton.properties b/src/chrome/locale/nl/torbutton.properties index 87595e2..ccdac33 100644 --- a/src/chrome/locale/nl/torbutton.properties +++ b/src/chrome/locale/nl/torbutton.properties @@ -2,9 +2,12 @@ torbutton.circuit_display.internet = Internet torbutton.circuit_display.ip_unknown = IP-adres onbekend torbutton.circuit_display.onion_site = Onion-site torbutton.circuit_display.this_browser = Deze browser -torbutton.circuit_display.relay = relay +torbutton.circuit_display.relay = Relay torbutton.circuit_display.tor_bridge = Bridge torbutton.circuit_display.unknown_country = Onbekend land +torbutton.circuit_display.guard = Guard +torbutton.circuit_display.guard_note = Your [Guard] node may not change. +torbutton.circuit_display.learn_more = Lees meer torbutton.content_sizer.margin_tooltip = Tor Browser voegt deze rand toe om de afmetingen van het venster minder uit de toon te laten vallen. Dit maakt het moeilijker om u online te volgen. torbutton.panel.tooltip.disabled = Hier klikken om Tor in te schakelen torbutton.panel.tooltip.enabled = Hier klikken om Tor uit te schakelen diff --git a/src/chrome/locale/pl/torbutton.dtd b/src/chrome/locale/pl/torbutton.dtd index 47e21ca..2ceab63 100644 --- a/src/chrome/locale/pl/torbutton.dtd +++ b/src/chrome/locale/pl/torbutton.dtd @@ -47,4 +47,5 @@ <!ENTITY torbutton.prefs.sec_limit_typography "NiektÃ³re fonty i symbole sÄ wyÅÄczone."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "NiektÃ³re fonty, ikony, symbole i obrazki sÄ wyÅÄczone."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play."> -<!ENTITY torbutton.circuit_display.title "ObwÃ³d Tor dla tej strony"> +<!ENTITY torbutton.circuit_display.title "Tor Circuit"> +<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site"> diff --git a/src/chrome/locale/pl/torbutton.properties b/src/chrome/locale/pl/torbutton.properties index 7164f69..aea4730 100644 --- a/src/chrome/locale/pl/torbutton.properties +++ b/src/chrome/locale/pl/torbutton.properties @@ -2,9 +2,12 @@ torbutton.circuit_display.internet = Internet torbutton.circuit_display.ip_unknown = IP nieznany torbutton.circuit_display.onion_site = strona Onion torbutton.circuit_display.this_browser = Ta przeglÄdarka -torbutton.circuit_display.relay = przekaÅºnik +torbutton.circuit_display.relay = PrzekaÅºnik torbutton.circuit_display.tor_bridge = Bridge torbutton.circuit_display.unknown_country = Nieznane paÅstwo +torbutton.circuit_display.guard = Guard +torbutton.circuit_display.guard_note = Your [Guard] node may not change. +torbutton.circuit_display.learn_more = Dowiedz siÄ wiÄcej torbutton.content_sizer.margin_tooltip = PrzeglÄdarka Tor dodaje ten margines po to, aby szerokoÅÄ i wysokoÅÄ okna Twojej przeglÄdarki byÅa mniej charakterystyczna, dziÄki temu zmniejszysz szanse Åledzenia Ciebie online. torbutton.panel.tooltip.disabled = Kliknij tutaj, aby wÅÄczyÄ Tora torbutton.panel.tooltip.enabled = Kliknij tutaj, aby wyÅÄczyÄ Tora diff --git a/src/chrome/locale/pt-BR/torbutton.dtd b/src/chrome/locale/pt-BR/torbutton.dtd index 2798ee0..64e87c2 100644 --- a/src/chrome/locale/pt-BR/torbutton.dtd +++ b/src/chrome/locale/pt-BR/torbutton.dtd @@ -47,4 +47,5 @@ <!ENTITY torbutton.prefs.sec_limit_typography "Algumas fontes e sÃmbolos matemÃ¡ticos estÃ£o desativados."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Algumas fontes, Ãcones, sÃmbolos matemÃ¡ticas e imagens estÃ£o desativadas."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Clicar para tocar ou ver Ã¡udio ou vÃdeo (mÃdia HTML5)."> -<!ENTITY torbutton.circuit_display.title "Circuito Tor para este site"> +<!ENTITY torbutton.circuit_display.title "Tor Circuit"> +<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site"> diff --git a/src/chrome/locale/pt-BR/torbutton.properties b/src/chrome/locale/pt-BR/torbutton.properties index 6c61a97..df5f7fe 100644 --- a/src/chrome/locale/pt-BR/torbutton.properties +++ b/src/chrome/locale/pt-BR/torbutton.properties @@ -2,9 +2,12 @@ torbutton.circuit_display.internet = Internet torbutton.circuit_display.ip_unknown = IP desconhecido torbutton.circuit_display.onion_site = Site Onion torbutton.circuit_display.this_browser = Este navegador -torbutton.circuit_display.relay = retransmitir +torbutton.circuit_display.relay = RelÃª torbutton.circuit_display.tor_bridge = Ponte torbutton.circuit_display.unknown_country = PaÃs desconhecido +torbutton.circuit_display.guard = Guard +torbutton.circuit_display.guard_note = Your [Guard] node may not change. +torbutton.circuit_display.learn_more = Aprenda mais torbutton.content_sizer.margin_tooltip = O Navegador Tor inclui esta margem para que a altura e a largura da janela sejam menos distinguÃveis, o que reduz a possibilidade de que alguÃ©m rastreie a sua navegaÃ§Ã£o . torbutton.panel.tooltip.disabled = Clique para habilitar o Tor torbutton.panel.tooltip.enabled = Clique para desabilitar o Tor diff --git a/src/chrome/locale/ru/torbutton.dtd b/src/chrome/locale/ru/torbutton.dtd index 50063ce..7ca05b7 100644 --- a/src/chrome/locale/ru/torbutton.dtd +++ b/src/chrome/locale/ru/torbutton.dtd @@ -47,4 +47,5 @@ <!ENTITY torbutton.prefs.sec_limit_typography "ÐÐµÐºÐŸÑÐŸÑÑÐµ ÑÑÐžÑÑÑ Ðž ÐŒÐ°ÑÐµÐŒÐ°ÑÐžÑÐµÑÐºÐžÐµ ÑÐžÐŒÐ²ÐŸÐ»Ñ ÐŸÑÐºÐ»ÑÑÐµÐœÑ."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "ÐÐµÐºÐŸÑÐŸÑÑÐµ ÑÑÐžÑÑÑ, Ð·ÐœÐ°ÑÐºÐž, ÐŒÐ°ÑÐµÐŒÐ°ÑÐžÑÐµÑÐºÐžÐµ ÑÐžÐŒÐ²ÐŸÐ»Ñ Ðž ÐžÐ·ÐŸÐ±ÑÐ°Ð¶ÐµÐœÐžÑ ÐŸÑÐºÐ»ÑÑÐµÐœÑ."> <!ENTITY torbutton.prefs.sec_click_to_play_media "ÐÑÐŽÐžÐŸ Ðž Ð²ÐžÐŽÐµÐŸ (HTML5 ÐŒÐµÐŽÐžÐ°) Ð¿ÑÐŸÐžÐ³ÑÑÐ²Ð°ÑÑÑÑ ÑÐŸÐ»ÑÐºÐŸ Ð¿ÐŸÑÐ»Ðµ ÐºÐ»ÐžÐºÐ°."> -<!ENTITY torbutton.circuit_display.title "ÐŠÐµÐ¿ÐŸÑÐºÐ° Tor ÐŽÐ»Ñ ÑÑÐŸÐ³ÐŸ ÑÐ°Ð¹ÑÐ°"> +<!ENTITY torbutton.circuit_display.title "Ð¡ÑÐµÐŒÐ° Tor"> +<!ENTITY torbutton.circuit_display.new_circuit "ÐÐŸÐ²Ð°Ñ ÑÑÐµÐŒÐ° ÐŽÐ»Ñ ÑÑÐŸÐ³ÐŸ Ð¡Ð°Ð¹ÑÐ°"> diff --git a/src/chrome/locale/ru/torbutton.properties b/src/chrome/locale/ru/torbutton.properties index 5f6f439..2194c84 100644 --- a/src/chrome/locale/ru/torbutton.properties +++ b/src/chrome/locale/ru/torbutton.properties @@ -2,9 +2,12 @@ torbutton.circuit_display.internet = ÐÐœÑÐµÑÐœÐµÑ torbutton.circuit_display.ip_unknown = IP ÐœÐµÐžÐ·Ð²ÐµÑÑÐµÐœ torbutton.circuit_display.onion_site = "ÐÑÐºÐŸÐ²ÑÐ¹" ÑÐ°Ð¹Ñ torbutton.circuit_display.this_browser = ÐÑÐŸÑ Ð±ÑÐ°ÑÐ·ÐµÑ -torbutton.circuit_display.relay = ÑÐ·ÐµÐ» +torbutton.circuit_display.relay = Ð ÐµÑÑÐ°ÐœÑÐ»ÑÑÐŸÑ torbutton.circuit_display.tor_bridge = Ð ÐµÑÑÐ°ÐœÑÐ»ÑÑÐŸÑ torbutton.circuit_display.unknown_country = ÐÐµÐžÐ·Ð²ÐµÑÑÐœÐ°Ñ ÑÑÑÐ°ÐœÐ° +torbutton.circuit_display.guard = Guard +torbutton.circuit_display.guard_note = ÐÐ°Ñ [Guard] ÑÐ·ÐµÐ» ÐœÐµ ÐŒÐŸÐ¶ÐµÑ Ð±ÑÑÑ ÐžÐ·ÐŒÐµÐœÐµÐœ. +torbutton.circuit_display.learn_more = ÐÐŸÐŽÑÐŸÐ±ÐœÐµÐµ torbutton.content_sizer.margin_tooltip = Tor Browser ÐŽÐŸÐ±Ð°Ð²Ð»ÑÐµÑ ÑÑÐŸÑ ÐŸÑÑÑÑÐ¿, ÑÑÐŸÐ±Ñ ÑÐžÑÐžÐœÐ° Ðž Ð²ÑÑÐŸÑÐ° ÐŸÐºÐœÐ° Ð±ÑÐ»Ðž ÐŒÐµÐœÐµÐµ ÑÐ·ÐœÐ°Ð²Ð°ÐµÐŒÑÐŒÐž, ÑÑÐŸ ÑÑÐ»ÐŸÐ¶ÐœÑÐµÑ Ð²ÐŸÐ·ÐŒÐŸÐ¶ÐœÐŸÑÑÑ ÐŸÑÑÐ»ÐµÐŽÐžÑÑ ÐÐ°Ñ Ð² ÑÐµÑÐž. torbutton.panel.tooltip.disabled = ÐÐ°Ð¶ÐŒÐžÑÐµ, ÑÑÐŸÐ±Ñ Ð²ÐºÐ»ÑÑÐžÑÑ Tor torbutton.panel.tooltip.enabled = ÐÐ°Ð¶ÐŒÐžÑÐµ, ÑÑÐŸÐ±Ñ ÐŸÑÐºÐ»ÑÑÐžÑÑ Tor diff --git a/src/chrome/locale/sv/torbutton.dtd b/src/chrome/locale/sv/torbutton.dtd index aac0ea8..e61d393 100644 --- a/src/chrome/locale/sv/torbutton.dtd +++ b/src/chrome/locale/sv/torbutton.dtd @@ -47,4 +47,5 @@ <!ENTITY torbutton.prefs.sec_limit_typography "Vissa typsnitt och matte symboler Ã€r inaktiverade."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Vissa typsnitt, ikoner, matte symboler och bilder Ã€r inaktiverade."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Ljud och video (HTML5-media) Ã€r klicka-fÃ¶r-att-spel."> -<!ENTITY torbutton.circuit_display.title "Tor-krets fÃ¶r den hÃ€r webbplatsen"> +<!ENTITY torbutton.circuit_display.title "Tor Circuit"> +<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site"> diff --git a/src/chrome/locale/sv/torbutton.properties b/src/chrome/locale/sv/torbutton.properties index 7f0765d..c78ff5c 100644 --- a/src/chrome/locale/sv/torbutton.properties +++ b/src/chrome/locale/sv/torbutton.properties @@ -2,9 +2,12 @@ torbutton.circuit_display.internet = Internet torbutton.circuit_display.ip_unknown = OkÃ€nd IP-adress. torbutton.circuit_display.onion_site = Onion webbplats torbutton.circuit_display.this_browser = Denna webblÃ€sare -torbutton.circuit_display.relay = relÃ€ +torbutton.circuit_display.relay = Router torbutton.circuit_display.tor_bridge = Brygga torbutton.circuit_display.unknown_country = OkÃ€nt land +torbutton.circuit_display.guard = Guard +torbutton.circuit_display.guard_note = Your [Guard] node may not change. +torbutton.circuit_display.learn_more = LÃ€s mer torbutton.content_sizer.margin_tooltip = Tor Browser lÃ€gger till denna marginal fÃ¶r att gÃ¶ra bredden och hÃ¶jden pÃ¥ ditt fÃ¶nster mindre tydlig. DÃ€rmed minskas mÃ¶jligheten att spÃ¥ra dig. torbutton.panel.tooltip.disabled = Klicka fÃ¶r att aktivera Tor torbutton.panel.tooltip.enabled = Klicka fÃ¶r att inaktivera Tor diff --git a/src/chrome/locale/tr/torbutton.dtd b/src/chrome/locale/tr/torbutton.dtd index a696ebe..be0a563 100644 --- a/src/chrome/locale/tr/torbutton.dtd +++ b/src/chrome/locale/tr/torbutton.dtd @@ -47,4 +47,5 @@ <!ENTITY torbutton.prefs.sec_limit_typography "BazÄ± yazÄ± tÃŒrleri ve matematik simgeleri devre dÄ±ÅÄ± bÄ±rakÄ±lÄ±r."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "BazÄ± yazÄ± tÃŒrleri, simgeler, matematik simgeleri ve gÃ¶rseller devre dÄ±ÅÄ± bÄ±rakÄ±lÄ±r."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Ses ve gÃ¶rÃŒntÃŒler (HTML5 ortamÄ±) tÄ±klayarak Ã§alÄ±ÅtÄ±rÄ±labilir."> -<!ENTITY torbutton.circuit_display.title "Bu site iÃ§in Tor devresi"> +<!ENTITY torbutton.circuit_display.title "Tor Circuit"> +<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site"> diff --git a/src/chrome/locale/tr/torbutton.properties b/src/chrome/locale/tr/torbutton.properties index ed7ee39..7b4b681 100644 --- a/src/chrome/locale/tr/torbutton.properties +++ b/src/chrome/locale/tr/torbutton.properties @@ -2,9 +2,12 @@ torbutton.circuit_display.internet = Ä°nternet torbutton.circuit_display.ip_unknown = Bilinmeyen IP torbutton.circuit_display.onion_site = SoÄan sitesi torbutton.circuit_display.this_browser = Bu tarayÄ±cÄ± -torbutton.circuit_display.relay = aktarÄ±cÄ± +torbutton.circuit_display.relay = Anahtarlama torbutton.circuit_display.tor_bridge = KÃ¶prÃŒ torbutton.circuit_display.unknown_country = Bilinmeyen Ãlke +torbutton.circuit_display.guard = Guard +torbutton.circuit_display.guard_note = Your [Guard] node may not change. +torbutton.circuit_display.learn_more = AyrÄ±ntÄ±lÄ± bilgi torbutton.content_sizer.margin_tooltip = Tor Browser pencerenizin geniÅlik ve yÃŒksekliÄini daha az ayÄ±rt edilebilir duruma getirmek iÃ§in kenar boÅluklarÄ± ekleyerek kiÅilerin sizi Ã§evrim iÃ§i olarak izleme yeteneÄini azaltÄ±r. torbutton.panel.tooltip.disabled = Tor yazÄ±lÄ±mÄ±nÄ± etkinleÅtirmek iÃ§in tÄ±klayÄ±n torbutton.panel.tooltip.enabled = Tor yazÄ±lÄ±mÄ±nÄ± devre dÄ±ÅÄ± bÄ±rakmak iÃ§in tÄ±klayÄ±n diff --git a/src/chrome/locale/vi/torbutton.dtd b/src/chrome/locale/vi/torbutton.dtd index d86b90c..6bbd492 100644 --- a/src/chrome/locale/vi/torbutton.dtd +++ b/src/chrome/locale/vi/torbutton.dtd @@ -47,4 +47,5 @@ <!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play."> -<!ENTITY torbutton.circuit_display.title "Äáº§u ná»i Tor dÃ nh cho trang nÃ y."> +<!ENTITY torbutton.circuit_display.title "Tor Circuit"> +<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site"> diff --git a/src/chrome/locale/vi/torbutton.properties b/src/chrome/locale/vi/torbutton.properties index 34a800c..b7b8a51 100644 --- a/src/chrome/locale/vi/torbutton.properties +++ b/src/chrome/locale/vi/torbutton.properties @@ -2,9 +2,12 @@ torbutton.circuit_display.internet = Internet torbutton.circuit_display.ip_unknown = Äá»a chá» IP khÃŽng biáº¿t Äáº¿n torbutton.circuit_display.onion_site = Trang cá»§ hÃ nh torbutton.circuit_display.this_browser = TrÃ¬nh duyá»t nÃ y -torbutton.circuit_display.relay = tiáº¿p sá»©c +torbutton.circuit_display.relay = Tiáº¿p sá»©c torbutton.circuit_display.tor_bridge = Cáº§u ná»i torbutton.circuit_display.unknown_country = Äáº¥t nÆ°á»c khÃŽng ÄÆ°á»£c biáº¿t Äáº¿n +torbutton.circuit_display.guard = Guard +torbutton.circuit_display.guard_note = Your [Guard] node may not change. +torbutton.circuit_display.learn_more = Biáº¿t thÃªm torbutton.content_sizer.margin_tooltip = TrÃ¬nh duyá»t Tor thÃªm lá» nÃ y Äá» lÃ m cho chiá»u rá»ng vÃ chiá»u cao cá»§a mÃ n hÃ¬nh cá»§a báº¡n Ãt dá» bá» phÃ¢n biá»t hÆ¡n, vÃ vÃ¬ tháº¿ giáº£m kháº£ nÄng cá»§a nhá»¯ng ngÆ°á»i theo dÃµi báº¡n trá»±c tuyáº¿n. torbutton.panel.tooltip.disabled = Nháº¥n Äá» báºt Tor torbutton.panel.tooltip.enabled = Nháº¥n Äá» táº¯t Tor diff --git a/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd index a43d991..d8ecba2 100644 --- a/src/chrome/locale/zh-CN/torbutton.dtd +++ b/src/chrome/locale/zh-CN/torbutton.dtd @@ -47,4 +47,5 @@ <!ENTITY torbutton.prefs.sec_limit_typography "äžäºåäœäžæ°åŠç¬Šå·è¢«çŠçšã"> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "äžäºåäœïŒåŸæ ïŒæ°åŠç¬Šå·äžåŸçè¢«çŠçšã"> <!ENTITY torbutton.prefs.sec_click_to_play_media "ç¹å»ææŸé³é¢æè§é¢ïŒHTML5 åªäœïŒã"> -<!ENTITY torbutton.circuit_display.title "äžºæ€ç«ç¹äœ¿çšç Tor çº¿è·¯"> +<!ENTITY torbutton.circuit_display.title "Tor Circuit"> +<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site"> diff --git a/src/chrome/locale/zh-CN/torbutton.properties b/src/chrome/locale/zh-CN/torbutton.properties index 398b639..b00744b 100644 --- a/src/chrome/locale/zh-CN/torbutton.properties +++ b/src/chrome/locale/zh-CN/torbutton.properties @@ -5,6 +5,9 @@ torbutton.circuit_display.this_browser = æ¬æµè§åš torbutton.circuit_display.relay = äžç»§ torbutton.circuit_display.tor_bridge = çœæ¡¥ torbutton.circuit_display.unknown_country = æªç¥åœå®¶ +torbutton.circuit_display.guard = Guard +torbutton.circuit_display.guard_note = Your [Guard] node may not change. +torbutton.circuit_display.learn_more = è¯Šç»äºè§£ torbutton.content_sizer.margin_tooltip = Tor æµè§åšæ·»å äºäžäºèŸ¹æ¡ïŒä»¥éäœçªå£å€§å°çç¬ç¹æ§ïŒä»€åšçº¿è·èžªçæ§ååŸæŽå å°éŸã torbutton.panel.tooltip.disabled = ç¹å»å¯çš Tor torbutton.panel.tooltip.enabled = ç¹å»çŠçš Tor

1 0

[torbutton/master] Bug 26235: Hide new unusable items from help menu (ESR60)
by gk＠torproject.org 30 May '18

30 May '18

commit 66048f2ad3c2708aec11d7414ec189e868c0d487 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue May 29 16:34:13 2018 -0400 Bug 26235: Hide new unusable items from help menu (ESR60) --- src/chrome/content/menu-overlay.xul | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/chrome/content/menu-overlay.xul b/src/chrome/content/menu-overlay.xul index f6c6fbd..1e812cc 100644 --- a/src/chrome/content/menu-overlay.xul +++ b/src/chrome/content/menu-overlay.xul @@ -14,6 +14,8 @@ <menuitem id="menu_HelpPopup_reportPhishingtoolmenu" removeelement="true"/> <menuitem id="menu_HelpPopup_reportPhishingErrortoolmenu" removeelement="true"/>  + <box id="feedbackPage"/> + <box id="helpSafeMode"/> <box id="menu_HelpPopup_reportPhishingtoolmenu"/> <box id="menu_HelpPopup_reportPhishingErrortoolmenu"/>

1 0

[tor-browser-build/master] Bug 16472: update binutils to 2.26.1
by gk＠torproject.org 29 May '18

29 May '18

commit b24500f6880e2c461050e248c0f7e587b5201d51 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Feb 14 13:31:29 2018 +0100 Bug 16472: update binutils to 2.26.1 --- keyring/binutils.gpg | Bin 25772 -> 1169 bytes projects/binutils/64bit-fixups.patch | 31 +- projects/binutils/binutils-224-gold.patch | 98 -- projects/binutils/build | 10 +- projects/binutils/config | 11 +- projects/binutils/enable-reloc-section-ld.patch | 83 +- projects/binutils/fix-warning-bfd.patch | 186 ---- .../binutils/fix-windows-reproducibility.patch | 1034 ++++++++++++++++++++ projects/binutils/peXXigen.patch | 43 +- projects/mingw-w64/build | 2 +- projects/nsis/build | 9 +- projects/nsis/config | 1 + projects/nsis/no-insert-timestamp.patch | 27 + projects/openssl/config | 2 +- projects/selfrando/config | 2 +- projects/zlib/build | 4 +- rbm.conf | 2 +- 17 files changed, 1174 insertions(+), 371 deletions(-) diff --git a/keyring/binutils.gpg b/keyring/binutils.gpg index f24bb01..2de205d 100644 Binary files a/keyring/binutils.gpg and b/keyring/binutils.gpg differ diff --git a/projects/binutils/64bit-fixups.patch b/projects/binutils/64bit-fixups.patch index 33c0297..7dc1294 100644 --- a/projects/binutils/64bit-fixups.patch +++ b/projects/binutils/64bit-fixups.patch @@ -1,14 +1,19 @@ -From f3ba95e14437f10de8b8f296930ff2a8495d18c6 Mon Sep 17 00:00:00 2001 +From 05164a1162d5f6f696d7f7c4b1bc61ef06d1c288 Mon Sep 17 00:00:00 2001 From: Georg Koppen <gk(a)torproject.org> Date: Tue, 12 Sep 2017 07:21:16 +0000 Subject: [PATCH] 64bit fixups +--- + ld/emultempl/pep.em | 4 ++-- + ld/pep-dll.c | 1 + + ld/pep-dll.h | 1 + + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ld/emultempl/pep.em b/ld/emultempl/pep.em -index b566903b14..27006bdf79 100644 +index fccbd63..f7c0a57 100644 --- a/ld/emultempl/pep.em +++ b/ld/emultempl/pep.em -@@ -730,7 +730,7 @@ gld${EMULATION_NAME}_handle_option (int optc) +@@ -742,7 +742,7 @@ gld${EMULATION_NAME}_handle_option (int optc) pep_dll_exclude_all_symbols = 1; break; case OPTION_ENABLE_RELOC_SECTION: @@ -17,17 +22,17 @@ index b566903b14..27006bdf79 100644 break; case OPTION_EXCLUDE_LIBS: pep_dll_add_excludes (optarg, EXCLUDELIBS); -@@ -1623,7 +1623,7 @@ gld_${EMULATION_NAME}_finish (void) - +@@ -1862,7 +1862,7 @@ gld_${EMULATION_NAME}_finish (void) #ifdef DLL_SUPPORT - if (link_info.shared -- || (!link_info.relocatable && pe_dll_enable_reloc_section) -+ || (!link_info.relocatable && pep_dll_enable_reloc_section) - || (!link_info.relocatable && pep_def_file->num_exports != 0)) + if (bfd_link_pic (&link_info) + || (!bfd_link_relocatable (&link_info) +- && pe_dll_enable_reloc_section) ++ && pep_dll_enable_reloc_section) + || (!bfd_link_relocatable (&link_info) + && pep_def_file->num_exports != 0)) { - pep_dll_fill_sections (link_info.output_bfd, &link_info); diff --git a/ld/pep-dll.c b/ld/pep-dll.c -index 0e5e8b1523..b5f99b90e0 100644 +index b8c017f..5ad5733 100644 --- a/ld/pep-dll.c +++ b/ld/pep-dll.c @@ -31,6 +31,7 @@ @@ -39,7 +44,7 @@ index 0e5e8b1523..b5f99b90e0 100644 #define pe_dll_stdcall_aliases pep_dll_stdcall_aliases #define pe_dll_warn_dup_exports pep_dll_warn_dup_exports diff --git a/ld/pep-dll.h b/ld/pep-dll.h -index 1e7e3d65d4..c31e69cc8e 100644 +index 0a27c1f..95d9c15 100644 --- a/ld/pep-dll.h +++ b/ld/pep-dll.h @@ -31,6 +31,7 @@ extern def_file * pep_def_file; @@ -51,5 +56,5 @@ index 1e7e3d65d4..c31e69cc8e 100644 extern int pep_dll_stdcall_aliases; extern int pep_dll_warn_dup_exports; -- -2.14.1 +2.1.4 diff --git a/projects/binutils/binutils-224-gold.patch b/projects/binutils/binutils-224-gold.patch deleted file mode 100644 index a45e49c..0000000 --- a/projects/binutils/binutils-224-gold.patch +++ /dev/null @@ -1,98 +0,0 @@ -From f984741df04cd68bb116073fdfa9405808810ab4 Mon Sep 17 00:00:00 2001 -From: Cary Coutant <ccoutant(a)google.com> -Date: Wed, 5 Feb 2014 22:59:02 -0800 -Subject: [PATCH] Fix issues with gold undefined symbol diagnostics. - -PR binutils/15435 complains that gold issues a visibility error for an -weak undefined symbol with hidden visibility. The message should be -suppressed if the symbol is a weak undef. - -An earlier patch to add an extra note about key functions when a class's -vtable symbol is undefined missed a case where the reference to the -vtable came from a shared library. This patch moves the check to a -lower-level routine that catches both cases. - -gold/ - -2014-02-05 Cary Coutant <ccoutant(a)google.com> - - * errors.cc (Errors::undefined_symbol): Move undef vtable symbol - check to here. - * target-reloc.h (is_strong_undefined): New function. - (relocate_section): Move undef vtable symbol check from here. - Check for is_strong_undefined. - -diff --git a/gold/ChangeLog b/gold/ChangeLog -index dcf7ed41f8..dd7ef72980 100644 ---- a/gold/ChangeLog -+++ b/gold/ChangeLog -@@ -1,3 +1,14 @@ -+2014-02-05 Cary Coutant <ccoutant(a)google.com> -+ -+ Fix issues with gold undefined symbol diagnostics. -+ -+ PR binutils/15435 -+ * errors.cc (Errors::undefined_symbol): Move undef vtable symbol -+ check to here. -+ * target-reloc.h (is_strong_undefined): New function. -+ (relocate_section): Move undef vtable symbol check from here. -+ Check for is_strong_undefined. -+ - 2013-11-22 Cary Coutant <ccoutant(a)google.com> - - * testsuite/Makefile.am (exception_x86_64_bnd_test): Use in-tree -diff --git a/gold/errors.cc b/gold/errors.cc -index b79764bd1d..98db0fdd86 100644 ---- a/gold/errors.cc -+++ b/gold/errors.cc -@@ -193,6 +193,11 @@ Errors::undefined_symbol(const Symbol* sym, const std::string& location) - fprintf(stderr, - _("%s: %s: undefined reference to '%s', version '%s'\n"), - location.c_str(), zmsg, sym->demangled_name().c_str(), version); -+ -+ if (sym->is_cxx_vtable()) -+ gold_info(_("%s: the vtable symbol may be undefined because " -+ "the class is missing its key function"), -+ program_name); - } - - // Issue a debugging message. -diff --git a/gold/target-reloc.h b/gold/target-reloc.h -index b544c78f37..d609bcbaa8 100644 ---- a/gold/target-reloc.h -+++ b/gold/target-reloc.h -@@ -144,6 +144,12 @@ class Default_comdat_behavior - } - }; - -+inline bool -+is_strong_undefined(const Symbol* sym) -+{ -+ return sym->is_undefined() && sym->binding() != elfcpp::STB_WEAK; -+} -+ - // Give an error for a symbol with non-default visibility which is not - // defined locally. - -@@ -411,16 +417,10 @@ relocate_section( - } - - if (issue_undefined_symbol_error(sym)) -- { -- gold_undefined_symbol_at_location(sym, relinfo, i, offset); -- if (sym->is_cxx_vtable()) -- gold_info(_("%s: the vtable symbol may be undefined because " -- "the class is missing its key function"), -- program_name); -- } -+ gold_undefined_symbol_at_location(sym, relinfo, i, offset); - else if (sym != NULL - && sym->visibility() != elfcpp::STV_DEFAULT -- && (sym->is_undefined() || sym->is_from_dynobj())) -+ && (is_strong_undefined(sym) || sym->is_from_dynobj())) - visibility_error(sym); - - if (sym != NULL && sym->has_warning()) --- -2.11.0 - diff --git a/projects/binutils/build b/projects/binutils/build index ee6db1a..0d1c062 100644 --- a/projects/binutils/build +++ b/projects/binutils/build @@ -25,17 +25,13 @@ cd [% project %]-[% c("version") %] patch -p1 < ../peXXigen.patch # Needed for the hardening... patch -p1 < ../enable-reloc-section-ld.patch - # fix "right-hand operand of comma expression has no effect" warning - patch -p1 < ../fix-warning-bfd.patch + # fix build reproducibility of Windows builds by reverting commit 13e570f80c. + # See bug 16472. + patch -p1 < ../fix-windows-reproducibility.patch [% END -%] [% IF c('var/windows-x86_64') -%] patch -p1 < ../64bit-fixups.patch [% END -%] -[% IF c("var/linux") && ! c("var/release") -%] - # We need to work around a gold linker bug in 2.24 to get selfrando working, - # see bug 20683. - patch -p1 < $rootdir/binutils-224-gold.patch -[% END -%] ./configure --prefix=$distdir [% c('var/configure_opt') %] make -j[% c("buildconf/num_procs") %] make install diff --git a/projects/binutils/config b/projects/binutils/config index 5c35588..1f992a2 100644 --- a/projects/binutils/config +++ b/projects/binutils/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2.24 +version: 2.26.1 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: configure_opt: '--disable-multilib --enable-gold --enable-deterministic-archives --enable-plugins' @@ -10,6 +10,9 @@ targets: windows: var: configure_opt: '--target=[% c("arch") %]-w64-mingw32 --disable-multilib --enable-deterministic-archives' + arch_deps: + # texinfo required for fix-windows-reproducibility.patch + - texinfo input_files: - URL: https://ftp.gnu.org/gnu/binutils/binutils-[% c("version") %].tar.bz2 @@ -19,11 +22,9 @@ input_files: - project: container-image - filename: enable-reloc-section-ld.patch enable: '[% c("var/windows") %]' - - filename: fix-warning-bfd.patch - enable: '[% c("var/windows") %]' - filename: 64bit-fixups.patch enable: '[% c("var/windows-x86_64") %]' - filename: peXXigen.patch enable: '[% c("var/windows") %]' - - filename: binutils-224-gold.patch - enable: '[% c("var/linux") %]' + - filename: fix-windows-reproducibility.patch + enable: '[% c("var/windows") %]' diff --git a/projects/binutils/enable-reloc-section-ld.patch b/projects/binutils/enable-reloc-section-ld.patch index f393f51..a6600c3 100644 --- a/projects/binutils/enable-reloc-section-ld.patch +++ b/projects/binutils/enable-reloc-section-ld.patch @@ -1,30 +1,29 @@ -From 093b08a9e7af23a258306b710ebc4556d12f94f7 Mon Sep 17 00:00:00 2001 +From fba503a78c50d6134943245d55e820f53e8f19cd Mon Sep 17 00:00:00 2001 From: Erinn Clark <erinn(a)torproject.org> Date: Fri, 8 Aug 2014 14:23:44 -0400 Subject: [PATCH] add relocation section so Windows bundles can have ASLR Patch by skruffy. - --- - ld/emultempl/pe.em | 6 +++++ - ld/emultempl/pep.em | 8 ++++++- + ld/emultempl/pe.em | 7 ++++++ + ld/emultempl/pep.em | 11 ++++++++-- ld/pe-dll.c | 63 ++++++++++++++++++++++++++++++----------------------- ld/pe-dll.h | 1 + - 4 files changed, 50 insertions(+), 28 deletions(-) + 4 files changed, 53 insertions(+), 29 deletions(-) diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em -index 5d6da9e..14c07f7 100644 +index 339b7c5..3958b81 100644 --- a/ld/emultempl/pe.em +++ b/ld/emultempl/pe.em -@@ -268,6 +268,7 @@ fragment <<EOF - #define OPTION_TERMINAL_SERVER_AWARE (OPTION_WDM_DRIVER + 1) - /* Determinism. */ +@@ -272,6 +272,7 @@ fragment <<EOF #define OPTION_INSERT_TIMESTAMP (OPTION_TERMINAL_SERVER_AWARE + 1) -+#define OPTION_ENABLE_RELOC_SECTION (OPTION_INSERT_TIMESTAMP + 1) + #define OPTION_NO_INSERT_TIMESTAMP (OPTION_INSERT_TIMESTAMP + 1) + #define OPTION_BUILD_ID (OPTION_NO_INSERT_TIMESTAMP + 1) ++#define OPTION_ENABLE_RELOC_SECTION (OPTION_BUILD_ID + 1) static void gld${EMULATION_NAME}_add_options -@@ -310,6 +311,7 @@ gld${EMULATION_NAME}_add_options +@@ -315,6 +316,7 @@ gld${EMULATION_NAME}_add_options {"export-all-symbols", no_argument, NULL, OPTION_EXPORT_ALL}, {"exclude-symbols", required_argument, NULL, OPTION_EXCLUDE_SYMBOLS}, {"exclude-all-symbols", no_argument, NULL, OPTION_EXCLUDE_ALL_SYMBOLS}, @@ -32,7 +31,7 @@ index 5d6da9e..14c07f7 100644 {"exclude-libs", required_argument, NULL, OPTION_EXCLUDE_LIBS}, {"exclude-modules-for-implib", required_argument, NULL, OPTION_EXCLUDE_MODULES_FOR_IMPLIB}, {"kill-at", no_argument, NULL, OPTION_KILL_ATS}, -@@ -773,6 +775,9 @@ gld${EMULATION_NAME}_handle_option (int optc) +@@ -782,6 +784,9 @@ gld${EMULATION_NAME}_handle_option (int optc) case OPTION_EXCLUDE_ALL_SYMBOLS: pe_dll_exclude_all_symbols = 1; break; @@ -42,29 +41,30 @@ index 5d6da9e..14c07f7 100644 case OPTION_EXCLUDE_LIBS: pe_dll_add_excludes (optarg, EXCLUDELIBS); break; -@@ -1839,6 +1844,7 @@ gld_${EMULATION_NAME}_finish (void) - if (link_info.shared +@@ -2076,6 +2081,8 @@ gld_${EMULATION_NAME}_finish (void) #if !defined(TARGET_IS_shpe) - || (!link_info.relocatable && pe_def_file->num_exports != 0) -+ || (!link_info.relocatable && pe_dll_enable_reloc_section) + || (!bfd_link_relocatable (&link_info) + && pe_def_file->num_exports != 0) ++ || (!bfd_link_relocatable (&link_info) ++ && pe_dll_enable_reloc_section) #endif ) { diff --git a/ld/emultempl/pep.em b/ld/emultempl/pep.em -index b738800..b566903 100644 +index c253d2f..fccbd63 100644 --- a/ld/emultempl/pep.em +++ b/ld/emultempl/pep.em -@@ -242,7 +242,8 @@ enum options - OPTION_NO_BIND, - OPTION_WDM_DRIVER, +@@ -246,7 +246,8 @@ enum options OPTION_INSERT_TIMESTAMP, -- OPTION_TERMINAL_SERVER_AWARE -+ OPTION_TERMINAL_SERVER_AWARE, + OPTION_NO_INSERT_TIMESTAMP, + OPTION_TERMINAL_SERVER_AWARE, +- OPTION_BUILD_ID ++ OPTION_BUILD_ID, + OPTION_ENABLE_RELOC_SECTION }; static void -@@ -284,6 +285,7 @@ gld${EMULATION_NAME}_add_options +@@ -288,6 +289,7 @@ gld${EMULATION_NAME}_add_options {"export-all-symbols", no_argument, NULL, OPTION_EXPORT_ALL}, {"exclude-symbols", required_argument, NULL, OPTION_EXCLUDE_SYMBOLS}, {"exclude-all-symbols", no_argument, NULL, OPTION_EXCLUDE_ALL_SYMBOLS}, @@ -72,7 +72,7 @@ index b738800..b566903 100644 {"exclude-libs", required_argument, NULL, OPTION_EXCLUDE_LIBS}, {"exclude-modules-for-implib", required_argument, NULL, OPTION_EXCLUDE_MODULES_FOR_IMPLIB}, {"kill-at", no_argument, NULL, OPTION_KILL_ATS}, -@@ -727,6 +729,9 @@ gld${EMULATION_NAME}_handle_option (int optc) +@@ -739,6 +741,9 @@ gld${EMULATION_NAME}_handle_option (int optc) case OPTION_EXCLUDE_ALL_SYMBOLS: pep_dll_exclude_all_symbols = 1; break; @@ -82,19 +82,22 @@ index b738800..b566903 100644 case OPTION_EXCLUDE_LIBS: pep_dll_add_excludes (optarg, EXCLUDELIBS); break; -@@ -1618,6 +1623,7 @@ gld_${EMULATION_NAME}_finish (void) - +@@ -1857,7 +1862,9 @@ gld_${EMULATION_NAME}_finish (void) #ifdef DLL_SUPPORT - if (link_info.shared -+ || (!link_info.relocatable && pe_dll_enable_reloc_section) - || (!link_info.relocatable && pep_def_file->num_exports != 0)) + if (bfd_link_pic (&link_info) + || (!bfd_link_relocatable (&link_info) +- && pep_def_file->num_exports != 0)) ++ && pe_dll_enable_reloc_section) ++ || (!bfd_link_relocatable (&link_info) ++ && pep_def_file->num_exports != 0)) { pep_dll_fill_sections (link_info.output_bfd, &link_info); + if (command_line.out_implib_filename) diff --git a/ld/pe-dll.c b/ld/pe-dll.c -index e9e133b..4230dc3 100644 +index c398f23..3797f1a 100644 --- a/ld/pe-dll.c +++ b/ld/pe-dll.c -@@ -152,6 +152,7 @@ def_file * pe_def_file = 0; +@@ -151,6 +151,7 @@ def_file * pe_def_file = 0; int pe_dll_export_everything = 0; int pe_dll_exclude_all_symbols = 0; int pe_dll_do_default_excludes = 1; @@ -102,10 +105,10 @@ index e9e133b..4230dc3 100644 int pe_dll_kill_ats = 0; int pe_dll_stdcall_aliases = 0; int pe_dll_warn_dup_exports = 0; -@@ -3370,8 +3371,15 @@ pe_dll_build_sections (bfd *abfd, struct bfd_link_info *info) +@@ -3430,8 +3431,15 @@ pe_dll_build_sections (bfd *abfd, struct bfd_link_info *info) process_def_file_and_drectve (abfd, info); - if (pe_def_file->num_exports == 0 && !info->shared) + if (pe_def_file->num_exports == 0 && !bfd_link_pic (info)) - return; - + { @@ -120,7 +123,7 @@ index e9e133b..4230dc3 100644 generate_edata (abfd, info); build_filler_bfd (1); pe_output_file_set_long_section_names (filler_bfd); -@@ -3386,13 +3394,9 @@ pe_exe_build_sections (bfd *abfd, struct bfd_link_info *info ATTRIBUTE_UNUSED) +@@ -3446,13 +3454,9 @@ pe_exe_build_sections (bfd *abfd, struct bfd_link_info *info ATTRIBUTE_UNUSED) pe_output_file_set_long_section_names (filler_bfd); } @@ -136,13 +139,13 @@ index e9e133b..4230dc3 100644 generate_reloc (abfd, info); if (reloc_sz > 0) { -@@ -3409,38 +3413,43 @@ pe_dll_fill_sections (bfd *abfd, struct bfd_link_info *info) +@@ -3469,38 +3473,43 @@ pe_dll_fill_sections (bfd *abfd, struct bfd_link_info *info) lang_do_assignments (lang_final_phase_enum); } - fill_edata (abfd, info); - -- if (info->shared && !info->pie) +- if (bfd_link_dll (info)) - pe_data (abfd)->dll = 1; - - edata_s->contents = edata_d; @@ -174,7 +177,7 @@ index e9e133b..4230dc3 100644 - /* Resize the sections. */ - lang_reset_memory_regions (); - lang_size_sections (NULL, TRUE); -+ if (info->shared && !info->pie) ++ if (bfd_link_pic (info) && !bfd_link_pie (info)) + pe_data (abfd)->dll = 1; - /* Redo special stuff. */ @@ -200,10 +203,10 @@ index e9e133b..4230dc3 100644 bfd_boolean diff --git a/ld/pe-dll.h b/ld/pe-dll.h -index 4697390..2bf71d9 100644 +index 48d169b..05ff72b 100644 --- a/ld/pe-dll.h +++ b/ld/pe-dll.h -@@ -31,6 +31,7 @@ extern def_file *pe_def_file; +@@ -30,6 +30,7 @@ extern def_file *pe_def_file; extern int pe_dll_export_everything; extern int pe_dll_exclude_all_symbols; extern int pe_dll_do_default_excludes; @@ -212,5 +215,5 @@ index 4697390..2bf71d9 100644 extern int pe_dll_stdcall_aliases; extern int pe_dll_warn_dup_exports; -- -2.0.1 +2.1.4 diff --git a/projects/binutils/fix-warning-bfd.patch b/projects/binutils/fix-warning-bfd.patch deleted file mode 100644 index fa04405..0000000 --- a/projects/binutils/fix-warning-bfd.patch +++ /dev/null @@ -1,186 +0,0 @@ -From 27b829ee701e29804216b3803fbaeb629be27491 Mon Sep 17 00:00:00 2001 -From: Nick Clifton <nickc(a)redhat.com> -Date: Wed, 29 Jan 2014 13:46:39 +0000 -Subject: [PATCH] Following up on Tom's suggestion I am checking in a patch to - replace the various bfd_xxx_set macros with static inline functions, so that - we can avoid compile time warnings about comma expressions with unused - values. - - * bfd-in.h (bfd_set_section_vma): Delete. - (bfd_set_section_alignment): Delete. - (bfd_set_section_userdata): Delete. - (bfd_set_cacheable): Delete. - * bfd.c (bfd_set_cacheable): New static inline function. - * section.c (bfd_set_section_userdata): Likewise. - (bfd_set_section_vma): Likewise. - (bfd_set_section_alignment): Likewise. - * bfd-in2.h: Regenerate. ---- - bfd/bfd-in.h | 5 ----- - bfd/bfd-in2.h | 41 +++++++++++++++++++++++++++++++++++------ - bfd/bfd.c | 8 ++++++++ - bfd/section.c | 26 ++++++++++++++++++++++++++ - 5 files changed, 81 insertions(+), 11 deletions(-) - -diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h -index 3afd71b..c7c5a7d 100644 ---- a/bfd/bfd-in.h -+++ b/bfd/bfd-in.h -@@ -292,9 +292,6 @@ typedef struct bfd_section *sec_ptr; - - #define bfd_is_com_section(ptr) (((ptr)->flags & SEC_IS_COMMON) != 0) - --#define bfd_set_section_vma(bfd, ptr, val) (((ptr)->vma = (ptr)->lma = (val)), ((ptr)->user_set_vma = TRUE), TRUE) --#define bfd_set_section_alignment(bfd, ptr, val) (((ptr)->alignment_power = (val)),TRUE) --#define bfd_set_section_userdata(bfd, ptr, val) (((ptr)->userdata = (val)),TRUE) - /* Find the address one past the end of SEC. */ - #define bfd_get_section_limit(bfd, sec) \ - (((bfd)->direction != write_direction && (sec)->rawsize != 0 \ -@@ -517,8 +514,6 @@ extern void warn_deprecated (const char *, const char *, int, const char *); - - #define bfd_get_symbol_leading_char(abfd) ((abfd)->xvec->symbol_leading_char) - --#define bfd_set_cacheable(abfd,bool) (((abfd)->cacheable = bool), TRUE) -- - extern bfd_boolean bfd_cache_close - (bfd *abfd); - /* NB: This declaration should match the autogenerated one in libbfd.h. */ -diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h -index 71996db..b5aeb40 100644 ---- a/bfd/bfd-in2.h -+++ b/bfd/bfd-in2.h -@@ -299,9 +299,6 @@ typedef struct bfd_section *sec_ptr; - - #define bfd_is_com_section(ptr) (((ptr)->flags & SEC_IS_COMMON) != 0) - --#define bfd_set_section_vma(bfd, ptr, val) (((ptr)->vma = (ptr)->lma = (val)), ((ptr)->user_set_vma = TRUE), TRUE) --#define bfd_set_section_alignment(bfd, ptr, val) (((ptr)->alignment_power = (val)),TRUE) --#define bfd_set_section_userdata(bfd, ptr, val) (((ptr)->userdata = (val)),TRUE) - /* Find the address one past the end of SEC. */ - #define bfd_get_section_limit(bfd, sec) \ - (((bfd)->direction != write_direction && (sec)->rawsize != 0 \ -@@ -524,8 +521,6 @@ extern void warn_deprecated (const char *, const char *, int, const char *); - - #define bfd_get_symbol_leading_char(abfd) ((abfd)->xvec->symbol_leading_char) - --#define bfd_set_cacheable(abfd,bool) (((abfd)->cacheable = bool), TRUE) -- - extern bfd_boolean bfd_cache_close - (bfd *abfd); - /* NB: This declaration should match the autogenerated one in libbfd.h. */ -@@ -1029,7 +1024,7 @@ bfd *bfd_openr (const char *filename, const char *target); - - bfd *bfd_fdopenr (const char *filename, const char *target, int fd); - --bfd *bfd_openstreamr (const char *, const char *, void *); -+bfd *bfd_openstreamr (const char * filename, const char * target, void * stream); - - bfd *bfd_openr_iovec (const char *filename, const char *target, - void *(*open_func) (struct bfd *nbfd, -@@ -1596,6 +1591,32 @@ struct relax_table { - int size; - }; - -+/* Note: the following are provided as inline functions rather than macros -+ because not all callers use the return value. A macro implementation -+ would use a comma expression, eg: "((ptr)->foo = val, TRUE)" and some -+ compilers will complain about comma expressions that have no effect. */ -+static inline bfd_boolean -+bfd_set_section_userdata (bfd * abfd ATTRIBUTE_UNUSED, asection * ptr, void * val) -+{ -+ ptr->userdata = val; -+ return TRUE; -+} -+ -+static inline bfd_boolean -+bfd_set_section_vma (bfd * abfd ATTRIBUTE_UNUSED, asection * ptr, bfd_vma val) -+{ -+ ptr->vma = ptr->lma = val; -+ ptr->user_set_vma = TRUE; -+ return TRUE; -+} -+ -+static inline bfd_boolean -+bfd_set_section_alignment (bfd * abfd ATTRIBUTE_UNUSED, asection * ptr, unsigned int val) -+{ -+ ptr->alignment_power = val; -+ return TRUE; -+} -+ - /* These sections are global, and are managed by BFD. The application - and target back end are not permitted to change the values in - these sections. */ -@@ -6415,6 +6436,14 @@ struct bfd - unsigned int selective_search : 1; - }; - -+/* See note beside bfd_set_section_userdata. */ -+static inline bfd_boolean -+bfd_set_cacheable (bfd * abfd, bfd_boolean val) -+{ -+ abfd->cacheable = val; -+ return TRUE; -+} -+ - typedef enum bfd_error - { - bfd_error_no_error = 0, -diff --git a/bfd/bfd.c b/bfd/bfd.c -index 8d0580c..2d174f3 100644 ---- a/bfd/bfd.c -+++ b/bfd/bfd.c -@@ -311,6 +311,14 @@ CODE_FRAGMENT - . unsigned int selective_search : 1; - .}; - . -+.{* See note beside bfd_set_section_userdata. *} -+.static inline bfd_boolean -+.bfd_set_cacheable (bfd * abfd, bfd_boolean val) -+.{ -+. abfd->cacheable = val; -+. return TRUE; -+.} -+. - */ - - #include "sysdep.h" -diff --git a/bfd/section.c b/bfd/section.c -index fb19d8c..a661228 100644 ---- a/bfd/section.c -+++ b/bfd/section.c -@@ -542,6 +542,32 @@ CODE_FRAGMENT - . int size; - .}; - . -+.{* Note: the following are provided as inline functions rather than macros -+. because not all callers use the return value. A macro implementation -+. would use a comma expression, eg: "((ptr)->foo = val, TRUE)" and some -+. compilers will complain about comma expressions that have no effect. *} -+.static inline bfd_boolean -+.bfd_set_section_userdata (bfd * abfd ATTRIBUTE_UNUSED, asection * ptr, void * val) -+.{ -+. ptr->userdata = val; -+. return TRUE; -+.} -+. -+.static inline bfd_boolean -+.bfd_set_section_vma (bfd * abfd ATTRIBUTE_UNUSED, asection * ptr, bfd_vma val) -+.{ -+. ptr->vma = ptr->lma = val; -+. ptr->user_set_vma = TRUE; -+. return TRUE; -+.} -+. -+.static inline bfd_boolean -+.bfd_set_section_alignment (bfd * abfd ATTRIBUTE_UNUSED, asection * ptr, unsigned int val) -+.{ -+. ptr->alignment_power = val; -+. return TRUE; -+.} -+. - .{* These sections are global, and are managed by BFD. The application - . and target back end are not permitted to change the values in - . these sections. *} --- -2.1.4 - diff --git a/projects/binutils/fix-windows-reproducibility.patch b/projects/binutils/fix-windows-reproducibility.patch new file mode 100644 index 0000000..1fc5987 --- /dev/null +++ b/projects/binutils/fix-windows-reproducibility.patch @@ -0,0 +1,1034 @@ +From c6df45304e92aa2d7e9f2d8311ae5a0b1543daa8 Mon Sep 17 00:00:00 2001 +From: Nicolas Vigier <boklm(a)torproject.org> +Date: Wed, 16 May 2018 11:07:52 +0200 +Subject: [PATCH] Revert "Fix LTO vs. COFF archives" + +This reverts commit 13e570f80cbfb299a8858ce6830e91a6cb40ab7b. +--- + bfd/aoutx.h | 2 - + bfd/cofflink.c | 116 +++++++++++++++--- + bfd/ecoff.c | 164 +++++++++++++++++++++++-- + bfd/elflink.c | 53 ++++++-- + bfd/libbfd-in.h | 4 +- + bfd/libbfd.h | 4 +- + bfd/linker.c | 366 ++++++++++++++++++++++++++++++++++++++++---------------- + bfd/pdp11.c | 4 +- + bfd/xcofflink.c | 4 +- + 9 files changed, 560 insertions(+), 157 deletions(-) + +diff --git a/bfd/aoutx.h b/bfd/aoutx.h +index 9385a98..6ca9c58 100644 +--- a/bfd/aoutx.h ++++ b/bfd/aoutx.h +@@ -3405,8 +3405,6 @@ aout_link_check_ar_symbols (bfd *abfd, + static bfd_boolean + aout_link_check_archive_element (bfd *abfd, + struct bfd_link_info *info, +- struct bfd_link_hash_entry *h ATTRIBUTE_UNUSED, +- const char *name ATTRIBUTE_UNUSED, + bfd_boolean *pneeded) + { + bfd *oldbfd; +diff --git a/bfd/cofflink.c b/bfd/cofflink.c +index 2782795..3a82640 100644 +--- a/bfd/cofflink.c ++++ b/bfd/cofflink.c +@@ -29,11 +29,9 @@ + #include "libcoff.h" + #include "safe-ctype.h" + +-static bfd_boolean coff_link_add_object_symbols (bfd *, struct bfd_link_info *); +-static bfd_boolean coff_link_check_archive_element +- (bfd *, struct bfd_link_info *, struct bfd_link_hash_entry *, const char *, +- bfd_boolean *); +-static bfd_boolean coff_link_add_symbols (bfd *, struct bfd_link_info *); ++static bfd_boolean coff_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info); ++static bfd_boolean coff_link_check_archive_element (bfd *abfd, struct bfd_link_info *info, bfd_boolean *pneeded); ++static bfd_boolean coff_link_add_symbols (bfd *abfd, struct bfd_link_info *info); + + /* Return TRUE if SYM is a weak, external symbol. */ + #define IS_WEAK_EXTERNAL(abfd, sym) \ +@@ -192,6 +190,74 @@ coff_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info) + return TRUE; + } + ++/* Look through the symbols to see if this object file should be ++ included in the link. */ ++ ++static bfd_boolean ++coff_link_check_ar_symbols (bfd *abfd, ++ struct bfd_link_info *info, ++ bfd_boolean *pneeded, ++ bfd **subsbfd) ++{ ++ bfd_size_type symesz; ++ bfd_byte *esym; ++ bfd_byte *esym_end; ++ ++ *pneeded = FALSE; ++ ++ symesz = bfd_coff_symesz (abfd); ++ esym = (bfd_byte *) obj_coff_external_syms (abfd); ++ esym_end = esym + obj_raw_syment_count (abfd) * symesz; ++ while (esym < esym_end) ++ { ++ struct internal_syment sym; ++ enum coff_symbol_classification classification; ++ ++ bfd_coff_swap_sym_in (abfd, esym, &sym); ++ ++ classification = bfd_coff_classify_symbol (abfd, &sym); ++ if (classification == COFF_SYMBOL_GLOBAL ++ || classification == COFF_SYMBOL_COMMON) ++ { ++ const char *name; ++ char buf[SYMNMLEN + 1]; ++ struct bfd_link_hash_entry *h; ++ ++ /* This symbol is externally visible, and is defined by this ++ object file. */ ++ name = _bfd_coff_internal_syment_name (abfd, &sym, buf); ++ if (name == NULL) ++ return FALSE; ++ h = bfd_link_hash_lookup (info->hash, name, FALSE, FALSE, TRUE); ++ ++ /* Auto import. */ ++ if (!h ++ && info->pei386_auto_import ++ && CONST_STRNEQ (name, "__imp_")) ++ h = bfd_link_hash_lookup (info->hash, name + 6, FALSE, FALSE, TRUE); ++ ++ /* We are only interested in symbols that are currently ++ undefined. If a symbol is currently known to be common, ++ COFF linkers do not bring in an object file which defines ++ it. */ ++ if (h != (struct bfd_link_hash_entry *) NULL ++ && h->type == bfd_link_hash_undefined) ++ { ++ if (!(*info->callbacks ++ ->add_archive_element) (info, abfd, name, subsbfd)) ++ return FALSE; ++ *pneeded = TRUE; ++ return TRUE; ++ } ++ } ++ ++ esym += (sym.n_numaux + 1) * symesz; ++ } ++ ++ /* We do not need this object file. */ ++ return TRUE; ++} ++ + /* Check a single archive element to see if we need to include it in + the link. *PNEEDED is set according to whether this element is + needed in the link or not. This is called via +@@ -200,23 +266,41 @@ coff_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info) + static bfd_boolean + coff_link_check_archive_element (bfd *abfd, + struct bfd_link_info *info, +- struct bfd_link_hash_entry *h, +- const char *name, + bfd_boolean *pneeded) + { +- *pneeded = FALSE; ++ bfd *oldbfd; ++ bfd_boolean needed; + +- /* We are only interested in symbols that are currently undefined. +- If a symbol is currently known to be common, COFF linkers do not +- bring in an object file which defines it. */ +- if (h->type != bfd_link_hash_undefined) +- return TRUE; ++ if (!_bfd_coff_get_external_symbols (abfd)) ++ return FALSE; + +- if (!(*info->callbacks->add_archive_element) (info, abfd, name, &abfd)) ++ oldbfd = abfd; ++ if (!coff_link_check_ar_symbols (abfd, info, pneeded, &abfd)) + return FALSE; +- *pneeded = TRUE; + +- return coff_link_add_object_symbols (abfd, info); ++ needed = *pneeded; ++ if (needed) ++ { ++ /* Potentially, the add_archive_element hook may have set a ++ substitute BFD for us. */ ++ if (abfd != oldbfd) ++ { ++ if (!info->keep_memory ++ && !_bfd_coff_free_symbols (oldbfd)) ++ return FALSE; ++ if (!_bfd_coff_get_external_symbols (abfd)) ++ return FALSE; ++ } ++ if (!coff_link_add_symbols (abfd, info)) ++ return FALSE; ++ } ++ ++ if (!info->keep_memory || !needed) ++ { ++ if (!_bfd_coff_free_symbols (abfd)) ++ return FALSE; ++ } ++ return TRUE; + } + + /* Add all the symbols from an object file to the hash table. */ +diff --git a/bfd/ecoff.c b/bfd/ecoff.c +index 01f51e6..2c915f0 100644 +--- a/bfd/ecoff.c ++++ b/bfd/ecoff.c +@@ -3500,29 +3500,171 @@ ecoff_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info) + return FALSE; + } + ++/* Factored out from ecoff_link_check_archive_element. */ ++ ++static bfd_boolean ++read_ext_syms_and_strs (HDRR **symhdr, bfd_size_type *external_ext_size, ++ bfd_size_type *esize, void **external_ext, char **ssext, bfd *abfd, ++ const struct ecoff_backend_data * const backend) ++{ ++ if (! ecoff_slurp_symbolic_header (abfd)) ++ return FALSE; ++ ++ /* If there are no symbols, we don't want it. */ ++ if (bfd_get_symcount (abfd) == 0) ++ return TRUE; ++ ++ *symhdr = &ecoff_data (abfd)->debug_info.symbolic_header; ++ ++ *external_ext_size = backend->debug_swap.external_ext_size; ++ *esize = (*symhdr)->iextMax * *external_ext_size; ++ *external_ext = bfd_malloc (*esize); ++ if (*external_ext == NULL && *esize != 0) ++ return FALSE; ++ ++ if (bfd_seek (abfd, (file_ptr) (*symhdr)->cbExtOffset, SEEK_SET) != 0 ++ || bfd_bread (*external_ext, *esize, abfd) != *esize) ++ return FALSE; ++ ++ *ssext = (char *) bfd_malloc ((bfd_size_type) (*symhdr)->issExtMax); ++ if (*ssext == NULL && (*symhdr)->issExtMax != 0) ++ return FALSE; ++ ++ if (bfd_seek (abfd, (file_ptr) (*symhdr)->cbSsExtOffset, SEEK_SET) != 0 ++ || (bfd_bread (*ssext, (bfd_size_type) (*symhdr)->issExtMax, abfd) ++ != (bfd_size_type) (*symhdr)->issExtMax)) ++ return FALSE; ++ return TRUE; ++} ++ ++static bfd_boolean ++reread_ext_syms_and_strs (HDRR **symhdr, bfd_size_type *external_ext_size, ++ bfd_size_type *esize, void **external_ext, char **ssext, bfd *abfd, ++ const struct ecoff_backend_data * const backend) ++{ ++ if (*external_ext != NULL) ++ free (*external_ext); ++ *external_ext = NULL; ++ if (*ssext != NULL) ++ free (*ssext); ++ *ssext = NULL; ++ return read_ext_syms_and_strs (symhdr, external_ext_size, esize, ++ external_ext, ssext, abfd, backend); ++} ++ + /* This is called if we used _bfd_generic_link_add_archive_symbols + because we were not dealing with an ECOFF archive. */ + + static bfd_boolean + ecoff_link_check_archive_element (bfd *abfd, + struct bfd_link_info *info, +- struct bfd_link_hash_entry *h, +- const char *name, + bfd_boolean *pneeded) + { ++ const struct ecoff_backend_data * const backend = ecoff_backend (abfd); ++ void (* const swap_ext_in) (bfd *, void *, EXTR *) ++ = backend->debug_swap.swap_ext_in; ++ HDRR *symhdr; ++ bfd_size_type external_ext_size = 0; ++ void * external_ext = NULL; ++ bfd_size_type esize = 0; ++ char *ssext = NULL; ++ char *ext_ptr; ++ char *ext_end; ++ + *pneeded = FALSE; + +- /* Unlike the generic linker, we do not pull in elements because +- of common symbols. */ +- if (h->type != bfd_link_hash_undefined) +- return TRUE; ++ /* Read in the external symbols and external strings. */ ++ if (!read_ext_syms_and_strs (&symhdr, &external_ext_size, &esize, ++ &external_ext, &ssext, abfd, backend)) ++ goto error_return; + +- /* Include this element. */ +- if (!(*info->callbacks->add_archive_element) (info, abfd, name, &abfd)) +- return FALSE; +- *pneeded = TRUE; ++ /* If there are no symbols, we don't want it. */ ++ if (bfd_get_symcount (abfd) == 0) ++ goto successful_return; + +- return ecoff_link_add_object_symbols (abfd, info); ++ /* Look through the external symbols to see if they define some ++ symbol that is currently undefined. */ ++ ext_ptr = (char *) external_ext; ++ ext_end = ext_ptr + esize; ++ for (; ext_ptr < ext_end; ext_ptr += external_ext_size) ++ { ++ EXTR esym; ++ bfd_boolean def; ++ const char *name; ++ bfd *oldbfd; ++ struct bfd_link_hash_entry *h; ++ ++ (*swap_ext_in) (abfd, (void *) ext_ptr, &esym); ++ ++ /* See if this symbol defines something. */ ++ if (esym.asym.st != stGlobal ++ && esym.asym.st != stLabel ++ && esym.asym.st != stProc) ++ continue; ++ ++ switch (esym.asym.sc) ++ { ++ case scText: ++ case scData: ++ case scBss: ++ case scAbs: ++ case scSData: ++ case scSBss: ++ case scRData: ++ case scCommon: ++ case scSCommon: ++ case scInit: ++ case scFini: ++ case scRConst: ++ def = TRUE; ++ break; ++ default: ++ def = FALSE; ++ break; ++ } ++ ++ if (! def) ++ continue; ++ ++ name = ssext + esym.asym.iss; ++ h = bfd_link_hash_lookup (info->hash, name, FALSE, FALSE, TRUE); ++ ++ /* Unlike the generic linker, we do not pull in elements because ++ of common symbols. */ ++ if (h == NULL ++ || h->type != bfd_link_hash_undefined) ++ continue; ++ ++ /* Include this element. */ ++ oldbfd = abfd; ++ if (!(*info->callbacks ++ ->add_archive_element) (info, abfd, name, &abfd)) ++ goto error_return; ++ /* Potentially, the add_archive_element hook may have set a ++ substitute BFD for us. */ ++ if (abfd != oldbfd ++ && !reread_ext_syms_and_strs (&symhdr, &external_ext_size, &esize, ++ &external_ext, &ssext, abfd, backend)) ++ goto error_return; ++ if (! ecoff_link_add_externals (abfd, info, external_ext, ssext)) ++ goto error_return; ++ ++ *pneeded = TRUE; ++ goto successful_return; ++ } ++ ++ successful_return: ++ if (external_ext != NULL) ++ free (external_ext); ++ if (ssext != NULL) ++ free (ssext); ++ return TRUE; ++ error_return: ++ if (external_ext != NULL) ++ free (external_ext); ++ if (ssext != NULL) ++ free (ssext); ++ return FALSE; + } + + /* Add the symbols from an archive file to the global hash table. +diff --git a/bfd/elflink.c b/bfd/elflink.c +index 94ab762..164df6b 100644 +--- a/bfd/elflink.c ++++ b/bfd/elflink.c +@@ -2933,6 +2933,13 @@ elf_link_is_defined_archive_symbol (bfd * abfd, carsym * symdef) + if (! bfd_check_format (abfd, bfd_object)) + return FALSE; + ++ /* If we have already included the element containing this symbol in the ++ link then we do not need to include it again. Just claim that any symbol ++ it contains is not a definition, so that our caller will not decide to ++ (re)include this element. */ ++ if (abfd->archive_pass) ++ return FALSE; ++ + /* Select the appropriate symbol table. */ + if ((abfd->flags & DYNAMIC) == 0 || elf_dynsymtab (abfd) == 0) + hdr = &elf_tdata (abfd)->symtab_hdr; +@@ -4929,8 +4936,20 @@ _bfd_elf_archive_symbol_lookup (bfd *abfd, + } + + /* Add symbols from an ELF archive file to the linker hash table. We +- don't use _bfd_generic_link_add_archive_symbols because we need to +- handle versioned symbols. ++ don't use _bfd_generic_link_add_archive_symbols because of a ++ problem which arises on UnixWare. The UnixWare libc.so is an ++ archive which includes an entry libc.so.1 which defines a bunch of ++ symbols. The libc.so archive also includes a number of other ++ object files, which also define symbols, some of which are the same ++ as those defined in libc.so.1. Correct linking requires that we ++ consider each object file in turn, and include it if it defines any ++ symbols we need. _bfd_generic_link_add_archive_symbols does not do ++ this; it looks through the list of undefined symbols, and includes ++ any object file which defines them. When this algorithm is used on ++ UnixWare, it winds up pulling in libc.so.1 early and defining a ++ bunch of symbols. This means that some of the other objects in the ++ archive are not included in the link, which is incorrect since they ++ precede libc.so.1 in the archive. + + Fortunately, ELF archive handling is simpler than that done by + _bfd_generic_link_add_archive_symbols, which has to allow for a.out +@@ -4945,7 +4964,8 @@ static bfd_boolean + elf_link_add_archive_symbols (bfd *abfd, struct bfd_link_info *info) + { + symindex c; +- unsigned char *included = NULL; ++ bfd_boolean *defined = NULL; ++ bfd_boolean *included = NULL; + carsym *symdefs; + bfd_boolean loop; + bfd_size_type amt; +@@ -4969,10 +4989,11 @@ elf_link_add_archive_symbols (bfd *abfd, struct bfd_link_info *info) + if (c == 0) + return TRUE; + amt = c; +- amt *= sizeof (*included); +- included = (unsigned char *) bfd_zmalloc (amt); +- if (included == NULL) +- return FALSE; ++ amt *= sizeof (bfd_boolean); ++ defined = (bfd_boolean *) bfd_zmalloc (amt); ++ included = (bfd_boolean *) bfd_zmalloc (amt); ++ if (defined == NULL || included == NULL) ++ goto error_return; + + symdefs = bfd_ardata (abfd)->symdefs; + bed = get_elf_backend_data (abfd); +@@ -4997,7 +5018,7 @@ elf_link_add_archive_symbols (bfd *abfd, struct bfd_link_info *info) + struct bfd_link_hash_entry *undefs_tail; + symindex mark; + +- if (included[i]) ++ if (defined[i] || included[i]) + continue; + if (symdef->file_offset == last) + { +@@ -5032,8 +5053,7 @@ elf_link_add_archive_symbols (bfd *abfd, struct bfd_link_info *info) + else if (h->root.type != bfd_link_hash_undefined) + { + if (h->root.type != bfd_link_hash_undefweak) +- /* Symbol must be defined. Don't check it again. */ +- included[i] = TRUE; ++ defined[i] = TRUE; + continue; + } + +@@ -5045,6 +5065,16 @@ elf_link_add_archive_symbols (bfd *abfd, struct bfd_link_info *info) + if (! bfd_check_format (element, bfd_object)) + goto error_return; + ++ /* Doublecheck that we have not included this object ++ already--it should be impossible, but there may be ++ something wrong with the archive. */ ++ if (element->archive_pass != 0) ++ { ++ bfd_set_error (bfd_error_bad_value); ++ goto error_return; ++ } ++ element->archive_pass = 1; ++ + undefs_tail = info->hash->undefs_tail; + + if (!(*info->callbacks +@@ -5082,11 +5112,14 @@ elf_link_add_archive_symbols (bfd *abfd, struct bfd_link_info *info) + } + while (loop); + ++ free (defined); + free (included); + + return TRUE; + + error_return: ++ if (defined != NULL) ++ free (defined); + if (included != NULL) + free (included); + return FALSE; +diff --git a/bfd/libbfd-in.h b/bfd/libbfd-in.h +index 50a46ac..90c6018 100644 +--- a/bfd/libbfd-in.h ++++ b/bfd/libbfd-in.h +@@ -596,9 +596,7 @@ extern bfd_boolean _bfd_generic_link_add_symbols_collect + /* Generic archive add symbol routine. */ + extern bfd_boolean _bfd_generic_link_add_archive_symbols + (bfd *, struct bfd_link_info *, +- bfd_boolean (*) (bfd *, struct bfd_link_info *, +- struct bfd_link_hash_entry *, const char *, +- bfd_boolean *)); ++ bfd_boolean (*) (bfd *, struct bfd_link_info *, bfd_boolean *)); + + /* Forward declaration to avoid prototype errors. */ + typedef struct bfd_link_hash_entry _bfd_link_hash_entry; +diff --git a/bfd/libbfd.h b/bfd/libbfd.h +index 6c48f82..ffb6ea4 100644 +--- a/bfd/libbfd.h ++++ b/bfd/libbfd.h +@@ -601,9 +601,7 @@ extern bfd_boolean _bfd_generic_link_add_symbols_collect + /* Generic archive add symbol routine. */ + extern bfd_boolean _bfd_generic_link_add_archive_symbols + (bfd *, struct bfd_link_info *, +- bfd_boolean (*) (bfd *, struct bfd_link_info *, +- struct bfd_link_hash_entry *, const char *, +- bfd_boolean *)); ++ bfd_boolean (*) (bfd *, struct bfd_link_info *, bfd_boolean *)); + + /* Forward declaration to avoid prototype errors. */ + typedef struct bfd_link_hash_entry _bfd_link_hash_entry; +diff --git a/bfd/linker.c b/bfd/linker.c +index abdf5b0..4cff1e7 100644 +--- a/bfd/linker.c ++++ b/bfd/linker.c +@@ -229,16 +229,28 @@ SUBSUBSECTION + @findex _bfd_generic_link_add_archive_symbols + In most cases the work of looking through the symbols in the + archive should be done by the +- <<_bfd_generic_link_add_archive_symbols>> function. ++ <<_bfd_generic_link_add_archive_symbols>> function. This ++ function builds a hash table from the archive symbol table and ++ looks through the list of undefined symbols to see which ++ elements should be included. + <<_bfd_generic_link_add_archive_symbols>> is passed a function + to call to make the final decision about adding an archive + element to the link and to do the actual work of adding the +- symbols to the linker hash table. If the element is to ++ symbols to the linker hash table. ++ ++ The function passed to ++ <<_bfd_generic_link_add_archive_symbols>> must read the ++ symbols of the archive element and decide whether the archive ++ element should be included in the link. If the element is to + be included, the <<add_archive_element>> linker callback + routine must be called with the element as an argument, and + the element's symbols must be added to the linker hash table + just as though the element had itself been passed to the +- <<_bfd_link_add_symbols>> function. ++ <<_bfd_link_add_symbols>> function. The <<add_archive_element>> ++ callback has the option to indicate that it would like to ++ replace the element archive with a substitute BFD, in which ++ case it is the symbols of that substitute BFD that must be ++ added to the linker hash table instead. + + When the a.out <<_bfd_link_add_symbols>> function receives an + archive, it calls <<_bfd_generic_link_add_archive_symbols>> +@@ -407,14 +419,11 @@ static bfd_boolean generic_link_add_object_symbols + static bfd_boolean generic_link_add_symbols + (bfd *, struct bfd_link_info *, bfd_boolean); + static bfd_boolean generic_link_check_archive_element_no_collect +- (bfd *, struct bfd_link_info *, struct bfd_link_hash_entry *, const char *, +- bfd_boolean *); ++ (bfd *, struct bfd_link_info *, bfd_boolean *); + static bfd_boolean generic_link_check_archive_element_collect +- (bfd *, struct bfd_link_info *, struct bfd_link_hash_entry *, const char *, +- bfd_boolean *); ++ (bfd *, struct bfd_link_info *, bfd_boolean *); + static bfd_boolean generic_link_check_archive_element +- (bfd *, struct bfd_link_info *, struct bfd_link_hash_entry *, const char *, +- bfd_boolean *, bfd_boolean); ++ (bfd *, struct bfd_link_info *, bfd_boolean *, bfd_boolean); + static bfd_boolean generic_link_add_symbol_list + (bfd *, struct bfd_link_info *, bfd_size_type count, asymbol **, + bfd_boolean); +@@ -908,32 +917,138 @@ generic_link_add_object_symbols (bfd *abfd, + return generic_link_add_symbol_list (abfd, info, symcount, outsyms, collect); + } + ++/* We build a hash table of all symbols defined in an archive. */ ++ ++/* An archive symbol may be defined by multiple archive elements. ++ This linked list is used to hold the elements. */ ++ ++struct archive_list ++{ ++ struct archive_list *next; ++ unsigned int indx; ++}; ++ ++/* An entry in an archive hash table. */ ++ ++struct archive_hash_entry ++{ ++ struct bfd_hash_entry root; ++ /* Where the symbol is defined. */ ++ struct archive_list *defs; ++}; ++ ++/* An archive hash table itself. */ ++ ++struct archive_hash_table ++{ ++ struct bfd_hash_table table; ++}; ++ ++/* Create a new entry for an archive hash table. */ ++ ++static struct bfd_hash_entry * ++archive_hash_newfunc (struct bfd_hash_entry *entry, ++ struct bfd_hash_table *table, ++ const char *string) ++{ ++ struct archive_hash_entry *ret = (struct archive_hash_entry *) entry; ++ ++ /* Allocate the structure if it has not already been allocated by a ++ subclass. */ ++ if (ret == NULL) ++ ret = (struct archive_hash_entry *) ++ bfd_hash_allocate (table, sizeof (struct archive_hash_entry)); ++ if (ret == NULL) ++ return NULL; ++ ++ /* Call the allocation method of the superclass. */ ++ ret = ((struct archive_hash_entry *) ++ bfd_hash_newfunc ((struct bfd_hash_entry *) ret, table, string)); ++ ++ if (ret) ++ { ++ /* Initialize the local fields. */ ++ ret->defs = NULL; ++ } ++ ++ return &ret->root; ++} ++ ++/* Initialize an archive hash table. */ ++ ++static bfd_boolean ++archive_hash_table_init ++ (struct archive_hash_table *table, ++ struct bfd_hash_entry *(*newfunc) (struct bfd_hash_entry *, ++ struct bfd_hash_table *, ++ const char *), ++ unsigned int entsize) ++{ ++ return bfd_hash_table_init (&table->table, newfunc, entsize); ++} ++ ++/* Look up an entry in an archive hash table. */ ++ ++#define archive_hash_lookup(t, string, create, copy) \ ++ ((struct archive_hash_entry *) \ ++ bfd_hash_lookup (&(t)->table, (string), (create), (copy))) ++ ++/* Allocate space in an archive hash table. */ ++ ++#define archive_hash_allocate(t, size) bfd_hash_allocate (&(t)->table, (size)) ++ ++/* Free an archive hash table. */ ++ ++#define archive_hash_table_free(t) bfd_hash_table_free (&(t)->table) ++ + /* Generic function to add symbols from an archive file to the global + hash file. This function presumes that the archive symbol table + has already been read in (this is normally done by the +- bfd_check_format entry point). It looks through the archive symbol +- table for symbols that are undefined or common in the linker global +- symbol hash table. When one is found, the CHECKFN argument is used +- to see if an object file should be included. This allows targets +- to customize common symbol behaviour. CHECKFN should set *PNEEDED +- to TRUE if the object file should be included, and must also call +- the bfd_link_info add_archive_element callback function and handle +- adding the symbols to the global hash table. CHECKFN must notice +- if the callback indicates a substitute BFD, and arrange to add +- those symbols instead if it does so. CHECKFN should only return +- FALSE if some sort of error occurs. */ ++ bfd_check_format entry point). It looks through the undefined and ++ common symbols and searches the archive symbol table for them. If ++ it finds an entry, it includes the associated object file in the ++ link. ++ ++ The old linker looked through the archive symbol table for ++ undefined symbols. We do it the other way around, looking through ++ undefined symbols for symbols defined in the archive. The ++ advantage of the newer scheme is that we only have to look through ++ the list of undefined symbols once, whereas the old method had to ++ re-search the symbol table each time a new object file was added. ++ ++ The CHECKFN argument is used to see if an object file should be ++ included. CHECKFN should set *PNEEDED to TRUE if the object file ++ should be included, and must also call the bfd_link_info ++ add_archive_element callback function and handle adding the symbols ++ to the global hash table. CHECKFN must notice if the callback ++ indicates a substitute BFD, and arrange to add those symbols instead ++ if it does so. CHECKFN should only return FALSE if some sort of ++ error occurs. ++ ++ For some formats, such as a.out, it is possible to look through an ++ object file but not actually include it in the link. The ++ archive_pass field in a BFD is used to avoid checking the symbols ++ of an object files too many times. When an object is included in ++ the link, archive_pass is set to -1. If an object is scanned but ++ not included, archive_pass is set to the pass number. The pass ++ number is incremented each time a new object file is included. The ++ pass number is used because when a new object file is included it ++ may create new undefined symbols which cause a previously examined ++ object file to be included. */ + + bfd_boolean + _bfd_generic_link_add_archive_symbols + (bfd *abfd, + struct bfd_link_info *info, +- bfd_boolean (*checkfn) (bfd *, struct bfd_link_info *, +- struct bfd_link_hash_entry *, const char *, +- bfd_boolean *)) ++ bfd_boolean (*checkfn) (bfd *, struct bfd_link_info *, bfd_boolean *)) + { +- bfd_boolean loop; +- bfd_size_type amt; +- unsigned char *included; ++ carsym *arsyms; ++ carsym *arsym_end; ++ register carsym *arsym; ++ int pass; ++ struct archive_hash_table arsym_hash; ++ unsigned int indx; ++ struct bfd_link_hash_entry **pundef; + + if (! bfd_has_map (abfd)) + { +@@ -944,103 +1059,148 @@ _bfd_generic_link_add_archive_symbols + return FALSE; + } + +- amt = bfd_ardata (abfd)->symdef_count; +- if (amt == 0) +- return TRUE; +- amt *= sizeof (*included); +- included = (unsigned char *) bfd_zmalloc (amt); +- if (included == NULL) ++ arsyms = bfd_ardata (abfd)->symdefs; ++ arsym_end = arsyms + bfd_ardata (abfd)->symdef_count; ++ ++ /* In order to quickly determine whether an symbol is defined in ++ this archive, we build a hash table of the symbols. */ ++ if (! archive_hash_table_init (&arsym_hash, archive_hash_newfunc, ++ sizeof (struct archive_hash_entry))) + return FALSE; ++ for (arsym = arsyms, indx = 0; arsym < arsym_end; arsym++, indx++) ++ { ++ struct archive_hash_entry *arh; ++ struct archive_list *l, **pp; + +- do ++ arh = archive_hash_lookup (&arsym_hash, arsym->name, TRUE, FALSE); ++ if (arh == NULL) ++ goto error_return; ++ l = ((struct archive_list *) ++ archive_hash_allocate (&arsym_hash, sizeof (struct archive_list))); ++ if (l == NULL) ++ goto error_return; ++ l->indx = indx; ++ for (pp = &arh->defs; *pp != NULL; pp = &(*pp)->next) ++ ; ++ *pp = l; ++ l->next = NULL; ++ } ++ ++ /* The archive_pass field in the archive itself is used to ++ initialize PASS, sine we may search the same archive multiple ++ times. */ ++ pass = abfd->archive_pass + 1; ++ ++ /* New undefined symbols are added to the end of the list, so we ++ only need to look through it once. */ ++ pundef = &info->hash->undefs; ++ while (*pundef != NULL) + { +- carsym *arsyms; +- carsym *arsym_end; +- carsym *arsym; +- unsigned int indx; +- file_ptr last_ar_offset = -1; +- bfd_boolean needed = FALSE; +- bfd *element = NULL; +- +- loop = FALSE; +- arsyms = bfd_ardata (abfd)->symdefs; +- arsym_end = arsyms + bfd_ardata (abfd)->symdef_count; +- for (arsym = arsyms, indx = 0; arsym < arsym_end; arsym++, indx++) ++ struct bfd_link_hash_entry *h; ++ struct archive_hash_entry *arh; ++ struct archive_list *l; ++ ++ h = *pundef; ++ ++ /* When a symbol is defined, it is not necessarily removed from ++ the list. */ ++ if (h->type != bfd_link_hash_undefined ++ && h->type != bfd_link_hash_common) + { +- struct bfd_link_hash_entry *h; +- struct bfd_link_hash_entry *undefs_tail; ++ /* Remove this entry from the list, for general cleanliness ++ and because we are going to look through the list again ++ if we search any more libraries. We can't remove the ++ entry if it is the tail, because that would lose any ++ entries we add to the list later on (it would also cause ++ us to lose track of whether the symbol has been ++ referenced). */ ++ if (*pundef != info->hash->undefs_tail) ++ *pundef = (*pundef)->u.undef.next; ++ else ++ pundef = &(*pundef)->u.undef.next; ++ continue; ++ } + +- if (included[indx]) +- continue; +- if (needed && arsym->file_offset == last_ar_offset) ++ /* Look for this symbol in the archive symbol map. */ ++ arh = archive_hash_lookup (&arsym_hash, h->root.string, FALSE, FALSE); ++ if (arh == NULL) ++ { ++ /* If we haven't found the exact symbol we're looking for, ++ let's look for its import thunk */ ++ if (info->pei386_auto_import) ++ { ++ bfd_size_type amt = strlen (h->root.string) + 10; ++ char *buf = (char *) bfd_malloc (amt); ++ if (buf == NULL) ++ return FALSE; ++ ++ sprintf (buf, "__imp_%s", h->root.string); ++ arh = archive_hash_lookup (&arsym_hash, buf, FALSE, FALSE); ++ free(buf); ++ } ++ if (arh == NULL) + { +- included[indx] = 1; ++ pundef = &(*pundef)->u.undef.next; + continue; + } ++ } ++ /* Look at all the objects which define this symbol. */ ++ for (l = arh->defs; l != NULL; l = l->next) ++ { ++ bfd *element; ++ bfd_boolean needed; ++ ++ /* If the symbol has gotten defined along the way, quit. */ ++ if (h->type != bfd_link_hash_undefined ++ && h->type != bfd_link_hash_common) ++ break; + +- h = bfd_link_hash_lookup (info->hash, arsym->name, +- FALSE, FALSE, TRUE); ++ element = bfd_get_elt_at_index (abfd, l->indx); ++ if (element == NULL) ++ goto error_return; + +- if (h == NULL +- && info->pei386_auto_import +- && CONST_STRNEQ (arsym->name, "__imp_")) +- h = bfd_link_hash_lookup (info->hash, arsym->name + 6, +- FALSE, FALSE, TRUE); +- if (h == NULL) ++ /* If we've already included this element, or if we've ++ already checked it on this pass, continue. */ ++ if (element->archive_pass == -1 ++ || element->archive_pass == pass) + continue; + +- if (h->type != bfd_link_hash_undefined +- && h->type != bfd_link_hash_common) ++ /* If we can't figure this element out, just ignore it. */ ++ if (! bfd_check_format (element, bfd_object)) + { +- if (h->type != bfd_link_hash_undefweak) +- /* Symbol must be defined. Don't check it again. */ +- included[indx] = 1; ++ element->archive_pass = -1; + continue; + } + +- if (last_ar_offset != arsym->file_offset) +- { +- last_ar_offset = arsym->file_offset; +- element = _bfd_get_elt_at_filepos (abfd, last_ar_offset); +- if (element == NULL +- || !bfd_check_format (element, bfd_object)) +- goto error_return; +- } +- +- undefs_tail = info->hash->undefs_tail; +- + /* CHECKFN will see if this element should be included, and + go ahead and include it if appropriate. */ +- if (! (*checkfn) (element, info, h, arsym->name, &needed)) ++ if (! (*checkfn) (element, info, &needed)) + goto error_return; + +- if (needed) ++ if (! needed) ++ element->archive_pass = pass; ++ else + { +- unsigned int mark; ++ element->archive_pass = -1; + +- /* Look backward to mark all symbols from this object file +- which we have already seen in this pass. */ +- mark = indx; +- do +- { +- included[mark] = 1; +- if (mark == 0) +- break; +- --mark; +- } +- while (arsyms[mark].file_offset == last_ar_offset); +- +- if (undefs_tail != info->hash->undefs_tail) +- loop = TRUE; ++ /* Increment the pass count to show that we may need to ++ recheck object files which were already checked. */ ++ ++pass; + } + } +- } while (loop); + +- free (included); ++ pundef = &(*pundef)->u.undef.next; ++ } ++ ++ archive_hash_table_free (&arsym_hash); ++ ++ /* Save PASS in case we are called again. */ ++ abfd->archive_pass = pass; ++ + return TRUE; + + error_return: +- free (included); ++ archive_hash_table_free (&arsym_hash); + return FALSE; + } + +@@ -1050,14 +1210,12 @@ _bfd_generic_link_add_archive_symbols + for finding them. */ + + static bfd_boolean +-generic_link_check_archive_element_no_collect (bfd *abfd, ++generic_link_check_archive_element_no_collect ( ++ bfd *abfd, + struct bfd_link_info *info, +- struct bfd_link_hash_entry *h, +- const char *name, + bfd_boolean *pneeded) + { +- return generic_link_check_archive_element (abfd, info, h, name, pneeded, +- FALSE); ++ return generic_link_check_archive_element (abfd, info, pneeded, FALSE); + } + + /* See if we should include an archive element. This version is used +@@ -1067,12 +1225,9 @@ generic_link_check_archive_element_no_collect (bfd *abfd, + static bfd_boolean + generic_link_check_archive_element_collect (bfd *abfd, + struct bfd_link_info *info, +- struct bfd_link_hash_entry *h, +- const char *name, + bfd_boolean *pneeded) + { +- return generic_link_check_archive_element (abfd, info, h, name, pneeded, +- TRUE); ++ return generic_link_check_archive_element (abfd, info, pneeded, TRUE); + } + + /* See if we should include an archive element. Optionally collect +@@ -1081,8 +1236,6 @@ generic_link_check_archive_element_collect (bfd *abfd, + static bfd_boolean + generic_link_check_archive_element (bfd *abfd, + struct bfd_link_info *info, +- struct bfd_link_hash_entry *h, +- const char *name ATTRIBUTE_UNUSED, + bfd_boolean *pneeded, + bfd_boolean collect) + { +@@ -1098,6 +1251,7 @@ generic_link_check_archive_element (bfd *abfd, + for (; pp < ppend; pp++) + { + asymbol *p; ++ struct bfd_link_hash_entry *h; + + p = *pp; + +diff --git a/bfd/pdp11.c b/bfd/pdp11.c +index 593c5ca..5111a51 100644 +--- a/bfd/pdp11.c ++++ b/bfd/pdp11.c +@@ -251,7 +251,7 @@ HOWTO( 1, 0, 1, 16, TRUE, 0, complain_overflow_signed,0,"DISP16", TRU + #define TABLE_SIZE(TABLE) (sizeof(TABLE)/sizeof(TABLE[0])) + + +-static bfd_boolean aout_link_check_archive_element (bfd *, struct bfd_link_info *, struct bfd_link_hash_entry *, const char *, bfd_boolean *); ++static bfd_boolean aout_link_check_archive_element (bfd *, struct bfd_link_info *, bfd_boolean *); + static bfd_boolean aout_link_add_object_symbols (bfd *, struct bfd_link_info *); + static bfd_boolean aout_link_add_symbols (bfd *, struct bfd_link_info *); + static bfd_boolean aout_link_write_symbols (struct aout_final_link_info *, bfd *); +@@ -2682,8 +2682,6 @@ aout_link_check_ar_symbols (bfd *abfd, + static bfd_boolean + aout_link_check_archive_element (bfd *abfd, + struct bfd_link_info *info, +- struct bfd_link_hash_entry *h ATTRIBUTE_UNUSED, +- const char *name ATTRIBUTE_UNUSED, + bfd_boolean *pneeded) + { + bfd *oldbfd; +diff --git a/bfd/xcofflink.c b/bfd/xcofflink.c +index 9522974..dcfd58f 100644 +--- a/bfd/xcofflink.c ++++ b/bfd/xcofflink.c +@@ -2384,8 +2384,6 @@ xcoff_link_check_ar_symbols (bfd *abfd, + static bfd_boolean + xcoff_link_check_archive_element (bfd *abfd, + struct bfd_link_info *info, +- struct bfd_link_hash_entry *h ATTRIBUTE_UNUSED, +- const char *name ATTRIBUTE_UNUSED, + bfd_boolean *pneeded) + { + bfd_boolean keep_syms_p; +@@ -2465,7 +2463,7 @@ _bfd_xcoff_bfd_link_add_symbols (bfd *abfd, struct bfd_link_info *info) + bfd_boolean needed; + + if (! xcoff_link_check_archive_element (member, info, +- NULL, NULL, &needed)) ++ &needed)) + return FALSE; + if (needed) + member->archive_pass = -1; diff --git a/projects/binutils/peXXigen.patch b/projects/binutils/peXXigen.patch index 785aa02..c2a689a 100644 --- a/projects/binutils/peXXigen.patch +++ b/projects/binutils/peXXigen.patch @@ -1,14 +1,29 @@ -diff -crB binutils-2.24/bfd/peXXigen.c binutils-2.24/bfd/peXXigen.c -*** binutils-2.24/bfd/peXXigen.c Tue Nov 26 11:37:33 2013 ---- binutils-2.24/bfd/peXXigen.c Mon Aug 4 07:10:15 2014 -*************** -*** 795,800 **** ---- 795,802 ---- - /* Only use a real timestamp if the option was chosen. */ - if ((pe_data (abfd)->insert_timestamp)) - H_PUT_32 (abfd, time(0), filehdr_out->f_timdat); -+ else -+ H_PUT_32 (abfd, 0, filehdr_out->f_timdat); - - PUT_FILEHDR_SYMPTR (abfd, filehdr_in->f_symptr, - filehdr_out->f_symptr); +From f8e8f1daf12e30d3197b25d6bd10c03d1f932e20 Mon Sep 17 00:00:00 2001 +From: Nick Clifton <nickc(a)redhat.com> +Date: Tue, 27 Sep 2016 12:08:19 +0100 +Subject: [PATCH] Ensure that the timestamp in PE/COFF headers is always + initialised. + + PR ld/20634 + * peXXigen.c (_bfd_XXi_only_swap_filehdr_out): Put 0 in the + timestamp field if real time values are not being stored. +--- + bfd/peXXigen.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/bfd/peXXigen.c b/bfd/peXXigen.c +index c92c1ea..d713d96 100644 +--- a/bfd/peXXigen.c ++++ b/bfd/peXXigen.c +@@ -879,6 +879,8 @@ _bfd_XXi_only_swap_filehdr_out (bfd * abfd, void * in, void * out) + /* Only use a real timestamp if the option was chosen. */ + if ((pe_data (abfd)->insert_timestamp)) + H_PUT_32 (abfd, time (0), filehdr_out->f_timdat); ++ else ++ H_PUT_32 (abfd, 0, filehdr_out->f_timdat); + + PUT_FILEHDR_SYMPTR (abfd, filehdr_in->f_symptr, + filehdr_out->f_symptr); +-- +2.1.4 + diff --git a/projects/mingw-w64/build b/projects/mingw-w64/build index a142c38..b0ce69d 100644 --- a/projects/mingw-w64/build +++ b/projects/mingw-w64/build @@ -29,7 +29,7 @@ sed 's/msvcrt/msvcr100/' -i $distdir/msvcr100.spec sed 's/msvcrt/msvcr100/' -i gcc-[% c("var/gcc_version") %]/gcc/config/i386/t-mingw-w32 # LDFLAGS_FOR_TARGET does not work for some reason. Thus, we take # CFLAGS_FOR_TARGET. -export CFLAGS_FOR_TARGET="-specs=$distdir/msvcr100.spec -Wl,--nxcompat -Wl,--dynamicbase" +export CFLAGS_FOR_TARGET="-specs=$distdir/msvcr100.spec -Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-insert-timestamp" gcc-[% c("var/gcc_version") %]/configure --prefix=$distdir --target=[% c("arch") %]-w64-mingw32 --disable-multilib --enable-languages=c,c++ make -j[% c("buildconf/num_procs") %] all-gcc make install-gcc diff --git a/projects/nsis/build b/projects/nsis/build index 81ed4d4..5a7b59f 100755 --- a/projects/nsis/build +++ b/projects/nsis/build @@ -1,7 +1,6 @@ #!/bin/bash [% c("var/set_default_env") -%] [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] -mkdir -p /var/tmp/dist mkdir -p /var/tmp/build tar -C /var/tmp/build -xf nsis-[% c('version') %].tar.bz2 cd /var/tmp/build/nsis-[% c('version') %]-src @@ -13,7 +12,13 @@ for patch in $(grep '\.patch$' debian/patches/series) do [ -f debian/patches/$patch ] && patch -p1 < debian/patches/$patch done -[% SET scons_args = 'APPEND_CCFLAGS="-fgnu89-inline" VERSION=' _ c("version") +# Adding --no-insert-timestamp to APPEND_LINKFLAGS is not working as it +# is used for both the host and cross-compiled parts, but this option is +# only valid for the Windows linker. Therefore we add it using a patch +# to the cross-compilation part only. +patch -p1 < $rootdir/no-insert-timestamp.patch +[% SET scons_args = 'VERSION=' _ c("version") + _ ' APPEND_CCFLAGS="-fgnu89-inline"' _ " SKIPUTILS='NSIS Menu' XGCC_W32_PREFIX=i686-w64-mingw32-" _ ' PREFIX=/var/tmp/dist/nsis' -%] scons [% scons_args %] diff --git a/projects/nsis/config b/projects/nsis/config index 7db7b60..24adc36 100644 --- a/projects/nsis/config +++ b/projects/nsis/config @@ -21,5 +21,6 @@ input_files: URL: 'http://http.debian.net/debian/pool/main/n/nsis/nsis_2.51-1.debian.tar.xz' sha256sum: 1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a - filename: nsis-missing-unistd-include.patch + - filename: no-insert-timestamp.patch - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' diff --git a/projects/nsis/no-insert-timestamp.patch b/projects/nsis/no-insert-timestamp.patch new file mode 100644 index 0000000..e71af21 --- /dev/null +++ b/projects/nsis/no-insert-timestamp.patch @@ -0,0 +1,27 @@ +diff -ur nsis-2.51-src/SCons/Config/gnu nsis-2.51-src.n/SCons/Config/gnu +--- nsis-2.51-src/SCons/Config/gnu 2018-05-24 20:40:06.508000000 +0200 ++++ nsis-2.51-src.n/SCons/Config/gnu 2018-05-24 21:04:16.501000000 +0200 +@@ -89,6 +89,7 @@ + stub_env.Append(LINKFLAGS = ['$ALIGN_FLAG']) # 512 bytes align + stub_env.Append(LINKFLAGS = ['-Wl,-e,_WinMain@16']) # entry point + stub_env.Append(LINKFLAGS = ['$MAP_FLAG']) # generate map file ++stub_env.Append(LINKFLAGS = ['-Wl,--no-insert-timestamp']) # remove timestamps for reproducible builds + + ### makensis environment + +@@ -125,6 +126,7 @@ + plugin_env.Append(LINKFLAGS = ['$MAP_FLAG']) # generate map file + plugin_env.Append(LINKFLAGS = ['-static-libgcc']) # Make sure libgcc is statically linked in, for the plugins to work. + plugin_env.Append(LINKFLAGS = ['-static-libstdc++']) # Make sure libstdc++ is statically linked in, for the plugins to work. ++plugin_env.Append(LINKFLAGS = ['-Wl,--no-insert-timestamp']) # remove timestamps for reproducible builds + + ### cross-platform util environment + +@@ -148,6 +150,7 @@ + + util_env.Append(LINKFLAGS = ['-mwindows']) # build windows executables + util_env.Append(LINKFLAGS = ['$ALIGN_FLAG']) # 512 bytes align ++util_env.Append(LINKFLAGS = ['-Wl,--no-insert-timestamp']) # remove timestamps for reproducible builds + + conf = FlagsConfigure(util_env) + if not defenv['DEBUG'] and defenv['STRIP'] and defenv['STRIP_W32']: diff --git a/projects/openssl/config b/projects/openssl/config index 9ab54c6..9c191fa 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -15,7 +15,7 @@ targets: configure_opts: -shared linux-generic32 windows: var: - configure_opts: '-shared --cross-compile-prefix=[% c("arch") %]-w64-mingw32- mingw[% IF c("var/windows-x86_64") %]64[% END %] "-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$gcclibs"' + configure_opts: '-shared --cross-compile-prefix=[% c("arch") %]-w64-mingw32- mingw[% IF c("var/windows-x86_64") %]64[% END %] "-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$gcclibs"' osx-x86_64: var: configure_opts: --cross-compile-prefix=x86_64-apple-darwin10- darwin64-x86_64-cc enable-ec_nistp_64_gcc_128 diff --git a/projects/selfrando/config b/projects/selfrando/config index f8afa5d..07195f7 100644 --- a/projects/selfrando/config +++ b/projects/selfrando/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -version: 0.3.3 +version: 0.4.1 git_hash: 'tb-v[% c("version") %]' git_url: https://github.com/immunant/selfrando.git gpg_keyring: selfrando.gpg diff --git a/projects/zlib/build b/projects/zlib/build index 4cb384b..ef26882 100644 --- a/projects/zlib/build +++ b/projects/zlib/build @@ -7,8 +7,8 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] export CFLAGS="[% c("var/CFLAGS") %]" export LDFLAGS="[% c("var/LDFLAGS") %]" -make BINARY_PATH=$distdir/lib INCLUDE_PATH=$distdir/include LIBRARY_PATH=$distdir/lib -f win32/Makefile.gcc PREFIX=[% c("arch") %]-w64-mingw32- -j4 SHARED_MODE=1 LOC="-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$gcclibs" -make BINARY_PATH=$distdir/lib INCLUDE_PATH=$distdir/include LIBRARY_PATH=$distdir/lib -f win32/Makefile.gcc PREFIX=[% c("arch") %]-w64-mingw32- -j4 SHARED_MODE=1 LOC="-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$gcclibs" install +make BINARY_PATH=$distdir/lib INCLUDE_PATH=$distdir/include LIBRARY_PATH=$distdir/lib -f win32/Makefile.gcc PREFIX=[% c("arch") %]-w64-mingw32- -j4 SHARED_MODE=1 LOC="-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$gcclibs" +make BINARY_PATH=$distdir/lib INCLUDE_PATH=$distdir/include LIBRARY_PATH=$distdir/lib -f win32/Makefile.gcc PREFIX=[% c("arch") %]-w64-mingw32- -j4 SHARED_MODE=1 LOC="-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$gcclibs" install cd /var/tmp/dist [% c('tar', { diff --git a/rbm.conf b/rbm.conf index 6adcd6f..0d6de69 100644 --- a/rbm.conf +++ b/rbm.conf @@ -217,7 +217,7 @@ targets: suite: jessie configure_opt: '--host=[% c("arch") %]-w64-mingw32 CFLAGS="[% c("var/CFLAGS") %]" LDFLAGS="[% c("var/LDFLAGS") %]"' CFLAGS: '[% c("var/flag_mwindows") %] -fstack-protector-strong -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security' - LDFLAGS: '[% c("var/flag_mwindows") %] -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$gcclibs' + LDFLAGS: '[% c("var/flag_mwindows") %] -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$gcclibs' flag_mwindows: '-mwindows' compiler: mingw-w64 deps:

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_16472_v16'
by gk＠torproject.org 29 May '18

29 May '18

commit 6b4cb8b83c0a52e596db45b64551162ff2fce947 Merge: 473342e b24500f Author: Georg Koppen <gk(a)torproject.org> Date: Tue May 29 19:51:30 2018 +0000 Merge remote-tracking branch 'boklm/bug_16472_v16' keyring/binutils.gpg | Bin 25772 -> 1169 bytes projects/binutils/64bit-fixups.patch | 31 +- projects/binutils/binutils-224-gold.patch | 98 -- projects/binutils/build | 10 +- projects/binutils/config | 11 +- projects/binutils/enable-reloc-section-ld.patch | 83 +- projects/binutils/fix-warning-bfd.patch | 186 ---- .../binutils/fix-windows-reproducibility.patch | 1034 ++++++++++++++++++++ projects/binutils/peXXigen.patch | 43 +- projects/mingw-w64/build | 2 +- projects/nsis/build | 9 +- projects/nsis/config | 1 + projects/nsis/no-insert-timestamp.patch | 27 + projects/openssl/config | 2 +- projects/selfrando/config | 2 +- projects/zlib/build | 4 +- rbm.conf | 2 +- 17 files changed, 1174 insertions(+), 371 deletions(-)

1 0

[tor-browser/tor-browser-60.0.1esr-8.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 29 May '18

29 May '18

commit 30544586f8a98e985e0038b2e905bfddb14e999e Author: Georg Koppen <gk(a)torproject.org> Date: Tue May 29 19:40:31 2018 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. A fix for our bug 26127. --- browser/app/profile/000-tor-browser.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 8a187a8cefad..4289b7bcc5f9 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -297,6 +297,9 @@ pref("xpinstall.whitelist.add.36", ""); // don't want to have some random Google Analytics script running either on the // about:addons page, see bug 22073 and 22900. pref("extensions.getAddons.showPane", false); +// Show our legacy extensions directly on about:addons and get rid of the +// warning for the default theme. +pref("extensions.legacy.exceptions", "{972ce4c6-7e08-4474-a285-3208198ce6fd},torbutton@torproject.org,tor-launcher@torproject.org"); // Toolbar layout pref("browser.uiCustomization.state", "{\"placements\":{\"PanelUI-contents\":[\"edit-controls\",\"zoom-controls\",\"new-window-button\",\"save-page-button\",\"print-button\",\"bookmarks-menu-button\",\"history-panelmenu\",\"find-button\",\"preferences-button\",\"add-ons-button\",\"developer-button\",\"https-everywhere-button\",\"downloads-button\"],\"addon-bar\":[\"addonbar-closebutton\",\"status-bar\"],\"PersonalToolbar\":[\"personal-bookmarks\"],\"nav-bar\":[\"noscript-tbb\",\"torbutton-button\",\"urlbar-container\",\"search-container\",\"webrtc-status-button\",\"loop-button\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"toolbar-menubar\":[\"menubar-items\"]},\"seen\":[],\"dirtyAreaCache\":[\"PersonalToolbar\",\"nav-bar\",\"TabsToolbar\",\"toolbar-menubar\",\"PanelUI-contents\",\"addon-bar\"],\"currentVersion\":4,\"newElementCount\":0}");

1 0

[tor-browser-build/master] Use Rust and LLVM for Stylo bindgen in Firefox
by gk＠torproject.org 29 May '18

29 May '18

commit b5a67ed318c316c1c5258e2f5e793abbe8bf84ee Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon May 28 09:54:37 2018 -0400 Use Rust and LLVM for Stylo bindgen in Firefox --- projects/firefox/build | 9 +++++++++ projects/firefox/config | 6 ++++++ projects/llvm/config | 2 +- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/projects/firefox/build b/projects/firefox/build index 88bffc2..a9d5125 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -48,6 +48,15 @@ EOF # export SELFRANDO_skip_shuffle= #[% END -%] +[% IF c("var/linux") %] + mkdir -p /var/tmp/dist + tar -C /var/tmp/dist -xf [% c('input_files_by_name/rust') %] + export PATH="/var/tmp/dist/rust/bin:$PATH" + # Add llvm so stylo can build + tar -C /var/tmp/dist -xf [% c('input_files_by_name/llvm') %] + export LLVM_CONFIG="/var/tmp/dist/llvm/bin/llvm-config" +[% END -%] + tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz [% IF c("var/osx") %] diff --git a/projects/firefox/config b/projects/firefox/config index 0692ead..d6b8313 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -97,3 +97,9 @@ input_files: enable: '[% c("var/windows") %]' - filename: STL_win64.patch enable: '[% c("var/windows-x86_64") %]' + - project: rust + name: rust + enable: '[% c("var/linux") %]' + - project: llvm + name: llvm + enable: '[% c("var/linux") %]' diff --git a/projects/llvm/config b/projects/llvm/config index daa779d..44252b4 100644 --- a/projects/llvm/config +++ b/projects/llvm/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 3.8.0 +version: 3.9.1 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var:

1 0

[tor-browser-build/master] disable selfrando
by gk＠torproject.org 29 May '18

29 May '18

commit d3339fe091e96daa6fb1918880a3eef82c068cad Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu May 3 22:51:38 2018 -0700 disable selfrando --- projects/firefox/build | 14 +++++++------- projects/firefox/config | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index 7f74c9c..88bffc2 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -40,13 +40,13 @@ EOF export PATH="/var/tmp/dist/binutils/bin:$PATH" [% END -%] -[% IF c("var/linux") && ! c("var/release") -%] - tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/selfrando') %] - # Selfrando wrapper - export PATH="/var/tmp/dist/selfrando/Tools/TorBrowser/tc-wrapper/:$PATH" - # We need to avoid the shuffling while building as this breaks compilation - export SELFRANDO_skip_shuffle= -[% END -%] +#[% IF c("var/linux") && ! c("var/release") -%] +# tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/selfrando') %] +# # Selfrando wrapper +# export PATH="/var/tmp/dist/selfrando/Tools/TorBrowser/tc-wrapper/:$PATH" +# # We need to avoid the shuffling while building as this breaks compilation +# export SELFRANDO_skip_shuffle= +#[% END -%] tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz diff --git a/projects/firefox/config b/projects/firefox/config index 77ae405..0692ead 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -81,9 +81,9 @@ input_files: - project: binutils name: binutils enable: '[% c("var/linux") %]' - - project: selfrando - name: selfrando - enable: '[% c("var/linux") && ! c("var/release") %]' +# - project: selfrando +# name: selfrando +# enable: '[% c("var/linux") && ! c("var/release") %]' - filename: fix-info-plist.py enable: '[% c("var/osx") %]' - URL: https://people.torproject.org/~gk/mirrors/sources/msvcr100.dll

1 0

[tor-browser-build/master] Use cairgo-gtk3 and provide libgtk-3-dev for Firefox 60 ESR
by gk＠torproject.org 29 May '18

29 May '18

commit ed1e40688ca502e1adc1819024c430c24aebebb0 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon May 28 09:48:35 2018 -0400 Use cairgo-gtk3 and provide libgtk-3-dev for Firefox 60 ESR --- projects/firefox/config | 1 + projects/firefox/mozconfig-linux-i686 | 4 ++-- projects/firefox/mozconfig-linux-x86_64 | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index c53ea7e..77ae405 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -37,6 +37,7 @@ targets: var: arch_deps: - libgtk2.0-dev + - libgtk-3-dev - libdbus-glib-1-dev - libxt-dev - hardening-wrapper diff --git a/projects/firefox/mozconfig-linux-i686 b/projects/firefox/mozconfig-linux-i686 index a7d75fa..b677df3 100755 --- a/projects/firefox/mozconfig-linux-i686 +++ b/projects/firefox/mozconfig-linux-i686 @@ -17,8 +17,8 @@ ac_add_options --enable-optimize #ac_add_options --disable-optimize ac_add_options --enable-official-branding -# Let's support GTK2 for ESR52 -ac_add_options --enable-default-toolkit=cairo-gtk2 +# Let's support GTK3 for ESR60 +ac_add_options --enable-default-toolkit=cairo-gtk3 ac_add_options --enable-tor-browser-update ac_add_options --enable-signmar diff --git a/projects/firefox/mozconfig-linux-x86_64 b/projects/firefox/mozconfig-linux-x86_64 index 7d9ab1c..2e8e2fa 100755 --- a/projects/firefox/mozconfig-linux-x86_64 +++ b/projects/firefox/mozconfig-linux-x86_64 @@ -9,8 +9,8 @@ ac_add_options --enable-optimize #ac_add_options --disable-optimize ac_add_options --enable-official-branding -# Let's support GTK2 for ESR52 -ac_add_options --enable-default-toolkit=cairo-gtk2 +# Let's support GTK3 for ESR60 +ac_add_options --enable-default-toolkit=cairo-gtk3 ac_add_options --enable-tor-browser-update ac_add_options --enable-signmar

1 0

[tor-browser-build/master] Disable checking the hashes of the language packs for Firefox 60 ESR
by gk＠torproject.org 29 May '18

29 May '18

commit a80e0d5b49e827b613b624c5516b087b3c402f73 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon May 28 10:59:06 2018 -0400 Disable checking the hashes of the language packs for Firefox 60 ESR ... pending https://bugzilla.mozilla.org/show_bug.cgi?id=1463749 is fixed. --- projects/firefox-langpacks/build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/firefox-langpacks/build b/projects/firefox-langpacks/build index 6bc1810..cbbc9ca 100644 --- a/projects/firefox-langpacks/build +++ b/projects/firefox-langpacks/build @@ -4,8 +4,8 @@ [% FOREACH lang = c('var/locales') %] [% SET lang = tmpl(lang) %] [% SET filename = c("var/input_filename") _ '/' _ lang _ '.xpi'; %] - shasum=$(grep '[% c("var/ff_arch") %]/xpi/[% lang %].xpi$' SHA512SUMS-[% c("version") %] | sed 's| [% c("var/ff_arch") %]/xpi/[% lang %].xpi$||') - echo "$shasum [% filename %]" | sha512sum -c + #shasum=$(grep '[% c("var/ff_arch") %]/xpi/[% lang %].xpi$' SHA512SUMS-[% c("version") %] | sed 's| [% c("var/ff_arch") %]/xpi/[% lang %].xpi$||') + #echo "$shasum [% filename %]" | sha512sum -c [% END %] mkdir -p [% dest_dir %]/[% c("filename") %]

1 0

[tor-browser-build/master] Update Firefox to 60.0.1esr (tor-browser-60.0.1esr-8.0-1)
by gk＠torproject.org 29 May '18

29 May '18

commit a4ed53bb203f03b76853f42efc0564a75cc7e562 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon May 28 09:44:02 2018 -0400 Update Firefox to 60.0.1esr (tor-browser-60.0.1esr-8.0-1) --- projects/firefox/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/config b/projects/firefox/config index 4458d48..c53ea7e 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -7,7 +7,7 @@ git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg var: - firefox_platform_version: 52.8.0 + firefox_platform_version: 60.0.1 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 8.0 torbrowser_update_channel: alpha

1 0

[tor-browser-build/master] Use mach configure to pass build configuration arguments
by gk＠torproject.org 29 May '18

29 May '18

commit 74e8c6a9803cc778b73dfa08c23ab7c75bb40718 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon May 28 11:05:32 2018 -0400 Use mach configure to pass build configuration arguments --- projects/firefox/build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index cfef91d..7f74c9c 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -111,10 +111,10 @@ fi rm -f configure rm -f js/src/configure -make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=[% c("var/torbrowser_version") %] --with-distribution-id=org.torproject --enable-update-channel=[% c("var/torbrowser_update_channel") %] --enable-bundled-fonts" -make -j[% c("buildconf/num_procs") %] -f client.mk build -make -C obj-* package INNER_MAKE_PACKAGE=true +./mach configure --with-tor-browser-version=[% c("var/torbrowser_version") %] --with-distribution-id=org.torproject --enable-update-channel=[% c("var/torbrowser_update_channel") %] --enable-bundled-fonts +./mach build +./mach package [% IF c("var/osx") %] cp -a obj-macos/dist/firefox/* $distdir

1 0

[tor-browser-build/master] Update signing key for llvm
by gk＠torproject.org 29 May '18

29 May '18

commit 21b610639107c66bcd49cd219c26560261257aa4 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue May 15 10:37:50 2018 -0400 Update signing key for llvm LLVM 3.9.1 is signed with 0x02119294 --- keyring/llvm.gpg | Bin 2507 -> 3335 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/keyring/llvm.gpg b/keyring/llvm.gpg index 9911f65..a94f435 100644 Binary files a/keyring/llvm.gpg and b/keyring/llvm.gpg differ

1 0

[tor-browser-build/master] Bug 26073: Migrate general.useragent.locale to intl.locale.requested
by gk＠torproject.org 29 May '18

29 May '18

commit 473342eefe9e19dde3a7548b16b29fcfc1f13855 Author: Igor Oliveira <igt0(a)torproject.org> Date: Wed May 23 12:12:01 2018 -0300 Bug 26073: Migrate general.useragent.locale to intl.locale.requested intl.locale.requested is the new way that Gecko handles locales. --- projects/tor-browser/build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index c542818..4d1be00 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -194,7 +194,7 @@ cp defaults/preferences/000-tor-browser.js $rootdir rm -rf chrome [% END %] # Set the locale of the bundle. -echo "pref(\"general.useragent.locale\", \"en-US\");" >> defaults/preferences/000-tor-browser.js +echo "pref(\"intl.locale.requested\", \"en-US\");" >> defaults/preferences/000-tor-browser.js [% c("var/touch") %] defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js rm -rf defaults @@ -325,7 +325,7 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ mkdir -p defaults/preferences cp $rootdir/000-tor-browser.js defaults/preferences/ # Set the locale of the bundle. - echo "pref(\"general.useragent.locale\", \"[% lang %]\");" >> defaults/preferences/000-tor-browser.js + echo "pref(\"intl.locale.requested\", \"[% lang %]\");" >> defaults/preferences/000-tor-browser.js [% c("var/touch") %] defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js rm -rf defaults

1 0

[tor-browser-build/master] Update NoScript to 10.1.8.1
by gk＠torproject.org 29 May '18

29 May '18

commit 4398ed2d7050c8539068d0e6e3ed4a3ca7ff93a7 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon May 28 10:16:46 2018 -0400 Update NoScript to 10.1.8.1 Revert the download URL to Mozilla Add-ons (AMO) --- projects/tor-browser/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index dec5648..62ed70c 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -66,9 +66,9 @@ input_files: name: snowflake enable: '[% c("var/snowflake") %]' - filename: Bundle-Data - - URL: https://secure.informaction.com/download/releases/noscript-5.1.8.5.xpi + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 7180f8d24ca31989682dee229b95e3503699f2bb25cb593a6a1f2ce0a2253792 + sha256sum: 63a8a6a582af6e28084fae3bc72ebc5c5c2437467f8d445c8ea69d1061a3f7b2 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop'

1 0

[tor-browser-build/master] new certutil location for firefox 60
by gk＠torproject.org 29 May '18

29 May '18

commit 66c38da52239e4d8c408f793ce6178f4131cf0cb Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue May 8 20:12:18 2018 -0700 new certutil location for firefox 60 --- projects/firefox/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/build b/projects/firefox/build index a9d5125..62186d1 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -169,7 +169,7 @@ cp -p obj-*/dist/host/bin/mar $MARTOOLS/ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ [% IF c("var/linux") %] cp -p obj-*/modules/libmar/tool/signmar $MARTOOLS/ - cp -p obj-*/security/nss/cmd/certutil/certutil $MARTOOLS/ + cp -p obj-*/security/nss/cmd/certutil/certutil_certutil/certutil $MARTOOLS/ NSS_LIBS="libfreeblpriv3.so libmozsqlite3.so libnss3.so libnssdbm3.so libnssutil3.so libsmime3.so libsoftokn3.so libssl3.so" NSPR_LIBS="libnspr4.so libplc4.so libplds4.so" for LIB in $NSS_LIBS $NSPR_LIBS; do

1 0

[tor-browser-build/master] Use a more recent version of gcc
by gk＠torproject.org 29 May '18

29 May '18

commit 77b52782bc81b00a7cd702fa50459cd56a0752e8 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon May 28 10:06:40 2018 -0400 Use a more recent version of gcc --- projects/llvm/build | 7 +++++++ projects/llvm/config | 3 +++ 2 files changed, 10 insertions(+) diff --git a/projects/llvm/build b/projects/llvm/build index b018ca5..0958a4c 100644 --- a/projects/llvm/build +++ b/projects/llvm/build @@ -4,6 +4,13 @@ distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %] export PATH="/var/tmp/dist/cmake/bin:$PATH" +[% IF c("var/linux") %] + # We need a link to our GCC, otherwise the system cc gets used which points to + # /usr/bin/gcc. + [% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcc'), + hardened_gcc => 0 }) %] + ln -s gcc /var/tmp/dist/gcc/bin/cc +[% END -%] mkdir -p /var/tmp/build cd /var/tmp/build tar -xf $rootdir/[% c('input_files_by_name/llvm') %] diff --git a/projects/llvm/config b/projects/llvm/config index 44252b4..76fb2c0 100644 --- a/projects/llvm/config +++ b/projects/llvm/config @@ -8,6 +8,9 @@ var: input_files: - project: container-image + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + enable: '[% c("var/linux") %]' - project: cmake name: cmake - URL: 'https://releases.llvm.org/[% c("version") %]/llvm-[% c("version") %].src.tar.xz'

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_26165_v2'
by gk＠torproject.org 29 May '18

29 May '18

commit b1e6dd922f17555ad153cd9e05997ca41e50417a Merge: 8fd3d1d 2b3a355 Author: Georg Koppen <gk(a)torproject.org> Date: Tue May 29 07:48:51 2018 +0000 Merge remote-tracking branch 'boklm/bug_26165_v2' projects/firefox/build | 10 ++-------- projects/gcc/config | 36 ++++++++++++++++++++---------------- 2 files changed, 22 insertions(+), 24 deletions(-)

1 0

[tor-browser-build/master] Bug 26165: make it possible to use gcc:var/setup without hardening wrapper
by gk＠torproject.org 29 May '18

29 May '18

commit 2b3a35530ece4f61f86786bc524d18448bc009eb Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue May 22 18:21:28 2018 +0200 Bug 26165: make it possible to use gcc:var/setup without hardening wrapper This allows us to use it to setup the gcc host compiler for the Windows build in projects/firefox/build. --- projects/firefox/build | 10 ++-------- projects/gcc/config | 36 ++++++++++++++++++++---------------- 2 files changed, 22 insertions(+), 24 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index a7441bd..aa5fd73 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -2,16 +2,10 @@ [% c("var/setarch") -%] [% c("var/set_default_env") -%] [% IF c("var/windows") -%] - mkdir -p /var/tmp/dist - tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/gcc') %] - hgccdir=/var/tmp/dist/gcc + [% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcc') }) %] # We need a link to our GCC, otherwise the system cc gets used which points to # /usr/bin/gcc. - ln -s gcc $hgccdir/bin/cc - # Make sure our GCC (as host compiler) get used. We do that before - # compiler setup so that mingw is first in the PATH. - export LD_LIBRARY_PATH=$hgccdir/lib64 - export PATH=$hgccdir/bin:$PATH + ln -s gcc /var/tmp/dist/gcc/bin/cc [% END -%] [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] distdir=/var/tmp/dist/[% project %] diff --git a/projects/gcc/config b/projects/gcc/config index 1d74a0a..b13a738 100644 --- a/projects/gcc/config +++ b/projects/gcc/config @@ -18,23 +18,25 @@ var: export LD_LIBRARY_PATH=/var/tmp/dist/gcc/lib64 [% END -%] - # Config options for hardening-wrapper - export DEB_BUILD_HARDENING=1 - export DEB_BUILD_HARDENING_STACKPROTECTOR=1 - export DEB_BUILD_HARDENING_FORTIFY=1 - export DEB_BUILD_HARDENING_FORMAT=1 - export DEB_BUILD_HARDENING_PIE=1 + [% IF c("hardened_gcc") -%] + # Config options for hardening-wrapper + export DEB_BUILD_HARDENING=1 + export DEB_BUILD_HARDENING_STACKPROTECTOR=1 + export DEB_BUILD_HARDENING_FORTIFY=1 + export DEB_BUILD_HARDENING_FORMAT=1 + export DEB_BUILD_HARDENING_PIE=1 - # Make sure we use the hardening wrapper - pushd /var/tmp/dist/gcc/bin - cp /usr/bin/hardened-cc ./ - mv gcc gcc.real - mv c++ c++.real - mv g++ g++.real - ln -sf hardened-cc gcc - ln -sf hardened-cc c++ - ln -sf hardened-cc g++ - popd + # Make sure we use the hardening wrapper + pushd /var/tmp/dist/gcc/bin + cp /usr/bin/hardened-cc ./ + mv gcc gcc.real + mv c++ c++.real + mv g++ g++.real + ln -sf hardened-cc gcc + ln -sf hardened-cc c++ + ln -sf hardened-cc g++ + popd + [% END -%] targets: windows: @@ -43,6 +45,8 @@ targets: arch_deps: - libc6-dev - zlib1g-dev + linux: + hardened_gcc: 1 linux-i686: var: configure_opt: --enable-multilib --enable-languages=c,c++ --with-system-zlib

1 0

[torbutton/master] Bug 26129: Show our about:tor page on startup
by gk＠torproject.org 28 May '18

28 May '18

commit 07bdf93e5a4545d33e9204192eab60fd508a02da Author: Georg Koppen <gk(a)torproject.org> Date: Mon May 28 09:24:37 2018 +0000 Bug 26129: Show our about:tor page on startup --- src/chrome/content/locale/non-localized.properties | 6 ++++++ src/defaults/preferences/preferences.js | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/locale/non-localized.properties b/src/chrome/content/locale/non-localized.properties new file mode 100644 index 0000000..dca7863 --- /dev/null +++ b/src/chrome/content/locale/non-localized.properties @@ -0,0 +1,6 @@ +# This file must be located in a subdirectory named "locale" so that +# about:config will display the correct value for browser.startup.homepage. +# See fetchPref() inside toolkit/components/viewconfig/content/config.js + +# Default home page +browser.startup.homepage=about:tor diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index f51c7db..f61cb89 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -53,7 +53,7 @@ pref("extensions.torbutton.confirm_plugins", true); pref("extensions.torbutton.confirm_newnym", true); // Browser home page: -pref("browser.startup.homepage", "about:tor"); +pref("browser.startup.homepage", "chrome://torbutton/content/locale/non-localized.properties"); // This pref specifies an ad-hoc "version" for various pref update hacks we need to do pref("extensions.torbutton.pref_fixup_version", 0);

1 0

[tor-browser/tor-browser-60.0.1esr-8.0-1] Fix MAR generation bashism
by gk＠torproject.org 27 May '18

27 May '18

commit b135c59f65dba827b61379a4945251e148c43291 Author: Georg Koppen <gk(a)torproject.org> Date: Sun May 27 11:46:56 2018 +0000 Fix MAR generation bashism --- tools/update-packaging/common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/update-packaging/common.sh b/tools/update-packaging/common.sh index 388d6b186367..79548dd4aa19 100755 --- a/tools/update-packaging/common.sh +++ b/tools/update-packaging/common.sh @@ -218,7 +218,7 @@ list_files() { continue; fi eval "${1}[$count]=\"$file\"" - (( count++ )) + count=$((count + 1)) done <"${tmpfile}" rm -f "${tmpfile}" }

1 0

[tor-browser-build/master] Bug 25862: move mingw helper scripts to firefox
by gk＠torproject.org 25 May '18

25 May '18

commit 8fd3d1dc7f27a96129328af98b69e18d161cef97 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 20 18:41:15 2018 +0200 Bug 25862: move mingw helper scripts to firefox Stop using mingw helper scripts everywhere except for the firefox build. At the same time as we move them to firefox, we simplify the helper scripts by using var/CFLAGS and var/LDFLAGS from rbm.conf instead of redefining the flags. We are also now building firefox with -fstack-protector-strong instead of -fstack-protector. --- projects/firefox/build | 23 +++++++++++++++++++++++ projects/mingw-w64/build | 19 ------------------- projects/mingw-w64/config | 2 +- projects/nsis/build | 2 -- rbm.conf | 2 +- 5 files changed, 25 insertions(+), 23 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index a7441bd..c3536c6 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -17,6 +17,29 @@ distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/build +[% IF c("var/windows") -%] + mingwdir=/var/tmp/dist/mingw-w64 + mkdir -p $mingwdir/helpers + + cat > $mingwdir/helpers/[% c("arch") %]-w64-mingw32-g++ << 'EOF' +#!/bin/sh +/var/tmp/dist/mingw-w64/bin/[% c("arch") %]-w64-mingw32-g++ [% c("var/LDFLAGS") %] [% c("var/CFLAGS") %] "$@" +EOF + + cat > $mingwdir/helpers/[% c("arch") %]-w64-mingw32-gcc << 'EOF' +#!/bin/sh +/var/tmp/dist/mingw-w64/bin/[% c("arch") %]-w64-mingw32-gcc [% c("var/LDFLAGS") %] [% c("var/CFLAGS") %] "$@" +EOF + + cat > $mingwdir/helpers/[% c("arch") %]-w64-mingw32-ld << 'EOF' +#!/bin/sh +/var/tmp/dist/mingw-w64/bin/[% c("arch") %]-w64-mingw32-ld [% c("var/LDFLAGS") %] "$@" +EOF + + chmod +x $mingwdir/helpers/* + export PATH="$mingwdir/helpers:$PATH" +[% END -%] + [% IF c("var/linux") %] mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %] diff --git a/projects/mingw-w64/build b/projects/mingw-w64/build index 8ce5048..a142c38 100644 --- a/projects/mingw-w64/build +++ b/projects/mingw-w64/build @@ -55,25 +55,6 @@ mkdir -p $distdir/gcclibs cp [% c("arch") %]-w64-mingw32/libssp/.libs/libssp-0.dll $distdir/gcclibs cp [% c("arch") %]-w64-mingw32/libgcc/shlib/[% c("var/libgcc_dll") %] $distdir/gcclibs -mkdir -p $distdir/helpers - -cat > $distdir/helpers/[% c("arch") %]-w64-mingw32-g++ << 'EOF' -#!/bin/sh -/var/tmp/dist/mingw-w64/bin/[% c("arch") %]-w64-mingw32-g++ -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -fstack-protector --param ssp-buffer-size=4 -fno-strict-overflow "$@" -EOF - -cat > $distdir/helpers/[% c("arch") %]-w64-mingw32-gcc << 'EOF' -#!/bin/sh -/var/tmp/dist/mingw-w64/bin/[% c("arch") %]-w64-mingw32-gcc -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -fstack-protector --param ssp-buffer-size=4 -fno-strict-overflow "$@" -EOF - -cat > $distdir/helpers/[% c("arch") %]-w64-mingw32-ld << 'EOF' -#!/bin/sh -/var/tmp/dist/mingw-w64/bin/[% c("arch") %]-w64-mingw32-ld --dynamicbase --nxcompat --enable-reloc-section -lssp -L$gcclibs "$@" -EOF - -chmod +x $distdir/helpers/* - cd /var/tmp/dist [% c('tar', { tar_src => [ project ], diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config index 01d0c37..fb9ef21 100644 --- a/projects/mingw-w64/config +++ b/projects/mingw-w64/config @@ -15,7 +15,7 @@ var: [% c("var/setarch") -%] mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %] - export PATH="/var/tmp/dist/mingw-w64/helpers:/var/tmp/dist/mingw-w64/bin:$PATH" + export PATH="/var/tmp/dist/mingw-w64/bin:$PATH" export gcclibs=/var/tmp/dist/mingw-w64/gcclibs targets: windows-i686: diff --git a/projects/nsis/build b/projects/nsis/build index af19dd7..81ed4d4 100755 --- a/projects/nsis/build +++ b/projects/nsis/build @@ -1,8 +1,6 @@ #!/bin/bash [% c("var/set_default_env") -%] [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] -# remove hardening wrappers -rm -Rf /var/tmp/dist/mingw-w64/helpers mkdir -p /var/tmp/dist mkdir -p /var/tmp/build tar -C /var/tmp/build -xf nsis-[% c('version') %].tar.bz2 diff --git a/rbm.conf b/rbm.conf index bb53bcb..6adcd6f 100644 --- a/rbm.conf +++ b/rbm.conf @@ -216,7 +216,7 @@ targets: container: suite: jessie configure_opt: '--host=[% c("arch") %]-w64-mingw32 CFLAGS="[% c("var/CFLAGS") %]" LDFLAGS="[% c("var/LDFLAGS") %]"' - CFLAGS: '[% c("var/flag_mwindows") %] -fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security' + CFLAGS: '[% c("var/flag_mwindows") %] -fstack-protector-strong -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security' LDFLAGS: '[% c("var/flag_mwindows") %] -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$gcclibs' flag_mwindows: '-mwindows' compiler: mingw-w64

1 0

[tor-browser-build/master] Bug 25975: Get a Rust cross-compiler for macOS
by gk＠torproject.org 25 May '18

25 May '18

commit e7f9f6f11e45d1ba15fbbb183ef1ae8b0c3b20c5 Author: Georg Koppen <gk(a)torproject.org> Date: Fri May 25 06:53:05 2018 +0000 Bug 25975: Get a Rust cross-compiler for macOS --- projects/rust/build | 39 +++++++++++++++++++++++++++++++++++++-- projects/rust/config | 12 +++++++++--- 2 files changed, 46 insertions(+), 5 deletions(-) diff --git a/projects/rust/build b/projects/rust/build index e20df55..4c81ad8 100644 --- a/projects/rust/build +++ b/projects/rust/build @@ -10,10 +10,45 @@ cd /var/tmp/dist/rust-[% c('var/prev_version') %]-[% c('arch') %]-unknown-linux- ./install.sh --prefix=$distdir-rust-old export PATH="$distdir-rust-old/bin:$PATH" -[% IF c("var/linux") %] - [% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcc') }) %] +[% IF ! c("var/windows") %] + [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] [% END -%] +[% IF c("var/osx") %] + # We need to clear `CC` and `LDFLAGS` as they are used for the host platform + # (i.e. Linux). + unset CC + unset LDFLAGS + # Target 10.6 as our toolchain does. Without this explicit declaration Bad + # Things will happen, as a lot of dependent code then assumes that the + # official macOS target, x86_64-apple-darwin, essentially means 10.4. + export MACOSX_DEPLOYMENT_TARGET=10.6 + # The Rust target for macOS is x86_64-apple-darwin, yet our toolchain is built + # for x86_64-apple-darwin10. We can't mix those targets as clang gets confused + # that way. Changing the Rust target to x86_64-apple-darwin10 would require a + # fair amount of patching, thus we create symlinks to prvoide Rust with the + # necessary tools while using our toolchain underneath, targeting 10.6. + cd $cctoolsdir + for f in `ls x86_64-apple-darwin10-*`; do + ln -s $f ${f//x86_64-apple-darwin10/x86_64-apple-darwin} + done + cd .. + ln -s x86_64-apple-darwin10 x86_64-apple-darwin + mkdir -p $distdir/helper + + # We need to adapt our CFLAGS and make sure our flags are passed down to all + # dependencies. Using `CFLAGS_x86_apple-darwin` did not do the trick, so resort + # to a wrapper script. + cat > $distdir/helper/x86_64-apple-darwin-clang << 'EOF' +#!/bin/sh +BASEDIR=/var/tmp/dist/macosx-toolchain +$BASEDIR/cctools/bin/x86_64-apple-darwin-clang -target x86_64-apple-darwin -mlinker-version=136 -B $BASEDIR/cctools/bin -isysroot $BASEDIR/SDK/ -Wl,-syslibroot,$BASEDIR/SDK/ -Wl,-dead_strip -Wl,-pie "$@" +EOF + + chmod +x $distdir/helper/x86_64-apple-darwin-clang + export PATH=$distdir/helper:$PATH +[% END %] + cd $rootdir mkdir /var/tmp/build tar -C /var/tmp/build -xf [% c('input_files_by_name/rust') %] diff --git a/projects/rust/config b/projects/rust/config index 49fc3ab..ae2290b 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -41,13 +41,19 @@ targets: # Rust pieces compiled. configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=[% c("arch") %]-unknown-linux-gnu --set=target.[% c("arch") %]-unknown-linux-gnu.cc=gcc + osx-x86_64: + var: + arch_deps: + - libssl-dev + - pkg-config + configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=x86_64-apple-darwin --set=target.x86_64-apple-darwin.cc=x86_64-apple-darwin-clang + input_files: - project: container-image - project: cmake name: cmake - - project: gcc - name: gcc - enable: '[% c("var/linux") %]' + - project: '[% c("var/compiler") %]' + name: '[% c("var/compiler") %]' - URL: 'https://static.rust-lang.org/dist/rustc-[% c("version") %]-src.tar.gz' name: rust sig_ext: asc

1 0

[torbutton/master] Bug 26100: Update xmlhttprequest calls after changes in xpcom interface
by gk＠torproject.org 25 May '18

25 May '18

commit 91f1c5deae6fb8415e0c22a99d4c0c3eac7db7b5 Author: Igor Oliveira <igt0(a)torproject.org> Date: Wed Feb 28 17:42:33 2018 -0300 Bug 26100: Update xmlhttprequest calls after changes in xpcom interface The xmlhttprequest xpcom interface was deprecated in favor of the XMLHttpRequest. --- src/chrome/content/torbutton.js | 12 +++++++----- src/components/torCheckService.js | 5 ++--- src/components/torbutton-logger.js | 4 +--- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 4b15c5f..cf39dc2 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -7,13 +7,14 @@ // TODO: Double-check there are no strange exploits to defeat: // http://kb.mozillazine.org/Links_to_local_pages_don%27t_work -let { LoadContextInfo } = Cu.import('resource://gre/modules/LoadContextInfo.jsm', {}); let { Services } = Cu.import("resource://gre/modules/Services.jsm", {}); let { showDialog } = Cu.import("resource://torbutton/modules/utils.js", {}); let { getLocale, unescapeTorString } = Cu.import("resource://torbutton/modules/utils.js", {}); let SecurityPrefs = Cu.import("resource://torbutton/modules/security-prefs.js", {}); let { bindPrefAndInit, observe } = Cu.import("resource://torbutton/modules/utils.js", {}); +Cu.importGlobalProperties(["XMLHttpRequest"]); + const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion"; const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; const k_tb_last_update_check_pref = "extensions.torbutton.lastUpdateCheck"; @@ -733,9 +734,7 @@ function torbutton_do_async_versioncheck() { torbutton_log(3, "Checking version with socks port: " +m_tb_prefs.getIntPref("network.proxy.socks_port")); try { - var req = Components.classes["@mozilla.org/xmlextras/xmlhttprequest;1"] - .createInstance(Components.interfaces.nsIXMLHttpRequest); - //var req = new XMLHttpRequest(); Blocked by content policy + var req = new XMLHttpRequest(); var url = m_tb_prefs.getCharPref("extensions.torbutton.versioncheck_url"); req.open('GET', url, true); req.channel.loadFlags |= Ci.nsIRequest.LOAD_BYPASS_CACHE; @@ -1130,6 +1129,9 @@ function torbutton_do_new_identity() { torbutton_log(3, "New Identity: Clearing Offline Cache"); try { + const LoadContextInfo = Cc["@mozilla.org/load-context-info-factory;1"] + .getService(Ci.nsILoadContextInfoFactory); + for (let contextInfo of [LoadContextInfo.default, LoadContextInfo.private]) { let appCacheStorage = Services.cache2.appCacheStorage(contextInfo, null); // The following call (asyncEvictStorage) is actually synchronous, either @@ -2023,7 +2025,7 @@ let stopLanguagePromptObserver; function torbutton_new_window(event) { torbutton_log(3, "New window"); - var browser = getBrowser(); + var browser = window.gBrowser; if(!browser) { torbutton_log(5, "No browser for new window."); diff --git a/src/components/torCheckService.js b/src/components/torCheckService.js index 04708d4..19e13f4 100644 --- a/src/components/torCheckService.js +++ b/src/components/torCheckService.js @@ -77,9 +77,8 @@ TBTorCheckService.prototype = createCheckRequest: function(aAsync) { - let req = Cc["@mozilla.org/xmlextras/xmlhttprequest;1"] - .createInstance(Ci.nsIXMLHttpRequest); - //let req = new XMLHttpRequest(); Blocked by content policy + Cu.importGlobalProperties(["XMLHttpRequest"]); + let req = new XMLHttpRequest(); let prefs = Cc["@mozilla.org/preferences-service;1"] .getService(Ci.nsIPrefBranch); let url = prefs.getCharPref("extensions.torbutton.test_url"); diff --git a/src/components/torbutton-logger.js b/src/components/torbutton-logger.js index 620113f..18a5f1e 100644 --- a/src/components/torbutton-logger.js +++ b/src/components/torbutton-logger.js @@ -22,9 +22,7 @@ function TorbuttonLogger() { .getService(Components.interfaces.nsIPrefBranch); // Register observer - var pref_service = Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefBranchInternal); - this._branch = pref_service.QueryInterface(Components.interfaces.nsIPrefBranchInternal); + this._branch = this.prefs.QueryInterface(Components.interfaces.nsIPrefBranch); this._branch.addObserver("extensions.torbutton", this, false); this.loglevel = this.prefs.getIntPref("extensions.torbutton.loglevel");

1 0

[torbutton/master] Bug 26100: Don't use console object for logging
by gk＠torproject.org 25 May '18

25 May '18

commit 482abfb95de85bce98043338d8f7fcad9f6b7845 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu May 17 23:05:44 2018 -0700 Bug 26100: Don't use console object for logging --- src/modules/tor-control-port.js | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/modules/tor-control-port.js b/src/modules/tor-control-port.js index 2b75e22..2c39936 100644 --- a/src/modules/tor-control-port.js +++ b/src/modules/tor-control-port.js @@ -26,14 +26,9 @@ Cu.import("resource://gre/modules/Services.jsm"); // __log__. // Logging function -let log; -if ((typeof console) !== "undefined") { - log = x => console.log(typeof(x) === "string" ? x.trimRight().replace(/\r\n/g, "\n") : JSON.stringify(x)); -} else { - let logger = Cc["@torproject.org/torbutton-logger;1"] - .getService(Components.interfaces.nsISupports).wrappedJSObject; - log = x => logger.eclog(3, x.trimRight().replace(/\r\n/g, "\n")); -} +let logger = Cc["@torproject.org/torbutton-logger;1"] + .getService(Components.interfaces.nsISupports).wrappedJSObject; +let log = x => logger.eclog(3, x.trimRight().replace(/\r\n/g, "\n")); // ### announce this file log("Loading tor-control-port.js\n");

1 0

[torbutton/master] Bug 26100: Use inputStream.asyncWait instead of nsIInputStreamPump
by gk＠torproject.org 25 May '18

25 May '18

commit 2764f9a0019b1eb8704e6748bfa46b9f58aaf74a Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu May 17 22:35:51 2018 -0700 Bug 26100: Use inputStream.asyncWait instead of nsIInputStreamPump --- src/modules/tor-control-port.js | 39 +++++++++++++++------------------------ 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/src/modules/tor-control-port.js b/src/modules/tor-control-port.js index 3491efc..2b75e22 100644 --- a/src/modules/tor-control-port.js +++ b/src/modules/tor-control-port.js @@ -68,35 +68,26 @@ io.asyncSocketStreams = function (ipcFile, host, port) { }; // __io.pumpInputStream(scriptableInputStream, onInputData, onError)__. -// Run an "input stream pump" that takes an input stream and -// asynchronously pumps incoming data to the onInputData callback. +// Take an input stream and asynchronously pass data to the onInputData callback. io.pumpInputStream = function (inputStream, onInputData, onError) { // Wrap raw inputStream with a "ScriptableInputStream" so we can read incoming data. let ScriptableInputStream = Components.Constructor( "@mozilla.org/scriptableinputstream;1", "nsIScriptableInputStream", "init"), scriptableInputStream = new ScriptableInputStream(inputStream), - // A private method to read all data available on the input stream. - readAll = function() { - return scriptableInputStream.read(scriptableInputStream.available()); - }, - pump = Cc["@mozilla.org/network/input-stream-pump;1"] - .createInstance(Components.interfaces.nsIInputStreamPump); - // Start the pump. - pump.init(inputStream, -1, -1, 0, 0, true); - // Tell the pump to read all data whenever it is available, and pass the data - // to the onInputData callback. The first argument to asyncRead implements - // nsIStreamListener. - pump.asyncRead({ onStartRequest: function (request, context) { }, - onStopRequest: function (request, context, code) { }, - onDataAvailable : function (request, context, stream, offset, count) { - try { - onInputData(readAll()); - } catch (error) { - // readAll() or onInputData(...) has thrown an error. - // Notify calling code through onError. - onError(error); - } - } }, null); + awaitNextChunk = function () { + inputStream.asyncWait({ + onInputStreamReady: (stream) => { + try { + let chunk = scriptableInputStream.read(scriptableInputStream.available()); + onInputData(chunk); + awaitNextChunk(); + } catch (err) { + onError(err); + } + } + }, 0, 0, Services.tm.currentThread); + }; + awaitNextChunk(); }; // __io.asyncSocket(ipcFile, host, port, onInputData, onError)__.

1 0

[torbutton/master] Bug 26100: Use new asynchronous applyFilter
by gk＠torproject.org 25 May '18

25 May '18

commit d07608265a3720f6f0a35f1e1bfa3c4d08706861 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed May 16 13:48:39 2018 -0700 Bug 26100: Use new asynchronous applyFilter applyFilter changed its signature to include a callback object: https://hg.mozilla.org/mozilla-central/rev/77c14093bc69 --- src/components/domain-isolator.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/domain-isolator.js b/src/components/domain-isolator.js index a698439..fc28703 100644 --- a/src/components/domain-isolator.js +++ b/src/components/domain-isolator.js @@ -43,8 +43,8 @@ mozilla.protocolProxyService = Cc["@mozilla.org/network/protocol-proxy-service;1 // for the given channel, and should return a new Proxy or list of Proxies. mozilla.registerProxyChannelFilter = function (filterFunction, positionIndex) { let proxyFilter = { - applyFilter : function (aProxyService, aChannel, aProxy) { - return filterFunction(aChannel, aProxy); + applyFilter : function (aProxyService, aChannel, aProxy, aCallback) { + aCallback.onProxyFilterResult(filterFunction(aChannel, aProxy)); } }; mozilla.protocolProxyService.registerChannelFilter(proxyFilter, positionIndex);

1 0

[torbutton/master] Bug 26100: baseMenuOverlay.xul was removed by Mozilla
by gk＠torproject.org 25 May '18

25 May '18

commit 5905b318d348f608f6c8e59dccac28015aea6672 Author: Igor Oliveira <igt0(a)torproject.org> Date: Thu May 17 14:28:58 2018 -0300 Bug 26100: baseMenuOverlay.xul was removed by Mozilla Now it is inline in the browser.xul[1]. [1] https://bugzilla.mozilla.org/show_bug.cgi?id=1441378 --- src/chrome.manifest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome.manifest b/src/chrome.manifest index f72fffa..230a1e6 100644 --- a/src/chrome.manifest +++ b/src/chrome.manifest @@ -13,7 +13,7 @@ override chrome://branding/locale/brand.properties chrome://torbutton/locale/bra overlay chrome://browser/content/aboutDialog.xul chrome://torbutton/content/aboutDialog.xul # UI customization -overlay chrome://browser/content/baseMenuOverlay.xul chrome://torbutton/content/menu-overlay.xul +overlay chrome://browser/content/browser.xul chrome://torbutton/content/menu-overlay.xul overlay about:preferences chrome://torbutton/content/privacy-prefs-overlay.xul overlay chrome://browser/content/browser.xul chrome://torbutton/content/tor-circuit-display.xul

1 0

[torbutton/master] Bug 26100: Update about:tor code after changes in the resource and js
by gk＠torproject.org 25 May '18

25 May '18

commit e37b97e4af14fdbccfcb485f6b4ecf136aeb2e18 Author: Igor Oliveira <igt0(a)torproject.org> Date: Thu May 17 16:13:47 2018 -0300 Bug 26100: Update about:tor code after changes in the resource and js code - Move all the resource files to the same directory and change the chrome.manifest file to allow them to be accessible by the chrome.[1] - jsversion.h was removed, we don't need to specify the JS version anymore.[2] - Since Torbutton has now logic to load the default preferences and we don't know when a string is a complex data, for the sake of simplicity, we are now retiring non-localized.properties and hard coding the about:tor in the preferences file. - Use tabbrowser-initialBrowser instead of content [1] https://bugzilla.mozilla.org/show_bug.cgi?id=863246 [2] https://bugzilla.mozilla.org/show_bug.cgi?id=1440043 --- src/chrome.manifest | 1 + src/chrome/content/aboutTor/aboutTor.xhtml | 4 ++-- src/chrome/content/locale/non-localized.properties | 6 ------ src/chrome/content/torbutton.js | 2 +- src/chrome/skin/aboutTor.css | 14 +++++++------- .../{content/aboutTor => skin}/onionArrow-extension.png | Bin .../{content/aboutTor => skin}/onionArrow-leftBend.png | Bin .../{content/aboutTor => skin}/onionArrow-rightBend.png | Bin .../{content/aboutTor => skin}/onionArrow-short.png | Bin src/chrome/{content/aboutTor => skin}/search.png | Bin src/chrome/{content/aboutTor => skin}/tor-off.png | Bin src/chrome/{content/aboutTor => skin}/tor-on.png | Bin src/defaults/preferences/preferences.js | 2 +- 13 files changed, 12 insertions(+), 17 deletions(-) diff --git a/src/chrome.manifest b/src/chrome.manifest index 230a1e6..7b57d39 100644 --- a/src/chrome.manifest +++ b/src/chrome.manifest @@ -6,6 +6,7 @@ overlay chrome://messenger/content/messengercompose/messengercompose.xul chrome: overlay about:addons chrome://torbutton/content/torbutton-extensions.xul overlay chrome://mozapps/content/extensions/extensions.xul chrome://torbutton/content/torbutton-extensions.xul resource torbutton ./ +resource torbutton-assets resource://torbutton/chrome/skin/ contentaccessible=yes # browser branding override chrome://branding/locale/brand.dtd chrome://torbutton/locale/brand.dtd diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 0d8f680..5cb2a60 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -20,8 +20,8 @@ <head> <title>&aboutTor.title;</title> <link rel="stylesheet" type="text/css" media="all" - href="resource://torbutton/chrome/skin/aboutTor.css"/> -<script type="text/javascript;version=1.7"> + href="resource://torbutton-assets/aboutTor.css"/> +<script type="text/javascript"> <![CDATA[ window.addEventListener("pageshow", function() { let evt = new CustomEvent("AboutTorLoad", { bubbles: true }); diff --git a/src/chrome/content/locale/non-localized.properties b/src/chrome/content/locale/non-localized.properties deleted file mode 100644 index dca7863..0000000 --- a/src/chrome/content/locale/non-localized.properties +++ /dev/null @@ -1,6 +0,0 @@ -# This file must be located in a subdirectory named "locale" so that -# about:config will display the correct value for browser.startup.homepage. -# See fetchPref() inside toolkit/components/viewconfig/content/config.js - -# Default home page -browser.startup.homepage=about:tor diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 40d63fd..7f750bc 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -664,7 +664,7 @@ function torbutton_get_toolbarbutton_xpos() { let tbItem = torbutton_get_toolbutton(); if (tbItem) { let tbItemRect = tbItem.getBoundingClientRect(); - let contentElem = document.getElementById("content"); + let contentElem = document.getElementById("tabbrowser-initialBrowser"); let contentRect = contentElem.getBoundingClientRect(); if (tbItemRect.top < contentRect.top) { tbXpos = tbItemRect.left + (tbItemRect.width / 2.0) - contentRect.left; diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css index 873f6d0..62c9256 100644 --- a/src/chrome/skin/aboutTor.css +++ b/src/chrome/skin/aboutTor.css @@ -59,7 +59,7 @@ body:not([initialized]) { } body[toron] #torstatus-image { - background-image: url('chrome://torbutton/content/aboutTor/tor-on.png'); + background-image: url('chrome://torbutton/skin/tor-on.png'); } #torstatus-image { @@ -68,7 +68,7 @@ body[toron] #torstatus-image { left: 85px; height: 128px; width: 128px; - background-image: url('chrome://torbutton/content/aboutTor/tor-off.png'); + background-image: url('chrome://torbutton/skin/tor-off.png'); background-repeat: no-repeat; background-position: center; z-index: -1; @@ -84,23 +84,23 @@ body[toron] #torstatus-image { top: 4px; width: 30px; height: 36px; - background-image: url('chrome://torbutton/content/aboutTor/onionArrow-short.png'); + background-image: url('chrome://torbutton/skin/onionArrow-short.png'); } #toolbarIconArrowVertExtension, #toolbarIconArrowHorzExtension { width: 11px; height: 11px; - background-image: url('chrome://torbutton/content/aboutTor/onionArrow-extension.png'); + background-image: url('chrome://torbutton/skin/onionArrow-extension.png'); } #toolbarIconArrowBend { width: 22px; height: 22px; - background-image: url('chrome://torbutton/content/aboutTor/onionArrow-leftBend.png'); + background-image: url('chrome://torbutton/skin/onionArrow-leftBend.png'); } #toolbarIconArrowBend[pos="right"] { - background-image: url('chrome://torbutton/content/aboutTor/onionArrow-rightBend.png'); + background-image: url('chrome://torbutton/skin/onionArrow-rightBend.png'); } a { @@ -288,7 +288,7 @@ body .top div.hideIfTorIsUpToDate h1 { height: 34px; width: 33px; border: 0; - background: url('chrome://torbutton/content/aboutTor/search.png') no-repeat top left; + background: url('chrome://torbutton/skin/search.png') no-repeat top left; cursor: pointer; } diff --git a/src/chrome/content/aboutTor/onionArrow-extension.png b/src/chrome/skin/onionArrow-extension.png similarity index 100% rename from src/chrome/content/aboutTor/onionArrow-extension.png rename to src/chrome/skin/onionArrow-extension.png diff --git a/src/chrome/content/aboutTor/onionArrow-leftBend.png b/src/chrome/skin/onionArrow-leftBend.png similarity index 100% rename from src/chrome/content/aboutTor/onionArrow-leftBend.png rename to src/chrome/skin/onionArrow-leftBend.png diff --git a/src/chrome/content/aboutTor/onionArrow-rightBend.png b/src/chrome/skin/onionArrow-rightBend.png similarity index 100% rename from src/chrome/content/aboutTor/onionArrow-rightBend.png rename to src/chrome/skin/onionArrow-rightBend.png diff --git a/src/chrome/content/aboutTor/onionArrow-short.png b/src/chrome/skin/onionArrow-short.png similarity index 100% rename from src/chrome/content/aboutTor/onionArrow-short.png rename to src/chrome/skin/onionArrow-short.png diff --git a/src/chrome/content/aboutTor/search.png b/src/chrome/skin/search.png similarity index 100% rename from src/chrome/content/aboutTor/search.png rename to src/chrome/skin/search.png diff --git a/src/chrome/content/aboutTor/tor-off.png b/src/chrome/skin/tor-off.png similarity index 100% rename from src/chrome/content/aboutTor/tor-off.png rename to src/chrome/skin/tor-off.png diff --git a/src/chrome/content/aboutTor/tor-on.png b/src/chrome/skin/tor-on.png similarity index 100% rename from src/chrome/content/aboutTor/tor-on.png rename to src/chrome/skin/tor-on.png diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index f61cb89..f51c7db 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -53,7 +53,7 @@ pref("extensions.torbutton.confirm_plugins", true); pref("extensions.torbutton.confirm_newnym", true); // Browser home page: -pref("browser.startup.homepage", "chrome://torbutton/content/locale/non-localized.properties"); +pref("browser.startup.homepage", "about:tor"); // This pref specifies an ad-hoc "version" for various pref update hacks we need to do pref("extensions.torbutton.pref_fixup_version", 0);

1 0

[torbutton/master] Bug 26100: Switch from Task.spawn to async/await
by gk＠torproject.org 25 May '18

25 May '18

commit c4a44294290fc96471646ae1ff39fb55d2dedf92 Author: Igor Oliveira <igt0(a)torproject.org> Date: Mon May 14 17:56:26 2018 -0300 Bug 26100: Switch from Task.spawn to async/await Mozilla switched from Task.spawn to async/await[1] and we should follow it since it makes the code simple. [1] https://bugzilla.mozilla.org/show_bug.cgi?id=1353542 --- src/chrome/content/tor-circuit-display.js | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index 5bd02bc..7b12db0 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -28,7 +28,6 @@ let createTorCircuitDisplay = (function () { // Mozilla utilities const { Cu : utils , Ci : interfaces } = Components.utils; Cu.import("resource://gre/modules/Services.jsm"); -Cu.import("resource://gre/modules/Task.jsm"); // Import the controller code. let { controller } = Cu.import("resource://torbutton/modules/tor-control-port.js", {}); @@ -59,8 +58,8 @@ let trimQuotes = s => s ? s.match(/^"(.*)"$/)[1] : undefined; // __getBridge(id)__. // Gets the bridge parameters for a given node ID. If the node // is not currently used as a bridge, returns null. -let getBridge = function* (controller, id) { - let bridges = yield controller.getConf("bridge"); +let getBridge = async function (controller, id) { + let bridges = await controller.getConf("bridge"); if (bridges) { for (let bridge of bridges) { if (bridge.ID && bridge.ID.toUpperCase() === id.toUpperCase()) { @@ -75,9 +74,9 @@ let getBridge = function* (controller, id) { // Returns the type, IP and country code of a node with given ID. // Example: `nodeDataForID(controller, "20BC91DC525C3DC9974B29FBEAB51230DE024C44")` // => `{ type : "default", ip : "12.23.34.45", countryCode : "fr" }` -let nodeDataForID = function* (controller, id) { +let nodeDataForID = async function (controller, id) { let result = {}, - bridge = yield getBridge(controller, id); // type, ip, countryCode; + bridge = await getBridge(controller, id); // type, ip, countryCode; if (bridge) { result.type = "bridge"; result.bridgeType = bridge.type; @@ -89,14 +88,14 @@ let nodeDataForID = function* (controller, id) { result.type = "default"; // Get the IP address for the given node ID. try { - let statusMap = yield controller.getInfo("ns/id/" + id); + let statusMap = await controller.getInfo("ns/id/" + id); result.ip = statusMap.IP; } catch (e) { } } if (result.ip) { // Get the country code for the node's IP address. try { - let countryCode = yield controller.getInfo("ip-to-country/" + result.ip); + let countryCode = await controller.getInfo("ip-to-country/" + result.ip); result.countryCode = countryCode === "??" ? null : countryCode; } catch (e) { } } @@ -105,18 +104,18 @@ let nodeDataForID = function* (controller, id) { // __nodeDataForCircuit(controller, circuitEvent)__. // Gets the information for a circuit. -let nodeDataForCircuit = function* (controller, circuitEvent) { +let nodeDataForCircuit = async function (controller, circuitEvent) { let rawIDs = circuitEvent.circuit.map(circ => circ[0]), // Remove the leading '$' if present. ids = rawIDs.map(id => id[0] === "$" ? id.substring(1) : id); // Get the node data for all IDs in circuit. - return [for (id of ids) yield nodeDataForID(controller, id)]; + return Promise.all(ids.map(id => nodeDataForID(controller, id))); }; // __getCircuitStatusByID(aController, circuitID)__ // Returns the circuit status for the circuit with the given ID. -let getCircuitStatusByID = function* (aController, circuitID) { - let circuitStatuses = yield aController.getInfo("circuit-status"); +let getCircuitStatusByID = async function (aController, circuitID) { + let circuitStatuses = await aController.getInfo("circuit-status"); if (circuitStatuses) { for (let circuitStatus of circuitStatuses) { if (circuitStatus.id === circuitID) { @@ -139,22 +138,22 @@ let collectIsolationData = function (aController, updateUI) { return aController.watchEvent( "STREAM", streamEvent => streamEvent.StreamStatus === "SENTCONNECT", - streamEvent => Task.spawn(function* () { + async (streamEvent) => { if (!knownCircuitIDs[streamEvent.CircuitID]) { logger.eclog(3, "streamEvent.CircuitID: " + streamEvent.CircuitID); knownCircuitIDs[streamEvent.CircuitID] = true; - let circuitStatus = yield getCircuitStatusByID(aController, streamEvent.CircuitID), + let circuitStatus = await getCircuitStatusByID(aController, streamEvent.CircuitID), credentials = circuitStatus ? (trimQuotes(circuitStatus.SOCKS_USERNAME) + "|" + trimQuotes(circuitStatus.SOCKS_PASSWORD)) : null; if (credentials) { - let nodeData = yield nodeDataForCircuit(aController, circuitStatus); + let nodeData = await nodeDataForCircuit(aController, circuitStatus); credentialsToNodeDataMap[credentials] = nodeData; updateUI(); } } - }).then(null, Cu.reportError)); + }); }; // __browserForChannel(channel)__.

1 0

[torbutton/master] Bug 26100: Load extension preferences during initialization
by gk＠torproject.org 25 May '18

25 May '18

commit e5ecb22e0f4bfec84935f8266cc1520642301660 Author: Igor Oliveira <igt0(a)torproject.org> Date: Mon May 14 17:56:18 2018 -0300 Bug 26100: Load extension preferences during initialization Mozilla removed the code that loads the default extension preferences[1]. Thus we need to load them in the startup time. [1] https://bugzilla.mozilla.org/show_bug.cgi?id=1413413 --- src/chrome/content/torbutton.js | 8 ++++---- src/components/cookie-jar-selector.js | 4 ++++ src/components/domain-isolator.js | 11 ++++++++--- src/components/dragDropFilter.js | 2 ++ src/components/startup-observer.js | 9 ++++++--- src/components/torbutton-logger.js | 19 ++++++++++--------- src/modules/default-prefs.js | 30 ++++++++++++++++++++++++++++++ 7 files changed, 64 insertions(+), 19 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index cf39dc2..40d63fd 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1217,7 +1217,7 @@ function torbutton_do_new_identity() { torbutton_log(3, "New Identity: Syncing prefs"); // Force prefs to be synced to disk - m_tb_prefs.savePrefFile(null); + Services.prefs.savePrefFile(null); torbutton_log(3, "New Identity: Clearing permissions"); @@ -1634,7 +1634,7 @@ function torbutton_update_disk_prefs() { } catch (e) {} // Force prefs to be synced to disk - m_tb_prefs.savePrefFile(null); + Services.prefs.savePrefFile(null); } function torbutton_update_fingerprinting_prefs() { @@ -1667,7 +1667,7 @@ function torbutton_update_fingerprinting_prefs() { m_tb_prefs.setBoolPref("extensions.torbutton.resize_new_windows", mode); // Force prefs to be synced to disk - m_tb_prefs.savePrefFile(null); + Services.prefs.savePrefFile(null); } function torbutton_update_isolation_prefs() { @@ -1682,7 +1682,7 @@ function torbutton_update_isolation_prefs() { m_tb_prefs.setBoolPref("security.enable_tls_session_tickets", !isolate); // Force prefs to be synced to disk - m_tb_prefs.savePrefFile(null); + Services.prefs.savePrefFile(null); } // This function closes all XUL browser windows except this one. For this diff --git a/src/components/cookie-jar-selector.js b/src/components/cookie-jar-selector.js index 4f137d7..8456da3 100644 --- a/src/components/cookie-jar-selector.js +++ b/src/components/cookie-jar-selector.js @@ -19,6 +19,10 @@ const kMODULE_CONTRACTID = "@torproject.org/cookie-jar-selector;1"; const kMODULE_CID = Components.ID("e6204253-b690-4159-bfe8-d4eedab6b3be"); const Cr = Components.results; +const Cu = Components.utils; + +Cu.import("resource://torbutton/modules/default-prefs.js", {}) + .ensureDefaultPrefs(); // XXX: Must match the definition in torcookie.js :/ function Cookie(number,name,value,isDomain,host,rawHost,HttpOnly,path,isSecure,isSession, diff --git a/src/components/domain-isolator.js b/src/components/domain-isolator.js index a52cccc..a698439 100644 --- a/src/components/domain-isolator.js +++ b/src/components/domain-isolator.js @@ -16,6 +16,12 @@ const Cc = Components.classes, Ci = Components.interfaces, Cu = Components.utils let logger = Cc["@torproject.org/torbutton-logger;1"] .getService(Components.interfaces.nsISupports).wrappedJSObject; +let { ensureDefaultPrefs } = Cu.import("resource://torbutton/modules/default-prefs.js", {}); +ensureDefaultPrefs(); + +// Import Services object +Cu.import("resource://gre/modules/Services.jsm"); + // Import crypto object (FF 37+). Cu.importGlobalProperties(["crypto"]); @@ -165,6 +171,7 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm"); function DomainIsolator() { this.wrappedJSObject = this; } + // Firefox component requirements DomainIsolator.prototype = { QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports, Ci.nsIObserver]), @@ -175,9 +182,7 @@ DomainIsolator.prototype = { if (topic === "profile-after-change") { logger.eclog(3, "domain isolator: set up isolating circuits by domain"); - let prefs = Cc["@mozilla.org/preferences-service;1"] - .getService(Ci.nsIPrefBranch); - if (prefs.getBoolPref("extensions.torbutton.use_nontor_proxy")) { + if (Services.prefs.getBoolPref("extensions.torbutton.use_nontor_proxy")) { tor.isolationEnabled = false; } tor.isolateCircuitsByDomain(); diff --git a/src/components/dragDropFilter.js b/src/components/dragDropFilter.js index 22dde86..916b835 100644 --- a/src/components/dragDropFilter.js +++ b/src/components/dragDropFilter.js @@ -9,6 +9,8 @@ const Cc = Components.classes; const Ci = Components.interfaces; const Cu = Components.utils; +Cu.import("resource://torbutton/modules/default-prefs.js", {}).ensureDefaultPrefs(); + Cu.import("resource://gre/modules/XPCOMUtils.jsm"); // Module specific constants diff --git a/src/components/startup-observer.js b/src/components/startup-observer.js index dac7aff..144d600 100644 --- a/src/components/startup-observer.js +++ b/src/components/startup-observer.js @@ -22,6 +22,7 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "FileUtils", "resource://gre/modules/FileUtils.jsm"); +Cu.import("resource://torbutton/modules/default-prefs.js", {}).ensureDefaultPrefs(); // Module specific constants const kMODULE_NAME = "Startup"; @@ -96,7 +97,9 @@ StartupObserver.prototype = { let tlps = Cc["@torproject.org/torlauncher-protocol-service;1"] .getService(Ci.nsISupports).wrappedJSObject; socksPortInfo = tlps.TorGetSOCKSPortInfo(); - } catch(e) {} + } catch(e) { + this.logger.log(3, "tor launcher failed " + e); + } // If Tor Launcher is not available, check environment variables. if (!socksPortInfo) { @@ -143,7 +146,7 @@ StartupObserver.prototype = { } // Force prefs to be synced to disk - this._prefs.savePrefFile(null); + Services.prefs.savePrefFile(null); this.logger.log(3, "Synced network settings to environment."); }, @@ -158,7 +161,7 @@ StartupObserver.prototype = { } // In all cases, force prefs to be synced to disk - this._prefs.savePrefFile(null); + Services.prefs.savePrefFile(null); }, QueryInterface: function(iid) { diff --git a/src/components/torbutton-logger.js b/src/components/torbutton-logger.js index 18a5f1e..b25d039 100644 --- a/src/components/torbutton-logger.js +++ b/src/components/torbutton-logger.js @@ -16,17 +16,18 @@ const kMODULE_CID = Components.ID("f36d72c9-9718-4134-b550-e109638331d7"); const Cr = Components.results; const Cc = Components.classes; const Ci = Components.interfaces; +const Cu = Components.utils; -function TorbuttonLogger() { - this.prefs = Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefBranch); +Cu.import("resource://torbutton/modules/default-prefs.js", {}).ensureDefaultPrefs(); + +Cu.import("resource://gre/modules/Services.jsm"); +function TorbuttonLogger() { // Register observer - this._branch = this.prefs.QueryInterface(Components.interfaces.nsIPrefBranch); - this._branch.addObserver("extensions.torbutton", this, false); + Services.prefs.addObserver("extensions.torbutton", this, false); - this.loglevel = this.prefs.getIntPref("extensions.torbutton.loglevel"); - this.logmethod = this.prefs.getIntPref("extensions.torbutton.logmethod"); + this.loglevel = Services.prefs.getIntPref("extensions.torbutton.loglevel"); + this.logmethod = Services.prefs.getIntPref("extensions.torbutton.logmethod"); try { var logMngr = Components.classes["@mozmonkey.com/debuglogger/manager;1"] @@ -152,10 +153,10 @@ TorbuttonLogger.prototype = if (topic != "nsPref:changed") return; switch (data) { case "extensions.torbutton.logmethod": - this.logmethod = this.prefs.getIntPref("extensions.torbutton.logmethod"); + this.logmethod = Services.prefs.getIntPref("extensions.torbutton.logmethod"); break; case "extensions.torbutton.loglevel": - this.loglevel = this.prefs.getIntPref("extensions.torbutton.loglevel"); + this.loglevel = Services.prefs.getIntPref("extensions.torbutton.loglevel"); break; } } diff --git a/src/modules/default-prefs.js b/src/modules/default-prefs.js new file mode 100644 index 0000000..d4c948f --- /dev/null +++ b/src/modules/default-prefs.js @@ -0,0 +1,30 @@ +let loaded = false; + +function ensureDefaultPrefs () { + if (loaded) { + return; + } + Components.utils.import("resource://gre/modules/Services.jsm"); + const kDefaultPreferences = "resource://torbutton/defaults/preferences/preferences.js"; + const defaultPrefBranch = Services.prefs.getDefaultBranch(null); + + const context = { + pref: function (aPrefName, aValue) { + const aValueType = typeof aValue; + if (aValueType === "boolean") { + defaultPrefBranch.setBoolPref(aPrefName, aValue); + } else if (aValueType === "number") { + defaultPrefBranch.setIntPref(aPrefName, aValue); + } else if (aValueType === "string") { + defaultPrefBranch.setCharPref(aPrefName, aValue); + } else { + Services.console.logStringMessage( + `Preference ${aPrefName} with value ${aValue} has an invalid value type`); + } + } + }; + Services.scriptloader.loadSubScript(kDefaultPreferences, context); + loaded = true; +} + +let EXPORTED_SYMBOLS = ["ensureDefaultPrefs"];

1 0

[torbutton/master] Bug 26100: Migrate general.useragent.locale to intl.locale.requested
by gk＠torproject.org 25 May '18

25 May '18

commit 399d2ba81505e4a74535b61f60563f4a9c2a8f6d Author: Igor Oliveira <igt0(a)torproject.org> Date: Wed Feb 28 13:43:48 2018 -0300 Bug 26100: Migrate general.useragent.locale to intl.locale.requested intl.locale.requested is the new way that Gecko handles locales. See https://bugzilla.mozilla.org/show_bug.cgi?id=1414390 --- src/chrome/content/aboutTor/aboutTor-content.js | 6 ++++-- src/chrome/content/menu-overlay.xul | 2 +- src/chrome/content/preferences.js | 5 ++++- src/chrome/content/torbutton.js | 10 +++++----- src/modules/utils.js | 10 ++++++++-- 5 files changed, 22 insertions(+), 11 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor-content.js b/src/chrome/content/aboutTor/aboutTor-content.js index ec515bb..1a8d5cf 100644 --- a/src/chrome/content/aboutTor/aboutTor-content.js +++ b/src/chrome/content/aboutTor/aboutTor-content.js @@ -67,8 +67,10 @@ var AboutTorListener = { onPageLoad: function() { // Arrange to update localized text and links. - bindPrefAndInit("general.useragent.locale", aNewVal => { - this.onLocaleChange(aNewVal); + bindPrefAndInit("intl.locale.requested", aNewVal => { + if (aNewVal !== null) { + this.onLocaleChange(aNewVal); + } }); // Add message and event listeners. diff --git a/src/chrome/content/menu-overlay.xul b/src/chrome/content/menu-overlay.xul index 53654c5..f6c6fbd 100644 --- a/src/chrome/content/menu-overlay.xul +++ b/src/chrome/content/menu-overlay.xul @@ -22,6 +22,6 @@ position="1" label="&aboutTor.torbrowser_user_manual.label;" accesskey="&aboutTor.torbrowser_user_manual.accesskey;" - oncommand="gBrowser.selectedTab = gBrowser.addTab('https://tb-manual.torproject.org/' + Services.prefs.getCharPref('general.useragent.locale'))" /> + oncommand="gBrowser.selectedTab = gBrowser.addTab('https://tb-manual.torproject.org/' + Services.locale.getRequestedLocale())" /> </menupopup> </overlay> diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js index 721ff46..36c8818 100644 --- a/src/chrome/content/preferences.js +++ b/src/chrome/content/preferences.js @@ -5,6 +5,9 @@ let { utils: Cu } = Components; let { getBoolPref, getIntPref, setBoolPref, setIntPref, getCharPref } = Cu.import("resource://gre/modules/Services.jsm", {}).Services.prefs; +let { getLocale } = + Cu.import("resource://torbutton/modules/utils.js", {}); + // Description elements have the follow names. const descNames = [, "desc_safest", "desc_safer", "desc_standard"]; @@ -67,7 +70,7 @@ function torbutton_set_learn_more_links() { let show_manual = window.opener.torbutton_show_torbrowser_manual(); let locale = "" if (show_manual) { - locale = getCharPref('general.useragent.locale'); + locale = getLocale(); } let links = linkNames.map(name => document.getElementById(name)); links.forEach(link => {; diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 2f1f689..d744d15 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -10,7 +10,7 @@ let { LoadContextInfo } = Cu.import('resource://gre/modules/LoadContextInfo.jsm', {}); let { Services } = Cu.import("resource://gre/modules/Services.jsm", {}); let { showDialog } = Cu.import("resource://torbutton/modules/utils.js", {}); -let { unescapeTorString } = Cu.import("resource://torbutton/modules/utils.js", {}); +let { getLocale, unescapeTorString } = Cu.import("resource://torbutton/modules/utils.js", {}); let SecurityPrefs = Cu.import("resource://torbutton/modules/security-prefs.js", {}); let { bindPrefAndInit, observe } = Cu.import("resource://torbutton/modules/utils.js", {}); @@ -818,14 +818,14 @@ function torbutton_update_toolbutton() // Bug 1506 P3: Support code for language+uagent spoofing function torbutton_get_general_useragent_locale() { try { - var locale = m_tb_prefs.getCharPref("general.useragent.locale"); + const locale = getLocale(); if (/chrome:\/\//.test(locale)) { - return m_tb_prefs.getComplexValue("general.useragent.locale", + return m_tb_prefs.getComplexValue("intl.locale.requested", Components.interfaces.nsIPrefLocalizedString).data; } return locale; } catch(err) { - torbutton_log(4, "Error while getting general.useragent.locale:" + err); + torbutton_log(4, "Error while getting locale" + err); return 'en-US'; } } @@ -2380,7 +2380,7 @@ function torbutton_show_torbrowser_manual() { // torbutton_show_torbrowser_manual() returns true. function torbutton_init_user_manual_links() { let menuitem = document.getElementById("torBrowserUserManual"); - bindPrefAndInit("general.useragent.locale", val => { + bindPrefAndInit("intl.locale.requested", val => { menuitem.hidden = !torbutton_show_torbrowser_manual(); torbutton_abouttor_message_handler.updateAllOpenPages(); }); diff --git a/src/modules/utils.js b/src/modules/utils.js index fa4405e..0a2649d 100644 --- a/src/modules/utils.js +++ b/src/modules/utils.js @@ -79,6 +79,12 @@ var getEnv = function (name) { return env.exists(name) ? env.get(name) : undefined; }; +// __getLocale +// Reads the browser locale, the default locale is en-US. +var getLocale = function() { + return Services.locale.getRequestedLocale() || "en-US"; +} + // ## Windows // __dialogsByName__. @@ -200,5 +206,5 @@ var unescapeTorString = function(str) { }; // Export utility functions for external use. -let EXPORTED_SYMBOLS = ["bindPref", "bindPrefAndInit", "getEnv", "getPrefValue", - "observe", "showDialog", "unescapeTorString"]; +let EXPORTED_SYMBOLS = ["bindPref", "bindPrefAndInit", "getEnv", "getLocale", + "getPrefValue", "observe", "showDialog", "unescapeTorString"];

1 0

[torbutton/master] Bug 26100: Update deprecated JS and CSS code
by gk＠torproject.org 25 May '18

25 May '18

commit 3047f3fcb9c606a659c6e7ffa7e4d97e33cd0ebe Author: Igor Oliveira <igt0(a)torproject.org> Date: Wed Feb 28 17:38:59 2018 -0300 Bug 26100: Update deprecated JS and CSS code - catch statement can not have if statements. https://bugzilla.mozilla.org/show_bug.cgi?id=1228841 - Use 0o to represent octal numbers. https://bugzilla.mozilla.org/show_bug.cgi?id=1263074 - remove -moz- prefix in css https://bugzilla.mozilla.org/show_bug.cgi?id=1270406 --- src/chrome/content/torbutton.js | 9 ++++++--- src/chrome/skin/aboutTor.css | 6 +++--- src/chrome/skin/tor-circuit-display.css | 4 ++-- src/components/cookie-jar-selector.js | 4 ++-- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index d744d15..4b15c5f 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1140,9 +1140,12 @@ function torbutton_do_new_identity() { // #5715 also makes this synchronous. So we pass a null callback. try { appCacheStorage.asyncEvictStorage(null); - } catch (err if err.name == 'NS_ERROR_NOT_AVAILABLE') { - // We ignore "not available" errors because they occur if a cache - // has not been used, e.g., if no browsing has been done. + } catch (err) { + // We ignore "not available" errors because they occur if a cache + // has not been used, e.g., if no browsing has been done. + if (err.name !== 'NS_ERROR_NOT_AVAILABLE') { + throw err; + } } } } catch(e) { diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css index 7ba7e7c..873f6d0 100644 --- a/src/chrome/skin/aboutTor.css +++ b/src/chrome/skin/aboutTor.css @@ -25,11 +25,11 @@ body { } body { - background-image: -moz-linear-gradient(top, #ffffff, #ffffff 10%, #dddddd 50%, #dddddd); + background-image: linear-gradient(to bottom, #ffffff, #ffffff 10%, #dddddd 50%, #dddddd); } body[toron] { - background-image: -moz-linear-gradient(top, #ffffff, #ffffff 10%, #d5ffd5 50%, #d5ffd5); + background-image: linear-gradient(to bottom, #ffffff, #ffffff 10%, #d5ffd5 50%, #d5ffd5); } /* Hide the entire document by default to avoid showing the incorrect @@ -221,7 +221,7 @@ body .top div.hideIfTorIsUpToDate h1 { padding: 5px 0 0 22px; } -#middle ul:-moz-dir(rtl) { +#middle ul:dir(rtl) { padding: 5px 22px 0 0; } diff --git a/src/chrome/skin/tor-circuit-display.css b/src/chrome/skin/tor-circuit-display.css index 640d595..c9e682a 100644 --- a/src/chrome/skin/tor-circuit-display.css +++ b/src/chrome/skin/tor-circuit-display.css @@ -21,7 +21,7 @@ and lines drawn between them to represent Tor network inter-relay connections. width: 100%; } -#circuit-display-content:-moz-locale-dir(rtl) { +#circuit-display-content:dir(rtl) { background-position: calc(100% - 1em) 1em; } @@ -65,7 +65,7 @@ ul#circuit-display-nodes li { white-space: nowrap; } -ul#circuit-display-nodes li:-moz-locale-dir(rtl) { +ul#circuit-display-nodes li:dir(rtl) { background-position: right center; } diff --git a/src/components/cookie-jar-selector.js b/src/components/cookie-jar-selector.js index f6d579e..4f137d7 100644 --- a/src/components/cookie-jar-selector.js +++ b/src/components/cookie-jar-selector.js @@ -143,7 +143,7 @@ function CookieJarSelector() { var file = getProfileFile("cookies-" + name + ".json"); var foStream = Cc["@mozilla.org/network/file-output-stream;1"] .createInstance(Ci.nsIFileOutputStream); - foStream.init(file, 0x02 | 0x08 | 0x20, 0666, 0); + foStream.init(file, 0x02 | 0x08 | 0x20, 0o666, 0); var data = JSON.stringify(this["cookiesobj-" + name]); foStream.write(data, data.length); foStream.close(); @@ -154,7 +154,7 @@ function CookieJarSelector() { var file = getProfileFile("protected-" + name + ".json"); var foStream = Cc["@mozilla.org/network/file-output-stream;1"] .createInstance(Ci.nsIFileOutputStream); - foStream.init(file, 0x02 | 0x08 | 0x20, 0666, 0); + foStream.init(file, 0x02 | 0x08 | 0x20, 0o666, 0); var data = JSON.stringify(this["protected-" + name]); foStream.write(data, data.length); foStream.close();

1 0

[tor-launcher/master] Mozilla dropped support for Ci.nsIProgrammingLanguage.JAVASCRIPT
by gk＠torproject.org 23 May '18

23 May '18

commit 9fa37a1fbf6ed9f004f70cccac762a0e4ed454b3 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri Feb 23 19:44:18 2018 +0000 Mozilla dropped support for Ci.nsIProgrammingLanguage.JAVASCRIPT See https://bugzilla.mozilla.org/show_bug.cgi?id=1149830#c18 --- src/components/tl-process.js | 3 +-- src/components/tl-protocol.js | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 53c9919..74d5f41 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -1,4 +1,4 @@ -// Copyright (c) 2017, The Tor Project, Inc. +// Copyright (c) 2018, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -272,7 +272,6 @@ TorProcessService.prototype = contractID: this.kContractID, classDescription: this.kServiceName, classID: this.kClassID, - implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT, flags: Ci.nsIClassInfo.DOM_OBJECT, // nsIFactory implementation. diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js index ab33bd3..79b327e 100644 --- a/src/components/tl-protocol.js +++ b/src/components/tl-protocol.js @@ -256,7 +256,6 @@ TorProtocolService.prototype = contractID: this.kContractID, classDescription: this.kServiceName, classID: this.kClassID, - implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT, flags: Ci.nsIClassInfo.DOM_OBJECT, // nsIFactory implementation.

1 0

[tor-launcher/master] Merge remote-tracking branch 'sysrqb/bug25750_6'
by gk＠torproject.org 23 May '18

23 May '18

commit b15da273aa1c6de5a1725e24a171ad043864bf69 Merge: 9aa5fd4 51c1dfb Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 23 18:07:50 2018 +0000 Merge remote-tracking branch 'sysrqb/bug25750_6' src/chrome/content/network-settings.js | 3 +- src/components/tl-process.js | 31 +++++++-- src/components/tl-protocol.js | 25 ++++---- src/install.rdf | 8 +++ src/modules/tl-logger.jsm | 6 +- src/modules/tl-util.jsm | 114 ++++++++++++++++++++++++++++++++- 6 files changed, 163 insertions(+), 24 deletions(-)

1 0

[tor-launcher/master] Synchronize some prefs.js and get{Bool, Char, Int}Pref() defaults
by gk＠torproject.org 23 May '18

23 May '18

commit 51c1dfb76f02f870b60b7b3cdf86cc36b85eec2f Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Tue May 15 22:35:09 2018 +0000 Synchronize some prefs.js and get{Bool,Char,Int}Pref() defaults --- src/chrome/content/network-settings.js | 3 ++- src/components/tl-process.js | 3 ++- src/components/tl-protocol.js | 7 ++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index dc3c9ab..f86402d 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -2533,7 +2533,8 @@ function requestMoatCaptcha(aProxySettings, aMeekClientPath, aMeekClientArgs) aMeekClientPath, aMeekClientArgs) .then(()=> { - let bridgeType = TorLauncherUtil.getCharPref(kPrefBridgeDBType); + let bridgeType = TorLauncherUtil.getCharPref(kPrefBridgeDBType, + "obfs4"); moatRequestor.fetchBridges([bridgeType]) .then(aCaptchaInfo => { diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 1c67817..615227f 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -455,7 +455,8 @@ TorProcessService.prototype = if (socksPortArg) { let socksPortFlags = TorLauncherUtil.getCharPref( - "extensions.torlauncher.socks_port_flags"); + "extensions.torlauncher.socks_port_flags", + "IPv6Traffic PreferIPv6 KeepAliveIsolateSOCKSAuth"); if (socksPortFlags) socksPortArg += ' ' + socksPortFlags; args.push("+__SocksPort"); diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js index 6659621..a5fd1d9 100644 --- a/src/components/tl-protocol.js +++ b/src/components/tl-protocol.js @@ -53,7 +53,7 @@ function TorProtocolService() this.mControlPort = parseInt(env.get("TOR_CONTROL_PORT"), 10); let useIPC = !isWindows && TorLauncherUtil.getBoolPref( - "extensions.torlauncher.control_port_use_ipc", true); + "extensions.torlauncher.control_port_use_ipc", false); if (!this.mControlHost && !this.mControlPort && useIPC) this.mControlIPCFile = TorLauncherUtil.getTorFile("control_ipc", false); else @@ -157,7 +157,7 @@ function TorProtocolService() if (useIPC === undefined) { useIPC = !isWindows && TorLauncherUtil.getBoolPref( - "extensions.torlauncher.socks_port_use_ipc", true); + "extensions.torlauncher.socks_port_use_ipc", false); } // Fill in missing SOCKS info from prefs. @@ -183,6 +183,7 @@ function TorProtocolService() { let socksPort = TorLauncherUtil.getIntPref("network.proxy.socks_port", 0); + // This pref is set as 0 by default in Firefox, use 9150 if we get 0. this.mSOCKSPortInfo.port = (socksPort != 0) ? socksPort : 9150; } } @@ -1506,7 +1507,7 @@ TorProtocolService.prototype = else { var maxEntries = - TorLauncherUtil.getIntPref(this.kPrefMaxTorLogEntries, 0); + TorLauncherUtil.getIntPref(this.kPrefMaxTorLogEntries, 1000); if ((maxEntries > 0) && (this.mTorLog.length >= maxEntries)) this.mTorLog.splice(0, 1); }

1 0

[tor-launcher/master] Load default prefs during initialization
by gk＠torproject.org 23 May '18

23 May '18

commit 949379555010a04633c64b08ed52896a86c2cce6 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri May 4 14:26:32 2018 +0000 Load default prefs during initialization In bug 1413413 Mozilla ripped out support for loading default prefs from extensions. Unfortunately, backing out that changeset is non-trivial so it is easier if we set the default prefs manually. Here we define a function named pref() and it sets the preference based on the type of the pref's value. We only support a few types: boolean, number, and string. All other types are handled by the default case where a message is logged and the pref is skipped. The default prefs must be set before Tor Launcher begins making decisions based on them. An exception is thrown with Cr.NS_ERROR_NOT_INITIALIZED when this requirement is violated. --- src/components/tl-process.js | 23 ++++++++- src/modules/tl-util.jsm | 108 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 130 insertions(+), 1 deletion(-) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 8d3efb7..1c67817 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -19,6 +19,13 @@ XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherLogger", function TorProcessService() { + this.mDefaultPreferencesAreLoaded = TorLauncherUtil.loadDefaultPreferences(); + if (!this.mDefaultPreferencesAreLoaded) + { + throw Components.Exception("Setting (some) default preferences failed!", + Cr.NS_ERROR_NOT_INITIALIZED); + } + this.wrappedJSObject = this; this.mProtocolSvc = Cc["@torproject.org/torlauncher-protocol-service;1"] .getService(Ci.nsISupports).wrappedJSObject; @@ -98,6 +105,13 @@ TorProcessService.prototype = this.mObsSvc.addObserver(this, kUserQuitTopic, false); this.mObsSvc.addObserver(this, kBootstrapStatusTopic, false); + if (!this.mDefaultPreferencesAreLoaded) + { + throw Components.Exception("Default preferences not loaded at " + + "profile-after-change notification!", + Cr.NS_ERROR_NOT_INITIALIZED); + } + if (TorLauncherUtil.shouldOnlyConfigureTor) { this._controlTor(true, false); @@ -304,6 +318,13 @@ TorProcessService.prototype = TorStartAndControlTor: function(aForceDisableNetwork) { + if (!this.mDefaultPreferencesAreLoaded) + { + throw Components.Exception("TorLauncher is starting Tor but " + + "the default preferences were not set!", + Cr.NS_ERROR_NOT_INITIALIZED); + } + this._startTor(aForceDisableNetwork); let isRunningTor = (this.mTorProcessStatus == this.kStatusStarting) || (this.mTorProcessStatus == this.kStatusRunning); @@ -333,7 +354,7 @@ TorProcessService.prototype = mQuitSoon: false, // Quit was requested by the user; do so soon. mLastTorWarningPhase: null, mLastTorWarningReason: null, - + mDefaultPreferencesAreLoaded: false, // Private Methods ///////////////////////////////////////////////////////// _startTor: function(aForceDisableNetwork) diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index d669112..292f88b 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -226,6 +226,11 @@ let TorLauncherUtil = // Public }, // Preferences + loadDefaultPreferences: function() + { + return TLUtilInternal._loadPreferences(); + }, + getBoolPref: function(aPrefName, aDefaultVal) { var rv = (undefined != aDefaultVal) ? aDefaultVal : false; @@ -749,6 +754,9 @@ let TLUtilInternal = // Private mAppDir: null, // nsIFile (cached; access via this._appDir) mDataDir: null, // nsIFile (cached; access via this._dataDir) mIsFirstIPCPathRequest : true, + mNumDefaultPrefsDefined: 0, + mNumDefaultPrefsLoaded: 0, + mDefaultPreferencesLoaded: false, _init: function() { @@ -756,6 +764,106 @@ let TLUtilInternal = // Private .getService(Ci.nsIPrefBranch); }, + _getPrefDefaultBranch: function(aBranchName) + { + return Cc["@mozilla.org/preferences-service;1"] + .getService(Ci.nsIPrefService) + .getDefaultBranch(aBranchName); + }, + + _setPref: function(aSetPrefFunc, aPrefName, aValue) + { + try + { + aSetPrefFunc(aPrefName, aValue); + } + catch(e) + { + TorLauncherLogger.log(5, "Setting default pref '" + aPrefName + + "' threw exception: " + e); + return false; + } + + return true; + }, + + pref: function (aPrefName, aValue) + { + // Increment this counter for each pref() call. + this.mNumDefaultPrefsDefined += 1; + + let lastPeriod = aPrefName.lastIndexOf("."); + // This pref doesn't contain a period (".") + // or the period is the first character. + if (lastPeriod == 0 || lastPeriod == -1) + { + TorLauncherLogger.log(5, "Ignoring invalid pref '" + aPrefName + "'"); + return; + } + // This pref has a period at the last character, we can't set + // a default value on a pref root. + if (aPrefName.length == (lastPeriod + 1)) + { + TorLauncherLogger.log(5, + "Ignoring invalid pref ending with a period: '" + aPrefName + "'"); + return; + } + + let prefRoot = aPrefName.substring(0, lastPeriod + 1); + let defaultBranch = this._getPrefDefaultBranch(prefRoot); + let prefName = aPrefName.substring(lastPeriod + 1); + let setPrefFunc; + switch (typeof aValue) + { + case "boolean": + setPrefFunc = defaultBranch.setBoolPref; + if (!this._setPref(setPrefFunc, prefName, aValue)) + { + return; + } + break; + case "number": + setPrefFunc = defaultBranch.setIntPref; + if (!this._setPref(setPrefFunc, prefName, aValue)) + { + return; + } + break; + case "string": + setPrefFunc = defaultBranch.setCharPref; + if (!this._setPref(setPrefFunc, prefName, aValue)) + { + return; + } + break; + default: + TorLauncherLogger.log(5, "Cowardly not setting pref '" + + aPrefName + "' of type '" + (typeof aValue) + "'"); + return; + } + + // Increment this counter for each pref() call where the default preference + // was successfully set. + this.mNumDefaultPrefsLoaded += 1; + }, + + _loadPreferences: function() + { + if (this.mDefaultPreferencesLoaded) + { + return this.mDefaultPreferencesLoaded; + } + + var loader = Cc["@mozilla.org/moz/jssubscript-loader;1"] + .getService(Ci.mozIJSSubScriptLoader); + loader.loadSubScript( + "resource://torlauncher/defaults/preferences/prefs.js", this); + + this.mDefaultPreferencesLoaded = + (this.mNumDefaultPrefsDefined == this.mNumDefaultPrefsLoaded); + return this.mDefaultPreferencesLoaded; + }, + get _stringBundle() { if (!this.mStringBundle)

1 0

[tor-launcher/master] Replace nsIScriptableDateFormat with Services.intl.DateTimeFormat
by gk＠torproject.org 23 May '18

23 May '18

commit eccf3749f046da385eae27176f4c9e692a5784ff Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri May 4 21:17:32 2018 +0000 Replace nsIScriptableDateFormat with Services.intl.DateTimeFormat In bug 1313625 Mozilla ripped out support for nsIScriptableDateFormat because ECMAScript now has support for this. This change is based on bug 1383463. --- src/components/tl-protocol.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js index 79b327e..6659621 100644 --- a/src/components/tl-protocol.js +++ b/src/components/tl-protocol.js @@ -13,6 +13,7 @@ const Cr = Components.results; const Cu = Components.utils; Cu.import("resource://gre/modules/XPCOMUtils.jsm"); +Cu.import("resource://gre/modules/Services.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherUtil", "resource://torlauncher/modules/tl-util.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherLogger", @@ -636,10 +637,6 @@ TorProtocolService.prototype = let s = ""; if (this.mTorLog) { - let dateFmtSvc = Cc["@mozilla.org/intl/scriptabledateformat;1"] - .getService(Ci.nsIScriptableDateFormat); - let dateFormat = dateFmtSvc.dateFormatShort; - let timeFormat = dateFmtSvc.timeFormatSecondsForce24Hour; let eol = (TorLauncherUtil.isWindows) ? "\r\n" : "\n"; let count = this.mTorLog.length; if (aCountObj) @@ -648,12 +645,16 @@ TorProtocolService.prototype = { let logObj = this.mTorLog[i]; let secs = logObj.date.getSeconds(); - let timeStr = dateFmtSvc.FormatDateTime("", dateFormat, timeFormat, - logObj.date.getFullYear(), logObj.date.getMonth() + 1, - logObj.date.getDate(), logObj.date.getHours(), - logObj.date.getMinutes(), secs); + + let options = { year: '2-digit', month: 'numeric', day: 'numeric', + hour: 'numeric', minute: 'numeric', second: 'numeric', + hour12: false }; + let timeStr = new Intl.DateTimeFormat('en-US', options) + .format(logObj.date, options); + if (' ' == timeStr.substr(-1)) timeStr = timeStr.substr(0, timeStr.length - 1); + let fracSecsStr = "" + logObj.date.getMilliseconds(); while (fracSecsStr.length < 3) fracSecsStr += "0";

1 0

[tor-launcher/master] Mozilla ripped out nsIPrefBranchInternal
by gk＠torproject.org 23 May '18

23 May '18

commit a2a42c64de4322f96a77451e64e839ada353eda7 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri Feb 23 19:56:38 2018 +0000 Mozilla ripped out nsIPrefBranchInternal Apparently nsIPrefBranchInternal was a trivial subclass of nsIPrefBranch, so we simply switch which class we use. https://bugzilla.mozilla.org/show_bug.cgi?id=1374847 --- src/modules/tl-logger.jsm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/tl-logger.jsm b/src/modules/tl-logger.jsm index 19168d2..a2ea404 100644 --- a/src/modules/tl-logger.jsm +++ b/src/modules/tl-logger.jsm @@ -1,4 +1,4 @@ -// Copyright (c) 2013, The Tor Project, Inc. +// Copyright (c) 2018, The Tor Project, Inc. // See LICENSE for licensing information. // TODO: Based on torbutton-logger.js (pull in copyright and license?) // @@ -108,8 +108,8 @@ let TLLoggerInternal = // Private { // Register observer var prefs = Cc["@mozilla.org/preferences-service;1"] - .getService(Ci.nsIPrefBranchInternal) - .QueryInterface(Ci.nsIPrefBranchInternal); + .getService(Ci.nsIPrefBranch) + .QueryInterface(Ci.nsIPrefBranch); prefs.addObserver("extensions.torlauncher", this, false); this.mLogLevel = TorLauncherUtil.getIntPref(

1 0

[tor-launcher/master] Fix deprecated octal literals
by gk＠torproject.org 23 May '18

23 May '18

commit c5cf235c8f530ef5dc64eea3bb404ca0d48eb0a8 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri Feb 23 19:50:01 2018 +0000 Fix deprecated octal literals See https://bugzilla.mozilla.org/show_bug.cgi?id=1263074 --- src/components/tl-process.js | 2 +- src/modules/tl-util.jsm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 74d5f41..8d3efb7 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -978,7 +978,7 @@ TorProcessService.prototype = let stream = Cc["@mozilla.org/network/safe-file-output-stream;1"] .createInstance(Ci.nsIFileOutputStream); stream.init(aFile, 0x02 | 0x08 | 0x20, /* WRONLY CREATE TRUNCATE */ - 0600, 0); + 0o600, 0); stream.write(data, data.length); stream.QueryInterface(Ci.nsISafeOutputStream).finish(); } diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index a79e2bd..d669112 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -658,9 +658,9 @@ let TorLauncherUtil = // Public try { if ("tordatadir" == aTorFileType) - torFile.create(torFile.DIRECTORY_TYPE, 0700); + torFile.create(torFile.DIRECTORY_TYPE, 0o700); else - torFile.create(torFile.NORMAL_FILE_TYPE, 0600); + torFile.create(torFile.NORMAL_FILE_TYPE, 0o600); } catch (e) { @@ -883,7 +883,7 @@ let TLUtilInternal = // Private let d = Cc['@mozilla.org/file/local;1'].createInstance(Ci.nsIFile); d.initWithPath(aBasePath); d.append("Tor"); - d.createUnique(Ci.nsIFile.DIRECTORY_TYPE, 0700); + d.createUnique(Ci.nsIFile.DIRECTORY_TYPE, 0o700); return d; } catch (e)

1 0

[tor-launcher/master] Add fennec target application
by gk＠torproject.org 23 May '18

23 May '18

commit 785568d05b12f819a29b90c2dcd4e55b821a2047 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri Feb 23 19:43:05 2018 +0000 Add fennec target application --- src/install.rdf | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/install.rdf b/src/install.rdf index d0debd0..a71a21a 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -39,6 +39,14 @@ <em:maxVersion>*.*.*</em:maxVersion> </Description> </em:targetApplication> +  + <em:targetApplication> + <Description> + <em:id>{aa3c5121-dab2-40e2-81ca-7ea25febc110}</em:id> + <em:minVersion>45.0</em:minVersion> + <em:maxVersion>*</em:maxVersion> + </Description> + </em:targetApplication> </Description> </RDF>

1 0

[tor-browser-build/master] Bug 26054: Make sure to create incrementals from previously signed MAR files
by gk＠torproject.org 23 May '18

23 May '18

commit 0bfae091fa18b6bca05de2cac42bacac47381876 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon May 21 15:54:31 2018 +0200 Bug 26054: Make sure to create incrementals from previously signed MAR files --- tools/update-responses/update_responses | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index bf2415d..1df35b3 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -209,6 +209,10 @@ sub create_incremental_mar { my $tmpdir = get_tmpdir($config); extract_mar(mar_filename($config, $appname, $from_version, $os, $lang), "$tmpdir/A"); extract_mar(mar_filename($config, $appname, $new_version, $os, $lang), "$tmpdir/B"); + # bug 26054: make sure previous macOS version is code signed + if (($os eq 'osx64') && ! -f "$tmpdir/A/Contents/_CodeSignature/CodeResources") { + exit_error "Missing code signature in $from_version while creating $mar_file"; + } if ($ENV{CHECK_CODESIGNATURE_EXISTS}) { unless (-f "$tmpdir/A/Contents/_CodeSignature/CodeResources" && -f "$tmpdir/B/Contents/_CodeSignature/CodeResources") {

1 0

[tor-browser-build/master] Bug 26059: Use signed directory when generating incremental mars
by gk＠torproject.org 23 May '18

23 May '18

commit ae1c8fd96fdb9f3208a84cca6ec9c8d546ada459 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon May 21 13:14:13 2018 +0200 Bug 26059: Use signed directory when generating incremental mars We update the update_responses script to be able to specify a different $releases_dir for each version. When generating incremental mars, this allows us to set the default releases_dir to {alpha,release}/signed and the current version's releases_dir to {alpha,release}/unsigned. --- Makefile | 4 ++-- projects/release/config | 4 ++++ projects/release/update_responses_config.yml | 5 ++++- tools/update-responses/update_responses | 27 ++++++++++++++++----------- 4 files changed, 26 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 2707d41..4c21a83 100644 --- a/Makefile +++ b/Makefile @@ -111,13 +111,13 @@ signtag-alpha: submodule-update $(rbm) build release --step signtag --target alpha incrementals-release: submodule-update - $(rbm) build release --step update_responses_config --target release + $(rbm) build release --step update_responses_config --target release --target create_unsigned_incrementals tools/update-responses/download_missing_versions release tools/update-responses/gen_incrementals release $(rbm) build release --step hash_incrementals --target release incrementals-alpha: submodule-update - $(rbm) build release --step update_responses_config --target alpha + $(rbm) build release --step update_responses_config --target alpha --target create_unsigned_incrementals tools/update-responses/download_missing_versions alpha tools/update-responses/gen_incrementals alpha $(rbm) build release --step hash_incrementals --target alpha diff --git a/projects/release/config b/projects/release/config index e48fb01..2aba446 100644 --- a/projects/release/config +++ b/projects/release/config @@ -73,6 +73,10 @@ targets: var: signed_status: signed + create_unsigned_incrementals: + var: + create_unsigned_incrementals: 1 + input_files: # Release diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml index 01c6950..1a9b0cf 100644 --- a/projects/release/update_responses_config.yml +++ b/projects/release/update_responses_config.yml @@ -5,7 +5,7 @@ appname_bundle_osx: TorBrowser appname_bundle_linux: tor-browser appname_bundle_win32: torbrowser-install appname_bundle_win64: torbrowser-install-win64 -releases_dir: [% path(c('output_dir')) %]/[% c("var/signed_status") %] +releases_dir: [% path(c('output_dir')) %]/signed download: archive_url: https://archive.torproject.org/tor-package-archive/torbrowser gpg_keyring: ../../keyring/torbrowser.gpg @@ -25,6 +25,9 @@ channels: [% pc('firefox', 'var/torbrowser_update_channel') %]: [% c("var/torbrowser_version") %] versions: [% c("var/torbrowser_version") %]: +[% IF c("var/create_unsigned_incrementals") -%] + releases_dir: [% path(c('output_dir')) %]/unsigned +[% END -%] platformVersion: [% pc('firefox', 'var/firefox_platform_version') %] detailsURL: https://blog.torproject.org/tor-browser-[% c("var/torbrowser_version") FILTER remove('\.') %]-released incremental_from: diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 658f451..bf2415d 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -92,7 +92,7 @@ sub get_version_files { return if $config->{versions}{$version}{files}; my $appname = $config->{appname_marfile}; my $files = {}; - my $vdir = "$releases_dir/$version"; + my $vdir = version_dir($config, $version); my $download_url = "$config->{download}{mars_url}/$version"; opendir(my $d, $vdir) or exit_error "Error opening directory $vdir"; foreach my $file (readdir $d) { @@ -126,7 +126,7 @@ sub get_version_files { sub get_version_downloads { my ($config, $version) = @_; my $downloads = {}; - my $vdir = "$releases_dir/$version"; + my $vdir = version_dir($config, $version); my $download_url = "$config->{download}{bundles_url}/$version"; opendir(my $d, $vdir) or exit_error "Error opening directory $vdir"; foreach my $file (readdir $d) { @@ -179,15 +179,15 @@ sub extract_mar { } sub mar_filename { - my ($appname, $version, $os, $lang) = @_; - "$releases_dir/$version/$appname-$os-${version}_$lang.mar"; + my ($config, $appname, $version, $os, $lang) = @_; + version_dir($config, $version) . "/$appname-$os-${version}_$lang.mar"; } sub create_incremental_mar { my ($config, $pm, $from_version, $new_version, $os, $lang) = @_; my $appname = $config->{appname_marfile}; my $mar_file = "$appname-$os-${from_version}-${new_version}_$lang.incremental.mar"; - my $mar_file_path = "$releases_dir/$new_version/$mar_file"; + my $mar_file_path = version_dir($config, $new_version) . '/' . $mar_file; if ($ENV{MAR_SKIP_EXISTING} && -f $mar_file_path) { print "Skipping $mar_file\n"; return; @@ -207,8 +207,8 @@ sub create_incremental_mar { }; return if $pm->start($finished_file); my $tmpdir = get_tmpdir($config); - extract_mar(mar_filename($appname, $from_version, $os, $lang), "$tmpdir/A"); - extract_mar(mar_filename($appname, $new_version, $os, $lang), "$tmpdir/B"); + extract_mar(mar_filename($config, $appname, $from_version, $os, $lang), "$tmpdir/A"); + extract_mar(mar_filename($config, $appname, $new_version, $os, $lang), "$tmpdir/B"); if ($ENV{CHECK_CODESIGNATURE_EXISTS}) { unless (-f "$tmpdir/A/Contents/_CodeSignature/CodeResources" && -f "$tmpdir/B/Contents/_CodeSignature/CodeResources") { @@ -250,6 +250,11 @@ sub get_config { // $config->{$name}; } +sub version_dir { + my ($config, $version) = @_; + return get_config($config, $version, 'any', 'releases_dir') . "/$version"; +} + sub channel_to_version { my ($config, @channels) = @_; return values %{$config->{channels}} unless @channels; @@ -270,7 +275,7 @@ sub get_buildinfos { next unless $files->{$os}{$lang}{complete}; my $tmpdir = get_tmpdir($config); extract_mar( - mar_filename($config->{appname_marfile}, $version, $os, $lang), + mar_filename($config, $config->{appname_marfile}, $version, $os, $lang), "$tmpdir"); my $appfile = "$tmpdir/application.ini" if -f "$tmpdir/application.ini"; $appfile = "$tmpdir/Contents/Resources/application.ini" @@ -423,7 +428,7 @@ my $martools_tmpdir; sub extract_martools { my ($config, $version) = @_; my $osname = osname; - my $marzip = "$releases_dir/$version/mar-tools-$osname.zip"; + my $marzip = version_dir($config, $version) . "/mar-tools-$osname.zip"; $martools_tmpdir = get_tmpdir($config); my $old_cwd = getcwd; chdir $martools_tmpdir; @@ -523,7 +528,7 @@ sub check_update_responses_channel { sub download_version { my ($config, $version) = @_; my $tmpdir = get_tmpdir($config); - my $destdir = "$releases_dir/$version"; + my $destdir = version_dir($config, $version); my $urldir = "$config->{download}{archive_url}/$version"; print "Downloading version $version\n"; foreach my $file (qw(sha256sums-signed-build.txt sha256sums-signed-build.txt.asc)) { @@ -576,7 +581,7 @@ sub download_missing_versions { my $cversion = $config->{channels}{$channel}; next unless $config->{versions}{$cversion}{incremental_from}; foreach my $version (@{$config->{versions}{$cversion}{incremental_from}}) { - next if -d "$releases_dir/$version"; + next if -d version_dir($config, $version); download_version($config, $version); } }

1 0

[torbutton/master] Bug 24309: Fix identity popup dimensions
by gk＠torproject.org 23 May '18

23 May '18

commit 8057989d2d37edcce8cc3bf04e6a145d19440be6 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue May 22 10:04:37 2018 -0700 Bug 24309: Fix identity popup dimensions On some OSes relay lines are wrapping and the doorhanger is sometimes rendering too small to show everything inside. We avoid the line wrapping and resize the identity popup where needed. --- src/chrome/content/tor-circuit-display.js | 43 +++++++++++++++++++++++++++++++ src/chrome/skin/tor-circuit-display.css | 1 + 2 files changed, 44 insertions(+) diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index cbea569..5bd02bc 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -392,6 +392,44 @@ let setupGuardNote = function () { learnMoreString]]); }; +// __ensureCorrectPopupDimensions()__. +// Make sure the identity popup always displays with the correct height. +let ensureCorrectPopupDimensions = function () { + let setDimensions = () => { + setTimeout(() => { + let view = document.querySelector("#identity-popup-multiView .panel-viewcontainer"); + let stack = document.querySelector("#identity-popup-multiView .panel-viewstack"); + let view2 = document.getElementById("identity-popup-mainView"); + if (view && stack && view2) { + let newWidth = Math.max(...[...view2.children].map(el => el.clientWidth)) + 10; + let newHeight = stack.clientHeight; + stack.setAttribute("width", newWidth); + view2.style.minWidth = view2.style.maxWidth = newWidth + "px"; + view.setAttribute("width", newWidth); + view.setAttribute("height", newHeight); + } + }, 0); + }; + let removeDimensions = () => { + let view = document.querySelector("#identity-popup-multiView .panel-viewcontainer"); + let stack = document.querySelector("#identity-popup-multiView .panel-viewstack"); + let view2 = document.getElementById("identity-popup-mainView"); + if (view && stack && view2) { + view.removeAttribute("width"); + view.removeAttribute("height"); + stack.removeAttribute("width"); + view2.style.minWidth = view2.style.maxWidth = ""; + } + }; + let popupMenu = document.getElementById("identity-popup"); + popupMenu.addEventListener("popupshowing", setDimensions); + popupMenu.addEventListener("popuphiding", removeDimensions); + return () => { + popupMenu.removeEventListener("popupshowing", setDimensions); + popupMenu.removeEventListener("popuphiding", removeDimensions); + }; +}; + // ## Main function // __setupDisplay(ipcFile, host, port, password, enablePrefName)__. @@ -403,6 +441,7 @@ let setupDisplay = function (ipcFile, host, port, password, enablePrefName) { let myController = null, stopCollectingIsolationData = null, stopCollectingBrowserCredentials = null, + stopEnsuringCorrectPopupDimensions = null, stop = function() { syncDisplayWithSelectedTab(false); if (myController) { @@ -412,6 +451,9 @@ let setupDisplay = function (ipcFile, host, port, password, enablePrefName) { if (stopCollectingBrowserCredentials) { stopCollectingBrowserCredentials(); } + if (stopEnsuringCorrectPopupDimensions) { + stopEnsuringCorrectPopupDimensions(); + } myController = null; } }, @@ -428,6 +470,7 @@ let setupDisplay = function (ipcFile, host, port, password, enablePrefName) { syncDisplayWithSelectedTab(true); stopCollectingIsolationData = collectIsolationData(myController, updateCircuitDisplay); stopCollectingBrowserCredentials = collectBrowserCredentials(); + stopEnsuringCorrectPopupDimensions = ensureCorrectPopupDimensions(); } }; try { diff --git a/src/chrome/skin/tor-circuit-display.css b/src/chrome/skin/tor-circuit-display.css index 71c283c..640d595 100644 --- a/src/chrome/skin/tor-circuit-display.css +++ b/src/chrome/skin/tor-circuit-display.css @@ -62,6 +62,7 @@ ul#circuit-display-nodes li { background-repeat: no-repeat; list-style: none; padding-inline-start: 1.5em; + white-space: nowrap; } ul#circuit-display-nodes li:-moz-locale-dir(rtl) {

1 0

[torbutton/master] Fix two typos
by gk＠torproject.org 22 May '18

22 May '18

commit a3447ddb13c279e7e4c384610b98a045e7f932bb Author: Georg Koppen <gk(a)torproject.org> Date: Tue May 22 08:40:01 2018 +0000 Fix two typos --- src/chrome/content/tor-circuit-display.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index cb43499..cbea569 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -282,13 +282,13 @@ let xmlTree = function xmlTree (ns, data) { // __htmlTree(data)__. // Takes a data structure representing html elements like // [tag, { attr-key: attr-value }, ...html-children] -// and return nested html element objects. +// and returns nested html element objects. let htmlTree = data => xmlTree("http://www.w3.org/1999/xhtml", data); // __appendHtml(parent, data)__. // Takes a data structure representing html elements like // [tag, { attr-key: attr-value }, ...html-children] -// and append nested html element objects to the parent element. +// and appends nested html element objects to the parent element. let appendHtml = (parent, data) => parent.appendChild(htmlTree(data)); // __circuitCircuitData()__.

1 0

[torbutton/master] Bug 24309: Move circuit display to the identity popup.
by gk＠torproject.org 22 May '18

22 May '18

commit 26d4ce95369819a1aeefd30fd52f670fc589b5ea Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Apr 12 15:36:44 2018 -0700 Bug 24309: Move circuit display to the identity popup. New circuit display design by Antonela Debiasi. The new design includes a "Guard" indicator, a "Load New Circuit" button, new Photon-compatible style. --- src/chrome.manifest | 1 + src/chrome/content/popup.xul | 12 -- src/chrome/content/tor-circuit-display.js | 130 +++++++++++++++------ src/chrome/content/tor-circuit-display.xul | 34 ++++++ src/chrome/locale/en/torbutton.dtd | 3 +- src/chrome/locale/en/torbutton.properties | 5 +- src/chrome/skin/relay.svg | 10 ++ src/chrome/skin/tor-circuit-display.css | 176 ++++++++++++++++------------- 8 files changed, 247 insertions(+), 124 deletions(-) diff --git a/src/chrome.manifest b/src/chrome.manifest index 65f55a9..f72fffa 100644 --- a/src/chrome.manifest +++ b/src/chrome.manifest @@ -15,6 +15,7 @@ overlay chrome://browser/content/aboutDialog.xul chrome://torbutton/content/abou # UI customization overlay chrome://browser/content/baseMenuOverlay.xul chrome://torbutton/content/menu-overlay.xul overlay about:preferences chrome://torbutton/content/privacy-prefs-overlay.xul +overlay chrome://browser/content/browser.xul chrome://torbutton/content/tor-circuit-display.xul # Strings for the about:tbupdate page override chrome://browser/locale/aboutTBUpdate.dtd chrome://torbutton/locale/aboutTBUpdate.dtd diff --git a/src/chrome/content/popup.xul b/src/chrome/content/popup.xul index 9447b70..b088a82 100644 --- a/src/chrome/content/popup.xul +++ b/src/chrome/content/popup.xul @@ -1,6 +1,5 @@ <?xml version="1.0"?> <?xml-stylesheet href="chrome://torbutton/skin/torbutton.css" type="text/css"?> -<?xml-stylesheet href="chrome://torbutton/skin/tor-circuit-display.css" type="text/css"?> <!DOCTYPE overlay SYSTEM "chrome://torbutton/locale/torbutton.dtd"> @@ -51,17 +50,6 @@ insertafter="context-stop" oncommand="torbutton_check_for_update()"/> </vbox> - <vbox id="circuit-display-container"> - <div id="circuit-display" xmlns="http://www.w3.org/1999/xhtml" dir="auto"> - <p id="title">&torbutton.circuit_display.title;</p> - <p id="domain">(example.com)</p> - <ul id="circuit-nodes" dir="auto"> - <li>example A</li> - <li>example B</li> - <li>example C</li> - </ul> - </div> - </vbox> </hbox> </panel> </overlay> diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index b5c24f8..cb43499 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -215,7 +215,7 @@ let regionBundle = Services.strings.createBundle( // Convert a country code to a localized country name. // Example: `'de'` -> `'Deutschland'` in German locale. let localizedCountryNameFromCode = function (countryCode) { - if (typeof(countryCode) === "undefined") return undefined; + if (!countryCode) return uiString("unknown_country"); try { return regionBundle.GetStringFromName(countryCode.toLowerCase()); } catch (e) { @@ -249,7 +249,7 @@ let nodeLines = function (nodeData) { (country ? " (" + country + ")" : "")) : // For each non-bridge relay, show its host country and IP. - (country || uiString("unknown_country")) + + country + // As we don't have a bridge, show the IP address // of the node. Use unicode escapes to ensure that // parentheses behave properly in both left-to-right @@ -260,46 +260,90 @@ let nodeLines = function (nodeData) { return result; }; -// __onionSiteRelayLine__. -// When we have an onion site, we simply show the word '(relay)'. -let onionSiteRelayLine = "<li class='relay'>(" + uiString("relay") + ")</li>"; +// __xmlTree(ns, data)__. +// Takes an xml namespace, ns, and a +// data structure representing xml elements like +// [tag, { attr-key: attr-value }, ...xml-children] +// and returns nested xml element objects. +let xmlTree = function xmlTree (ns, data) { + let [type, attrs, ...children] = data; + let element = document.createElementNS(ns, type); + for (let [key, val] of Object.entries(attrs)) { + element.setAttribute(key, val); + } + for (let child of children) { + if (child !== null && child !== undefined) { + element.append(typeof child === "string" ? child : xmlTree(ns, child)); + } + } + return element; +}; + +// __htmlTree(data)__. +// Takes a data structure representing html elements like +// [tag, { attr-key: attr-value }, ...html-children] +// and return nested html element objects. +let htmlTree = data => xmlTree("http://www.w3.org/1999/xhtml", data); + +// __appendHtml(parent, data)__. +// Takes a data structure representing html elements like +// [tag, { attr-key: attr-value }, ...html-children] +// and append nested html element objects to the parent element. +let appendHtml = (parent, data) => parent.appendChild(htmlTree(data)); + +// __circuitCircuitData()__. +// Obtains the circuit used by the given browser. +let currentCircuitData = function (browser) { + if (browser) { + let credentials = browserToCredentialsMap.get(browser); + if (credentials) { + let [SOCKS_username, SOCKS_password] = credentials; + let nodeData = credentialsToNodeDataMap[`${SOCKS_username}|${SOCKS_password}`]; + let domain = SOCKS_username; + return { domain, nodeData }; + } + } + return { domain: null, nodeData: null }; +}; // __updateCircuitDisplay()__. // Updates the Tor circuit display, showing the current domain // and the relay nodes for that domain. let updateCircuitDisplay = function () { - let selectedBrowser = gBrowser.selectedBrowser; - if (selectedBrowser) { - let credentials = browserToCredentialsMap.get(selectedBrowser), - nodeData = null; - if (credentials) { - let [SOCKS_username, SOCKS_password] = credentials; - // Check if we have anything to show for these credentials. - nodeData = credentialsToNodeDataMap[SOCKS_username + "|" + SOCKS_password]; - if (nodeData) { - // Update the displayed domain. - let domain = SOCKS_username; - document.getElementById("domain").innerHTML = "(" + domain + "):"; - // Update the displayed information for the relay nodes. - let lines = nodeLines(nodeData), - nodeInnerHTML = "<li>" + uiString("this_browser") + "</li>"; - for (let line of lines) { - nodeInnerHTML += "<li>" + line + "</li>"; - } - nodeInnerHTML += domain.endsWith(".onion") ? - (onionSiteRelayLine + - onionSiteRelayLine + - onionSiteRelayLine + - "<li>" + uiString("onion_site") + "</li>") : - "<li>" + uiString("internet") + "</li>"; - document.getElementById("circuit-nodes").innerHTML = nodeInnerHTML; + let { domain, nodeData } = currentCircuitData(gBrowser.selectedBrowser); + if (domain && nodeData) { + // Update the displayed information for the relay nodes. + let nodeHtmlList = document.getElementById("circuit-display-nodes"); + let li = (...data) => appendHtml(nodeHtmlList, ["li", {}, ...data]); + nodeHtmlList.innerHTML = ""; + li(uiString("this_browser")); + for (let i = 0; i < nodeData.length; ++i) { + let relayText; + if (nodeData[i].type === "bridge") { + relayText = uiString("tor_bridge") + + ((nodeData[i].bridgeType !== "vanilla") ? `: ${nodeData[i].bridgeType}` : ""); + } else { + relayText = localizedCountryNameFromCode(nodeData[i].countryCode); } - } else { - logger.eclog(5, "no SOCKS credentials found for current document."); + li(relayText, " ", + ["span", { class: "circuit-ip-address" }, nodeData[i].ip], " ", + (i === 0 && nodeData[0].type !== "bridge") ? + ["span", { class: "circuit-guard-info" }, uiString("guard")] : null); } + if (domain.endsWith(".onion")) { + for (let i = 0; i < 3; ++i) { + li(uiString("relay")); + } + } + li(domain); + // Hide the note about guards if we are using a bridge. + document.getElementById("circuit-guard-note-container").style.display = + (nodeData[0].type === "bridge") ? "none" : "block"; + } else { // Only show the Tor circuit if we have credentials and node data. - showCircuitDisplay(credentials && nodeData); + logger.eclog(5, "no SOCKS credentials found for current document."); } + showCircuitDisplay(domain && nodeData); }; // __syncDisplayWithSelectedTab(syncOn)__. @@ -314,7 +358,7 @@ let syncDisplayWithSelectedTab = (function() { } } }; return function (syncOn) { - let popupMenu = document.getElementById("torbutton-context-menu"); + let popupMenu = document.getElementById("identity-popup"); if (syncOn) { // Update the circuit display just before the popup menu is shown. popupMenu.addEventListener("popupshowing", updateCircuitDisplay); @@ -331,6 +375,23 @@ let syncDisplayWithSelectedTab = (function() { }; })(); +// __setupGuardNote()__. +// Call once to show the Guard note as intended. +let setupGuardNote = function () { + let guardNote = document.getElementById("circuit-guard-note-container"); + let guardNoteString = uiString("guard_note"); + let learnMoreString = uiString("learn_more"); + let [noteBefore, name, noteAfter] = guardNoteString.split(/[\[\]]/); + let localeCode = torbutton_get_general_useragent_locale(); + appendHtml(guardNote, + ["div", {}, + noteBefore, ["span", {class: "circuit-guard-name"}, name], + noteAfter, " ", + ["span", {onclick: `gBrowser.selectedTab = gBrowser.addTab('https://tb-manual.torproject.org/${localeCode}');`, + class: "circuit-link"}, + learnMoreString]]); +}; + // ## Main function // __setupDisplay(ipcFile, host, port, password, enablePrefName)__. @@ -338,6 +399,7 @@ let syncDisplayWithSelectedTab = (function() { // the "enablePref" is set to true, and stopped when it is set to false. // A reference to this function (called createTorCircuitDisplay) is exported as a global. let setupDisplay = function (ipcFile, host, port, password, enablePrefName) { + setupGuardNote(); let myController = null, stopCollectingIsolationData = null, stopCollectingBrowserCredentials = null, diff --git a/src/chrome/content/tor-circuit-display.xul b/src/chrome/content/tor-circuit-display.xul new file mode 100644 index 0000000..b4d4ac7 --- /dev/null +++ b/src/chrome/content/tor-circuit-display.xul @@ -0,0 +1,34 @@ +<?xml version="1.0"?> +<?xml-stylesheet href="chrome://torbutton/skin/tor-circuit-display.css" type="text/css"?> + +<!DOCTYPE overlay SYSTEM "chrome://torbutton/locale/torbutton.dtd"> + +<overlay id="circuit-display-overlay" + xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" + xmlns:html="http://www.w3.org/1999/xhtml"> + <panelview id="identity-popup-mainView"> +  + <xul:hbox id="circuit-display-container" + class="identity-popup-section" + insertafter="identity-popup-security"> + <xul:vbox id="circuit-display-content" flex="1"> + <xul:label id="circuit-display-headline" + class="identity-popup-headline" + value="&torbutton.circuit_display.title;"/> + <html:ul id="circuit-display-nodes" dir="auto"> + <li>example A</li> + <li>example B</li> + <li>example C</li> + </html:ul> + </xul:vbox> + <xul:vbox id="circuit-reload-content" flex="1"> + <html:button id="circuit-reload-button" + onclick="torbutton_new_circuit()"> + &torbutton.circuit_display.new_circuit; + </html:button> + <xul:hbox id="circuit-guard-note-container"> + </xul:hbox> + </xul:vbox> + </xul:hbox> + </panelview> +</overlay> diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd index 7ccad6a..a0ef5f9 100644 --- a/src/chrome/locale/en/torbutton.dtd +++ b/src/chrome/locale/en/torbutton.dtd @@ -47,4 +47,5 @@ <!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled."> <!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play."> -<!ENTITY torbutton.circuit_display.title "Tor circuit for this site"> +<!ENTITY torbutton.circuit_display.title "Tor Circuit"> +<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site"> diff --git a/src/chrome/locale/en/torbutton.properties b/src/chrome/locale/en/torbutton.properties index 2391e69..468a532 100644 --- a/src/chrome/locale/en/torbutton.properties +++ b/src/chrome/locale/en/torbutton.properties @@ -2,9 +2,12 @@ torbutton.circuit_display.internet = Internet torbutton.circuit_display.ip_unknown = IP unknown torbutton.circuit_display.onion_site = Onion site torbutton.circuit_display.this_browser = This browser -torbutton.circuit_display.relay = relay +torbutton.circuit_display.relay = Relay torbutton.circuit_display.tor_bridge = Bridge torbutton.circuit_display.unknown_country = Unknown country +torbutton.circuit_display.guard = Guard +torbutton.circuit_display.guard_note = Your [Guard] node may not change. +torbutton.circuit_display.learn_more = Learn more torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online. torbutton.panel.tooltip.disabled = Click to enable Tor torbutton.panel.tooltip.enabled = Click to disable Tor diff --git a/src/chrome/skin/relay.svg b/src/chrome/skin/relay.svg new file mode 100644 index 0000000..b2f5f16 --- /dev/null +++ b/src/chrome/skin/relay.svg @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> +  + <title>relay</title> + <desc>Created with Sketch.</desc> + <defs></defs> + <g id="Artboard" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="translate(-448.000000, -65.000000)"> + <path d="M462.904942,71.0268217 L467.575247,74.1403583 C468.095041,73.9073638 468.671277,73.7777778 469.277778,73.7777778 C471.57895,73.7777778 473.444444,75.6432726 473.444444,77.9444444 C473.444444,80.2456163 471.57895,82.1111111 469.277778,82.1111111 C468.296528,82.1111111 467.394661,81.7717448 466.682726,81.2041667 L462.234549,83.9842882 C462.366276,84.5801474 462.366276,85.197587 462.234549,85.7934462 L466.682726,88.5735677 C467.394661,88.006033 468.296528,87.6666667 469.277778,87.6666667 C471.57895,87.6666667 473.444444,89.5321615 473.444444,91.8333333 C473.444444,94.1345052 471.57895,96 469.277778,96 C466.976606,96 465.111111,94.1345052 465.111111,91.8333333 C465.111023,91.5291178 465.144147,91.2258017 465.209896,90.928776 L460.761719,88.1486545 C460.049783,88.7161892 459.147917,89.0555556 458.166667,89.0555556 C455.865495,89.0555556 454,87.1900608 454,84.8888889 C454,82.587717 455.865495,80.7222222 458.166667,80.7222222 C459.147917,80.7222222 460.049783,81.0615885 46 0.761719,81.6291233 L465.209896,78.8490017 C465.145399,78.5577257 465.111111,78.2551215 465.111111,77.9444444 C465.111111,77.2224682 465.29474,76.5433776 465.617841,75.95133 L461.36038,73.1130222 C460.739536,73.5327021 459.990981,73.7777778 459.185185,73.7777778 C457.037411,73.7777778 455.296296,72.0366629 455.296296,69.8888889 C455.296296,67.7411149 457.037411,66 459.185185,66 C461.332959,66 463.074074,67.7411149 463.074074,69.8888889 C463.074074,70.2848045 463.01491,70.6669018 462.904942,71.0268217 Z" id="Line-2" fill="#000000" fill-rule="nonzero"></path> + </g> +</svg> \ No newline at end of file diff --git a/src/chrome/skin/tor-circuit-display.css b/src/chrome/skin/tor-circuit-display.css index d3b5edc..71c283c 100644 --- a/src/chrome/skin/tor-circuit-display.css +++ b/src/chrome/skin/tor-circuit-display.css @@ -4,110 +4,134 @@ a domain, and a bulleted list. Each bullet in the circuit node list is supposed to represent a Tor circuit node, and lines drawn between them to represent Tor network inter-relay connections. - -CSS for line between bullets is derived in part from https://jsfiddle.net/5JP8Q/ */ -/* The circuit-display div encloses all other HTML elements. - Color the background to make circuit display distinct - from the rest of the popup. */ -div#circuit-display { - background-color: #e8f4f4; - font-family: Arial; - width: 100%; - height: 100%; - padding: 8px; - /* Magically keep popup menu from clipping div: */ - display: table-cell; + +#circuit-display-content { + background-image: url(chrome://torbutton/skin/relay.svg); + background-position: 1em 1em; + background-repeat: no-repeat; + background-size: 24px auto; + background-color: rgba(255,255,255,0.4); + background-blend-mode: lighten; cursor: default; + padding: 0.5em 0px 0.5em; + padding-inline-end: 1em; + padding-inline-start: calc(2em + 24px); + width: 100%; } -/* Format the title text. */ -div#circuit-display p#title { - font-size: 15px; - font-weight: bold; - color: #2c26a7; - margin: 0; +#circuit-display-content:-moz-locale-dir(rtl) { + background-position: calc(100% - 1em) 1em; +} + +#circuit-reload-content { + background-color: #f7f7f7; + cursor: default; + padding: 1em 0px 1em; + padding-inline-end: 3em; + padding-inline-start: calc(2em + 24px); + width: 100%; } /* Format the domain text. */ -div#circuit-display p#domain { - font-size: 13px; - color: black; - margin: 4px; +#circuit-display-domain { + opacity: 0.8; +} + +#circuit-div { + position: relative; + margin-inline-start: 6px; } /* Format the circuit node list. */ -ul#circuit-nodes { - font-family: Arial; - font-size: 14px; - color: black; - margin-top: 8px; - padding-left: 8px; - padding-right: 8px; -} - -/* Hide default bullets, and position pseudoelements (our new bullets) relative - to the list items. */ -ul#circuit-nodes li { +ul#circuit-display-nodes { + /* font-family: Arial; */ + font-size: 16px; + line-height: 26px; + /* color: black;*/ + margin-top: 4px; + margin-bottom: 2px; + padding-inline-start: 4px; +} + +/* Hide default bullets, and draw our own bullets */ +ul#circuit-display-nodes li { + background-image: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20width%3D%2715%27%20height%3D%2740%27%3E%3Cg%20style%3D%27stroke%3A%234a4a4a%3Bstroke-width%3A3px%3Bfill%3Awhite%3B%27%3E%3Cline%20x1%3D%2750%25%27%20y1%3D%270%25%27%20x2%3D%2750%25%27%20y2%3D%27100%25%27%2F%3E%3Ccircle%20cx%3D%2750%25%27%20cy%3D%2750%25%27%20r%3D%274.5%27%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A"); + background-position: left center; + background-repeat: no-repeat; list-style: none; - position:relative; + padding-inline-start: 1.5em; } -/* Pad the list item text at left or right to be tastefully - separated from bullets. */ -ul#circuit-nodes li:-moz-dir(ltr) { - padding-left: 18px; +ul#circuit-display-nodes li:-moz-locale-dir(rtl) { + background-position: right center; } -ul#circuit-nodes li:-moz-dir(rtl) { - padding-right: 18px; + +ul#circuit-display-nodes li:first-child { + background-image: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20width%3D%2715%27%20height%3D%2740%27%3E%3Cg%20style%3D%27stroke%3A%234a4a4a%3Bstroke-width%3A3px%3Bfill%3Awhite%3B%27%3E%3Cline%20x1%3D%2750%25%27%20y1%3D%2750%25%27%20x2%3D%2750%25%27%20y2%3D%27100%25%27%2F%3E%3Ccircle%20cx%3D%2750%25%27%20cy%3D%2750%25%27%20r%3D%274.5%27%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A"); +} + +ul#circuit-display-nodes li:last-child { + background-image: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20width%3D%2715%27%20height%3D%2740%27%3E%3Cg%20style%3D%27stroke%3A%234a4a4a%3Bstroke-width%3A3px%3Bfill%3Awhite%3B%27%3E%3Cline%20x1%3D%2750%25%27%20y1%3D%270%25%27%20x2%3D%2750%25%27%20y2%3D%2750%25%27%2F%3E%3Ccircle%20cx%3D%2750%25%27%20cy%3D%2750%25%27%20r%3D%274.5%27%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A"); +} + +.circuit-guard-help { + -moz-context-properties: fill, stroke; + fill: #6200a4; + stroke: #6200a4; +} + +.circuit-ip-address { + font-size: 80%; + opacity: 0.4; + padding-inline-start: 3px; } -/* Drawn bullets, centered vertically for each list item. */ -ul#circuit-nodes li:after { - /* bullets */ - content: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20width%3D%2711%27%20height%3D%2711%27%3E%3Ccircle%20cx%3D%275.5%27%20cy%3D%275.5%27%20r%3D%274%27%20style%3D%27stroke%3A%20%23195021%3B%20stroke-width%3A%202px%3B%20fill%3A%20white%3B%27%2F%3E%3C%2Fsvg%3E"); - position: absolute; - top: 1px; +.circuit-guard-info { + font-size: 80%; + font-weight: bold; + color: #6200a4; + padding-inline-start: 3px; } -/* Move the bullets to the far left or right, - depending on text directionality. */ -ul#circuit-nodes li:-moz-dir(ltr):after { - left: 0px; +#circuit-reload-button { + background-color: #0060df; + border-radius: 3px; + border: none; + color: white; + cursor: pointer; + font-size: 18px; + padding: 10px; } -ul#circuit-nodes li:-moz-dir(rtl):after { - right: 0px; + +#circuit-reload-button:hover { + background-color: #0058cf; } -/* Draw a connecting vertical line through the bullets. */ -ul#circuit-nodes li:before { - content: ""; - position: absolute; - border-left: 3px solid #4d363a; - height: 100%; - width: 0px; +#circuit-reload-button:active { + background-color: #0050bf; } -/* Position lines through the middle of the bullet. */ -ul#circuit-nodes li:-moz-dir(ltr):before { - left: 4px; +#circuit-guard-note-container { + margin-top: 10px; } -ul#circuit-nodes li:-moz-dir(rtl):before { - right: 4px; + +#circuit-guard-note-container div { + margin-left: 3px; + margin-right: 3px; } -/* Shorten the first list item's line so that it starts under the bullet. */ -ul#circuit-nodes li:first-child:before { - top: 50%; +.circuit-guard-name { + font-weight: bold; + color: #6200a4; } -/* Shorten the last list item's line so that it ends under the bullet. */ -ul#circuit-nodes li:last-child:before { - height: 50%; +.circuit-link { + cursor: pointer; + color: #0000ee; } -/* Onion site relay node text should be gray. */ -ul#circuit-nodes li.relay { - color: gray; -} \ No newline at end of file +.circuit-link:hover { + text-decoration: underline; +}

1 0

[tor-launcher/master] Bug 20890: Increase control port connection timeout
by gk＠torproject.org 17 May '18

17 May '18

commit 9aa5fd46cb33528150400a9b94c14ad5e9b7d4ee Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed May 16 14:17:16 2018 -0400 Bug 20890: Increase control port connection timeout On slow computers, it can take longer than 30 seconds for Tor Launcher to connect to the tor control port. Increase the timeout to 5 minutes. --- src/components/tl-process.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 53c9919..2bf5a4c 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -38,8 +38,8 @@ TorProcessService.prototype = kWizardProgressPageID: "progress", kInitialControlConnDelayMS: 25, - kMaxControlConnRetryMS: 500, - kControlConnTimeoutMS: 30000, // Wait at most 30 seconds for tor to start. + kMaxControlConnRetryMS: 2000, // Retry at least every 2 seconds. + kControlConnTimeoutMS: 5*60*1000, // Wait at most 5 minutes for tor to start. kStatusUnknown: 0, // Tor process status. kStatusStarting: 1,

1 0

[tor-browser-build/maint-7.5] Bug 26098: Remove amazon-meek
by gk＠torproject.org 16 May '18

16 May '18

commit efa9901ec57d0d78aa1f8034a922da4f792c0ee0 Author: Sina Rabbani <srabbani(a)cymru.com> Date: Tue May 15 13:46:06 2018 -0400 Bug 26098: Remove amazon-meek --- projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index a3f5326..ad34891 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -41,7 +41,6 @@ pref("extensions.torlauncher.default_bridge.obfs4.25", "obfs4 85.31.186.98:443 0 pref("extensions.torlauncher.default_bridge.obfs4.26", "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.27", "obfs4 216.252.162.21:46089 0DB8799466902192B6C7576D58D4F7F714EC87C1 cert=XPUwcQPxEXExHfJYX58gZXN7mYpos7VNAHbkgERNFg+FCVNzuYo1Wp+uMscl3aR9hO2DRQ iat-mode=0"); -pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2cly7j4zqgua7.cloudfront.net/ front=a0.awsstatic.com"); -pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com"); +pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com"); pref("extensions.torlauncher.default_bridge.snowflake.1", "snowflake 0.0.3.0:1 2B280B23E1107BB62ABFC40DDCC8824814F80A72");

1 0

[tor-browser-build/master] Bug 26098: Remove amazon-meek
by gk＠torproject.org 16 May '18

16 May '18

commit 22af54508a1e98bec13ee9580aac7c1b907043e8 Author: Sina Rabbani <srabbani(a)cymru.com> Date: Tue May 15 13:46:06 2018 -0400 Bug 26098: Remove amazon-meek --- projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index a3f5326..ad34891 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -41,7 +41,6 @@ pref("extensions.torlauncher.default_bridge.obfs4.25", "obfs4 85.31.186.98:443 0 pref("extensions.torlauncher.default_bridge.obfs4.26", "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.27", "obfs4 216.252.162.21:46089 0DB8799466902192B6C7576D58D4F7F714EC87C1 cert=XPUwcQPxEXExHfJYX58gZXN7mYpos7VNAHbkgERNFg+FCVNzuYo1Wp+uMscl3aR9hO2DRQ iat-mode=0"); -pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2cly7j4zqgua7.cloudfront.net/ front=a0.awsstatic.com"); -pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com"); +pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com"); pref("extensions.torlauncher.default_bridge.snowflake.1", "snowflake 0.0.3.0:1 2B280B23E1107BB62ABFC40DDCC8824814F80A72");

1 0

[tor-browser-build/master] Bug 26057: make it easy to see commit used in nightly builds
by gk＠torproject.org 15 May '18

15 May '18

commit 78ab93d70e73cf37550f45d6fb8fd61825bc1e95 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed May 9 10:29:18 2018 +0200 Bug 26057: make it easy to see commit used in nightly builds In order to make it easy to see which commit was used, we include the abbreviated commit hash in the filename of all components that are based on master in the nightly build. To do that, we set git_hash to master, and version (which is included in the filename) to '[% c("abbrev") %]". --- projects/obfs4/config | 1 + projects/sandbox/config | 1 + projects/tor-launcher/config | 3 ++- projects/tor/config | 2 +- projects/torbutton/config | 3 ++- 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/projects/obfs4/config b/projects/obfs4/config index 916887f..2bae851 100644 --- a/projects/obfs4/config +++ b/projects/obfs4/config @@ -13,6 +13,7 @@ var: targets: nightly: git_hash: master + version: '[% c("abbrev") %]' tag_gpg_id: 0 input_files: diff --git a/projects/sandbox/config b/projects/sandbox/config index a7ed768..11fe6be 100644 --- a/projects/sandbox/config +++ b/projects/sandbox/config @@ -21,6 +21,7 @@ var: targets: nightly: git_hash: master + version: '[% c("abbrev") %]' tag_gpg_id: 0 input_files: diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index e72ce10..fe21a49 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -13,5 +13,6 @@ input_files: targets: nightly: - version: master + version: '[% c("abbrev") %]' + git_hash: master tag_gpg_id: 0 diff --git a/projects/tor/config b/projects/tor/config index 78d834f..6219ea6 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -18,7 +18,7 @@ var: targets: nightly: - version: master + version: '[% c("abbrev") %]' git_hash: master tag_gpg_id: 0 diff --git a/projects/torbutton/config b/projects/torbutton/config index 93bef30..f153cf6 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -13,5 +13,6 @@ input_files: targets: nightly: - version: master + version: '[% c("abbrev") %]' + git_hash: master tag_gpg_id: 0

1 0

[tor-browser-build/master] Bug 25318: Add Tor Browser nightly builds email notification
by gk＠torproject.org 08 May '18

08 May '18

commit 4580c03c937e8ccab86446d60a0d4ee29b7c07c8 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 23 13:35:39 2018 +0200 Bug 25318: Add Tor Browser nightly builds email notification Authentication configuration for the email setup is stored in group_vars/boklm-tbb-nightly/dma-auth.yml, encrypted using ansible-vault. The file contains the dma_auth_conf variable, which is the content of the /etc/dma/auth.conf file. --- tools/ansible/Makefile | 2 +- tools/ansible/boklm-tbb-nightly-build.yml | 1 + .../ansible/group_vars/boklm-tbb-nightly/dma-auth.yml | 10 ++++++++++ tools/ansible/group_vars/boklm-tbb-nightly/dma.yml | 8 ++++++++ .../group_vars/boklm-tbb-nightly/tbb-nightly-build.yml | 2 ++ tools/ansible/roles/mta/tasks/main.yml | 18 ++++++++++++++++++ .../roles/tbb-nightly-build/templates/testsuite-config | 5 +++++ 7 files changed, 45 insertions(+), 1 deletion(-) diff --git a/tools/ansible/Makefile b/tools/ansible/Makefile index 72deb5b..ea63a44 100644 --- a/tools/ansible/Makefile +++ b/tools/ansible/Makefile @@ -5,4 +5,4 @@ fpcentral: ANSIBLE_CONFIG='$((a)D)/ansible-fpcentral.cfg' ansible-playbook -i inventory --ask-become-pass fpcentral.yml boklm-tbb-nightly-build: - ansible-playbook -i inventory boklm-tbb-nightly-build.yml + ansible-playbook --vault-password-file=~/ansible-vault/boklm-tbb-nightly -i inventory boklm-tbb-nightly-build.yml diff --git a/tools/ansible/boklm-tbb-nightly-build.yml b/tools/ansible/boklm-tbb-nightly-build.yml index cc37e23..2fe48cd 100644 --- a/tools/ansible/boklm-tbb-nightly-build.yml +++ b/tools/ansible/boklm-tbb-nightly-build.yml @@ -5,3 +5,4 @@ - role: tbb-builder - role: tbb-nightly-build - role: unattended-upgrades + - role: mta diff --git a/tools/ansible/group_vars/boklm-tbb-nightly/dma-auth.yml b/tools/ansible/group_vars/boklm-tbb-nightly/dma-auth.yml new file mode 100644 index 0000000..254291c --- /dev/null +++ b/tools/ansible/group_vars/boklm-tbb-nightly/dma-auth.yml @@ -0,0 +1,10 @@ +$ANSIBLE_VAULT;1.1;AES256 +64353537366566623534653938363036396164303631616138313130663766626463303034336564 +6339346639633765383534653561646366626665393333340a343533636436333838633039363265 +33393762363563323338356634396137393466616336326337323761643332363438313735646135 +6633326462616261310a663738306463613237326164663533326230316662333935333361636334 +61336433633964643631653230633861393131646532666536653738376261386535356636666262 +30303761333230623662323037376130386134373939613861343233363038636464623132363135 +66386532346165303839346563383934633462386534383330636432356166666238383332353930 +39316439653733376239343661373265303033323237366132366161316535636165336539333130 +3033 diff --git a/tools/ansible/group_vars/boklm-tbb-nightly/dma.yml b/tools/ansible/group_vars/boklm-tbb-nightly/dma.yml new file mode 100644 index 0000000..b210a3a --- /dev/null +++ b/tools/ansible/group_vars/boklm-tbb-nightly/dma.yml @@ -0,0 +1,8 @@ +--- +dma_conf: | + SMARTHOST mail.riseup.net + AUTHPATH /etc/dma/auth.conf + SECURETRANSFER + STARTTLS + MAILNAME /etc/mailname + MASQUERADE boklm-tbb-nightly(a)riseup.net diff --git a/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml b/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml index ebaadfe..77c4ad6 100644 --- a/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml +++ b/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml @@ -1,3 +1,5 @@ --- nightly_build_hostname: f4amtbsowhix7rrf.onion nightly_build_url: 'http://{{ nightly_build_hostname }}' +nightly_build_email_from: "'Tor Browser Nightly Builds (boklm) <boklm-tbb-nightly(a)riseup.net>'," +nightly_build_email_to: "[ 'boklm(a)torproject.org', 'gk(a)torproject.org' ]," diff --git a/tools/ansible/roles/mta/tasks/main.yml b/tools/ansible/roles/mta/tasks/main.yml index de469d8..9c5ac49 100644 --- a/tools/ansible/roles/mta/tasks/main.yml +++ b/tools/ansible/roles/mta/tasks/main.yml @@ -4,3 +4,21 @@ apt: name: dma state: present + +- name: create dma auth.conf + copy: + dest: /etc/dma/auth.conf + mode: 0640 + owner: root + group: mail + content: "{{ dma_auth_conf }}" + when: dma_auth_conf is defined + +- name: create dma.conf + copy: + dest: /etc/dma/dma.conf + mode: 0640 + owner: root + group: mail + content: "{{ dma_conf }}" + when: dma_conf is defined diff --git a/tools/ansible/roles/tbb-nightly-build/templates/testsuite-config b/tools/ansible/roles/tbb-nightly-build/templates/testsuite-config index b537f56..c07c52c 100644 --- a/tools/ansible/roles/tbb-nightly-build/templates/testsuite-config +++ b/tools/ansible/roles/tbb-nightly-build/templates/testsuite-config @@ -23,5 +23,10 @@ my %res = ( name => $name, args => [ $testsuite ], tags => [ 'nightly' ], + 'reports-url' => '{{ nightly_build_url }}/reports/', + 'email-subject' => '[build result: [% success ? "ok" : "failed" %]] [% options.name %]', + {% if nightly_build_email_to is defined %}'email-report' => 1,{% endif %} + {% if nightly_build_email_to is defined %}'email-to' => {{ nightly_build_email_to }}{% endif %} + {% if nightly_build_email_from is defined %}'email-from' => {{ nightly_build_email_from }}{% endif %} ); %res;

1 0

[tor-browser-build/master] Bug 25817: add ansible roles for tbb-nightly setup
by gk＠torproject.org 08 May '18

08 May '18

commit a2f565643d4c34a49712c37e3931dd6f80da7ba1 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 16 19:30:02 2018 +0200 Bug 25817: add ansible roles for tbb-nightly setup --- README | 43 ++------ tools/ansible/Makefile | 3 + tools/ansible/README | 6 ++ tools/ansible/boklm-tbb-nightly-build.yml | 7 ++ .../boklm-tbb-nightly/tbb-nightly-build.yml | 3 + tools/ansible/inventory | 4 + .../roles/tbb-nightly-build/defaults/main.yml | 11 ++ .../roles/tbb-nightly-build/handlers/main.yml | 5 + .../ansible/roles/tbb-nightly-build/tasks/main.yml | 84 +++++++++++++++ .../roles/tbb-nightly-build/templates/nginx.conf | 16 +++ .../tbb-nightly-build/templates/rbm.local.conf | 116 +++++++++++++++++++++ .../tbb-nightly-build/templates/start-tbb-nightly | 5 + .../tbb-nightly-build/templates/testsuite-config | 27 +++++ .../tbb-nightly-build/templates/www-index.html | 10 ++ 14 files changed, 306 insertions(+), 34 deletions(-) diff --git a/README b/README index d498c05..a20b659 100644 --- a/README +++ b/README @@ -138,43 +138,18 @@ Automated builds using tbb-testsuite ------------------------------------ The Tor Browser testsuite scripts can also be used to do nightly builds -and publish the build logs. +and publish the build logs. The recommended way to do that is to use +the ansible roles from the tools/ansible directory. See next section +for details. -If you want to do that, start by cloning the git repository: - $ git clone https://git.torproject.org/boklm/tor-browser-bundle-testsuite.git +Using ansible to set up a nightly build machine +----------------------------------------------- -Install some dependencies: - - # apt-get install -y libdata-dump-perl libfile-slurp-perl \ - libio-captureoutput-perl perlmagick libjson-perl \ - libwww-perl liblwp-protocol-https-perl libtemplate-perl \ - libyaml-syck-perl libdatetime-perl \ - libemail-sender-perl libemail-simple-perl libfile-type-perl \ - libipc-run-perl libxml-libxml-perl - -Copy the config/tor-browser_build-boklm file and edit it: - - $ cd tor-browser-bundle-testsuite - $ cp config/tor-browser_build-boklm config/tor-browser_build-$user - $ vim config/tor-browser_build-$user - -Change the publish_dir and publish_url options. The publish_dir option is -the local directory where the builds will be stored. The publish_url -option is the public URL where the builds will be available. - -Copy the tools/tor-browser-builds-boklm file and edit it to change the ---config= option: - - $ cp tools/tor-browser-builds-boklm tools/tor-browser-builds-$user - $ vim tools/tor-browser-builds-$user - -You can now run ./tools/tor-browser-builds-$user to start the build, and -add it to your crontab. - -The html build reports will be available in the reports/ directory, and -the build files in the tor-browser-builds/ directory (unless you changed -the publish_dir option). +The directory tools/ansible contains some ansible roles to set up a +nightly build machine. You can look at the playbook defined in +boklm-tbb-nightly-build.yml and variables in group_vars/boklm-tbb-nightly/ +for an example of how it can be used. Signing builds diff --git a/tools/ansible/Makefile b/tools/ansible/Makefile index 608f932..72deb5b 100644 --- a/tools/ansible/Makefile +++ b/tools/ansible/Makefile @@ -3,3 +3,6 @@ ansible-tbb-build: fpcentral: ANSIBLE_CONFIG='$((a)D)/ansible-fpcentral.cfg' ansible-playbook -i inventory --ask-become-pass fpcentral.yml + +boklm-tbb-nightly-build: + ansible-playbook -i inventory boklm-tbb-nightly-build.yml diff --git a/tools/ansible/README b/tools/ansible/README index 6b2e6a4..dc69ad7 100644 --- a/tools/ansible/README +++ b/tools/ansible/README @@ -16,3 +16,9 @@ fpcentral: you need to be in the fpcentral tpo ldap group. Your ldap password will be asked, to sudo to the fpcentral user. +boklm-tbb-nightly-build: + This target is used by boklm to deploy a nightly build machine. If + anybody else wants to set up their own nightly builds, it is possible to + do it by adding a new host to the inventory file and making copies of + group_vars/boklm-tbb-nightly/ and boklm-tbb-nightly-build.yml. + diff --git a/tools/ansible/boklm-tbb-nightly-build.yml b/tools/ansible/boklm-tbb-nightly-build.yml new file mode 100644 index 0000000..cc37e23 --- /dev/null +++ b/tools/ansible/boklm-tbb-nightly-build.yml @@ -0,0 +1,7 @@ +--- + +- hosts: boklm-tbb-nightly-build + roles: + - role: tbb-builder + - role: tbb-nightly-build + - role: unattended-upgrades diff --git a/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml b/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml new file mode 100644 index 0000000..ebaadfe --- /dev/null +++ b/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml @@ -0,0 +1,3 @@ +--- +nightly_build_hostname: f4amtbsowhix7rrf.onion +nightly_build_url: 'http://{{ nightly_build_hostname }}' diff --git a/tools/ansible/inventory b/tools/ansible/inventory index 32a5805..fc25842 100644 --- a/tools/ansible/inventory +++ b/tools/ansible/inventory @@ -1,8 +1,12 @@ build-sunet-a ansible_ssh_user=root ansible_ssh_host=build-sunet-a.torproject.net fpcentral ansible_become=True ansible_become_method=sudo ansible_become_user=fpcentral ansible_ssh_host=forrestii.torproject.org allow_world_readable_tmpfiles=True +boklm-tbb-nightly-build ansible_ssh_user=root ansible_become_method=su [tbb-build] build-sunet-a [fpcentral] fpcentral + +[boklm-tbb-nightly] +boklm-tbb-nightly-build diff --git a/tools/ansible/roles/tbb-nightly-build/defaults/main.yml b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml new file mode 100644 index 0000000..d84a161 --- /dev/null +++ b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml @@ -0,0 +1,11 @@ +--- +nightly_build_user: tbb-nightly +nightly_build_cron_hour: 2 +nightly_build_cron_minute: 20 +nightly_build_keep_builds: 2 +testsuite_dir: "/home/{{ nightly_build_user }}/tbb-testsuite" +testsuite_git_url: https://git.torproject.org/boklm/tor-browser-bundle-testsuite.git +testsuite_git_commit: 348ad855711382089c4fbf1badfec58e31a6c148 +nightly_build_wwwdir: "/home/{{ nightly_build_user }}/www" +nightly_build_nginx_enable: true +nightly_build_nginx_listen: 127.0.0.1:80 diff --git a/tools/ansible/roles/tbb-nightly-build/handlers/main.yml b/tools/ansible/roles/tbb-nightly-build/handlers/main.yml new file mode 100644 index 0000000..3350d73 --- /dev/null +++ b/tools/ansible/roles/tbb-nightly-build/handlers/main.yml @@ -0,0 +1,5 @@ +--- +- name: restart nginx + service: + name: nginx + state: restarted diff --git a/tools/ansible/roles/tbb-nightly-build/tasks/main.yml b/tools/ansible/roles/tbb-nightly-build/tasks/main.yml new file mode 100644 index 0000000..64d31a9 --- /dev/null +++ b/tools/ansible/roles/tbb-nightly-build/tasks/main.yml @@ -0,0 +1,84 @@ +--- +- name: create tbb-nightly user + user: + name: "{{ nightly_build_user }}" + comment: "Tor Browser Nightly Builds" + groups: tbb-build + createhome: yes + home: "/home/{{ nightly_build_user }}" + +- name: clone tor browser testsuite + become: yes + become_user: "{{ nightly_build_user }}" + git: + repo: "{{ testsuite_git_url }}" + dest: "{{ testsuite_dir }}" + version: "{{ testsuite_git_commit }}" + +- name: install testsuite dependencies + command: "{{ testsuite_dir }}/install-deps" + +- name: add testsuite config + template: + src: testsuite-config + dest: "{{ testsuite_dir }}/config/tbb-nightly" + mode: 0644 + owner: "{{ nightly_build_user }}" + +- name: create rbm-config directory + file: + path: '{{ testsuite_dir }}/rbm-config/' + state: directory + owner: '{{ nightly_build_user }}' + mode: 0755 + +- name: add rbm config + template: + src: rbm.local.conf + dest: "{{ testsuite_dir }}/rbm-config/tbb-nightly.rbm.local.conf" + mode: 0644 + owner: "{{ nightly_build_user }}" + +- name: add start-tbb-nightly script + template: + src: start-tbb-nightly + dest: "/home/{{ nightly_build_user }}/start-tbb-nightly" + mode: 0755 + owner: "{{ nightly_build_user }}" + +- name: add cron to start nighly build + cron: + name: tbb-nightly-build + user: "{{ nightly_build_user }}" + hour: "{{ nightly_build_cron_hour }}" + minute: "{{ nightly_build_cron_minute }}" + job: "/home/{{ nightly_build_user }}/start-tbb-nightly" + +- name: create wwwdir + file: + path: '{{ nightly_build_wwwdir }}' + state: directory + owner: '{{ nightly_build_user }}' + mode: 0755 + +- name: add index page + template: + src: www-index.html + dest: "{{ nightly_build_wwwdir }}/index.html" + mode: 0644 + owner: "{{ nightly_build_user }}" + +- name: install nginx + apt: + name: nginx + state: present + when: nightly_build_nginx_enable + +- name: add nginx config + template: + src: nginx.conf + dest: /etc/nginx/sites-enabled/tbb-nightly-build + mode: 0644 + notify: + - restart nginx + when: nightly_build_nginx_enable diff --git a/tools/ansible/roles/tbb-nightly-build/templates/nginx.conf b/tools/ansible/roles/tbb-nightly-build/templates/nginx.conf new file mode 100644 index 0000000..9d44bec --- /dev/null +++ b/tools/ansible/roles/tbb-nightly-build/templates/nginx.conf @@ -0,0 +1,16 @@ +server { + listen {{ nightly_build_nginx_listen }}; + server_name {{ nightly_build_hostname }}; + root {{ nightly_build_wwwdir }}; + index index.html; + location / { + try_files $uri $uri/ =404; + } + location /reports { + alias {{ testsuite_dir }}/reports; + } + location /tor-browser-builds { + alias {{ testsuite_dir }}/tor-browser-builds; + autoindex on; + } +} diff --git a/tools/ansible/roles/tbb-nightly-build/templates/rbm.local.conf b/tools/ansible/roles/tbb-nightly-build/templates/rbm.local.conf new file mode 100644 index 0000000..fcd6b34 --- /dev/null +++ b/tools/ansible/roles/tbb-nightly-build/templates/rbm.local.conf @@ -0,0 +1,116 @@ +--- +### This file is used to override options from rbm.conf to adapt them +### to your local setup. +### +### Copy this file as rbm.local.conf to enable it, and uncomment the +### options you want to modify. + + +### The tmp_dir option defines where temporary files are stored. The +### builds are made from this directory, so using a directory on a fast +### disk can improve build time. By default we are using a tmp directory +### under the tor-browser-build directory. +#tmp_dir: /tmp + +### The debug option defines whether a debugging shell should be opened +### automatically in the build directory/container in case of build +### failure. If you are doing automated builds, you might want to disable +### this. +#debug: 0 + +### The build_log option defines in which file the build logs of each +### component are stored. If you set it to '-' the logs are output on +### stdout and stderr. +#build_log: '-' + +### By default, the logs from previous builds are kept in the log files. +### If you set build_log_append to 0, then previous logs are cleaned +### when starting a new build. +#build_log_append: 0 + +buildconf: + buildconf: 1 + + ### The buildconf/num_procs option can be used to select the number of + ### build processes to run simultaneously. You can also use the + ### RBM_NUM_PROCS environment variable. The default is 4. + #num_procs: 8 + + ### The buildconf/git_signtag_opt option is useful when you tag a release. + ### It is used to set the 'git tag' argument to select the keyid for + ### signing the tag. + #git_signtag_opt: '-u keyid' + +var: + local_conf: 1 + + ### The var/sign_build option defines if you want to sign the + ### sha256sums-unsigned-build.txt file with gpg. + #sign_build: 1 + + ### The var/sign_build_gpg_opts option can be used to define some gpg + ### options to select the key to use to sign the sha256sums-unsigned-build.txt + ### file. + #sign_build_gpg_opts: '--local-user XXXXXXXX' + + ### The clean configuration is used by the cleaning script to find the + ### branches and build targets you are using, to compute the list of + ### files that should be kept. + ### + ### If you only do alpha builds for all platforms, you can use the + ### following configuration: + clean: + HEAD: + - project: release + target: + - alpha + - torbrowser-all + - project: release + target: + - nightly + - torbrowser-all + # + ### If you are doing 'release' builds in the maint-7.0 branch and + ### 'alpha' builds in the master branch, you can use the following + ### configuration: + #clean: + # master: + # - project: release + # target: + # - alpha + # - torbrowser-all + # maint-7.0: + # - project: release + # target: + # - release + # - torbrowser-all + +targets: + + ### testbuild is based on alpha by default. Uncomment this if you want it + ### to be based on nightly. + #torbrowser-testbuild: + # - testbuild + # - nightly + + testbuild: + var: + testbuild: 1 + + ### Uncomment this if you want to create mar files in your test build. + #build_mar: 1 + + nightly: + + ### By default 'fetch' is set to 1 for nightly builds, meaning that new + ### commits will be fetched automatically during each build. You can + ### disable this during development if you want to do rebuilds to test + ### a specific change, but don't want rebuilds caused by unrelated + ### changes, or if you want to decide at which point new commits are + ### fetched. When 'fetch' is set to 'if_needed', new commits will only + ### be fetched if the selected commit (or branch, or tag) is not present, + ### which means that existing branches won't be updated. In that case + ### you can fetch new commits by running 'make fetch'. + fetch: 'if_needed' + +# vim: filetype=yaml sw=2 diff --git a/tools/ansible/roles/tbb-nightly-build/templates/start-tbb-nightly b/tools/ansible/roles/tbb-nightly-build/templates/start-tbb-nightly new file mode 100644 index 0000000..3c1847d --- /dev/null +++ b/tools/ansible/roles/tbb-nightly-build/templates/start-tbb-nightly @@ -0,0 +1,5 @@ +#!/bin/sh +cd {{ testsuite_dir }} +export RBM_NO_DEBUG=1 +./tbb-testsuite --config=tbb-nightly "$@" +./tools/prune-old-builds/prune-old-builds --prefix '' --days {{ nightly_build_keep_builds }} ./tor-browser-builds diff --git a/tools/ansible/roles/tbb-nightly-build/templates/testsuite-config b/tools/ansible/roles/tbb-nightly-build/templates/testsuite-config new file mode 100644 index 0000000..b537f56 --- /dev/null +++ b/tools/ansible/roles/tbb-nightly-build/templates/testsuite-config @@ -0,0 +1,27 @@ +# vim: filetype=perl expandtab +use strict; +use FindBin; +use DateTime; +use TBBTestSuite::TestSuite::TorBrowserBuild; + +my $date = DateTime->now->ymd; +my $name = "tor-browser-$date"; + +if (-d "$options->{'reports-dir'}/r/$name") { + print "Doing nothing: $name already done\n"; + return ( args => [] ); +} + +my $testsuite = TBBTestSuite::TestSuite::TorBrowserBuild->new({ + publish_dir => "$FindBin::Bin/tor-browser-builds/$date", + publish_url => "{{ nightly_build_url }}/tor-browser-builds/$date", + rbm_local_conf => "$FindBin::Bin/rbm-config/tbb-nightly.rbm.local.conf", + make_clean => 1, + }); + +my %res = ( + name => $name, + args => [ $testsuite ], + tags => [ 'nightly' ], +); +%res; diff --git a/tools/ansible/roles/tbb-nightly-build/templates/www-index.html b/tools/ansible/roles/tbb-nightly-build/templates/www-index.html new file mode 100644 index 0000000..05050d8 --- /dev/null +++ b/tools/ansible/roles/tbb-nightly-build/templates/www-index.html @@ -0,0 +1,10 @@ +<html> +<head> + <title>Tor Browser Nightly Builds</title> +</head> +<body> + <h1>Tor Browser Nightly Builds</title> + <a href="reports/"><h3>Build Reports</h3></a> + <a href="tor-browser-builds/"><h3>Build files</h3></a> +</body> +</html>

1 0

[tor-browser-build/maint-7.5] Bug 20892: use sha256sums-signed-build.txt in download_missing_versions
by gk＠torproject.org 07 May '18

07 May '18

commit da514cdf49e89fb5efbb969cfd74dd561d50f54e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Feb 2 16:10:34 2018 +0100 Bug 20892: use sha256sums-signed-build.txt in download_missing_versions This fixes the download of the osx64 mar files. Previously we were unsigning the downloaded mar files and checking them with sha256sums-unsigned-build.txt. The signed osx64 mar files include files that are code-signed, so unsigning the mar file is not enough to get a mar file matching sha256sums-unsigned-build.txt. --- tools/update-responses/update_responses | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index b68e46a..658f451 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -526,22 +526,22 @@ sub download_version { my $destdir = "$releases_dir/$version"; my $urldir = "$config->{download}{archive_url}/$version"; print "Downloading version $version\n"; - foreach my $file (qw(sha256sums-unsigned-build.txt sha256sums-unsigned-build.txt.asc)) { + foreach my $file (qw(sha256sums-signed-build.txt sha256sums-signed-build.txt.asc)) { if (getstore("$urldir/$file", "$tmpdir/$file") != 200) { exit_error "Error downloading $urldir/$file"; } } if (system('gpg', '--no-default-keyring', '--keyring', "$FindBin::Bin/$config->{download}{gpg_keyring}", '--verify', - "$tmpdir/sha256sums-unsigned-build.txt.asc", - "$tmpdir/sha256sums-unsigned-build.txt")) { + "$tmpdir/sha256sums-signed-build.txt.asc", + "$tmpdir/sha256sums-signed-build.txt")) { exit_error "Error checking gpg signature for version $version"; } mkdir $destdir; - move "$tmpdir/sha256sums-unsigned-build.txt.asc", "$destdir/sha256sums-unsigned-build.txt.asc"; - move "$tmpdir/sha256sums-unsigned-build.txt", "$destdir/sha256sums-unsigned-build.txt"; + move "$tmpdir/sha256sums-signed-build.txt.asc", "$destdir/sha256sums-signed-build.txt.asc"; + move "$tmpdir/sha256sums-signed-build.txt", "$destdir/sha256sums-signed-build.txt"; my %sums = map { chomp; reverse split ' ', $_ } - read_file "$destdir/sha256sums-unsigned-build.txt"; + read_file "$destdir/sha256sums-signed-build.txt"; my $martools = 'mar-tools-' . osname . '.zip'; exit_error "Error downloading $urldir/$martools\n" @@ -557,19 +557,13 @@ sub download_version { unless $sums{$martools} eq sha256_hex(read_file("$tmpdir/$martools")); move "$tmpdir/$martools", "$destdir/$martools"; move "$tmpdir/$martools.asc", "$destdir/$martools.asc"; - extract_martools($config, $version); foreach my $file (sort grep { $_ =~ m/\.mar$/ } keys %sums) { print "Downloading $file\n"; exit_error "Error downloading $urldir/$file\n" unless getstore("$urldir/$file", "$tmpdir/$file") == 200; - if ($sums{$file} ne sha256_hex(read_file("$tmpdir/$file"))) { - exit_error "Error unsigning $file" - if system('signmar', '-r', "$tmpdir/$file", "$tmpdir/$file.u"); - exit_error "Wrong checksum for $file" - unless $sums{$file} eq sha256_hex(read_file("$tmpdir/$file.u")); - move "$tmpdir/$file.u", "$tmpdir/$file"; - } + exit_error "Wrong checksum for $file" + unless $sums{$file} eq sha256_hex(read_file("$tmpdir/$file")); move "$tmpdir/$file", "$destdir/$file"; } }

1 0

[tor-browser-build/master] Release preparations for 8.0a7
by gk＠torproject.org 03 May '18

03 May '18

commit 88f2fc7c4731c73337e0e8f9fb20c87f4768b719 Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 3 08:00:17 2018 +0000 Release preparations for 8.0a7 Changelog update and versions bump --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 4 ++-- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 16 ++++++++++++++++ projects/tor-launcher/config | 2 +- rbm.conf | 4 ++-- 5 files changed, 22 insertions(+), 6 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 04cd7dd..4e42939 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build2 + ff_build: build1 ff_arch: linux-i686 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' diff --git a/projects/firefox/config b/projects/firefox/config index ee79a15..4458d48 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,13 +1,13 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg var: - firefox_platform_version: 52.7.3 + firefox_platform_version: 52.8.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 8.0 torbrowser_update_channel: alpha diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index b9d3941..089cbad 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,19 @@ +Tor Browser 8.0a7 -- May 9 2018 + * All platforms + * Update Firefox to 52.8.0esr + * Update Tor Launcher to 0.2.15.2 + * Bug 25807: Change front domain to unbreak Moat + * Translations update + * Bug 25973: Backport off-by-one fix (bug 1352073) + * Bug 25938: Backport fix for cross-origin header leak (bug 1334776) + * Bug 25458: Fix broken UI customization + * Bug 25898: Make Youtube videos play automatically again + * Bug 25980: Improve backport of bug 1448771 (fixes broken Orfox build) + * OS X + * Bug 26010: Change Snowflake rendezvous to use the Azure domain front + * Linux + * Bug 26010: Change Snowflake rendezvous to use the Azure domain front + Tor Browser 8.0a6 -- April 19 2018 * All platforms * Update Tor to 0.3.3.5-rc diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 1d67b05..e72ce10 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.15.1 +version: 0.2.15.2 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index 87ab109..bb53bcb 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,10 +15,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '8.0a6' + torbrowser_version: '8.0a7' torbrowser_build: 'build1' torbrowser_incremental_from: - - 8.0a5 + - 8.0a6 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-launcher/master] Release preparations for 0.2.15.2
by gk＠torproject.org 03 May '18

03 May '18

commit 462e972213a2aedeee238361c47931dfa187fd7a Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 3 07:25:15 2018 +0000 Release preparations for 0.2.15.2 --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index d0debd0..2686aee 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.15.1</em:version> + <em:version>0.2.15.2</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL>

1 0

[tor-launcher/master] Translations update
by gk＠torproject.org 03 May '18

03 May '18

commit 7df0806652ae0cba65f9927575fce900f80b5d03 Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 3 07:23:24 2018 +0000 Translations update --- src/chrome/locale/ar/torlauncher.properties | 18 +++++++++--------- src/chrome/locale/bn-BD/network-settings.dtd | 8 ++++---- src/chrome/locale/da/network-settings.dtd | 8 ++++---- src/chrome/locale/da/torlauncher.properties | 24 ++++++++++++------------ src/chrome/locale/de/network-settings.dtd | 2 +- src/chrome/locale/de/torlauncher.properties | 6 +++--- src/chrome/locale/es/torlauncher.properties | 4 ++-- src/chrome/locale/fr/network-settings.dtd | 2 +- src/chrome/locale/fr/torlauncher.properties | 4 ++-- src/chrome/locale/ga/network-settings.dtd | 10 +++++----- src/chrome/locale/ga/torlauncher.properties | 24 ++++++++++++------------ src/chrome/locale/he/network-settings.dtd | 6 +++--- src/chrome/locale/he/torlauncher.properties | 24 ++++++++++++------------ src/chrome/locale/hu/network-settings.dtd | 2 +- src/chrome/locale/is/network-settings.dtd | 12 ++++++------ src/chrome/locale/is/torlauncher.properties | 24 ++++++++++++------------ src/chrome/locale/it/network-settings.dtd | 6 +++--- src/chrome/locale/it/torlauncher.properties | 24 ++++++++++++------------ src/chrome/locale/ja/network-settings.dtd | 6 +++--- src/chrome/locale/ja/torlauncher.properties | 24 ++++++++++++------------ src/chrome/locale/ka/torlauncher.properties | 2 +- src/chrome/locale/nb/torlauncher.properties | 6 +++--- src/chrome/locale/nl/network-settings.dtd | 6 +++--- src/chrome/locale/nl/torlauncher.properties | 10 +++++----- src/chrome/locale/pt-BR/torlauncher.properties | 14 +++++++------- src/chrome/locale/pt/network-settings.dtd | 10 +++++----- src/chrome/locale/ro/torlauncher.properties | 4 ++-- src/chrome/locale/ru/torlauncher.properties | 24 ++++++++++++------------ src/chrome/locale/sk-SK/network-settings.dtd | 8 ++++---- src/chrome/locale/sv/network-settings.dtd | 6 +++--- src/chrome/locale/sv/torlauncher.properties | 24 ++++++++++++------------ src/chrome/locale/te/torlauncher.properties | 2 +- src/chrome/locale/ti/network-settings.dtd | 4 ++-- src/chrome/locale/ti/torlauncher.properties | 2 +- src/chrome/locale/tr/network-settings.dtd | 4 ++-- src/chrome/locale/tr/torlauncher.properties | 22 +++++++++++----------- 36 files changed, 193 insertions(+), 193 deletions(-) diff --git a/src/chrome/locale/ar/torlauncher.properties b/src/chrome/locale/ar/torlauncher.properties index 8dbc19a..a0190e7 100644 --- a/src/chrome/locale/ar/torlauncher.properties +++ b/src/chrome/locale/ar/torlauncher.properties @@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=من الضروري تحديد كل من ع torlauncher.error_proxy_type_missing=من الضروري تحديد نوع البروكسي. torlauncher.error_bridges_missing=من الضروري تحديد جسر واحد أو أكثر. torlauncher.error_default_bridges_type_missing=يجب عليك تحديد نوع الجسور المقدمة مع المتصفح. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. +torlauncher.error_bridgedb_bridges_missing=يُرجى طلب جسر. torlauncher.error_bridge_bad_default_type=هذا النوع غير متوفر بداخل الجسور المقدمة مع المتصفح. الرجاء تعديل إعداداتك. torlauncher.bridge_suffix.meek-amazon=(شغال في الصين) torlauncher.bridge_suffix.meek-azure=(شغال في الصين) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. +torlauncher.request_a_bridge=عملية طلب جسرٍ جارية … +torlauncher.request_a_new_bridge=عملية طلب جسرٍ جديدة جارية … +torlauncher.contacting_bridgedb=عملية الإتصال بقاعدة الجسور BridgeDB جارية. يُرجى الإنتظار. torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. +torlauncher.bad_captcha_solution=الحل ليس سليمًا بعد. يُرجى إعادة المحاولة. torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.no_bridges_available=المعذرة. لا توجد هناك جسور متوفرة حاليا. torlauncher.connect=اتصل torlauncher.restart_tor=إعادة تشغيل تور @@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=لا طريق للمضيف torlauncher.bootstrapWarning.ioerror=خطأ في القراءة/الكتابة torlauncher.bootstrapWarning.pt_missing=الناقل المضاف مفقود -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=لقد قُطع الإتصال مع الخادوم. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=فشِل الإتصال بالخادوم. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=فشِل الإتصال بوكيل البروكسي. diff --git a/src/chrome/locale/bn-BD/network-settings.dtd b/src/chrome/locale/bn-BD/network-settings.dtd index 51469da..4129ee0 100644 --- a/src/chrome/locale/bn-BD/network-settings.dtd +++ b/src/chrome/locale/bn-BD/network-settings.dtd @@ -41,10 +41,10 @@ <!ENTITY torsettings.useBridges.checkbox "টর আমার দেশে সেন্সর করা হয়"> <!ENTITY torsettings.useBridges.default "একটি অন্তর্নির্মিত ব্রিজ নির্বাচন করুন"> <!ENTITY torsettings.useBridges.default.placeholder "একটি ব্রিজ নির্বাচন করুন"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> -<!ENTITY torsettings.useBridges.captchaSubmit "Submit"> +<!ENTITY torsettings.useBridges.bridgeDB "torproject.org থেকে একটি সেতুর জন্য অনুরোধ করুন"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "ইমেজ থেকে অক্ষর লিখুন"> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "একটি নতুন চ্যালেঞ্জ পান"> +<!ENTITY torsettings.useBridges.captchaSubmit "জমা করা"> <!ENTITY torsettings.useBridges.custom "একটি ব্রিজ প্রদান আমি জানি"> <!ENTITY torsettings.useBridges.label "বিশ্বস্ত উৎস থেকে ব্রিজ তথ্য প্রবেশ করান।"> <!ENTITY torsettings.useBridges.placeholder "টাইপ ঠিকানা: পোর্ট (প্রতি লাইন প্রতি)"> diff --git a/src/chrome/locale/da/network-settings.dtd b/src/chrome/locale/da/network-settings.dtd index d196708..77ae01e 100644 --- a/src/chrome/locale/da/network-settings.dtd +++ b/src/chrome/locale/da/network-settings.dtd @@ -41,10 +41,10 @@ <!ENTITY torsettings.useBridges.checkbox "Tor er censureret i mit land"> <!ENTITY torsettings.useBridges.default "Vælg en indbygget bro"> <!ENTITY torsettings.useBridges.default.placeholder "vælg en bro"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> -<!ENTITY torsettings.useBridges.captchaSubmit "Submit"> +<!ENTITY torsettings.useBridges.bridgeDB "Anmod om en bro fra torproject.org"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Indtast tegnene fra billedet"> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Få en ny udfordring"> +<!ENTITY torsettings.useBridges.captchaSubmit "Indsend"> <!ENTITY torsettings.useBridges.custom "Formidl en bro jeg kender"> <!ENTITY torsettings.useBridges.label "Indtast broinformation fra en betroet kilde."> <!ENTITY torsettings.useBridges.placeholder "skriv adresse:port (én pr. linje)"> diff --git a/src/chrome/locale/da/torlauncher.properties b/src/chrome/locale/da/torlauncher.properties index 8900731..daa4651 100644 --- a/src/chrome/locale/da/torlauncher.properties +++ b/src/chrome/locale/da/torlauncher.properties @@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=Du skal angive både IP adresse eller vært torlauncher.error_proxy_type_missing=Du skal vælge proxytypen: torlauncher.error_bridges_missing=Du skal angive en eller flere broer. torlauncher.error_default_bridges_type_missing=Du skal vælge en transporttype for de tildelte broer. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. +torlauncher.error_bridgedb_bridges_missing=Anmod venligst om en bro. torlauncher.error_bridge_bad_default_type=Ingen tildelte broer med transporttypen %S er tilgængelige. Justér venligst dine indstillinger. torlauncher.bridge_suffix.meek-amazon=(virker i kina) torlauncher.bridge_suffix.meek-azure=(virker i kina) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S -torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.request_a_bridge=Anmod om en bro… +torlauncher.request_a_new_bridge=Anmod om en ny bro… +torlauncher.contacting_bridgedb=Kontakter BridgeDB. Vent venligst. +torlauncher.captcha_prompt=Løs CAPTCHA'en for at anmode om en bro. +torlauncher.bad_captcha_solution=Løsningen er ikke korrekt. Prøv venligst igen. +torlauncher.unable_to_get_bridge=Kan ikke hente en bro fra BridgeDB.\n\n%S +torlauncher.no_meek=Browseren er ikke konfigureret til meek, som behøves for at hente broer. +torlauncher.no_bridges_available=Der er ingen broer tilgængelige på nuværende tidspunkt. Beklager. torlauncher.connect=Tilslut torlauncher.restart_tor=Genstart Tor @@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=ingen rute til vært torlauncher.bootstrapWarning.ioerror=læse/skrive fejl torlauncher.bootstrapWarning.pt_missing=mangler udskiftelig transport -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=Mistede forbindelsen til serveren. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Kunne ikke oprette forbindelse til serveren. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Kunne ikke oprette forbindelse til proxyen. diff --git a/src/chrome/locale/de/network-settings.dtd b/src/chrome/locale/de/network-settings.dtd index 760f7b6..9cefcf3 100644 --- a/src/chrome/locale/de/network-settings.dtd +++ b/src/chrome/locale/de/network-settings.dtd @@ -42,7 +42,7 @@ <!ENTITY torsettings.useBridges.default "Bereitgestellte Brücke auswählen"> <!ENTITY torsettings.useBridges.default.placeholder "Brücke auswählen"> <!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Geben Sie das Zeichen aus dem Bild ein"> <!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> <!ENTITY torsettings.useBridges.captchaSubmit "Übermitteln"> <!ENTITY torsettings.useBridges.custom "Biete mir eine Brücke an, die ich kenne"> diff --git a/src/chrome/locale/de/torlauncher.properties b/src/chrome/locale/de/torlauncher.properties index e5a7be7..1aa2bf8 100644 --- a/src/chrome/locale/de/torlauncher.properties +++ b/src/chrome/locale/de/torlauncher.properties @@ -36,7 +36,7 @@ torlauncher.request_a_bridge=Request a Bridge… torlauncher.request_a_new_bridge=Request a New Bridge… torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. +torlauncher.bad_captcha_solution=Die Lösung ist nicht korrekt. Bitte versuchen Sie es erneut. torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. torlauncher.no_bridges_available=No bridges are available at this time. Sorry. @@ -74,5 +74,5 @@ torlauncher.bootstrapWarning.ioerror=Lese-/Schreibfehler torlauncher.bootstrapWarning.pt_missing=Steckbarer Transport fehlt torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Konnte nicht mit dem Server verbinden. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Konnte nicht mit dem Proxy verbinden. diff --git a/src/chrome/locale/es/torlauncher.properties b/src/chrome/locale/es/torlauncher.properties index 8fc6834..365318a 100644 --- a/src/chrome/locale/es/torlauncher.properties +++ b/src/chrome/locale/es/torlauncher.properties @@ -5,7 +5,7 @@ torlauncher.error_title=Arranque de Tor torlauncher.tor_exited_during_startup=Tor se cerró durante el arranque. Esto se podría deber a un error en tu fichero torrc, un fallo en Tor o en otro programa de tu sistema, o a hardware defectuoso. Hasta que soluciones el problema subyacente y reinices Tor, el Navegador Tor no se iniciará. torlauncher.tor_exited=Tor se cerró inesperadamente. Esto podría deberse a un fallo con el propio Tor, con otro programa de su sistema, o por hardware defectuoso. Hasta que reinicie Tor, el Navegador Tor no podrá abrir ningún sitio web. Si el problema persiste, por favor envíe una copia de su Registro de Tor (log) al equipo de soporte. -torlauncher.tor_exited2=Al reiniciar Tor no se cerrarán las pestañas de su navegador. +torlauncher.tor_exited2=Al reiniciar Tor no se cerrarán las pestañas de tu navegador. torlauncher.tor_controlconn_failed=No se pudo conectar al puerto de control de Tor torlauncher.tor_failed_to_start=Tor no pudo iniciarse. torlauncher.tor_control_failed=Fallo al tomar control de Tor. @@ -47,7 +47,7 @@ torlauncher.quit=Salir torlauncher.quit_win=Salir torlauncher.done=Listo -torlauncher.forAssistance=Para obtener ayuda, contacte con %S +torlauncher.forAssistance=Para obtener ayuda, contacta con %S torlauncher.forAssistance2=Para asistencia, visita %S torlauncher.copiedNLogMessages=Copia completada. %S mensajes de registro ('log') de Tor están listos para ser pegados en un editor de texto o en un mensaje de correo electrónico. diff --git a/src/chrome/locale/fr/network-settings.dtd b/src/chrome/locale/fr/network-settings.dtd index de2afe9..c93e71f 100644 --- a/src/chrome/locale/fr/network-settings.dtd +++ b/src/chrome/locale/fr/network-settings.dtd @@ -4,7 +4,7 @@ <!ENTITY torsettings.wizard.title.connecting "Établissement d’une connexion">  -<!ENTITY torlauncher.localePicker.title "Langue du navigateur Tor"> +<!ENTITY torlauncher.localePicker.title "Langue du Navigateur Tor"> <!ENTITY torlauncher.localePicker.prompt "Veuillez choisir une langue.">  diff --git a/src/chrome/locale/fr/torlauncher.properties b/src/chrome/locale/fr/torlauncher.properties index 804dafa..e3a4b03 100644 --- a/src/chrome/locale/fr/torlauncher.properties +++ b/src/chrome/locale/fr/torlauncher.properties @@ -3,8 +3,8 @@ torlauncher.error_title=Lanceur Tor -torlauncher.tor_exited_during_startup=Tor s’est fermé pendant le démarrage. Cela peut être dû à une erreur dans votre fichier torrc, un bogue dans Tor ou dans un autre programme de votre système, ou encore à un matériel défectueux. Jusqu’à ce que vous corrigiez le problème sous-jacent et redémarriez Tor, le navigateur Tor ne démarrera pas. -torlauncher.tor_exited=Tor s’est fermé de manière imprévue. Cela peut être dû à un bogue dans Tor même, un autre programme dans votre système ou un matériel défectueux. Jusqu’à ce que vous redémarriez Tor, le navigateur Tor ne pourra atteindre aucun site. Si le problème persiste, veuillez envoyer une copie de votre journal de Tor à l’équipe de soutien. +torlauncher.tor_exited_during_startup=Tor s’est fermé pendant le démarrage. Cela peut être dû à une erreur dans votre fichier torrc, un bogue dans Tor ou dans un autre programme de votre système, ou encore à un matériel défectueux. Jusqu’à ce que vous corrigiez le problème sous-jacent et redémarriez Tor, le Navigateur Tor ne démarrera pas. +torlauncher.tor_exited=Tor s’est fermé de manière imprévue. Cela peut être dû à un bogue dans Tor même, un autre programme dans votre système ou un matériel défectueux. Jusqu’à ce que vous redémarriez Tor, le Navigateur Tor ne pourra atteindre aucun site. Si le problème persiste, veuillez envoyer une copie de votre journal de Tor à l’équipe de soutien. torlauncher.tor_exited2=Redémarrer Tor ne fermera pas les onglets de votre navigateur. torlauncher.tor_controlconn_failed=Impossible de se connecter au port de contrôle de Tor. torlauncher.tor_failed_to_start=Tor n’a pas pu démarrer. diff --git a/src/chrome/locale/ga/network-settings.dtd b/src/chrome/locale/ga/network-settings.dtd index f058db5..2e86b28 100644 --- a/src/chrome/locale/ga/network-settings.dtd +++ b/src/chrome/locale/ga/network-settings.dtd @@ -41,15 +41,15 @@ <!ENTITY torsettings.useBridges.checkbox "Déantar cinsireacht ar Tor sa tír seo"> <!ENTITY torsettings.useBridges.default "Roghnaigh droichead ionsuite"> <!ENTITY torsettings.useBridges.default.placeholder "roghnaigh droichead"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> -<!ENTITY torsettings.useBridges.captchaSubmit "Submit"> +<!ENTITY torsettings.useBridges.bridgeDB "Iarr droichead ó torproject.org"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Cuir isteach na carachtair a fheiceann tú sa bpictiúr"> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Faigh dúshlán nua"> +<!ENTITY torsettings.useBridges.captchaSubmit "Seol"> <!ENTITY torsettings.useBridges.custom "Úsáid droichead ar m'eolas"> <!ENTITY torsettings.useBridges.label "Cuir isteach eolas faoi dhroichead ó fhoinse iontaofa."> <!ENTITY torsettings.useBridges.placeholder "clóscríobh seoladh:port (ceann amháin ar gach líne)"> -<!ENTITY torsettings.copyLog "Cóipeáil an Logchomhad Tor go dtí an Ghearrthaisce"> +<!ENTITY torsettings.copyLog "Cóipeáil Logchomhad Tor go dtí an Ghearrthaisce"> <!ENTITY torsettings.proxyHelpTitle "Cabhair le Seachfhreastalaithe"> <!ENTITY torsettings.proxyHelp1 "Úsáidtear seachfhreastalaí áitiúil nuair a cheanglaítear ó líonra i gcomhlacht, i scoil, nó in ollscoil. Mura bhfuil tú cinnte faoin fhreagra ba chóir duit a thabhairt, caith súil ar na socruithe Idirlín i mbrabhsálaí eile, nó ar shocruithe líonra do chórais, le fáil amach an bhfuil seachfhreastalaí de dhíth."> diff --git a/src/chrome/locale/ga/torlauncher.properties b/src/chrome/locale/ga/torlauncher.properties index 9eb336b..27c4568 100644 --- a/src/chrome/locale/ga/torlauncher.properties +++ b/src/chrome/locale/ga/torlauncher.properties @@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=Caithfidh tú seoladh IP nó óstainm agus torlauncher.error_proxy_type_missing=Caithfidh tú cineál an tseachfhreastalaí a roghnú. torlauncher.error_bridges_missing=Caithfidh tú droichead nó droichid a shonrú. torlauncher.error_default_bridges_type_missing=Caithfidh tú cineál iompair a roghnú do na droichid ionsuite. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. +torlauncher.error_bridgedb_bridges_missing=Iarr droichead. torlauncher.error_bridge_bad_default_type=Níl aon droichead a úsáideann cineál iompair %S ar fáil. Athraigh do chuid socruithe. torlauncher.bridge_suffix.meek-amazon=(oibríonn sé sa tSín) torlauncher.bridge_suffix.meek-azure=(oibríonn sé sa tSín) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S -torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.request_a_bridge=Iarr Droichead... +torlauncher.request_a_new_bridge=Iarr Droichead Nua... +torlauncher.contacting_bridgedb=Ag dul i dteagmháil le BridgeDB. Fan nóiméad. +torlauncher.captcha_prompt=Réitigh an CAPTCHA le droichead a iarraidh. +torlauncher.bad_captcha_solution=Níl an freagra sin ceart. Bain triail eile as. +torlauncher.unable_to_get_bridge=Níorbh fhéidir droichead a fháil ó BridgeDB.\n\n%S +torlauncher.no_meek=Níl thacaíonn an brabhsálaí seo le meek, acmhainn a theastaíonn uait chun droichid a fháil. +torlauncher.no_bridges_available=Níl aon droichead ar fáil faoi láthair. Ár leithscéal. torlauncher.connect=Ceangail torlauncher.restart_tor=Atosaigh Tor @@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=níl aon bhealach chuig an óstach torlauncher.bootstrapWarning.ioerror=earráid léite/scríofa torlauncher.bootstrapWarning.pt_missing=córas iompair ionphlugáilte ar iarraidh -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=Briseadh an ceangal leis an bhfreastalaí. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Níorbh fhéidir ceangal leis an bhfreastalaí. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Níorbh fhéidir ceangal a bhunú leis an seachfhreastalaí. diff --git a/src/chrome/locale/he/network-settings.dtd b/src/chrome/locale/he/network-settings.dtd index 02f7139..f11c418 100644 --- a/src/chrome/locale/he/network-settings.dtd +++ b/src/chrome/locale/he/network-settings.dtd @@ -41,9 +41,9 @@ <!ENTITY torsettings.useBridges.checkbox "Tor מצונזר במדינה שלי"> <!ENTITY torsettings.useBridges.default "בחר גשר מובנה"> <!ENTITY torsettings.useBridges.default.placeholder "בחר גשר"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> +<!ENTITY torsettings.useBridges.bridgeDB "בקש גשר מן torproject.org"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "הכנס את התווים מהתמונה"> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "קבל אתגר חדש"> <!ENTITY torsettings.useBridges.captchaSubmit "הגש"> <!ENTITY torsettings.useBridges.custom "סַפֵּק גשר שאני מכיר"> <!ENTITY torsettings.useBridges.label "הכנס מידע גשר ממקור מהימן."> diff --git a/src/chrome/locale/he/torlauncher.properties b/src/chrome/locale/he/torlauncher.properties index cf04e2c..e9b3488 100644 --- a/src/chrome/locale/he/torlauncher.properties +++ b/src/chrome/locale/he/torlauncher.properties @@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=אתה חייב לציין כתובת IP א torlauncher.error_proxy_type_missing=אתה חייב לבחור את סוג ייפוי-הכוח. torlauncher.error_bridges_missing=אתה חייב לציין גשר אחד או יותר. torlauncher.error_default_bridges_type_missing=אתה חייב לבחור סוג תעבורה עבור הגשרים המסופקים. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. +torlauncher.error_bridgedb_bridges_missing=אנא בקש גשר. torlauncher.error_bridge_bad_default_type=אין גשרים מסופקים זמינים שיש להם את סוג התעבורה %S. אנא התאם את הגדרותיך. torlauncher.bridge_suffix.meek-amazon=(עובד בסין) torlauncher.bridge_suffix.meek-azure=(עובד בסין) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S -torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.request_a_bridge=בקש גשר... +torlauncher.request_a_new_bridge=בקש גשר חדש... +torlauncher.contacting_bridgedb=יוצר קשר עם BridgeDB. אנא המתן. +torlauncher.captcha_prompt=פתור את ה־CAPTCHA כדי לבקש גשר. +torlauncher.bad_captcha_solution=הפתרון אינו נכון. אנא נסה שוב. +torlauncher.unable_to_get_bridge=לא היה ניתן להשיג גשר מן BridgeDB.\n\n%S +torlauncher.no_meek=דפדפן זה אינו מוגדר עבור meek, אשר דרוש כדי להשיג גשרים. +torlauncher.no_bridges_available=אין גשרים זמינים הפעם. סליחה. torlauncher.connect=התחבר torlauncher.restart_tor=הפעל מחדש את Tor @@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=אין נתיב למארח torlauncher.bootstrapWarning.ioerror=שגיאה של קריאה/כתיבה torlauncher.bootstrapWarning.pt_missing=תעבורה נתיקה חסרה -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=החיבור אל השרת אבד. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=לא היה ניתן להתחבר אל השרת. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=לא היה ניתן להתחבר אל ייפוי הכוח. diff --git a/src/chrome/locale/hu/network-settings.dtd b/src/chrome/locale/hu/network-settings.dtd index 9ad1d97..d269276 100644 --- a/src/chrome/locale/hu/network-settings.dtd +++ b/src/chrome/locale/hu/network-settings.dtd @@ -42,7 +42,7 @@ <!ENTITY torsettings.useBridges.default "Válasszon ki egy beépített hidat"> <!ENTITY torsettings.useBridges.default.placeholder "Válasszon ki egy hidat"> <!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Adja meg a karaktereket amik a fenti képen láthatóak"> <!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> <!ENTITY torsettings.useBridges.captchaSubmit "Elküld"> <!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> diff --git a/src/chrome/locale/is/network-settings.dtd b/src/chrome/locale/is/network-settings.dtd index 617318a..6e259b9 100644 --- a/src/chrome/locale/is/network-settings.dtd +++ b/src/chrome/locale/is/network-settings.dtd @@ -41,12 +41,12 @@ <!ENTITY torsettings.useBridges.checkbox "Tor er ritskoðað í landinu mínu"> <!ENTITY torsettings.useBridges.default "Veldu innbyggða brú"> <!ENTITY torsettings.useBridges.default.placeholder "veldu brú"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> -<!ENTITY torsettings.useBridges.captchaSubmit "Submit"> -<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> -<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.bridgeDB "Biðja um brú frá torproject.org"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Settu inn stafina úr myndinni"> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Fá nýja gátu"> +<!ENTITY torsettings.useBridges.captchaSubmit "Senda inn"> +<!ENTITY torsettings.useBridges.custom "Gefa brú sem ég þekki"> +<!ENTITY torsettings.useBridges.label "Settu inn upplýsingar um brú frá aðila sem þú treystir."> <!ENTITY torsettings.useBridges.placeholder "settu inn vistfang:gátt (eitt á hverja línu)"> <!ENTITY torsettings.copyLog "Afrita atvikaskrá Tor á klippispjald"> diff --git a/src/chrome/locale/is/torlauncher.properties b/src/chrome/locale/is/torlauncher.properties index c7e04fa..c68bbdc 100644 --- a/src/chrome/locale/is/torlauncher.properties +++ b/src/chrome/locale/is/torlauncher.properties @@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=You must specify both an IP address or host torlauncher.error_proxy_type_missing=Þú verður að velja tegund milliþjóns. torlauncher.error_bridges_missing=Þú verður að tilgreina eina eða fleiri brýr. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. +torlauncher.error_bridgedb_bridges_missing=Biðja um brú. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. torlauncher.bridge_suffix.meek-amazon=(virkar í Kína) torlauncher.bridge_suffix.meek-azure=(virkar í Kína) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S -torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.request_a_bridge=Biðja um brú… +torlauncher.request_a_new_bridge=Biðja um nýja brú… +torlauncher.contacting_bridgedb=Tengist BridgeDB. Bíddu aðeins. +torlauncher.captcha_prompt=Leystu CAPTCHA-þrautina til að biðja um brú. +torlauncher.bad_captcha_solution=Þessi lausn er ekki rétt. Reyndu aftur. +torlauncher.unable_to_get_bridge=Tókst ekki að fá brú frá BridgeDB.\n\n%S +torlauncher.no_meek=Þessi vafri er ekki stilltur til að nota 'meek', sem er nauðsynlegt til að geta beðið um brýr. +torlauncher.no_bridges_available=Engar brýr eru tiltækar í augnablikinu. Því miður. torlauncher.connect=Tengjast torlauncher.restart_tor=Endurræsa Tor @@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=no route to host torlauncher.bootstrapWarning.ioerror=les/skrifvilla torlauncher.bootstrapWarning.pt_missing=vantar 'pluggable transport' tengileiðir -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=Missti tengingu við þjóninn. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Tókst ekki að tengjast þjóninum. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Tókst ekki að tengjast milliþjóninum. diff --git a/src/chrome/locale/it/network-settings.dtd b/src/chrome/locale/it/network-settings.dtd index 94ea8ce..4ad241a 100644 --- a/src/chrome/locale/it/network-settings.dtd +++ b/src/chrome/locale/it/network-settings.dtd @@ -41,9 +41,9 @@ <!ENTITY torsettings.useBridges.checkbox "Tor viene censurato nel mio Paese"> <!ENTITY torsettings.useBridges.default "Seleziona un bridge integrato"> <!ENTITY torsettings.useBridges.default.placeholder "seleziona un bridge"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> +<!ENTITY torsettings.useBridges.bridgeDB "Richiedi un bridge da torproject.org"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Inserisci i caratteri dell'immagine"> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Carica una nuova verifica"> <!ENTITY torsettings.useBridges.captchaSubmit "Invia"> <!ENTITY torsettings.useBridges.custom "Fornisci un bridge che conosco"> <!ENTITY torsettings.useBridges.label "Inserisci le informazioni del bridge da una fonte fidata."> diff --git a/src/chrome/locale/it/torlauncher.properties b/src/chrome/locale/it/torlauncher.properties index c09ad56..7c62bd1 100644 --- a/src/chrome/locale/it/torlauncher.properties +++ b/src/chrome/locale/it/torlauncher.properties @@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=Affinché Tor sia configurato all'utilizzo torlauncher.error_proxy_type_missing=Devi selezionare il tipo di proxy. torlauncher.error_bridges_missing=Devi specificare uno o più ponti. torlauncher.error_default_bridges_type_missing=È necessario selezionare un tipo di trasporto per il bridge preconfigurato. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. +torlauncher.error_bridgedb_bridges_missing=Richiedi un bridge. torlauncher.error_bridge_bad_default_type=Non è disponibile alcun bridge con il tipo di trasporto %S. Modificare le proprie impostazioni. torlauncher.bridge_suffix.meek-amazon=(funziona in Cina) torlauncher.bridge_suffix.meek-azure=(funziona in Cina) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S -torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.request_a_bridge=Richiedi un bridge... +torlauncher.request_a_new_bridge=Richiedi un nuovo bridge... +torlauncher.contacting_bridgedb=Contatto BridgeDB. Attendere, prego. +torlauncher.captcha_prompt=Risolvi il CAPTCHA per richiedere un bridge. +torlauncher.bad_captcha_solution=La soluzione è sbagliata. Riprova. +torlauncher.unable_to_get_bridge=Impossibile ottenere un bridge da BridgeDB.\n\n%S +torlauncher.no_meek=Questo browser non è configurato per meek, necessario per ottenere dei bridge. +torlauncher.no_bridges_available=Nessun bridge disponibile al momento. Spiacenti. torlauncher.connect=Connetti torlauncher.restart_tor=Riavvia Tor @@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=nessun rotta per l'host torlauncher.bootstrapWarning.ioerror=errore di lettura/scrittura torlauncher.bootstrapWarning.pt_missing=pluggable transport mancante -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=Connessione al server persa. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Connessione al server fallita. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Connessione al proxy fallita. diff --git a/src/chrome/locale/ja/network-settings.dtd b/src/chrome/locale/ja/network-settings.dtd index 2e17417..dfcfd48 100644 --- a/src/chrome/locale/ja/network-settings.dtd +++ b/src/chrome/locale/ja/network-settings.dtd @@ -41,9 +41,9 @@ <!ENTITY torsettings.useBridges.checkbox "Tor は私の国では検閲されています"> <!ENTITY torsettings.useBridges.default "内蔵ブリッジを選択する"> <!ENTITY torsettings.useBridges.default.placeholder "ブリッジを選択"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> +<!ENTITY torsettings.useBridges.bridgeDB "torproject.orgからブリッジの要求をする"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "画像から文字を入力してください..."> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "チャレンジを更新する"> <!ENTITY torsettings.useBridges.captchaSubmit "生成"> <!ENTITY torsettings.useBridges.custom "知っているブリッジを使う"> <!ENTITY torsettings.useBridges.label "信頼できる情報源からのブリッジ情報を入力してください。"> diff --git a/src/chrome/locale/ja/torlauncher.properties b/src/chrome/locale/ja/torlauncher.properties index 270ceba..b55a4df 100644 --- a/src/chrome/locale/ja/torlauncher.properties +++ b/src/chrome/locale/ja/torlauncher.properties @@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=インターネットのアクセスにプ torlauncher.error_proxy_type_missing=プロキシの種類を選択する必要があります。 torlauncher.error_bridges_missing=一つ以上のブリッジを記述する必要があります。 torlauncher.error_default_bridges_type_missing=提供されたブリッジ用のトランスポートタイプを選択する必要があります。 -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. +torlauncher.error_bridgedb_bridges_missing=ブリッジをリクエストしてください。 torlauncher.error_bridge_bad_default_type=トランスポートタイプ %S がある提供されたブリッジに利用できるものがありません。設定を調整してください。 torlauncher.bridge_suffix.meek-amazon=（中国で動作） torlauncher.bridge_suffix.meek-azure=（中国で動作） -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S -torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.request_a_bridge=ブリッジをリクエスト。\n +torlauncher.request_a_new_bridge=新たなブリッジをリクエスト。 +torlauncher.contacting_bridgedb=BridgeDBとの接続を確立しています。しばらく待って下さい。 +torlauncher.captcha_prompt= ブリッジをリクエストするにはCAPTCHAを解いて下さい。 +torlauncher.bad_captcha_solution=その解答は正しくありません。再度実行してください。 +torlauncher.unable_to_get_bridge=BridgeDBからブリッジを入手できません。\n\n%S +torlauncher.no_meek= このブラウザはmeekを使用するように設定されていないため、ブリッジを入手できません。 +torlauncher.no_bridges_available=今回利用可能なブリッジがありません。 torlauncher.connect=接続 torlauncher.restart_tor=Torを再起動する @@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=ホストへの経路が見つかりませ torlauncher.bootstrapWarning.ioerror=読み書きエラー torlauncher.bootstrapWarning.pt_missing=プラグ可能な転送が見つかりません -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=サーバーへの接続が切断されました。\n +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=サーバーに接続できませんでした。\n +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=プロクシーに接続できませんでした。 diff --git a/src/chrome/locale/ka/torlauncher.properties b/src/chrome/locale/ka/torlauncher.properties index 697b03f..c0dadd3 100644 --- a/src/chrome/locale/ka/torlauncher.properties +++ b/src/chrome/locale/ka/torlauncher.properties @@ -44,7 +44,7 @@ torlauncher.no_bridges_available=No bridges are available at this time. Sorry. torlauncher.connect=დაკავშირება torlauncher.restart_tor=Restart Tor torlauncher.quit=Quit -torlauncher.quit_win=Exit +torlauncher.quit_win=გასვლა torlauncher.done=შესრულებულია torlauncher.forAssistance=For assistance, contact %S diff --git a/src/chrome/locale/nb/torlauncher.properties b/src/chrome/locale/nb/torlauncher.properties index 7e4a018..8e97a0d 100644 --- a/src/chrome/locale/nb/torlauncher.properties +++ b/src/chrome/locale/nb/torlauncher.properties @@ -32,10 +32,10 @@ torlauncher.error_bridge_bad_default_type=Det er ingen angitte broer som har til torlauncher.bridge_suffix.meek-amazon=(virker i Kina) torlauncher.bridge_suffix.meek-azure=(virker i Kina) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… +torlauncher.request_a_bridge=Forespør en bro… +torlauncher.request_a_new_bridge=Forespør ny bro… torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. +torlauncher.captcha_prompt=Løs CAPTCHA-en for å forespørre en bro. torlauncher.bad_captcha_solution=The solution is not correct. Please try again. torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. diff --git a/src/chrome/locale/nl/network-settings.dtd b/src/chrome/locale/nl/network-settings.dtd index 004f989..91effd7 100644 --- a/src/chrome/locale/nl/network-settings.dtd +++ b/src/chrome/locale/nl/network-settings.dtd @@ -41,9 +41,9 @@ <!ENTITY torsettings.useBridges.checkbox "Tor is geblokkeerd in mijn land."> <!ENTITY torsettings.useBridges.default "Selecteer een ingebouwde bridge"> <!ENTITY torsettings.useBridges.default.placeholder "Kies een bridge"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> +<!ENTITY torsettings.useBridges.bridgeDB "Vraag een bridge aan bij torproject.org"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Voer de tekens van het plaatje in"> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Krijg een nieuwe uitdaging"> <!ENTITY torsettings.useBridges.captchaSubmit "Verzenden"> <!ENTITY torsettings.useBridges.custom "Geef een bridge weer die ik ken"> <!ENTITY torsettings.useBridges.label "Voer bridge informatie van een vertrouwde bron in."> diff --git a/src/chrome/locale/nl/torlauncher.properties b/src/chrome/locale/nl/torlauncher.properties index e2d4b69..9b19476 100644 --- a/src/chrome/locale/nl/torlauncher.properties +++ b/src/chrome/locale/nl/torlauncher.properties @@ -34,9 +34,9 @@ torlauncher.bridge_suffix.meek-azure=(werkt in China) torlauncher.request_a_bridge=Request a Bridge… torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. +torlauncher.contacting_bridgedb=Contact maken met BridgeDB. Een ogenblik. torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. +torlauncher.bad_captcha_solution=De oplossing is niet correct. Probeer opnieuw. torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. torlauncher.no_bridges_available=No bridges are available at this time. Sorry. @@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=geen route naar de server torlauncher.bootstrapWarning.ioerror=lees/schrijffout torlauncher.bootstrapWarning.pt_missing=ontbrekend plugbaar vervoer -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=De verbinding met de server is verbroken. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Kon niet verbinden met de server. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Kon niet verbinden met de proxy. diff --git a/src/chrome/locale/pt-BR/torlauncher.properties b/src/chrome/locale/pt-BR/torlauncher.properties index 1b20ee1..21d0106 100644 --- a/src/chrome/locale/pt-BR/torlauncher.properties +++ b/src/chrome/locale/pt-BR/torlauncher.properties @@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=Você deve especificar um endereço IP ou u torlauncher.error_proxy_type_missing=Você deve selecionar um tipo de proxy. torlauncher.error_bridges_missing=Você deve especificar uma ou mais pontes. torlauncher.error_default_bridges_type_missing=Você deve selecionar um tipo de transporte para as pontes fornecidas. -torlauncher.error_bridgedb_bridges_missing=Por favor, peça uma bridge. +torlauncher.error_bridgedb_bridges_missing=Por favor, solicite uma ponte. torlauncher.error_bridge_bad_default_type=Entre as pontes fornecidas que têm o tipo de transporte %S, nenhuma está disponível. Por favor ajuste as suas configurações. torlauncher.bridge_suffix.meek-amazon=(funciona na China) torlauncher.bridge_suffix.meek-azure=(funciona na China) -torlauncher.request_a_bridge=Pedir uma bridge... -torlauncher.request_a_new_bridge=Pedir uma nova bridge... +torlauncher.request_a_bridge=Solicitar uma ponte... +torlauncher.request_a_new_bridge=Solicitar uma nova ponte torlauncher.contacting_bridgedb=Entrando em contato com BridgeDB. Por favor, aguarde. -torlauncher.captcha_prompt=Resolva o CAPTCHA para pedir uma bridge. -torlauncher.bad_captcha_solution=A solução está incorreta. Tente novamente. -torlauncher.unable_to_get_bridge=Não foi possível obter uma ponte a partir do BridgeDB.\n\n$S +torlauncher.captcha_prompt=Resolva o CAPTCHA para solicitar uma ponte. +torlauncher.bad_captcha_solution=A solução não está correta. Por favor, tente novamente. +torlauncher.unable_to_get_bridge=Não é possível obter uma ponte do BridgeDB.\n\n$S torlauncher.no_meek=Este navegador não está configurado para usar o 'meek', que é necessário para obter pontes. -torlauncher.no_bridges_available=Não existem bridges disponíveis no momento. Sentimos muito. +torlauncher.no_bridges_available=Nenhuma ponte está disponível neste momento. Desculpe. torlauncher.connect=Conectar torlauncher.restart_tor=Reiniciar o Tor diff --git a/src/chrome/locale/pt/network-settings.dtd b/src/chrome/locale/pt/network-settings.dtd index a359691..f0576fd 100644 --- a/src/chrome/locale/pt/network-settings.dtd +++ b/src/chrome/locale/pt/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Clique em 'Ligar' para ligar ao Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Clique em “Configurar” para ajustar as definições de rede se estiver num país que censura o Tor (tal como China, Egito, Turquia) ou se estiver a ligar a partir de uma rede privada que requer um proxy."> <!ENTITY torSettings.configure "Configurar"> <!ENTITY torSettings.connect "Ligar"> @@ -39,11 +39,11 @@ <!ENTITY torsettings.firewall.checkbox "Este computador liga através de uma firewall que só permite ligações para determinadas portas."> <!ENTITY torsettings.firewall.allowedPorts "Portas permitidas:"> <!ENTITY torsettings.useBridges.checkbox "Tor é censurado no meu país"> -<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> +<!ENTITY torsettings.useBridges.default "Selecionar um ponte integrada"> <!ENTITY torsettings.useBridges.default.placeholder "selecionar uma ponte"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> +<!ENTITY torsettings.useBridges.bridgeDB "Solicitar uma ponte a partir de torproject.org"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Insira os carateres da imagem"> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Obter um novo desafio"> <!ENTITY torsettings.useBridges.captchaSubmit "Submeter"> <!ENTITY torsettings.useBridges.custom "Fornecer uma ponte que eu conheça"> <!ENTITY torsettings.useBridges.label "Inserir a informação de ponte de uma fonte confiável"> diff --git a/src/chrome/locale/ro/torlauncher.properties b/src/chrome/locale/ro/torlauncher.properties index 85857f6..1c6f761 100644 --- a/src/chrome/locale/ro/torlauncher.properties +++ b/src/chrome/locale/ro/torlauncher.properties @@ -6,7 +6,7 @@ torlauncher.error_title=Lansator Tor torlauncher.tor_exited_during_startup=Tor s-a închis în mod neașteptat. Acest lucru se datorează fie unei erori în Tor, în alt program de pe sistemul dvs., sau a unei defecțiuni de hardware. Până nu vei fixa problema şi restartezi Tor,\nBrowserul Tor nu va porni. torlauncher.tor_exited=Tor s-a închis în mod neașteptat. Acest lucru se datorează fie unei erori în Tor, în alt program de pe sistemul dvs., sau a unei defecțiuni în hardware. Browserul Tor nu va putea accesa nici un site decât dacă reporniți Tor. Dacă problema persistă, vă rugăm să trimiteți o copie a Tor Log către echipa de suport. torlauncher.tor_exited2=Restartând Tor nu se vor închide ferestrele browserului dvs. -torlauncher.tor_controlconn_failed=Nu sa putut conecta la portul de control Tor. +torlauncher.tor_controlconn_failed=Nu s-a putut conecta la portul de control Tor. torlauncher.tor_failed_to_start=Tor nu poate porni. torlauncher.tor_control_failed=Eșec să preiau controlul Tor. torlauncher.tor_bootstrap_failed=Tor nu a reușit să facă o conexiune la rețeaua Tor. @@ -16,7 +16,7 @@ torlauncher.unable_to_start_tor=Tor nu poate porni. torlauncher.tor_missing=Fișierul executabil Tor lipsește. torlauncher.torrc_missing=Fişierul torrc lipseşte şi nu s-a putut crea. torlauncher.datadir_missing=Directorul de date Tor nu există şi nu a putut fi creat. -torlauncher.password_hash_missing=Eșec parole hashed. +torlauncher.password_hash_missing=Eroare la obținerea hash-ului parolei. torlauncher.failed_to_get_settings=Nu pot obține Tor settings.\n\n%S torlauncher.failed_to_save_settings=Nu pot salva Tor settings.\n\n%S diff --git a/src/chrome/locale/ru/torlauncher.properties b/src/chrome/locale/ru/torlauncher.properties index 57c5361..3ff6b62 100644 --- a/src/chrome/locale/ru/torlauncher.properties +++ b/src/chrome/locale/ru/torlauncher.properties @@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=Вы должны указать IP-адр torlauncher.error_proxy_type_missing=Необходимо выбрать тип прокси. torlauncher.error_bridges_missing=Необходимо указать один или несколько мостов. torlauncher.error_default_bridges_type_missing=Вы должны выбрать тип транспорта предопределенных мостов. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. +torlauncher.error_bridgedb_bridges_missing=Пожалуйста, запросите мост. torlauncher.error_bridge_bad_default_type=Предопределенные мосты не поддерживают тип транспорта %S. Пожалуйста, исправьте ваши настройки. torlauncher.bridge_suffix.meek-amazon=(работает в Китае) torlauncher.bridge_suffix.meek-azure=(работает в Китае) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S -torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.request_a_bridge=Запрос моста… +torlauncher.request_a_new_bridge=Запрос нового моста… +torlauncher.contacting_bridgedb=Обращение к BridgeDB. Пожалуйста, подождите. +torlauncher.captcha_prompt=Решите CAPTCHA для запроса моста. +torlauncher.bad_captcha_solution=Решение не является правильным. Попробуйте ещё раз. +torlauncher.unable_to_get_bridge=Не удалось получить мост из BridgeDB.\n\n%S +torlauncher.no_meek=Этот браузер не настроен должным образом, что необходимо для получения мостов. +torlauncher.no_bridges_available=В настоящее время мостов не имеется. Извините. torlauncher.connect=Соединиться torlauncher.restart_tor=Перезапустить Tor @@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=не указан путь к хосту torlauncher.bootstrapWarning.ioerror=ошибка чтения / записи torlauncher.bootstrapWarning.pt_missing=отсутствует подключаемый транспорт -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=Соединение с сервером было потеряно. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Не удалось подключиться к серверу. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Не удалось подключиться к прокси. diff --git a/src/chrome/locale/sk-SK/network-settings.dtd b/src/chrome/locale/sk-SK/network-settings.dtd index ba160db..ce4cb7e 100644 --- a/src/chrome/locale/sk-SK/network-settings.dtd +++ b/src/chrome/locale/sk-SK/network-settings.dtd @@ -1,7 +1,7 @@ <!ENTITY torsettings.dialog.title "Nastavenia Tor Network"> -<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.default "Pripojiť k Tor"> <!ENTITY torsettings.wizard.title.configure "Nastavenia Tor Network"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> +<!ENTITY torsettings.wizard.title.connecting "Vytváram spojenie">  <!ENTITY torlauncher.localePicker.title "Jazyk Tor Browser"> @@ -25,7 +25,7 @@ <!ENTITY torsettings.optional "Voliteľné"> -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> +<!ENTITY torsettings.useProxy.checkbox "Na pripojenie k internetu používam proxy"> <!ENTITY torsettings.useProxy.type "Typ proxy:"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Adresa:"> @@ -38,7 +38,7 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Tento počítač prechádza cez firewall, ktorý povoľuje spojenie len k určitým portom."> <!ENTITY torsettings.firewall.allowedPorts "Povolené porty:"> -<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> +<!ENTITY torsettings.useBridges.checkbox "Tor je v mojej krajine cenzurovaný"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> <!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> diff --git a/src/chrome/locale/sv/network-settings.dtd b/src/chrome/locale/sv/network-settings.dtd index cc952f1..b7adc24 100644 --- a/src/chrome/locale/sv/network-settings.dtd +++ b/src/chrome/locale/sv/network-settings.dtd @@ -41,9 +41,9 @@ <!ENTITY torsettings.useBridges.checkbox "Tor är censurerat i mitt land"> <!ENTITY torsettings.useBridges.default "Välj en inbyggd brygga"> <!ENTITY torsettings.useBridges.default.placeholder "Välj en brygga"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> +<!ENTITY torsettings.useBridges.bridgeDB "Begär en brygga från torproject.org"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Ange tecknen från bilden"> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Få en ny utmaning"> <!ENTITY torsettings.useBridges.captchaSubmit "Skicka"> <!ENTITY torsettings.useBridges.custom "Använd en egen brygga"> <!ENTITY torsettings.useBridges.label "Ange brygg informationen från en betrodd källa"> diff --git a/src/chrome/locale/sv/torlauncher.properties b/src/chrome/locale/sv/torlauncher.properties index 7a8ddda..92800d7 100644 --- a/src/chrome/locale/sv/torlauncher.properties +++ b/src/chrome/locale/sv/torlauncher.properties @@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=Du måste ange både en IP-adress eller vä torlauncher.error_proxy_type_missing=Du måste välja typ av proxy. torlauncher.error_bridges_missing=Du måste ange en eller flera bryggor. torlauncher.error_default_bridges_type_missing=Du måste välja en transporttyp för de förkonfigurerade bryggorna. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. +torlauncher.error_bridgedb_bridges_missing=Vänligen begär en brygga. torlauncher.error_bridge_bad_default_type=Det finns inga förkonfigurerade bryggor för transporttypen %S tillgängliga. Du behöver ändra dina inställningar. torlauncher.bridge_suffix.meek-amazon=(Fungerar i Kina) torlauncher.bridge_suffix.meek-azure=(Fungerar i Kina) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S -torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.request_a_bridge=Begär en brygga... +torlauncher.request_a_new_bridge=Begär en ny brygga... +torlauncher.contacting_bridgedb=Kontaktar BridgeDB. Vänligen vänta. +torlauncher.captcha_prompt=Lös CAPTCHA:n för att begära en brygga. +torlauncher.bad_captcha_solution=Lösningen är inte korrekt. Vänligen försök igen. +torlauncher.unable_to_get_bridge=Kunde inte ta emot en brygga från BridgeDB.\n\n%S +torlauncher.no_meek=Den här webbläsaren är inte konfigurerad för meek, vilket krävs för att ta emot bryggor. +torlauncher.no_bridges_available=Inga bryggor finns tillgängliga för tillfället, tyvärr. torlauncher.connect=Anslut torlauncher.restart_tor=Starta om Tor @@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=framkomlig väg till värddatorn saknas torlauncher.bootstrapWarning.ioerror=läs-/skrivfel torlauncher.bootstrapWarning.pt_missing=Pluggable Transport saknas -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=Anslutningen till servern förlorades. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Kunde inte ansluta till servern. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Kunde inte ansluta till proxyn. diff --git a/src/chrome/locale/te/torlauncher.properties b/src/chrome/locale/te/torlauncher.properties index a4d097a..209ac60 100644 --- a/src/chrome/locale/te/torlauncher.properties +++ b/src/chrome/locale/te/torlauncher.properties @@ -45,7 +45,7 @@ torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor torlauncher.quit=Quit torlauncher.quit_win=Exit -torlauncher.done=Done +torlauncher.done=పూర్తి torlauncher.forAssistance=For assistance, contact %S torlauncher.forAssistance2=For assistance, visit %S diff --git a/src/chrome/locale/ti/network-settings.dtd b/src/chrome/locale/ti/network-settings.dtd index 4615146..bdceb7b 100644 --- a/src/chrome/locale/ti/network-settings.dtd +++ b/src/chrome/locale/ti/network-settings.dtd @@ -12,7 +12,7 @@ <!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> <!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> <!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connect "Connect"> +<!ENTITY torSettings.connect "ኣራኽብ">  @@ -44,7 +44,7 @@ <!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> <!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> <!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> -<!ENTITY torsettings.useBridges.captchaSubmit "Submit"> +<!ENTITY torsettings.useBridges.captchaSubmit "ኣረክብ"> <!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> <!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> <!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> diff --git a/src/chrome/locale/ti/torlauncher.properties b/src/chrome/locale/ti/torlauncher.properties index 28e2ff6..c438d31 100644 --- a/src/chrome/locale/ti/torlauncher.properties +++ b/src/chrome/locale/ti/torlauncher.properties @@ -41,7 +41,7 @@ torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. torlauncher.no_bridges_available=No bridges are available at this time. Sorry. -torlauncher.connect=Connect +torlauncher.connect=ኣራኽብ torlauncher.restart_tor=Restart Tor torlauncher.quit=ኣቋርጽ torlauncher.quit_win=ውጻእ diff --git a/src/chrome/locale/tr/network-settings.dtd b/src/chrome/locale/tr/network-settings.dtd index add4561..8a45e77 100644 --- a/src/chrome/locale/tr/network-settings.dtd +++ b/src/chrome/locale/tr/network-settings.dtd @@ -41,8 +41,8 @@ <!ENTITY torsettings.useBridges.checkbox "Bulunduğum ülkede Tor engelleniyor"> <!ENTITY torsettings.useBridges.default "Bir hazır köprü seçin"> <!ENTITY torsettings.useBridges.default.placeholder "bir köprü seçin"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> +<!ENTITY torsettings.useBridges.bridgeDB "torproject.org'dan köprü iste"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Resimdeki karakterleri girin"> <!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> <!ENTITY torsettings.useBridges.captchaSubmit "Gönder"> <!ENTITY torsettings.useBridges.custom "Bildiğim bir köprü sağla"> diff --git a/src/chrome/locale/tr/torlauncher.properties b/src/chrome/locale/tr/torlauncher.properties index 1586384..a40956d 100644 --- a/src/chrome/locale/tr/torlauncher.properties +++ b/src/chrome/locale/tr/torlauncher.properties @@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=İnternet'e bir vekil sunucu üzerinden ba torlauncher.error_proxy_type_missing=Vekil sunucu türünü seçmelisiniz. torlauncher.error_bridges_missing=Bir ya da birkaç köprü belirtmelisiniz. torlauncher.error_default_bridges_type_missing=Hazır köprüler için bir aktarım türü seçmelisiniz. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. +torlauncher.error_bridgedb_bridges_missing=Lütfen köprü talep edin. torlauncher.error_bridge_bad_default_type=Hazır köprüler %S aktarım türü için kullanılamıyor. Lütfen ayarlarınızı değiştirin. torlauncher.bridge_suffix.meek-amazon=(Çin'de çalışır) torlauncher.bridge_suffix.meek-azure=(Çin'de çalışır) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S +torlauncher.request_a_bridge=Köprü talep edin... +torlauncher.request_a_new_bridge=Yeni Köprü talep edin... +torlauncher.contacting_bridgedb=Köprü veritabanına bağlanılıyor. Lütfen bekleyin. +torlauncher.captcha_prompt=Köprü talep etmek için lütfen güvenlik kodunu girin. +torlauncher.bad_captcha_solution=Çözümleme doğru değil. Lütfen yeniden deneyin. +torlauncher.unable_to_get_bridge=Köprü veritabanından köprü alınamıyor. torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.no_bridges_available=Şu anda hiçbir köprü müsait değil. Üzgünüz. torlauncher.connect=Bağlan torlauncher.restart_tor=Tor'u Yeniden Başlat @@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=sunucu yöneltmesi yok torlauncher.bootstrapWarning.ioerror=okuma/yazma hatası torlauncher.bootstrapWarning.pt_missing=takılabilir aktarım bulunamadı -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=Sunucuyla bağlantı kesildi +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Sunucuya bağlanılamadı. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Vekil sunucusuna bağlanılamadı.

1 0

[torbutton/master] Translations update
by gk＠torproject.org 03 May '18

03 May '18

commit 2fb9a2965d240f222a716065a2279a6b71ed2930 Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 3 07:21:27 2018 +0000 Translations update --- src/chrome/locale/es/aboutTor.dtd | 2 +- src/chrome/locale/fr/aboutTBUpdate.dtd | 4 ++-- src/chrome/locale/fr/aboutTor.dtd | 6 +++--- src/chrome/locale/fr/torbutton.dtd | 8 ++++---- src/chrome/locale/fr/torbutton.properties | 10 +++++----- src/chrome/locale/ja/aboutTor.properties | 10 +++++----- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/chrome/locale/es/aboutTor.dtd b/src/chrome/locale/es/aboutTor.dtd index 6354df7..73ce9ef 100644 --- a/src/chrome/locale/es/aboutTor.dtd +++ b/src/chrome/locale/es/aboutTor.dtd @@ -8,7 +8,7 @@ <!ENTITY aboutTor.outOfDateTorOn.label "ADVERTENCIA: Este navegador no está actualizado."> <!ENTITY aboutTor.outOfDateTorOff.label "ADEMÁS, este navegador tampoco está actualizado."> -<!ENTITY aboutTor.outOfDate2.label "Haz clic en la cebolla y luego selecciona Comprobar actualizaciones del Navegador Tor."> +<!ENTITY aboutTor.outOfDate2.label "Haz clic en la cebolla y selecciona Comprobar actualización del Navegador Tor."> <!ENTITY aboutTor.check.label "Probar las preferencias de red Tor"> diff --git a/src/chrome/locale/fr/aboutTBUpdate.dtd b/src/chrome/locale/fr/aboutTBUpdate.dtd index fc83797..04912b6 100644 --- a/src/chrome/locale/fr/aboutTBUpdate.dtd +++ b/src/chrome/locale/fr/aboutTBUpdate.dtd @@ -1,5 +1,5 @@ -<!ENTITY aboutTBUpdate.title "Mise à jour du navigateur Tor"> -<!ENTITY aboutTBUpdate.updated "Le navigateur Tor a été mis à jour."> +<!ENTITY aboutTBUpdate.title "Mise à jour du Navigateur Tor"> +<!ENTITY aboutTBUpdate.updated "Le Navigateur Tor a été mis à jour."> <!ENTITY aboutTBUpdate.linkPrefix "Pour les toutes dernières informations sur cette version,"> <!ENTITY aboutTBUpdate.linkLabel "visitez notre site Web"> <!ENTITY aboutTBUpdate.linkSuffix "."> diff --git a/src/chrome/locale/fr/aboutTor.dtd b/src/chrome/locale/fr/aboutTor.dtd index fee49c8..6a551d9 100644 --- a/src/chrome/locale/fr/aboutTor.dtd +++ b/src/chrome/locale/fr/aboutTor.dtd @@ -8,11 +8,11 @@ <!ENTITY aboutTor.outOfDateTorOn.label "AVERTISSEMENT : ce navigateur n’est pas à jour."> <!ENTITY aboutTor.outOfDateTorOff.label "DE PLUS, ce navigateur n’est pas à jour."> -<!ENTITY aboutTor.outOfDate2.label "Cliquez sur l’oignon, puis choisissez Vérifier les mises à jour du navigateur Tor."> +<!ENTITY aboutTor.outOfDate2.label "Cliquez sur l’oignon, puis choisissez Vérifier les mises à jour du Navigateur Tor."> <!ENTITY aboutTor.check.label "Tester les paramètres du réseau Tor"> -<!ENTITY aboutTor.success.label "Bienvenue dans le navigateur Tor"> +<!ENTITY aboutTor.success.label "Bienvenue dans le Navigateur Tor"> <!ENTITY aboutTor.success2.label "Connecté au réseau Tor."> <!ENTITY aboutTor.success3.label "Vous êtes maintenant libre de naviguer anonymement sur Internet."> <!ENTITY aboutTor.failure.label "Une erreur s’est produite !"> @@ -30,7 +30,7 @@ <!ENTITY aboutTor.whatnext.label "Conseils pour rester anonyme »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html#warning"> <!ENTITY aboutTor.torbrowser_user_manual.accesskey "G"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Guide d’utilisation du navigateur Tor"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Guide d’utilisation du Navigateur Tor"> <!ENTITY aboutTor.helpInfo1.label "Vous pouvez aider !"> <!ENTITY aboutTor.helpInfo2.label "Vous pouvez aider à rendre le réseau Tor plus rapide et plus puissant de plusieurs façons :"> <!ENTITY aboutTor.helpInfo3.label "Exploiter un nœud-relais Tor »"> diff --git a/src/chrome/locale/fr/torbutton.dtd b/src/chrome/locale/fr/torbutton.dtd index ac44ef5..895d922 100644 --- a/src/chrome/locale/fr/torbutton.dtd +++ b/src/chrome/locale/fr/torbutton.dtd @@ -6,12 +6,12 @@ <!ENTITY torbutton.context_menu.preferences.key "S"> <!ENTITY torbutton.context_menu.networksettings "Paramètres du réseau Tor"> <!ENTITY torbutton.context_menu.networksettings.key "R"> -<!ENTITY torbutton.context_menu.downloadUpdate "Vérifier les mises à jour du navigateur Tor"> +<!ENTITY torbutton.context_menu.downloadUpdate "Vérifier les mises à jour du Navigateur Tor"> <!ENTITY torbutton.context_menu.downloadUpdate.key "M"> <!ENTITY torbutton.context_menu.cookieProtections "Protections des fichiers témoins…"> <!ENTITY torbutton.context_menu.cookieProtections.key "T"> <!ENTITY torbutton.button.tooltip "Cliquer pour lancer BoutonTor"> -<!ENTITY torbutton.prefs.security_settings "Paramètres de sécurité du navigateur Tor"> +<!ENTITY torbutton.prefs.security_settings "Paramètres de sécurité du Navigateur Tor"> <!ENTITY torbutton.prefs.restore_defaults "Revenir aux paramètres par défaut"> <!ENTITY torbutton.prefs.custom_warning "Les préférences personnalisées de votre navigateur ont entraîné des paramètres de sécurité inhabituels. Pour des raisons de sécurité et de protection des informations personnelles, nous vous recommandons de choisir un des niveaux de sécurité par défaut."> <!ENTITY torbutton.cookiedialog.title "Gérer les protections des fichiers témoins"> @@ -28,13 +28,13 @@ <!ENTITY torbutton.prefs.restrict_thirdparty "Limiter les fichiers témoins tiers et les autres données de suivi à la trace"> <!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "L"> <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Gardez cette case cochée pour empêcher que diverses fonctions du navigateur soient utilisées pour vous suivre à la trace lorsque vous surfez sur le Web. Les fonctions modifiées incluent les URL de grands objets binaires, les canaux de diffusion, le cache du navigateur, les fichiers fichiers témoins, les favoricônes, les en-têtes Auth HTTP, les préconnexions de liens, localStorage, les URL de sources de médias, les requêtes OCSP, les travailleurs Web SharedWorker, et les billets de session TLS."> -<!ENTITY torbutton.prefs.resist_fingerprinting "Modifier les détails qui vous distingue d’autres utilisateurs du navigateur Tor"> +<!ENTITY torbutton.prefs.resist_fingerprinting "Modifier les détails qui vous distingue d’autres utilisateurs du Navigateur Tor"> <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Gardez cette case cochée pour cacher aux sites Web certaines choses qui pourraient être uniques à votre sujet, incluant les performances de votre ordinateur, l’agencement du clavier, les paramètres de langue, l’emplacement des greffons installés, la liste des greffons installés, l’état de votre réseau, l’orientation de l’écran, la taille de l’écran, les niveaux de zoom particuliers aux sites, les types de fichiers pris en charge, les couleurs système et les capacités WebGL."> <!ENTITY torbutton.prefs.sec_caption "Niveau de sécurité"> <!ENTITY torbutton.prefs.sec_caption_tooltip "Le curseur de sécurité vous permet de désactiver certaines fonctions du navigateur qui pourraient le rendre plus vulnérable aux tentatives de piratage."> <!ENTITY torbutton.prefs.sec_standard_label "Normal"> -<!ENTITY torbutton.prefs.sec_standard_description "Toutes les fonctions du navigateur Tor et des sites Web sont activées."> +<!ENTITY torbutton.prefs.sec_standard_description "Toutes les fonctions du Navigateur Tor et des sites Web sont activées."> <!ENTITY torbutton.prefs.sec_safer_label "Plus sûr"> <!ENTITY torbutton.prefs.sec_safer_description "Désactive les fonctions souvent dangereuses des sites Web, ce qui pourrait entraîner une perte de fonctionnalité de certains sites Web."> <!ENTITY torbutton.prefs.sec_safer_list_label "Au réglage Plus sûr :"> diff --git a/src/chrome/locale/fr/torbutton.properties b/src/chrome/locale/fr/torbutton.properties index 8df885b..f293385 100644 --- a/src/chrome/locale/fr/torbutton.properties +++ b/src/chrome/locale/fr/torbutton.properties @@ -5,7 +5,7 @@ torbutton.circuit_display.this_browser = Ce navigateur torbutton.circuit_display.relay = relayer torbutton.circuit_display.tor_bridge = Pont torbutton.circuit_display.unknown_country = Pays inconnu -torbutton.content_sizer.margin_tooltip = Le navigateur Tor ajoute cette marge pour rendre la largeur et la hauteur de votre fenêtre moins distinctives, et pour réduire par conséquent la possibilité que l’on vous suive à la trace en ligne. +torbutton.content_sizer.margin_tooltip = Le Navigateur Tor ajoute cette marge pour rendre la largeur et la hauteur de votre fenêtre moins distinctives, et pour réduire par conséquent la possibilité que l’on vous suive à la trace en ligne. torbutton.panel.tooltip.disabled = Cliquer pour activer Tor torbutton.panel.tooltip.enabled = Cliquer pour désactiver Tor torbutton.panel.label.disabled = Tor est désactivé @@ -21,20 +21,20 @@ torbutton.popup.dontask = Télécharger automatiquement à partir de maintenant torbutton.popup.prompted_language = Pour renforcer votre anonymat, BoutonTor peut demander la version anglaise des pages Web. Les pages que vous préférez lire dans votre langue maternelle pourraient alors s’afficher en anglais.\n\nVoulez-vous demander des pages Web en anglais pour améliorer votre anonymat ? torbutton.popup.no_newnym = BoutonTor ne peut pas vous attribuer une nouvelle identité de façon sûre. Il n’a pas accès au port de contrôle de Tor.\n\nUtilisez-vous l’offre groupée de navigation Tor ? torbutton.title.prompt_torbrowser = Informations importantes concernant BoutonTor -torbutton.popup.prompt_torbrowser = BoutonTor fonctionne différemment maintenant : vous ne pouvez plus le désactiver.\n\nNous avons effectué ce changement car il n’est pas sécuritaire d’utiliser BoutonTor dans un navigateur qui est également utiliser pour une navigation sans Tor. Trop de bogues ne pouvaient être réglés autrement.\n\nSi vous voulez continuer à utiliser Firefox normalement, vous devriez désinstaller BoutonTor et télécharger l’offre groupée de navigation Tor. Les propriétés de confidentialité du navigateur Tor sont aussi supérieures à celles de Firefox, même s’il est utilisé avec BoutonTor.\n\nPour enlever BoutonTor, allez dans Outils->Modules complémentaires->Extensions et cliquer sur Supprimer à coté de BoutonTor. +torbutton.popup.prompt_torbrowser = BoutonTor fonctionne différemment maintenant : vous ne pouvez plus le désactiver.\n\nNous avons effectué ce changement car il n’est pas sécuritaire d’utiliser BoutonTor dans un navigateur qui est également utiliser pour une navigation sans Tor. Trop de bogues ne pouvaient être réglés autrement.\n\nSi vous voulez continuer à utiliser Firefox normalement, vous devriez désinstaller BoutonTor et télécharger l’offre groupée de navigation Tor. Les propriétés de confidentialité du Navigateur Tor sont aussi supérieures à celles de Firefox, même s’il est utilisé avec BoutonTor.\n\nPour enlever BoutonTor, allez dans Outils->Modules complémentaires->Extensions et cliquer sur Supprimer à coté de BoutonTor. torbutton.popup.short_torbrowser = Informations importantes concernant BoutonTor !\n\nBoutonTor est toujours activé dorénavant.\n\nCliquer sur BoutonTor pour plus d’informations. torbutton.popup.confirm_plugins = Les greffons tels que Flash peuvent nuire à vos anonymat et vie privée.\n\nIls peuvent également contourner Tor afin de révéler votre position actuelle ainsi que votre adresse IP.\n\nÊtes-vous certain de vouloir activer les greffons ?\n\n torbutton.popup.never_ask_again = Ne plus me poser la question. -torbutton.popup.confirm_newnym = Le navigateur Tor fermera tous les fenêtres et onglets. Les sessions des sites Web seront toutes perdues.\n\nRedémarrer le navigateur Tor maintenant pour réinitialiser votre identité ?\n\n +torbutton.popup.confirm_newnym = Le Navigateur Tor fermera tous les fenêtres et onglets. Les sessions des sites Web seront toutes perdues.\n\nRedémarrer le Navigateur Tor maintenant pour réinitialiser votre identité ?\n\n torbutton.slider_notification = Le menu de l’oignon vert propose maintenant un curseur de sécurité qui vous permet de régler votre niveau de sécurité. Découvrez-le ! torbutton.slider_notification_button = Ouvrir préférences de sécurité -torbutton.maximize_warning = Maximiser le navigateur Tor peut permettre aux sites Web de déterminer la taille de votre moniteur, ce qui peut être utilisé pour vous suivre à la trace. Nous vous recommandons de garder la taille d’origine des fenêtres du navigateur Tor. +torbutton.maximize_warning = Maximiser le Navigateur Tor peut permettre aux sites Web de déterminer la taille de votre moniteur, ce qui peut être utilisé pour vous suivre à la trace. Nous vous recommandons de garder la taille d’origine des fenêtres du Navigateur Tor. # Canvas permission prompt. Strings are kept here for ease of translation. -canvas.siteprompt=Ce site Web (%S) a essayé d’extraire des données d’image de canevas HTML5, qui pourraient être utilisées pour identifier votre ordinateur de façon unique.\n\nLe navigateur Tor devrait-il permettre à ce site Web d’extraire des données d’image de canevas HTML5 ? +canvas.siteprompt=Ce site Web (%S) a essayé d’extraire des données d’image de canevas HTML5, qui pourraient être utilisées pour identifier votre ordinateur de façon unique.\n\nLe Navigateur Tor devrait-il permettre à ce site Web d’extraire des données d’image de canevas HTML5 ? canvas.notNow=Pas maintenant canvas.notNowAccessKey=P canvas.allow=Autoriser à l’avenir diff --git a/src/chrome/locale/ja/aboutTor.properties b/src/chrome/locale/ja/aboutTor.properties index 848d0dc..5e85397 100644 --- a/src/chrome/locale/ja/aboutTor.properties +++ b/src/chrome/locale/ja/aboutTor.properties @@ -10,11 +10,11 @@ aboutTor.searchDDG.search.link=https://duckduckgo.com/ aboutTor.donationBanner.donate=今すぐ寄付願います！ -aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance -aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! +aboutTor.donationBanner.slogan=Tor: デジタル抵抗運動に力を与える。 +aboutTor.donationBanner.mozilla=今から寄付すると、Mozillaが一緒に同じ金額を寄付します！ -aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activists Since 2006 -aboutTor.donationBanner.tagline2=Networking Freedom Worldwide +aboutTor.donationBanner.tagline1=2006年以来、ジャーナリスト、内部告発者、そして活動家を守っています。 +aboutTor.donationBanner.tagline2=世界的ネットワーク自由 aboutTor.donationBanner.tagline3=フリーダムオンライン -aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide +aboutTor.donationBanner.tagline4=世界的に自由な表現を促進します。 aboutTor.donationBanner.tagline5=数百万件以上のプライバシーを毎日保護しています。

1 0

[tor-browser/tor-browser-52.7.3esr-8.0-1] Bug 25603 - Upgrade Orfox's https-everywhere add-on
by gk＠torproject.org 03 May '18

03 May '18

commit e3effb933616512282e0047d56ed0087cce702a6 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Mon Apr 30 14:51:19 2018 +0000 Bug 25603 - Upgrade Orfox's https-everywhere add-on We bundle https-everywhere in-tree and add it using Fennec's distribution system. The newer webextensions versions of https-everywhere do not work with this version of Fennec, so we are using https-everywhere's last extension release (v5.2.21). Unfortunately, this version was released 18 July, 2017 so the ruleset is old. As a workaround, we compiled v5.2.21 and included the ruleset from the 2018.4.11 tag [0]. This created a byte-for-byte reproducible XPI [1]. [0] https://trac.torproject.org/projects/tor/ticket/25603#comment:10 [1] 7a33c13dbd80fd881b1508fca6dc10fca787f8eb4da754104321537240ffb866 --- .../extensions/https-everywhere-eff(a)eff.org.xpi | Bin 0 -> 3094089 bytes .../extensions/https-everywhere(a)eff.org.xpi | Bin 2975335 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/mobile/android/orfox/distribution/assets/distribution/extensions/https-everywhere-eff(a)eff.org.xpi b/mobile/android/orfox/distribution/assets/distribution/extensions/https-everywhere-eff(a)eff.org.xpi new file mode 100644 index 000000000000..cd801d22b1e1 Binary files /dev/null and b/mobile/android/orfox/distribution/assets/distribution/extensions/https-everywhere-eff(a)eff.org.xpi differ diff --git a/mobile/android/orfox/distribution/assets/distribution/extensions/https-everywhere(a)eff.org.xpi b/mobile/android/orfox/distribution/assets/distribution/extensions/https-everywhere(a)eff.org.xpi deleted file mode 100644 index 3b1ed8ec1c02..000000000000 Binary files a/mobile/android/orfox/distribution/assets/distribution/extensions/https-everywhere(a)eff.org.xpi and /dev/null differ

1 0

[tor-browser/tor-browser-52.7.3esr-8.0-1] Bug 25980 - Define __libcpp_feof when we redefine feof
by gk＠torproject.org 03 May '18

03 May '18

commit d51742d0dd8364c20bb33a15cec5c2ae6d81f9b5 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Mon Apr 30 19:02:54 2018 +0000 Bug 25980 - Define __libcpp_feof when we redefine feof On Android, NDK r11b declares __libcpp_feof(FILE*) as a wrapper around feof(FILE*). This is semanticly incorrect when feof is redefined and the function signature changes, therefore causing a type-incompatibility. In this case, within the hyphenation code feof(FILE*) is redefined as feof(hnjFile*), but |struct hnjFile| does not have a converting constructor for FILE. The easy solution is simply redefining __libcpp_feof, as well. Bugfix on 0e1e49d4971bb891152c93b8b62665f24bd8a0c2 --- intl/hyphenation/glue/hnjalloc.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/intl/hyphenation/glue/hnjalloc.h b/intl/hyphenation/glue/hnjalloc.h index 5cee1be1b6d7..78e9d8cbee13 100644 --- a/intl/hyphenation/glue/hnjalloc.h +++ b/intl/hyphenation/glue/hnjalloc.h @@ -31,6 +31,11 @@ #define fopen(path,mode) hnjFopen(path,mode) #define fclose(file) hnjFclose(file) #define fgets(buf,count,file) hnjFgets(buf,count,file) +#ifdef __ANDROID__ +#ifdef feof +#define __libcpp_feof(file) hnjFeof(file) +#endif // feof +#endif // __ANDROID__ #define feof(file) hnjFeof(file) #define fgetc(file) hnjFgetc(file)

1 0

[tor-browser-build/master] Bug 26010: Change Snowflake rendezvous to use the Azure domain front
by gk＠torproject.org 03 May '18

03 May '18

commit c37d2bd67589190df77a5936fae2ef74dd0a8d7c Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 3 06:22:17 2018 +0000 Bug 26010: Change Snowflake rendezvous to use the Azure domain front https://bugs.torproject.org/22782#comment:7 This also uses the newer standalone broker on the backend (rather than the one based on App Engine), but that should be invisible to users. Patch by David Fifield I converted the mac file to a unix file format as well using `dos2unix` to get rid of the ^M characters that started to show up. --- .../Bundle-Data/PTConfigs/linux/torrc-defaults-appendix | 2 +- .../Bundle-Data/PTConfigs/mac/torrc-defaults-appendix | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) 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 7fbf63c..12b8aad 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix +++ b/projects/tor-browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix @@ -8,4 +8,4 @@ ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec ./TorBrowser/Tor/Plugg ClientTransportPlugin meek exec ./TorBrowser/Tor/PluggableTransports/meek-client-torbrowser -- ./TorBrowser/Tor/PluggableTransports/meek-client ## snowflake configuration -ClientTransportPlugin snowflake exec ./TorBrowser/Tor/PluggableTransports/snowflake-client -url https://snowflake-reg.appspot.com/ -front www.google.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 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 06dbec9..cf7cc2a 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix +++ b/projects/tor-browser/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix @@ -1,8 +1,8 @@ -## obfs4proxy configuration -ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec PluggableTransports/obfs4proxy - -## meek configuration -ClientTransportPlugin meek exec PluggableTransports/meek-client-torbrowser -- PluggableTransports/meek-client - -## snowflake configuration -ClientTransportPlugin snowflake exec PluggableTransports/snowflake-client -url https://snowflake-reg.appspot.com/ -front www.google.com -ice stun:stun.l.google.com:19302 +## obfs4proxy configuration +ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec PluggableTransports/obfs4proxy + +## meek configuration +ClientTransportPlugin meek exec PluggableTransports/meek-client-torbrowser -- PluggableTransports/meek-client + +## 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

1 0

[tor-browser-build/maint-7.5] Release preparations for 7.5.4
by gk＠torproject.org 02 May '18

02 May '18

commit ad2095ad97cdb3b27f800561529578f3bac511f7 Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 2 07:52:50 2018 +0000 Release preparations for 7.5.4 Changelog update and versions bump --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 6 +++--- projects/https-everywhere/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 11 +++++++++++ rbm.conf | 5 ++--- 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 04cd7dd..4e42939 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build2 + ff_build: build1 ff_arch: linux-i686 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' diff --git a/projects/firefox/config b/projects/firefox/config index 22c7a0b..886cfdc 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,13 +1,13 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg var: - firefox_platform_version: 52.7.3 + firefox_platform_version: 52.8.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 7.5 torbrowser_update_channel: alpha @@ -28,7 +28,7 @@ targets: torbrowser_update_channel: release nightly: - git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2' + git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1' tag_gpg_id: 0 var: torbrowser_update_channel: default diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 38eb2be..cfa0a78 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2018.3.13 +version: 2018.4.11 git_url: https://git.torproject.org/https-everywhere.git git_hash: '[% c("version") %]' git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index f9a328a..7f5a736 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,14 @@ +Tor Browser 7.5.4 -- May 9 2018 + * All platforms + * Update Firefox to 52.8.0esr + * Update HTTPS Everywhere to 2018.4.11 + * Update NoScript to 5.1.8.5 + * Bug 23439: Exempt .onion domains from mixed content warnings + * Bug 22614: Make e10s/non-e10s Tor Browsers indistinguishable + * Bug 22659: Changes to `intl.accept.languages` get overwritten after restart + * Bug 25973: Backport off-by-one fix (bug 1352073) + * Bug 25020: Add a tbb_version.json file + Tor Browser 7.5.3 -- March 26 2018 * All platforms * Update Firefox to 52.7.3esr diff --git a/rbm.conf b/rbm.conf index 1f7d0d4..ca427f9 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,11 +15,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '7.5.3' + torbrowser_version: '7.5.4' torbrowser_build: 'build1' torbrowser_incremental_from: - - 7.5.1 - - 7.5.2 + - 7.5.3 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/maint-7.5] Bug 25572: Update NoScript to version 5.1.8.5
by gk＠torproject.org 02 May '18

02 May '18

commit f0f669e25747a9c33f07d365397a030a21ede864 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 11 11:59:12 2018 +0000 Bug 25572: Update NoScript to version 5.1.8.5 --- projects/tor-browser/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 661b8e2..dec5648 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -66,9 +66,9 @@ input_files: name: snowflake enable: '[% c("var/snowflake") %]' - filename: Bundle-Data - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://secure.informaction.com/download/releases/noscript-5.1.8.5.xpi name: noscript - sha256sum: 1c85a72cd0d7d210f8dd463f9700214703a5f28319c2b1679db00f861a5289f7 + sha256sum: 7180f8d24ca31989682dee229b95e3503699f2bb25cb593a6a1f2ce0a2253792 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop'

1 0

[tor-browser-build/maint-7.5] Bug 25020: fix a typo in tbb_version.json filename
by gk＠torproject.org 02 May '18

02 May '18

commit f99490f12132557981907254495d2b1d6053018e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sat Feb 24 21:54:29 2018 +0100 Bug 25020: fix a typo in tbb_version.json filename --- projects/tor-browser/build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 978d988..c542818 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -199,7 +199,7 @@ echo "pref(\"general.useragent.locale\", \"en-US\");" >> defaults/preferences/00 zip -Xm omni.ja defaults/preferences/000-tor-browser.js rm -rf defaults # create tbb_version.json file for #25020 -echo '{"version":"[% c("var/torbrowser_version") %]","architecture":"[% c("var/mar_osname") %]","channel":"[% c("var/channel") %]","locale":"en-US"}' > ../tbb_verson.json +echo '{"version":"[% c("var/torbrowser_version") %]","architecture":"[% c("var/mar_osname") %]","channel":"[% c("var/channel") %]","locale":"en-US"}' > ../tbb_version.json popd # Prepare our language packs for using the proper search engines and embed @@ -330,7 +330,7 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ zip -Xm omni.ja defaults/preferences/000-tor-browser.js rm -rf defaults # create tbb_version.json file for #25020 - echo '{"version":"[% c("var/torbrowser_version") %]","architecture":"[% c("var/mar_osname") %]","channel":"[% c("var/channel") %]","locale":"[% lang %]"}' > ../tbb_verson.json + echo '{"version":"[% c("var/torbrowser_version") %]","architecture":"[% c("var/mar_osname") %]","channel":"[% c("var/channel") %]","locale":"[% lang %]"}' > ../tbb_version.json popd # Set the update.locale (it is used to replace %LOCALE% within

1 0

[tor-browser-build/maint-7.5] Bug 25020: add a tbb_version.json file
by gk＠torproject.org 02 May '18

02 May '18

commit 38e9d1caaa0d7cf49e4052e7c709b48ebdba9e31 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Feb 8 14:55:10 2018 +0100 Bug 25020: add a tbb_version.json file Add a tbb_version.json file containing informations about the installed bundle. --- projects/tor-browser/build | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 7431e26..978d988 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -198,6 +198,8 @@ echo "pref(\"general.useragent.locale\", \"en-US\");" >> defaults/preferences/00 [% c("var/touch") %] defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js rm -rf defaults +# create tbb_version.json file for #25020 +echo '{"version":"[% c("var/torbrowser_version") %]","architecture":"[% c("var/mar_osname") %]","channel":"[% c("var/channel") %]","locale":"en-US"}' > ../tbb_verson.json popd # Prepare our language packs for using the proper search engines and embed @@ -327,6 +329,8 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ [% c("var/touch") %] defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js rm -rf defaults + # create tbb_version.json file for #25020 + echo '{"version":"[% c("var/torbrowser_version") %]","architecture":"[% c("var/mar_osname") %]","channel":"[% c("var/channel") %]","locale":"[% lang %]"}' > ../tbb_verson.json popd # Set the update.locale (it is used to replace %LOCALE% within

1 0

[tor-browser/tor-browser-52.8.0esr-7.5-1] Bug 22614: Make e10s/non-e10s Tor Browsers indistinguishable
by gk＠torproject.org 02 May '18

02 May '18

commit deaa82b4f8ab411198ca300f614df3970221455e Author: Fernando Fernandez Mancera <ffmancera(a)riseup.net> Date: Fri Feb 2 11:38:01 2018 +0100 Bug 22614: Make e10s/non-e10s Tor Browsers indistinguishable e10s in its current form probably brings some fingerprinting risks with it. E.g. users of accessibility tools (not only those users) won't have e10s enabled on windows and macOS. In order to solve this issue "dom.disable_window_showModalDialog" is set to "true". --- browser/app/profile/000-tor-browser.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 32922418b12f..6fa34860a7b5 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -177,6 +177,8 @@ pref("media.webspeech.synth.enabled", false); // Bug 10283: Disable SpeechSynthe pref("dom.webaudio.enabled", false); // Bug 13017: Disable Web Audio API pref("dom.maxHardwareConcurrency", 1); // Bug 21675: Spoof single-core cpu pref("dom.w3c_touch_events.enabled", 0); // Bug 10286: Always disable Touch API +// Make e10s/non-e10s Tor Browsers indistinguishable (Bug: 22614) +pref("dom.disable_window_showModalDialog", true); // Third party stuff pref("privacy.firstparty.isolate", true); // Always enforce first party isolation

1 0