- tbb-commits - lists.torproject.org

[tor-launcher/master] Bug #11482: Hide bridge settings prompt if no default bridges.
by brade＠torproject.org 17 Apr '14

17 Apr '14

commit 4776f6c431a06867b8d2a5c6c3f35c4a7f78850e Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Apr 17 10:31:40 2014 -0400 Bug #11482: Hide bridge settings prompt if no default bridges. --- src/chrome/content/network-settings-wizard.xul | 3 ++- src/chrome/content/network-settings.js | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/network-settings-wizard.xul b/src/chrome/content/network-settings-wizard.xul index a1d820e..07fcdcd 100644 --- a/src/chrome/content/network-settings-wizard.xul +++ b/src/chrome/content/network-settings-wizard.xul @@ -140,7 +140,8 @@ </vbox> <separator /> <vbox> - <label class="question">&torSettings.bridgeSettingsPrompt;</label> + <label id="bridgeSettingsPrompt" + class="question">&torSettings.bridgeSettingsPrompt;</label> <groupbox id="bridgeSpecificSettings" /> </vbox> </wizardpage> diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 07526c8..98028e2 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -818,6 +818,10 @@ function initBridgeSettings() if (!canUseDefaultBridges) { + var label = document.getElementById("bridgeSettingsPrompt"); + if (label) + label.setAttribute("hidden", true); + var radioGroup = document.getElementById("bridgeTypeRadioGroup"); if (radioGroup) radioGroup.setAttribute("hidden", true);

1 0

[tor-launcher/master] Bug #11484: Show help button even if no default bridges.
by brade＠torproject.org 17 Apr '14

17 Apr '14

commit c9427b6623deae7d08019f734b56d4b62990a694 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Apr 17 10:06:46 2014 -0400 Bug #11484: Show help button even if no default bridges. --- src/chrome/content/network-settings-overlay.xul | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/chrome/content/network-settings-overlay.xul b/src/chrome/content/network-settings-overlay.xul index 4172af5..6422802 100644 --- a/src/chrome/content/network-settings-overlay.xul +++ b/src/chrome/content/network-settings-overlay.xul @@ -74,7 +74,7 @@ </groupbox> <groupbox id="bridgeSpecificSettings"> - <hbox pack="end"> + <hbox align="end" pack="end"> <radiogroup id="bridgeTypeRadioGroup" flex="1" style="margin: 0px" oncommand="onBridgeTypeRadioChange()"> <radio id="bridgeRadioDefault" @@ -91,12 +91,10 @@ </hbox> <spacer style="height: 0.5em" /> - <hbox align="baseline" flex="1"> - <radio align="start" id="bridgeRadioCustom" - label="&torsettings.useBridges.custom;" /> - <button align="end" dlgtype="help" oncommand="onOpenHelp()" /> - </hbox> + <radio align="start" id="bridgeRadioCustom" + label="&torsettings.useBridges.custom;" /> </radiogroup> + <button dlgtype="help" oncommand="onOpenHelp()" /> </hbox> <vbox id="bridgeCustomEntry"> <label id="bridgeListLabel" style="margin-top:0px;"

1 0

[tor-browser-bundle/master] Version bump.
by gk＠torproject.org 17 Apr '14

17 Apr '14

commit bc2cb177a16d8e34b359175e0804b133635a0c62 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 17 14:45:28 2014 +0000 Version bump. HTTPS-Everywhere has a new stable version, 3.5. Adding that to all version files. Additionally, updating the tor, Tor Browser and TorLauncher tag in the alpha version file. --- gitian/versions | 2 +- gitian/versions.alpha | 8 ++++---- gitian/versions.beta | 2 +- gitian/versions.nightly | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gitian/versions b/gitian/versions index a1e6384..addcb3b 100755 --- a/gitian/versions +++ b/gitian/versions @@ -9,7 +9,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build1 TOR_TAG=tor-0.2.4.21 TORLAUNCHER_TAG=0.2.4.4 TORBUTTON_TAG=1.6.7.0 -HTTPSE_TAG=3.4.5 +HTTPSE_TAG=3.5 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 650103a..56192a8 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -6,11 +6,11 @@ VERIFY_TAGS=1 FIREFOX_VERSION=24.4.0esr -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build1 -TOR_TAG=tor-0.2.5.2-alpha -TORLAUNCHER_TAG=0.2.5.1a +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build2 +TOR_TAG=tor-0.2.5.3-alpha +TORLAUNCHER_TAG=0.2.5.3 TORBUTTON_TAG=1.6.8.1 -HTTPSE_TAG=3.4.5 +HTTPSE_TAG=3.5 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable diff --git a/gitian/versions.beta b/gitian/versions.beta index 9d6a8f0..95e7235 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -10,7 +10,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build2 TOR_TAG=tor-0.2.4.21 TORLAUNCHER_TAG=0.2.5.3 TORBUTTON_TAG=1.6.8.1 -HTTPSE_TAG=3.4.5 +HTTPSE_TAG=3.5 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 1869182..74455b6 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -10,7 +10,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1 TOR_TAG=master TORLAUNCHER_TAG=master TORBUTTON_TAG=master -HTTPSE_TAG=3.4.5 # XXX: Master and 4.0 require python2.7 +HTTPSE_TAG=3.5 # XXX: Master and 4.0 require python2.7 NSIS_TAG=master ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable

1 0

[tor-browser-bundle/master] Set the bundle version in the bundle descriptor.
by gk＠torproject.org 17 Apr '14

17 Apr '14

