tbb-commits

tbb-commits@lists.torproject.org

1 participants
17653 discussions

[tor-browser-bundle/master] Bug 16910: Mac OS app bundle has wrong copyright year.
by gk＠torproject.org 09 Sep '15

09 Sep '15

commit 5019358bcac86508260703ae9cd99a4dfd2983e1 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Sep 8 10:29:10 2015 -0400 Bug 16910: Mac OS app bundle has wrong copyright year. Insert the year associated with the last tor-browser commit when generating the Info.plist file for Mac OS. --- gitian/build-helpers/fix-info-plist.py | 6 +++--- gitian/descriptors/mac/gitian-firefox.yml | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/gitian/build-helpers/fix-info-plist.py b/gitian/build-helpers/fix-info-plist.py index ac531ec..fae29ed 100755 --- a/gitian/build-helpers/fix-info-plist.py +++ b/gitian/build-helpers/fix-info-plist.py @@ -10,17 +10,17 @@ import plistlib import sys def usage(): - print >> sys.stderr, "usage: %s TORBROWSER_VERSION < Info.plist > FixedInfo.plist" % sys.argv[0] + print >> sys.stderr, "usage: %s TORBROWSER_VERSION YEAR < Info.plist > FixedInfo.plist" % sys.argv[0] sys.exit(2) _, args = getopt.gnu_getopt(sys.argv[1:], "") -if len(args) != 1: +if len(args) != 2: usage() TORBROWSER_VERSION = args[0] +YEAR = args[1] -YEAR = "2014" COPYRIGHT = "Tor Browser %s Copyright %s The Tor Project" % (TORBROWSER_VERSION, YEAR) plist = plistlib.readPlist(sys.stdin) diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index 8b85b5a..1a35eab 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -58,6 +58,8 @@ script: | tar xaf MacOSX10.7.sdk.tar.gz # cd tor-browser + TB_COMMIT_DATE=$(git show -s --format='%ci') + COPYRIGHT_YEAR=${TB_COMMIT_DATE%%-*} mv .mozconfig-mac .mozconfig # .git and the src takes up a lot of useless space, and we need the space to build #git archive HEAD | tar -x -C $OUTDIR/src @@ -101,7 +103,7 @@ script: | # Adjust the Info.plist file INFO_PLIST=TorBrowser.app/Contents/Info.plist mv $INFO_PLIST tmp.plist - ~/build/fix-info-plist.py $TORBROWSER_VERSION < tmp.plist > $INFO_PLIST + ~/build/fix-info-plist.py $TORBROWSER_VERSION $COPYRIGHT_YEAR < tmp.plist > $INFO_PLIST rm -f tmp.plist ~/build/re-dzip.sh TorBrowser.app/Contents/Resources/omni.ja ~/build/re-dzip.sh TorBrowser.app/Contents/Resources/webapprt/omni.ja

1 0

[tor-browser/tor-browser-38.2.1esr-5.5-2] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 09 Sep '15

09 Sep '15

commit 45666d66cbd1e51e0926e3ad14831af47aa8a44d Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Sep 4 21:57:43 2015 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. Bug #16707 - Use more system fonts for OS X and Windows --- browser/app/profile/000-tor-browser.js | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index b32728b..34b8e6e 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -247,21 +247,29 @@ pref("security.cert_pinning.enforcement_level", 2); #expand pref("torbrowser.version", __TOR_BROWSER_VERSION__); #endif -// If we are bundling fonts, only allow bundled fonts to be used. +// If we are bundling fonts, whitelist those bundled fonts, and restrict system fonts to a selection. #ifdef MOZ_BUNDLED_FONTS #ifdef XP_MACOSX -pref("font.system.whitelist", "Courier, Georgia, Verdana, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.system.whitelist", "AppleGothic, Arial, Courier, Geneva, Georgia, Heiti TC, Helvetica, Helvetica Neue, Hiragino Kaku Gothic ProN, Lucida Grande, Monaco, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi, STHeiti, Tahoma, Thonburi, Times, Times New Roman, Verdana"); +pref("font.name-list.cursive.x-unicode", "Apple Chancery, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); +pref("font.name-list.fantasy.x-unicode", "Papyrus, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); +pref("font.name-list.monospace.x-unicode", "Courier, Arial, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); +pref("font.name-list.sans-serif.x-unicode", "Helvetica, Tahoma, Arial, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); +pref("font.name-list.serif.x-unicode", "Times, Arial, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); +pref("font.name.cursive.ar", "Arial"); +pref("font.name.fantasy.ar", "Arial"); +pref("font.name.monospace.ar", "Arial"); +pref("font.name.sans-serif.ar", "Arial"); #endif #ifdef XP_WIN -pref("font.system.whitelist", "Courier New, Georgia, Arial, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.system.whitelist", "Arial, Batang, Courier New, Euphemia, Gautami, Georgia, Gulim, GulimChe, Iskoola Pota, Kalinga, Kartika, Latha, Lucida Console, MS Gothic, MS Mincho, MS PGothic, MS PMincho, MV Boli, Mangal, Microsoft Himalaya, Microsoft YaHei, MingLiU, Noto Sans Buginese, Noto Sans Khmer, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Yi, Nyala, PMingLiU, Plantagenet Cherokee, Raavi, Segoe UI, Shruti, SimSun, Sylfaen, Tahoma, Times New Roman, Tunga, Verdana, Vrinda"); #endif #ifdef XP_LINUX pref("font.system.whitelist", "Arimo, Arimo Bold, Arimo Italic, Arimo Bold Italic, Cousine, Tinos, Tinos Bold, Tinos Italic, Tinos Bold Italic, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); -#endif pref("font.default.lo", "Noto Sans Lao"); pref("font.default.my", "Noto Sans Myanmar"); @@ -456,3 +464,5 @@ pref("font.name.serif.zh-HK", "Noto Sans CJK SC Regular"); pref("font.name.serif.zh-TW", "Noto Sans CJK SC Regular"); #endif + +#endif

1 0

[tor-browser-bundle/master] Bug #16707: Bundle fewer Noto fonts
by gk＠torproject.org 09 Sep '15

09 Sep '15

