commit a1347df3ca9d094b53c2aee516a7c96111422d12 Author: Georg Koppen gk@torproject.org Date: Tue Jan 16 13:15:54 2018 +0000

Bug 24912: Disable selfrando on stable series --- projects/binutils/build | 2 +- projects/firefox/build | 2 +- projects/firefox/config | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/projects/binutils/build b/projects/binutils/build index 6d8e0b2..aa0d752 100644 --- a/projects/binutils/build +++ b/projects/binutils/build @@ -29,7 +29,7 @@ cd [% project %]-[% c("version") %] [% IF c('var/windows-x86_64') -%] patch -p1 < ../64bit-fixups.patch [% END -%] -[% IF c("var/linux") -%] +[% IF c("var/linux") && ! c("var/release") -%] # We need to work around a gold linker bug in 2.24 to get selfrando working, # see bug 20683. patch -p1 < $rootdir/binutils-224-gold.patch diff --git a/projects/firefox/build b/projects/firefox/build index ed559b0..81d4d1c 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -27,7 +27,7 @@ mkdir -p /var/tmp/build export PATH="/var/tmp/dist/binutils/bin:$PATH" [% END -%]

-[% IF c("var/linux") -%] +[% 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" diff --git a/projects/firefox/config b/projects/firefox/config index 182b6b5..59a4418 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -82,7 +82,7 @@ input_files: enable: '[% c("var/linux") %]' - project: selfrando name: selfrando - enable: '[% c("var/linux") %]' + 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