[tbb-commits] [tor-browser-build/master] Bug 10394: Don't autoupdate HTTPS Everywhere anymore

[boklm at torproject.org]

commit 50982eda6d3687aa5bcc2d088546f82c4fa7e53d
Author: Georg Koppen <gk at torproject.org>
Date:   Wed Nov 8 14:12:26 2017 +0000

    Bug 10394: Don't autoupdate HTTPS Everywhere anymore
    
    We use the new --remove-update-channel switch to prevent HTTPS Everywhere
    from pinging update servers and updating automatically like we do with
    Torbutton and Tor Launcher.
    
    The new HTTPS Everywhere build file makes the workaround for bug 10066
    obsolete as well.
---
 projects/https-everywhere/build  | 11 ++---------
 projects/https-everywhere/config |  2 +-
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/projects/https-everywhere/build b/projects/https-everywhere/build
index 71b2a21..49018af 100644
--- a/projects/https-everywhere/build
+++ b/projects/https-everywhere/build
@@ -2,15 +2,8 @@
 [% c("var/set_default_env") -%]
 tar xf [% project %]-[% c('version') %].tar.gz
 cd [% project %]-[% c('version') %]
-# patch makexpi.sh because we don't have a git repository
-sed -i makexpi.sh -e 's/git rev-parse --short HEAD/echo aaaaaa/'
-# XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in
-# makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066
-# The solution there does not work for us as doing something like
-# |./makexpi.sh foo| to build tag |foo| is a) trying to download the sources
-# during build time (again) and b) broken due to a certificate error.
-rm -f .git/refs/heads/master
-./makexpi.sh
+# Bug 10394: We don't want to autoupdate HTTPS Everywhere anymore.
+./make.sh --remove-update-channel
 # Since 5.0.2 a .xpi for AMO is built, too. We don't need it.
 rm pkg/*-amo.xpi
 mv pkg/*.xpi [% dest_dir _ '/' _ c('filename') %]
diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config
index 99290e7..5225bbc 100644
--- a/projects/https-everywhere/config
+++ b/projects/https-everywhere/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 2017.10.4
+version: 2017.10.30
 git_url: https://git.torproject.org/https-everywhere.git
 git_hash: '[% c("version") %]'
 git_submodule: 1