- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-38.3.0esr-5.5-2] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 13 Oct '15

13 Oct '15

commit 1c95cfa27db267c332262518c64a79c96f3ef4fa Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Oct 5 16:48:36 2015 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. Fixes bug 17220. --- browser/app/profile/000-tor-browser.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 3e4afd8..26b50e3 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -260,7 +260,7 @@ pref("browser.download.panel.shown", true); #ifdef MOZ_BUNDLED_FONTS #ifdef XP_MACOSX -pref("font.system.whitelist", "AppleGothic, Arial, Courier, Geneva, Georgia, Heiti TC, Helvetica, Helvetica Neue, Hiragino Kaku Gothic ProN, Lucida Grande, Monaco, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi, STHeiti, Tahoma, Thonburi, Times, Times New Roman, Verdana"); +pref("font.system.whitelist", "AppleGothic, Arial, Courier, Geneva, Georgia, Heiti TC, Helvetica, Helvetica Neue, Hiragino Kaku Gothic ProN, Lucida Grande, Monaco, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi, STHeiti, STIX Math, Tahoma, Thonburi, Times, Times New Roman, Verdana"); pref("font.name-list.cursive.x-unicode", "Apple Chancery, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); pref("font.name-list.fantasy.x-unicode", "Papyrus, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); pref("font.name-list.monospace.x-unicode", "Courier, Arial, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); @@ -273,7 +273,7 @@ pref("font.name.sans-serif.ar", "Arial"); #endif #ifdef XP_WIN -pref("font.system.whitelist", "Arial, Batang, Courier New, Euphemia, Gautami, Georgia, Gulim, GulimChe, Iskoola Pota, Kalinga, Kartika, Latha, Lucida Console, MS Gothic, MS Mincho, MS PGothic, MS PMincho, MV Boli, Mangal, Microsoft Himalaya, Microsoft YaHei, MingLiU, Noto Sans Buginese, Noto Sans Khmer, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Yi, Nyala, PMingLiU, Plantagenet Cherokee, Raavi, Segoe UI, Shruti, SimSun, Sylfaen, Tahoma, Times New Roman, Tunga, Verdana, Vrinda"); +pref("font.system.whitelist", "Arial, Batang, Cambria Math, Courier New, Euphemia, Gautami, Georgia, Gulim, GulimChe, Iskoola Pota, Kalinga, Kartika, Latha, Lucida Console, MS Gothic, MS Mincho, MS PGothic, MS PMincho, MV Boli, Mangal, Microsoft Himalaya, Microsoft YaHei, MingLiU, Noto Sans Buginese, Noto Sans Khmer, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Yi, Nyala, PMingLiU, Plantagenet Cherokee, Raavi, Segoe UI, Shruti, SimSun, Sylfaen, Tahoma, Times New Roman, Tunga, Verdana, Vrinda"); #endif #ifdef XP_LINUX

1 0

[tor-browser-bundle/master] Bug 17124: No patch for tor alpha > 0.2.7.2 anymore
by gk＠torproject.org 12 Oct '15

12 Oct '15

