commit f8998987409e2c3b8ba747c17b7bf0ff95f7b08b Author: Mike Perry mikeperry-git@torproject.org Date: Thu Oct 31 15:18:30 2013 -0700

Work around a HTTPS-Everywhere build reproducibility issue.

https://trac.torproject.org/projects/tor/ticket/10066 --- gitian/descriptors/linux/gitian-bundle.yml | 3 +++ gitian/descriptors/mac/gitian-bundle.yml | 3 +++ gitian/descriptors/windows/gitian-bundle.yml | 3 +++ 3 files changed, 9 insertions(+)

diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index 1728358..060f1a4 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -76,6 +76,9 @@ 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 cp ./pkg/*.xpi ../tor-browser/Data/Browser/profile.default/extensions/https-everywhere@eff.org.xpi cd .. diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index 85df0e7..cdf387b 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -74,6 +74,9 @@ 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 cp ./pkg/*.xpi ../TorBrowserBundle.app/Data/Browser/profile.default/extensions/https-everywhere@eff.org.xpi cd .. diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index abe4549..bb28155 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -74,6 +74,9 @@ 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 cp ./pkg/*.xpi ../tbb-windows-installer/"Tor Browser"/Data/Browser/profile.default/extensions/https-everywhere@eff.org.xpi cd ..