[tor-commits] [builders/tor-browser-build] 01/02: Bug 40527: Remove https-everywhere from tor-browser alpha desktop

[gitolite role <git@xxxxxxxxxxxxxxxxxxxxx>]

This is an automated email from the git hooks/post-receive script.

richard pushed a commit to branch master
in repository builders/tor-browser-build.

commit e2a2f2811cef163abbdc4ff06fc5d44e6ea85e7b
Author: Richard Pospesel <richard@xxxxxxxxxxxxxx>
AuthorDate: Sat Jun 11 01:31:34 2022 +0000

    Bug 40527: Remove https-everywhere from tor-browser alpha desktop
---
 projects/tor-browser/build  | 11 -----------
 projects/tor-browser/config |  1 +
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/projects/tor-browser/build b/projects/tor-browser/build
index e1de23b..a0eab42 100644
--- a/projects/tor-browser/build
+++ b/projects/tor-browser/build
@@ -72,17 +72,6 @@ RBM_TB_EOF
 
 tar -C ${TB_STAGE_DIR} -xf [% c('input_files_by_name/firefox') %]/tor-browser.tar.gz
 
-# Make unpacked HTTPS Everywhere available in resource://torbutton/content/extensions/https-everywhere/ as TB expects
-TMP_HTTPS_EVERYWHERE_PATH=$rootdir/tmp_https_everywhere/
-mkdir $TMP_HTTPS_EVERYWHERE_PATH
-pushd $TMP_HTTPS_EVERYWHERE_PATH
-mkdir -p chrome/torbutton/content/extensions/https-everywhere/
-unzip $rootdir/[% c('input_files_by_name/https-everywhere') %] -d chrome/torbutton/content/extensions/https-everywhere/
-find . -exec [% c("var/touch") %] {} \;
-find chrome/ | sort | zip -X -@ "$TBDIR[% IF c("var/osx") %]/Contents/Resources[% END %]/omni.ja"
-popd
-rm -rf $TMP_HTTPS_EVERYWHERE_PATH
-
 # Include the Tor Browser manual
 TMP_MANUAL_PATH=$rootdir/tmp_manual/
 mkdir $TMP_MANUAL_PATH
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index 9620b6b..a4b1a32 100644
--- a/projects/tor-browser/config
+++ b/projects/tor-browser/config
@@ -65,6 +65,7 @@ input_files:
     enable: '[% ! c("var/testbuild") && ! c("var/android") %]'
   - project: https-everywhere
     name: https-everywhere
+    enable: '[% c("var/android") %]'
   - project: fonts
     name: fonts
     enable: '[% ! c("var/android") %]'

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits