- tbb-commits - lists.torproject.org

[tor-launcher/master] Bug #10418: Use Sentence case for radio button labels.
by brade＠torproject.org 10 Mar '14

10 Mar '14

commit 848d698d8c832a88c5c0bc26d87a786cf6f4b6c1 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Mar 10 14:35:59 2014 -0400 Bug #10418: Use Sentence case for radio button labels. --- src/chrome/locale/en/network-settings.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd index dca8d53..4e21541 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/chrome/locale/en/network-settings.dtd @@ -46,8 +46,8 @@ <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> <!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type"> -<!ENTITY torsettings.useBridges.custom "Use Custom Bridges"> +<!ENTITY torsettings.useBridges.default "Use default bridges of type"> +<!ENTITY torsettings.useBridges.custom "Use custom bridges"> <!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> <!ENTITY torsettings.useBridges.placeholder "type address:port">

1 0

[tor-browser-bundle/master] Bug 4261: Fix DMG permissions to work from /Applications
by mikeperry＠torproject.org 08 Mar '14

08 Mar '14

commit fb9453c51306ad39d261617e2cb3ba8e18368574 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Mar 8 13:46:23 2014 -0800 Bug 4261: Fix DMG permissions to work from /Applications Only seems to matter on some Mac versions... Very odd. --- gitian/build-helpers/ddmg.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gitian/build-helpers/ddmg.sh b/gitian/build-helpers/ddmg.sh index 468d6be..c37a1fd 100755 --- a/gitian/build-helpers/ddmg.sh +++ b/gitian/build-helpers/ddmg.sh @@ -5,14 +5,17 @@ export LC_ALL=C DMGFILE=$1 shift -find $@ -executable -exec chmod 700 {} \; -find $@ ! -executable -exec chmod 600 {} \; +# We need group readability for some Macs to be able to handle /Applications +# installation. Still unclear exactly why this is -- it is not dependent on +# OSX version... +find $@ -executable -exec chmod 750 {} \; +find $@ ! -executable -exec chmod 640 {} \; cd $@ find . -type f | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" > ~/build/filelist.txt find . -type l | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" >> ~/build/filelist.txt -mkisofs -D -V "Tor Browser" -no-pad -R -apple -o ~/build/tbb-uncompressed.dmg -path-list ~/build/filelist.txt -graft-points -dir-mode 0700 -new-dir-mode 0700 +mkisofs -D -V "Tor Browser" -no-pad -R -apple -o ~/build/tbb-uncompressed.dmg -path-list ~/build/filelist.txt -graft-points -gid 20 -dir-mode 0750 -new-dir-mode 0750 cd ~/build

1 0

[tor-browser-bundle/master] Add a changelog entry for 3.6-beta-1.
by mikeperry＠torproject.org 07 Mar '14

07 Mar '14

commit f0fa0845fd19cdba5c1cdc2751d1fbe4e682684e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Mar 7 14:27:25 2014 -0800 Add a changelog entry for 3.6-beta-1. --- Bundle-Data/Docs/ChangeLog.txt | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 657db38..ccf31b0 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,33 @@ +Tor Browser Bundle 3.6-beta-1 -- Mar 12 2014 + * All Platforms + * Include Pluggable Transports by default: + * Obfsproxy3 0.2.4, Flashproxy 1.6, and FTE 0.2.6 are now included + * Update Tor Launcher to 0.2.5.0 + * Bug 10418: Provide UI configuration for Pluggable Transports + * Bug 10604: Allow Tor status & error messages to be translated + * Bug 10894: Make bridge UI clear that helpdesk is a last resort for + bridges + * Bug 10610: Clarify wizard UI text describing obstacles/blocking + * Bug 11074: Support Tails use case (XULRunner and optional + customizations) + * Update Torbutton to 1.6.7.0: + * Bug 9901: Fix browser freeze due to content type sniffing + * Bug 10611: Add Swedish (sv) to extra locales to update + * Update NoScript to 2.6.8.17 + * Update Tor to 0.2.4.21 + * Backport Pending Tor Patches: + * Bug 5018: Don't launch Pluggable Transport helpers if not in use + * Bug 11069: Detect and report Pluggable Transport bootstrap failures + * Bug 10237: Disable the media cache to prevent disk leaks for videos + * Bug 10703: Force the default charset to avoid locale fingerprinting + * Bug 10104: Update gitian to fix LXC build issues (for non-KVM/VT builders) + * Mac: + * Bug 4271: Use DMG instead of ZIP for Mac packages + * Linux: + * Bug 9533: Fix keyboard input on Ubuntu 13.10 + * Bug 9896: Provide debug symbols for Tor Browser binary + * Bug 10472: Pass arguments to the browser from Linux startup script + Tor Browser Bundle 3.5.2.1 -- Feb 14 2014 * All Platforms * Bug 10895: Fix broken localized bundles

1 0

[tor-browser-bundle/master] Update tags for Torbutton and Tor Browser.
by mikeperry＠torproject.org 07 Mar '14

07 Mar '14

commit ffd28013c92b64a73ba985b708f47aa30e450063 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Mar 7 14:52:06 2014 -0800 Update tags for Torbutton and Tor Browser. --- gitian/versions | 6 +++--- gitian/versions.alpha | 4 ++-- gitian/versions.beta | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gitian/versions b/gitian/versions index 7f367a0..4f1d1c8 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,12 +1,12 @@ -TORBROWSER_VERSION=3.5.2.1 +TORBROWSER_VERSION=3.5.3 BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" VERIFY_TAGS=1 -TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-3-build2 +TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-4-build1 TOR_TAG=tor-0.2.4.21 TORLAUNCHER_TAG=0.2.4.4 -TORBUTTON_TAG=1.6.6.0 +TORBUTTON_TAG=1.6.7.0 HTTPSE_TAG=3.4.5 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 76182b7..83febef 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -4,10 +4,10 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-3-build2 +TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-4-build1 TOR_TAG=tor-0.2.5.2-alpha TORLAUNCHER_TAG=0.2.5.0 -TORBUTTON_TAG=1.6.6.0 +TORBUTTON_TAG=1.6.7.0 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 94ada7c..fd4a715 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -4,10 +4,10 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-3-build2 +TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-4-build1 TOR_TAG=tor-0.2.4.21 TORLAUNCHER_TAG=0.2.5.0 -TORBUTTON_TAG=1.6.6.0 +TORBUTTON_TAG=1.6.7.0 HTTPSE_TAG=3.4.5 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8

1 0

[tor-launcher/master] Bugs 10867, 10900: Bug Add eu, sv, and ja to extra locales
by mikeperry＠torproject.org 07 Mar '14

07 Mar '14

commit f9759b66e964c05188b9bd0adced5e06c005f09d Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 13 16:55:37 2014 +0000 Bugs 10867,10900: Bug Add eu, sv, and ja to extra locales I swear I committed eu and ja before as bug #10687.. --- localization/import-translations.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/localization/import-translations.sh b/localization/import-translations.sh index 3096168..8d30a7d 100755 --- a/localization/import-translations.sh +++ b/localization/import-translations.sh @@ -1,6 +1,13 @@ #!/bin/sh -BUNDLE_LOCALES="ar de es fa fr it ja ko nl pl pt ru vi zh-CN" +BUNDLE_LOCALES="ar de es fa fr it ko nl pl pt ru vi zh-CN" + +# XXX: Basque (eu) by request in #10687. +# This is not used for official builds, but should remain +# so Basque XPIs can be build independently. We can do +# this for other languages too, if anyone requests this +# and translations are available. +BUNDLE_LOCALES="$BUNDLE_LOCALES eu ja sv" if [ -d translation ]; then

1 0

[torbutton/master] Changelog and version bump for 1.6.7.0.
by mikeperry＠torproject.org 07 Mar '14

07 Mar '14

commit 4a9d180fc8b97f38c51089a85305da2d6765eb15 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Mar 7 14:48:54 2014 -0800 Changelog and version bump for 1.6.7.0. --- src/CHANGELOG | 5 +++++ src/install.rdf | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index acbc736..321e2b9 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,8 @@ +1.6.7.0: + 7 Mar 2014: + * Bug 9901: Fix browser freeze due to content type sniffing + * Bug 10611: Add Swedish (sv) to extra locales to update + 1.6.6.0: 3 Feb 2014 * Bug #10800: Prevent exception in New Identity diff --git a/src/install.rdf b/src/install.rdf index e183f91..0c8c486 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.6.0</em:version> + <em:version>1.6.7.0</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] Properly check the Tor tag before applying backport patches.
by mikeperry＠torproject.org 07 Mar '14

07 Mar '14

commit 2edf15136f5bbc939b4420537b779ab80a8c955c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Mar 7 11:28:41 2014 -0800 Properly check the Tor tag before applying backport patches. Also only aply #5018 for PT-enabled bundles. --- gitian/descriptors/linux/gitian-tor.yml | 7 +++++-- gitian/descriptors/mac/gitian-tor.yml | 7 +++++-- gitian/descriptors/windows/gitian-tor.yml | 8 +++++--- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index 8a50ed4..a83d8a4 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -77,13 +77,16 @@ script: | export GIT_COMMITTER_NAME="nobody" export GIT_COMMITTER_EMAIL="nobody@localhost" export GIT_COMMITTER_DATE="$REFERENCE_DATETIME" - if [ ${TOR_TAG:9} == "tor-0.2.4" ]; + if [ ${TOR_TAG::9} == "tor-0.2.4" ]; then git am ~/build/bug10297.patch - git am ~/build/bug5018.patch fi if [ $BUILD_PT_BUNDLES ]; then git am ~/build/bug11069.patch + if [ ${TOR_TAG::9} == "tor-0.2.4" ]; + then + git am ~/build/bug5018.patch + fi 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 d2aab2f..1596c8e 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -93,13 +93,16 @@ script: | export GIT_COMMITTER_NAME="nobody" export GIT_COMMITTER_EMAIL="nobody@localhost" export GIT_COMMITTER_DATE="$REFERENCE_DATETIME" - if [ ${TOR_TAG:9} == "tor-0.2.4" ]; + if [ ${TOR_TAG::9} == "tor-0.2.4" ]; then git am ~/build/bug10297.patch - git am ~/build/bug5018.patch fi if [ $BUILD_PT_BUNDLES ]; then git am ~/build/bug11069.patch + if [ ${TOR_TAG::9} == "tor-0.2.4" ]; + then + git am ~/build/bug5018.patch + fi 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 00b1f9a..9033939 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -89,14 +89,16 @@ script: | export GIT_COMMITTER_NAME="nobody" export GIT_COMMITTER_EMAIL="nobody@localhost" export GIT_COMMITTER_DATE="$REFERENCE_DATETIME" - if [ ${TOR_TAG:9} == "tor-0.2.4" ]; + if [ ${TOR_TAG::9} == "tor-0.2.4" ]; then git am ~/build/bug10297.patch - git am ~/build/bug5018.patch fi if [ $BUILD_PT_BUNDLES ]; then git am ~/build/bug11069.patch - fi + if [ ${TOR_TAG::9} == "tor-0.2.4" ]; + then + git am ~/build/bug5018.patch + fi fi mkdir -p $OUTDIR/src git archive HEAD | tar -x -C $OUTDIR/src ./autogen.sh

1 0

[tor-browser-bundle/master] Bump versions for NoScript and for Tor.
by mikeperry＠torproject.org 07 Mar '14

07 Mar '14