commit 62ca5505e07fd86add646b97f82caf136e39b348 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 17 14:06:38 2014 +0000 Set the bundle version in the bundle descriptor. We used to set the bundle version in the browser descriptor which had the bad side-effect that we needed to rebuild the whole Tor Browser just in order to change the bundle version. We do that now in the bundle descriptor instead. --- gitian/descriptors/linux/gitian-bundle.yml | 5 +++++ gitian/descriptors/linux/gitian-firefox.yml | 6 +----- gitian/descriptors/mac/gitian-bundle.yml | 5 +++++ gitian/descriptors/mac/gitian-firefox.yml | 4 ---- gitian/descriptors/windows/gitian-bundle.yml | 5 +++++ gitian/descriptors/windows/gitian-firefox.yml | 6 +----- 6 files changed, 17 insertions(+), 14 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index fa78928..39a7747 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -41,6 +41,7 @@ files: - "bundle.inputs" - "versions" - "tbb-docs.zip" +- "torbrowser.version" script: | INSTDIR="$HOME/install" source versions @@ -118,6 +119,10 @@ script: | # pushd tor-browser_en-US/Browser/browser/ unzip omni.ja defaults/preferences/000-tor-browser.js + # Set the version of the bundle. + grep -v '^pref(\"torbrowser.version\",' defaults/preferences/000-tor-browser.js > defaults/preferences/000-tor-browser.js.fixed + cat ~/build/torbrowser.version >> defaults/preferences/000-tor-browser.js.fixed + mv defaults/preferences/000-tor-browser.js.fixed defaults/preferences/000-tor-browser.js cp defaults/preferences/000-tor-browser.js ~/build/ # Set the locale of the bundle. echo "pref(\"general.useragent.locale\", \"en-US\");" >> defaults/preferences/000-tor-browser.js diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 282ea49..1f2cf12 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -5,7 +5,7 @@ suites: architectures: - "i386" - "amd64" -packages: +packages: - "faketime" - "unzip" - "zip" @@ -29,7 +29,6 @@ remotes: - "url": "https://git.torproject.org/tor-browser.git" "dir": "tor-browser" files: -- "torbrowser.version" - "re-dzip.sh" - "dzip.sh" - "python.tar.bz2" @@ -73,9 +72,6 @@ script: | fi # cd tor-browser - grep -v '^pref(\"torbrowser.version\",' browser/app/profile/000-tor-browser.js > browser/app/profile/000-tor-browser.js.fixed - cat ../torbrowser.version >> browser/app/profile/000-tor-browser.js.fixed - mv browser/app/profile/000-tor-browser.js.fixed browser/app/profile/000-tor-browser.js # .git and the src takes up a lot of useless space, and we need the space to build #git archive HEAD | tar -x -C $OUTDIR/src rm -rf .git diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index 4928acb..b7ecf3a 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -46,6 +46,7 @@ files: - "versions" - "tbb-docs.zip" - "mac-tor.sh" +- "torbrowser.version" script: | INSTDIR="$HOME/install" source versions @@ -146,6 +147,10 @@ script: | # pushd $TORBROWSER_NAME.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/browser/ unzip omni.ja defaults/preferences/000-tor-browser.js + # Set the version of the bundle. + grep -v '^pref(\"torbrowser.version\",' defaults/preferences/000-tor-browser.js > defaults/preferences/000-tor-browser.js.fixed + cat ~/build/torbrowser.version >> defaults/preferences/000-tor-browser.js.fixed + mv defaults/preferences/000-tor-browser.js.fixed defaults/preferences/000-tor-browser.js cp defaults/preferences/000-tor-browser.js ~/build/ # Set the locale of the bundle. echo "pref(\"general.useragent.locale\", \"en-US\");" >> defaults/preferences/000-tor-browser.js diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index e252888..1832f55 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -17,7 +17,6 @@ remotes: - "url": "https://git.torproject.org/tor-browser.git" "dir": "tor-browser" files: -- "torbrowser.version" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "x86_64-apple-darwin10.tar.xz" - "re-dzip.sh" @@ -51,9 +50,6 @@ script: | # cd tor-browser mv .mozconfig-mac .mozconfig - grep -v '^pref(\"torbrowser.version\",' browser/app/profile/000-tor-browser.js > browser/app/profile/000-tor-browser.js.fixed - cat ../torbrowser.version >> browser/app/profile/000-tor-browser.js.fixed - mv browser/app/profile/000-tor-browser.js.fixed browser/app/profile/000-tor-browser.js # .git and the src takes up a lot of useless space, and we need the space to build #git archive HEAD | tar -x -C $OUTDIR/src rm -rf .git diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index ac79d58..fddb611 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -39,6 +39,7 @@ files: - "bundle.inputs" - "versions" - "tbb-docs.zip" +- "torbrowser.version" script: | INSTDIR="$HOME/install" source versions @@ -115,6 +116,10 @@ script: | # pushd "Tor Browser"/Browser/browser/ unzip omni.ja defaults/preferences/000-tor-browser.js + # Set the version of the bundle. + grep -v '^pref(\"torbrowser.version\",' defaults/preferences/000-tor-browser.js > defaults/preferences/000-tor-browser.js.fixed + cat ~/build/torbrowser.version >> defaults/preferences/000-tor-browser.js.fixed + mv defaults/preferences/000-tor-browser.js.fixed defaults/preferences/000-tor-browser.js cp defaults/preferences/000-tor-browser.js ~/build/ # Set the locale bundle. echo "pref(\"general.useragent.locale\", \"en-US\");" >> defaults/preferences/000-tor-browser.js diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index 1c151ea..fefb677 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -4,7 +4,7 @@ suites: - "precise" architectures: - "i386" -packages: +packages: - "git-core" - "unzip" - "zip" @@ -25,7 +25,6 @@ files: - "mingw-w64-svn-snapshot.zip" - "binutils.tar.bz2" - "gcc.tar.bz2" -- "torbrowser.version" - "re-dzip.sh" - "dzip.sh" - "i686-w64-mingw32-gcc" @@ -137,9 +136,6 @@ script: | # Our flags don't get passed to NSS. We need to do that manually using an # obscure one. export DLLFLAGS="-specs=/home/ubuntu/build/msvcr100.spec" - grep -v '^pref(\"torbrowser.version\",' browser/app/profile/000-tor-browser.js > browser/app/profile/000-tor-browser.js.fixed - cat ../torbrowser.version >> browser/app/profile/000-tor-browser.js.fixed - mv browser/app/profile/000-tor-browser.js.fixed browser/app/profile/000-tor-browser.js # .git and the src takes up a lot of useless space, and we need the space to build #git archive HEAD | tar -x -C $OUTDIR/src rm -rf .git

1 0

[tor-browser-bundle/master] Bug 11539: Update PTs when building nightlies.
by gk＠torproject.org 17 Apr '14

17 Apr '14

commit e47484df829eefead58ed10c8541a493c0ba6e3a Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 17 12:40:53 2014 +0000 Bug 11539: Update PTs when building nightlies. We have to update branches to build the latest and greatest Pluggable Transport code. In order to do so we need to tell update_git() the corresponding tag. --- gitian/fetch-inputs.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index e80713b..6b8ae99 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -297,10 +297,10 @@ https-everywhere https://git.torproject.org/https-everywhere.git $HTTPSE_TA torbutton https://git.torproject.org/torbutton.git $TORBUTTON_TAG tor-launcher https://git.torproject.org/tor-launcher.git $TORLAUNCHER_TAG tor-browser https://git.torproject.org/tor-browser.git $TORBROWSER_TAG -pyptlib https://git.torproject.org/pluggable-transports/pyptlib.git -obfsproxy https://git.torproject.org/pluggable-transports/obfsproxy.git -flashproxy https://git.torproject.org/flashproxy.git -fteproxy https://github.com/kpdyer/fteproxy.git +pyptlib https://git.torproject.org/pluggable-transports/pyptlib.git $PYPTLIB_TAG +obfsproxy https://git.torproject.org/pluggable-transports/obfsproxy.git $OBFSPROXY_TAG +flashproxy https://git.torproject.org/flashproxy.git $FLASHPROXY_TAG +fteproxy https://github.com/kpdyer/fteproxy.git $FTEPROXY_TAG libdmg-hfsplus https://github.com/vasi/libdmg-hfsplus.git $LIBDMG_TAG EOF

1 0

[tor-browser-bundle/master] Bug 11539: pin latest version of fteproxy across all versions* files
by gk＠torproject.org 17 Apr '14

17 Apr '14

commit a6208dc8dcfe383a25a7d53b77675c90028774f5 Author: Kevin P. Dyer <kpdyer(a)gmail.com> Date: Wed Apr 16 18:53:49 2014 -0700 Bug 11539: pin latest version of fteproxy across all versions* files --- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- gitian/versions.nightly | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/versions b/gitian/versions index d381fed..a1e6384 100755 --- a/gitian/versions +++ b/gitian/versions @@ -17,7 +17,7 @@ MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.5 OBFSPROXY_TAG=obfsproxy-0.2.4 FLASHPROXY_TAG=1.6 -FTEPROXY_TAG=0.2.12 +FTEPROXY_TAG=0.2.13 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.x-5 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 59edba7..650103a 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -18,7 +18,7 @@ MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.5 OBFSPROXY_TAG=obfsproxy-0.2.4 FLASHPROXY_TAG=1.6 -FTEPROXY_TAG=0.2.12 +FTEPROXY_TAG=0.2.13 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.x-5 diff --git a/gitian/versions.beta b/gitian/versions.beta index 9b3f80d..9d6a8f0 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -18,7 +18,7 @@ MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.5 OBFSPROXY_TAG=obfsproxy-0.2.4 FLASHPROXY_TAG=1.6 -FTEPROXY_TAG=0.2.12 +FTEPROXY_TAG=0.2.13 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.x-5 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index c54df5a..c2d2997 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -18,7 +18,7 @@ MINGW_REV=6184 PYPTLIB_TAG=master OBFSPROXY_TAG=master FLASHPROXY_TAG=master -FTEPROXY_TAG=master +FTEPROXY_TAG=0.2.13 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.x-5

1 0

[tor-browser-bundle/master] Merge remote-tracking branch 'kpdyer/master'
by gk＠torproject.org 17 Apr '14

17 Apr '14

