June 2018 - tor-commits - lists.torproject.org

[tor-browser-spec/master] Fix typo in URL
by gk＠torproject.org 15 Jun '18

15 Jun '18

commit 1f99fbdb5a738899e4ee51f3c41aa1e83bb27eb8 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 15 15:37:39 2018 +0000 Fix typo in URL Thanks for nusenu for pointing that out. --- design-doc/design.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/design-doc/design.xml b/design-doc/design.xml index 71366d5..c8ef205 100644 --- a/design-doc/design.xml +++ b/design-doc/design.xml @@ -29,7 +29,7 @@ <address><email>gk#torproject org</email></address> </affiliation> </author> - <pubdate>May 15, 2018</pubdate> + <pubdate>June 15, 2018</pubdate> </articleinfo> <sect1> @@ -1429,7 +1429,7 @@ While the vast majority of web requests adheres to the circuit and connection unlinkability requirement there are still corner cases we <ulink url="https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-browser-52.5.2e…"> need to treat separately</ulink> or that -<ulink href="https://bugs.torproject.org/22343">lack a fix altogether</ulink>. +<ulink url="https://bugs.torproject.org/22343">lack a fix altogether</ulink>. </para> </listitem> <listitem><command>SharedWorkers</command>

1 0

[tor-browser-spec/master] Update MAR key generation for SHA-384
by gk＠torproject.org 15 Jun '18

15 Jun '18

commit 571ea37ca54bce230c634b1faa4f7ec15c4f526b Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 15 15:33:25 2018 +0000 Update MAR key generation for SHA-384 --- processes/KeyGeneration | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/processes/KeyGeneration b/processes/KeyGeneration index e10baee..2dad005 100644 --- a/processes/KeyGeneration +++ b/processes/KeyGeneration @@ -55,8 +55,8 @@ Key Creation Incantations and Instructions 1) `mkdir nssdb` 2) `certutil -d nssdb -N` -3) Choose a strong passphrase to protect the keys -4) `certutil -d nssdb -S -x -g 4096 -Z SHA512 -n marsigner -s "CN=Tor Browser MAR signing key" -t,,` +3) Choose a strong passphrase to protect the key +4) `certutil -d nssdb -S -x -g 4096 -Z SHA384 -n marsigner -s "CN=Tor Browser MAR signing key" -t,,` 5) If there should be additional keys in the database repeat step 4. Note, you need a different CN and ideally a different nickname ("marsigner" in the example above).

1 0

[tor-browser-build/master] Bug 25540: Don't ship sandboxed-tor-browser anymore
by boklm＠torproject.org 15 Jun '18

15 Jun '18

