- tbb-commits - lists.torproject.org

[tor-browser-bundle/master] Bug 19316: add support for minSupportedInstructionSet in config.yml
by gk＠torproject.org 19 Apr '17

19 Apr '17

commit 70961a33301ca42b1fe3eb9eee87ea16bef4fea2 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Apr 19 12:14:04 2017 +0200 Bug 19316: add support for minSupportedInstructionSet in config.yml --- tools/update-responses/update_responses | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index b7f4b63..0ed19c1 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -292,6 +292,7 @@ sub get_response { goto CLOSETAGS; } my $minversion = get_config($config, $version, $os, 'minSupportedOSVersion'); + my $mininstruc = get_config($config, $version, $os, 'minSupportedInstructionSet'); $writer->startTag('update', type => 'minor', displayVersion => $version, @@ -302,6 +303,7 @@ sub get_response { actions => 'showURL', openURL => get_config($config, $version, $os, 'detailsURL'), defined $minversion ? ( minSupportedOSVersion => $minversion ) : (), + defined $mininstruc ? ( minSupportedInstructionSet => $mininstruc ) : (), ); foreach my $patch (@patches) { my @sorted_patch = map { $_ => $patch->{$_} } sort keys %$patch;

1 0

[tor-browser-bundle/master] Pick up build3 from Mozilla and bug fixes
by gk＠torproject.org 18 Apr '17

18 Apr '17

commit 421091532d3536893e715f62cab9055cd822b95a Author: Georg Koppen <gk(a)torproject.org> Date: Tue Apr 18 11:26:23 2017 +0000 Pick up build3 from Mozilla and bug fixes --- Bundle-Data/Docs/ChangeLog.txt | 3 +++ gitian/versions.alpha | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 3d36c6e..b2ee463 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -58,10 +58,12 @@ Tor Browser 7.0a3 -- April 20 2017 * Bug 21723: Fix inconsistent generation of MOZ_MACBUNDLE_ID * Bug 21724: Make Firefox and Tor Browser distinct macOS apps * Bug 21931: Backport OSX SetupMacCommandLine updater fixes + * Bug 15910: Don't download GMPs via the local fallback * Linux * Bug 21907: Fix runtime error on CentOS 6 * Bug 21748: Fix broken Snowflake build and update bridge details * Bug 21954: Snowflake breaks the 7.0a3 build + * Bug 15910: Don't download GMPs via the local fallback * Build system * Windows * Bug 21837: Fix reproducibility of accessibility code for Windows @@ -78,6 +80,7 @@ Tor Browser 7.0a3 -- April 20 2017 * Linux * Bug 21930: NSS libraries are missing from mar-tools archive * Bug 21239: Adapt Linux Firefox descriptor to ESR52 (use GTK2) + * Bug 21960: Linux bundles based on ESR 52 are not reproducible anymore * Bug 21629: Fix broken ASan builds when switching to ESR 52 Tor Browser 7.0a2-hardened -- March 7 2017 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index b16341a..fffb050 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -14,7 +14,7 @@ FIREFOX_VERSION=52.1.0esr TORBROWSER_UPDATE_CHANNEL=alpha -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.0-1-build2 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.0-2-build1 TOR_TAG=tor-0.3.0.5-rc TORLAUNCHER_TAG=0.2.12 TORBUTTON_TAG=1.9.7.2 @@ -48,12 +48,12 @@ GO_WEBRTC_TAG=ab1b64862e0c4b4182010699911c2c5818f0a101 SNOWFLAKE_TAG=9f2e9a6ecb696149708716ca06ce842df03cf492 UNIURI_TAG=8902c56451e9b58ff940bbe5fec35d5f9c04584a -GITIAN_TAG=tor-browser-builder-4-3 +GITIAN_TAG=tor-browser-builder-4-4 OPENSSL_VER=1.0.2k GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build2 +FIREFOX_LANG_BUILD=build3 BINUTILS_VER=2.24 GCC_VER=5.1.0 CLANG_VER=3.8.0

1 0

[tor-browser/tor-browser-52.1.0esr-7.0-2] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 18 Apr '17

18 Apr '17

commit 72667935298e11ca5a0e2e5202a5d9e33981eedf Author: Georg Koppen <gk(a)torproject.org> Date: Tue Apr 18 11:09:53 2017 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. This blocks downloading GMPs via the new local fallback. See: https://trac.torproject.org/projects/tor/ticket/15910#comment:25 --- browser/app/profile/000-tor-browser.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index e07a5a1..305666a 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -195,6 +195,10 @@ pref("media.navigator.enabled", false); // clever solution for https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=769716. pref("media.gmp-provider.enabled", false); pref("media.gmp-manager.url.override", "data:text/plain,"); +// Since ESR52 it is not enough anymore to block pinging the GMP update/download +// server. There is a local fallback that must be blocked now as well. See: +// https://bugzilla.mozilla.org/show_bug.cgi?id=1267495. +pref("media.gmp-manager.updateEnabled", false); // EME prefs: Strictly speaking these prefs don't need to be set as we are // using the --disable-eme compile flag. However, in order to not confuse users, // who might stumble upon them while looking into about:config, we set them to

1 0

[gitian-builder/tor-browser-builder-4] Increase base VM size from 15360M to 20480M.
by gk＠torproject.org 17 Apr '17

17 Apr '17

commit 6185a530122f5476335bcd46dba6a3e8b3eefed8 Author: David Fifield <fifield(a)eecs.berkeley.edu> Date: Sat Apr 15 18:20:45 2017 -0700 Increase base VM size from 15360M to 20480M. Needed to hold the webrtc source code. https://bugs.torproject.org/21954#comment:2 --- bin/make-base-vm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/make-base-vm b/bin/make-base-vm index 9e796eb..4ada11f 100755 --- a/bin/make-base-vm +++ b/bin/make-base-vm @@ -172,7 +172,7 @@ if [ $LXC = "1" ]; then sudo cp $OUT-bootstrap/usr/lib/i386-linux-gnu/lxc/lxc-init $OUT-bootstrap/usr/sbin/init.lxc fi fi - dd if=/dev/zero of=$OUT-lxc bs=1M count=1 seek=15360 + dd if=/dev/zero of=$OUT-lxc bs=1M count=1 seek=20480 /sbin/mkfs.ext4 -F $OUT-lxc t=`mktemp -d gitian.XXXXXXXX` sudo mount $OUT-lxc $t @@ -191,7 +191,7 @@ else libexec/config-bootstrap-fixup rm -rf $OUT - env -i LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 sudo vmbuilder kvm $DISTRO --rootsize 20000 --arch=$ARCH --suite=$SUITE --addpkg=$addpkg --removepkg=$removepkg --ssh-key=var/id_rsa.pub --ssh-user-key=var/id_rsa.pub --mirror=$MIRROR --security-mirror=$SECURITY_MIRROR --dest=$OUT --flavour=$FLAVOUR --firstboot=`pwd`/target-bin/bootstrap-fixup + env -i LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 sudo vmbuilder kvm $DISTRO --rootsize 20480 --arch=$ARCH --suite=$SUITE --addpkg=$addpkg --removepkg=$removepkg --ssh-key=var/id_rsa.pub --ssh-user-key=var/id_rsa.pub --mirror=$MIRROR --security-mirror=$SECURITY_MIRROR --dest=$OUT --flavour=$FLAVOUR --firstboot=`pwd`/target-bin/bootstrap-fixup mv $OUT/*.qcow2 $OUT.qcow2 rm -rf $OUT # bootstrap-fixup is done on first boot

1 0

[tor-browser/tor-browser-52.1.0esr-7.0-1] Bug 1351071: Get rid of pre-generated startup cache r=glandium
by gk＠torproject.org 17 Apr '17

17 Apr '17

commit ec0b55bdfb638c63f30116b19583456632ad708d Author: Chris AtLee <catlee(a)mozilla.com> Date: Tue Apr 4 09:26:25 2017 -0400 Bug 1351071: Get rid of pre-generated startup cache r=glandium MozReview-Commit-ID: BcWcqEKwGBv --HG-- extra : rebase_source : 4bd21805a89359a5a2ed7ffd2ee2b76cf1e9e634 --- python/mozbuild/mozpack/packager/formats.py | 7 +- python/mozbuild/mozpack/packager/unpack.py | 8 +-- .../mozbuild/mozpack/test/test_packager_formats.py | 2 - toolkit/mozapps/installer/packager.py | 74 ---------------------- 4 files changed, 3 insertions(+), 88 deletions(-) diff --git a/python/mozbuild/mozpack/packager/formats.py b/python/mozbuild/mozpack/packager/formats.py index c4adaba..be5fafe 100644 --- a/python/mozbuild/mozpack/packager/formats.py +++ b/python/mozbuild/mozpack/packager/formats.py @@ -23,11 +23,6 @@ from mozpack.copier import ( Jarrer, ) -STARTUP_CACHE_PATHS = [ - 'jsloader', - 'jssubloader', -] - ''' Formatters are classes receiving packaging instructions and creating the appropriate package layout. @@ -321,4 +316,4 @@ class OmniJarSubFormatter(PiecemealFormatter): 'greprefs.js', 'hyphenation', 'update.locale', - ] or path[0] in STARTUP_CACHE_PATHS + ] diff --git a/python/mozbuild/mozpack/packager/unpack.py b/python/mozbuild/mozpack/packager/unpack.py index fa2b474..3f6633e 100644 --- a/python/mozbuild/mozpack/packager/unpack.py +++ b/python/mozbuild/mozpack/packager/unpack.py @@ -23,10 +23,7 @@ from mozpack.copier import ( FileCopier, ) from mozpack.packager import SimplePackager -from mozpack.packager.formats import ( - FlatFormatter, - STARTUP_CACHE_PATHS, -) +from mozpack.packager.formats import FlatFormatter from urlparse import urlparse @@ -188,8 +185,7 @@ def unpack_to_registry(source, registry): finder = UnpackFinder(source) packager = SimplePackager(FlatFormatter(registry)) for p, f in finder.find('*'): - if mozpath.split(p)[0] not in STARTUP_CACHE_PATHS: - packager.add(p, f) + packager.add(p, f) packager.close() diff --git a/python/mozbuild/mozpack/test/test_packager_formats.py b/python/mozbuild/mozpack/test/test_packager_formats.py index 1af4336..ca141b0 100644 --- a/python/mozbuild/mozpack/test/test_packager_formats.py +++ b/python/mozbuild/mozpack/test/test_packager_formats.py @@ -408,8 +408,6 @@ class TestFormatters(unittest.TestCase): self.assertTrue(is_resource(base, 'greprefs.js')) self.assertTrue(is_resource(base, 'hyphenation/foo')) self.assertTrue(is_resource(base, 'update.locale')) - self.assertTrue( - is_resource(base, 'jsloader/resource/gre/modules/foo.jsm')) self.assertFalse(is_resource(base, 'foo')) self.assertFalse(is_resource(base, 'foo/bar/greprefs.js')) self.assertTrue(is_resource(base, 'defaults/messenger/foo.dat')) diff --git a/toolkit/mozapps/installer/packager.py b/toolkit/mozapps/installer/packager.py index f2dc3fa..1a1b335 100644 --- a/toolkit/mozapps/installer/packager.py +++ b/toolkit/mozapps/installer/packager.py @@ -30,7 +30,6 @@ from argparse import ArgumentParser import os from StringIO import StringIO import subprocess -import platform import mozinfo # List of libraries to shlibsign. @@ -125,60 +124,6 @@ class LibSignFile(File): errors.fatal('Error while signing %s' % self.path) -def precompile_cache(registry, source_path, gre_path, app_path): - ''' - Create startup cache for the given application directory, using the - given GRE path. - - registry is a FileRegistry-like instance where to add the startup cache. - - source_path is the base path of the package. - - gre_path is the GRE path, relative to source_path. - - app_path is the application path, relative to source_path. - Startup cache for all resources under resource://app/ are generated, - except when gre_path == app_path, in which case it's under - resource://gre/. - ''' - from tempfile import mkstemp - source_path = os.path.abspath(source_path) - if app_path != gre_path: - resource = 'app' - else: - resource = 'gre' - app_path = os.path.join(source_path, app_path) - gre_path = os.path.join(source_path, gre_path) - - fd, cache = mkstemp('.zip') - os.close(fd) - os.remove(cache) - - try: - extra_env = {'MOZ_STARTUP_CACHE': cache} - if buildconfig.substs.get('MOZ_TSAN'): - extra_env['TSAN_OPTIONS'] = 'report_bugs=0' - if buildconfig.substs.get('MOZ_ASAN'): - extra_env['ASAN_OPTIONS'] = 'detect_leaks=0' - if launcher.launch(['xpcshell', '-g', gre_path, '-a', app_path, - '-f', os.path.join(os.path.dirname(__file__), - 'precompile_cache.js'), - '-e', 'precompile_startupcache("resource://%s/");' - % resource], - extra_linker_path=gre_path, - extra_env=extra_env): - errors.fatal('Error while running startup cache precompilation') - return - from mozpack.mozjar import JarReader - jar = JarReader(cache) - resource = '/resource/%s/' % resource - for f in jar: - if resource in f.filename: - path = f.filename[f.filename.index(resource) + len(resource):] - if registry.contains(path): - registry.add(f.filename, GeneratedFile(f.read())) - jar.close() - finally: - if os.path.exists(cache): - os.remove(cache) - - class RemovedFiles(GeneratedFile): ''' File class for removed-files. Is used as a preprocessor parser. @@ -389,25 +334,6 @@ def main(): if key in log: f.preload(log[key]) - # Fill startup cache - if isinstance(formatter, OmniJarFormatter) and launcher.can_launch() \ - and buildconfig.substs['MOZ_DISABLE_STARTUPCACHE'] != '1': - gre_path = None - def get_bases(): - for b in sink.packager.get_bases(addons=False): - for p in (mozpath.join('bin', b), b): - if os.path.exists(os.path.join(args.source, p)): - yield p - break - for base in sorted(get_bases()): - if not gre_path: - gre_path = base - omnijar_path = mozpath.join(sink.normalize_path(base), - buildconfig.substs['OMNIJAR_NAME']) - if formatter.contains(omnijar_path): - precompile_cache(formatter.copier[omnijar_path], - args.source, gre_path, base) - copier.copy(args.destination)

1 0

[tor-browser-bundle/master] Fixing typo in changelog
by gk＠torproject.org 17 Apr '17

17 Apr '17

commit 3491397ce91183922204e7e3e2a760f6f6de8f9a Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 17 14:49:21 2017 +0000 Fixing typo in changelog Thanks arma. --- Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 808a3bb..3d36c6e 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -45,7 +45,7 @@ Tor Browser 7.0a3 -- April 20 2017 * Bug 19955: Avoid confusing warning that favicon load request got cancelled * Bug 20005: Backport fixes for memory leaks investigation * Bug 20755: ltn.com.tw is broken in Tor Browser - * Bug 21896: Commenting on website is broken due to CAPTCHA not being disaplyed + * Bug 21896: Commenting on website is broken due to CAPTCHA not being displayed * Bug 20680: Rebase Tor Browser patches to 52 ESR * Bug 21917: Add new obfs4 bridges * Bug 21918: Move meek-amazon to d2cly7j4zqgua7.cloudfront.net backend

1 0

[tor-browser-build/master] Fix tor-browser.git branch for nightly build
by boklm＠torproject.org 15 Apr '17

15 Apr '17

commit 8abc7fb0e05c8470c55f38a4b2142d2a1949cc36 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sat Apr 15 22:26:07 2017 +0200 Fix tor-browser.git branch for nightly build --- projects/firefox/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/config b/projects/firefox/config index 408852f..14c1cd5 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -22,7 +22,7 @@ var: targets: 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

1 0

[tor-browser-bundle/master] Add new Gitian tag and update the Changelog
by gk＠torproject.org 15 Apr '17

15 Apr '17

commit 01e7e2c69107e78ffad79a932edbbf8d2b6fcc46 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Apr 15 19:31:40 2017 +0000 Add new Gitian tag and update the Changelog --- Bundle-Data/Docs/ChangeLog.txt | 1 + gitian/versions.alpha | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 7767a74..808a3bb 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -61,6 +61,7 @@ Tor Browser 7.0a3 -- April 20 2017 * Linux * Bug 21907: Fix runtime error on CentOS 6 * Bug 21748: Fix broken Snowflake build and update bridge details + * Bug 21954: Snowflake breaks the 7.0a3 build * Build system * Windows * Bug 21837: Fix reproducibility of accessibility code for Windows diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 72d7006..b16341a 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -48,7 +48,7 @@ GO_WEBRTC_TAG=ab1b64862e0c4b4182010699911c2c5818f0a101 SNOWFLAKE_TAG=9f2e9a6ecb696149708716ca06ce842df03cf492 UNIURI_TAG=8902c56451e9b58ff940bbe5fec35d5f9c04584a -GITIAN_TAG=tor-browser-builder-4-2 +GITIAN_TAG=tor-browser-builder-4-3 OPENSSL_VER=1.0.2k GMP_VER=5.1.3

1 0

[tor-browser-bundle/master] Bug 21954: Ignore dump_syms_regtest.o when building libwebrtc
by gk＠torproject.org 15 Apr '17

15 Apr '17

commit e9b16e19134655aa16a8840e09093e01692138d5 Author: Arlo Breault <arlolra(a)gmail.com> Date: Sat Apr 15 08:29:53 2017 -0400 Bug 21954: Ignore dump_syms_regtest.o when building libwebrtc This was mistakenly removed in 121de1ca (see bug 21748). --- gitian/descriptors/linux/gitian-webrtc.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gitian/descriptors/linux/gitian-webrtc.yml b/gitian/descriptors/linux/gitian-webrtc.yml index 0622fee..ccf2d4a 100644 --- a/gitian/descriptors/linux/gitian-webrtc.yml +++ b/gitian/descriptors/linux/gitian-webrtc.yml @@ -121,7 +121,8 @@ script: | "$GN" gen out/Release --args="$GN_ARGS" ninja -C out/Release webrtc field_trial metrics_default pc_test_utils # https://github.com/keroserene/go-webrtc/issues/23#issuecomment-175312648 - ar crs libwebrtc-magic.a $(find . -name '*.o' -not -name '*.main.o' | sort) + # libwebrtc-linux-386-magic.a(dump_syms_regtest.o): unsupported ELF file type 2 + ar crs libwebrtc-magic.a $(find . -name '*.o' -not -name '*.main.o' -not -name 'dump_syms_regtest.o' | sort) cd ../.. # Grabbing the result

1 0

[gitian-builder/tor-browser-builder-4] The WebRTC beast needs more space
by gk＠torproject.org 15 Apr '17

15 Apr '17

commit 5fbd2a1955328f1450a127f67be2c9d0e12c0ccb Author: Georg Koppen <gk(a)torproject.org> Date: Sat Apr 15 10:34:06 2017 +0000 The WebRTC beast needs more space --- bin/make-base-vm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/make-base-vm b/bin/make-base-vm index 59f0734..9e796eb 100755 --- a/bin/make-base-vm +++ b/bin/make-base-vm @@ -191,7 +191,7 @@ else libexec/config-bootstrap-fixup rm -rf $OUT - env -i LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 sudo vmbuilder kvm $DISTRO --rootsize 15360 --arch=$ARCH --suite=$SUITE --addpkg=$addpkg --removepkg=$removepkg --ssh-key=var/id_rsa.pub --ssh-user-key=var/id_rsa.pub --mirror=$MIRROR --security-mirror=$SECURITY_MIRROR --dest=$OUT --flavour=$FLAVOUR --firstboot=`pwd`/target-bin/bootstrap-fixup + env -i LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 sudo vmbuilder kvm $DISTRO --rootsize 20000 --arch=$ARCH --suite=$SUITE --addpkg=$addpkg --removepkg=$removepkg --ssh-key=var/id_rsa.pub --ssh-user-key=var/id_rsa.pub --mirror=$MIRROR --security-mirror=$SECURITY_MIRROR --dest=$OUT --flavour=$FLAVOUR --firstboot=`pwd`/target-bin/bootstrap-fixup mv $OUT/*.qcow2 $OUT.qcow2 rm -rf $OUT # bootstrap-fixup is done on first boot

1 0