commit f5484a13da65bf9138f2566326e9624178a376ed Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Mar 7 11:47:44 2014 -0800 Bump versions for NoScript and for Tor. --- gitian/versions | 6 +++--- gitian/versions.alpha | 6 +++--- gitian/versions.beta | 6 +++--- gitian/versions.nightly | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gitian/versions b/gitian/versions index f0e8c42..7f367a0 100755 --- a/gitian/versions +++ b/gitian/versions @@ -4,7 +4,7 @@ BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" VERIFY_TAGS=1 TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-3-build2 -TOR_TAG=tor-0.2.4.20 +TOR_TAG=tor-0.2.4.21 TORLAUNCHER_TAG=0.2.4.4 TORBUTTON_TAG=1.6.6.0 HTTPSE_TAG=3.4.5 @@ -37,7 +37,7 @@ SETUPTOOLS_VER=1.4 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.13-fn+sm+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.17-fx+sm+fn.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -61,7 +61,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=0d90f283ee9e3be5bb1ebc315fab12994ff5a15380bd3a2fdff62750286b4ea1 +NOSCRIPT_HASH=8d3246153054c92f850ea8a85b19a2e493a17979751087e4c7bf11f4056282f1 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/gitian/versions.alpha b/gitian/versions.alpha index d6838dc..76182b7 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -5,7 +5,7 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-3-build2 -TOR_TAG=tor-0.2.5.1-alpha +TOR_TAG=tor-0.2.5.2-alpha TORLAUNCHER_TAG=0.2.5.0 TORBUTTON_TAG=1.6.6.0 HTTPSE_TAG=3.4.5 @@ -38,7 +38,7 @@ SETUPTOOLS_VER=1.4 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.13-sm+fx+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.17-fx+sm+fn.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -62,7 +62,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=0d90f283ee9e3be5bb1ebc315fab12994ff5a15380bd3a2fdff62750286b4ea1 +NOSCRIPT_HASH=8d3246153054c92f850ea8a85b19a2e493a17979751087e4c7bf11f4056282f1 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/gitian/versions.beta b/gitian/versions.beta index 402b8a9..94ada7c 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -5,7 +5,7 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-3-build2 -TOR_TAG=tor-0.2.4.20 +TOR_TAG=tor-0.2.4.21 TORLAUNCHER_TAG=0.2.5.0 TORBUTTON_TAG=1.6.6.0 HTTPSE_TAG=3.4.5 @@ -38,7 +38,7 @@ SETUPTOOLS_VER=1.4 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.13-fn+sm+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.17-fx+sm+fn.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -62,7 +62,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=0d90f283ee9e3be5bb1ebc315fab12994ff5a15380bd3a2fdff62750286b4ea1 +NOSCRIPT_HASH=8d3246153054c92f850ea8a85b19a2e493a17979751087e4c7bf11f4056282f1 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 8a2924a..baefbae 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -38,7 +38,7 @@ SETUPTOOLS_VER=1.4 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.14-sm+fx+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.17-fx+sm+fn.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -62,7 +62,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=c0c089f994c71a8e504fa26fed9fbbb16dbd7e49d4bef2cf9bc6a2159ae5f073 +NOSCRIPT_HASH=8d3246153054c92f850ea8a85b19a2e493a17979751087e4c7bf11f4056282f1 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/master] Bug 10369: For now, at least download+verify the old OSX compiler.
by mikeperry＠torproject.org 07 Mar '14

07 Mar '14

commit f1a4621f0c453b0f32752b940271aaa1cf4af8fc Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Mar 6 23:20:20 2014 -0800 Bug 10369: For now, at least download+verify the old OSX compiler. We still need it for Tor and Pluggable Transports. --- gitian/fetch-inputs.sh | 4 ++-- gitian/versions | 3 +++ gitian/versions.alpha | 3 +++ gitian/versions.beta | 3 +++ gitian/versions.nightly | 3 +++ 5 files changed, 14 insertions(+), 2 deletions(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index c2bf811..0bc217e 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -151,7 +151,7 @@ do fi done -for i in TOOLCHAIN4 OSXSDK MSVCR100 +for i in TOOLCHAIN4 TOOLCHAIN4_OLD OSXSDK MSVCR100 do PACKAGE="${i}_PACKAGE" URL="${MIRROR_URL}${!PACKAGE}" @@ -217,7 +217,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 NOSCRIPT MINGW MSVCR100 PYCRYPTO ARGPARSE ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP +for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MINGW MSVCR100 PYCRYPTO ARGPARSE ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/versions b/gitian/versions index 11eb1db..f0e8c42 100755 --- a/gitian/versions +++ b/gitian/versions @@ -39,6 +39,7 @@ OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.13-fn+sm+fx.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz +TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MINGW_PACKAGE=mingw-w64-svn-snapshot.zip MSVCR100_PACKAGE=msvcr100.dll @@ -59,6 +60,7 @@ OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 +TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=0d90f283ee9e3be5bb1ebc315fab12994ff5a15380bd3a2fdff62750286b4ea1 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 @@ -74,6 +76,7 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} TOOLCHAIN4_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${T… +TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${TOOLCHAIN4_OLD_PACKAGE} OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 85ffd95..d6838dc 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -40,6 +40,7 @@ OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.13-sm+fx+fn.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz +TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MINGW_PACKAGE=mingw-w64-svn-snapshot.zip MSVCR100_PACKAGE=msvcr100.dll @@ -60,6 +61,7 @@ OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 +TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=0d90f283ee9e3be5bb1ebc315fab12994ff5a15380bd3a2fdff62750286b4ea1 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 @@ -75,6 +77,7 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} TOOLCHAIN4_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${T… +TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${TOOLCHAIN4_OLD_PACKAGE} OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} diff --git a/gitian/versions.beta b/gitian/versions.beta index a2c91b9..402b8a9 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -40,6 +40,7 @@ OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.13-fn+sm+fx.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz +TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MINGW_PACKAGE=mingw-w64-svn-snapshot.zip MSVCR100_PACKAGE=msvcr100.dll @@ -60,6 +61,7 @@ OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 +TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=0d90f283ee9e3be5bb1ebc315fab12994ff5a15380bd3a2fdff62750286b4ea1 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 @@ -75,6 +77,7 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} TOOLCHAIN4_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${T… +TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${TOOLCHAIN4_OLD_PACKAGE} OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 3288c7e..8a2924a 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -40,6 +40,7 @@ OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.14-sm+fx+fn.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz +TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MINGW_PACKAGE=mingw-w64-svn-snapshot.zip MSVCR100_PACKAGE=msvcr100.dll @@ -60,6 +61,7 @@ OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 +TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=c0c089f994c71a8e504fa26fed9fbbb16dbd7e49d4bef2cf9bc6a2159ae5f073 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 @@ -75,6 +77,7 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} TOOLCHAIN4_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${T… +TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${TOOLCHAIN4_OLD_PACKAGE} OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE}

1 0

[tor-browser-bundle/master] Bug 4261: Make uncompressed DMG creation reproducible.
by mikeperry＠torproject.org 07 Mar '14

07 Mar '14

commit 82f061f118519c318ddf0aaa7dc4fcbd8290536e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sun Mar 2 14:21:30 2014 -0800 Bug 4261: Make uncompressed DMG creation reproducible. genisoimage was non-deterministic, and libdmg was using unitialized memory in a stack struct. --- gitian/build-helpers/ddmg.sh | 25 +++++++------------ gitian/descriptors/mac/gitian-bundle.yml | 6 +++++ gitian/patches/libdmg.patch | 39 ++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 16 deletions(-) diff --git a/gitian/build-helpers/ddmg.sh b/gitian/build-helpers/ddmg.sh index f9f54da..468d6be 100755 --- a/gitian/build-helpers/ddmg.sh +++ b/gitian/build-helpers/ddmg.sh @@ -5,24 +5,17 @@ export LC_ALL=C DMGFILE=$1 shift -# Attempt to normalize inode ordering.. -# XXX: the genisoimage -path-list argument seems broken -mkdir -p ~/build/tmp/dmg +find $@ -executable -exec chmod 700 {} \; +find $@ ! -executable -exec chmod 600 {} \; + cd $@ -for i in `find . | sort` -do - if [ -d $i ]; - then - mkdir -p ~/build/tmp/dmg/$i - else - cp --parents -d --preserve=all $i ~/build/tmp/dmg/ - fi -done +find . -type f | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" > ~/build/filelist.txt +find . -type l | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" >> ~/build/filelist.txt + +mkisofs -D -V "Tor Browser" -no-pad -R -apple -o ~/build/tbb-uncompressed.dmg -path-list ~/build/filelist.txt -graft-points -dir-mode 0700 -new-dir-mode 0700 -find ~/build/tmp/dmg -executable -exec chmod 700 {} \; -find ~/build/tmp/dmg ! -executable -exec chmod 600 {} \; +cd ~/build -genisoimage -D -V "Tor Browser" -no-pad -R -apple -o tbb-uncompressed.dmg ~/build/tmp/dmg/ ~/build/libdmg-hfsplus/dmg/dmg dmg tbb-uncompressed.dmg $DMGFILE rm tbb-uncompressed.dmg -rm -rf ~/build/tmp/dmg/ +rm ~/build/filelist.txt diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index 63c0a96..55a6777 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -41,6 +41,7 @@ files: - "noscript(a)noscript.net.xpi" - "dzip.sh" - "ddmg.sh" +- "libdmg.patch" - "bare-version" - "bundle.inputs" - "versions" @@ -141,6 +142,7 @@ script: | # # Set up DMG skeleton cd libdmg-hfsplus + git am ~/build/libdmg.patch cmake CMakeLists.txt cd dmg make @@ -162,6 +164,10 @@ script: | ~/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 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 ~/build/ddmg.sh $OUTDIR/TorBrowser-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_en-US.dmg ~/build/dmg rm -rf ~/build/dmg/$TORBROWSER_APP.app diff --git a/gitian/patches/libdmg.patch b/gitian/patches/libdmg.patch new file mode 100644 index 0000000..a84ac3e --- /dev/null +++ b/gitian/patches/libdmg.patch @@ -0,0 +1,39 @@ +From d1a5eca891f32103ccda80ee75e158dfc7ece70d Mon Sep 17 00:00:00 2001 +From: Mike Perry <mikeperry-git(a)torproject.org> +Date: Thu, 6 Mar 2014 19:47:05 -0800 +Subject: [PATCH] Memset a UDIF header to ensure archive reproducibility. + +Some of the struct padding and fields contained unitialized memory, which +caused two successive invocations to produce archives that differed in some +bytes. +--- + dmg/dmglib.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/dmg/dmglib.c b/dmg/dmglib.c +index f481b1f..b74e50b 100644 +--- a/dmg/dmglib.c ++++ b/dmg/dmglib.c +@@ -108,7 +108,8 @@ int buildDmg(AbstractFile* abstractIn, AbstractFile* abstractOut) { + ChecksumToken dataForkToken; + + UDIFResourceFile koly; +- ++ memset(&koly, 0, sizeof(koly)); ++ + off_t plistOffset; + uint32_t plistSize; + uint32_t dataForkChecksum; +@@ -284,7 +285,8 @@ int convertToDMG(AbstractFile* abstractIn, AbstractFile* abstractOut) { + uint64_t numSectors; + + UDIFResourceFile koly; +- ++ memset(&koly, 0, sizeof(koly)); ++ + char partitionName[512]; + + off_t fileLength; +-- +1.8.1.2 +