commit fed9df74f3fc35a898710b8186efbfd250ea926d Author: Georg Koppen <gk(a)torproject.org> Date: Tue Oct 6 07:48:05 2015 +0000 Bug 17124: No patch for tor alpha > 0.2.7.2 anymore --- Bundle-Data/linux/Data/Tor/torrc-defaults | 2 +- Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults | 2 +- Bundle-Data/windows/Data/Tor/torrc-defaults | 2 +- gitian/descriptors/linux/gitian-tor.yml | 2 -- gitian/descriptors/mac/gitian-tor.yml | 2 -- gitian/descriptors/windows/gitian-tor.yml | 2 -- 6 files changed, 3 insertions(+), 9 deletions(-) diff --git a/Bundle-Data/linux/Data/Tor/torrc-defaults b/Bundle-Data/linux/Data/Tor/torrc-defaults index e4c8920..4b91aae 100644 --- a/Bundle-Data/linux/Data/Tor/torrc-defaults +++ b/Bundle-Data/linux/Data/Tor/torrc-defaults @@ -5,6 +5,6 @@ AvoidDiskWrites 1 Log notice stdout # Bind to this address to listen to connections from SOCKS-speaking # applications. -SocksPort 9150 IPv6Traffic PreferIPv6 +SocksPort 9150 IPv6Traffic PreferIPv6 KeepAliveIsolateSOCKSAuth ControlPort 9151 CookieAuthentication 1 diff --git a/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults b/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults index e4c8920..4b91aae 100644 --- a/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults +++ b/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults @@ -5,6 +5,6 @@ AvoidDiskWrites 1 Log notice stdout # Bind to this address to listen to connections from SOCKS-speaking # applications. -SocksPort 9150 IPv6Traffic PreferIPv6 +SocksPort 9150 IPv6Traffic PreferIPv6 KeepAliveIsolateSOCKSAuth ControlPort 9151 CookieAuthentication 1 diff --git a/Bundle-Data/windows/Data/Tor/torrc-defaults b/Bundle-Data/windows/Data/Tor/torrc-defaults index e4c8920..4b91aae 100644 --- a/Bundle-Data/windows/Data/Tor/torrc-defaults +++ b/Bundle-Data/windows/Data/Tor/torrc-defaults @@ -5,6 +5,6 @@ AvoidDiskWrites 1 Log notice stdout # Bind to this address to listen to connections from SOCKS-speaking # applications. -SocksPort 9150 IPv6Traffic PreferIPv6 +SocksPort 9150 IPv6Traffic PreferIPv6 KeepAliveIsolateSOCKSAuth ControlPort 9151 CookieAuthentication 1 diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index 906077b..d8e3557 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -84,8 +84,6 @@ script: | git am ~/build/bug15482.patch git am ~/build/bug16430.patch git am ~/build/bug16674.patch - else - git am ~/build/bug15482.patch fi mkdir -p $OUTDIR/src #git archive HEAD | tar -x -C $OUTDIR/src diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 848fbe9..857b5de 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -62,8 +62,6 @@ script: | git am ~/build/bug15482.patch git am ~/build/bug16430.patch git am ~/build/bug16674.patch - else - git am ~/build/bug15482.patch fi mkdir -p $OUTDIR/src #git archive HEAD | tar -x -C $OUTDIR/src diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index 7320a65..9d6838c 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -62,8 +62,6 @@ script: | git am ~/build/bug15482.patch git am ~/build/bug16430.patch git am ~/build/bug16674.patch - else - git am ~/build/bug15482.patch fi mkdir -p $OUTDIR/src #git archive HEAD | tar -x -C $OUTDIR/src

1 0

[torbutton/maint-1.9.3] Bug 17164: Don't show text-select cursor on circuit display
by gk＠torproject.org 06 Oct '15

06 Oct '15

commit fa52d60753aabf7bc9239632f0a552acfaa59a95 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Sep 25 11:57:42 2015 -0700 Bug 17164: Don't show text-select cursor on circuit display --- src/chrome/skin/tor-circuit-display.css | 1 + 1 file changed, 1 insertion(+) diff --git a/src/chrome/skin/tor-circuit-display.css b/src/chrome/skin/tor-circuit-display.css index fc18f05..d3b5edc 100644 --- a/src/chrome/skin/tor-circuit-display.css +++ b/src/chrome/skin/tor-circuit-display.css @@ -19,6 +19,7 @@ div#circuit-display { padding: 8px; /* Magically keep popup menu from clipping div: */ display: table-cell; + cursor: default; } /* Format the title text. */

1 0

[torbutton/master] Bug 17164: Don't show text-select cursor on circuit display
by gk＠torproject.org 06 Oct '15

06 Oct '15

commit a6f8dcec3bc11bcfc9ded64943051e2408ee9190 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Sep 25 11:57:42 2015 -0700 Bug 17164: Don't show text-select cursor on circuit display --- src/chrome/skin/tor-circuit-display.css | 1 + 1 file changed, 1 insertion(+) diff --git a/src/chrome/skin/tor-circuit-display.css b/src/chrome/skin/tor-circuit-display.css index fc18f05..d3b5edc 100644 --- a/src/chrome/skin/tor-circuit-display.css +++ b/src/chrome/skin/tor-circuit-display.css @@ -19,6 +19,7 @@ div#circuit-display { padding: 8px; /* Magically keep popup menu from clipping div: */ display: table-cell; + cursor: default; } /* Format the title text. */

1 0

[tor-browser-bundle/master] LXC is still not ready for prime-time
by gk＠torproject.org 24 Sep '15

24 Sep '15

commit bbdab93d054800d1b395dab7066403ad5fa8b7ab Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 24 09:46:13 2015 +0000 LXC is still not ready for prime-time --- Bundle-Data/Docs/ChangeLog.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 7f45827..dce1a3e 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -35,8 +35,6 @@ Tor Browser 5.5a3 -- September 22 2015 * Bug 16707: Allow more system fonts to get used on OS X * Linux * Bug 16672: Don't use font whitelisting for Linux users - * Build system - * Bug 12240+12237: Make LXC builds reproducible Tor Browser 5.0.3 -- September 22 2015 * All Platforms

1 0

[tor-browser-bundle/maint-5.0] Fix typo in Changelog
by gk＠torproject.org 22 Sep '15