commit dc355882e235178d0a1889a7d96c5721faad2716 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 15 11:54:02 2018 +0000 Bug 25540: Don't ship sandboxed-tor-browser anymore sandboxed-tor-browser is not maintained anymore and Yawning requested to not ship it anymore in our alphas once we switch to Firefox 60 ESR. --- projects/goerrors/config | 17 ----------------- projects/gogb/config | 23 ----------------------- projects/gogb/gb-build-dir.patch | 31 ------------------------------- projects/release/build | 3 --- projects/release/config | 7 ------- projects/sandbox/build | 26 -------------------------- projects/sandbox/config | 32 -------------------------------- 7 files changed, 139 deletions(-) diff --git a/projects/goerrors/config b/projects/goerrors/config deleted file mode 100644 index 3c11fab..0000000 --- a/projects/goerrors/config +++ /dev/null @@ -1,17 +0,0 @@ -# vim: filetype=yaml sw=2 -version: '[% c("abbrev") %]' -git_url: https://github.com/pkg/errors -git_hash: 248dadf4e9068a0b3e79f02ed0a610d935de5302 -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' - -build: '[% c("projects/go/var/build_go_lib") %]' - -var: - container: - use_container: 1 - go_lib: github.com/pkg/errors - -input_files: - - project: container-image - - name: go - project: go diff --git a/projects/gogb/config b/projects/gogb/config deleted file mode 100644 index dcf30f6..0000000 --- a/projects/gogb/config +++ /dev/null @@ -1,23 +0,0 @@ -# vim: filetype=yaml sw=2 -version: '[% c("abbrev") %]' -git_url: https://github.com/constabulary/gb -git_hash: 06cc925cce6592e922dcc4839a8b44feb384e71e -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' - -build: '[% c("projects/go/var/build_go_lib") %]' - -var: - container: - use_container: 1 - go_lib: github.com/constabulary/gb - go_lib_install: github.com/constabulary/gb/cmd/gb - go_lib_deps: - - goerrors - -input_files: - - project: container-image - - name: go - project: go - - name: goerrors - project: goerrors - - filename: gb-build-dir.patch diff --git a/projects/gogb/gb-build-dir.patch b/projects/gogb/gb-build-dir.patch deleted file mode 100644 index a52ca69..0000000 --- a/projects/gogb/gb-build-dir.patch +++ /dev/null @@ -1,31 +0,0 @@ -From a7b198e3a32509197150d7c2767262a7319ff339 Mon Sep 17 00:00:00 2001 -From: Georg Koppen <gk(a)torproject.org> -Date: Tue, 6 Dec 2016 21:34:16 +0000 -Subject: [PATCH] Make the gb build directory deterministic - - -diff --git a/context.go b/context.go -index 53c00da..d040082 100644 ---- a/context.go -+++ b/context.go -@@ -3,7 +3,6 @@ package gb - import ( - "fmt" - "io" -- "io/ioutil" - "os" - "os/exec" - "path/filepath" -@@ -136,7 +135,8 @@ func NewContext(p Project, opts ...func(*Context) error) (*Context, error) { - }, - GcToolchain(), - } -- workdir, err := ioutil.TempDir("", "gb") -+ workdir := filepath.Join(os.TempDir(), "gb") -+ err := os.Mkdir(workdir, 0777) - if err != nil { - return nil, err - } --- -2.10.2 - diff --git a/projects/release/build b/projects/release/build index a73f017..882d26d 100644 --- a/projects/release/build +++ b/projects/release/build @@ -20,9 +20,6 @@ mkdir -p "$destdir" [% END -%] [% IF c("var/torbrowser-linux-x86_64") -%] mv [% c('input_files_by_name/linux-x86_64') %]/* "$destdir"/ - [% IF ! c("var/release") %] - mv [% c('input_files_by_name/sandbox-linux-x86_64') %] "$destdir"/sandbox-[% pc('sandbox', 'version') %]-linux64.zip - [% END %] [% END -%] cd "$destdir" cat > .htaccess <<EOF diff --git a/projects/release/config b/projects/release/config index 2aba446..236325b 100644 --- a/projects/release/config +++ b/projects/release/config @@ -87,13 +87,6 @@ input_files: - '[% c("var/build_target") %]' - 'torbrowser-linux-x86_64[% c("var/debug-build") %]' - - name: sandbox-linux-x86_64 - project: sandbox - enable: '[% c("var/torbrowser-linux-x86_64") && ! c("var/release") %]' - target: - - '[% c("var/build_target") %]' - - torbrowser-linux-x86_64 - - name: linux-i686 project: tor-browser enable: '[% c("var/torbrowser-linux-i686") %]' diff --git a/projects/sandbox/build b/projects/sandbox/build deleted file mode 100644 index 8a3edb3..0000000 --- a/projects/sandbox/build +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -[% pc('go', 'var/setup', { go_tarfile => c('input_files_by_name/go') }) %] -distdir=/var/tmp/dist/[% project %] -mkdir -p $distdir - -tar -C /var/tmp/dist -xf [% c('input_files_by_name/gogb') %] - -mkdir -p /var/tmp/build -tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz -cd /var/tmp/build/[% project %]-[% c('version') %] - -# we don't have access to the git repository during the build -sed -i Makefile -e 's|git rev-parse --short HEAD > data/revision|echo [% c("abbrev") %] > data/revision|' -# Unset GOOS and GOARCH as they change some file names, and we don't need -# them as we are only building on x86_64 -unset GOOS -unset GOARCH -make -cp bin/sandboxed-tor-browser $distdir - -cd $distdir/.. -[% c('zip', { - zip_src => [ project ], - zip_args => dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/sandbox/config b/projects/sandbox/config deleted file mode 100644 index 11fe6be..0000000 --- a/projects/sandbox/config +++ /dev/null @@ -1,32 +0,0 @@ -# vim: filetype=yaml sw=2 -version: 0.0.16 -git_url: https://git.torproject.org/tor-browser/sandboxed-tor-browser -git_hash: 'sandboxed-tor-browser-[% c("version") %]' -tag_gpg_id: 1 -gpg_keyring: obfs4.gpg -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' - -var: - container: - use_container: 1 - suite: jessie - arch: amd64 - deps: - - libx11-dev - - pkg-config - - libgtk-3-dev - - libnotify-dev - - zip - -targets: - nightly: - git_hash: master - version: '[% c("abbrev") %]' - tag_gpg_id: 0 - -input_files: - - project: container-image - - name: go - project: go - - name: gogb - project: gogb