1 0

[tor-browser-bundle/master] Bug #11069: Detect PT bootstrap failures.
by mikeperry＠torproject.org 07 Mar '14

07 Mar '14

commit bfb553da6b2d1978c369361950079297a8628fbf Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Mar 6 17:05:04 2014 -0800 Bug #11069: Detect PT bootstrap failures. --- gitian/descriptors/linux/gitian-tor.yml | 4 + gitian/descriptors/mac/gitian-tor.yml | 4 + gitian/descriptors/windows/gitian-tor.yml | 4 + gitian/patches/bug11069.patch | 169 +++++++++++++++++++++++++++++ 4 files changed, 181 insertions(+) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index ce9372b..8a50ed4 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -26,6 +26,7 @@ files: - "versions" - "bug10297.patch" - "bug5018.patch" +- "bug11069.patch" - "dzip.sh" - "openssl.tar.gz" script: | @@ -81,6 +82,9 @@ script: | git am ~/build/bug10297.patch git am ~/build/bug5018.patch fi + if [ $BUILD_PT_BUNDLES ]; then + git am ~/build/bug11069.patch + fi mkdir -p $OUTDIR/src #git archive HEAD | tar -x -C $OUTDIR/src ./autogen.sh diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index c2c2bf6..d2aab2f 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -27,6 +27,7 @@ files: - "openssl.tar.gz" - "bug10297.patch" - "bug5018.patch" +- "bug11069.patch" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" - "dzip.sh" @@ -97,6 +98,9 @@ script: | git am ~/build/bug10297.patch git am ~/build/bug5018.patch fi + if [ $BUILD_PT_BUNDLES ]; then + git am ~/build/bug11069.patch + fi mkdir -p $OUTDIR/src git archive HEAD | tar -x -C $OUTDIR/src ./autogen.sh diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index 6900a14..00b1f9a 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -26,6 +26,7 @@ files: - "versions" - "bug10297.patch" - "bug5018.patch" +- "bug11069.patch" - "binutils.tar.bz2" - "dzip.sh" - "openssl.tar.gz" @@ -93,6 +94,9 @@ script: | git am ~/build/bug10297.patch git am ~/build/bug5018.patch fi + if [ $BUILD_PT_BUNDLES ]; then + git am ~/build/bug11069.patch + fi mkdir -p $OUTDIR/src git archive HEAD | tar -x -C $OUTDIR/src ./autogen.sh diff --git a/gitian/patches/bug11069.patch b/gitian/patches/bug11069.patch new file mode 100644 index 0000000..563aafb --- /dev/null +++ b/gitian/patches/bug11069.patch @@ -0,0 +1,169 @@ +From 404cc6095e31ce47af9287cdda1e4d3ff449b387 Mon Sep 17 00:00:00 2001 +From: George Kadianakis <desnacked(a)riseup.net> +Date: Fri, 28 Feb 2014 15:19:30 +0000 +Subject: [PATCH] Throw control port warning if we failed connecting to briges. + +--- + changes/bug11069 | 4 ++++ + src/or/connection.c | 41 ++++++++++++++++++++++++++++++++--------- + src/or/connection.h | 2 ++ + src/or/control.c | 7 ++++--- + src/or/entrynodes.c | 21 --------------------- + src/or/entrynodes.h | 1 - + 6 files changed, 42 insertions(+), 34 deletions(-) + create mode 100644 changes/bug11069 + +diff --git a/changes/bug11069 b/changes/bug11069 +new file mode 100644 +index 0000000..5aa3085 +--- /dev/null ++++ b/changes/bug11069 +@@ -0,0 +1,4 @@ ++ o Minor bugfixes (clients): ++ - Fix tor so that it raises a control port warning when we fail to ++ connect to all of our bridges. Fixes bug 11069; bugfix on ++ tor-0.2.1.2-alpha. +diff --git a/src/or/connection.c b/src/or/connection.c +index 77565ee..12f2b01 100644 +--- a/src/or/connection.c ++++ b/src/or/connection.c +@@ -3129,15 +3129,6 @@ connection_handle_read_impl(connection_t *conn) + before = buf_datalen(conn->inbuf); + if (connection_read_to_buf(conn, &max_to_read, &socket_error) < 0) { + /* There's a read error; kill the connection.*/ +- if (conn->type == CONN_TYPE_OR) { +- connection_or_notify_error(TO_OR_CONN(conn), +- socket_error != 0 ? +- errno_to_orconn_end_reason(socket_error) : +- END_OR_CONN_REASON_CONNRESET, +- socket_error != 0 ? +- tor_socket_strerror(socket_error) : +- "(unknown, errno was 0)"); +- } + if (CONN_IS_EDGE(conn)) { + edge_connection_t *edge_conn = TO_EDGE_CONN(conn); + connection_edge_end_errno(edge_conn); +@@ -3152,6 +3143,19 @@ connection_handle_read_impl(connection_t *conn) + * connection_or_notify_error() above. + */ + connection_mark_for_close_internal(conn); ++ ++ /* If it's an OR connection, notify the other components of its ++ failure. */ ++ if (conn->type == CONN_TYPE_OR) { ++ connection_or_notify_error(TO_OR_CONN(conn), ++ socket_error != 0 ? ++ errno_to_orconn_end_reason(socket_error) : ++ END_OR_CONN_REASON_CONNRESET, ++ socket_error != 0 ? ++ tor_socket_strerror(socket_error) : ++ "(unknown, errno was 0)"); ++ } ++ + return -1; + } + n_read += buf_datalen(conn->inbuf) - before; +@@ -4164,6 +4168,25 @@ connection_dir_get_by_purpose_and_resource(int purpose, + return NULL; + } + ++/** Return 1 if there are any active OR connections. We use this to ++ * guess if we should tell the controller that we didn't manage to ++ * connect to any of our bridges. */ ++int ++any_active_or_conns(void) ++{ ++ smartlist_t *conns = get_connection_array(); ++ SMARTLIST_FOREACH_BEGIN(conns, connection_t *, conn) { ++ if (conn->type == CONN_TYPE_OR && ++ !conn->marked_for_close) { ++ log_debug(LD_DIR, "%s: Found an OR connection: %s", ++ __func__, conn->address); ++ return 1; ++ } ++ } SMARTLIST_FOREACH_END(conn); ++ ++ return 0; ++} ++ + /** Return 1 if <b>conn</b> is a listener conn, else return 0. */ + int + connection_is_listener(connection_t *conn) +diff --git a/src/or/connection.h b/src/or/connection.h +index fa07650..47c70c5 100644 +--- a/src/or/connection.h ++++ b/src/or/connection.h +@@ -187,6 +187,8 @@ connection_t *connection_get_by_type_state_rendquery(int type, int state, + dir_connection_t *connection_dir_get_by_purpose_and_resource( + int state, const char *resource); + ++int any_active_or_conns(void); ++ + #define connection_speaks_cells(conn) ((conn)->type == CONN_TYPE_OR) + int connection_is_listener(connection_t *conn); + int connection_state_is_open(connection_t *conn); +diff --git a/src/or/control.c b/src/or/control.c +index 05ff9a6..198fb18 100644 +--- a/src/or/control.c ++++ b/src/or/control.c +@@ -4898,9 +4898,10 @@ control_event_bootstrap_problem, (const char *warn, int reason)) + if (reason == END_OR_CONN_REASON_NO_ROUTE) + recommendation = "warn"; + +- if (get_options()->UseBridges && +- !any_bridge_descriptors_known() && +- !any_pending_bridge_descriptor_fetches()) ++ /* If we are using bridges and all our OR connections are now ++ closed, it means that we totally failed to connect to our ++ bridges. Throw a warning. */ ++ if (get_options()->UseBridges && !any_active_or_conns()) + recommendation = "warn"; + + if (we_are_hibernating()) +diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c +index d463303..17c5b13 100644 +--- a/src/or/entrynodes.c ++++ b/src/or/entrynodes.c +@@ -2213,27 +2213,6 @@ any_bridge_descriptors_known(void) + return choose_random_entry(NULL) != NULL; + } + +-/** Return 1 if there are any directory conns fetching bridge descriptors +- * that aren't marked for close. We use this to guess if we should tell +- * the controller that we have a problem. */ +-int +-any_pending_bridge_descriptor_fetches(void) +-{ +- smartlist_t *conns = get_connection_array(); +- SMARTLIST_FOREACH_BEGIN(conns, connection_t *, conn) { +- if (conn->type == CONN_TYPE_DIR && +- conn->purpose == DIR_PURPOSE_FETCH_SERVERDESC && +- TO_DIR_CONN(conn)->router_purpose == ROUTER_PURPOSE_BRIDGE && +- !conn->marked_for_close && +- conn->linked && +- conn->linked_conn && !conn->linked_conn->marked_for_close) { +- log_debug(LD_DIR, "found one: %s", conn->address); +- return 1; +- } +- } SMARTLIST_FOREACH_END(conn); +- return 0; +-} +- + /** Return 1 if we have at least one descriptor for an entry guard + * (bridge or member of EntryNodes) and all descriptors we know are + * down. Else return 0. If <b>act</b> is 1, then mark the down guards +diff --git a/src/or/entrynodes.h b/src/or/entrynodes.h +index 772c666..73ac017 100644 +--- a/src/or/entrynodes.h ++++ b/src/or/entrynodes.h +@@ -105,7 +105,6 @@ void retry_bridge_descriptor_fetch_directly(const char *digest); + void fetch_bridge_descriptors(const or_options_t *options, time_t now); + void learned_bridge_descriptor(routerinfo_t *ri, int from_cache); + int any_bridge_descriptors_known(void); +-int any_pending_bridge_descriptor_fetches(void); + int entries_known_but_down(const or_options_t *options); + void entries_retry_all(const or_options_t *options); + +-- +1.8.1.2 +

1 0

[tor-browser-bundle/master] Switch the install shortcut location to /Applications.
by mikeperry＠torproject.org 07 Mar '14

07 Mar '14