22 Sep '15

commit 57bd13e2e031acee6429424fde42b470704d8c24 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 22 14:50:32 2015 +0000 Fix typo in Changelog --- Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index ade00f3..f5a4d71 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -9,7 +9,7 @@ Tor Browser 5.0.3 -- September 22 2015 * Translation updates * Bug 7446: Tor Browser should not "fix up" .onion domains (or any domains) * Bug 16837: Disable Firefox Hotfix updates - * Bug 16855: Allow blobs to be download on first-party pages (fixes mega.nz) + * Bug 16855: Allow blobs to be downloaded on first-party pages (fixes mega.nz) * Bug 16781: Allow saving pdf files in built-in pdf viewer * Bug 16842: Restore Media tab on Page information dialog * Bug 16727: Disable about:healthreport page

1 0

[tor-browser-bundle/master] Fix typos in Changelog
by gk＠torproject.org 22 Sep '15

22 Sep '15

commit ca69d85d27cbed53b251aae23d15e3da8a4e6a39 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 22 14:48:51 2015 +0000 Fix typos in Changelog --- Bundle-Data/Docs/ChangeLog.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 7c7b6b3..7f45827 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -16,7 +16,7 @@ Tor Browser 5.5a3 -- September 22 2015 * Bug 16937: Remove the en-US dictionary from non en-US Tor Browser bundles * Bug 7446: Tor Browser should not "fix up" .onion domains (or any domains) * Bug 16837: Disable Firefox Hotfix updates - * Bug 16855: Allow blobs to be download on first-party pages (fixes mega.nz) + * Bug 16855: Allow blobs to be downloaded on first-party pages (fixes mega.nz) * Bug 16781: Allow saving pdf files in built-in pdf viewer * Bug 16842: Restore Media tab on Page information dialog * Bug 16727: Disable about:healthreport page @@ -49,7 +49,7 @@ Tor Browser 5.0.3 -- September 22 2015 * Translation updates * Bug 7446: Tor Browser should not "fix up" .onion domains (or any domains) * Bug 16837: Disable Firefox Hotfix updates - * Bug 16855: Allow blobs to be download on first-party pages (fixes mega.nz) + * Bug 16855: Allow blobs to be downloaded on first-party pages (fixes mega.nz) * Bug 16781: Allow saving pdf files in built-in pdf viewer * Bug 16842: Restore Media tab on Page information dialog * Bug 16727: Disable about:healthreport page

1 0

[tor-browser-bundle/master] We have no fix for 16909 in 5.5a3 yet
by gk＠torproject.org 22 Sep '15

22 Sep '15

commit a5d9b3dc621e521a106c869dde1057bc4cabadd1 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 22 14:09:20 2015 +0000 We have no fix for 16909 in 5.5a3 yet --- Bundle-Data/Docs/ChangeLog.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index cddf2d5..7c7b6b3 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -36,7 +36,6 @@ Tor Browser 5.5a3 -- September 22 2015 * Linux * Bug 16672: Don't use font whitelisting for Linux users * Build system - * Bug 16909: Bump Ubuntu host requirement to 14.04+ * Bug 12240+12237: Make LXC builds reproducible Tor Browser 5.0.3 -- September 22 2015

1 0

[tor-browser-bundle/master] Revert "Bug 16909: Adapt to HTTPS-Everyhwere build changes"
by gk＠torproject.org 20 Sep '15

20 Sep '15