commit eeb219db7b3a1539a4e79e9665f98ee2d32b62bf Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Sat Sep 5 05:30:27 2015 +0000 Bug #16707: Bundle fewer Noto fonts --- gitian/descriptors/mac/gitian-bundle.yml | 4 +--- gitian/descriptors/windows/gitian-bundle.yml | 6 ++---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index dabe619..da441a2 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -56,7 +56,6 @@ files: - "mar-tools-mac64.zip" - "tbb-docs.zip" - "mac-tor.sh" -- "NotoSansCJKsc-Regular.otf" script: | INSTDIR="$HOME/install" source versions @@ -126,7 +125,7 @@ script: | # # Install fonts. mkdir -p $TORBROWSER_NAME.app/Contents/Resources/fonts - NOTO_FONTS_HINTED="NotoNaskhArabic-Regular.ttf NotoSansArmenian-Regular.ttf NotoSansBengali-Regular.ttf NotoSansDevanagari-Regular.ttf NotoSansEthiopic-Regular.ttf NotoSansGeorgian-Regular.ttf NotoSansGujarati-Regular.ttf NotoSansGurmukhi-Regular.ttf NotoSansHebrew-Regular.ttf NotoSansKannada-Regular.ttf NotoSansKhmer-Regular.ttf NotoSansLao-Regular.ttf NotoSansMalayalam-Regular.ttf NotoSansMyanmar-Regular.ttf NotoSansOriya-Regular.ttf NotoSansSinhala-Regular.ttf NotoSansTamil-Regular.ttf NotoSansTelugu-Regular.ttf NotoSansThaana-Regular.ttf NotoSansThai-Regular.ttf NotoSansTibetan-Regular.ttf NotoSerifArmenian-Regular.ttf NotoSerifKhmer-Regular.ttf NotoSerifLao-Regular.ttf NotoSerifThai-Regular.ttf" + NOTO_FONTS_HINTED="NotoSansArmenian-Regular.ttf NotoSansBengali-Regular.ttf NotoSansDevanagari-Regular.ttf NotoSansEthiopic-Regular.ttf NotoSansGujarati-Regular.ttf NotoSansGurmukhi-Regular.ttf NotoSansKannada-Regular.ttf NotoSansKhmer-Regular.ttf NotoSansLao-Regular.ttf NotoSansMalayalam-Regular.ttf NotoSansMyanmar-Regular.ttf NotoSansOriya-Regular.ttf NotoSansSinhala-Regular.ttf NotoSansTamil-Regular.ttf NotoSansTelugu-Regular.ttf NotoSansThaana-Regular.ttf NotoSansTibetan-Regular.ttf" for fontfile in $NOTO_FONTS_HINTED; do cp "noto-fonts/hinted/$fontfile" $TORBROWSER_NAME.app/Contents/Resources/fonts/ done @@ -134,7 +133,6 @@ script: | for fontfile in $NOTO_FONTS_UNHINTED; do cp "noto-fonts/unhinted/$fontfile" $TORBROWSER_NAME.app/Contents/Resources/fonts/ done - cp NotoSansCJKsc-Regular.otf $TORBROWSER_NAME.app/Contents/Resources/fonts/ # unzip tor-mac$GBUILD_BITS-gbuilt.zip if [ $BUILD_PT_BUNDLES ]; then diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index 649ff53..d4ae0fa 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -49,7 +49,6 @@ files: - "mar-tools-win32.zip" - "tbb-docs.zip" - "pe_checksum_fix.py" -- "NotoSansCJKsc-Regular.otf" script: | INSTDIR="$HOME/install" source versions @@ -115,15 +114,14 @@ script: | # # Install fonts. mkdir -p tbb-windows-installer/"Tor Browser"/Browser/fonts - NOTO_FONTS_HINTED="NotoNaskhArabic-Regular.ttf NotoSansArmenian-Regular.ttf NotoSansBengali-Regular.ttf NotoSansDevanagari-Regular.ttf NotoSansEthiopic-Regular.ttf NotoSansGeorgian-Regular.ttf NotoSansGujarati-Regular.ttf NotoSansGurmukhi-Regular.ttf NotoSansHebrew-Regular.ttf NotoSansKannada-Regular.ttf NotoSansKhmer-Regular.ttf NotoSansLao-Regular.ttf NotoSansMalayalam-Regular.ttf NotoSansMyanmar-Regular.ttf NotoSansOriya-Regular.ttf NotoSansSinhala-Regular.ttf NotoSansTamil-Regular.ttf NotoSansTelugu-Regular.ttf NotoSansThaana-Regular.ttf NotoSansThai-Regular.ttf NotoSansTibetan-Regular.ttf NotoSerifArmenian-Regular.ttf NotoSerifKhmer-Regular.ttf NotoSerifLao-Regular.ttf NotoSerifThai-Regular.ttf" + NOTO_FONTS_HINTED="NotoSansKhmer-Regular.ttf NotoSansLao-Regular.ttf NotoSansMyanmar-Regular.ttf" for fontfile in $NOTO_FONTS_HINTED; do cp "noto-fonts/hinted/$fontfile" tbb-windows-installer/"Tor Browser"/Browser/fonts/ done - NOTO_FONTS_UNHINTED="NotoSansCanadianAboriginal-Regular.ttf NotoSansBuginese-Regular.ttf NotoSansCherokee-Regular.ttf NotoSansMongolian-Regular.ttf NotoSansYi-Regular.ttf" + NOTO_FONTS_UNHINTED="NotoSansBuginese-Regular.ttf NotoSansYi-Regular.ttf" for fontfile in $NOTO_FONTS_UNHINTED; do cp "noto-fonts/unhinted/$fontfile" tbb-windows-installer/"Tor Browser"/Browser/fonts/ done - cp NotoSansCJKsc-Regular.otf tbb-windows-installer/"Tor Browser"/Browser/fonts/ # cd tbb-windows-installer/"Tor Browser" unzip ~/build/tor-browser-win32-gbuilt.zip