commit 02d79a009b0a13d7e115d5f8c71e1298b4982ff9 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sun Mar 2 23:31:00 2014 -0800 Switch the install shortcut location to /Applications. Mac users still get lost by a default install location to Desktop.. :/ In case we decide to do more extensive A/B testing: Keep skeletons for both Desktop and Application DMG templates around. --- Bundle-Data/mac-applications.dmg/.DS_Store | Bin 0 -> 12292 bytes Bundle-Data/mac-applications.dmg/.VolumeIcon.icns | Bin 0 -> 242224 bytes Bundle-Data/mac-applications.dmg/.background/background.png | Bin 0 -> 50020 bytes Bundle-Data/mac-applications.dmg/.fseventsd/0000000000400c60 | Bin 0 -> 173 bytes Bundle-Data/mac-applications.dmg/.fseventsd/fseventsd-uuid | 1 + Bundle-Data/mac-applications.dmg/Applications | 1 + Bundle-Data/mac-desktop.dmg/.DS_Store | Bin 0 -> 12292 bytes Bundle-Data/mac-desktop.dmg/._Desktop | Bin 0 -> 303592 bytes Bundle-Data/mac-desktop.dmg/.background/background.png | Bin 0 -> 50020 bytes Bundle-Data/mac-desktop.dmg/Desktop | Bin 0 -> 300120 bytes Bundle-Data/mac.dmg/.DS_Store | Bin 12292 -> 0 bytes Bundle-Data/mac.dmg/._Desktop | Bin 303592 -> 0 bytes Bundle-Data/mac.dmg/.background/background.png | Bin 50020 -> 0 bytes Bundle-Data/mac.dmg/Desktop | Bin 300120 -> 0 bytes gitian/descriptors/mac/gitian-bundle.yml | 5 +++-- gitian/mkbundle-mac.sh | 9 ++++++--- 16 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Bundle-Data/mac-applications.dmg/.DS_Store b/Bundle-Data/mac-applications.dmg/.DS_Store new file mode 100644 index 0000000..aeb3104 Binary files /dev/null and b/Bundle-Data/mac-applications.dmg/.DS_Store differ diff --git a/Bundle-Data/mac-applications.dmg/.VolumeIcon.icns b/Bundle-Data/mac-applications.dmg/.VolumeIcon.icns new file mode 100644 index 0000000..481914f Binary files /dev/null and b/Bundle-Data/mac-applications.dmg/.VolumeIcon.icns differ diff --git a/Bundle-Data/mac-applications.dmg/.background/background.png b/Bundle-Data/mac-applications.dmg/.background/background.png new file mode 100644 index 0000000..94e4584 Binary files /dev/null and b/Bundle-Data/mac-applications.dmg/.background/background.png differ diff --git a/Bundle-Data/mac-applications.dmg/.fseventsd/0000000000400c60 b/Bundle-Data/mac-applications.dmg/.fseventsd/0000000000400c60 new file mode 100644 index 0000000..e21068d Binary files /dev/null and b/Bundle-Data/mac-applications.dmg/.fseventsd/0000000000400c60 differ diff --git a/Bundle-Data/mac-applications.dmg/.fseventsd/fseventsd-uuid b/Bundle-Data/mac-applications.dmg/.fseventsd/fseventsd-uuid new file mode 100644 index 0000000..538367d --- /dev/null +++ b/Bundle-Data/mac-applications.dmg/.fseventsd/fseventsd-uuid @@ -0,0 +1 @@ +B29020CB-1603-4E1C-8C56-5C8A4434D120 \ No newline at end of file diff --git a/Bundle-Data/mac-applications.dmg/Applications b/Bundle-Data/mac-applications.dmg/Applications new file mode 120000 index 0000000..bd2d47f --- /dev/null +++ b/Bundle-Data/mac-applications.dmg/Applications @@ -0,0 +1 @@ +/Applications \ No newline at end of file diff --git a/Bundle-Data/mac-desktop.dmg/.DS_Store b/Bundle-Data/mac-desktop.dmg/.DS_Store new file mode 100644 index 0000000..9bec18c Binary files /dev/null and b/Bundle-Data/mac-desktop.dmg/.DS_Store differ diff --git a/Bundle-Data/mac-desktop.dmg/._Desktop b/Bundle-Data/mac-desktop.dmg/._Desktop new file mode 100644 index 0000000..a1e0b7f Binary files /dev/null and b/Bundle-Data/mac-desktop.dmg/._Desktop differ diff --git a/Bundle-Data/mac-desktop.dmg/.background/background.png b/Bundle-Data/mac-desktop.dmg/.background/background.png new file mode 100644 index 0000000..94e4584 Binary files /dev/null and b/Bundle-Data/mac-desktop.dmg/.background/background.png differ diff --git a/Bundle-Data/mac-desktop.dmg/Desktop b/Bundle-Data/mac-desktop.dmg/Desktop new file mode 100644 index 0000000..3c88450 Binary files /dev/null and b/Bundle-Data/mac-desktop.dmg/Desktop differ diff --git a/Bundle-Data/mac.dmg/.DS_Store b/Bundle-Data/mac.dmg/.DS_Store deleted file mode 100644 index 9bec18c..0000000 Binary files a/Bundle-Data/mac.dmg/.DS_Store and /dev/null differ diff --git a/Bundle-Data/mac.dmg/._Desktop b/Bundle-Data/mac.dmg/._Desktop deleted file mode 100644 index a1e0b7f..0000000 Binary files a/Bundle-Data/mac.dmg/._Desktop and /dev/null differ diff --git a/Bundle-Data/mac.dmg/.background/background.png b/Bundle-Data/mac.dmg/.background/background.png deleted file mode 100644 index 94e4584..0000000 Binary files a/Bundle-Data/mac.dmg/.background/background.png and /dev/null differ diff --git a/Bundle-Data/mac.dmg/Desktop b/Bundle-Data/mac.dmg/Desktop deleted file mode 100644 index 3c88450..0000000 Binary files a/Bundle-Data/mac.dmg/Desktop and /dev/null differ diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index 55a6777..4325a1b 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -36,7 +36,8 @@ files: - "bridge_prefs.js" - "relativelink-src.zip" - "mac-skeleton.zip" -- "mac-dmg.zip" +- "dmg-applications.tar.xz" +- "dmg-desktop.tar.xz" - "mac-langpacks.zip" - "noscript(a)noscript.net.xpi" - "dzip.sh" @@ -148,7 +149,7 @@ script: | make cd ../../ cd dmg - unzip ~/build/mac-dmg.zip + tar -Jxvf ~/build/dmg-applications.tar.xz # FIXME: Desktop or Application as dest? cd .. # # FF24 puts the prefs in the browser jar: diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 18e0f8a..a9cbacb 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -63,9 +63,12 @@ cp mac-tor.sh $GITIAN_DIR/inputs/ cd mac rm -f $GITIAN_DIR/inputs/mac-skeleton.zip $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/mac-skeleton.zip . -cd ../mac.dmg -rm -f $GITIAN_DIR/inputs/mac-dmg.zip -$WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/mac-dmg.zip . +cd ../mac-desktop.dmg +rm -f $GITIAN_DIR/inputs/dmg-desktop.tar.xz +$WRAPPER_DIR/build-helpers/dtar.sh $GITIAN_DIR/inputs/dmg-desktop.tar.xz . +cd ../mac-applications.dmg +rm -f $GITIAN_DIR/inputs/dmg-applications.tar-gz +$WRAPPER_DIR/build-helpers/dtar.sh $GITIAN_DIR/inputs/dmg-applications.tar.xz . cd $WRAPPER_DIR

1 0

[tor-browser-bundle/master] Bug 11042: Remove Build-ID from Firefox libs.
by mikeperry＠torproject.org 02 Mar '14

02 Mar '14

