[tbb-commits] [tor-browser-build/master] Bug 26153: Selfrando builds broken for Firefox 60 ESR

[gk at torproject.org]

commit d161cb720ea36ccd547acd385752fe353279761f
Author: Sukhbir Singh <sukhbir at torproject.org>
Date:   Wed Jun 6 11:01:19 2018 -0400

    Bug 26153: Selfrando builds broken for Firefox 60 ESR
    
    This commit fixes #26153 by bumping the selfrando version to 0.4.2
---
 projects/firefox/build    | 14 +++++++-------
 projects/firefox/config   |  6 +++---
 projects/selfrando/config |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/projects/firefox/build b/projects/firefox/build
index 62186d1..cbd9250 100644
--- a/projects/firefox/build
+++ b/projects/firefox/build
@@ -40,13 +40,13 @@ EOF
   export PATH="/var/tmp/dist/binutils/bin:$PATH"
 [% END -%]
 
-#[% IF c("var/linux") && ! c("var/release") -%]
-#  tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/selfrando') %]
-#  # Selfrando wrapper
-#  export PATH="/var/tmp/dist/selfrando/Tools/TorBrowser/tc-wrapper/:$PATH"
-#  # We need to avoid the shuffling while building as this breaks compilation
-#  export SELFRANDO_skip_shuffle=
-#[% END -%]
+[% IF c("var/linux") && ! c("var/release") -%]
+  tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/selfrando') %]
+  # Selfrando wrapper
+  export PATH="/var/tmp/dist/selfrando/Tools/TorBrowser/tc-wrapper/:$PATH"
+  # We need to avoid the shuffling while building as this breaks compilation
+  export SELFRANDO_skip_shuffle=
+[% END -%]
 
 [% IF c("var/linux") %]
   mkdir -p /var/tmp/dist
diff --git a/projects/firefox/config b/projects/firefox/config
index d6b8313..418daa3 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -81,9 +81,9 @@ input_files:
   - project: binutils
     name: binutils
     enable: '[% c("var/linux") %]'
-#  - project: selfrando
-#    name: selfrando
-#    enable: '[% c("var/linux") && ! c("var/release") %]'
+  - project: selfrando
+    name: selfrando
+    enable: '[% c("var/linux") && ! c("var/release") %]'
   - filename: fix-info-plist.py
     enable: '[% c("var/osx") %]'
   - URL: https://people.torproject.org/~gk/mirrors/sources/msvcr100.dll
diff --git a/projects/selfrando/config b/projects/selfrando/config
index 07195f7..82acc23 100644
--- a/projects/selfrando/config
+++ b/projects/selfrando/config
@@ -1,6 +1,6 @@
 # vim: filetype=yaml sw=2
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
-version: 0.4.1
+version: 0.4.2
 git_hash: 'tb-v[% c("version") %]'
 git_url: https://github.com/immunant/selfrando.git
 gpg_keyring: selfrando.gpg