[tor-commits] [tor-messenger-build/master] Bump tor-browser-build to 9b4ba82

[arlo at torproject.org]

commit 4ff1d64dc1f9ae732978d319987bb7e7f3aed010
Author: Arlo Breault <arlolra at gmail.com>
Date:   Mon Oct 23 10:33:46 2017 -0400

    Bump tor-browser-build to 9b4ba82
---
 ChangeLog                                 | 4 ++--
 projects/instantbird/mozconfig-osx-x86_64 | 3 ++-
 rbm.conf                                  | 2 +-
 tor-browser-build                         | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cb9d4ce..7c34e3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,9 @@
-Tor Messenger 0.5.0b2 -- 
+Tor Messenger 0.5.0b2 --
  * All Platforms
    * Use the tor-browser-52.4.0esr-7.0-1-build1 tag on tor-browser
    * Use the THUNDERBIRD_52_4_0_RELEASE tag on comm-esr52
    * Update tor-browser to 7.0.6
-   * Update tor-browser-build to 8c4c05d
+   * Update tor-browser-build to 9b4ba82
  * Linux
    * Trac 23806: libotr.so and libgcrypt.so are using RPATH
    * Trac 23542: Add snowflake pt
diff --git a/projects/instantbird/mozconfig-osx-x86_64 b/projects/instantbird/mozconfig-osx-x86_64
index 21154f5..cd1c4ef 100644
--- a/projects/instantbird/mozconfig-osx-x86_64
+++ b/projects/instantbird/mozconfig-osx-x86_64
@@ -5,7 +5,8 @@ TOOLCHAIN_DIR=/var/tmp/dist/macosx-toolchain
 CROSS_CCTOOLS_PATH=$TOOLCHAIN_DIR/cctools
 CROSS_SYSROOT=$TOOLCHAIN_DIR/SDK
 CROSS_PRIVATE_FRAMEWORKS=$CROSS_SYSROOT/System/Library/PrivateFrameworks
-FLAGS="-target x86_64-apple-darwin10 -mlinker-version=136 -B $CROSS_CCTOOLS_PATH/bin -isysroot $CROSS_SYSROOT"
+HARDENING_FLAGS="-Werror=format -Werror=format-security -fstack-protector-strong -D_FORTIFY_SOURCE=2"
+FLAGS="-target x86_64-apple-darwin10 -mlinker-version=136 -B $CROSS_CCTOOLS_PATH/bin -isysroot $CROSS_SYSROOT $HARDENING_FLAGS"
 
 export CC="$TOOLCHAIN_DIR/clang/bin/clang $FLAGS"
 export CXX="$TOOLCHAIN_DIR/clang/bin/clang++ $FLAGS"
diff --git a/rbm.conf b/rbm.conf
index 5f793b2..e5938e4 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -310,7 +310,7 @@ ENV:
       # We will need to update this when there is a new spec version available
       runc_spec100 => sub {
         my ($out) = capture_exec('sudo', 'runc', '--version');
-        return $out =~ m/^runc version spec: 1\.0\.0$/;
+        return $out =~ m/^spec: 1\.0\.0$/m;
       },
     },
   )
diff --git a/tor-browser-build b/tor-browser-build
index 8c4c05d..9b4ba82 160000
--- a/tor-browser-build
+++ b/tor-browser-build
@@ -1 +1 @@
-Subproject commit 8c4c05ddcfc30107b967b204d491523685460226
+Subproject commit 9b4ba8252a80fb10ca9fc22e90033d63383ac05d