commit 7df52e4294bcb0fff50c34bffe7aca38a9b88b61 Merge: e1623db a6208dc Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 17 12:29:21 2014 +0000 Merge remote-tracking branch 'kpdyer/master' gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- gitian/versions.nightly | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --cc gitian/versions.nightly index 79930f7,c2d2997..1869182 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@@ -16,10 -16,9 +16,10 @@@ ZLIB_TAG=v1.2. LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 PYPTLIB_TAG=master -OBFSPROXY_TAG=master +# Hardcoding this commit until #11535 is fixed +OBFSPROXY_TAG=b58fd9e1ef264796b6bddbde5db117472fb674a0 FLASHPROXY_TAG=master - FTEPROXY_TAG=master + FTEPROXY_TAG=0.2.13 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.x-5

1 0

[tor-browser-bundle/master] Bug 11535: Hardcoding obfsproxy commit.
by gk＠torproject.org 17 Apr '14

17 Apr '14

commit 612972b1eb3ac54754467c66ab146baa800f5eb8 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 17 11:14:09 2014 +0000 Bug 11535: Hardcoding obfsproxy commit. Until #11535 is getting fixed we are hardcoding commit b58fd9e1ef264796b6bddbde5db117472fb674a0 to avoid a broken obfsproxy in nightly builds. --- gitian/versions.nightly | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index c54df5a..79930f7 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -16,7 +16,8 @@ ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 PYPTLIB_TAG=master -OBFSPROXY_TAG=master +# Hardcoding this commit until #11535 is fixed +OBFSPROXY_TAG=b58fd9e1ef264796b6bddbde5db117472fb674a0 FLASHPROXY_TAG=master FTEPROXY_TAG=master LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014

1 0

[tor-browser-bundle/master] Fix typo in commit message.
by gk＠torproject.org 17 Apr '14

17 Apr '14

