- tbb-commits - lists.torproject.org

[tor-browser-bundle/hardened-builds] Pick up a new tor tag
by gk＠torproject.org 23 Jan '17

23 Jan '17

commit 249596f03de46d395efcbbcbcf4608a6abf99475 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jan 23 16:11:27 2017 +0000 Pick up a new tor tag --- Bundle-Data/Docs/ChangeLog.txt | 2 +- gitian/versions.alpha | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 3a3e1b6..f349311 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,7 +1,7 @@ Tor Browser 7.0a1-hardened -- January 25 2017 * All Platforms * Update Firefox to 45.7.0esr - * Tor to 0.3.0.1-alpha + * Tor to 0.3.0.2-alpha * Update Torbutton to 1.9.7 * Bug 19898: Use DuckDuckGo on about:tor * Bug 21091: Hide the update check menu entry when running under the sandbox diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 7d1e8b3..aaacef9 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -19,7 +19,7 @@ FIREFOX_VERSION=45.7.0esr TORBROWSER_UPDATE_CHANNEL=hardened TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.0-1-build1 -TOR_TAG=tor-0.3.0.1-alpha +TOR_TAG=tor-0.3.0.2-alpha TORLAUNCHER_TAG=0.2.11.1 TORBUTTON_TAG=1.9.7 HTTPSE_TAG=5.2.9

1 0

[tor-browser-bundle/master] Pick a up new tor tag
by gk＠torproject.org 23 Jan '17

23 Jan '17

commit 7d2a4011f7af5f8d5ff3b521fef75e74fbb32ec5 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jan 23 16:08:35 2017 +0000 Pick a up new tor tag --- Bundle-Data/Docs/ChangeLog.txt | 2 +- gitian/versions.alpha | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index fc60c5a..f5d9a92 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,7 +1,7 @@ Tor Browser 7.0a1 -- January 25 2017 * All Platforms * Update Firefox to 45.7.0esr - * Tor to 0.3.0.1-alpha + * Tor to 0.3.0.2-alpha * Update Torbutton to 1.9.7 * Bug 19898: Use DuckDuckGo on about:tor * Bug 21091: Hide the update check menu entry when running under the sandbox diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 774512d..a6f1aac 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -15,7 +15,7 @@ FIREFOX_VERSION=45.7.0esr TORBROWSER_UPDATE_CHANNEL=alpha TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.0-1-build1 -TOR_TAG=tor-0.3.0.1-alpha +TOR_TAG=tor-0.3.0.2-alpha TORLAUNCHER_TAG=0.2.10.2 TORBUTTON_TAG=1.9.7 HTTPSE_TAG=5.2.9

1 0

[tor-browser-bundle/maint-6.5] Picking up new tor tag
by gk＠torproject.org 23 Jan '17

23 Jan '17

commit 536b7cf8cfc2d065a2ee3564b9a4148f52a0e7d4 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jan 23 15:38:59 2017 +0000 Picking up new tor tag --- Bundle-Data/Docs/ChangeLog.txt | 2 +- gitian/versions | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index f58a62f..ff6267c 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,7 +1,7 @@ Tor Browser 6.5 -- January 24 2017 * All Platforms * Update Firefox to 45.7.0esr - * Tor to 0.2.9.8 + * Tor to 0.2.9.9 * OpenSSL to 1.0.2j * Update Torbutton to 1.9.6.12 * Bug 16622: Timezone spoofing moved to tor-browser.git diff --git a/gitian/versions b/gitian/versions index 691168d..73bbc83 100755 --- a/gitian/versions +++ b/gitian/versions @@ -15,7 +15,7 @@ FIREFOX_VERSION=45.7.0esr TORBROWSER_UPDATE_CHANNEL=release TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build1 -TOR_TAG=tor-0.2.9.8 +TOR_TAG=tor-0.2.9.9 TORLAUNCHER_TAG=0.2.10.3 TORBUTTON_TAG=1.9.6.12 HTTPSE_TAG=5.2.9

1 0

[tor-browser-bundle/hardened-builds] Release preparations for 7.0a1-hardened
by gk＠torproject.org 23 Jan '17

23 Jan '17