1 0

[tor-browser-build/master] Bug 23231: Remove our STL Wrappers workaround for Windows 64bit
by boklm＠torproject.org 15 Jun '18

15 Jun '18

commit aa79addec263ad31bad46f589e5964173b07d24f Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 14 19:52:09 2018 +0000 Bug 23231: Remove our STL Wrappers workaround for Windows 64bit The fix for https://bugzilla.mozilla.org/show_bug.cgi?id=1443823 makes our workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=1392604 obsolete, and we can remove it as it landed on esr60. --- projects/firefox/STL_win64.patch | 24 ------------------------ projects/firefox/build | 4 ---- projects/firefox/config | 2 -- 3 files changed, 30 deletions(-) diff --git a/projects/firefox/STL_win64.patch b/projects/firefox/STL_win64.patch deleted file mode 100644 index e528905..0000000 --- a/projects/firefox/STL_win64.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 8f8c1a1069d4907d3cedae578975225d8caeecaf Mon Sep 17 00:00:00 2001 -From: Nicolas Vigier <boklm(a)torproject.org> -Date: Sat, 12 Aug 2017 22:00:13 +0200 -Subject: [PATCH] Bug 23231: disable STL Wrappers on Windows - -Workaround for: -https://bugzilla.mozilla.org/show_bug.cgi?id=1392604 ---- - old-configure.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/old-configure.in b/old-configure.in -index f5a2f05..e247551 100644 ---- a/old-configure.in -+++ b/old-configure.in -@@ -1338,7 +1338,7 @@ MOZ_CXX11 - AC_LANG_C - - case "${OS_TARGET}" in --Darwin) -+WINNT|Darwin) - ;; - *) - STL_FLAGS="-I${DIST}/stl_wrappers" diff --git a/projects/firefox/build b/projects/firefox/build index 1b3a0d0..9f849b0 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -132,10 +132,6 @@ fi export CC='gcc -m32' [% END -%] -[% IF c("var/windows-x86_64") %] - patch -p1 < $rootdir/STL_win64.patch -[% END -%] - [% IF c("var/windows") %] patch -p1 < $rootdir/nsis-uninstall.patch [% END -%] diff --git a/projects/firefox/config b/projects/firefox/config index 9d0829d..c2cbebd 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -104,8 +104,6 @@ input_files: - project: gcc name: gcc enable: '[% c("var/windows") %]' - - filename: STL_win64.patch - enable: '[% c("var/windows-x86_64") %]' - filename: nsis-uninstall.patch enable: '[% c("var/windows") %]' - project: rust

