[tor-commits] [tor-browser-build/maint-9.0] Release preparations for 9.0.6

[sysrqb at torproject.org]

commit 1f1087cd9cc350585bc1f1737cf0030d4bf3b810
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Sat Mar 7 19:14:32 2020 +0000

    Release preparations for 9.0.6
    
    Versions bump and Changelog update
---
 projects/firefox-langpacks/config                   | 2 +-
 projects/firefox-locale-bundle/config               | 2 +-
 projects/firefox/config                             | 4 ++--
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 8 ++++++++
 projects/tor-browser/config                         | 4 ++--
 rbm.conf                                            | 6 +++---
 6 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config
index 34d6fad..17a707a 100644
--- a/projects/firefox-langpacks/config
+++ b/projects/firefox-langpacks/config
@@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil
 
 var:
   ff_version: '[% pc("firefox", "var/firefox_version") %]'
-  ff_build: build1
+  ff_build: build2
   input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]'
 
 targets:
diff --git a/projects/firefox-locale-bundle/config b/projects/firefox-locale-bundle/config
index 2f4997f..2ea6db6 100644
--- a/projects/firefox-locale-bundle/config
+++ b/projects/firefox-locale-bundle/config
@@ -5,4 +5,4 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
 var:
   use_container: 0
   ff_version: '[% pc("firefox", "var/firefox_version") %]'
-  ff_build: build1
+  ff_build: build2
diff --git a/projects/firefox/config b/projects/firefox/config
index 87010ee..36ec737 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -1,14 +1,14 @@
 # vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
 filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]'
-git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2'
+git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1'
 tag_gpg_id: 1
 git_url: https://git.torproject.org/tor-browser.git
 git_submodule: 1
 gpg_keyring: torbutton.gpg
 
 var:
-  firefox_platform_version: 68.5.0
+  firefox_platform_version: 68.6.0
   firefox_version: '[% c("var/firefox_platform_version") %]esr'
   torbrowser_branch: 9.0
   torbrowser_update_channel: alpha
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index c542ef0..6b7748d 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,11 @@
+Tor Browser 9.0.6 -- March 11 2020
+ * All Platforms
+   * Update Firefox to 68.6.0esr
+   * Bump NoScript to 11.0.15
+ * Build System
+   * All Platforms
+     * Bug 33535: Patch openssl to use SOURCE_DATE_EPOCH for copyright year
+
 Tor Browser 9.0.5 -- February 11 2020
  * All Platforms
    * Update Firefox to 68.5.0esr
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index 4e8ee14..c526d59 100644
--- a/projects/tor-browser/config
+++ b/projects/tor-browser/config
@@ -73,9 +73,9 @@ input_files:
     enable: '[% c("var/snowflake") %]'
   - filename: Bundle-Data
     enable: '[% ! c("var/android") %]'
-  - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-11.0.13-an+fx.xpi
+  - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-11.0.15-an+fx.xpi
     name: noscript
-    sha256sum: ced718d9d9e719547db392ad85d24a7ad5c6b54cc0f93f9c57f2fcb44bb4de56
+    sha256sum: 5e795f711275f9162957321e5245cb0176ce36ce8a2410de95496670af51603d
   - filename: 'RelativeLink/start-tor-browser.desktop'
     enable: '[% c("var/linux") %]'
   - filename: 'RelativeLink/execdesktop'
diff --git a/rbm.conf b/rbm.conf
index 123d1a8..99c0de3 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -24,10 +24,10 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '9.0.5'
-  torbrowser_build: 'build3'
+  torbrowser_version: '9.0.6'
+  torbrowser_build: 'build1'
   torbrowser_incremental_from:
-    - 9.0.4
+    - 9.0.5
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1