1 0

[tor-browser-bundle/master] Merge remote-tracking branch 'arthur/16707'
by gk＠torproject.org 09 Sep '15

09 Sep '15

commit 10a4658832496eba75ae0b30ee3dbb25823dd23b Merge: 3dd1fc4 eeb219d Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 9 07:42:44 2015 +0000 Merge remote-tracking branch 'arthur/16707' gitian/descriptors/mac/gitian-bundle.yml | 4 +--- gitian/descriptors/windows/gitian-bundle.yml | 6 ++---- 2 files changed, 3 insertions(+), 7 deletions(-)

1 0

[tor-browser-bundle/master] Bug 16551: generate a downloads.json file
by gk＠torproject.org 08 Sep '15

08 Sep '15

commit 3dd1fc4afa36266027a2785a443757b2c6c3d93d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Aug 21 16:40:03 2015 +0200 Bug 16551: generate a downloads.json file --- gitian/check-prerequisites.sh | 2 +- tools/update-responses/README.md | 6 ++--- tools/update-responses/update_responses | 41 +++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 4 deletions(-) diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh index 8518ffe..32c9b7b 100755 --- a/gitian/check-prerequisites.sh +++ b/gitian/check-prerequisites.sh @@ -60,7 +60,7 @@ else exit 1 fi -update_responses_pkg="libyaml-perl libfile-slurp-perl libxml-writer-perl libio-captureoutput-perl libfile-which-perl libparallel-forkmanager-perl libxml-libxml-perl libwww-perl" +update_responses_pkg="libyaml-perl libfile-slurp-perl libxml-writer-perl libio-captureoutput-perl libfile-which-perl libparallel-forkmanager-perl libxml-libxml-perl libwww-perl libjson-perl" missing_pkg='' for pkg in $update_responses_pkg do diff --git a/tools/update-responses/README.md b/tools/update-responses/README.md index 5fe69a2..5440b0d 100644 --- a/tools/update-responses/README.md +++ b/tools/update-responses/README.md @@ -14,7 +14,7 @@ Dependencies The following perl modules need to be installed to run the script: FindBin YAML File::Slurp Digest::SHA XML::Writer File::Temp IO::CaptureOutput File::Which Parallel::ForkManager XML::LibXML - LWP + LWP JSON On Debian / Ubuntu you can install them with: @@ -23,7 +23,7 @@ On Debian / Ubuntu you can install them with: libdigest-sha-perl libxml-writer-perl \ libio-captureoutput-perl libfile-which-perl \ libparallel-forkmanager-perl libxml-libxml-perl \ - libwww-perl + libwww-perl libjson-perl ``` On Red Hat / Fedora you can install them with: @@ -31,7 +31,7 @@ On Red Hat / Fedora you can install them with: ``` # for module in FindBin YAML File::Slurp Digest::SHA XML::Writer \ File::Temp IO::CaptureOutput File::Which \ - Parallel::ForkManager XML::LibXML LWP + Parallel::ForkManager XML::LibXML LWP JSON do yum install "perl($module)"; done ``` diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index b1b3331..72a19d7 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -19,6 +19,7 @@ use Parallel::ForkManager; use File::Basename; use XML::LibXML '1.70'; use LWP::Simple; +use JSON; # Set umask and locale to provide a consistent environment for MAR file # generation, etc. @@ -109,6 +110,32 @@ sub get_version_files { $config->{versions}{$version}{files} = $files; } +sub get_version_downloads { + my ($config, $version) = @_; + my $downloads = {}; + my $vdir = "$releases_dir/$version"; + opendir(my $d, $vdir) or exit_error "Error opening directory $vdir"; + foreach my $file (readdir $d) { + next unless -f "$vdir/$file"; + my ($os, $lang); + if ($file =~ m/^TorBrowser-$version-osx64_(.+).dmg$/) { + ($os, $lang) = ('osx64', $1); + } elsif ($file =~ m/^tor-browser-(linux32|linux64)-${version}_(.+).tar.xz$/) { + ($os, $lang) = ($1, $2); + } elsif ($file =~ m/^torbrowser-install-${version}_(.+).exe$/) { + ($os, $lang) = ('win32', $1); + } else { + next; + } + $downloads->{$os}{$lang} = { + binary => "$config->{versions}{$version}{download_url}/$file", + sig => "$config->{versions}{$version}{download_url}/$file.asc", + }; + } + closedir $d; + $config->{versions}{$version}{downloads} = $downloads; +} + sub extract_mar { my ($mar_file, $dest_dir) = @_; my $old_cwd = getcwd; @@ -301,6 +328,19 @@ sub write_htaccess { } } +sub write_downloads_json { + my ($config, @channels) = @_; + @channels = keys %{$config->{channels}} unless @channels; + foreach my $channel (@channels) { + my $version = $config->{channels}{$channel}; + my $data = { + version => $version, + downloads => get_version_downloads($config, $version), + }; + write_htdocs($channel, 'downloads.json', encode_json($data)); + } +} + sub check_deps { foreach my $bin (qw(bunzip2 mar mbsdiff make_incremental_update.sh)) { exit_error "Cannot find $bin in PATH" unless which($bin); @@ -501,6 +541,7 @@ my %actions = ( } write_responses($config, @channels); write_htaccess($config, @channels); + write_downloads_json($config, @channels); clean_htdocs(@channels); }, gen_incrementals => sub {