commit 60c82df8b9365c61ed3318787d783cbc737965e9 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jan 23 08:16:57 2017 +0000 Release preparations for 7.0a1-hardened Changelog update, version bumps, and config.yml update --- Bundle-Data/Docs/ChangeLog.txt | 21 +++++++++++++++++++++ gitian/versions.alpha | 10 +++++----- tools/update-responses/config.yml | 11 +++++------ 3 files changed, 31 insertions(+), 11 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index def8f6a..3a3e1b6 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,24 @@ +Tor Browser 7.0a1-hardened -- January 25 2017 + * All Platforms + * Update Firefox to 45.7.0esr + * Tor to 0.3.0.1-alpha + * Update Torbutton to 1.9.7 + * Bug 19898: Use DuckDuckGo on about:tor + * Bug 21091: Hide the update check menu entry when running under the sandbox + * Bug 21243: Add links to es, fr, and pt Tor Browser manual + * Bug 21194: Show snowflake in the circuit display + * Bug 21131: Remove 2016 donation banner + * Translation updates + * Update HTTPS-Everywhere to 5.2.9 + * Update NoScript to 2.9.5.3 + * Bug 20471: Allow javascript: links from HTTPS first party pages + * Bug 20651: DuckDuckGo does not work with JavaScript disabled + * Bug 20589: Add new MAR signing key + * Bug 20735: Add snowflake pluggable transport to alpha Linux builds + * Build system + * All platforms + * Bug 20927: Upgrade Go to 1.7.4 + Tor Browser 6.5a6-hardened -- December 14 2016 * All Platforms * Update Firefox to 45.6.0esr diff --git a/gitian/versions.alpha b/gitian/versions.alpha index da847c6..7d1e8b3 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -14,15 +14,15 @@ DATA_OUTSIDE_APP_DIR=1 VERIFY_TAGS=1 -FIREFOX_VERSION=45.6.0esr +FIREFOX_VERSION=45.7.0esr TORBROWSER_UPDATE_CHANNEL=hardened -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build1 -TOR_TAG=tor-0.2.9.7-rc +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.0-1-build1 +TOR_TAG=tor-0.3.0.1-alpha TORLAUNCHER_TAG=0.2.11.1 -TORBUTTON_TAG=1.9.6.9 -HTTPSE_TAG=5.2.8 +TORBUTTON_TAG=1.9.7 +HTTPSE_TAG=5.2.9 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 54c4082..21c039b 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -20,7 +20,7 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - hardened: 6.5a6-hardened + hardened: 7.0a1-hardened release: 6.0.1 versions: 6.0.1: @@ -33,12 +33,11 @@ versions: osx32: minSupportedOSVersion: 10.8 detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#upda… - 6.5a6-hardened: - platformVersion: 45.6.0 - detailsURL: https://blog.torproject.org/blog/tor-browser-65a6-hardened-released + 7.0a1-hardened: + platformVersion: 45.7.0 + detailsURL: https://blog.torproject.org/blog/tor-browser-70a1-hardened-released incremental_from: - - 6.5a4-hardened - - 6.5a5-hardened + - 6.5a6-hardened migrate_archs: osx32: osx64 osx32:

1 0

[tor-browser-bundle/hardened-builds] Add Bill's new key
by gk＠torproject.org 23 Jan '17

23 Jan '17

commit 5b33ff70aa48f44a5d819c5267def6b16f2c6c3b Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 19 11:50:43 2017 +0000 Add Bill's new key --- gitian/gpg/https-everywhere.gpg | Bin 194393 -> 203297 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/https-everywhere.gpg b/gitian/gpg/https-everywhere.gpg index fdd8d4f..f6a9dfc 100644 Binary files a/gitian/gpg/https-everywhere.gpg and b/gitian/gpg/https-everywhere.gpg differ

1 0

[tor-browser-bundle/hardened-builds] Bump NoScript version to 2.9.5.3
by gk＠torproject.org 23 Jan '17

23 Jan '17

commit 97dc2d422e1ff5daf72546a96c87221336527b58 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 18 12:02:15 2017 +0000 Bump NoScript version to 2.9.5.3 --- gitian/versions.alpha | 4 ++-- gitian/versions.nightly | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index d9ce0cb..da847c6 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -80,7 +80,7 @@ ELFUTILS_VER=0.160 ## 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.9.5.2-fx+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9.5.3-fx+sm.xpi TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -115,7 +115,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=ed71ca922790e81bc5e8c6a87bb81f394a38676ac37d1fba518a6a428d128dd5 +NOSCRIPT_HASH=ce9779a3a5a2574b958f8e4d079a99d43a8f84193bef52c587c704ed81c2fbbd CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/gitian/versions.nightly b/gitian/versions.nightly index ad3f017..cb196ed 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -83,7 +83,7 @@ ELFUTILS_VER=0.160 ## 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.9.5.2-fx+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9.5.3-fx+sm.xpi TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -118,7 +118,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=ed71ca922790e81bc5e8c6a87bb81f394a38676ac37d1fba518a6a428d128dd5 +NOSCRIPT_HASH=ce9779a3a5a2574b958f8e4d079a99d43a8f84193bef52c587c704ed81c2fbbd CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/master] Fix typo in changelog
by gk＠torproject.org 20 Jan '17

