- tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 26410: Stop using old MAR format in the next esr60-based alpha
by gk＠torproject.org 29 Jun '18

29 Jun '18

commit 2846221abfaeb05837e7d4a2056741df555dbd5e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Jun 28 14:29:24 2018 +0200 Bug 26410: Stop using old MAR format in the next esr60-based alpha However we keep setting MAR_OLD_FORMAT=1 on the stable release for now. --- Makefile | 6 +++--- projects/tor-browser/build | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 3b5c2d9..b667960 100644 --- a/Makefile +++ b/Makefile @@ -119,7 +119,7 @@ incrementals-release: submodule-update incrementals-alpha: submodule-update $(rbm) build release --step update_responses_config --target alpha --target create_unsigned_incrementals tools/update-responses/download_missing_versions alpha - MAR_OLD_FORMAT=1 tools/update-responses/gen_incrementals alpha + tools/update-responses/gen_incrementals alpha $(rbm) build release --step hash_incrementals --target alpha update_responses-release: submodule-update @@ -138,9 +138,9 @@ dmg2mar-release: submodule-update dmg2mar-alpha: submodule-update $(rbm) build release --step update_responses_config --target alpha --target signed - MAR_OLD_FORMAT=1 $(rbm) build release --step dmg2mar --target alpha --target signed + $(rbm) build release --step dmg2mar --target alpha --target signed tools/update-responses/download_missing_versions alpha - CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 MAR_OLD_FORMAT=1 tools/update-responses/gen_incrementals alpha + CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals alpha submodule-update: git submodule update --init diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 0c3e583..50fdc30 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -264,9 +264,11 @@ popd cd $distdir [% IF c("var/build_mar") -%] - # Let's use the bzip2 format for now so that users can update to the first - # esr60-based Tor Browser. - export MAR_OLD_FORMAT=1 + [% IF c("var/release") -%] + # Let's use the bzip2 format for now so that users can update to the first + # esr60-based Tor Browser. + export MAR_OLD_FORMAT=1 + [% END -%] # Create full MAR file and compressed package. MAR_FILE=tor-browser-[% c("var/mar_osname") %]-[% c("var/torbrowser_version") %]_${PKG_LOCALE}.mar MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/$MAR_FILE "$TBDIR"

1 0

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

29 Jun '18

commit 660007aa541e3c8cc4fda2776e8a277fdbc74915 Merge: c2f11e3 2846221 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 29 11:29:06 2018 +0000 Merge remote-tracking branch 'boklm/bug_26410' Makefile | 6 +++--- projects/tor-browser/build | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-)

1 0

[tor-browser-build/master] Fix HTTPS Everywhere version in the changelog
by boklm＠torproject.org 29 Jun '18

29 Jun '18

commit c2f11e3720f2a5429f4cd32af73b94d655002712 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Jun 29 12:32:39 2018 +0200 Fix HTTPS Everywhere version in the changelog Reported in a comment on the blog: https://blog.torproject.org/comment/275985#comment-275985 --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 5f52bbe..516e81f 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -20,7 +20,7 @@ Tor Browser 8.0a9 -- June 27 2018 * Bug 20890: Increase control port connection timeout * Bug 20628: Add more locales to Tor Browser * Translations update - * Update HTTPS Everywhere to 2018.6.13 + * Update HTTPS Everywhere to 2018.6.21 * Update NoScript to 10.1.8.2 * Bug 25543: Rebase Tor Browser patches for ESR60 * Bug 23247: Show security state of .onions

1 0

[torbutton/master] Bug 26500: Reposition circuit display relay icon for RTL locales
by gk＠torproject.org 27 Jun '18

27 Jun '18