1 0

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

15 Jun '18

commit 5e72f5077d7c974e30c9f48f2c554ded6e8358d1 Merge: b9a2dfe aa79add Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Jun 15 11:31:19 2018 +0200 Merge remote-tracking branch 'gk/bug_23231' projects/firefox/STL_win64.patch | 24 ------------------------ projects/firefox/build | 4 ---- projects/firefox/config | 2 -- 3 files changed, 30 deletions(-)

1 0

[tor-browser-build/master] Bug 26304: Bump zlib to latest stable (1.2.11)
by boklm＠torproject.org 15 Jun '18

15 Jun '18

commit b9a2dfe610121f88be74d8569ee2b9f904132670 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 15 06:18:26 2018 +0000 Bug 26304: Bump zlib to latest stable (1.2.11) --- projects/zlib/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/zlib/config b/projects/zlib/config index 4ac96c9..2a98469 100644 --- a/projects/zlib/config +++ b/projects/zlib/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -version: 1.2.8 +version: 1.2.11 git_hash: 'v[% c("version") %]' git_url: https://github.com/madler/zlib.git gpg_keyring: zlib.gpg

1 0

[tor-browser-build/master] Bug 26205: Don't build the uninstaller for Windows during Firefox compilation
by gk＠torproject.org 14 Jun '18

14 Jun '18

commit 0f6ebe396fad0834388fd2424218582b32493816 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue Jun 12 22:02:03 2018 -0400 Bug 26205: Don't build the uninstaller for Windows during Firefox compilation --- projects/firefox/build | 4 ++ projects/firefox/config | 2 + projects/firefox/nsis-uninstall.patch | 73 +++++++++++++++++++++++++++++++++++ 3 files changed, 79 insertions(+) diff --git a/projects/firefox/build b/projects/firefox/build index 09620ae..1b3a0d0 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -136,6 +136,10 @@ fi patch -p1 < $rootdir/STL_win64.patch [% END -%] +[% IF c("var/windows") %] + patch -p1 < $rootdir/nsis-uninstall.patch +[% END -%] + [% IF c("var/osx") %] patch -p1 < $rootdir/no-dmg.patch [% END -%] diff --git a/projects/firefox/config b/projects/firefox/config index 120ad35..9d0829d 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -106,6 +106,8 @@ input_files: enable: '[% c("var/windows") %]' - filename: STL_win64.patch enable: '[% c("var/windows-x86_64") %]' + - filename: nsis-uninstall.patch + enable: '[% c("var/windows") %]' - project: rust name: rust - project: llvm diff --git a/projects/firefox/nsis-uninstall.patch b/projects/firefox/nsis-uninstall.patch new file mode 100644 index 0000000..765ef67 --- /dev/null +++ b/projects/firefox/nsis-uninstall.patch @@ -0,0 +1,73 @@ +From 4ef264b601ac92a0b385c40bd011ef94618a176a 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(-) + +diff --git a/browser/Makefile.in b/browser/Makefile.in +index 2eb9e708f68e..0c9442183942 100644 +--- a/browser/Makefile.in ++++ b/browser/Makefile.in +@@ -6,10 +6,6 @@ include $(topsrcdir)/config/rules.mk + + ifdef MAKENSISU + +-# For Windows build the uninstaller during the application build since the +-# uninstaller is included with the application for mar file generation. +-libs:: +- $(MAKE) -C installer/windows uninstaller + ifdef MOZ_MAINTENANCE_SERVICE + $(MAKE) -C installer/windows maintenanceservice_installer + endif +diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in +index 1bf11252ee06..dee6d5434106 100644 +--- a/browser/installer/Makefile.in ++++ b/browser/installer/Makefile.in +@@ -98,10 +98,6 @@ ifdef NECKO_WIFI + DEFINES += -DNECKO_WIFI + endif + +-ifdef MAKENSISU +-DEFINES += -DHAVE_MAKENSISU=1 +-endif +- + 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 +

