November 2016 - tbb-commits - lists.torproject.org

[tor-browser/tor-browser-45.4.0esr-6.5-1] Bug 19459: Size new windows to 1000x1000 or nearest 200x100
by gk＠torproject.org 10 Nov '16

10 Nov '16

commit fa996469071a1442386f0313b278cf07ccb4d14c Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Oct 12 02:28:31 2016 +0000 Bug 19459: Size new windows to 1000x1000 or nearest 200x100 --- browser/base/content/browser.js | 10 +++- xpfe/appshell/nsXULWindow.cpp | 108 ++++++++++++++++++++++++++++++++++------ xpfe/appshell/nsXULWindow.h | 2 + 3 files changed, 102 insertions(+), 18 deletions(-) diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 41d72ae..e5fb01c 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -999,8 +999,14 @@ var gBrowserInit = { // have been initialized. Services.obs.notifyObservers(window, "browser-window-before-show", ""); - // Set a sane starting width/height for all resolutions on new profiles. - if (!document.documentElement.hasAttribute("width")) { + if (gPrefService.getBoolPref("privacy.resistFingerprinting")) { + // With fingerprinting resistance enabled, code elsewhere + // is going to generate rounded window dimensions. Make sure + // we don't have a maximized window that can interfere with + // that, as observed in http://trac.torproject.org/18175 + document.documentElement.setAttribute("sizemode", "normal"); + } else if (!document.documentElement.hasAttribute("width")) { + // Set a sane starting width/height for all resolutions on new profiles. let defaultWidth; let defaultHeight; diff --git a/xpfe/appshell/nsXULWindow.cpp b/xpfe/appshell/nsXULWindow.cpp index 99289a0..c523e31 100644 --- a/xpfe/appshell/nsXULWindow.cpp +++ b/xpfe/appshell/nsXULWindow.cpp @@ -1007,7 +1007,70 @@ NS_IMETHODIMP nsXULWindow::EnsureAuthPrompter() } return mAuthPrompter ? NS_OK : NS_ERROR_FAILURE; } - + +// Rounds window size to 1000x1000, or, if there isn't enough available +// screen space, to a multiple of 200x100. +NS_IMETHODIMP nsXULWindow::ResizeToRoundedDimensions() +{ + NS_ENSURE_STATE(mPrimaryContentShell); + nsCOMPtr<nsIBaseWindow> shellWindow(do_QueryInterface(mPrimaryContentShell)); + NS_ENSURE_STATE(shellWindow); + int32_t windowWidth, windowHeight; + int32_t availWidthCSS, availHeightCSS; + int32_t contentWidth, contentHeight; + double devicePerCSSPixels = 1.0; + shellWindow->GetUnscaledDevicePixelsPerCSSPixel(&devicePerCSSPixels); + GetSize(&windowWidth, &windowHeight); // device pixels + NS_ENSURE_TRUE(GetAvailScreenSize(&availWidthCSS, &availHeightCSS), + NS_ERROR_FAILURE); + int32_t availWidth = NSToIntRound(devicePerCSSPixels * + availWidthCSS); // device pixels + int32_t availHeight = NSToIntRound(devicePerCSSPixels * + availHeightCSS); // device pixels + shellWindow->GetSize(&contentWidth, &contentHeight); // device pixels + // Useful for debugging: + //printf("\nscaling factor: %f\n", devicePerCSSPixels); + //printf("window size: %d x %d\n", windowWidth, windowHeight); + //printf("avail screen size: %d x %d\n", availWidth, availHeight); + //printf("primary content shell: %d x %d\n", contentWidth, contentHeight); + int32_t chromeWidth = windowWidth - contentWidth; + int32_t chromeHeight = windowHeight - contentHeight; + int maxInnerWidth = Preferences::GetInt("privacy.window.maxInnerWidth", + INT_MAX); + int maxInnerHeight = Preferences::GetInt("privacy.window.maxInnerHeight", + INT_MAX); + int32_t availForContentWidthCSS = + std::min(maxInnerWidth, + NSToIntRound((0.95 * availWidth - chromeWidth) / + devicePerCSSPixels)); + int32_t availForContentHeightCSS = + std::min(maxInnerHeight, + NSToIntRound((0.95 * availHeight - chromeHeight) / + devicePerCSSPixels)); + int32_t targetContentWidth = + NSToIntRound(devicePerCSSPixels * + std::min(1000, availForContentWidthCSS - + (availForContentWidthCSS % 200))); + int32_t targetContentHeight = + NSToIntRound(devicePerCSSPixels * + std::min(1000, availForContentHeightCSS - + (availForContentHeightCSS % 100))); + SizeShellTo(mPrimaryContentShell, + targetContentWidth, targetContentHeight); + mIgnoreXULSize = true; + mIgnoreXULSizeMode = true; + // Useful for debugging: + //printf("target content size: %d, %d\n", + // targetContentWidth, targetContentHeight); + //GetSize(&windowWidth, &windowHeight); + //GetAvailScreenSize(&availWidth, &availHeight); + //shellWindow->GetSize(&contentWidth, &contentHeight); // device pixels + //printf("\nwindow size: %d x %d\n", windowWidth, windowHeight); + //printf("avail screen size: %d x %d\n", availWidth, availHeight); + //printf("primary content shell: %d x %d\n", contentWidth, contentHeight); + return NS_OK; +} + void nsXULWindow::OnChromeLoaded() { nsresult rv = EnsureContentTreeOwner(); @@ -1037,6 +1100,13 @@ void nsXULWindow::OnChromeLoaded() } } + // If we have a content browser object, and fingerprinting resistance + // is active, then set to a rounded size. + if (mPrimaryContentShell && + Preferences::GetBool("privacy.resistFingerprinting", false)) { + ResizeToRoundedDimensions(); + } + bool positionSet = !mIgnoreXULPosition; nsCOMPtr<nsIXULWindow> parentWindow(do_QueryReferent(mParentWindow)); #if defined(XP_UNIX) && !defined(XP_MACOSX) @@ -1137,6 +1207,21 @@ bool nsXULWindow::LoadPositionFromXUL() return gotPosition; } +bool nsXULWindow::GetAvailScreenSize(int32_t* availWidth, int32_t* availHeight) +{ + nsCOMPtr<nsIDOMWindow> domWindow; + GetWindowDOMWindow(getter_AddRefs(domWindow)); + if (nsCOMPtr<nsPIDOMWindow> window = do_QueryInterface(domWindow)) { + nsCOMPtr<nsIDOMScreen> screen = window->GetScreen(); + if (screen) { + screen->GetAvailWidth(availWidth); + screen->GetAvailHeight(availHeight); + return true; + } + } + return false; +} + bool nsXULWindow::LoadSizeFromXUL() { bool gotSize = false; @@ -1181,21 +1266,12 @@ bool nsXULWindow::LoadSizeFromXUL() } if (gotSize) { - // constrain to screen size - nsCOMPtr<nsIDOMWindow> domWindow; - GetWindowDOMWindow(getter_AddRefs(domWindow)); - if (nsCOMPtr<nsPIDOMWindow> window = do_QueryInterface(domWindow)) { - nsCOMPtr<nsIDOMScreen> screen = window->GetScreen(); - if (screen) { - int32_t screenWidth; - int32_t screenHeight; - screen->GetAvailWidth(&screenWidth); - screen->GetAvailHeight(&screenHeight); - if (specWidth > screenWidth) - specWidth = screenWidth; - if (specHeight > screenHeight) - specHeight = screenHeight; - } + int32_t screenWidth, screenHeight; + if (GetAvailScreenSize(&screenWidth, &screenHeight)) { + if (specWidth > screenWidth) + specWidth = screenWidth; + if (specHeight > screenHeight) + specHeight = screenHeight; } mIntrinsicallySized = false; diff --git a/xpfe/appshell/nsXULWindow.h b/xpfe/appshell/nsXULWindow.h index 882e614..f959e11 100644 --- a/xpfe/appshell/nsXULWindow.h +++ b/xpfe/appshell/nsXULWindow.h @@ -88,6 +88,7 @@ protected: NS_IMETHOD EnsurePrimaryContentTreeOwner(); NS_IMETHOD EnsurePrompter(); NS_IMETHOD EnsureAuthPrompter(); + NS_IMETHOD ResizeToRoundedDimensions(); void OnChromeLoaded(); void StaggerPosition(int32_t &aRequestedX, int32_t &aRequestedY, @@ -120,6 +121,7 @@ protected: void SetContentScrollbarVisibility(bool aVisible); bool GetContentScrollbarVisibility(); void PersistentAttributesDirty(uint32_t aDirtyFlags); + bool GetAvailScreenSize(int32_t* availWidth, int32_t* availHeight); nsChromeTreeOwner* mChromeTreeOwner; nsContentTreeOwner* mContentTreeOwner;

1 0

[tor-browser/tor-browser-45.4.0esr-6.5-1] fixup! Bug 19459: Size new windows to 1000x1000 or nearest 200x100
by gk＠torproject.org 10 Nov '16

10 Nov '16

commit f768cdd414cd3900f6927550c1a6eccb42cad05a Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Nov 3 13:41:34 2016 -0700 fixup! Bug 19459: Size new windows to 1000x1000 or nearest 200x100 --- xpfe/appshell/nsXULWindow.cpp | 50 +++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/xpfe/appshell/nsXULWindow.cpp b/xpfe/appshell/nsXULWindow.cpp index c523e31..b0b1f52 100644 --- a/xpfe/appshell/nsXULWindow.cpp +++ b/xpfe/appshell/nsXULWindow.cpp @@ -1028,46 +1028,44 @@ NS_IMETHODIMP nsXULWindow::ResizeToRoundedDimensions() int32_t availHeight = NSToIntRound(devicePerCSSPixels * availHeightCSS); // device pixels shellWindow->GetSize(&contentWidth, &contentHeight); // device pixels - // Useful for debugging: - //printf("\nscaling factor: %f\n", devicePerCSSPixels); - //printf("window size: %d x %d\n", windowWidth, windowHeight); - //printf("avail screen size: %d x %d\n", availWidth, availHeight); - //printf("primary content shell: %d x %d\n", contentWidth, contentHeight); + /* Useful for debugging: + printf("\nscaling factor: %f\n", devicePerCSSPixels); + printf("window size: %d x %d\n", windowWidth, windowHeight); + printf("avail screen size: %d x %d\n", availWidth, availHeight); + printf("primary content shell: %d x %d\n", contentWidth, contentHeight); + */ int32_t chromeWidth = windowWidth - contentWidth; int32_t chromeHeight = windowHeight - contentHeight; int maxInnerWidth = Preferences::GetInt("privacy.window.maxInnerWidth", - INT_MAX); + 1000); int maxInnerHeight = Preferences::GetInt("privacy.window.maxInnerHeight", - INT_MAX); + 1000); int32_t availForContentWidthCSS = - std::min(maxInnerWidth, - NSToIntRound((0.95 * availWidth - chromeWidth) / - devicePerCSSPixels)); + std::min(maxInnerWidth, NSToIntRound((0.95 * availWidth - chromeWidth) / + devicePerCSSPixels)); int32_t availForContentHeightCSS = - std::min(maxInnerHeight, - NSToIntRound((0.95 * availHeight - chromeHeight) / - devicePerCSSPixels)); + std::min(maxInnerHeight, NSToIntRound((0.95 * availHeight - chromeHeight) / + devicePerCSSPixels)); int32_t targetContentWidth = NSToIntRound(devicePerCSSPixels * - std::min(1000, availForContentWidthCSS - - (availForContentWidthCSS % 200))); + (availForContentWidthCSS - (availForContentWidthCSS % 200))); int32_t targetContentHeight = NSToIntRound(devicePerCSSPixels * - std::min(1000, availForContentHeightCSS - - (availForContentHeightCSS % 100))); + (availForContentHeightCSS - (availForContentHeightCSS % 100))); SizeShellTo(mPrimaryContentShell, targetContentWidth, targetContentHeight); mIgnoreXULSize = true; mIgnoreXULSizeMode = true; - // Useful for debugging: - //printf("target content size: %d, %d\n", - // targetContentWidth, targetContentHeight); - //GetSize(&windowWidth, &windowHeight); - //GetAvailScreenSize(&availWidth, &availHeight); - //shellWindow->GetSize(&contentWidth, &contentHeight); // device pixels - //printf("\nwindow size: %d x %d\n", windowWidth, windowHeight); - //printf("avail screen size: %d x %d\n", availWidth, availHeight); - //printf("primary content shell: %d x %d\n", contentWidth, contentHeight); + /* Useful for debugging: + printf("target content size: %d, %d\n", + targetContentWidth, targetContentHeight); + GetSize(&windowWidth, &windowHeight); + GetAvailScreenSize(&availWidth, &availHeight); + shellWindow->GetSize(&contentWidth, &contentHeight); // device pixels + printf("\nwindow size: %d x %d\n", windowWidth, windowHeight); + printf("avail screen size: %d x %d\n", availWidth, availHeight); + printf("primary content shell: %d x %d\n", contentWidth, contentHeight); + */ return NS_OK; }

1 0

[torbutton/master] Adding fr, ru, and tr to the banner locales
by gk＠torproject.org 10 Nov '16

10 Nov '16

commit c7798457fac62e77b0da9efac69296c0966325ca Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 10 13:07:50 2016 +0000 Adding fr, ru, and tr to the banner locales --- src/chrome/content/aboutTor/donation_banner.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/chrome/content/aboutTor/donation_banner.js b/src/chrome/content/aboutTor/donation_banner.js index 1087815..04f8db9 100644 --- a/src/chrome/content/aboutTor/donation_banner.js +++ b/src/chrome/content/aboutTor/donation_banner.js @@ -6,8 +6,11 @@ let kBannerLocales = [ "en", "es", "fa", + "fr", "it", "nl", + "ru", + "tr", "vi", "zh", ];

1 0

[tor-browser-bundle/hardened-builds] Update tor signing key
by gk＠torproject.org 10 Nov '16

10 Nov '16

commit 07c917f0aa87ec7e4b3b668fd868bca58fac27be Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 9 11:10:02 2016 +0000 Update tor signing key --- gitian/gpg/tor.gpg | Bin 14432 -> 21817 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/tor.gpg b/gitian/gpg/tor.gpg index 319a9a6..51eeb40 100644 Binary files a/gitian/gpg/tor.gpg and b/gitian/gpg/tor.gpg differ

1 0

[tor-browser-bundle/master] Update tor signing key
by gk＠torproject.org 10 Nov '16

10 Nov '16

commit 2c2690fb3a2c76ae916fdb9d37b2f9f2a362de7f Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 9 11:10:02 2016 +0000 Update tor signing key --- gitian/gpg/tor.gpg | Bin 14432 -> 21817 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/tor.gpg b/gitian/gpg/tor.gpg index 319a9a6..51eeb40 100644 Binary files a/gitian/gpg/tor.gpg and b/gitian/gpg/tor.gpg differ

1 0

[tor-browser/tor-browser-45.4.0esr-6.5-1] fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.
by gk＠torproject.org 10 Nov '16

10 Nov '16

commit 74af032f2b07b8106b216a240c175d163634d89d Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Jun 23 10:09:15 2016 -0400 fixup! Bug #4234: Use the Firefox Update Process for Tor Browser. Change app.update.url to point to aus1.tpo (bug 19481). --- browser/app/profile/firefox.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index 6e424cb..64ab700 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -147,7 +147,7 @@ pref("app.update.badge", false); pref("app.update.staging.enabled", true); // Update service URL: -pref("app.update.url", "https://www.torproject.org/dist/torbrowser/update_2/%CHANNEL%/%BUILD_TARGET…"); +pref("app.update.url", "https://aus1.torproject.org/dist/torbrowser/update_2/%CHANNEL%/%BUILD_TARGE…"); // app.update.url.manual is in branding section // app.update.url.details is in branding section

1 0

[tor-browser-bundle/maint-6.0] Revert "Remove the Go update from Changelog"
by gk＠torproject.org 10 Nov '16

10 Nov '16

commit df5a2277a97f78a4384eeb0b5238d9d303756fb4 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 10 08:24:29 2016 +0000 Revert "Remove the Go update from Changelog" This reverts commit fe44fa5dc3e1eb5889f64114d0a8a03d144e7891. --- Bundle-Data/Docs/ChangeLog.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 0758477..b2a0719 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -21,6 +21,10 @@ Tor Browser 6.0.6 -- November 15 * Bug 20342: Add tor-gencert.exe to expert bundle * OS X * Bug 20204: Windows don't drag on macOS Sierra anymore + * Bug 20250: Meek fails on macOS Sierra if built with Go < 1.7 + * Build system + * All platforms + * Bug 20023: Upgrade Go to 1.7.3 Tor Browser 6.0.5 -- September 16 * All Platforms

1 0

[tor-browser-bundle/maint-6.0] Revert "Revert "Bug 20023: Upgrade Go to 1.7.3.""
by gk＠torproject.org 10 Nov '16

10 Nov '16

commit 04ad1276fb3e410f42a079cf0cac30bd7e1d0c53 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 10 08:25:37 2016 +0000 Revert "Revert "Bug 20023: Upgrade Go to 1.7.3."" This reverts commit 8e93f0ddb6b018c6d5a28c2063554bb5174d9c45. It seems the segfault was only spurious on my build machine. --- gitian/descriptors/mac/gitian-pluggable-transports.yml | 12 +++++++----- gitian/versions | 4 ++-- gitian/versions.alpha | 4 ++-- gitian/versions.beta | 4 ++-- gitian/versions.nightly | 4 ++-- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index 33b134e..519a3ee 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -48,6 +48,7 @@ files: - "go14.tar.gz" - "go.tar.gz" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" +- "MacOSX10.7.sdk.tar.gz" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" - "dzip.sh" - "gmp-mac64-utils.zip" @@ -82,6 +83,8 @@ script: | export PATH="/usr/sbin:/sbin:$PATH" sudo dpkg -i *.deb tar xaf multiarch-darwin*tar.xz + # The 10.7 SDK is needed for Go: https://bugs.torproject.org/20023#comment:6 + tar xaf MacOSX10.7.sdk.tar.gz export PATH="$PATH:$HOME/build/apple-osx/bin/" if [ "z$INCLUDE_FTE" = "z1" ]; then unzip -d $INSTDIR gmp-mac64-utils.zip @@ -99,10 +102,6 @@ script: | export CXX=$HOME/build/apple-osx/bin/i686-apple-darwin11-g++ # http://bugs.python.org/issue9437 export LDSHARED="$CC -pthread -shared" - # XXX Clean up these flags? - export CFLAGS="-m64 -I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -F/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks -mmacosx-version-min=10.5 -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/i686-apple-darwin10/4.2.1$FTE_EXTRA_CFLAGS" - export CXXFLAGS="-m64 -I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -F/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks -mmacosx-version-min=10.5 -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/i686-apple-darwin10/4.2.1$FTE_EXTRA_CFLAGS" - export LDFLAGS="-L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -F/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks -mmacosx-version-min=10.5" # Building go 1.4.x # This is needed to bootstrap the go that we actually use @@ -122,7 +121,7 @@ script: | # https://github.com/golang/go/issues/15457 CC_FOR_TARGET="$(pwd)/cc-for-target" echo "#!/bin/sh" > "$CC_FOR_TARGET" - echo "exec $CC $CFLAGS $LDFLAGS \"\$@\"" >> "$CC_FOR_TARGET" + echo "exec $CC $CFLAGS $LDFLAGS -isysroot $HOME/build/MacOSX10.7.sdk -std=gnu99 \"\$@\"" >> "$CC_FOR_TARGET" chmod +x "$CC_FOR_TARGET" # http://golang.org/doc/install/source#environment export GOPATH="$HOME/go" @@ -130,6 +129,9 @@ script: | export GOARCH=386 tar xvf go.tar.gz cd go/src + # Remove a preprocessor directive that causes problems when building with the 10.7 SDK. + # https://github.com/golang/go/issues/17732 + sed -i -e '/^#cgo CFLAGS:/s/-D__MAC_OS_X_VERSION_MAX_ALLOWED=1060//' crypto/x509/root_cgo_darwin.go CGO_ENABLED=1 CC_FOR_TARGET="$CC_FOR_TARGET" CC= CFLAGS= LDFLAGS= ./make.bash cd ../.. export PATH="$PATH:$PWD/go/bin" diff --git a/gitian/versions b/gitian/versions index 387b7c5..2be65b4 100755 --- a/gitian/versions +++ b/gitian/versions @@ -62,7 +62,7 @@ SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 # We need a Go 1.4 to bootstrap later versions; see https://golang.org/doc/install/source#go14 GO14_VER=1.4.3 -GO_VER=1.6.3 +GO_VER=1.7.3 NSIS_VER=2.51 ## File names for the source packages @@ -114,7 +114,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 -GO_HASH=6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00 +GO_HASH=79430a0027a09b0b3ad57e214c4c1acfdd7af290961dd08d322818895af1ef44 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad diff --git a/gitian/versions.alpha b/gitian/versions.alpha index d6044ce..68be3f3 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -62,7 +62,7 @@ SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 # We need a Go 1.4 to bootstrap later versions; see https://golang.org/doc/install/source#go14 GO14_VER=1.4.3 -GO_VER=1.6.3 +GO_VER=1.7.3 NSIS_VER=2.51 ## File names for the source packages @@ -114,7 +114,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 -GO_HASH=6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00 +GO_HASH=79430a0027a09b0b3ad57e214c4c1acfdd7af290961dd08d322818895af1ef44 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad diff --git a/gitian/versions.beta b/gitian/versions.beta index 1ff14b8..e19f53b 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -49,7 +49,7 @@ SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 # We need a Go 1.4 to bootstrap later versions; see https://golang.org/doc/install/source#go14 GO14_VER=1.4.3 -GO_VER=1.6.3 +GO_VER=1.7.3 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -96,7 +96,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 -GO_HASH=6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00 +GO_HASH=79430a0027a09b0b3ad57e214c4c1acfdd7af290961dd08d322818895af1ef44 STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da diff --git a/gitian/versions.nightly b/gitian/versions.nightly index f4475bc..75cb02b 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -69,7 +69,7 @@ SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 # We need a Go 1.4 to bootstrap later versions; see https://golang.org/doc/install/source#go14 GO14_VER=1.4.3 -GO_VER=1.6.3 +GO_VER=1.7.3 NSIS_VER=2.51 ## File names for the source packages @@ -121,7 +121,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 -GO_HASH=6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00 +GO_HASH=79430a0027a09b0b3ad57e214c4c1acfdd7af290961dd08d322818895af1ef44 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad

1 0

[tor-browser-bundle/maint-6.0] Revert "Revert "Upgrade Go to 1.6.3.""
by gk＠torproject.org 10 Nov '16

10 Nov '16

commit 9b9cf24a443a1fca1ca1920c81af0387ab8169a6 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 10 08:25:07 2016 +0000 Revert "Revert "Upgrade Go to 1.6.3."" This reverts commit a10a5a000c5eaf294d7afc01ba4c6b9af9f67e50. It seems the sefault was only spurious on my build machine. --- .../linux/gitian-pluggable-transports.yml | 12 ++++++++++ .../mac/gitian-pluggable-transports.yml | 27 ++++++++++++++++----- .../windows/gitian-pluggable-transports.yml | 28 +++++++++++++++++----- gitian/fetch-inputs.sh | 5 ++-- gitian/verify-tags.sh | 2 +- gitian/versions | 9 +++++-- gitian/versions.alpha | 9 +++++-- gitian/versions.beta | 9 +++++-- gitian/versions.nightly | 9 +++++-- 9 files changed, 87 insertions(+), 23 deletions(-) diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index 38ae561..a1cdc48 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -46,6 +46,7 @@ files: - "zope.interface.zip" - "twisted.tar.bz2" - "parsley.tar.gz" +- "go14.tar.gz" - "go.tar.gz" - "dzip.sh" - "gmp-linux32-utils.zip" @@ -74,6 +75,17 @@ script: | # FTE only needs libgmp.so.10 and no libgmpxx anymore. cp $INSTDIR/gmp/lib/libgmp.so.10 $INSTDIR/Tor + # Building go 1.4.x + # This is needed to bootstrap the go that we actually use + # https://golang.org/doc/install/source#go14 + tar xvf go14.tar.gz --transform='s,^go\>,go1.4,' + cd go1.4/src + # Disable cgo to avoid conflicts with newer GCC. cgo is not needed for the bootstrap go. + # https://github.com/golang/go/issues/13114#issuecomment-186922245 + CGO_ENABLED=0 ./make.bash + cd ../.. + export GOROOT_BOOTSTRAP="$PWD/go1.4" + # Building go # http://golang.org/doc/install/source#environment export GOPATH="$HOME/go" diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index fbf38c2..33b134e 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -45,6 +45,7 @@ files: - "zope.interface.zip" - "twisted.tar.bz2" - "parsley.tar.gz" +- "go14.tar.gz" - "go.tar.gz" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" @@ -103,19 +104,33 @@ script: | export CXXFLAGS="-m64 -I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -F/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks -mmacosx-version-min=10.5 -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/i686-apple-darwin10/4.2.1$FTE_EXTRA_CFLAGS" export LDFLAGS="-L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -F/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks -mmacosx-version-min=10.5" + # Building go 1.4.x + # This is needed to bootstrap the go that we actually use + # https://golang.org/doc/install/source#go14 + tar xvf go14.tar.gz --transform='s,^go\>,go1.4,' + cd go1.4/src + # Disable cgo to avoid conflicts with newer GCC. cgo is not needed for the bootstrap go. + # https://github.com/golang/go/issues/13114#issuecomment-186922245 + # Disable CC etc. that are set up for cross builds. + CGO_ENABLED=0 CC= CFLAGS= LDFLAGS= ./make.bash + cd ../.. + export GOROOT_BOOTSTRAP="$PWD/go1.4" + # Building go + # Create a cc-for-target script that closes over CC, CFLAGS, and LDFLAGS. + # Go's CC_FOR_TARGET only allows a command name, not a command with arguments. + # https://github.com/golang/go/issues/15457 + CC_FOR_TARGET="$(pwd)/cc-for-target" + echo "#!/bin/sh" > "$CC_FOR_TARGET" + echo "exec $CC $CFLAGS $LDFLAGS \"\$@\"" >> "$CC_FOR_TARGET" + chmod +x "$CC_FOR_TARGET" # http://golang.org/doc/install/source#environment export GOPATH="$HOME/go" export GOOS=darwin export GOARCH=386 tar xvf go.tar.gz cd go/src - # http://golang.org/cmd/cgo/: - # "To enable cgo during cross compiling builds, set the CGO_ENABLED - # environment variable to 1 when building the Go tools with make.bash. Also, - # set CC_FOR_TARGET to the C cross compiler for the target. CC will be used - # for compiling for the host." - CGO_ENABLED=1 CC_FOR_TARGET="$CC $CFLAGS $LDFLAGS" CC= CFLAGS= LDFLAGS= ./make.bash + CGO_ENABLED=1 CC_FOR_TARGET="$CC_FOR_TARGET" CC= CFLAGS= LDFLAGS= ./make.bash cd ../.. export PATH="$PATH:$PWD/go/bin" diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index f073fd1..7e8a349 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -47,6 +47,7 @@ files: - "wine-wrappers" - "python.msi" - "py2exe.exe" +- "go14.tar.gz" - "go.tar.gz" - "dzip.sh" - "pyc-timestamp.sh" @@ -139,19 +140,34 @@ script: | cp -a dist/gcc.exe dist/g++.exe dist/dllwrap.exe $WINEROOT/windows/ cd .. + # Building go 1.4.x + # This is needed to bootstrap the go that we actually use + # https://golang.org/doc/install/source#go14 + tar xvf go14.tar.gz --transform='s,^go\>,go1.4,' + cd go1.4/src + # Disable cgo to avoid conflicts with newer GCC. cgo is not needed for the bootstrap go. + # https://github.com/golang/go/issues/13114#issuecomment-186922245 + # Disable CC etc. that are set up for cross builds. + CGO_ENABLED=0 CC= CFLAGS= LDFLAGS= ./make.bash + cd ../.. + export GOROOT_BOOTSTRAP="$PWD/go1.4" + # Building go + CC=i686-w64-mingw32-gcc + # Create a cc-for-target script that closes over CC, CFLAGS, and LDFLAGS. + # Go's CC_FOR_TARGET only allows a command name, not a command with arguments. + # https://github.com/golang/go/issues/15457 + CC_FOR_TARGET="$(pwd)/cc-for-target" + echo "#!/bin/sh" > "$CC_FOR_TARGET" + echo "exec $CC $CFLAGS $LDFLAGS \"\$@\"" >> "$CC_FOR_TARGET" + chmod +x "$CC_FOR_TARGET" # http://golang.org/doc/install/source#environment export GOPATH="$HOME/go" export GOOS=windows export GOARCH=386 tar xvf go.tar.gz cd go/src - # http://golang.org/cmd/cgo/: - # "To enable cgo during cross compiling builds, set the CGO_ENABLED - # environment variable to 1 when building the Go tools with make.bash. Also, - # set CC_FOR_TARGET to the C cross compiler for the target. CC will be used - # for compiling for the host." - CGO_ENABLED=1 CC_FOR_TARGET="i686-w64-mingw32-gcc" CC= CFLAGS= LDFLAGS= ./make.bash + CGO_ENABLED=1 CC_FOR_TARGET="$CC_FOR_TARGET" CC= CFLAGS= LDFLAGS= ./make.bash cd ../.. export PATH="$PATH:$PWD/go/bin" diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index b5adfc2..50daec0 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -162,7 +162,7 @@ do get "${!PACKAGE}" "${MIRROR_URL_ASN}${!PACKAGE}" done -for i in ZOPEINTERFACE TWISTED PY2EXE SETUPTOOLS PARSLEY GO STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN PYCRYPTO +for i in ZOPEINTERFACE TWISTED PY2EXE SETUPTOOLS PARSLEY GO14 GO STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN PYCRYPTO do URL="${i}_URL" PACKAGE="${i}_PACKAGE" @@ -174,7 +174,7 @@ wget -U "" -N ${NOSCRIPT_URL} # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all) -for i in OSXSDK OSXSDK_OLD TOOLCHAIN4_OLD CCTOOLS NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN +for i in OSXSDK OSXSDK_OLD TOOLCHAIN4_OLD CCTOOLS NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO14 GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" @@ -243,6 +243,7 @@ ln -sf "$PY2EXE_PACKAGE" py2exe.exe ln -sf "$SETUPTOOLS_PACKAGE" setuptools.tar.gz ln -sf "$GMP_PACKAGE" gmp.tar.bz2 ln -sf "$PARSLEY_PACKAGE" parsley.tar.gz +ln -sf "$GO14_PACKAGE" go14.tar.gz ln -sf "$GO_PACKAGE" go.tar.gz ln -sf "$NSIS_PACKAGE" nsis.tar.bz2 ln -sf "$NSIS_DEBIAN_PACKAGE" nsis-debian.tar.xz diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 33b54a4..d95b0e0 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -144,7 +144,7 @@ done # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all) -for i in OSXSDK OSXSDK_OLD TOOLCHAIN4_OLD CCTOOLS NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN +for i in OSXSDK OSXSDK_OLD TOOLCHAIN4_OLD CCTOOLS NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO14 GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/versions b/gitian/versions index 143d56d..387b7c5 100755 --- a/gitian/versions +++ b/gitian/versions @@ -60,7 +60,9 @@ TWISTED_VER=13.2.0 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 -GO_VER=1.4.3 +# We need a Go 1.4 to bootstrap later versions; see https://golang.org/doc/install/source#go14 +GO14_VER=1.4.3 +GO_VER=1.6.3 NSIS_VER=2.51 ## File names for the source packages @@ -83,6 +85,7 @@ TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz +GO14_PACKAGE=go${GO14_VER}.src.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz NSIS_PACKAGE=nsis-${NSIS_VER}-src.tar.bz2 NSIS_DEBIAN_PACKAGE=nsis_${NSIS_VER}-1.debian.tar.xz @@ -110,7 +113,8 @@ TWISTED_HASH=095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3 PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 -GO_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 +GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 +GO_HASH=6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad @@ -140,6 +144,7 @@ TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… PY2EXE_URL=http://downloads.sourceforge.net/py2exe/${PY2EXE_VER}/${PY2EXE_P… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… +GO14_URL=https://golang.org/dl/${GO14_PACKAGE} GO_URL=https://golang.org/dl/${GO_PACKAGE} NSIS_URL=http://downloads.sourceforge.net/nsis/${NSIS_PACKAGE} NSIS_DEBIAN_URL=http://http.debian.net/debian/pool/main/n/nsis/${NSIS_DEBIA… diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 65acf45..d6044ce 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -60,7 +60,9 @@ TWISTED_VER=13.2.0 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 -GO_VER=1.4.2 +# We need a Go 1.4 to bootstrap later versions; see https://golang.org/doc/install/source#go14 +GO14_VER=1.4.3 +GO_VER=1.6.3 NSIS_VER=2.51 ## File names for the source packages @@ -83,6 +85,7 @@ TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz +GO14_PACKAGE=go${GO14_VER}.src.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz NSIS_PACKAGE=nsis-${NSIS_VER}-src.tar.bz2 NSIS_DEBIAN_PACKAGE=nsis_${NSIS_VER}-1.debian.tar.xz @@ -110,7 +113,8 @@ TWISTED_HASH=095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3 PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 -GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b +GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 +GO_HASH=6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad @@ -140,6 +144,7 @@ TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… PY2EXE_URL=http://downloads.sourceforge.net/py2exe/${PY2EXE_VER}/${PY2EXE_P… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… +GO14_URL=https://golang.org/dl/${GO14_PACKAGE} GO_URL=https://golang.org/dl/${GO_PACKAGE} NSIS_URL=http://downloads.sourceforge.net/nsis/${NSIS_PACKAGE} NSIS_DEBIAN_URL=http://http.debian.net/debian/pool/main/n/nsis/${NSIS_DEBIA… diff --git a/gitian/versions.beta b/gitian/versions.beta index 2564e41..1ff14b8 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -47,7 +47,9 @@ TWISTED_VER=13.2.0 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 -GO_VER=1.4.2 +# We need a Go 1.4 to bootstrap later versions; see https://golang.org/doc/install/source#go14 +GO14_VER=1.4.3 +GO_VER=1.6.3 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -68,6 +70,7 @@ TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz +GO14_PACKAGE=go${GO14_VER}.src.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz STIXMATHFONT_PACKAGE=STIXv1.1.1-latex.zip NOTOEMOJIFONT_PACKAGE=NotoEmoji-Regular.ttf @@ -92,7 +95,8 @@ TWISTED_HASH=095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3 PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 -GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b +GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 +GO_HASH=6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00 STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da @@ -118,6 +122,7 @@ TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… PY2EXE_URL=http://downloads.sourceforge.net/py2exe/${PY2EXE_VER}/${PY2EXE_P… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… +GO14_URL=https://golang.org/dl/${GO14_PACKAGE} GO_URL=https://golang.org/dl/${GO_PACKAGE} STIXMATHFONT_URL=http://iweb.dl.sourceforge.net/project/stixfonts/Current%2… NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd… diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 781d4ae..f4475bc 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -67,7 +67,9 @@ TWISTED_VER=13.2.0 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 -GO_VER=1.4.2 +# We need a Go 1.4 to bootstrap later versions; see https://golang.org/doc/install/source#go14 +GO14_VER=1.4.3 +GO_VER=1.6.3 NSIS_VER=2.51 ## File names for the source packages @@ -90,6 +92,7 @@ TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz +GO14_PACKAGE=go${GO14_VER}.src.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz NSIS_PACKAGE=nsis-${NSIS_VER}-src.tar.bz2 NSIS_DEBIAN_PACKAGE=nsis_${NSIS_VER}-1.debian.tar.xz @@ -117,7 +120,8 @@ TWISTED_HASH=095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3 PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 -GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b +GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 +GO_HASH=6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad @@ -147,6 +151,7 @@ TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… PY2EXE_URL=http://downloads.sourceforge.net/py2exe/${PY2EXE_VER}/${PY2EXE_P… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… +GO14_URL=https://golang.org/dl/${GO14_PACKAGE} GO_URL=https://golang.org/dl/${GO_PACKAGE} NSIS_URL=http://downloads.sourceforge.net/nsis/${NSIS_PACKAGE} NSIS_DEBIAN_URL=http://http.debian.net/debian/pool/main/n/nsis/${NSIS_DEBIA…

1 0

[tor-browser-bundle/maint-6.0] Bump Torbutton tag to pick up banner translations
by gk＠torproject.org 10 Nov '16

10 Nov '16

commit 3e01d216bc9e9bc50995e8e5b7dd28dadf377f0a Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 10 08:27:23 2016 +0000 Bump Torbutton tag to pick up banner translations --- 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 b2a0719..e6f9b74 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -3,7 +3,7 @@ Tor Browser 6.0.6 -- November 15 * Update Firefox to 45.5.0esr * Update Tor to 0.2.8.9 * Update OpenSSL to 1.0.1u - * Update Torbutton to 1.9.5.8 + * Update Torbutton to 1.9.5.9 * Bug 20414: Add donation banner on about:tor for 2016 campaign * Translation updates * Update Tor Launcher to 0.2.9.4 diff --git a/gitian/versions b/gitian/versions index 2be65b4..bb83b2d 100755 --- a/gitian/versions +++ b/gitian/versions @@ -17,7 +17,7 @@ TORBROWSER_UPDATE_CHANNEL=release TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build2 TOR_TAG=tor-0.2.8.9 TORLAUNCHER_TAG=0.2.9.4 -TORBUTTON_TAG=1.9.5.8 +TORBUTTON_TAG=1.9.5.9 HTTPSE_TAG=5.2.7 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8

1 0