1 0

[torbutton/master] Bug 16887: Update intl.accept_languages value
by gk＠torproject.org 07 Sep '15

07 Sep '15

commit c39a9540dc693d8f5b14636c643530f29e1c0ead Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 7 14:01:53 2015 +0000 Bug 16887: Update intl.accept_languages value We previously spoofed the `intl.accept_languages` value to "en-us, en" but with the update to ESR 38 Firefox does not like the lower case country code anymore. See: https://html5.org/r/8458 and https://bugzilla.mozilla.org/show_bug.cgi?id=889335 for the reasons behind that. We adapt our code accordingly and set the default value to "en-US, en" now. This fixes #13277 as well. Thanks for this patch, cypherpunk. --- src/chrome/content/torbutton.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 28da420..11591dc 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2207,10 +2207,10 @@ function torbutton_update_fingerprinting_prefs() { m_tb_prefs.clearUserPref("browser.display.max_font_attempts"); if(m_tb_prefs.prefHasUserValue("browser.display.max_font_count")) m_tb_prefs.clearUserPref("browser.display.max_font_count"); - - // Governed also by the spoof_english dialog.. + + // Governed also by the spoof_english dialog.. if (m_tb_prefs.getBoolPref("extensions.torbutton.spoof_english")) { - m_tb_prefs.setCharPref("intl.accept_languages", "en-us, en"); + m_tb_prefs.setCharPref("intl.accept_languages", "en-US, en"); m_tb_prefs.setCharPref("intl.accept_charsets", "iso-8859-1,*,utf-8"); m_tb_prefs.setCharPref("intl.charsetmenu.browser.cache", "UTF-8"); m_tb_prefs.setBoolPref("javascript.use_us_english_locale", true);

1 0

[tor-browser-bundle/master] Bug 16960: OS X nightly tor target is broken
by gk＠torproject.org 04 Sep '15

