- tbb-commits - lists.torproject.org

[tor-browser-bundle/master] Fix typo in changelog
by gk＠torproject.org 05 Nov '15

05 Nov '15

commit 310740285eed2a0e5fc2fd05c29eaa5ebeec27b9 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 5 11:16:53 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 0b2a51c..2a4af99 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -5,7 +5,7 @@ Tor Browser 5.5a4 -- November 3 2015 * Update NoScript to 2.6.9.39 * Update HTTPS-Everywhere to 5.1.1 * Update Torbutton to 1.9.4.1 - * Bug 9263: Spoof Referer when leaving a .onion domain + * Bug 9623: Spoof Referer when leaving a .onion domain * Bug 16620: Remove old window.name handling code * Bug 17164: Don't show text-select cursor on circuit display * Bug 17351: Remove unused code

1 0

[tor-browser-bundle/master] Bug 17511: fix sha256sums file in continuous builds
by gk＠torproject.org 03 Nov '15

03 Nov '15

commit 7643c10134ff66c427974e36130bfdc1faa044fd Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Nov 2 20:01:02 2015 +0100 Bug 17511: fix sha256sums file in continuous builds --- tools/continuous-builds/build-tbb.sh | 4 ++-- tools/continuous-builds/park-nightly.sh | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/continuous-builds/build-tbb.sh b/tools/continuous-builds/build-tbb.sh index f1be4ef..6c8d248 100755 --- a/tools/continuous-builds/build-tbb.sh +++ b/tools/continuous-builds/build-tbb.sh @@ -61,8 +61,8 @@ if [ $status = done ]; then echo "$0: renaming $DESTDIR -> $NEWDESTDIR" | tee -a $logfile mv $DESTDIR $NEWDESTDIR cd $NEWDESTDIR || exit 3 - sha256sum *.tar.xz *.zip *.dmg *.exe > sha256sums.txt - gpg -a --clearsign $PGPKEYID sha256sums.txt || exit 2 + sha256sum *.tar.xz *.zip *.dmg *.exe > sha256sums-unsigned-build.txt + gpg $PGPKEYID -abs sha256sums-unsigned-build.txt || exit 2 cd .. D=$(basename $NEWDESTDIR) tar cf - $D/sha256sums* $D/*.tar.xz $D/*.zip $D/*.exe $D/*.dmg | ssh -i $PUBLISH_SSH_KEY $PUBLISH_HOST | tee -a $logfile diff --git a/tools/continuous-builds/park-nightly.sh b/tools/continuous-builds/park-nightly.sh index dbc01e4..0f418b2 100755 --- a/tools/continuous-builds/park-nightly.sh +++ b/tools/continuous-builds/park-nightly.sh @@ -16,10 +16,10 @@ DSTDIR=tbb-nightly-$(date +%F) do_check() { [ -z "$1" ] || cd $1 || exit 5 - [ -z "$V" ] || echo "Verifying sha256sums.txt" - gpg -q --verify sha256sums.txt.asc > /dev/null || exit 3 - [ -z "$V" ] || echo "Checking sha256sums.txt" - sha256sum --strict --quiet -c sha256sums.txt || exit 4 + [ -z "$V" ] || echo "Verifying sha256sums-unsigned-build.txt" + gpg -q --verify sha256sums-unsigned-build.txt.asc sha256sums-unsigned-build.txt > /dev/null || exit 3 + [ -z "$V" ] || echo "Checking sha256sums-unsigned-build.txt" + sha256sum --strict --quiet -c sha256sums-unsigned-build.txt || exit 4 } if [ -d $DIR/$DSTDIR ] && [ -e $DIR/$DSTDIR/tbb-nightly.stamp ]; then

1 0

[tor-browser-bundle/maint-5.0] Update the changelog for 5.0.4
by gk＠torproject.org 02 Nov '15

02 Nov '15

commit bcf1d2ea96af55cd4b4220727b124e361411e4a1 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Nov 2 10:11:41 2015 +0000 Update the changelog for 5.0.4 --- Bundle-Data/Docs/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index fab04c9..08e1bae 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -11,6 +11,7 @@ Tor Browser 5.0.4 -- November 3 2015 * Translation updates * Bug 16937: Remove the en-US dictionary from non en-US Tor Browser bundles * Bug 17318: Remove dead ScrambleSuit bridge + * Bug 17473: Update meek-amazon fingerprint * Bug 16983: Isolate favicon requests caused by the tab list dropdown * Bug 17102: Don't crash while opening a second Tor Browser * Windows:

1 0

[tor-browser-bundle/hardened-builds] Update meek-amazon bridge fingerprint to B9E7141C594AF25699E0079C1F0146F409495296.
by gk＠torproject.org 01 Nov '15

01 Nov '15

commit 6f3b8d5c8d85fcef148b6f4b5861d63d6e2f157a Author: David Fifield <david(a)bamsoftware.com> Date: Fri Oct 30 09:26:09 2015 -0700 Update meek-amazon bridge fingerprint to B9E7141C594AF25699E0079C1F0146F409495296. The bridge fingerprint changed when the bridge was restarted on 2015-10-09: https://lists.torproject.org/pipermail/tor-talk/2015-October/039234.html https://bugs.torproject.org/17473 --- Bundle-Data/PTConfigs/bridge_prefs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index fa0d92f..a055d8f 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -25,5 +25,5 @@ pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 83.212.101.3:41213 pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfDQrKjUJP8Qq6wrwSICEPf3Vl/nJRsYxWbg3QRoSqhl2EB78MPS2lQxbXY4EW1wwXA iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-google.1", "meek 0.0.2.0:1 46D4A71197B8FA515A826C6B017C522FE264655B url=https://meek-reflect.appspot.com/ front=www.google.com"); -pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 4EE0CC769EB4B15A872F742EDE27D298A59DCADE url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com"); +pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 A2C13B7DFCAB1CBF3A884B6EB99A98067AB6EF44 url=https://az786092.vo.msecnd.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-bundle/maint-5.0] Update meek-amazon bridge fingerprint to B9E7141C594AF25699E0079C1F0146F409495296.
by gk＠torproject.org 01 Nov '15

01 Nov '15

commit a6cabe7f9d6134a362872daaf07e0a5bc3806242 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Oct 30 09:26:09 2015 -0700 Update meek-amazon bridge fingerprint to B9E7141C594AF25699E0079C1F0146F409495296. The bridge fingerprint changed when the bridge was restarted on 2015-10-09: https://lists.torproject.org/pipermail/tor-talk/2015-October/039234.html https://bugs.torproject.org/17473 --- Bundle-Data/PTConfigs/bridge_prefs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 8f8af9a..3aab4c6 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -31,5 +31,5 @@ pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 83.212.101.3:41213 pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfDQrKjUJP8Qq6wrwSICEPf3Vl/nJRsYxWbg3QRoSqhl2EB78MPS2lQxbXY4EW1wwXA iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-google.1", "meek 0.0.2.0:1 46D4A71197B8FA515A826C6B017C522FE264655B url=https://meek-reflect.appspot.com/ front=www.google.com"); -pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 4EE0CC769EB4B15A872F742EDE27D298A59DCADE url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com"); +pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 A2C13B7DFCAB1CBF3A884B6EB99A98067AB6EF44 url=https://az786092.vo.msecnd.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-bundle/master] Update changelog
by gk＠torproject.org 01 Nov '15

01 Nov '15

commit b16859eaacd75e64384f9e47b1e730d43638c4ca Author: Georg Koppen <gk(a)torproject.org> Date: Sun Nov 1 09:55:31 2015 +0000 Update changelog --- Bundle-Data/Docs/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index ba4a3b5..0b2a51c 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -17,6 +17,7 @@ Tor Browser 5.5a4 -- November 3 2015 * Bug 10599+17305: Include updater and build patches needed for hardened builds * Bug 17318: Remove dead ScrambleSuit bridge * Bug 17428: Remove default Flashproxy bridges + * Bug 17473: Update meek-amazon fingerprint * Windows * Bug 17250: Add localized font names to font whitelist * OS X

1 0

[tor-browser-bundle/master] Update meek-amazon bridge fingerprint to B9E7141C594AF25699E0079C1F0146F409495296.
by gk＠torproject.org 01 Nov '15

01 Nov '15

commit f3f77d9d00bbee358eec588ccf1b833d72989527 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Oct 30 09:26:09 2015 -0700 Update meek-amazon bridge fingerprint to B9E7141C594AF25699E0079C1F0146F409495296. The bridge fingerprint changed when the bridge was restarted on 2015-10-09: https://lists.torproject.org/pipermail/tor-talk/2015-October/039234.html https://bugs.torproject.org/17473 --- Bundle-Data/PTConfigs/bridge_prefs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index fa0d92f..a055d8f 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -25,5 +25,5 @@ pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 83.212.101.3:41213 pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfDQrKjUJP8Qq6wrwSICEPf3Vl/nJRsYxWbg3QRoSqhl2EB78MPS2lQxbXY4EW1wwXA iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-google.1", "meek 0.0.2.0:1 46D4A71197B8FA515A826C6B017C522FE264655B url=https://meek-reflect.appspot.com/ front=www.google.com"); -pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 4EE0CC769EB4B15A872F742EDE27D298A59DCADE url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com"); +pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 A2C13B7DFCAB1CBF3A884B6EB99A98067AB6EF44 url=https://az786092.vo.msecnd.net/ front=ajax.aspnetcdn.com");

1 0

[tor-launcher/master] Update translations
by gk＠torproject.org 31 Oct '15

31 Oct '15

commit 82d5fa132792ca130532cb6438d71a033a48cfdc Author: Georg Koppen <gk(a)torproject.org> Date: Sat Oct 31 20:53:55 2015 +0000 Update translations --- src/chrome/locale/es/network-settings.dtd | 4 ++-- src/chrome/locale/fa/network-settings.dtd | 4 ++-- src/chrome/locale/fil/progress.dtd | 4 ++-- src/chrome/locale/fr/network-settings.dtd | 4 ++-- src/chrome/locale/ky/network-settings.dtd | 4 ++-- src/chrome/locale/ro/network-settings.dtd | 4 ++-- src/chrome/locale/ru/network-settings.dtd | 4 ++-- src/chrome/locale/sv/network-settings.dtd | 4 ++-- src/chrome/locale/uk/network-settings.dtd | 4 ++-- src/chrome/locale/ur/network-settings.dtd | 2 +- src/chrome/locale/ur/progress.dtd | 2 +- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/chrome/locale/es/network-settings.dtd b/src/chrome/locale/es/network-settings.dtd index ed03009..64547c1 100644 --- a/src/chrome/locale/es/network-settings.dtd +++ b/src/chrome/locale/es/network-settings.dtd @@ -1,8 +1,8 @@ <!ENTITY torsettings.dialog.title "Configuración de la red Tor">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> -<!ENTITY torlauncher.localePicker.prompt "Please select a language."> +<!ENTITY torlauncher.localePicker.title "Idioma del Navegador Tor"> +<!ENTITY torlauncher.localePicker.prompt "Por favor, seleccione un idioma.">  diff --git a/src/chrome/locale/fa/network-settings.dtd b/src/chrome/locale/fa/network-settings.dtd index 9a66be2..b7d2076 100644 --- a/src/chrome/locale/fa/network-settings.dtd +++ b/src/chrome/locale/fa/network-settings.dtd @@ -1,8 +1,8 @@ <!ENTITY torsettings.dialog.title "تنظیمات شبکه تور">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> -<!ENTITY torlauncher.localePicker.prompt "Please select a language."> +<!ENTITY torlauncher.localePicker.title "زبان مرورگر تور"> +<!ENTITY torlauncher.localePicker.prompt "لطفا یک زبان انتخاب کنید.">  diff --git a/src/chrome/locale/fil/progress.dtd b/src/chrome/locale/fil/progress.dtd index df60b42..33bbaca 100644 --- a/src/chrome/locale/fil/progress.dtd +++ b/src/chrome/locale/fil/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Buksan ang Settings"> -<!ENTITY torprogress.heading "Kumukonekta sa network ng Tor"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.heading "Nakikipag-ugnayan sa network ng Tor."> +<!ENTITY torprogress.pleaseWait "Pakihintay sandali habang tayo ay nakikipag-ugnayan sa kabalagan ng Tor."> diff --git a/src/chrome/locale/fr/network-settings.dtd b/src/chrome/locale/fr/network-settings.dtd index 9b4f6d0..c6eb480 100644 --- a/src/chrome/locale/fr/network-settings.dtd +++ b/src/chrome/locale/fr/network-settings.dtd @@ -1,7 +1,7 @@ -<!ENTITY torsettings.dialog.title "Paramètres du réseau Tor"> +<!ENTITY torsettings.dialog.title "Paramètres du Réseau Tor">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> +<!ENTITY torlauncher.localePicker.title "Language du navigateur Tor"> <!ENTITY torlauncher.localePicker.prompt "Merci de sélectionner une langue.">  diff --git a/src/chrome/locale/ky/network-settings.dtd b/src/chrome/locale/ky/network-settings.dtd index ef50668..fee491d 100644 --- a/src/chrome/locale/ky/network-settings.dtd +++ b/src/chrome/locale/ky/network-settings.dtd @@ -41,8 +41,8 @@ <!ENTITY torsettings.useProxy.address "Дарек:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.username "Колдонуучунун аты"> +<!ENTITY torsettings.useProxy.password "Сыр сөз:"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> diff --git a/src/chrome/locale/ro/network-settings.dtd b/src/chrome/locale/ro/network-settings.dtd index 6561901..5e77179 100644 --- a/src/chrome/locale/ro/network-settings.dtd +++ b/src/chrome/locale/ro/network-settings.dtd @@ -1,8 +1,8 @@ <!ENTITY torsettings.dialog.title "Setări rețea Tor">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> -<!ENTITY torlauncher.localePicker.prompt "Please select a language."> +<!ENTITY torlauncher.localePicker.title "Limba pentru Tor Browser"> +<!ENTITY torlauncher.localePicker.prompt "Va rugăm sa alegeți o limba.">  diff --git a/src/chrome/locale/ru/network-settings.dtd b/src/chrome/locale/ru/network-settings.dtd index 4880f19..41072da 100644 --- a/src/chrome/locale/ru/network-settings.dtd +++ b/src/chrome/locale/ru/network-settings.dtd @@ -1,8 +1,8 @@ <!ENTITY torsettings.dialog.title "Сетевые настройки Tor">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> -<!ENTITY torlauncher.localePicker.prompt "Please select a language."> +<!ENTITY torlauncher.localePicker.title "Язык Браузера Tor"> +<!ENTITY torlauncher.localePicker.prompt "Пожалуйста, выберите язык.">  diff --git a/src/chrome/locale/sv/network-settings.dtd b/src/chrome/locale/sv/network-settings.dtd index 6ec3077..c53103f 100644 --- a/src/chrome/locale/sv/network-settings.dtd +++ b/src/chrome/locale/sv/network-settings.dtd @@ -1,8 +1,8 @@ <!ENTITY torsettings.dialog.title "Nätverksinställningar för Tor">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> -<!ENTITY torlauncher.localePicker.prompt "Please select a language."> +<!ENTITY torlauncher.localePicker.title "Språk i Tor-webbläsare"> +<!ENTITY torlauncher.localePicker.prompt "Vänligen välj ett språk.">  diff --git a/src/chrome/locale/uk/network-settings.dtd b/src/chrome/locale/uk/network-settings.dtd index a3468a9..8703783 100644 --- a/src/chrome/locale/uk/network-settings.dtd +++ b/src/chrome/locale/uk/network-settings.dtd @@ -1,8 +1,8 @@ <!ENTITY torsettings.dialog.title "Налаштування мережі Tor">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> -<!ENTITY torlauncher.localePicker.prompt "Please select a language."> +<!ENTITY torlauncher.localePicker.title "Мова Tor Browser"> +<!ENTITY torlauncher.localePicker.prompt "Будь ласка, оберіть мову.">  diff --git a/src/chrome/locale/ur/network-settings.dtd b/src/chrome/locale/ur/network-settings.dtd index b193750..cad9bd9 100644 --- a/src/chrome/locale/ur/network-settings.dtd +++ b/src/chrome/locale/ur/network-settings.dtd @@ -1,4 +1,4 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.dialog.title "طور نیٹ ورک کے سیٹنگز">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> diff --git a/src/chrome/locale/ur/progress.dtd b/src/chrome/locale/ur/progress.dtd index ebd9cef..c8710bb 100644 --- a/src/chrome/locale/ur/progress.dtd +++ b/src/chrome/locale/ur/progress.dtd @@ -1,4 +1,4 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> +<!ENTITY torprogress.dialog.title "طور کے حیثیت"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">

1 0

[tor-launcher/master] Version bump
by gk＠torproject.org 31 Oct '15

31 Oct '15

commit 7a971cbbc00edbfecc5953769338a9552aa04469 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Oct 31 20:56:27 2015 +0000 Version bump --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index a7524b7..48a9471 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.7.7</em:version> + <em:version>0.2.8</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL> <em:updateKey>-</em:updateKey>

1 0

[tor-browser-bundle/master] Bug 16909: Don't download submodules while building
by gk＠torproject.org 31 Oct '15

31 Oct '15

commit 7848440fab0426df4b62fece4adb70cd1261499f Author: Georg Koppen <gk(a)torproject.org> Date: Sat Oct 31 08:18:08 2015 +0000 Bug 16909: Don't download submodules while building a) this is wrong and b) it is currently broken due to a certificate error. --- gitian/descriptors/linux/gitian-bundle.yml | 17 +++++++---------- gitian/descriptors/mac/gitian-bundle.yml | 17 +++++++---------- gitian/descriptors/windows/gitian-bundle.yml | 17 +++++++---------- 3 files changed, 21 insertions(+), 30 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index f1d99e9..15f6359 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -116,16 +116,13 @@ script: | # Workaround for git not knowing `git submodule -f` in the version shipped in # 10.04. sed 's/recursive -f/recursive/' -i 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 + # 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 # Since 5.0.2 a .xpi for AMO is built, too. We don't need it. rm ./pkg/*-amo.xpi cp pkg/*.xpi ../${TB_STAGE_DIR}/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index 458d613..0199cca 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -111,16 +111,13 @@ 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 + # 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 # 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 diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index eac3345..51565bf 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -98,16 +98,13 @@ 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 + # 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 # 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

1 0