1 0

[webwml/master] Deactivate loc proj manager job post
by hiro＠torproject.org 14 Jun '18

14 Jun '18

commit 7b9311ad3101e265b4172103d810798e3fb56e77 Author: hiro <hiro(a)torproject.org> Date: Thu Jun 14 19:49:48 2018 +0200 Deactivate loc proj manager job post --- about/en/jobs.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/about/en/jobs.wml b/about/en/jobs.wml index b2ccfbcf..ac10ed99 100644 --- a/about/en/jobs.wml +++ b/about/en/jobs.wml @@ -17,7 +17,6 @@ <p>Specifically, we're looking for the following people currently:</p> <ul> - <li><a href="<page about/jobs-localization-projectmanager>">Localization Project Manager (Part-time)</a></li> <li><a href="<page about/jobs-fundraising-director>">Fundraising Director</a></li> </ul> @@ -32,6 +31,7 @@ <li>Browser hacker</li> <li>Pluggable transport developer</li> <li>Lead Automation Engineer</li> + <li>Localization Project Manager (Part-time)</li> <li>Firefox/Thunderbird Extension Developer</li> <li>Director of Communications</li> <li>Executive Administrator</li>

1 0

[tor/maint-0.3.3] Make sure that the test_rust.sh script fails when a test fails
by nickm＠torproject.org 14 Jun '18

14 Jun '18

commit 9d06c41c6e69e25a68639a09b22baa7de3299fa9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 31 17:15:57 2018 -0700 Make sure that the test_rust.sh script fails when a test fails Exit codes from find(1) seem not to be so reliable as we had hoped. Closes ticket 26258; bugfix on 0.3.3.4-alpha when we fixed #25560 --- changes/bug26258_033 | 4 ++++ src/test/test_rust.sh | 15 ++++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/changes/bug26258_033 b/changes/bug26258_033 new file mode 100644 index 000000000..ceca38333 --- /dev/null +++ b/changes/bug26258_033 @@ -0,0 +1,4 @@ + o Major bugfixes (rust, testing): + - Fix a bug where a failure in the rust unit tests would not actually + cause the build to fail. Fixes bug 26258; bugfix on 0.3.3.4-alpha. + diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh index d87336e70..854582ec1 100755 --- a/src/test/test_rust.sh +++ b/src/test/test_rust.sh @@ -3,13 +3,14 @@ set -e -CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \ + +for cargo_toml in "${abs_top_srcdir:-../../..}"/src/rust/*/Cargo.toml; do + CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \ CARGO_HOME="${abs_top_builddir:-../../..}/src/rust" \ - find "${abs_top_srcdir:-../../..}/src/rust" \ - -mindepth 2 -maxdepth 2 \ - -type f -name 'Cargo.toml' \ - -exec "${CARGO:-cargo}" test --all-features ${CARGO_ONLINE-"--frozen"} \ - --manifest-path '{}' \; + "${CARGO:-cargo}" test --all-features ${CARGO_ONLINE-"--frozen"} \ + --manifest-path "$cargo_toml" || exitcode=1 +done + +exit $exitcode -exit $?

1 0

[tor/maint-0.3.3] Merge remote-tracking branch 'public/bug26258_033' into maint-0.3.3
by nickm＠torproject.org 14 Jun '18

14 Jun '18

commit 71065201dd6dcaf08238a2d09a604dfcdb4aa271 Merge: ca6d289c0 ee860b8f3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 14 12:47:09 2018 -0400 Merge remote-tracking branch 'public/bug26258_033' into maint-0.3.3 changes/bug26258_033 | 4 ++++ src/test/include.am | 1 + src/test/test_rust.sh | 23 ++++++++++++++--------- 3 files changed, 19 insertions(+), 9 deletions(-)

1 0