commit 9c37c9fcc639c02e9dd7b81741bbf95a24f47a31 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sun Mar 2 14:13:50 2014 -0800 Bug 11042: Remove Build-ID from Firefox libs. It is sometimes non-deterministic (particularly for libxul.so). --- gitian/descriptors/linux/gitian-firefox.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 3ee8eef..282ea49 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -100,6 +100,8 @@ script: | cd $INSTDIR for LIB in Browser/*.so Browser/webapprt-stub Browser/mozilla-xremote-client Browser/firefox Browser/plugin-container Browser/components/*.so # Browser/updater do + # Build-ID is sometimes non-deterministic, and we use debuglink anyway + objcopy --remove-section=.note.gnu.build-id $LIB objcopy --only-keep-debug $LIB Debug/$LIB strip $LIB objcopy --add-gnu-debuglink=./Debug/$LIB $LIB

1 0

[tor-browser-bundle/master] Set flag to build PT bundles for alpha and nightly.
by mikeperry＠torproject.org 02 Mar '14

02 Mar '14

commit 6ae73509c55eb0385b7dd0520fdee04ca3ad84e5 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sun Mar 2 13:54:45 2014 -0800 Set flag to build PT bundles for alpha and nightly. --- gitian/versions.alpha | 1 + gitian/versions.nightly | 1 + 2 files changed, 2 insertions(+) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index b6ee2c2..85ffd95 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -1,5 +1,6 @@ TORBROWSER_VERSION=4.0-alpha-1 BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" +BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 436536e..3288c7e 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -1,5 +1,6 @@ TORBROWSER_VERSION=tbb-nightly BUNDLE_LOCALES="ar ru zh-CN" +BUILD_PT_BUNDLES=1 VERIFY_TAGS=0

1 0

[tor-browser-bundle/master] Relocate bridges from torrc appendices to a prefs file.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit 3279db32f147479af225d7106949e8dddd360dbb Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Feb 28 10:02:10 2014 -0800 Relocate bridges from torrc appendices to a prefs file. --- Bundle-Data/beta/bridge_prefs.js | 15 ++++++++ Bundle-Data/beta/linux/torrc-defaults-appendix | 40 +++++----------------- Bundle-Data/beta/mac/torrc-defaults-appendix | 23 ------------- Bundle-Data/beta/windows/torrc-defaults-appendix | 22 ------------ 4 files changed, 23 insertions(+), 77 deletions(-) diff --git a/Bundle-Data/beta/bridge_prefs.js b/Bundle-Data/beta/bridge_prefs.js new file mode 100644 index 0000000..e3d6b69 --- /dev/null +++ b/Bundle-Data/beta/bridge_prefs.js @@ -0,0 +1,15 @@ +# Tor Launcher preferences (default bridges): +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.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.flashproxy.1", "flashproxy 0.0.1.0:1"); + +pref("extensions.torlauncher.default_bridge.fte.1", "fte bridges.fteproxy.org:8080"); diff --git a/Bundle-Data/beta/linux/torrc-defaults-appendix b/Bundle-Data/beta/linux/torrc-defaults-appendix index b43cd59..d0f621e 100644 --- a/Bundle-Data/beta/linux/torrc-defaults-appendix +++ b/Bundle-Data/beta/linux/torrc-defaults-appendix @@ -1,35 +1,11 @@ - ## fteproxy configuration -# Bridge fte bridges.fteproxy.org:8080 - ClientTransportPlugin fte exec ./Tor/PluggableTransports/fteproxy --managed -## obfsproxy configuration -# -# Bridge obfs3 83.212.101.2:42782 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D -# Bridge obfs3 83.212.101.2:443 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D -# Bridge obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9 -# Bridge obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9 -# Bridge obfs3 209.141.36.236:45496 58D91C3A631F910F32E18A55441D5A0463BA66E2 -# Bridge obfs3 208.79.90.242:35658 BA61757846841D64A83EA2514C766CB92F1FB41F -# Bridge obfs3 109.105.109.163:38980 9D7259A696F7DAB073043B28114112A46D36CFFD -# Bridge obfs3 109.105.109.163:47779 844B1F53FFD548C998F8D3B01B7E19FA07C3396E -# -# Bridge obfs2 83.212.100.216:47870 1F01A7BB60F49FC96E0850A6BAD6D076DFEFAF80 -# Bridge obfs2 83.212.96.182:46602 6F058CBEF888EB20D1DEB9886909F1E812245D41 -# Bridge obfs2 70.182.182.109:54542 94C9E691688FAFDEC701A0788BD15BE8AD34ED35 -# Bridge obfs2 128.31.0.34:1051 CA7434F14A898C7D3427B8295A7F83446BC7F496 -# Bridge obfs2 83.212.101.2:45235 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D - -ClientTransportPlugin obfs2,obfs3 exec ./Tor/PluggableTransports/obfsproxy.bin managed - - -## flash proxy configuration -# -# # The flashproxy bridge address and port are ignored. -# Bridge flashproxy 0.0.1.0:1 - -# Change the second number here (9000) to the number of a port that can -# receive connections from the Internet (the port for which you -# configured port forwarding). -ClientTransportPlugin flashproxy exec ./Tor/PluggableTransports/flashproxy-client --register :0 :9000 +## obfsproxy configuration +ClientTransportPlugin obfs2,obfs3 exec ./Tor/PluggableTransports/obfsproxy.bin managed +## flash proxy configuration +# +# Change the second number here (9000) to the number of a port that can +# receive connections from the Internet (the port for which you +# configured port forwarding). +ClientTransportPlugin flashproxy exec ./Tor/PluggableTransports/flashproxy-client --register :0 :9000 diff --git a/Bundle-Data/beta/mac/torrc-defaults-appendix b/Bundle-Data/beta/mac/torrc-defaults-appendix index d3e211d..e1ada73 100644 --- a/Bundle-Data/beta/mac/torrc-defaults-appendix +++ b/Bundle-Data/beta/mac/torrc-defaults-appendix @@ -1,34 +1,11 @@ - ## fteproxy configuration -# Bridge fte bridges.fteproxy.org:8080 - ClientTransportPlugin fte exec PluggableTransports/fteproxy --managed ## obfsproxy configuration -# -# Bridge obfs3 83.212.101.2:42782 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D -# Bridge obfs3 83.212.101.2:443 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D -# Bridge obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9 -# Bridge obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9 -# Bridge obfs3 209.141.36.236:45496 58D91C3A631F910F32E18A55441D5A0463BA66E2 -# Bridge obfs3 208.79.90.242:35658 BA61757846841D64A83EA2514C766CB92F1FB41F -# Bridge obfs3 109.105.109.163:38980 9D7259A696F7DAB073043B28114112A46D36CFFD -# Bridge obfs3 109.105.109.163:47779 844B1F53FFD548C998F8D3B01B7E19FA07C3396E -# -# Bridge obfs2 83.212.100.216:47870 1F01A7BB60F49FC96E0850A6BAD6D076DFEFAF80 -# Bridge obfs2 83.212.96.182:46602 6F058CBEF888EB20D1DEB9886909F1E812245D41 -# Bridge obfs2 70.182.182.109:54542 94C9E691688FAFDEC701A0788BD15BE8AD34ED35 -# Bridge obfs2 128.31.0.34:1051 CA7434F14A898C7D3427B8295A7F83446BC7F496 -# Bridge obfs2 83.212.101.2:45235 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D - ClientTransportPlugin obfs2,obfs3 exec PluggableTransports/obfsproxy.bin managed - ## flash proxy configuration # -# # The flashproxy bridge address and port are ignored. -# Bridge flashproxy 0.0.1.0:1 - # Change the second number here (9000) to the number of a port that can # receive connections from the Internet (the port for which you # configured port forwarding). diff --git a/Bundle-Data/beta/windows/torrc-defaults-appendix b/Bundle-Data/beta/windows/torrc-defaults-appendix index 965b98a..049d2ff 100644 --- a/Bundle-Data/beta/windows/torrc-defaults-appendix +++ b/Bundle-Data/beta/windows/torrc-defaults-appendix @@ -1,33 +1,11 @@ ## fteproxy configuration -# Bridge fte bridges.fteproxy.org:8080 - ClientTransportPlugin fte exec Tor\PluggableTransports\fteproxy --managed ## obfsproxy configuration -# -# Bridge obfs3 83.212.101.2:42782 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D -# Bridge obfs3 83.212.101.2:443 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D -# Bridge obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9 -# Bridge obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9 -# Bridge obfs3 209.141.36.236:45496 58D91C3A631F910F32E18A55441D5A0463BA66E2 -# Bridge obfs3 208.79.90.242:35658 BA61757846841D64A83EA2514C766CB92F1FB41F -# Bridge obfs3 109.105.109.163:38980 9D7259A696F7DAB073043B28114112A46D36CFFD -# Bridge obfs3 109.105.109.163:47779 844B1F53FFD548C998F8D3B01B7E19FA07C3396E -# -# Bridge obfs2 83.212.100.216:47870 1F01A7BB60F49FC96E0850A6BAD6D076DFEFAF80 -# Bridge obfs2 83.212.96.182:46602 6F058CBEF888EB20D1DEB9886909F1E812245D41 -# Bridge obfs2 70.182.182.109:54542 94C9E691688FAFDEC701A0788BD15BE8AD34ED35 -# Bridge obfs2 128.31.0.34:1051 CA7434F14A898C7D3427B8295A7F83446BC7F496 -# Bridge obfs2 83.212.101.2:45235 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D - ClientTransportPlugin obfs2,obfs3 exec Tor\PluggableTransports\obfsproxy managed - ## flash proxy configuration # -# # The flashproxy bridge address and port are ignored. -# Bridge flashproxy 0.0.1.0:1 - # Change the second number here (9000) to the number of a port that can # receive connections from the Internet (the port for which you # configured port forwarding).

1 0

[tor-browser-bundle/master] Append bridge lines to PT bundles.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit f29ec39f7bd73fcadf83f051c9add246e4d0c4f4 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Feb 28 10:11:16 2014 -0800 Append bridge lines to PT bundles. --- gitian/descriptors/linux/gitian-bundle.yml | 2 ++ gitian/descriptors/mac/gitian-bundle.yml | 2 ++ gitian/descriptors/windows/gitian-bundle.yml | 2 ++ gitian/mkbundle-linux.sh | 3 ++- gitian/mkbundle-mac.sh | 3 ++- gitian/mkbundle-windows.sh | 3 ++- 6 files changed, 12 insertions(+), 3 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index 36c2efc..3fa79cc 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -31,6 +31,7 @@ files: - "pluggable-transports-linux32-gbuilt.zip" - "pluggable-transports-linux64-gbuilt.zip" - "torrc-defaults-appendix-linux" +- "bridge_prefs.js" - "relativelink-src.zip" - "linux-skeleton.zip" - "linux-langpacks.zip" @@ -106,6 +107,7 @@ script: | if [ $BUILD_PT_BUNDLES ]; then unzip ~/build/pluggable-transports-linux$GBUILD_BITS-gbuilt.zip cat ~/build/torrc-defaults-appendix-linux >> Data/Tor/torrc-defaults + cat ~/build/bridge_prefs.js >> Data/Browser/profile.default/preferences/extension-overrides.js fi chmod 700 Data/Browser chmod 700 Data/Tor diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index da7e918..63c0a96 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -33,6 +33,7 @@ files: - "tor-mac32-gbuilt.zip" - "pluggable-transports-mac32-gbuilt.zip" - "torrc-defaults-appendix-mac" +- "bridge_prefs.js" - "relativelink-src.zip" - "mac-skeleton.zip" - "mac-dmg.zip" @@ -125,6 +126,7 @@ script: | unzip ~/build/tbb-docs.zip if [ $BUILD_PT_BUNDLES ]; then cat ~/build/torrc-defaults-appendix-mac >> Data/Tor/torrc-defaults + cat ~/build/bridge_prefs.js >> Data/Browser/profile.default/preferences/extension-overrides.js fi # Install a "tor" shim that sets the working directory. See #10030. mv Tor/tor Tor/tor.real diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index 8cf2f05..c8b29c9 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -28,6 +28,7 @@ files: - "tor-win32-gbuilt.zip" - "pluggable-transports-win32-gbuilt.zip" - "torrc-defaults-appendix-windows" +- "bridge_prefs.js" - "relativelink-src.zip" - "windows-skeleton.zip" - "win32-langpacks.zip" @@ -108,6 +109,7 @@ script: | if [ $BUILD_PT_BUNDLES ]; then unzip ~/build/pluggable-transports-win32-gbuilt.zip cat ~/build/torrc-defaults-appendix-windows >> Data/Tor/torrc-defaults + cat ~/build/bridge_prefs.js >> Data/Browser/profile.default/preferences/extension-overrides.js fi cd .. # diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 34485ae..b4e635d 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -56,7 +56,8 @@ $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/relativelink-src.zip ./Rel cd ./Bundle-Data/ rm -f $GITIAN_DIR/inputs/tbb-docs.zip $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/tbb-docs.zip ./Docs/ -cp beta/linux/torrc-defaults-appendix $GITIAN_DIR/inputs/torrc-defaults-appendix-linux +cp PTConfigs/linux/torrc-defaults-appendix $GITIAN_DIR/inputs/torrc-defaults-appendix-linux +cp PTConfigs/bridge_prefs.js $GITIAN_DIR/inputs/ cd linux rm -f $GITIAN_DIR/inputs/linux-skeleton.zip diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index d6bffce..18e0f8a 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -56,7 +56,8 @@ $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/relativelink-src.zip ./Rel cd ./Bundle-Data/ rm -f $GITIAN_DIR/inputs/tbb-docs.zip $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/tbb-docs.zip ./Docs/ -cp beta/mac/torrc-defaults-appendix $GITIAN_DIR/inputs/torrc-defaults-appendix-mac +cp PTConfigs/mac/torrc-defaults-appendix $GITIAN_DIR/inputs/torrc-defaults-appendix-mac +cp PTConfigs/bridge_prefs.js $GITIAN_DIR/inputs/ cp mac-tor.sh $GITIAN_DIR/inputs/ cd mac diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 037b031..7ab0aa6 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -58,7 +58,8 @@ $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/relativelink-src.zip ./Rel cd ./Bundle-Data/ rm -f $GITIAN_DIR/inputs/tbb-docs.zip $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/tbb-docs.zip ./Docs/ -cp beta/windows/torrc-defaults-appendix $GITIAN_DIR/inputs/torrc-defaults-appendix-windows +cp PTConfigs/windows/torrc-defaults-appendix $GITIAN_DIR/inputs/torrc-defaults-appendix-windows +cp PTConfigs/bridge_prefs.js $GITIAN_DIR/inputs/ cd windows rm -f $GITIAN_DIR/inputs/windows-skeleton.zip

1 0

[tor-browser-bundle/master] Rename 'beta' to PTConfigs.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit f8e7d91b4ed2e2d8f263b8b9898ce31ac28abfba Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Feb 28 10:04:36 2014 -0800 Rename 'beta' to PTConfigs. --- Bundle-Data/PTConfigs/bridge_prefs.js | 15 +++++++++++++++ Bundle-Data/PTConfigs/linux/torrc-defaults-appendix | 11 +++++++++++ Bundle-Data/PTConfigs/mac/torrc-defaults-appendix | 12 ++++++++++++ Bundle-Data/PTConfigs/windows/torrc-defaults-appendix | 12 ++++++++++++ Bundle-Data/beta/bridge_prefs.js | 15 --------------- Bundle-Data/beta/linux/torrc-defaults-appendix | 11 ----------- Bundle-Data/beta/mac/torrc-defaults-appendix | 12 ------------ Bundle-Data/beta/windows/torrc-defaults-appendix | 12 ------------ 8 files changed, 50 insertions(+), 50 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js new file mode 100644 index 0000000..e3d6b69 --- /dev/null +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -0,0 +1,15 @@ +# Tor Launcher preferences (default bridges): +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.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.flashproxy.1", "flashproxy 0.0.1.0:1"); + +pref("extensions.torlauncher.default_bridge.fte.1", "fte bridges.fteproxy.org:8080"); diff --git a/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix b/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix new file mode 100644 index 0000000..d0f621e --- /dev/null +++ b/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix @@ -0,0 +1,11 @@ +## fteproxy configuration +ClientTransportPlugin fte exec ./Tor/PluggableTransports/fteproxy --managed + +## obfsproxy configuration +ClientTransportPlugin obfs2,obfs3 exec ./Tor/PluggableTransports/obfsproxy.bin managed +## flash proxy configuration +# +# Change the second number here (9000) to the number of a port that can +# receive connections from the Internet (the port for which you +# configured port forwarding). +ClientTransportPlugin flashproxy exec ./Tor/PluggableTransports/flashproxy-client --register :0 :9000 diff --git a/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix b/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix new file mode 100644 index 0000000..e1ada73 --- /dev/null +++ b/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix @@ -0,0 +1,12 @@ +## fteproxy configuration +ClientTransportPlugin fte exec PluggableTransports/fteproxy --managed + +## obfsproxy configuration +ClientTransportPlugin obfs2,obfs3 exec PluggableTransports/obfsproxy.bin managed + +## flash proxy configuration +# +# Change the second number here (9000) to the number of a port that can +# receive connections from the Internet (the port for which you +# configured port forwarding). +ClientTransportPlugin flashproxy exec PluggableTransports/flashproxy-client --register :0 :9000 diff --git a/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix b/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix new file mode 100644 index 0000000..049d2ff --- /dev/null +++ b/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix @@ -0,0 +1,12 @@ +## fteproxy configuration +ClientTransportPlugin fte exec Tor\PluggableTransports\fteproxy --managed + +## obfsproxy configuration +ClientTransportPlugin obfs2,obfs3 exec Tor\PluggableTransports\obfsproxy managed + +## flash proxy configuration +# +# Change the second number here (9000) to the number of a port that can +# receive connections from the Internet (the port for which you +# configured port forwarding). +ClientTransportPlugin flashproxy exec Tor\PluggableTransports\flashproxy-client --register :0 :9000 diff --git a/Bundle-Data/beta/bridge_prefs.js b/Bundle-Data/beta/bridge_prefs.js deleted file mode 100644 index e3d6b69..0000000 --- a/Bundle-Data/beta/bridge_prefs.js +++ /dev/null @@ -1,15 +0,0 @@ -# Tor Launcher preferences (default bridges): -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.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.flashproxy.1", "flashproxy 0.0.1.0:1"); - -pref("extensions.torlauncher.default_bridge.fte.1", "fte bridges.fteproxy.org:8080"); diff --git a/Bundle-Data/beta/linux/torrc-defaults-appendix b/Bundle-Data/beta/linux/torrc-defaults-appendix deleted file mode 100644 index d0f621e..0000000 --- a/Bundle-Data/beta/linux/torrc-defaults-appendix +++ /dev/null @@ -1,11 +0,0 @@ -## fteproxy configuration -ClientTransportPlugin fte exec ./Tor/PluggableTransports/fteproxy --managed - -## obfsproxy configuration -ClientTransportPlugin obfs2,obfs3 exec ./Tor/PluggableTransports/obfsproxy.bin managed -## flash proxy configuration -# -# Change the second number here (9000) to the number of a port that can -# receive connections from the Internet (the port for which you -# configured port forwarding). -ClientTransportPlugin flashproxy exec ./Tor/PluggableTransports/flashproxy-client --register :0 :9000 diff --git a/Bundle-Data/beta/mac/torrc-defaults-appendix b/Bundle-Data/beta/mac/torrc-defaults-appendix deleted file mode 100644 index e1ada73..0000000 --- a/Bundle-Data/beta/mac/torrc-defaults-appendix +++ /dev/null @@ -1,12 +0,0 @@ -## fteproxy configuration -ClientTransportPlugin fte exec PluggableTransports/fteproxy --managed - -## obfsproxy configuration -ClientTransportPlugin obfs2,obfs3 exec PluggableTransports/obfsproxy.bin managed - -## flash proxy configuration -# -# Change the second number here (9000) to the number of a port that can -# receive connections from the Internet (the port for which you -# configured port forwarding). -ClientTransportPlugin flashproxy exec PluggableTransports/flashproxy-client --register :0 :9000 diff --git a/Bundle-Data/beta/windows/torrc-defaults-appendix b/Bundle-Data/beta/windows/torrc-defaults-appendix deleted file mode 100644 index 049d2ff..0000000 --- a/Bundle-Data/beta/windows/torrc-defaults-appendix +++ /dev/null @@ -1,12 +0,0 @@ -## fteproxy configuration -ClientTransportPlugin fte exec Tor\PluggableTransports\fteproxy --managed - -## obfsproxy configuration -ClientTransportPlugin obfs2,obfs3 exec Tor\PluggableTransports\obfsproxy managed - -## flash proxy configuration -# -# Change the second number here (9000) to the number of a port that can -# receive connections from the Internet (the port for which you -# configured port forwarding). -ClientTransportPlugin flashproxy exec Tor\PluggableTransports\flashproxy-client --register :0 :9000

1 0

[tor-browser-bundle/master] Remove a diff file.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit ec7da09f018252ff92d3728eb22e27e0934f83d1 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Feb 28 05:25:35 2014 -0800 Remove a diff file. It got added during a conflict resolution that got squashed. --- gitian/versions.diff | 45 --------------------------------------------- 1 file changed, 45 deletions(-) diff --git a/gitian/versions.diff b/gitian/versions.diff deleted file mode 100644 index 69001a8..0000000 --- a/gitian/versions.diff +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/gitian/versions.nightly b/gitian/versions.nightly -index b9b5835..f3dfe9d 100755 ---- a/gitian/versions.nightly -+++ b/gitian/versions.nightly -@@ -12,13 +12,14 @@ NSIS_TAG=v0.1 - ZLIB_TAG=v1.2.8 - LIBEVENT_TAG=release-2.0.21-stable - MINGW_REV=6184 --PYPTLIB_TAG=pyptlib-0.0.4 --OBFSPROXY_TAG=obfsproxy-0.2.3 -+PYPTLIB_TAG=pyptlib-0.0.5 -+OBFSPROXY_TAG=obfsproxy-0.2.4 - FLASHPROXY_TAG=1.6 - - GITIAN_TAG=tor-browser-builder-3.0-4 - - OPENSSL_VER=1.0.1f -+GMP_VER=5.1.3 - FIREFOX_LANG_VER=24.3.0esr - BINUTILS_VER=2.22 - GCC_VER=4.6.3 -@@ -33,6 +34,7 @@ SETUPTOOLS_VER=1.4 - - ## File names for the source packages - OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz -+GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 - NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.13-fn+sm+fx.xpi - TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz - OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb -@@ -52,6 +54,7 @@ SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz - - # Hashes for packages with weak sigs or no sigs - OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a -+GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 - OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc - TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 - NOSCRIPT_HASH=0d90f283ee9e3be5bb1ebc315fab12994ff5a15380bd3a2fdff62750286b4ea1 -@@ -67,6 +70,7 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 - - ## Non-git package URLs - OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} -+GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} - TOOLCHAIN4_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${T… - OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… - BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE}

1 0

[tor-browser-bundle/master] Specify a tag for fteproxy for all builds.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit d4470583ce2d681589e1f56b73fbbef83c3510be Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Feb 28 09:39:48 2014 -0800 Specify a tag for fteproxy for all builds. --- gitian/versions | 1 + gitian/versions.alpha | 1 + gitian/versions.nightly | 1 + 3 files changed, 3 insertions(+) diff --git a/gitian/versions b/gitian/versions index 389e3e1..11eb1db 100755 --- a/gitian/versions +++ b/gitian/versions @@ -15,6 +15,7 @@ MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.5 OBFSPROXY_TAG=obfsproxy-0.2.4 FLASHPROXY_TAG=1.6 +FTEPROXY_TAG=0.2.6 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.x-5 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index f190d5a..b6ee2c2 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -15,6 +15,7 @@ MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.5 OBFSPROXY_TAG=obfsproxy-0.2.4 FLASHPROXY_TAG=1.6 +FTEPROXY_TAG=0.2.6 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.x-5 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 0c7f50d..436536e 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -15,6 +15,7 @@ MINGW_REV=6184 PYPTLIB_TAG=master OBFSPROXY_TAG=master FLASHPROXY_TAG=master +FTEPROXY_TAG=master LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.x-5

1 0

[tor-browser-bundle/master] Bug 9353: Fix ibus issues on some Linux systems.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit c05c7728ef352e598750993190b76485addc26a2 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Feb 28 09:55:55 2014 +0000 Bug 9353: Fix ibus issues on some Linux systems. --- RelativeLink/RelativeLink.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/RelativeLink/RelativeLink.sh b/RelativeLink/RelativeLink.sh index 9bab08c..0d25a28 100755 --- a/RelativeLink/RelativeLink.sh +++ b/RelativeLink/RelativeLink.sh @@ -189,6 +189,13 @@ fi mydir="`dirname "$myname"`" test -d "$mydir" && cd "$mydir" +# This is a fix for an ibus issue on some Linux systems. See #9353 for more +# details. The symlink needs to be created before we change HOME. +if [ ! -d ".config/ibus" ]; then + mkdir -p .config/ibus + ln -nsf ~/.config/ibus/bus .config/ibus +fi + # If ${PWD} results in a zero length HOME, we can try something else... if [ ! "${PWD}" ]; then # "hacking around some braindamage"

1 0

[tor-browser-bundle/master] Put the "Tor" subdirectory at the head of PATH for DLL access.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit fadb9d2edb3ded8b66e7b2da3182bf78af329339 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Feb 20 19:15:17 2014 +0000 Put the "Tor" subdirectory at the head of PATH for DLL access. Pluggable transport executables are in their own subdirectory, PluggableTransports, but they need to have access to the OpenSSL DLLs. Adding the directory containing the DLLs to PATH makes them visible. I put the directory at the front of PATH and not the end, just in case there is a libeay32.dll or ssleay32.dll somewhere else on the system. https://trac.torproject.org/projects/tor/ticket/10845 --- RelativeLink/RelativeLink.c | 123 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 120 insertions(+), 3 deletions(-) diff --git a/RelativeLink/RelativeLink.c b/RelativeLink/RelativeLink.c index bae4647..9a6c9f5 100755 --- a/RelativeLink/RelativeLink.c +++ b/RelativeLink/RelativeLink.c @@ -1,4 +1,6 @@ #include <windows.h> +#include <stdio.h> +#include <tchar.h> // // RelativeLink.c @@ -22,8 +24,119 @@ // Put it in the proper place. // -int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) +// Get the absolute path to a subdirectory of the current directory; i.e. +// "C:\cwd\reldir". Returns a malloc-allocated string or NULL on error. +LPTSTR GetSubdirectory(LPCTSTR reldir) +{ + DWORD bufsize, n; + int len; + LPTSTR cwd, subdir; + + cwd = NULL; + subdir = NULL; + + // The first call to GetCurrentDirectory gets the buffer size; the second + // fills the buffer. + bufsize = GetCurrentDirectory(0, NULL); + if (bufsize == 0) + goto bail; + cwd = (LPTSTR) malloc(bufsize * sizeof(TCHAR)); + if (cwd == NULL) + goto bail; + n = GetCurrentDirectory(bufsize, cwd); + if (n == 0 || n >= bufsize) + goto bail; + + bufsize = _tcslen(cwd) + 1 + _tcslen(reldir) + 1; + subdir = (LPTSTR) malloc(bufsize * sizeof(TCHAR)); + if (subdir == NULL) + goto bail; + len = _sntprintf(subdir, bufsize, "%s\\%s", cwd, reldir); + if (len < 0 || (DWORD) len >= bufsize) + goto bail; + + free(cwd); + return subdir; + +bail: + if (cwd != NULL) + free(cwd); + if (subdir != NULL) + free(subdir); + return NULL; +} + +// Add a directory to the beginning of the PATH environment variable. Returns 0 +// on failure, nonzero on success. +// http://msdn.microsoft.com/en-us/library/windows/desktop/ms682009%28v=vs.85%… +DWORD PrependToPath(LPCTSTR dir) +{ + DWORD bufsize, n, rc, err; + int len; + LPTSTR path, value; + + path = NULL; + value = NULL; + + // First find out how big a buffer we need. + bufsize = GetEnvironmentVariable(TEXT ("PATH"), NULL, 0); + if (bufsize == 0) + { + err = GetLastError(); + if (err == ERROR_ENVVAR_NOT_FOUND) + // If the variable doesn't yet exist, just set it and return. + return SetEnvironmentVariable(TEXT ("PATH"), dir); + else + goto bail; + } + // Now that we know the buffer size, get the value. + path = (LPTSTR) malloc(bufsize * sizeof(TCHAR)); + if (path == NULL) + goto bail; + n = GetEnvironmentVariable(TEXT ("PATH"), path, bufsize); + if (n == 0 || n >= bufsize) + goto bail; + + bufsize = _tcslen(dir) + 1 + _tcslen(path) + 1; + value = (LPTSTR) malloc(bufsize * sizeof(TCHAR)); + if (value == NULL) + goto bail; + len = _sntprintf(value, bufsize, "%s;%s", dir, path); + if (len < 0 || (DWORD) len >= bufsize) + goto bail; + + rc = SetEnvironmentVariable(TEXT ("PATH"), value); + if (rc == 0) + goto bail; + + free(path); + free(value); + return 1; + +bail: + if (path != NULL) + free(path); + if (value != NULL) + free(value); + return 0; +} + +// Returns 0 on failure and nonzero on success. +DWORD StartTorBrowser(void) { + TCHAR *TorDir; + DWORD rc; + // Put the Tor subdirectory at the beginning of PATH so that pluggable + // transports (in their own subdirectory) can access DLLs. + // https://trac.torproject.org/projects/tor/ticket/10845 + TorDir = GetSubdirectory(TEXT ("Tor")); + if (TorDir == NULL) + return 0; + rc = PrependToPath(TorDir); + free(TorDir); + if (rc == 0) + return 0; + STARTUPINFO si; PROCESS_INFORMATION pi; @@ -34,8 +147,12 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine TCHAR *ProgramToStart; ProgramToStart = TEXT ("Browser\\firefox.exe -no-remote -profile .\\Data\\Browser\\profile.default\\"); - if( !CreateProcess( - NULL, ProgramToStart, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi )) + return CreateProcess( NULL, ProgramToStart, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ); +} + +int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) +{ + if (!StartTorBrowser()) { MessageBox ( NULL, TEXT ("Unable to start Tor Browser"), NULL, MB_OK); return -1;

1 0

[tor-browser-bundle/master] Use versions file itself to decide which locales to build.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit 3618f8600080f675a4592c5a7667c349bb3364a2 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 27 21:53:10 2014 -0800 Use versions file itself to decide which locales to build. --- gitian/descriptors/linux/gitian-bundle.yml | 6 +++--- gitian/descriptors/windows/gitian-bundle.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index 958fb65..36c2efc 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -134,11 +134,11 @@ script: | # unzip linux-langpacks.zip cd linux-langpacks - for i in *.xpi + for LANG in $BUNDLE_LOCALES do - LANG=`basename $i .xpi` + xpi=$LANG.xpi cp -a ../tor-browser ../tor-browser_$LANG - cp $i ../tor-browser_$LANG/Data/Browser/profile.default/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi + 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: diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index f8e6d1b..8cf2f05 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -131,10 +131,10 @@ script: | # unzip ../win32-langpacks.zip cd win32-langpacks - for i in *.xpi + for LANG in $BUNDLE_LOCALES do - LANG=`basename $i .xpi` - cp $i ../"Tor Browser"/Data/Browser/profile.default/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi + xpi=$LANG.xpi + 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:

1 0

[tor-browser-bundle/master] Bug #10104: Use new rebased gitian checkout.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit 014725628fdb30d612c5276581eb70202d1d1c59 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Feb 26 12:56:47 2014 -0800 Bug #10104: Use new rebased gitian checkout. Should fix LXC builds. --- 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 a29a4ba..389e3e1 100755 --- a/gitian/versions +++ b/gitian/versions @@ -17,7 +17,7 @@ OBFSPROXY_TAG=obfsproxy-0.2.4 FLASHPROXY_TAG=1.6 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 -GITIAN_TAG=tor-browser-builder-3.0-4 +GITIAN_TAG=tor-browser-builder-3.x-5 OPENSSL_VER=1.0.1f GMP_VER=5.1.3 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 55efa38..87b68ca 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -17,7 +17,7 @@ OBFSPROXY_TAG=obfsproxy-0.2.4 FLASHPROXY_TAG=1.6 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 -GITIAN_TAG=tor-browser-builder-3.0-4 +GITIAN_TAG=tor-browser-builder-3.x-5 OPENSSL_VER=1.0.1f GMP_VER=5.1.3 diff --git a/gitian/versions.beta b/gitian/versions.beta index 241e855..d68854a 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -19,7 +19,7 @@ FLASHPROXY_TAG=1.6 FTEPROXY_TAG=0.2.6 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 -GITIAN_TAG=tor-browser-builder-3.0-4 +GITIAN_TAG=tor-browser-builder-3.x-5 OPENSSL_VER=1.0.1f GMP_VER=5.1.3 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 5a8fcd0..0c7f50d 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -17,7 +17,7 @@ OBFSPROXY_TAG=master FLASHPROXY_TAG=master LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 -GITIAN_TAG=tor-browser-builder-3.0-4 +GITIAN_TAG=tor-browser-builder-3.x-5 OPENSSL_VER=1.0.1f GMP_VER=5.1.3

1 0

[tor-browser-bundle/master] Bump versions for Tor Launcher.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit fb91914f6901509eab2daaa11b607a789646393d Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 27 21:46:23 2014 -0800 Bump versions for Tor Launcher. --- gitian/versions.alpha | 2 +- gitian/versions.beta | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 87b68ca..f190d5a 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -5,7 +5,7 @@ VERIFY_TAGS=1 TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-3-build2 TOR_TAG=tor-0.2.5.1-alpha -TORLAUNCHER_TAG=0.2.4.4 +TORLAUNCHER_TAG=0.2.5.0 TORBUTTON_TAG=1.6.6.0 HTTPSE_TAG=3.4.5 NSIS_TAG=v0.1 diff --git a/gitian/versions.beta b/gitian/versions.beta index d68854a..a2c91b9 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -1,4 +1,4 @@ -TORBROWSER_VERSION=3.6-beta-2 +TORBROWSER_VERSION=3.6-beta-1 BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" BUILD_PT_BUNDLES=1 @@ -6,7 +6,7 @@ VERIFY_TAGS=1 TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-3-build2 TOR_TAG=tor-0.2.4.20 -TORLAUNCHER_TAG=0.2.4.4 +TORLAUNCHER_TAG=0.2.5.0 TORBUTTON_TAG=1.6.6.0 HTTPSE_TAG=3.4.5 NSIS_TAG=v0.1

1 0

[tor-browser-bundle/master] Bug #4261: Generate DMGs for MacOS.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit 535c7ebbdcdc0c5def8ec640e2f8626fb7396f78 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Feb 26 10:45:24 2014 -0800 Bug #4261: Generate DMGs for MacOS. Compressed with bzip2 (UDBZ) and complete with a background and desktop shortcut! --- Bundle-Data/mac.dmg/.DS_Store | Bin 0 -> 12292 bytes Bundle-Data/mac.dmg/._Desktop | Bin 0 -> 303592 bytes Bundle-Data/mac.dmg/.background/background.png | Bin 0 -> 50020 bytes Bundle-Data/mac.dmg/Desktop | Bin 0 -> 300120 bytes gitian/build-helpers/ddmg.sh | 28 ++++++ gitian/descriptors/mac/gitian-bundle.yml | 108 ++++++++++++++++-------- gitian/fetch-inputs.sh | 1 + gitian/mkbundle-mac.sh | 7 +- gitian/versions | 1 + gitian/versions.alpha | 1 + gitian/versions.beta | 1 + gitian/versions.diff | 45 ++++++++++ gitian/versions.nightly | 1 + 13 files changed, 156 insertions(+), 37 deletions(-) diff --git a/Bundle-Data/mac.dmg/.DS_Store b/Bundle-Data/mac.dmg/.DS_Store new file mode 100644 index 0000000..9bec18c Binary files /dev/null and b/Bundle-Data/mac.dmg/.DS_Store differ diff --git a/Bundle-Data/mac.dmg/._Desktop b/Bundle-Data/mac.dmg/._Desktop new file mode 100644 index 0000000..a1e0b7f Binary files /dev/null and b/Bundle-Data/mac.dmg/._Desktop differ diff --git a/Bundle-Data/mac.dmg/.background/background.png b/Bundle-Data/mac.dmg/.background/background.png new file mode 100644 index 0000000..94e4584 Binary files /dev/null and b/Bundle-Data/mac.dmg/.background/background.png differ diff --git a/Bundle-Data/mac.dmg/Desktop b/Bundle-Data/mac.dmg/Desktop new file mode 100644 index 0000000..3c88450 Binary files /dev/null and b/Bundle-Data/mac.dmg/Desktop differ diff --git a/gitian/build-helpers/ddmg.sh b/gitian/build-helpers/ddmg.sh new file mode 100755 index 0000000..f9f54da --- /dev/null +++ b/gitian/build-helpers/ddmg.sh @@ -0,0 +1,28 @@ +#!/bin/sh +# Crappy deterministic dmg wrapper +export LC_ALL=C + +DMGFILE=$1 +shift + +# Attempt to normalize inode ordering.. +# XXX: the genisoimage -path-list argument seems broken +mkdir -p ~/build/tmp/dmg +cd $@ +for i in `find . | sort` +do + if [ -d $i ]; + then + mkdir -p ~/build/tmp/dmg/$i + else + cp --parents -d --preserve=all $i ~/build/tmp/dmg/ + fi +done + +find ~/build/tmp/dmg -executable -exec chmod 700 {} \; +find ~/build/tmp/dmg ! -executable -exec chmod 600 {} \; + +genisoimage -D -V "Tor Browser" -no-pad -R -apple -o tbb-uncompressed.dmg ~/build/tmp/dmg/ +~/build/libdmg-hfsplus/dmg/dmg dmg tbb-uncompressed.dmg $DMGFILE +rm tbb-uncompressed.dmg +rm -rf ~/build/tmp/dmg/ diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index 428dbee..da7e918 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -12,6 +12,11 @@ packages: - "nsis" - "faketime" - "python" +- "hfsprogs" +- "genisoimage" +- "cmake" +- "zlib1g-dev" +- "libbz2-dev" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor-launcher.git" @@ -20,6 +25,8 @@ remotes: "dir": "torbutton" - "url": "https://git.torproject.org/https-everywhere.git" "dir": "https-everywhere" +- "url": "https://github.com/vasi/libdmg-hfsplus.git" + "dir": "libdmg-hfsplus" files: # TODO: Can we use an env for this file+version?? - "tor-browser-mac32-gbuilt.zip" @@ -28,9 +35,11 @@ files: - "torrc-defaults-appendix-mac" - "relativelink-src.zip" - "mac-skeleton.zip" +- "mac-dmg.zip" - "mac-langpacks.zip" - "noscript(a)noscript.net.xpi" - "dzip.sh" +- "ddmg.sh" - "bare-version" - "bundle.inputs" - "versions" @@ -46,12 +55,20 @@ script: | export TORBROWSER_VERSION=`cat bare-version` export LC_ALL=C umask 0022 + if [ ${TORBROWSER_VERSION::3} == "3.5" ]; then + export TORBROWSER_APP="TorBrowserBundle" + export TORBROWSER_NAME="TorBrowserBundle" + else + export TORBROWSER_APP="TorBrowser" + export TORBROWSER_NAME="TorBrowserBundle" + fi # mkdir -p $OUTDIR/ - mkdir -p TorBrowserBundle.app/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org - mkdir -p TorBrowserBundle.app/Data/Browser/Caches - mkdir -p TorBrowserBundle.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/ - mkdir -p TorBrowserBundle.app/Docs/sources + 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 # cd tor-launcher make clean @@ -62,7 +79,7 @@ script: | unzip ../*.xpi rm ../*.xpi ~/build/dzip.sh ../tor-launcher(a)torproject.org.xpi . - mv ../tor-launcher(a)torproject.org.xpi ../../../TorBrowserBundle.app/Data/Browser/profile.default/extensions/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 cd ../../../ # cd torbutton @@ -74,7 +91,7 @@ script: | unzip ../*.xpi rm ../*.xpi ~/build/dzip.sh ../torbutton(a)torproject.org.xpi . - mv ../torbutton(a)torproject.org.xpi ../../../TorBrowserBundle.app/Data/Browser/profile.default/extensions/torbutton(a)torproject.org.xpi + mv ../torbutton(a)torproject.org.xpi ../../../$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/torbutton(a)torproject.org.xpi cd ../../../ # cd https-everywhere @@ -82,11 +99,11 @@ script: | # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 rm -f .git/refs/heads/master ./makexpi.sh - cp ./pkg/*.xpi ../TorBrowserBundle.app/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi + cp ./pkg/*.xpi ../$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi cd .. # - cp *.xpi ./TorBrowserBundle.app/Data/Browser/profile.default/extensions/ - cd ./TorBrowserBundle.app/Data/Browser/profile.default/extensions/ + cp *.xpi ./$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 @@ -95,14 +112,14 @@ script: | # unzip relativelink-src.zip cd RelativeLink - cp RelativeLinkOSX.sh ../TorBrowserBundle.app/Contents/MacOS/TorBrowserBundle + cp RelativeLinkOSX.sh ../$TORBROWSER_NAME.app/Contents/MacOS/TorBrowserBundle cd .. # unzip ~/build/tor-mac$GBUILD_BITS-gbuilt.zip if [ $BUILD_PT_BUNDLES ]; then unzip ~/build/pluggable-transports-mac$GBUILD_BITS-gbuilt.zip fi - cd TorBrowserBundle.app + cd $TORBROWSER_NAME.app unzip ~/build/mac-skeleton.zip sed -i -e "s/TORBROWSER_VERSION/$TORBROWSER_VERSION/" Contents/Info.plist unzip ~/build/tbb-docs.zip @@ -117,40 +134,54 @@ script: | cd ../../../ # # Copy reproducibility info - cp versions TorBrowserBundle.app/Docs/sources/ - cp bundle.inputs TorBrowserBundle.app/Docs/sources/bundle.inputs + cp versions $TORBROWSER_NAME.app/Docs/sources/ + cp bundle.inputs $TORBROWSER_NAME.app/Docs/sources/bundle.inputs # - # FF24 puts the prefs in a different jar: - if [ -f TorBrowserBundle.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/browser/omni.ja ]; then - pushd TorBrowserBundle.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/browser/ - else - pushd TorBrowserBundle.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/ - fi + # Set up DMG skeleton + cd libdmg-hfsplus + cmake CMakeLists.txt + cd dmg + make + cd ../../ + cd dmg + unzip ~/build/mac-dmg.zip + 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/ echo "pref(\"general.useragent.locale\", \"en-US\");" >> defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js popd - # XXX: DMG plz - cp -a TorBrowserBundle.app TorBrowserBundle_en-US.app - ~/build/dzip.sh $OUTDIR/TorBrowserBundle-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_en-US.zip TorBrowserBundle_en-US.app - rm -rf TorBrowserBundle_en-US.app + # + if [ ${TORBROWSER_VERSION::3} == "3.5" ]; then + 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 + else + 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 + fi + mv $TORBROWSER_NAME.app ${TORBROWSER_NAME}_plain.app # unzip mac-langpacks.zip cd mac-langpacks - for i in *.xpi + for LANG in $BUNDLE_LOCALES do - LANG=`basename $i .xpi` - cp -a ../TorBrowserBundle.app ../TorBrowserBundle_$LANG.app - cp $i ../TorBrowserBundle_$LANG.app/Data/Browser/profile.default/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi - cd .. - - # FF24 puts the prefs in a different jar: - if [ -f TorBrowserBundle_$LANG.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/browser/omni.ja ]; then - pushd TorBrowserBundle_$LANG.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/browser/ + xpi=$LANG.xpi + if [ ${TORBROWSER_VERSION::3} == "3.5" ]; then + DEST=${TORBROWSER_APP}_$LANG else - pushd TorBrowserBundle_$LANG.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/ + DEST=$TORBROWSER_APP fi + cp -a ../${TORBROWSER_NAME}_plain.app ~/build/dmg/$DEST.app + 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 @@ -158,8 +189,15 @@ script: | zip -Xm omni.ja defaults/preferences/000-tor-browser.js popd - ~/build/dzip.sh $OUTDIR/TorBrowserBundle-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_$LANG.zip TorBrowserBundle_$LANG.app - rm -rf TorBrowserBundle_$LANG.app + if [ ${TORBROWSER_VERSION::3} == "3.5" ]; then + pushd ~/build/dmg/ + ~/build/dzip.sh $OUTDIR/TorBrowserBundle-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_$LANG.zip $DEST.app + rm -rf TorBrowserBundle_$LANG.app + popd + else + ~/build/ddmg.sh $OUTDIR/TorBrowser-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_$LANG.dmg ~/build/dmg/ + rm -rf ~/build/dmg/$DEST.app + fi cd mac-langpacks done cd .. diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index d757f4d..c2bf811 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -292,6 +292,7 @@ pyptlib https://git.torproject.org/pluggable-transports/pyptlib.gi obfsproxy https://git.torproject.org/pluggable-transports/obfsproxy.git flashproxy https://git.torproject.org/flashproxy.git fteproxy https://github.com/kpdyer/fteproxy.git +libdmg-hfsplus https://github.com/vasi/libdmg-hfsplus.git $LIBDMG_TAG EOF exit 0 diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index e8b3aa1..d6bffce 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -62,6 +62,9 @@ cp mac-tor.sh $GITIAN_DIR/inputs/ cd mac rm -f $GITIAN_DIR/inputs/mac-skeleton.zip $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/mac-skeleton.zip . +cd ../mac.dmg +rm -f $GITIAN_DIR/inputs/mac-dmg.zip +$WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/mac-dmg.zip . cd $WRAPPER_DIR @@ -155,7 +158,7 @@ then cd $WRAPPER_DIR && ./record-inputs.sh $VERSIONS_FILE && cd $GITIAN_DIR - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit https-everywhere=$HTTPSE_TAG,torbutton=$TORBUTTON_TAG,tor-launcher=$TORLAUNCHER_TAG $DESCRIPTOR_DIR/mac/gitian-bundle.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit libdmg-hfsplus=$LIBDMG_TAG,https-everywhere=$HTTPSE_TAG,torbutton=$TORBUTTON_TAG,tor-launcher=$TORLAUNCHER_TAG $DESCRIPTOR_DIR/mac/gitian-bundle.yml if [ $? -ne 0 ]; then #mv var/build.log ./bundle-fail-mac.log.`date +%Y%m%d%H%M%S` @@ -164,7 +167,7 @@ then #cp -a build/out/*.dmg $WRAPPER_DIR mkdir -p $WRAPPER_DIR/$TORBROWSER_VERSION/ - cp -a build/out/*.zip $WRAPPER_DIR/$TORBROWSER_VERSION/ || exit 1 + cp -a build/out/* $WRAPPER_DIR/$TORBROWSER_VERSION/ || exit 1 touch $GITIAN_DIR/inputs/bundle-mac.gbuilt else echo diff --git a/gitian/versions b/gitian/versions index f3dfe9d..a29a4ba 100755 --- a/gitian/versions +++ b/gitian/versions @@ -15,6 +15,7 @@ MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.5 OBFSPROXY_TAG=obfsproxy-0.2.4 FLASHPROXY_TAG=1.6 +LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.0-4 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 0741b8f..55efa38 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -15,6 +15,7 @@ MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.5 OBFSPROXY_TAG=obfsproxy-0.2.4 FLASHPROXY_TAG=1.6 +LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.0-4 diff --git a/gitian/versions.beta b/gitian/versions.beta index 6ac5a34..241e855 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -17,6 +17,7 @@ PYPTLIB_TAG=pyptlib-0.0.5 OBFSPROXY_TAG=obfsproxy-0.2.4 FLASHPROXY_TAG=1.6 FTEPROXY_TAG=0.2.6 +LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.0-4 diff --git a/gitian/versions.diff b/gitian/versions.diff new file mode 100644 index 0000000..69001a8 --- /dev/null +++ b/gitian/versions.diff @@ -0,0 +1,45 @@ +diff --git a/gitian/versions.nightly b/gitian/versions.nightly +index b9b5835..f3dfe9d 100755 +--- a/gitian/versions.nightly ++++ b/gitian/versions.nightly +@@ -12,13 +12,14 @@ NSIS_TAG=v0.1 + ZLIB_TAG=v1.2.8 + LIBEVENT_TAG=release-2.0.21-stable + MINGW_REV=6184 +-PYPTLIB_TAG=pyptlib-0.0.4 +-OBFSPROXY_TAG=obfsproxy-0.2.3 ++PYPTLIB_TAG=pyptlib-0.0.5 ++OBFSPROXY_TAG=obfsproxy-0.2.4 + FLASHPROXY_TAG=1.6 + + GITIAN_TAG=tor-browser-builder-3.0-4 + + OPENSSL_VER=1.0.1f ++GMP_VER=5.1.3 + FIREFOX_LANG_VER=24.3.0esr + BINUTILS_VER=2.22 + GCC_VER=4.6.3 +@@ -33,6 +34,7 @@ SETUPTOOLS_VER=1.4 + + ## File names for the source packages + OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz ++GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 + NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.13-fn+sm+fx.xpi + TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz + OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb +@@ -52,6 +54,7 @@ SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz + + # Hashes for packages with weak sigs or no sigs + OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a ++GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 + OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc + TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 + NOSCRIPT_HASH=0d90f283ee9e3be5bb1ebc315fab12994ff5a15380bd3a2fdff62750286b4ea1 +@@ -67,6 +70,7 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 + + ## Non-git package URLs + OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} ++GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} + TOOLCHAIN4_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${T… + OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… + BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 5e6bc6f..5a8fcd0 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -15,6 +15,7 @@ MINGW_REV=6184 PYPTLIB_TAG=master OBFSPROXY_TAG=master FLASHPROXY_TAG=master +LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.0-4

1 0