[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [tor-browser-bundle/master] Revert "Revert "Bug 16909: Adapt to HTTPS-Everyhwere build changes""



commit 21a4618ade947a8dac9b422f4be3e0945388967a
Author: Georg Koppen <gk@xxxxxxxxxxxxxx>
Date:   Mon Oct 12 09:53:27 2015 +0000

    Revert "Revert "Bug 16909: Adapt to HTTPS-Everyhwere build changes""
    
    This reverts commit 2b50a8cb7d2f4e43f41f82c13704b9af15ba6b4e.
---
 gitian/README.build                          |    2 +-
 gitian/check-prerequisites.sh                |   25 ++++++++++++++++---------
 gitian/descriptors/linux/gitian-bundle.yml   |   18 ++++++++++++------
 gitian/descriptors/mac/gitian-bundle.yml     |   18 ++++++++++++------
 gitian/descriptors/windows/gitian-bundle.yml |   18 ++++++++++++------
 gitian/fetch-inputs.sh                       |    9 ++++++++-
 gitian/versions                              |    2 +-
 gitian/versions.alpha                        |    2 +-
 gitian/versions.beta                         |    2 +-
 9 files changed, 64 insertions(+), 32 deletions(-)

diff --git a/gitian/README.build b/gitian/README.build
index 656dddd..f289791 100644
--- a/gitian/README.build
+++ b/gitian/README.build
@@ -1,6 +1,6 @@
 QuickStart:
 
- On an Ubuntu 12.04+/Debian Wheezy+ machine or VM, run:
+ On an Ubuntu 14.04+/Debian Wheezy+ machine or VM, run:
 
  $ make
 
diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh
index 32c9b7b..cc16d0e 100755
--- a/gitian/check-prerequisites.sh
+++ b/gitian/check-prerequisites.sh
@@ -6,7 +6,7 @@ if [ ! -f /etc/debian_version ];
 then
   echo "Gitian is dependent upon the Ubuntu Virtualization Tools."
   echo
-  echo "You need to run Ubuntu 12.04 LTS/Debian Wheezy or newer."
+  echo "You need to run Ubuntu 14.04 LTS/Debian Wheezy or newer."
   exit 1
 fi
 
@@ -14,15 +14,22 @@ DISTRO=`cat /etc/issue | grep -Eo 'Ubuntu|Debian*'`
 
 if [ $DISTRO = "Ubuntu" ];
 then
-  dpkg -s ruby apache2 git apt-cacher-ng python-vm-builder qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion torsocks tor 2>/dev/null >/dev/null
-
-  if [ $? -ne 0 ];
+  VERSION=`cat /etc/issue | grep -Eo '[0-9]{2}' | head -1`
+  if [ "$VERSION" -ge "14" ];
   then
-    echo "You are missing one or more Gitian build tool dependencies."
-    echo
-    echo "Please run:"
-    echo " sudo apt-get install torsocks tor"
-    echo " sudo torsocks apt-get install ruby apache2 git apt-cacher-ng python-vm-builder qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion"
+    dpkg -s ruby apache2 git apt-cacher-ng python-vm-builder qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion torsocks tor 2>/dev/null >/dev/null
+
+    if [ $? -ne 0 ];
+    then
+      echo "You are missing one or more Gitian build tool dependencies."
+      echo
+      echo "Please run:"
+      echo " sudo apt-get install torsocks tor"
+      echo " sudo torsocks apt-get install ruby apache2 git apt-cacher-ng python-vm-builder qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion"
+      exit 1
+    fi
+  else
+    echo "Your Ubuntu is too old. You need Ubuntu 14.04 LTS or newer to build Tor Browser with Gitian."
     exit 1
   fi
 elif [ $DISTRO = "Debian" ];
diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml
index 27bbec0..b90356b 100644
--- a/gitian/descriptors/linux/gitian-bundle.yml
+++ b/gitian/descriptors/linux/gitian-bundle.yml
@@ -67,7 +67,7 @@ script: |
   umask 0022
   #
   mkdir -p $OUTDIR/
-  mkdir -p tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere@xxxxxxx
+  mkdir -p tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere-eff@xxxxxxx
   mkdir -p tor-browser/Browser/TorBrowser/Data/Browser/profile.meek-http-helper/extensions
   mkdir -p tor-browser/Browser/TorBrowser/Data/Browser/Caches
   mkdir -p tor-browser/Browser/TorBrowser/Docs/sources/
@@ -101,10 +101,16 @@ script: |
   cd ../../../
   #
   cd https-everywhere
-  # 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
-  rm -f .git/refs/heads/master
-  ./makexpi.sh
+  # We are invoking the build script with a particular tag to avoid #10066. This
+  # does not work for nightlies as there is no "master" tag in that sense. But
+  # we don't need to care about that as we don't need reproducibility for
+  # nightly builds.
+  if [ $HTTPSE_TAG != "master" ];
+  then
+    ./makexpi.sh $HTTPSE_TAG
+  else
+    ./makexpi.sh
+  fi
   # Since 5.0.2 a .xpi for AMO is built, too. We don't need it.
   rm ./pkg/*-amo.xpi
   cp pkg/*.xpi ../tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere@xxxxxxxxxxx
@@ -113,7 +119,7 @@ script: |
   cp *.xpi tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions/
   cd tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions
   mv noscript@xxxxxxxxxxxxxxxx {73a6fe31-595d-460b-a920-fcc0f8843232}.xpi
-  cd https-everywhere@xxxxxxx/
+  cd https-everywhere-eff@xxxxxxx/
   unzip ../https-everywhere@xxxxxxxxxxx
   rm ../https-everywhere@xxxxxxxxxxx
   cd ~/build
diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml
index a80311e..c4477e2 100644
--- a/gitian/descriptors/mac/gitian-bundle.yml
+++ b/gitian/descriptors/mac/gitian-bundle.yml
@@ -75,7 +75,7 @@ script: |
   MARTOOLS=~/build/mar-tools
   #
   mkdir -p $OUTDIR/
-  mkdir -p $TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere@xxxxxxx
+  mkdir -p $TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere-eff@xxxxxxx
   mkdir -p $TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.meek-http-helper/extensions
   mkdir -p $TORBROWSER_NAME.app/TorBrowser/Data/Browser/Caches
   mkdir -p $TORBROWSER_NAME.app/TorBrowser/Docs/sources
@@ -103,10 +103,16 @@ script: |
   cd ../../../
   #
   cd https-everywhere
-  # 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
-  rm -f .git/refs/heads/master
-  ./makexpi.sh
+   # We are invoking the build script with a particular tag to avoid #10066. This
+  # does not work for nightlies as there is no "master" tag in that sense. But
+  # we don't need to care about that as we don't need reproducibility for
+  # nightly builds.
+  if [ $HTTPSE_TAG != "master" ];
+  then
+    ./makexpi.sh $HTTPSE_TAG
+  else
+    ./makexpi.sh
+  fi
   # Since 5.0.2 a .xpi for AMO is built, too. We don't need it.
   rm ./pkg/*-amo.xpi
   cp pkg/*.xpi ../$TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere@xxxxxxxxxxx
@@ -115,7 +121,7 @@ script: |
   cp *.xpi ./$TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/
   cd $TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/
   mv noscript@xxxxxxxxxxxxxxxx {73a6fe31-595d-460b-a920-fcc0f8843232}.xpi
-  cd https-everywhere@xxxxxxx
+  cd https-everywhere-eff@xxxxxxx
   unzip ../https-everywhere@xxxxxxxxxxx
   rm ../https-everywhere@xxxxxxxxxxx
   cd ~/build/
diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml
index 6028601..dc8ad05 100644
--- a/gitian/descriptors/windows/gitian-bundle.yml
+++ b/gitian/descriptors/windows/gitian-bundle.yml
@@ -65,7 +65,7 @@ script: |
   MARTOOLS=~/build/mar-tools
   #
   mkdir -p $OUTDIR/
-  mkdir -p tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere@xxxxxxx
+  mkdir -p tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere-eff@xxxxxxx
   mkdir -p tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.meek-http-helper/extensions
   mkdir -p tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/Caches
   mkdir -p tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Docs/sources
@@ -90,10 +90,16 @@ script: |
   cd ../../../
   #
   cd https-everywhere
-  # 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
-  rm -f .git/refs/heads/master
-  ./makexpi.sh
+  # We are invoking the build script with a particular tag to avoid #10066. This
+  # does not work for nightlies as there is no "master" tag in that sense. But
+  # we don't need to care about that as we don't need reproducibility for
+  # nightly builds.
+  if [ $HTTPSE_TAG != "master" ];
+  then
+    ./makexpi.sh $HTTPSE_TAG
+  else
+    ./makexpi.sh
+  fi
   # Since 5.0.2 a .xpi for AMO is built, too. We don't need it.
   rm ./pkg/*-amo.xpi
   cp ./pkg/*.xpi ../tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere@xxxxxxxxxxx
@@ -102,7 +108,7 @@ script: |
   cp *.xpi tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions
   cd tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions
   mv noscript@xxxxxxxxxxxxxxxx {73a6fe31-595d-460b-a920-fcc0f8843232}.xpi
-  cd https-everywhere@xxxxxxx
+  cd https-everywhere-eff@xxxxxxx
   unzip ../https-everywhere@xxxxxxxxxxx
   rm ../https-everywhere@xxxxxxxxxxx
   cd ~/build/
diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh
index 881e556..9252aea 100755
--- a/gitian/fetch-inputs.sh
+++ b/gitian/fetch-inputs.sh
@@ -162,7 +162,7 @@ do
   get "${!PACKAGE}" "${!URL}"
 done
 
-# NoScript and HTTPS-Everywhere are magikal and special:
+# NoScript is magikal and special:
 wget -U "" -N ${NOSCRIPT_URL}
 
 # Verify packages with weak or no signatures via direct sha256 check
@@ -281,5 +281,12 @@ obfs4                 https://git.torproject.org/pluggable-transports/obfs4.git
 noto-fonts            https://github.com/googlei18n/noto-fonts $NOTOFONTS_TAG
 EOF
 
+# HTTPS-Everywhere is special, too. We need to initialize the git submodules and
+# update them here. Otherwise it would happen during the build.
+cd https-everywhere
+git submodule init
+git submodule update
+cd ..
+
 exit 0
 
diff --git a/gitian/versions b/gitian/versions
index ee7f459..8e35391 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -16,7 +16,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-1-build2
 TOR_TAG=tor-0.2.6.10
 TORLAUNCHER_TAG=0.2.7.7
 TORBUTTON_TAG=1.9.3.2
-HTTPSE_TAG=5.0.7
+HTTPSE_TAG=5.1.0
 NSIS_TAG=v0.3
 ZLIB_TAG=v1.2.8
 LIBEVENT_TAG=release-2.0.21-stable
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index eaae8d2..3588096 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -15,7 +15,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-2-build4
 TOR_TAG=tor-0.2.7.2-alpha
 TORLAUNCHER_TAG=0.2.7.7
 TORBUTTON_TAG=1.9.4
-HTTPSE_TAG=5.0.7
+HTTPSE_TAG=5.1.1
 NSIS_TAG=v0.3
 ZLIB_TAG=v1.2.8
 LIBEVENT_TAG=release-2.0.22-stable
diff --git a/gitian/versions.beta b/gitian/versions.beta
index 501a891..43c5fde 100755
--- a/gitian/versions.beta
+++ b/gitian/versions.beta
@@ -15,7 +15,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build4
 TOR_TAG=tor-0.2.4.21
 TORLAUNCHER_TAG=0.2.5.4
 TORBUTTON_TAG=1.6.9.0
-HTTPSE_TAG=5.0.2
+HTTPSE_TAG=5.1.0
 NSIS_TAG=v0.1
 ZLIB_TAG=v1.2.8
 LIBEVENT_TAG=release-2.0.21-stable



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits