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

[translation/torbutton-abouttorproperties_completed] Update translations for torbutton-abouttorproperties_completed
by translation＠torproject.org 09 Nov '16

09 Nov '16

commit 15128fcc9856b052a85e7fa2d18675bcc3184846 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 9 20:47:17 2016 +0000 Update translations for torbutton-abouttorproperties_completed --- ru/abouttor.properties | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ru/abouttor.properties b/ru/abouttor.properties index 07d591c..055faae 100644 --- a/ru/abouttor.properties +++ b/ru/abouttor.properties @@ -19,3 +19,10 @@ aboutTor.searchDC.privacy=Ищите <a href="%1$S">конфиденциальн aboutTor.searchDC.privacy.link=https://disconnect.me/privacy # The following string is a link which replaces %2$S above. aboutTor.searchDC.search.link=https://search.disconnect.me/ + +aboutTor.donationBanner.donate=Пожертвовать сейчас! +aboutTor.donationBanner.heart=Tor это сердце свободы Интернета +aboutTor.donationBanner.tagline1=Миллионы людей зависят от Tor в онлайн-безопасности и конфиденциальности +aboutTor.donationBanner.tagline2=Сеть людей, защищающих людей +aboutTor.donationBanner.tagline3=Наблюдение = Угнетение +aboutTor.donationBanner.tagline4=Защита журналистов, активистов и информаторов с 2006 года

1 0

[translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties
by translation＠torproject.org 09 Nov '16

09 Nov '16

commit 1f6ef1ee2becb04e2b30878fd55417d84e13b46c Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 9 20:47:13 2016 +0000 Update translations for torbutton-abouttorproperties --- ru/abouttor.properties | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ru/abouttor.properties b/ru/abouttor.properties index 4d33808..055faae 100644 --- a/ru/abouttor.properties +++ b/ru/abouttor.properties @@ -20,9 +20,9 @@ aboutTor.searchDC.privacy.link=https://disconnect.me/privacy # The following string is a link which replaces %2$S above. aboutTor.searchDC.search.link=https://search.disconnect.me/ -aboutTor.donationBanner.donate=Donate Now! -aboutTor.donationBanner.heart=Tor is at the heart of Internet freedom -aboutTor.donationBanner.tagline1=Millions of People Depend on Tor for Online Security & Privacy -aboutTor.donationBanner.tagline2=A Network of People Protecting People -aboutTor.donationBanner.tagline3=Surveillance = Oppression -aboutTor.donationBanner.tagline4=Protecting Journalists, Activists & Whistleblowers Since 2006 +aboutTor.donationBanner.donate=Пожертвовать сейчас! +aboutTor.donationBanner.heart=Tor это сердце свободы Интернета +aboutTor.donationBanner.tagline1=Миллионы людей зависят от Tor в онлайн-безопасности и конфиденциальности +aboutTor.donationBanner.tagline2=Сеть людей, защищающих людей +aboutTor.donationBanner.tagline3=Наблюдение = Угнетение +aboutTor.donationBanner.tagline4=Защита журналистов, активистов и информаторов с 2006 года

1 0

[tor-messenger-build/master] Use tor-browser 6.0.5
by arlo＠torproject.org 09 Nov '16

09 Nov '16

commit 2abdfc10e7fbac7c73cff33665985b4d89af6b25 Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed Nov 9 12:46:18 2016 -0800 Use tor-browser 6.0.5 --- projects/tor-browser/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 15e73ff..0ea0dcd 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 6.0.4 +version: 6.0.5 filename: 'tor-browser-[% c("version") %]-[% c("var/osname") %].[% c("var/extension") %]' input_files:

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 09 Nov '16

09 Nov '16

commit dafb15ea75e11998d486d2499dc5aa09aceca77c Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 9 20:46:42 2016 +0000 Update translations for torbutton-torbuttondtd --- ru/torbutton.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ru/torbutton.dtd b/ru/torbutton.dtd index de02dd2..c5c989a 100644 --- a/ru/torbutton.dtd +++ b/ru/torbutton.dtd @@ -11,9 +11,9 @@ <!ENTITY torbutton.context_menu.cookieProtections "Защита куки-файла"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Нажмите, чтобы инициализировать Torbutton"> -<!ENTITY torbutton.prefs.security_settings "Tor Browser Security Settings"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.custom_warning "Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels."> +<!ENTITY torbutton.prefs.security_settings "Настройки безопасности Tor Browser"> +<!ENTITY torbutton.prefs.restore_defaults "Восстановить значения по умолчанию"> +<!ENTITY torbutton.prefs.custom_warning "Ваши настройки браузера, привели к необычным параметрам безопасности. По соображениям безопасности и конфиденциальности, мы рекомендуем вам выбрать один из уровней безопасности по умолчанию."> <!ENTITY torbutton.cookiedialog.title "Управление защитой куки-файлов"> <!ENTITY torbutton.cookiedialog.lockCol "Защищено"> <!ENTITY torbutton.cookiedialog.domainCol "Ведущий узел">

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 09 Nov '16

09 Nov '16

commit 0042c73ca56d461aa0a94d39322051d94e10f586 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 9 20:45:33 2016 +0000 Update translations for liveusb-creator_completed --- ru/ru.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ru/ru.po b/ru/ru.po index a81f65b..3320130 100644 --- a/ru/ru.po +++ b/ru/ru.po @@ -4,6 +4,7 @@ # # Translators: # Анатолий Гуськов <anatoliy.guskov(a)gmail.com>, 2009 +# Andrey, 2016 # Антон Толмачев <a.tolmachev(a)richart-consalt.ru>, 2015 # Den Arefyev <>, 2012 # Denis Denis <stereodenis(a)gmail.com>, 2014 @@ -24,8 +25,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-02 21:23+0100\n" -"PO-Revision-Date: 2016-05-02 03:02+0000\n" -"Last-Translator: Андрей Костриков <yavinav(a)gmail.com>\n" +"PO-Revision-Date: 2016-11-09 20:42+0000\n" +"Last-Translator: Andrey\n" "Language-Team: Russian (http://www.transifex.com/otf/torproject/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -295,7 +296,7 @@ msgstr "Раздел FAT16: Размер оверлея возможен не б #: ../liveusb/gui.py:565 msgid "Partition is FAT32; Restricting overlay size to 4G" -msgstr "Раздел отформатирован в FAT32; Размер постоянного хранилища ограничен 4G" +msgstr "Раздел отформатирован в FAT32; Размер постоянного хранилища ограничен 4 ГБ" #: ../liveusb/creator.py:236 ../liveusb/creator.py:866 #, python-format

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 09 Nov '16

09 Nov '16

commit 08feb150ffaf98284d85e8177cafa6f2101024a7 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 9 20:45:29 2016 +0000 Update translations for liveusb-creator --- ru/ru.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ru/ru.po b/ru/ru.po index a81f65b..3320130 100644 --- a/ru/ru.po +++ b/ru/ru.po @@ -4,6 +4,7 @@ # # Translators: # Анатолий Гуськов <anatoliy.guskov(a)gmail.com>, 2009 +# Andrey, 2016 # Антон Толмачев <a.tolmachev(a)richart-consalt.ru>, 2015 # Den Arefyev <>, 2012 # Denis Denis <stereodenis(a)gmail.com>, 2014 @@ -24,8 +25,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-02 21:23+0100\n" -"PO-Revision-Date: 2016-05-02 03:02+0000\n" -"Last-Translator: Андрей Костриков <yavinav(a)gmail.com>\n" +"PO-Revision-Date: 2016-11-09 20:42+0000\n" +"Last-Translator: Andrey\n" "Language-Team: Russian (http://www.transifex.com/otf/torproject/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -295,7 +296,7 @@ msgstr "Раздел FAT16: Размер оверлея возможен не б #: ../liveusb/gui.py:565 msgid "Partition is FAT32; Restricting overlay size to 4G" -msgstr "Раздел отформатирован в FAT32; Размер постоянного хранилища ограничен 4G" +msgstr "Раздел отформатирован в FAT32; Размер постоянного хранилища ограничен 4 ГБ" #: ../liveusb/creator.py:236 ../liveusb/creator.py:866 #, python-format

1 0

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

09 Nov '16

commit fe44fa5dc3e1eb5889f64114d0a8a03d144e7891 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 9 20:40:21 2016 +0000 Remove the Go update from Changelog --- Bundle-Data/Docs/ChangeLog.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index b2a0719..0758477 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -21,10 +21,6 @@ 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 "Upgrade Go to 1.6.3."
by gk＠torproject.org 09 Nov '16

09 Nov '16

commit a10a5a000c5eaf294d7afc01ba4c6b9af9f67e50 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 9 20:38:09 2016 +0000 Revert "Upgrade Go to 1.6.3." This reverts commit 3dee56db1330daa8df7e4d0c90d88bff17b80fec. --- .../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, 23 insertions(+), 87 deletions(-) diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index a1cdc48..38ae561 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -46,7 +46,6 @@ files: - "zope.interface.zip" - "twisted.tar.bz2" - "parsley.tar.gz" -- "go14.tar.gz" - "go.tar.gz" - "dzip.sh" - "gmp-linux32-utils.zip" @@ -75,17 +74,6 @@ 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 33b134e..fbf38c2 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -45,7 +45,6 @@ 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" @@ -104,33 +103,19 @@ 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 - CGO_ENABLED=1 CC_FOR_TARGET="$CC_FOR_TARGET" CC= CFLAGS= LDFLAGS= ./make.bash + # 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 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 7e8a349..f073fd1 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -47,7 +47,6 @@ files: - "wine-wrappers" - "python.msi" - "py2exe.exe" -- "go14.tar.gz" - "go.tar.gz" - "dzip.sh" - "pyc-timestamp.sh" @@ -140,34 +139,19 @@ 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 - CGO_ENABLED=1 CC_FOR_TARGET="$CC_FOR_TARGET" CC= CFLAGS= LDFLAGS= ./make.bash + # 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 cd ../.. export PATH="$PATH:$PWD/go/bin" diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 50daec0..b5adfc2 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 GO14 GO STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN PYCRYPTO +for i in ZOPEINTERFACE TWISTED PY2EXE SETUPTOOLS PARSLEY 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 GO14 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 GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" @@ -243,7 +243,6 @@ 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 d95b0e0..33b54a4 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 GO14 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 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 387b7c5..143d56d 100755 --- a/gitian/versions +++ b/gitian/versions @@ -60,9 +60,7 @@ TWISTED_VER=13.2.0 PY2EXE_VER=0.6.9 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.4.3 NSIS_VER=2.51 ## File names for the source packages @@ -85,7 +83,6 @@ 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 @@ -113,8 +110,7 @@ TWISTED_HASH=095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3 PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 -GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 -GO_HASH=6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00 +GO_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad @@ -144,7 +140,6 @@ 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 d6044ce..65acf45 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -60,9 +60,7 @@ TWISTED_VER=13.2.0 PY2EXE_VER=0.6.9 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.4.2 NSIS_VER=2.51 ## File names for the source packages @@ -85,7 +83,6 @@ 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 @@ -113,8 +110,7 @@ TWISTED_HASH=095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3 PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 -GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 -GO_HASH=6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00 +GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad @@ -144,7 +140,6 @@ 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 1ff14b8..2564e41 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -47,9 +47,7 @@ TWISTED_VER=13.2.0 PY2EXE_VER=0.6.9 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.4.2 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -70,7 +68,6 @@ 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 @@ -95,8 +92,7 @@ TWISTED_HASH=095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3 PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 -GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 -GO_HASH=6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00 +GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da @@ -122,7 +118,6 @@ 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 f4475bc..781d4ae 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -67,9 +67,7 @@ TWISTED_VER=13.2.0 PY2EXE_VER=0.6.9 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.4.2 NSIS_VER=2.51 ## File names for the source packages @@ -92,7 +90,6 @@ 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 @@ -120,8 +117,7 @@ TWISTED_HASH=095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3 PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 -GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 -GO_HASH=6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00 +GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad @@ -151,7 +147,6 @@ 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] Revert "Bug 20023: Upgrade Go to 1.7.3."
by gk＠torproject.org 09 Nov '16

09 Nov '16

commit 8e93f0ddb6b018c6d5a28c2063554bb5174d9c45 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 9 20:37:53 2016 +0000 Revert "Bug 20023: Upgrade Go to 1.7.3." This reverts commit 4a0bf1ed2578e3e742e00f95385f914a241904fd. --- 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, 13 insertions(+), 15 deletions(-) diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index 519a3ee..33b134e 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -48,7 +48,6 @@ 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" @@ -83,8 +82,6 @@ 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 @@ -102,6 +99,10 @@ 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 @@ -121,7 +122,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 -isysroot $HOME/build/MacOSX10.7.sdk -std=gnu99 \"\$@\"" >> "$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" @@ -129,9 +130,6 @@ 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 2be65b4..387b7c5 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.7.3 +GO_VER=1.6.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=79430a0027a09b0b3ad57e214c4c1acfdd7af290961dd08d322818895af1ef44 +GO_HASH=6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 68be3f3..d6044ce 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.7.3 +GO_VER=1.6.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=79430a0027a09b0b3ad57e214c4c1acfdd7af290961dd08d322818895af1ef44 +GO_HASH=6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad diff --git a/gitian/versions.beta b/gitian/versions.beta index e19f53b..1ff14b8 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.7.3 +GO_VER=1.6.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=79430a0027a09b0b3ad57e214c4c1acfdd7af290961dd08d322818895af1ef44 +GO_HASH=6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00 STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 75cb02b..f4475bc 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.7.3 +GO_VER=1.6.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=79430a0027a09b0b3ad57e214c4c1acfdd7af290961dd08d322818895af1ef44 +GO_HASH=6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad

1 0

[tor-messenger-build/master] Pull in fixup for updater on tor-browser-45.5.0esr-6.0-1
by arlo＠torproject.org 09 Nov '16

09 Nov '16

commit a6048ed04fe0be8bc0a78b364d5b4864d26547f8 Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed Nov 9 11:50:42 2016 -0800 Pull in fixup for updater on tor-browser-45.5.0esr-6.0-1 --- projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch | 2 +- projects/mozilla/0002-Trac-16475-Block-flash-too.patch | 2 +- .../0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch | 2 +- .../0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch | 2 +- projects/mozilla/0005-OSX-package-as-tar.bz2.patch | 2 +- projects/mozilla/0006-Updater-fixups-for-TM.patch | 2 +- projects/mozilla/config | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch b/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch index 1ce4cfc..f365561 100644 --- a/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch +++ b/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch @@ -1,4 +1,4 @@ -From d05e3b60489252ad72c367af074432ab30251b3b Mon Sep 17 00:00:00 2001 +From 428362e2eee5c06ec84c6d52ff0327d1cbb8beda Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Mon, 10 Oct 2016 10:52:52 -0700 Subject: [PATCH 1/6] Trac 19910: Prevents STARTTLS in XMPP diff --git a/projects/mozilla/0002-Trac-16475-Block-flash-too.patch b/projects/mozilla/0002-Trac-16475-Block-flash-too.patch index d4cc5a8..19481d3 100644 --- a/projects/mozilla/0002-Trac-16475-Block-flash-too.patch +++ b/projects/mozilla/0002-Trac-16475-Block-flash-too.patch @@ -1,4 +1,4 @@ -From 8f56d8580b3fb8a8355bc477d2353184ebf8ff31 Mon Sep 17 00:00:00 2001 +From 05842dca95a626ccdad123be15353b00ff03a7f0 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Thu, 6 Oct 2016 20:13:35 -0700 Subject: [PATCH 2/6] Trac 16475: Block flash too diff --git a/projects/mozilla/0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch b/projects/mozilla/0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch index 667d46a..4cd9013 100644 --- a/projects/mozilla/0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch +++ b/projects/mozilla/0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch @@ -1,4 +1,4 @@ -From 6dcf4662033b55c53401ed57e7d25d22ccf3e15b Mon Sep 17 00:00:00 2001 +From 401acfb1085f0ac9de8628a4f87d522fccbae8b1 Mon Sep 17 00:00:00 2001 From: Jonathan Kew <jkew(a)mozilla.com> Date: Sun, 9 Oct 2016 09:18:37 -0700 Subject: [PATCH 3/6] Trac 20206: Avoid the need to download the font Osaka diff --git a/projects/mozilla/0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch b/projects/mozilla/0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch index 06c97ca..0331884 100644 --- a/projects/mozilla/0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch +++ b/projects/mozilla/0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch @@ -1,4 +1,4 @@ -From ed613224bf375dd049edccdb6f1de8cfc5f9a149 Mon Sep 17 00:00:00 2001 +From 283d30517d1795fff99c0c193eeabe06043b591b Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Wed, 23 Mar 2016 19:52:07 -0700 Subject: [PATCH 4/6] Trac 18331: Update OS X toolchain to work with ESR 45 diff --git a/projects/mozilla/0005-OSX-package-as-tar.bz2.patch b/projects/mozilla/0005-OSX-package-as-tar.bz2.patch index 927e8cf..18652a0 100644 --- a/projects/mozilla/0005-OSX-package-as-tar.bz2.patch +++ b/projects/mozilla/0005-OSX-package-as-tar.bz2.patch @@ -1,4 +1,4 @@ -From 283a123b62870f7f8060d6e9164082f25b67927b Mon Sep 17 00:00:00 2001 +From 386cca851618f0d19f7ce07483c0b290e178ce46 Mon Sep 17 00:00:00 2001 From: Nicolas Vigier <boklm(a)torproject.org> Date: Thu, 25 Jun 2015 12:18:43 +0200 Subject: [PATCH 5/6] OSX: package as tar.bz2 diff --git a/projects/mozilla/0006-Updater-fixups-for-TM.patch b/projects/mozilla/0006-Updater-fixups-for-TM.patch index a0d7f47..0dd6a00 100644 --- a/projects/mozilla/0006-Updater-fixups-for-TM.patch +++ b/projects/mozilla/0006-Updater-fixups-for-TM.patch @@ -1,4 +1,4 @@ -From 94a4585f80a62a42f06e5433ba122e36ec60c418 Mon Sep 17 00:00:00 2001 +From 8f449e5b031577a45b80a58c798ad89bcf1ce2a6 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Sun, 9 Oct 2016 09:34:38 -0700 Subject: [PATCH 6/6] Updater fixups for TM diff --git a/projects/mozilla/config b/projects/mozilla/config index ca7d2b0..1c224be 100644 --- a/projects/mozilla/config +++ b/projects/mozilla/config @@ -2,7 +2,7 @@ version: '[% c("abbrev") %]' filename: 'mozilla-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' git_url: https://git.torproject.org/tor-browser.git -git_hash: e5dafab84b9b073bf1e510a8272c6ca35b4e396d +git_hash: f0382d95b8145b91bae099024bce64affff34523 input_files: - filename: 0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch - filename: 0002-Trac-16475-Block-flash-too.patch

1 0