04 Sep '15

commit 96b9929f24d0461ec05b010c6a8d74506c8e2657 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 3 19:01:57 2015 +0000 Bug 16960: OS X nightly tor target is broken Commit b79e90f6ba9426158cf305655590f70d3ae89875 (which fixed bug 16901) makes it necessary to update our CFLAGS for cross-compiling tor for OS X. --- gitian/descriptors/mac/gitian-tor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 8e64922..848fbe9 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -50,7 +50,7 @@ script: | # Building tor # XXX Clean up these flags? - export CFLAGS="-m64 -I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" + export CFLAGS="-m64 -I${INSTDIR}/openssl/include -I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" export LDFLAGS="-m64 -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" cd tor git update-index --refresh -q

1 0

[tor-browser-bundle/master] Bug 10140: Support platform specific langpacks
by gk＠torproject.org 03 Sep '15

03 Sep '15

commit 5b34c06405a5524a5bc2b8ba42fd0587086dd52c Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Tue Sep 1 10:54:30 2015 +0000 Bug 10140: Support platform specific langpacks This patch allows to fetch Linux/Windows/OSX-specific language packs. Furthermore, it enables Japanese. --- gitian/descriptors/linux/gitian-bundle.yml | 3 ++- gitian/descriptors/mac/gitian-bundle.yml | 3 ++- gitian/descriptors/windows/gitian-bundle.yml | 3 ++- gitian/fetch-inputs.sh | 20 ++++++++++++++++++++ gitian/versions | 4 ++++ gitian/versions.alpha | 3 +++ gitian/versions.beta | 3 +++ gitian/versions.nightly | 3 +++ 8 files changed, 39 insertions(+), 3 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index f1d0554..afb632e 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -182,7 +182,8 @@ script: | # unzip linux-langpacks.zip cd linux-langpacks - for LANG in $BUNDLE_LOCALES + LINUX_LOCALES="$BUNDLE_LOCALES $BUNDLE_LOCALES_LINUX" + for LANG in $LINUX_LOCALES do xpi=$LANG.xpi cp -a ../tor-browser ../tor-browser_$LANG diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index a956fa7..dabe619 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -208,7 +208,8 @@ script: | # unzip mac-langpacks.zip cd mac-langpacks - for LANG in $BUNDLE_LOCALES + MAC_LOCALES="$BUNDLE_LOCALES $BUNDLE_LOCALES_MAC" + for LANG in $MAC_LOCALES do xpi=$LANG.xpi DEST=$TORBROWSER_APP diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index c674e1b..649ff53 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -173,7 +173,8 @@ script: | # unzip ../win32-langpacks.zip cd win32-langpacks - for LANG in $BUNDLE_LOCALES + WIN32_LOCALES="$BUNDLE_LOCALES $BUNDLE_LOCALES_WIN32" + for LANG in $WIN32_LOCALES do xpi=$LANG.xpi cp $xpi ../"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index a97ff62..42efa33 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -177,6 +177,7 @@ do fi done +# Fetch the common langpacks first, then the platform specific ones if any. mkdir -p langpacks-$FIREFOX_LANG_VER/linux-langpacks mkdir -p langpacks-$FIREFOX_LANG_VER/win32-langpacks mkdir -p langpacks-$FIREFOX_LANG_VER/mac-langpacks @@ -196,6 +197,25 @@ do cd .. done +for i in $BUNDLE_LOCALES_LINUX +do + cd linux-langpacks + wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/candidates/${FIREFOX_LANG_V…" + cd .. +done +for i in $BUNDLE_LOCALES_WIN32 +do + cd win32-langpacks + wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/candidates/${FIREFOX_LANG_V…" + cd .. +done +for i in $BUNDLE_LOCALES_MAC +do + cd mac-langpacks + wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/candidates/${FIREFOX_LANG_V…" + cd .. +done + "$WRAPPER_DIR/build-helpers/dzip.sh" ../win32-langpacks.zip win32-langpacks "$WRAPPER_DIR/build-helpers/dzip.sh" ../linux-langpacks.zip linux-langpacks "$WRAPPER_DIR/build-helpers/dzip.sh" ../mac-langpacks.zip mac-langpacks diff --git a/gitian/versions b/gitian/versions index 3df967e..b833342 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,5 +1,9 @@ TORBROWSER_VERSION_TYPE=release BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" +BUNDLE_LOCALES_LINUX="ja" +BUNDLE_LOCALES_WIN32="ja" +BUNDLE_LOCALES_MAC="ja-JP-mac" + BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 5005445..f37b98a 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -1,5 +1,8 @@ TORBROWSER_VERSION_TYPE=alpha BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" +BUNDLE_LOCALES_LINUX="ja" +BUNDLE_LOCALES_WIN32="ja" +BUNDLE_LOCALES_MAC="ja-JP-mac" BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 diff --git a/gitian/versions.beta b/gitian/versions.beta index 343d4b5..c2143a0 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -1,5 +1,8 @@ TORBROWSER_VERSION_TYPE=beta BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" +BUNDLE_LOCALES_LINUX="ja" +BUNDLE_LOCALES_WIN32="ja" +BUNDLE_LOCALES_MAC="ja-JP-mac" BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index afb82c5..f0551f5 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -3,6 +3,9 @@ TORBROWSER_VERSION=tbb-nightly TORBROWSER_BUILDDIR=tbb-nightly TORBROWSER_SYMLINK_VERSION=0 BUNDLE_LOCALES="ar ru zh-CN" +BUNDLE_LOCALES_LINUX="ja" +BUNDLE_LOCALES_WIN32="ja" +BUNDLE_LOCALES_MAC="ja-JP-mac" BUILD_PT_BUNDLES=1 VERIFY_TAGS=0