commit e1623db26e9d3ef223379021d6b083a905b8e0d8 Merge: 612972b 3e83236 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 17 12:01:25 2014 +0200 Fix typo in commit message. Reminder: parse your commit message carefully before committing. :(

1 0

[tor-browser-bundle/master] Bug 11535: Hardcoding obfsproxy commit.
by gk＠torproject.org 17 Apr '14

17 Apr '14

commit 3e83236fc84a0d14f01a46db8550cbf4621e58c7 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 17 11:14:09 2014 +0000 Bug 11535: Hardcoding obfsproxy commit. Until #11535 is getting fixed we are hardcoding commit b58fd9e1ef264796b6bddbde5db117472fb674a0 do avoid a broken obfsproxy in nightly builds. --- gitian/versions.nightly | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index c54df5a..79930f7 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -16,7 +16,8 @@ ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 PYPTLIB_TAG=master -OBFSPROXY_TAG=master +# Hardcoding this commit until #11535 is fixed +OBFSPROXY_TAG=b58fd9e1ef264796b6bddbde5db117472fb674a0 FLASHPROXY_TAG=master FTEPROXY_TAG=master LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014

1 0

[tor-browser-bundle/master] Bug 10356: Refactoring the bundle descriptors.
by gk＠torproject.org 15 Apr '14

15 Apr '14

commit eef7f8761aba04722f67a098b8a7aba72a5917cb Author: Georg Koppen <gk(a)torproject.org> Date: Tue Apr 15 09:06:07 2014 +0000 Bug 10356: Refactoring the bundle descriptors. --- gitian/build-helpers/dzip.sh | 2 +- gitian/descriptors/linux/gitian-bundle.yml | 54 ++++++++-------------- gitian/descriptors/mac/gitian-bundle.yml | 64 +++++++++++--------------- gitian/descriptors/windows/gitian-bundle.yml | 43 ++++++----------- 4 files changed, 62 insertions(+), 101 deletions(-) diff --git a/gitian/build-helpers/dzip.sh b/gitian/build-helpers/dzip.sh index 2e38c89..2f7dc54 100755 --- a/gitian/build-helpers/dzip.sh +++ b/gitian/build-helpers/dzip.sh @@ -8,4 +8,4 @@ shift find $@ -executable -exec chmod 700 {} \; find $@ ! -executable -exec chmod 600 {} \; -find $@ | sort | zip $ZIPOPTS -X -@ $ZIPFILE +find $@ | sort | zip $ZIPOPTS -X -@ "$ZIPFILE" diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index 3fa79cc..fa78928 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -5,11 +5,10 @@ suites: architectures: - "i386" - "amd64" -packages: +packages: - "git-core" - "unzip" - "zip" -- "mingw-w64" - "faketime" - "python" - "rnv" @@ -52,14 +51,12 @@ script: | export LC_ALL=C export TORBROWSER_VERSION=`cat bare-version` umask 0022 - # + # mkdir -p $OUTDIR/ - mkdir -p tor-browser/Data/Browser/Caches mkdir -p tor-browser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org + mkdir -p tor-browser/Data/Browser/Caches mkdir -p tor-browser/Docs/sources/ # - cp *.xpi tor-browser/Data/Browser/profile.default/extensions/ - # cd tor-launcher make clean make package @@ -85,19 +82,19 @@ script: | # 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(a)eff.org.xpi + cp pkg/*.xpi ../tor-browser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi cd .. # - mv tor-browser/Data/Browser/profile.default/extensions/noscript(a)noscript.net.xpi tor-browser/Data/Browser/profile.default/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi - cd tor-browser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org/ + cp *.xpi tor-browser/Data/Browser/profile.default/extensions/ + cd tor-browser/Data/Browser/profile.default/extensions + mv noscript(a)noscript.net.xpi {73a6fe31-595d-460b-a920-fcc0f8843232}.xpi + cd https-everywhere(a)eff.org/ unzip ../https-everywhere(a)eff.org.xpi rm ../https-everywhere(a)eff.org.xpi cd ~/build/ # unzip relativelink-src.zip - cd RelativeLink - cp RelativeLink.sh ../tor-browser/start-tor-browser - cd .. + cp RelativeLink/RelativeLink.sh tor-browser/start-tor-browser # cd tor-browser unzip ~/build/tor-browser-linux$GBUILD_BITS-gbuilt.zip @@ -115,22 +112,18 @@ script: | # # Copy reproducibility info cp versions tor-browser/Docs/sources/ - cp bundle.inputs tor-browser/Docs/sources/bundle.inputs + cp bundle.inputs tor-browser/Docs/sources/ # cp -a tor-browser tor-browser_en-US - # FF24 puts the prefs in a different jar: - if [ -f tor-browser_en-US/Browser/browser/omni.ja ]; then - pushd tor-browser_en-US/Browser/browser/ - else - pushd tor-browser_en-US/Browser/ - fi + # + pushd tor-browser_en-US/Browser/browser/ unzip omni.ja defaults/preferences/000-tor-browser.js + cp defaults/preferences/000-tor-browser.js ~/build/ + # Set the locale of the bundle. echo "pref(\"general.useragent.locale\", \"en-US\");" >> defaults/preferences/000-tor-browser.js - zip -Xd omni.ja defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js popd - #7z a -sfx tor-browser.exe tor-browser_en-US - #mv tor-browser.exe $OUTDIR/tor-browser-linux${GBUILD_BITS}_en-US.7z-selfextract + # ~/build/dtar.sh $OUTDIR/tor-browser-linux${GBUILD_BITS}-${TORBROWSER_VERSION}_en-US.tar.xz tor-browser_en-US rm -rf tor-browser_en-US # @@ -143,23 +136,16 @@ script: | cp $xpi ../tor-browser_$LANG/Data/Browser/profile.default/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi cd .. - # FF24 puts the prefs in a different jar: - if [ -f tor-browser_$LANG/Browser/browser/omni.ja ]; then - pushd tor-browser_$LANG/Browser/browser/ - else - pushd tor-browser_$LANG/Browser/ - fi - - unzip omni.ja defaults/preferences/000-tor-browser.js + pushd tor-browser_$LANG/Browser/browser/ + mkdir -p defaults/preferences + cp ~/build/000-tor-browser.js defaults/preferences/ + # Set the locale of the bundle. echo "pref(\"general.useragent.locale\", \"$LANG\");" >> defaults/preferences/000-tor-browser.js - zip -Xd omni.ja defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js popd - #7z a -sfx tor-browser.exe tor-browser_$LANG - #mv tor-browser.exe $OUTDIR/tor-browser-linux${GBUILD_BITS}_$LANG.7z-selfextract ~/build/dtar.sh $OUTDIR/tor-browser-linux${GBUILD_BITS}-${TORBROWSER_VERSION}_$LANG.tar.xz tor-browser_$LANG rm -rf tor-browser_$LANG cd linux-langpacks - done + done diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index 4325a1b..4928acb 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -4,12 +4,10 @@ suites: - "precise" architectures: - "i386" -packages: +packages: - "git-core" - "unzip" - "zip" -- "mingw-w64" -- "nsis" - "faketime" - "python" - "hfsprogs" @@ -65,13 +63,13 @@ script: | export TORBROWSER_APP="TorBrowser" export TORBROWSER_NAME="TorBrowserBundle" fi - # + # mkdir -p $OUTDIR/ - mkdir -p dmg mkdir -p $TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org mkdir -p $TORBROWSER_NAME.app/Data/Browser/Caches - mkdir -p $TORBROWSER_NAME.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/ mkdir -p $TORBROWSER_NAME.app/Docs/sources + mkdir -p $TORBROWSER_NAME.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/ + mkdir -p dmg # cd tor-launcher make clean @@ -80,9 +78,7 @@ script: | mkdir pkg/tmp cd pkg/tmp unzip ../*.xpi - rm ../*.xpi - ~/build/dzip.sh ../tor-launcher(a)torproject.org.xpi . - mv ../tor-launcher(a)torproject.org.xpi ../../../$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/tor-launcher(a)torproject.org.xpi + ~/build/dzip.sh ../../../$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/tor-launcher(a)torproject.org.xpi . cd ../../../ # cd torbutton @@ -92,9 +88,7 @@ script: | mkdir pkg/tmp cd pkg/tmp unzip ../*.xpi - rm ../*.xpi - ~/build/dzip.sh ../torbutton(a)torproject.org.xpi . - mv ../torbutton(a)torproject.org.xpi ../../../$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/torbutton(a)torproject.org.xpi + ~/build/dzip.sh ../../../$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/torbutton(a)torproject.org.xpi . cd ../../../ # cd https-everywhere @@ -102,11 +96,11 @@ script: | # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 rm -f .git/refs/heads/master ./makexpi.sh - cp ./pkg/*.xpi ../$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi + cp pkg/*.xpi ../$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi cd .. # cp *.xpi ./$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/ - cd ./$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/ + cd $TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/ mv noscript(a)noscript.net.xpi {73a6fe31-595d-460b-a920-fcc0f8843232}.xpi cd https-everywhere(a)eff.org unzip ../https-everywhere(a)eff.org.xpi @@ -114,13 +108,11 @@ script: | cd ~/build/ # unzip relativelink-src.zip - cd RelativeLink - cp RelativeLinkOSX.sh ../$TORBROWSER_NAME.app/Contents/MacOS/TorBrowserBundle - cd .. + cp RelativeLink/RelativeLinkOSX.sh $TORBROWSER_NAME.app/Contents/MacOS/TorBrowserBundle # - unzip ~/build/tor-mac$GBUILD_BITS-gbuilt.zip + unzip tor-mac$GBUILD_BITS-gbuilt.zip if [ $BUILD_PT_BUNDLES ]; then - unzip ~/build/pluggable-transports-mac$GBUILD_BITS-gbuilt.zip + unzip pluggable-transports-mac$GBUILD_BITS-gbuilt.zip fi cd $TORBROWSER_NAME.app unzip ~/build/mac-skeleton.zip @@ -139,7 +131,7 @@ script: | # # Copy reproducibility info cp versions $TORBROWSER_NAME.app/Docs/sources/ - cp bundle.inputs $TORBROWSER_NAME.app/Docs/sources/bundle.inputs + cp bundle.inputs $TORBROWSER_NAME.app/Docs/sources/ # # Set up DMG skeleton cd libdmg-hfsplus @@ -147,31 +139,31 @@ script: | cmake CMakeLists.txt cd dmg make - cd ../../ - cd dmg - tar -Jxvf ~/build/dmg-applications.tar.xz # FIXME: Desktop or Application as dest? + cd ../../dmg + # FIXME: Desktop or Application as dest? + tar -Jxvf ~/build/dmg-applications.tar.xz cd .. # - # FF24 puts the prefs in the browser jar: pushd $TORBROWSER_NAME.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/browser/ unzip omni.ja defaults/preferences/000-tor-browser.js cp defaults/preferences/000-tor-browser.js ~/build/ + # Set the locale of the bundle. echo "pref(\"general.useragent.locale\", \"en-US\");" >> defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js popd # if [ ${TORBROWSER_VERSION::3} == "3.5" ]; then - cp -a ~/build/$TORBROWSER_NAME.app ~/build/${TORBROWSER_NAME}_en-US.app + cp -a ~/build/$TORBROWSER_NAME.app ~/build/${TORBROWSER_NAME}_en-US.app ~/build/dzip.sh $OUTDIR/TorBrowserBundle-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_en-US.zip ${TORBROWSER_NAME}_en-US.app - rm -rf ~/build/${TORBROWSER_NAME}_en-US.app + rm -rf ~/build/${TORBROWSER_NAME}_en-US.app else - # XXX: We need to insert these placeholders because otherwise mkisofs won't - # include these otherwise empty dirs: - touch ~/build/$TORBROWSER_NAME.app/Data/Browser/Caches/placeholder.txt - touch ~/build/$TORBROWSER_NAME.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/browser/defaults/preferences/placeholder.txt - cp -a ~/build/$TORBROWSER_NAME.app ~/build/dmg/$TORBROWSER_APP.app + # XXX: We need to insert these placeholders because otherwise mkisofs won't + # include these otherwise empty dirs: + touch ~/build/$TORBROWSER_NAME.app/Data/Browser/Caches/placeholder.txt + touch ~/build/$TORBROWSER_NAME.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/browser/defaults/preferences/placeholder.txt + cp -a ~/build/$TORBROWSER_NAME.app ~/build/dmg/$TORBROWSER_APP.app ~/build/ddmg.sh $OUTDIR/TorBrowser-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_en-US.dmg ~/build/dmg - rm -rf ~/build/dmg/$TORBROWSER_APP.app + rm -rf ~/build/dmg/$TORBROWSER_APP.app fi mv $TORBROWSER_NAME.app ${TORBROWSER_NAME}_plain.app # @@ -189,11 +181,10 @@ script: | cp $xpi ~/build/dmg/$DEST.app/Data/Browser/profile.default/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi cd .. - # FF24 puts the prefs in the browser jar: pushd ~/build/dmg/$DEST.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/browser/ - mkdir -p defaults/preferences - cp ~/build/000-tor-browser.js defaults/preferences/000-tor-browser.js + cp ~/build/000-tor-browser.js defaults/preferences/ + # Set the locale of the bundle. echo "pref(\"general.useragent.locale\", \"$LANG\");" >> defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js popd @@ -208,5 +199,4 @@ script: | rm -rf ~/build/dmg/$DEST.app fi cd mac-langpacks - done - cd .. + done diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index c8b29c9..ac79d58 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -4,10 +4,11 @@ suites: - "precise" architectures: - "i386" -packages: +packages: - "git-core" - "unzip" - "zip" +# This is needed for compiling the StartTorBrowserBundle.exe. - "mingw-w64" - "nsis" - "faketime" @@ -48,7 +49,7 @@ script: | export TORBROWSER_VERSION=`cat bare-version` export LC_ALL=C umask 0022 - # + # mkdir -p $OUTDIR/ mkdir -p tbb-windows-installer/"Tor Browser"/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org mkdir -p tbb-windows-installer/"Tor Browser"/Data/Browser/Caches @@ -61,9 +62,7 @@ script: | mkdir pkg/tmp cd pkg/tmp unzip ../*.xpi - rm ../*.xpi - ~/build/dzip.sh ../tor-launcher(a)torproject.org.xpi . - mv ../tor-launcher(a)torproject.org.xpi ../../../tbb-windows-installer/"Tor Browser"/Data/Browser/profile.default/extensions/tor-launcher(a)torproject.org.xpi + ~/build/dzip.sh ../../../tbb-windows-installer/"Tor Browser"/Data/Browser/profile.default/extensions/tor-launcher(a)torproject.org.xpi . cd ../../../ # cd torbutton @@ -72,9 +71,7 @@ script: | # FIXME: Switch to re-dzip.sh here? cd pkg/tmp unzip ../*.xpi - rm ../*.xpi - ~/build/dzip.sh ../torbutton(a)torproject.org.xpi . - mv ../torbutton(a)torproject.org.xpi ../../../tbb-windows-installer/"Tor Browser"/Data/Browser/profile.default/extensions/torbutton(a)torproject.org.xpi + ~/build/dzip.sh ../../../tbb-windows-installer/"Tor Browser"/Data/Browser/profile.default/extensions/torbutton(a)torproject.org.xpi . cd ../../../ # cd https-everywhere @@ -85,8 +82,8 @@ script: | cp ./pkg/*.xpi ../tbb-windows-installer/"Tor Browser"/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi cd .. # - cp *.xpi ./tbb-windows-installer/"Tor Browser"/Data/Browser/profile.default/extensions - cd ./tbb-windows-installer/"Tor Browser"/Data/Browser/profile.default/extensions + cp *.xpi tbb-windows-installer/"Tor Browser"/Data/Browser/profile.default/extensions + cd tbb-windows-installer/"Tor Browser"/Data/Browser/profile.default/extensions mv noscript(a)noscript.net.xpi {73a6fe31-595d-460b-a920-fcc0f8843232}.xpi cd https-everywhere(a)eff.org unzip ../https-everywhere(a)eff.org.xpi @@ -100,8 +97,7 @@ script: | cp StartTorBrowserBundle.exe ../tbb-windows-installer/"Tor Browser"/"Start Tor Browser.exe" cd .. # - cd tbb-windows-installer - cd "Tor Browser" + cd tbb-windows-installer/"Tor Browser" unzip ~/build/tor-browser-win32-gbuilt.zip unzip ~/build/tor-win32-gbuilt.zip unzip ~/build/windows-skeleton.zip @@ -117,14 +113,10 @@ script: | cp ../versions "Tor Browser"/Docs/sources/ cp ../bundle.inputs "Tor Browser"/Docs/sources/ # - # FF24 puts the prefs in a different jar: - if [ -f "Tor Browser"/Browser/browser/omni.ja ]; then - pushd "Tor Browser"/Browser/browser/ - else - pushd "Tor Browser"/Browser/ - fi + pushd "Tor Browser"/Browser/browser/ unzip omni.ja defaults/preferences/000-tor-browser.js cp defaults/preferences/000-tor-browser.js ~/build/ + # Set the locale bundle. echo "pref(\"general.useragent.locale\", \"en-US\");" >> defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js popd @@ -139,22 +131,15 @@ script: | cp $xpi ../"Tor Browser"/Data/Browser/profile.default/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi cd .. - # FF24 puts the prefs in a different jar: - if [ -f "Tor Browser"/Browser/browser/omni.ja ]; then - pushd "Tor Browser"/Browser/browser/ - else - pushd "Tor Browser"/Browser/ - fi - + pushd "Tor Browser"/Browser/browser/ mkdir -p defaults/preferences - cp ~/build/000-tor-browser.js defaults/preferences/000-tor-browser.js + cp ~/build/000-tor-browser.js defaults/preferences/ echo "pref(\"general.useragent.locale\", \"$LANG\");" >> defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js popd makensis torbrowser.nsi mv torbrowser-install.exe $OUTDIR/torbrowser-install-${TORBROWSER_VERSION}_$LANG.exe - rm ./"Tor Browser"/Data/Browser/profile.default/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi + rm "Tor Browser"/Data/Browser/profile.default/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi cd win32-langpacks - done - cd .. + done

1 0

[tor-browser-bundle/master] Fixed typo in mac pluggable transport descriptor.
by gk＠torproject.org 14 Apr '14

14 Apr '14

commit ff85a3b091dbb5956d8e1dbe03dc9d4297ddb3d1 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 14 15:43:25 2014 +0000 Fixed typo in mac pluggable transport descriptor. --- gitian/descriptors/mac/gitian-pluggable-transports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index f98a20a..920b231 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -107,7 +107,7 @@ script: | tar xzf pyyaml.tar.gz cd PyYAML-* find -type f | xargs touch --date="$REFERENCE_DATETIME" - $PYTHON setup.py build --build-lib build + python setup.py build --build-lib build cp -a build/yaml $PTDIR/ cd .. #

1 0

[tor-browser-bundle/master] Bug 11478: Add missing PyYAML.
by gk＠torproject.org 14 Apr '14

14 Apr '14

commit c088c17ba7ba93f3fcbcfc75e0c081aed2d98976 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 14 15:08:31 2014 +0000 Bug 11478: Add missing PyYAML. Enhanced asn's patch to fix broken obfsproxy > 0.2.4. --- gitian/descriptors/linux/gitian-pluggable-transports.yml | 8 ++++++++ gitian/descriptors/mac/gitian-pluggable-transports.yml | 8 ++++++++ gitian/descriptors/windows/gitian-pluggable-transports.yml | 7 +++++++ gitian/fetch-inputs.sh | 11 ++++++++++- gitian/versions | 4 ++++ gitian/versions.alpha | 4 ++++ gitian/versions.beta | 4 ++++ gitian/versions.nightly | 4 ++++ 8 files changed, 49 insertions(+), 1 deletion(-) diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index fbea855..4423b50 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -30,6 +30,7 @@ files: - "gmp.tar.bz2" - "pycrypto.tar.gz" - "argparse.tar.gz" +- "pyyaml.tar.gz" - "zope.interface.zip" - "twisted.tar.bz2" - "m2crypto.tar.gz" @@ -91,6 +92,13 @@ script: | cp -a build/zope $PTDIR/ cd .. # + tar xzf pyyaml.tar.gz + cd PyYAML-* + find -type f | xargs touch --date="$REFERENCE_DATETIME" + $PYTHON setup.py build --build-lib build + cp -a build/yaml $PTDIR/ + cd .. + # tar xjf twisted.tar.bz2 cd Twisted-* find -type f | xargs touch --date="$REFERENCE_DATETIME" diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index f6c2e61..f98a20a 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -30,6 +30,7 @@ files: - "gmp.tar.bz2" - "pycrypto.tar.gz" - "argparse.tar.gz" +- "pyyaml.tar.gz" - "zope.interface.zip" - "twisted.tar.bz2" - "m2crypto.tar.gz" @@ -103,6 +104,13 @@ script: | cp -a build/argparse.py $PTDIR/ cd .. # + tar xzf pyyaml.tar.gz + cd PyYAML-* + find -type f | xargs touch --date="$REFERENCE_DATETIME" + $PYTHON setup.py build --build-lib build + cp -a build/yaml $PTDIR/ + cd .. + # unzip zope.interface.zip cd zope.interface-* find -type f | xargs touch --date="$REFERENCE_DATETIME" diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index d2a3005..3624d04 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -32,6 +32,7 @@ files: - "setuptools.tar.gz" - "pycrypto.tar.gz" - "argparse.tar.gz" +- "pyyaml.tar.gz" - "zope.interface.zip" - "twisted.tar.bz2" - "m2crypto.tar.gz" @@ -163,6 +164,12 @@ script: | LD_PRELOAD= $INSTPYTHON setup.py install cd .. # + tar xzf pyyaml.tar.gz + cd PyYAML-* + find -type f | xargs touch --date="$REFERENCE_DATETIME" + LD_PRELOAD= $INSTPYTHON setup.py install + cd .. + # unzip zope.interface.zip cd zope.interface-* find -type f | xargs touch --date="$REFERENCE_DATETIME" diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 0bc217e..e80713b 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -5,6 +5,7 @@ MIRROR_URL=https://people.torproject.org/~mikeperry/mirrors/sources/ MIRROR_URL_DCF=https://people.torproject.org/~dcf/mirrors/sources/ +MIRROR_URL_ASN=https://people.torproject.org/~asn/mirrors/sources/ set -e set -u umask 0022 @@ -167,6 +168,13 @@ do get "${!PACKAGE}" "${MIRROR_URL_DCF}${!PACKAGE}" done +for i in PYYAML +do + PACKAGE="${i}_PACKAGE" + URL="${MIRROR_URL_ASN}${!PACKAGE}" + get "${!PACKAGE}" "${MIRROR_URL_ASN}${!PACKAGE}" +done + for i in ZOPEINTERFACE TWISTED PY2EXE SETUPTOOLS do URL="${i}_URL" @@ -217,7 +225,7 @@ fi # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK is not signed at all) -for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MINGW MSVCR100 PYCRYPTO ARGPARSE ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP +for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MINGW MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" @@ -260,6 +268,7 @@ ln -sf "$PYTHON_PACKAGE" python.tar.bz2 ln -sf "$PYTHON_MSI_PACKAGE" python.msi ln -sf "$PYCRYPTO_PACKAGE" pycrypto.tar.gz ln -sf "$ARGPARSE_PACKAGE" argparse.tar.gz +ln -sf "$PYYAML_PACKAGE" pyyaml.tar.gz ln -sf "$ZOPEINTERFACE_PACKAGE" zope.interface.zip ln -sf "$TWISTED_PACKAGE" twisted.tar.bz2 ln -sf "$M2CRYPTO_PACKAGE" m2crypto.tar.gz diff --git a/gitian/versions b/gitian/versions index 673cf32..d381fed 100755 --- a/gitian/versions +++ b/gitian/versions @@ -30,6 +30,7 @@ GCC_VER=4.6.3 PYTHON_VER=2.7.5 PYCRYPTO_VER=2.6.1 ARGPARSE_VER=1.2.1 +PYYAML_VER=3.11 ZOPEINTERFACE_VER=4.0.5 TWISTED_VER=13.1.0 M2CRYPTO_VER=0.21.1 @@ -51,6 +52,7 @@ PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 PYTHON_MSI_PACKAGE=python-${PYTHON_VER}.msi PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz +PYYAML_PACKAGE=PyYAML-${PYYAML_VER}.tar.gz ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 M2CRYPTO_PACKAGE=M2Crypto-${M2CRYPTO_VER}.tar.gz @@ -68,6 +70,7 @@ MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 +PYYAML_HASH=c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8 ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc TWISTED_HASH=110e957dd8fc4c6eaba8abe4f0477e60b2873e3cf1c260325863fd2ef69341c6 M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a @@ -87,6 +90,7 @@ PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_… PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PYCRYPTO_PAC… ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE} +PYYAML_URL=https://pypi.python.org/packages/source/P/PyYAML/${PYYAML_PACKAGE} ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/… TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE} diff --git a/gitian/versions.alpha b/gitian/versions.alpha index f53fbd8..59edba7 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -31,6 +31,7 @@ GCC_VER=4.6.3 PYTHON_VER=2.7.5 PYCRYPTO_VER=2.6.1 ARGPARSE_VER=1.2.1 +PYYAML_VER=3.11 ZOPEINTERFACE_VER=4.0.5 TWISTED_VER=13.1.0 M2CRYPTO_VER=0.21.1 @@ -52,6 +53,7 @@ PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 PYTHON_MSI_PACKAGE=python-${PYTHON_VER}.msi PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz +PYYAML_PACKAGE=PyYAML-${PYYAML_VER}.tar.gz ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 M2CRYPTO_PACKAGE=M2Crypto-${M2CRYPTO_VER}.tar.gz @@ -69,6 +71,7 @@ MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 +PYYAML_HASH=c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8 ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc TWISTED_HASH=110e957dd8fc4c6eaba8abe4f0477e60b2873e3cf1c260325863fd2ef69341c6 M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a @@ -88,6 +91,7 @@ PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_… PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PYCRYPTO_PAC… ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE} +PYYAML_URL=https://pypi.python.org/packages/source/P/PyYAML/${PYYAML_PACKAGE} ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/… TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE} diff --git a/gitian/versions.beta b/gitian/versions.beta index adb9818..9b3f80d 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -31,6 +31,7 @@ GCC_VER=4.6.3 PYTHON_VER=2.7.5 PYCRYPTO_VER=2.6.1 ARGPARSE_VER=1.2.1 +PYYAML_VER=3.11 ZOPEINTERFACE_VER=4.0.5 TWISTED_VER=13.1.0 M2CRYPTO_VER=0.21.1 @@ -52,6 +53,7 @@ PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 PYTHON_MSI_PACKAGE=python-${PYTHON_VER}.msi PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz +PYYAML_PACKAGE=PyYAML-${PYYAML_VER}.tar.gz ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 M2CRYPTO_PACKAGE=M2Crypto-${M2CRYPTO_VER}.tar.gz @@ -69,6 +71,7 @@ MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 +PYYAML_HASH=c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8 ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc TWISTED_HASH=110e957dd8fc4c6eaba8abe4f0477e60b2873e3cf1c260325863fd2ef69341c6 M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a @@ -88,6 +91,7 @@ PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_… PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PYCRYPTO_PAC… ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE} +PYYAML_URL=https://pypi.python.org/packages/source/P/PyYAML/${PYYAML_PACKAGE} ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/… TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 911898d..c54df5a 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -31,6 +31,7 @@ GCC_VER=4.6.3 PYTHON_VER=2.7.5 PYCRYPTO_VER=2.6.1 ARGPARSE_VER=1.2.1 +PYYAML_VER=3.11 ZOPEINTERFACE_VER=4.0.5 TWISTED_VER=13.1.0 M2CRYPTO_VER=0.21.1 @@ -52,6 +53,7 @@ PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 PYTHON_MSI_PACKAGE=python-${PYTHON_VER}.msi PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz +PYYAML_PACKAGE=PyYAML-${PYYAML_VER}.tar.gz ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 M2CRYPTO_PACKAGE=M2Crypto-${M2CRYPTO_VER}.tar.gz @@ -69,6 +71,7 @@ MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 +PYYAML_HASH=c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8 ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc TWISTED_HASH=110e957dd8fc4c6eaba8abe4f0477e60b2873e3cf1c260325863fd2ef69341c6 M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a @@ -88,6 +91,7 @@ PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_… PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PYCRYPTO_PAC… ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE} +PYYAML_URL=https://pypi.python.org/packages/source/P/PyYAML/${PYYAML_PACKAGE} ZOPEINTERFACE_URL=https://pypi.python.org/packages/source/z/zope.interface/… TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE}

1 0

[tor-browser-bundle/master] Merge ln5's branch 'tools2'
by gk＠torproject.org 14 Apr '14

14 Apr '14

commit 70d8786976abd9f39b6e19851724e74fc681cd92 Merge: 8031a8d 75bc254 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 14 09:24:43 2014 +0000 Merge ln5's branch 'tools2' tools/continuous-builds/build-tbb.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)

1 0

[tor-browser-bundle/master] Don't hardcode target 'build-nightly' for subsequent builds.
by gk＠torproject.org 14 Apr '14

14 Apr '14

commit 75bc25446840a3a0d051c13b3e2ae7b1c5fd10ee Author: Linus Nordberg <linus(a)nordberg.se> Date: Thu Apr 10 13:09:32 2014 +0200 Don't hardcode target 'build-nightly' for subsequent builds. --- tools/continuous-builds/build-tbb.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/continuous-builds/build-tbb.sh b/tools/continuous-builds/build-tbb.sh index 071903a..5f4b4ad 100755 --- a/tools/continuous-builds/build-tbb.sh +++ b/tools/continuous-builds/build-tbb.sh @@ -3,7 +3,8 @@ # build-tbb.sh [TARGET [PUBLISH-HOST [PUBLISH-SSH-KEY [BUILDDIR [DESTDIR [N]]]]]] # # Build TARGET in BUILDDIR, which will end up in DESTDIR -# Try doing it N times. +# Try building $TARGET one time and if that fails, try "build-$TARGET" +# up to N-1 times. # Upload result to PUBLISH-HOST using SSH key PUBLISH-KEY. # TODO: @@ -32,7 +33,7 @@ while [ $status != done ]; do killall qemu-system-i386 qemu-system-x86_64 make $TARGET > build-$(date -u +%s).log && status=done printf "%s: Tried building $TARGET %d times. Status: %s.\n" $0 $n $status | tee -a $logfile - TARGET=build-nightly + TARGET=build-$TARGET [ $n -ge $N ] && break done

1 0

[tor-browser-bundle/master] Do copy *.dmg too.
by gk＠torproject.org 14 Apr '14

14 Apr '14

commit 0308442986f218538440f4ded2ac666a51560544 Author: Linus Nordberg <linus(a)nordberg.se> Date: Tue Apr 8 03:33:28 2014 +0200 Do copy *.dmg too. --- tools/continuous-builds/build-tbb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/continuous-builds/build-tbb.sh b/tools/continuous-builds/build-tbb.sh index 3ae1c92..071903a 100755 --- a/tools/continuous-builds/build-tbb.sh +++ b/tools/continuous-builds/build-tbb.sh @@ -45,7 +45,7 @@ if [ $status = done ]; then gpg -a --clearsign --local-user $PGPKEYID sha256sums.txt || exit 2 cd .. D=$(basename $NEWDESTDIR) - tar cf - $D/sha256sums* $D/*.tar.xz $D/*.zip $D/*.exe | ssh -i $PUBLISH_SSH_KEY $PUBLISH_HOST | tee -a $logfile + tar cf - $D/sha256sums* $D/*.tar.xz $D/*.zip $D/*.exe $D/*.dmg | ssh -i $PUBLISH_SSH_KEY $PUBLISH_HOST | tee -a $logfile else echo "$0: giving up after $n tries" | tee -a $logfile fi

1 0

[tor-browser-bundle/master] Bug 11481: Fix Nightly build failure.
by gk＠torproject.org 14 Apr '14

14 Apr '14

commit 8031a8db85105a7a5ad7f04a7b86774eaa2747b6 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 14 08:34:01 2014 +0000 Bug 11481: Fix Nightly build failure. Apply fix for bug 9665 only to bundles that ship tor 0.2.4.x as it does not apply cleanly to tor 0.2.5.x. --- gitian/descriptors/linux/gitian-tor.yml | 2 +- gitian/descriptors/mac/gitian-tor.yml | 2 +- gitian/descriptors/windows/gitian-tor.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index 15ba469..28b7d13 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -97,9 +97,9 @@ script: | git am ~/build/bug5018.patch git am ~/build/bug11069.patch git am ~/build/bug11156.patch + git am ~/build/bug9665.patch fi git am ~/build/bug11200.patch - git am ~/build/bug9665.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 5ea3b4e..3304f76 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -108,9 +108,9 @@ script: | git am ~/build/bug5018.patch git am ~/build/bug11069.patch git am ~/build/bug11156.patch + git am ~/build/bug9665.patch fi git am ~/build/bug11200.patch - git am ~/build/bug9665.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 6369e7f..ce4ef63 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -104,9 +104,9 @@ script: | git am ~/build/bug5018.patch git am ~/build/bug11069.patch git am ~/build/bug11156.patch + git am ~/build/bug9665.patch fi git am ~/build/bug11200.patch - git am ~/build/bug9665.patch fi mkdir -p $OUTDIR/src git archive HEAD | tar -x -C $OUTDIR/src

1 0

[tor-browser-bundle/master] Bump Torbutton version for Turkish homepage fix.
by mikeperry＠torproject.org 11 Apr '14

11 Apr '14

commit 362bca4ed06cd0b12301492e2df8f69e9f6258e6 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Apr 10 22:43:08 2014 -0700 Bump Torbutton version for Turkish homepage fix. --- Bundle-Data/Docs/ChangeLog.txt | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 194ce0f..4b72c7f 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -5,7 +5,7 @@ Tor Browser Bundle 3.6-beta-2 -- Apr 8 2014 * Bug 9387 testing: Disable JS JIT, type inference, asmjs, and ion. * Update fte transport to 0.2.12 * Update NoScript to 2.6.8.19 - * Update Torbutton to 1.6.8.0 + * Update Torbutton to 1.6.8.1 * Bug 11242: Fix improper "update needed" message after in-place upgrade. * Bug 10398: Ease translation of about:tor page elements * Update Tor Launcher to 0.2.5.3 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 2bdbb2d..f53fbd8 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -9,7 +9,7 @@ FIREFOX_VERSION=24.4.0esr TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build1 TOR_TAG=tor-0.2.5.2-alpha TORLAUNCHER_TAG=0.2.5.1a -TORBUTTON_TAG=1.6.7.0 +TORBUTTON_TAG=1.6.8.1 HTTPSE_TAG=3.4.5 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 diff --git a/gitian/versions.beta b/gitian/versions.beta index ca59070..adb9818 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -9,7 +9,7 @@ FIREFOX_VERSION=24.4.0esr TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build2 TOR_TAG=tor-0.2.4.21 TORLAUNCHER_TAG=0.2.5.3 -TORBUTTON_TAG=1.6.8.0 +TORBUTTON_TAG=1.6.8.1 HTTPSE_TAG=3.4.5 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8

1 0

[torbutton/master] Dear Turkish Translators: Don't translate the homepage URL, yo.
by mikeperry＠torproject.org 11 Apr '14

11 Apr '14

commit 5393b528462d265b87972bc1279d024b0efb9eb8 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Apr 10 22:35:39 2014 -0700 Dear Turkish Translators: Don't translate the homepage URL, yo. (Or the search engine names, but we'll deal with that later). I fixed this in transifex too, but don't want to wait for transifex to get pulled again. --- src/chrome/locale/tr/browser.properties | 2 +- src/install.rdf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/chrome/locale/tr/browser.properties b/src/chrome/locale/tr/browser.properties index 55550a3..c30bc36 100644 --- a/src/chrome/locale/tr/browser.properties +++ b/src/chrome/locale/tr/browser.properties @@ -1,5 +1,5 @@ # Default home page -browser.startup.homepage=hakkında:tor +browser.startup.homepage=about:tor # Spell checker dictionary spellchecker.dictionary=en_US diff --git a/src/install.rdf b/src/install.rdf index 370cad8..87db08f 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.6.8.0</em:version> + <em:version>1.6.8.1</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[tor-browser-bundle/master] Document JS option changes in changelog.
by mikeperry＠torproject.org 10 Apr '14

10 Apr '14

commit 47dba349261163d41bcd0102f1e712fa2fe43f35 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Apr 10 09:49:43 2014 -0700 Document JS option changes in 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 9b66b5e..194ce0f 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -2,6 +2,7 @@ Tor Browser Bundle 3.6-beta-2 -- Apr 8 2014 * All Platforms * Update OpenSSL to 1.0.1g * Bug 9010: Add Turkish language support. + * Bug 9387 testing: Disable JS JIT, type inference, asmjs, and ion. * Update fte transport to 0.2.12 * Update NoScript to 2.6.8.19 * Update Torbutton to 1.6.8.0

1 0

[tor-browser-bundle/master] Bump Tor Launcher version.
by mikeperry＠torproject.org 10 Apr '14

10 Apr '14

commit 6d2934c93e402e544e8df8e248134bd3305d26ce Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Apr 10 08:46:44 2014 -0700 Bump Tor Launcher version. Turkish DTDs were missing. --- Bundle-Data/Docs/ChangeLog.txt | 2 +- gitian/versions.beta | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index af9b59d..9b66b5e 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -7,7 +7,7 @@ Tor Browser Bundle 3.6-beta-2 -- Apr 8 2014 * Update Torbutton to 1.6.8.0 * Bug 11242: Fix improper "update needed" message after in-place upgrade. * Bug 10398: Ease translation of about:tor page elements - * Update Tor Launcher to 0.2.5.2 + * Update Tor Launcher to 0.2.5.3 * Bug 9665: Localize Tor's unreachable bridges bootstrap error * Backport Pending Tor Patches: * Bug 9665: Report a bootstrap error if all bridges are unreachable diff --git a/gitian/versions.beta b/gitian/versions.beta index 9ec3927..ca59070 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -8,7 +8,7 @@ FIREFOX_VERSION=24.4.0esr TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build2 TOR_TAG=tor-0.2.4.21 -TORLAUNCHER_TAG=0.2.5.2 +TORLAUNCHER_TAG=0.2.5.3 TORBUTTON_TAG=1.6.8.0 HTTPSE_TAG=3.4.5 NSIS_TAG=v0.1

1 0

[tor-browser-bundle/master] Remove busted FTE bridges (bad fingerprints).
by mikeperry＠torproject.org 10 Apr '14

10 Apr '14

commit e58aabac8234b4115cef70030e213caf6444607f Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Apr 10 09:01:34 2014 -0700 Remove busted FTE bridges (bad fingerprints). --- Bundle-Data/PTConfigs/bridge_prefs.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 2d9777c..bb000cd 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -16,8 +16,10 @@ pref("extensions.torlauncher.default_bridge.flashproxy.3", "flashproxy 0.0.1.0:3 pref("extensions.torlauncher.default_bridge.flashproxy.4", "flashproxy 0.0.1.0:4"); pref("extensions.torlauncher.default_bridge.flashproxy.5", "flashproxy 0.0.1.0:5"); -pref("extensions.torlauncher.default_bridge.fte.1", "fte 131.252.210.150:8080 271EC1874E40FE65C145C6397AA34FFF7008E50E"); -pref("extensions.torlauncher.default_bridge.fte.2", "fte 79.125.3.12:8080 17AF9F9F4E57614A060B7221DCCEDB8BB546DD73"); -pref("extensions.torlauncher.default_bridge.fte.3", "fte 128.105.214.161:8080 1E326AAFB3FCB515015250D8FCCC8E37F91A153B"); -pref("extensions.torlauncher.default_bridge.fte.4", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D"); -pref("extensions.torlauncher.default_bridge.fte.5", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); +pref("extensions.torlauncher.default_bridge.fte.1", "fte 128.105.214.161:8080 1E326AAFB3FCB515015250D8FCCC8E37F91A153B"); +pref("extensions.torlauncher.default_bridge.fte.2", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D"); +pref("extensions.torlauncher.default_bridge.fte.3", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); +// XXX: Fingerprints changed: +//pref("extensions.torlauncher.default_bridge.fte.4", "fte 131.252.210.150:8080 271EC1874E40FE65C145C6397AA34FFF7008E50E"); +//pref("extensions.torlauncher.default_bridge.fte.5", "fte 79.125.3.12:8080 17AF9F9F4E57614A060B7221DCCEDB8BB546DD73"); +

1 0

[tor-browser-bundle/master] Fix changelog for obfsproxy3.
by mikeperry＠torproject.org 10 Apr '14

10 Apr '14

commit 751c60a211bfea3156f34d63f47a10eabb18f2d8 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Apr 9 15:19:21 2014 -0700 Fix changelog for obfsproxy3. --- 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 42c764c..af9b59d 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -2,7 +2,6 @@ Tor Browser Bundle 3.6-beta-2 -- Apr 8 2014 * All Platforms * Update OpenSSL to 1.0.1g * Bug 9010: Add Turkish language support. - * Update obfs3 transport to 0.2.8 * Update fte transport to 0.2.12 * Update NoScript to 2.6.8.19 * Update Torbutton to 1.6.8.0

1 0

[tor-browser-bundle/master] Move obfsproxy back to 0.2.4.
by mikeperry＠torproject.org 10 Apr '14

10 Apr '14

commit 13dd293a1888d6faac8fcb39d10c4938c639b443 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Apr 9 11:32:49 2014 -0700 Move obfsproxy back to 0.2.4. Moving back to last known-good. 0.2.6 won't launch either. --- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 5447d76..2bdbb2d 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -16,7 +16,7 @@ ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.5 -OBFSPROXY_TAG=obfsproxy-0.2.6 +OBFSPROXY_TAG=obfsproxy-0.2.4 FLASHPROXY_TAG=1.6 FTEPROXY_TAG=0.2.12 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 diff --git a/gitian/versions.beta b/gitian/versions.beta index 8c8433d..9ec3927 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -16,7 +16,7 @@ ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.5 -OBFSPROXY_TAG=obfsproxy-0.2.6 +OBFSPROXY_TAG=obfsproxy-0.2.4 FLASHPROXY_TAG=1.6 FTEPROXY_TAG=0.2.12 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014

1 0

[tor-browser-bundle/master] Update default PT Bridges.
by mikeperry＠torproject.org 10 Apr '14

10 Apr '14

commit ae9d19adf7935782d926919c84977f703b7ebadf Author: Kevin P. Dyer <kpdyer(a)gmail.com> Date: Tue Apr 8 12:24:27 2014 -0700 Update default PT Bridges. --- Bundle-Data/PTConfigs/bridge_prefs.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 47d20e8..2d9777c 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -2,13 +2,13 @@ pref("extensions.torlauncher.default_bridge_recommended_type", "obfs3"); // Default bridges. -pref("extensions.torlauncher.default_bridge.obfs3.1", "obfs3 83.212.101.3:60475 A09D536DD1752D542E1FBB3C9CE4449D51298239"); +pref("extensions.torlauncher.default_bridge.obfs3.1", "obfs3 83.212.101.3:80 A09D536DD1752D542E1FBB3C9CE4449D51298239"); pref("extensions.torlauncher.default_bridge.obfs3.2", "obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9"); pref("extensions.torlauncher.default_bridge.obfs3.3", "obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9"); pref("extensions.torlauncher.default_bridge.obfs3.4", "obfs3 209.141.36.236:45496 58D91C3A631F910F32E18A55441D5A0463BA66E2"); pref("extensions.torlauncher.default_bridge.obfs3.5", "obfs3 208.79.90.242:35658 BA61757846841D64A83EA2514C766CB92F1FB41F"); -pref("extensions.torlauncher.default_bridge.obfs3.6", "obfs3 109.105.109.163:38980 9D7259A696F7DAB073043B28114112A46D36CFFD"); -pref("extensions.torlauncher.default_bridge.obfs3.7", "obfs3 109.105.109.163:47779 844B1F53FFD548C998F8D3B01B7E19FA07C3396E"); +pref("extensions.torlauncher.default_bridge.obfs3.6", "obfs3 109.105.109.163:38980 1E05F577A0EC0213F971D81BF4D86A9E4E8229ED"); +pref("extensions.torlauncher.default_bridge.obfs3.7", "obfs3 109.105.109.163:47779 4C331FA9B3D1D6D8FB0D8FBBF0C259C360D97E6A"); pref("extensions.torlauncher.default_bridge.flashproxy.1", "flashproxy 0.0.1.0:1"); pref("extensions.torlauncher.default_bridge.flashproxy.2", "flashproxy 0.0.1.0:2"); @@ -18,3 +18,6 @@ pref("extensions.torlauncher.default_bridge.flashproxy.5", "flashproxy 0.0.1.0:5 pref("extensions.torlauncher.default_bridge.fte.1", "fte 131.252.210.150:8080 271EC1874E40FE65C145C6397AA34FFF7008E50E"); pref("extensions.torlauncher.default_bridge.fte.2", "fte 79.125.3.12:8080 17AF9F9F4E57614A060B7221DCCEDB8BB546DD73"); +pref("extensions.torlauncher.default_bridge.fte.3", "fte 128.105.214.161:8080 1E326AAFB3FCB515015250D8FCCC8E37F91A153B"); +pref("extensions.torlauncher.default_bridge.fte.4", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D"); +pref("extensions.torlauncher.default_bridge.fte.5", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9");

1 0