- tbb-commits - lists.torproject.org

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

17 Apr '14

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

1 0

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

17 Apr '14

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

1 0

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

17 Apr '14

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

1 0

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

17 Apr '14

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

1 0

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

17 Apr '14

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

1 0

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

17 Apr '14

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

1 0

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

17 Apr '14

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

1 0

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

17 Apr '14

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

1 0

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

15 Apr '14

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

1 0

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

14 Apr '14

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

1 0