commit b61ed65010816c8ceb4361dbd02a278347dca91b Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Jun 25 11:37:47 2018 -0700 Bug 26500: Reposition circuit display relay icon for RTL locales It seems -moz-locale-dir(rtl) works in XUL; dir(rtl) does not. --- src/chrome/skin/tor-circuit-display.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/skin/tor-circuit-display.css b/src/chrome/skin/tor-circuit-display.css index c9e682a..ed17f91 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:dir(rtl) { +#circuit-display-content:-moz-locale-dir(rtl) { background-position: calc(100% - 1em) 1em; }

1 0

[tor-browser-build/master] Add newline at the end of projects/release/update_responses_config.yml
by boklm＠torproject.org 27 Jun '18

27 Jun '18

commit 7a338d60a3106b70d411a6ebd1095bf3bc6862f4 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jun 27 22:11:42 2018 +0200 Add newline at the end of projects/release/update_responses_config.yml --- projects/release/update_responses_config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml index 0c49fe1..92c2203 100644 --- a/projects/release/update_responses_config.yml +++ b/projects/release/update_responses_config.yml @@ -46,4 +46,4 @@ versions: win32: minSupportedOSVersion: 6.1 win64: - minSupportedOSVersion: 6.1 \ No newline at end of file + minSupportedOSVersion: 6.1

1 0

[tor-browser-build/master] Bug 26319: Don't package up the whole Tor Browser in the `mach package` step
by gk＠torproject.org 27 Jun '18

27 Jun '18

commit 8d1c4c396034b2ab0b7c55982e1900236f5031a6 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri Jun 22 15:51:51 2018 -0400 Bug 26319: Don't package up the whole Tor Browser in the `mach package` step This commit sets `mach build stage-package` instead of `mach package` in the Firefox build; this helps us to use the useful properties of `mach package` but avoids creating the final DMG or EXE during the Firefox build which we don't want as we do that later when building Tor Browser. We no longer need to patch `installer.py` (bug 26205) but we still need the patch for the uninstaller otherwise the Firefox build fails trying to find the required NSIS files. The no-dmg.patch for macOS is also not required and is removed (bug 24632). --- projects/firefox/build | 6 +----- projects/firefox/config | 2 -- projects/firefox/no-dmg.patch | 29 -------------------------- projects/firefox/nsis-uninstall.patch | 39 +++++------------------------------ 4 files changed, 6 insertions(+), 70 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index e6fa41c..1921f53 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -138,16 +138,12 @@ fi patch -p1 < $rootdir/1467041.patch [% END -%] -[% IF c("var/osx") %] - patch -p1 < $rootdir/no-dmg.patch -[% END -%] - rm -f configure rm -f js/src/configure ./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 +./mach build stage-package [% IF c("var/osx") %] cp -a obj-macos/dist/firefox/* $distdir diff --git a/projects/firefox/config b/projects/firefox/config index 303ca0d..3284ed4 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -93,8 +93,6 @@ input_files: 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 --git a/projects/firefox/no-dmg.patch b/projects/firefox/no-dmg.patch deleted file mode 100644 index 1e722af..0000000 --- a/projects/firefox/no-dmg.patch +++ /dev/null @@ -1,29 +0,0 @@ -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/firefox/nsis-uninstall.patch b/projects/firefox/nsis-uninstall.patch index 765ef67..60e4e3d 100644 --- a/projects/firefox/nsis-uninstall.patch +++ b/projects/firefox/nsis-uninstall.patch @@ -1,14 +1,13 @@ -From 4ef264b601ac92a0b385c40bd011ef94618a176a Mon Sep 17 00:00:00 2001 +From e338a77c64c0afb72e857c7daa63346d35ad3891 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue, 12 Jun 2018 21:58:24 -0400 Subject: [PATCH 1/1] Bug 26205: Don't build the uninstaller for Windows during Firefox compilation --- - browser/Makefile.in | 4 ---- - browser/installer/Makefile.in | 4 ---- - .../mozbuild/mozbuild/repackaging/installer.py | 17 +---------------- - 3 files changed, 1 insertion(+), 24 deletions(-) + browser/Makefile.in | 4 ---- + browser/installer/Makefile.in | 4 ---- + 2 files changed, 8 deletions(-) diff --git a/browser/Makefile.in b/browser/Makefile.in index 2eb9e708f68e..0c9442183942 100644 @@ -40,34 +39,6 @@ index 1bf11252ee06..dee6d5434106 100644 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) MOZ_PKG_MAC_DSSTORE=$(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/dsstore MOZ_PKG_MAC_BACKGROUND=$(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/background.png -diff --git a/python/mozbuild/mozbuild/repackaging/installer.py b/python/mozbuild/mozbuild/repackaging/installer.py -index 9b49eb555153..1e6f6e73c3d8 100644 ---- a/python/mozbuild/mozbuild/repackaging/installer.py -+++ b/python/mozbuild/mozbuild/repackaging/installer.py -@@ -27,22 +27,7 @@ def repackage_installer(topsrcdir, tag, setupexe, package, output, package_name, - tmpdir = tempfile.mkdtemp() - old_cwd = os.getcwd() - try: -- if package: -- z = zipfile.ZipFile(package) -- z.extractall(tmpdir) -- z.close() -- -- # Copy setup.exe into the root of the install dir, alongside the -- # package. -- shutil.copyfile(setupexe, mozpath.join(tmpdir, mozpath.basename(setupexe))) -- -- # archive_exe requires us to be in the directory where the package is -- # unpacked (the tmpdir) -- os.chdir(tmpdir) -- -- sfx_package = mozpath.join(topsrcdir, sfx_stub) -- -- archive_exe(package_name, tag, sfx_package, output) -+ pass - - finally: - os.chdir(old_cwd) -- -2.17.1 +2.18.0.rc2

1 0

[tor-browser-build/master] Bug 26515: Update Tor Browser blog post URLs
by gk＠torproject.org 27 Jun '18

27 Jun '18

commit 7bace2c620e8ba1f31bcf70deee366c383401022 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jun 27 09:47:03 2018 +0200 Bug 26515: Update Tor Browser blog post URLs --- projects/release/update_responses_config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml index 9f33424..0c49fe1 100644 --- a/projects/release/update_responses_config.yml +++ b/projects/release/update_responses_config.yml @@ -29,7 +29,7 @@ versions: 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 + detailsURL: https://blog.torproject.org/new-release-tor-browser-[% c("var/torbrowser_version") FILTER remove('\.') %] incremental_from: [% FOREACH v IN c("var/torbrowser_incremental_from") -%] - [% v %]

1 0

[tor-browser-build/master] Bug 26355: Make sure only Windows users on Windows7+ are trying to use Tor Browser based on ESR60 (tor-browser-build)
by boklm＠torproject.org 27 Jun '18

27 Jun '18

commit 2b04f4ee916a43a70c436a52c83205eda5f38648 Author: Richard Pospesel <richard(a)torproject.org> Date: Thu Jun 21 17:12:13 2018 -0700 Bug 26355: Make sure only Windows users on Windows7+ are trying to use Tor Browser based on ESR60 (tor-browser-build) Edited the update_responses generation script to require version 6.1 of Windows (Windows 7) to get updates --- projects/release/update_responses_config.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml index 6861124..9f33424 100644 --- a/projects/release/update_responses_config.yml +++ b/projects/release/update_responses_config.yml @@ -43,3 +43,7 @@ versions: minSupportedOSVersion: 13.0.0 osx64: minSupportedOSVersion: 13.0.0 + win32: + minSupportedOSVersion: 6.1 + win64: + minSupportedOSVersion: 6.1 \ No newline at end of file

1 0

[tor-browser-build/master] Bug 26489: fix .app directory name in tools/dmg2mar
by gk＠torproject.org 26 Jun '18

26 Jun '18

commit 1633185de3336351f47cb66b99903ef70b04d6ff Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jun 25 14:41:39 2018 +0200 Bug 26489: fix .app directory name in tools/dmg2mar Add the whitespace in "Tor Browser.app". --- tools/dmg2mar | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/dmg2mar b/tools/dmg2mar index 51d6acb..9b98956 100755 --- a/tools/dmg2mar +++ b/tools/dmg2mar @@ -36,9 +36,10 @@ use Parallel::ForkManager; use Cwd; # If the application is not TorBrowser (for instance, TorMessenger) -# set the application name in the TOR_APPNAME_BUNDLE_OSX and in -# the TOR_APPNAME_MARFILE environment variables -my $appname = $ENV{TOR_APPNAME_BUNDLE_OSX} // 'TorBrowser'; +# set the application name in the TOR_APPNAME_BUNDLE_OSX, +# TOR_APPNAME_DMGFILE and TOR_APPNAME_MARFILE environment variables +my $appname = $ENV{TOR_APPNAME_BUNDLE_OSX} // 'Tor Browser'; +my $appname_dmg = $ENV{TOR_APPNAME_DMGFILE} // 'TorBrowser'; my $appname_mar = $ENV{TOR_APPNAME_MARFILE} // 'tor-browser'; sub exit_error { @@ -95,7 +96,7 @@ sub get_dmg_files_from_sha256sums { foreach my $line (read_file('sha256sums-unsigned-build.txt')) { my (undef, $filename) = split ' ', $line; chomp $filename; - next unless $filename =~ m/^$appname-(.+)-osx64_(.+)\.dmg$/; + next unless $filename =~ m/^$appname_dmg-(.+)-osx64_(.+)\.dmg$/; push @files, { filename => $filename, version => $1, lang => $2 }; } return @files;

1 0

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

26 Jun '18

commit 5d5401f7a0831702d913d5e469f70954c5796edb Merge: ce2f13c 1633185 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jun 26 19:30:03 2018 +0000 Merge remote-tracking branch 'boklm/bug_26489' tools/dmg2mar | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)

1 0