Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tor-browser-bundle-bin: 9.5.4 -> 10.0 #98564

Merged
merged 1 commit into from Sep 23, 2020
Merged

tor-browser-bundle-bin: 9.5.4 -> 10.0 #98564

merged 1 commit into from Sep 23, 2020

Conversation

yoctocell
Copy link
Member

Motivation for this change

Update to latest release https://blog.torproject.org/new-release-tor-browser-100. It is now based on Firefox 78 ESR.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

stigtsp
stigtsp requested changes Sep 23, 2020
View reviewed changes
Copy link
Member

@stigtsp stigtsp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commit has quite a bit of whitespace changes which can make cherrypicking etc. a bit tricky. I'd avoid unnecessary whitespace changes.

@yoctocell
Copy link
Member Author

This commit has quite a bit of whitespace changes which can make cherrypicking etc. a bit tricky. I'd avoid unnecessary whitespace changes.

Sorry, I had nixpkgs-fmt run on save.

stigtsp
stigtsp approved these changes Sep 23, 2020
View reviewed changes
Copy link
Member

@stigtsp stigtsp left a comment •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Tested OK on x86_64-linux

Verified signatures OK:

$ gpg --verify tor-browser-linux64-10.0_en-US.tar.xz.asc 
gpg: assuming signed data in 'tor-browser-linux64-10.0_en-US.tar.xz'
gpg: Signature made Tue 22 Sep 2020 09:14:53 AM CEST
gpg:                using RSA key EB774491D9FF06E2
gpg: Good signature from "Tor Browser Developers (signing key) <torbrowser@torproject.org>" [unknown]
gpg: torbrowser@torproject.org: Verified 1 signatures in the past 0 seconds.
     Encrypted 0 messages.
gpg: WARNING: This key is not certified with a trusted signature!
gpg:          There is no indication that the signature belongs to the owner.
Primary key fingerprint: EF6E 286D DA85 EA2A 4BA7  DE68 4E2C 6E87 9329 8290
     Subkey fingerprint: 1107 75B5 D101 FB36 BC6C  911B EB77 4491 D9FF 06E2
$ gpg --verify tor-browser-linux32-10.0_en-US.tar.xz.asc
gpg: assuming signed data in 'tor-browser-linux32-10.0_en-US.tar.xz'
gpg: Signature made Tue 22 Sep 2020 08:52:55 AM CEST
gpg:                using RSA key EB774491D9FF06E2
gpg: Good signature from "Tor Browser Developers (signing key) <torbrowser@torproject.org>" [unknown]
gpg: torbrowser@torproject.org: Verified 2 signatures in the past 6 seconds.
     Encrypted 0 messages.
gpg: WARNING: This key is not certified with a trusted signature!
gpg:          There is no indication that the signature belongs to the owner.
Primary key fingerprint: EF6E 286D DA85 EA2A 4BA7  DE68 4E2C 6E87 9329 8290
     Subkey fingerprint: 1107 75B5 D101 FB36 BC6C  911B EB77 4491 D9FF 06E2
$ sha256sum tor-browser-linux32-10.0_en-US.tar.xz tor-browser-linux64-10.0_en-US.tar.xz
82b204864265e01de993929a4059cbc2f934fbbc4dbe50b3fdd5acc904e00075  tor-browser-linux32-10.0_en-US.tar.xz
54d0e3165b55eee2d3feee94e9f7104797ad78d0f73713a286065ae7ec7459d0  tor-browser-linux64-10.0_en-US.tar.xz
$ nix-hash --type sha256 --to-base32 82b204864265e01de993929a4059cbc2f934fbbc4dbe50b3fdd5acc904e00075
0x80w02ckb6mznrm1gjdpkxk9yf2rdcl16ljjglivq358a309cl2
$ nix-hash --type sha256 --to-base32 54d0e3165b55eee2d3feee94e9f7104797ad78d0f73713a286065ae7ec7459d0
1l2rfknffnh6hsi16dzps1wav5s723vyk57fzv9y5vjmbcbf7l2l

@stigtsp stigtsp requested a review from taku0 September 23, 2020 14:02
@stigtsp
Copy link
Member

stigtsp commented Sep 23, 2020

@GrahamcOfBorg build tor-browser-bundle-bin

@stigtsp stigtsp merged commit c689117 into NixOS:master Sep 23, 2020
@stigtsp
Copy link
Member

stigtsp commented Sep 23, 2020

@yoctocell Thx for the contribution! Would you like to backport this PR to 20.09 and 20.03 as well?

@yoctocell
Copy link
Member Author

@yoctocell Thx for the contribution! Would you like to backport this PR to 20.09 and 20.03 as well?

You're welcome. Sure, do you want to do it or should I do it?

@stigtsp
Copy link
Member

stigtsp commented Sep 24, 2020

You're welcome. Sure, do you want to do it or should I do it?

Go ahead, if you don't mind. :)

This was referenced Sep 24, 2020
Merged
Closed
@xaverdh xaverdh mentioned this pull request Nov 3, 2020
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stigtsp stigtsp stigtsp approved these changes

@taku0 taku0 Awaiting requested review from taku0

Assignees
No one assigned
Labels
1.severity: security 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@yoctocell @stigtsp