20 Jan '17

commit 7fa18a244a501e3d12adbdf6ee8b81ebb4e44fc1 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 20 10:46:34 2017 +0000 Fix typo in changelog Thanks to arma for finding that one --- Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index a793a2d..fc60c5a 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -18,7 +18,7 @@ Tor Browser 7.0a1 -- January 25 2017 * Bug 20981: On Windows, check TZ for timezone first * OS X * Bug 20989: Browser sandbox profile is too restrictive on OSX 10.12.2 - * Liunx + * Linux * Update sandboxed-tor-browser to 0.0.3 * Bug 20735: Add snowflake pluggable transport to alpha Linux builds * Build system

1 0

[tor-browser-bundle/master] Release preparations for 7.0a1
by gk＠torproject.org 20 Jan '17

20 Jan '17

commit b6090e60ae25974d6663ea063094928151748470 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 20 07:44:43 2017 +0000 Release preparations for 7.0a1 --- Bundle-Data/Docs/ChangeLog.txt | 29 +++++++++++++++++++++++++++++ gitian/versions.alpha | 12 ++++++------ tools/update-responses/config.yml | 11 +++++------ 3 files changed, 40 insertions(+), 12 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 92b638d..a793a2d 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,32 @@ +Tor Browser 7.0a1 -- January 25 2017 + * All Platforms + * Update Firefox to 45.7.0esr + * Tor to 0.3.0.1-alpha + * Update Torbutton to 1.9.7 + * Bug 19898: Use DuckDuckGo on about:tor + * Bug 21091: Hide the update check menu entry when running under the sandbox + * Bug 21243: Add links to es, fr, and pt Tor Browser manual + * Bug 21194: Show snowflake in the circuit display + * Bug 21131: Remove 2016 donation banner + * Translation updates + * Update HTTPS-Everywhere to 5.2.9 + * Update NoScript to 2.9.5.3 + * Bug 20471: Allow javascript: links from HTTPS first party pages + * Bug 20651: DuckDuckGo does not work with JavaScript disabled + * Bug 20589: Add new MAR signing key + * Windows + * Bug 20981: On Windows, check TZ for timezone first + * OS X + * Bug 20989: Browser sandbox profile is too restrictive on OSX 10.12.2 + * Liunx + * Update sandboxed-tor-browser to 0.0.3 + * Bug 20735: Add snowflake pluggable transport to alpha Linux builds + * Build system + * All platforms + * Bug 20927: Upgrade Go to 1.7.4 + * Linux + * Bug 21103: Update descriptors for sandboxed-tor-browser 0.0.3 + Tor Browser 6.5a6-hardened -- December 14 2016 * All Platforms * Update Firefox to 45.6.0esr diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 50c2158..774512d 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -10,15 +10,15 @@ DATA_OUTSIDE_APP_DIR=1 VERIFY_TAGS=1 -FIREFOX_VERSION=45.6.0esr +FIREFOX_VERSION=45.7.0esr TORBROWSER_UPDATE_CHANNEL=alpha -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build1 -TOR_TAG=tor-0.2.9.6-rc +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.0-1-build1 +TOR_TAG=tor-0.3.0.1-alpha TORLAUNCHER_TAG=0.2.10.2 -TORBUTTON_TAG=1.9.6.8 -HTTPSE_TAG=5.2.8 +TORBUTTON_TAG=1.9.7 +HTTPSE_TAG=5.2.9 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable @@ -44,7 +44,7 @@ OBFS4_TAG=obfs4proxy-0.0.5 NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 ERRORS_TAG=248dadf4e9068a0b3e79f02ed0a610d935de5302 GB_TAG=06cc925cce6592e922dcc4839a8b44feb384e71e -SANDBOX_TAG=sandboxed-tor-browser-0.0.2 +SANDBOX_TAG=sandboxed-tor-browser-0.0.3 DEPOT_TOOLS_TAG=28216cd14b44716db5c83634afbdc6e90492652b WEBRTC_TAG=f33698296719f956497d2dbff81b5080864a8804 # https://chromium.googlesource.com/external/webrtc.git/+/refs/branch-heads/52 GO_WEBRTC_TAG=69c5ca70533142494d145b43ef2f46ca94715557 diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 210e707..613da0e 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -19,7 +19,7 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - alpha: 6.5a6 + alpha: 7.0a1 release: 6.0.1 versions: 6.0.1: @@ -33,12 +33,11 @@ versions: osx32: minSupportedOSVersion: 10.8 detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#upda… - 6.5a6: - platformVersion: 45.6.0 - detailsURL: https://blog.torproject.org/blog/tor-browser-65a6-released + 7.0a1: + platformVersion: 45.7.0 + detailsURL: https://blog.torproject.org/blog/tor-browser-70a1-released incremental_from: - - 6.5a4 - - 6.5a5 + - 6.5a6 migrate_archs: osx32: osx64 migrate_langs:

