From 5a0444b3cac8043916ab9ef43581df24005e7327 Mon Sep 17 00:00:00 2001 From: Matthew Finkel Date: Tue, 8 Dec 2020 15:04:32 +0000 Subject: [PATCH 1/4] Bug 40161: Update Go compiler --- projects/go/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/go/config b/projects/go/config index 124be1ff..1651b90e 100644 --- a/projects/go/config +++ b/projects/go/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.14.11 +version: 1.14.13 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: @@ -118,7 +118,7 @@ input_files: enable: '[% ! c("var/linux") %]' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: 1871f3d29b0cf1ebb739c9b134c9bc559282bd3625856e5f12f5aea29ab70f16 + sha256sum: ba1d244c6b5c0ed04aa0d7856d06aceb89ed31b895de6ff783efb1cc8ab6b177 - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' name: go14 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 -- GitLab From cabd4bd2de80178d2b24a1662e970184d4a9fac1 Mon Sep 17 00:00:00 2001 From: Matthew Finkel Date: Tue, 8 Dec 2020 15:08:52 +0000 Subject: [PATCH 2/4] Bug 40176: Update openssl to 1.1.1i --- projects/openssl/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/openssl/config b/projects/openssl/config index 45b4fd6c..c7534859 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.1.1h +version: 1.1.1i filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: @@ -31,4 +31,4 @@ input_files: - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz' - sha256sum: 5c9ca8774bd7b03e5784f26ae9e9e6d749c9da2438545077e6b3d755a06595d9 + sha256sum: e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242 -- GitLab From a38c1cf6eeb3fbda3248f392da89560b718e8940 Mon Sep 17 00:00:00 2001 From: Matthew Finkel Date: Tue, 8 Dec 2020 23:33:08 +0000 Subject: [PATCH 3/4] Tor Browser 10.0.7 release preparations Version bumps and Changelog update --- projects/firefox/config | 2 +- projects/https-everywhere/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 11 +++++++++++ rbm.conf | 5 +++-- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 4479b40c..750ae240 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -8,7 +8,7 @@ git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 78.5.0 + firefox_platform_version: 78.6.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 10.0 branding_directory: 'browser/branding/alpha' diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 90d7e41b..255d36f8 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2020.8.13 +version: 2020.11.17 git_url: https://git.torproject.org/https-everywhere.git git_hash: '[% c("version") %]' git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index d5027f43..556543f6 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,14 @@ +Tor Browser 10.0.7 -- December 15 2020 + * Windows + OS X + Linux + * Update Firefox to 78.6.0esr + * Update HTTPS Everywhere to 2020.11.17 + * Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots [tor-browser] + * Bug 40176: Update openssl to 1.1.1i [tor-browser-build] + * Build System + * Windows + OS X + Linux + * Bug 40139: Pick up rbm commit for bug 40008 [tor-browser-build] + * Bug 40161: Update Go compile to 1.14.13 [tor-browser-build] + Tor Browser 10.0.6 -- December 8 2020 * Windows + OS X + Linux * Bug 40175: Update obfs4proxy's TLS certificate public key pinning [tor-browser-build] diff --git a/rbm.conf b/rbm.conf index 9e1db9a3..3e49c09b 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,10 +24,11 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '10.0.6' - torbrowser_build: 'build2' + torbrowser_version: '10.0.7' + torbrowser_build: 'build1' torbrowser_incremental_from: - 10.0.5 + - 10.0.6 project_name: tor-browser multi_lingual: 0 build_mar: 1 -- GitLab From 3279b6e24cdd5274cd8c693d4b86ab2025f0190e Mon Sep 17 00:00:00 2001 From: Matthew Finkel Date: Wed, 9 Dec 2020 15:15:23 +0000 Subject: [PATCH 4/4] fixup! Tor Browser 10.0.7 release preparations --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 556543f6..4830bc72 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -4,10 +4,11 @@ Tor Browser 10.0.7 -- December 15 2020 * Update HTTPS Everywhere to 2020.11.17 * Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots [tor-browser] * Bug 40176: Update openssl to 1.1.1i [tor-browser-build] + * Bug 40226: Crash on Fedora Workstation Rawhide GNOME [tor-browser] * Build System * Windows + OS X + Linux * Bug 40139: Pick up rbm commit for bug 40008 [tor-browser-build] - * Bug 40161: Update Go compile to 1.14.13 [tor-browser-build] + * Bug 40161: Update Go compiler to 1.14.13 [tor-browser-build] Tor Browser 10.0.6 -- December 8 2020 * Windows + OS X + Linux -- GitLab