commit 2b50a8cb7d2f4e43f41f82c13704b9af15ba6b4e Author: Georg Koppen <gk(a)torproject.org> Date: Sun Sep 20 05:50:49 2015 +0000 Revert "Bug 16909: Adapt to HTTPS-Everyhwere build changes" This reverts commit f8a4557bb2a46f06e664e47a57a7065322dbbd35. --- 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, 32 insertions(+), 64 deletions(-) diff --git a/gitian/README.build b/gitian/README.build index f289791..656dddd 100644 --- a/gitian/README.build +++ b/gitian/README.build @@ -1,6 +1,6 @@ QuickStart: - On an Ubuntu 14.04+/Debian Wheezy+ machine or VM, run: + On an Ubuntu 12.04+/Debian Wheezy+ machine or VM, run: $ make diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh index cc16d0e..32c9b7b 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 14.04 LTS/Debian Wheezy or newer." + echo "You need to run Ubuntu 12.04 LTS/Debian Wheezy or newer." exit 1 fi @@ -14,22 +14,15 @@ DISTRO=`cat /etc/issue | grep -Eo 'Ubuntu|Debian*'` if [ $DISTRO = "Ubuntu" ]; then - VERSION=`cat /etc/issue | grep -Eo '[0-9]{2}' | head -1` - if [ "$VERSION" -ge "14" ]; - 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 + 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." + 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 elif [ $DISTRO = "Debian" ]; diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index 81fcdf1..ce743df 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -66,7 +66,7 @@ script: | umask 0022 # mkdir -p $OUTDIR/ - mkdir -p tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere-eff(a)eff.org + mkdir -p tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org 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/ @@ -100,16 +100,10 @@ script: | cd ../../../ # cd https-everywhere - # 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 + # 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 # 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(a)eff.org.xpi @@ -118,7 +112,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(a)noscript.net.xpi {73a6fe31-595d-460b-a920-fcc0f8843232}.xpi - cd https-everywhere-eff(a)eff.org/ + cd https-everywhere(a)eff.org/ unzip ../https-everywhere(a)eff.org.xpi rm ../https-everywhere(a)eff.org.xpi cd ~/build diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index cfb7888..e250365 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -74,7 +74,7 @@ script: | MARTOOLS=~/build/mar-tools # mkdir -p $OUTDIR/ - mkdir -p $TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere-eff(a)eff.org + mkdir -p $TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org 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 @@ -102,16 +102,10 @@ script: | cd ../../../ # cd https-everywhere - # 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 + # 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 # 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(a)eff.org.xpi @@ -120,7 +114,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(a)noscript.net.xpi {73a6fe31-595d-460b-a920-fcc0f8843232}.xpi - cd https-everywhere-eff(a)eff.org + cd https-everywhere(a)eff.org unzip ../https-everywhere(a)eff.org.xpi rm ../https-everywhere(a)eff.org.xpi cd ~/build/ diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index dc8ad05..6028601 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-eff(a)eff.org + mkdir -p tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org 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,16 +90,10 @@ script: | cd ../../../ # cd https-everywhere - # 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 + # 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 # 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(a)eff.org.xpi @@ -108,7 +102,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(a)noscript.net.xpi {73a6fe31-595d-460b-a920-fcc0f8843232}.xpi - cd https-everywhere-eff(a)eff.org + cd https-everywhere(a)eff.org unzip ../https-everywhere(a)eff.org.xpi rm ../https-everywhere(a)eff.org.xpi cd ~/build/ diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 22162b0..42efa33 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -162,7 +162,7 @@ do get "${!PACKAGE}" "${!URL}" done -# NoScript is magikal and special: +# NoScript and HTTPS-Everywhere are magikal and special: wget -U "" -N ${NOSCRIPT_URL} # Verify packages with weak or no signatures via direct sha256 check @@ -281,12 +281,5 @@ 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 70801b2..b833342 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.1.0 +HTTPSE_TAG=5.0.7 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 ade634a..6c3d05a 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -15,7 +15,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-2-build3 TOR_TAG=tor-0.2.7.2-alpha TORLAUNCHER_TAG=0.2.7.7 TORBUTTON_TAG=1.9.4 -HTTPSE_TAG=5.1.1 +HTTPSE_TAG=5.0.7 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 8c4cfa9..c2143a0 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.1.0 +HTTPSE_TAG=5.0.2 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable

1 0

[tor-browser-bundle/master] Use build version 4
by gk＠torproject.org 20 Sep '15

20 Sep '15

commit a20586e9e5a19de7f0b271807a99bdf4c1563df0 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Sep 20 06:10:20 2015 +0000 Use build version 4 --- Bundle-Data/Docs/ChangeLog.txt | 2 -- gitian/versions.alpha | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index a6784a4..cddf2d5 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -2,7 +2,6 @@ Tor Browser 5.5a3 -- September 22 2015 * All Platforms * Update Firefox to 38.3.0esr * Update libevent to 2.0.22-stable - * Update HTTPS-Everywhere to 5.1.1 * Update Torbutton to 1.9.4 * Bug 16937: Don't translate the hompepage/spellchecker dictionary string * Bug 16735: about:tor should accommodate different fonts/font sizes @@ -13,7 +12,6 @@ Tor Browser 5.5a3 -- September 22 2015 * Bug 10140: Add new Tor Browser locale (Japanese) * Bug 17102: Don't crash while opening a second Tor Browser * Bug 16983: Isolate favicon requests caused by the tab list dropdown - * Bug 16909: Adapt to HTTPS-Everywhere build changes * Bug 13512: Load a static tab with change notes after an update * Bug 16937: Remove the en-US dictionary from non en-US Tor Browser bundles * Bug 7446: Tor Browser should not "fix up" .onion domains (or any domains) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 6c3d05a..c856979 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -11,7 +11,7 @@ FIREFOX_VERSION=38.3.0esr TORBROWSER_UPDATE_CHANNEL=alpha -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-2-build3 +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

1 0