1 0

[torbutton/master] Release preparations for 1.9.7
by gk＠torproject.org 20 Jan '17

20 Jan '17

commit 09056067587f5c7db3b93b1e2e0e50fc380c32d5 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 19 20:32:35 2017 +0000 Release preparations for 1.9.7 Changelog update and version bump --- src/CHANGELOG | 8 ++++++++ src/install.rdf | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 62901a5..80b22e3 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,11 @@ +1.9.7 + * Bug 19898: Use DuckDuckGo on about:tor + * Bug 21091: Hide the update check menu entry when running under the sandbox + * Bug 21243: Add links to es, fr, and pt Tor Browser manual + * Bug 21194: Show snowflake in the circuit display + * Bug 21131: Remove 2016 donation banner + * Translation updates + 1.9.6.9 * Bug 20947: Donation banner improvements diff --git a/src/install.rdf b/src/install.rdf index 7374c4c..6c9572d 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.9.6.9</em:version> + <em:version>1.9.7</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] Bug 21104: Remove 32bit support for sandboxed-tor-browser
by gk＠torproject.org 20 Jan '17

20 Jan '17

commit ce546c418980229020684e09396595d3e9aed143 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 11 11:09:20 2017 +0000 Bug 21104: Remove 32bit support for sandboxed-tor-browser --- gitian/descriptors/linux/gitian-sandbox.yml | 2 -- gitian/make-vms.sh | 9 --------- gitian/mkbundle-linux.sh | 7 +++---- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/gitian/descriptors/linux/gitian-sandbox.yml b/gitian/descriptors/linux/gitian-sandbox.yml index 9e13c17..ab8df05 100644 --- a/gitian/descriptors/linux/gitian-sandbox.yml +++ b/gitian/descriptors/linux/gitian-sandbox.yml @@ -4,7 +4,6 @@ distro: "debian" suites: - "jessie" architectures: -- "i386" - "amd64" packages: - "unzip" @@ -27,7 +26,6 @@ remotes: "dir": "sandbox" files: - "versions" -- "go-linux32-utils.zip" - "go-linux64-utils.zip" - "dzip.sh" - "gb-build-dir.patch" diff --git a/gitian/make-vms.sh b/gitian/make-vms.sh index 7edd2b4..59632da 100755 --- a/gitian/make-vms.sh +++ b/gitian/make-vms.sh @@ -89,15 +89,6 @@ do echo done -while ! build_and_test_vm jessie i386 32 -do - stop-target 32 jessie - rm ./base-jessie-amd64* - echo - echo "Jessie i386 VM build failed... Trying again" - echo -done - while ! build_and_test_vm jessie amd64 64 do stop-target 64 jessie diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index f1da2e0..6dbbe51 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -261,8 +261,7 @@ else SB_TAG=${SANDBOX_TAG#sandboxed-tor-browser-} fi -if [ ! -f inputs/sandbox-$SB_TAG-linux32.zip -o \ - ! -f inputs/sandbox-$SB_TAG-linux64.zip ]; +if [ ! -f inputs/sandbox-$SB_TAG-linux64.zip ]; then echo echo "****** Starting Sandbox Component of Linux Bundle (6/7 for Linux) ******" @@ -274,7 +273,7 @@ then exit 1 fi - cp -a build/out/sandbox-$SB_TAG-linux*.zip inputs/ + cp -a build/out/sandbox-$SB_TAG-linux64.zip inputs/ #cp -a result/sandbox-linux-res.yml inputs/ else echo @@ -302,7 +301,7 @@ then cp -a build/out/*.mar $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1 cp -a inputs/mar-tools-linux*.zip $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1 cp -a inputs/*debug.zip $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1 - cp -a inputs/sandbox-$SB_TAG-linux*.zip $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1 + cp -a inputs/sandbox-$SB_TAG-linux64.zip $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1 touch inputs/bundle-linux.gbuilt else echo

1 0