1 0

[tor-browser-bundle/maint-5.0] Bug 16973: Add the mar-tools dir to LD_LIBRARY_PATH
by gk＠torproject.org 03 Sep '15

03 Sep '15

commit f3a1676797a35a63ff2e40f89e6aab169b8661b0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 3 12:11:29 2015 +0200 Bug 16973: Add the mar-tools dir to LD_LIBRARY_PATH --- tools/update-responses/update_responses | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index a371403..a875774 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -329,6 +329,11 @@ sub extract_martools { chdir $old_cwd; exit_error "Error extracting $marzip" unless $success; $ENV{PATH} .= ":$martools_tmpdir/mar-tools"; + if ($ENV{LD_LIBRARY_PATH}) { + $ENV{LD_LIBRARY_PATH} .= ":$martools_tmpdir/mar-tools"; + } else { + $ENV{LD_LIBRARY_PATH} = "$martools_tmpdir/mar-tools"; + } } sub log_step {

1 0

[tor-browser-bundle/maint-5.0] Bug 16973: fix gpg keyring path
by gk＠torproject.org 03 Sep '15

03 Sep '15

commit badf55cb0fdda5c3c893f01f996a29a4e105d3d7 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 3 11:35:34 2015 +0200 Bug 16973: fix gpg keyring path The path defined in config.yml is relative to the tools/update-responses directory, but we usually run the script from the Makefile in the gitian directory. This patch makes it work from anywhere. --- tools/update-responses/update_responses | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index d238d3a..a371403 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -421,7 +421,7 @@ sub download_version { } } if (system('gpg', '--no-default-keyring', '--keyring', - $config->{download}{gpg_keyring}, '--verify', + "$FindBin::Bin/$config->{download}{gpg_keyring}", '--verify', "$tmpdir/sha256sums-unsigned-build.txt.asc", "$tmpdir/sha256sums-unsigned-build.txt")) { exit_error "Error checking gpg signature for version $version";

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

tbb-commits