Ticket #25405: 0001-Bug-25405-cannot-use-Moat-if-a-meek-bridge-is-config.patch

File 0001-Bug-25405-cannot-use-Moat-if-a-meek-bridge-is-config.patch, 1.6 KB (added by mcs, 16 months ago)

tor-browser-build patch

  • projects/tor-browser/build

    From 6eba7a6fa156a83c5b7046efe2cb579233f556bf Mon Sep 17 00:00:00 2001
    From: Kathy Brade <brade@pearlcrescent.com>
    Date: Mon, 26 Mar 2018 21:10:44 +0000
    Subject: [PATCH] Bug 25405: cannot use Moat if a meek bridge is configured
    
    When doing Moat things, use a separate profile for the secondary browser
    (instead of trying to use the main meek helper profile).
    ---
     projects/tor-browser/build | 8 ++++++++
     1 file changed, 8 insertions(+)
    
    diff --git a/projects/tor-browser/build b/projects/tor-browser/build
    index c542818..db64f9a 100644
    a b TB_STAGE_DIR=$distdir/tor-browser-stage 
    3333  TORCONFIGPATH=TorBrowser/Data/Tor
    3434  EXTOVERRIDESPATH=TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js
    3535  MEEKPROFILEPATH=TorBrowser/Data/Browser/profile.meek-http-helper
     36  MOATPROFILEPATH=TorBrowser/Data/Browser/profile.moat-http-helper
    3637
    3738  mkdir -p $TBDIR/TorBrowser/Data/Browser/Caches
    3839[% END %]
    cat Bundle-Data/PTConfigs/meek-http-helper-user.js >> $TBDIR/$MEEKPROFILEPATH/us 
    155156  popd
    156157[% END %]
    157158
     159# For platforms for which we need to ship a Moat helper profile in addition
     160# to a meek one, create it by duplicating the meek one that we just finished
     161# creating.
     162if [ ! -z "$MOATPROFILEPATH" ]; then
     163  cp -pR $TBDIR/$MEEKPROFILEPATH $TBDIR/$MOATPROFILEPATH
     164fi
     165
    158166[% IF ! c("var/multi_lingual") %]
    159167  echo 'pref("extensions.torlauncher.prompt_for_locale", false);' >> $TBDIR/$EXTOVERRIDESPATH
    160168  echo 'pref("intl.locale.matchOS", false);' >> $TBDIR/$EXTOVERRIDESPATH