- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-52.2.0esr-7.5-1] Don't break accessibility support for Windows
by gk＠torproject.org 31 Jul '17

31 Jul '17

commit 84d370aab03e45fbafef90b0fd99153e45a1b64a Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jul 31 11:07:12 2017 +0000 Don't break accessibility support for Windows This fixes https://bugzilla.mozilla.org/show_bug.cgi?id=1372959 --- ipc/mscom/Interceptor.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ipc/mscom/Interceptor.h b/ipc/mscom/Interceptor.h index ecddbddf5769..88acdf6650a8 100644 --- a/ipc/mscom/Interceptor.h +++ b/ipc/mscom/Interceptor.h @@ -112,7 +112,7 @@ CreateInterceptor(STAUniquePtr<InterfaceT> aTargetInterface, return E_INVALIDARG; } - REFIID iidTarget = __uuidof(aTargetInterface); + REFIID iidTarget = __uuidof(InterfaceT); STAUniquePtr<IUnknown> targetUnknown(aTargetInterface.release()); return Interceptor::Create(Move(targetUnknown), aEventSink, iidTarget,

1 0

[tor-browser/tor-browser-52.2.0esr-7.5-1] Revert "Getting Tor Browser to build with accessibility enabled on Windows"
by gk＠torproject.org 31 Jul '17

31 Jul '17

commit 2e5a0f5570f5b2ba0bf9d84cd74b6553407a0435 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Jul 12 11:47:39 2017 -0700 Revert "Getting Tor Browser to build with accessibility enabled on Windows" This reverts commit d890171dbb89ebb79df1522f6b37bda538ef7e32, because we have updated mingw-w64 to 1259532ff8f5a7ac625b2f28d499ee93a0c0841e --- ipc/mscom/Interceptor.h | 2 +- other-licenses/ia2/IA2TypeLibrary.idl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ipc/mscom/Interceptor.h b/ipc/mscom/Interceptor.h index 88acdf6650a8..ecddbddf5769 100644 --- a/ipc/mscom/Interceptor.h +++ b/ipc/mscom/Interceptor.h @@ -112,7 +112,7 @@ CreateInterceptor(STAUniquePtr<InterfaceT> aTargetInterface, return E_INVALIDARG; } - REFIID iidTarget = __uuidof(InterfaceT); + REFIID iidTarget = __uuidof(aTargetInterface); STAUniquePtr<IUnknown> targetUnknown(aTargetInterface.release()); return Interceptor::Create(Move(targetUnknown), aEventSink, iidTarget, diff --git a/other-licenses/ia2/IA2TypeLibrary.idl b/other-licenses/ia2/IA2TypeLibrary.idl index 97aa08b9a5f8..2519aca91e13 100644 --- a/other-licenses/ia2/IA2TypeLibrary.idl +++ b/other-licenses/ia2/IA2TypeLibrary.idl @@ -68,7 +68,7 @@ cpp_quote("") library IAccessible2Lib { importlib ("stdole2.tlb"); - //importlib ("oleacc.dll"); + importlib ("oleacc.dll"); interface IAccessible2; interface IAccessible2_2; interface IAccessible2_3;

1 0

[tor-browser-bundle/master] Bug 22563: Update mingw-w64 to fix W^X violations
by gk＠torproject.org 31 Jul '17

31 Jul '17

commit b42927a08821f1e1d46267156c369e3b45379758 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Sun Jul 16 22:31:13 2017 -0700 Bug 22563: Update mingw-w64 to fix W^X violations --- gitian/versions.alpha | 2 +- gitian/versions.nightly | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index a29572a..17d3849 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -23,7 +23,7 @@ NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable CMAKE_TAG=v2.8.12.2 -MINGW_TAG=98e5b4930a717eafddd8ca0f0dfeb7c57c6b026a +MINGW_TAG=1259532ff8f5a7ac625b2f28d499ee93a0c0841e PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 LIBFTE_TAG=85ef8ae58dbf0d02ea26b627e343784b5574c428 # sketch master with fix diff --git a/gitian/versions.nightly b/gitian/versions.nightly index e050347..1f392c3 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -26,7 +26,7 @@ NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable CMAKE_TAG=v2.8.12.2 -MINGW_TAG=98e5b4930a717eafddd8ca0f0dfeb7c57c6b026a +MINGW_TAG=1259532ff8f5a7ac625b2f28d499ee93a0c0841e PYPTLIB_TAG=master OBFSPROXY_TAG=master LIBFTE_TAG=master

1 0

[tor-browser-build/master] Update noscript
by boklm＠torproject.org 28 Jul '17

28 Jul '17

commit 867ebd59598ae3a77d84c21d008b2c6debec372b Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Jul 28 19:04:43 2017 +0200 Update noscript This fixes bug 22067. tor-browser-bundle.git author: Georg Koppen <gk(a)torproject.org> tor-browser-bundle.git commit: 0437834017c1c7ff168da868d9dcb2f2519fd122 --- projects/tor-browser/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 8e8398a..fef279b 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -54,9 +54,9 @@ input_files: name: snowflake enable: '[% c("var/snowflake") %]' - filename: Bundle-Data - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: bf1dee39f6e5936df2b03b794c1efc9236b440536a05fafcff667e33903e6aed + sha256sum: fe85a4c72b5a763462f3b264f54a0ef1c6f6879eb95d903f2dfee337f768a50b - filename: RelativeLink enable: '[% c("var/linux") %]' - project: libdmg-hfsplus

1 0

[tor-browser-bundle/maint-7.0] Updating NoScript
by gk＠torproject.org 28 Jul '17

28 Jul '17

commit 12565f000a09b27b7dbd9ea864c5004b6d8324a9 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jul 28 16:21:20 2017 +0000 Updating NoScript This fixes bug 22067. --- gitian/versions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions b/gitian/versions index 108d085..873aa7f 100755 --- a/gitian/versions +++ b/gitian/versions @@ -67,7 +67,7 @@ YASM_VER=1.2.0 ## 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-5.0.5-fx+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-5.0.7.1-fx+sm.xpi CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz MSVCR100_PACKAGE=msvcr100.dll @@ -102,7 +102,7 @@ YASM_PACKAGE=yasm-${YASM_VER}.tar.gz OPENSSL_HASH=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf -NOSCRIPT_HASH=bf1dee39f6e5936df2b03b794c1efc9236b440536a05fafcff667e33903e6aed +NOSCRIPT_HASH=fe85a4c72b5a763462f3b264f54a0ef1c6f6879eb95d903f2dfee337f768a50b CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/master] Updating Noscript
by gk＠torproject.org 28 Jul '17

28 Jul '17

commit 0437834017c1c7ff168da868d9dcb2f2519fd122 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jul 28 16:19:01 2017 +0000 Updating Noscript This fixes bug 22067. --- 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 ee7384c..a29572a 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -77,7 +77,7 @@ ELFUTILS_VER=0.166 ## 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-5.0.5-fx+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-5.0.7.1-fx+sm.xpi CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz MSVCR100_PACKAGE=msvcr100.dll @@ -113,7 +113,7 @@ ELFUTILS_PACKAGE=elfutils-${ELFUTILS_VER}.tar.bz2 OPENSSL_HASH=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf -NOSCRIPT_HASH=bf1dee39f6e5936df2b03b794c1efc9236b440536a05fafcff667e33903e6aed +NOSCRIPT_HASH=fe85a4c72b5a763462f3b264f54a0ef1c6f6879eb95d903f2dfee337f768a50b CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 5fe2881..e050347 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -80,7 +80,7 @@ ELFUTILS_VER=0.166 ## 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-5.0.5-fx+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-5.0.7.1-fx+sm.xpi CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz MSVCR100_PACKAGE=msvcr100.dll @@ -116,7 +116,7 @@ ELFUTILS_PACKAGE=elfutils-${ELFUTILS_VER}.tar.bz2 OPENSSL_HASH=ce07195b659e75f4e1db43552860070061f156a98bb37b672b101ba6e3ddf30c GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf -NOSCRIPT_HASH=bf1dee39f6e5936df2b03b794c1efc9236b440536a05fafcff667e33903e6aed +NOSCRIPT_HASH=fe85a4c72b5a763462f3b264f54a0ef1c6f6879eb95d903f2dfee337f768a50b CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/maint-7.0] Apply patch for bug 23044
by gk＠torproject.org 27 Jul '17

27 Jul '17

commit a11a8b301950e1c25adcfd5bea07c773f5082533 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jul 27 08:10:20 2017 +0000 Apply patch for bug 23044 --- gitian/descriptors/linux/gitian-firefox.yml | 2 ++ gitian/patches/gio.patch | 48 +++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 1ff66a2..49c457c 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -33,6 +33,7 @@ files: - "gcc-linux32-utils.zip" - "gcc-linux64-utils.zip" - "get-moz-build-date" +- "gio.patch" - "re-dzip.sh" - "dzip.sh" - "versions" @@ -88,6 +89,7 @@ script: | mkdir -p $INSTDIR/Debug/Browser/ cd tor-browser + patch -p1 < ../gio.patch # run get-moz-build-date before removing .git, which is used to get the year chmod +x ~/build/get-moz-build-date eval $(~/build/get-moz-build-date $(cat browser/config/version.txt)) diff --git a/gitian/patches/gio.patch b/gitian/patches/gio.patch new file mode 100644 index 0000000..1edae4d --- /dev/null +++ b/gitian/patches/gio.patch @@ -0,0 +1,48 @@ +From a96f898e0da42de751a5e1367a9899cc96fadb1f Mon Sep 17 00:00:00 2001 +From: Georg Koppen <gk(a)torproject.org> +Date: Thu, 27 Jul 2017 07:31:38 +0000 +Subject: [PATCH] Bug 23044: Don't allow GIO supported protocols by default + + +diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js +index aaeba630422d..3edaad88f59e 100644 +--- a/browser/app/profile/000-tor-browser.js ++++ b/browser/app/profile/000-tor-browser.js +@@ -210,6 +210,9 @@ pref("network.protocol-handler.warn-external.mailto", true); + pref("network.protocol-handler.warn-external.news", true); + pref("network.protocol-handler.warn-external.nntp", true); + pref("network.protocol-handler.warn-external.snews", true); ++// Make sure we don't have any GIO supported protocols (defense in depth ++// measure) ++pref("network.gio.supported-protocols", ""); + pref("plugin.disable", true); // Disable to search plugins on first start + pref("plugins.click_to_play", true); + pref("plugin.state.flash", 1); +diff --git a/extensions/gio/nsGIOProtocolHandler.cpp b/extensions/gio/nsGIOProtocolHandler.cpp +index a378e8700821..5f6b2a0a2a57 100644 +--- a/extensions/gio/nsGIOProtocolHandler.cpp ++++ b/extensions/gio/nsGIOProtocolHandler.cpp +@@ -922,16 +922,16 @@ nsGIOProtocolHandler::InitSupportedProtocolsPref(nsIPrefBranch *prefs) + // Get user preferences to determine which protocol is supported. + // Gvfs/GIO has a set of supported protocols like obex, network, archive, + // computer, dav, cdda, gphoto2, trash, etc. Some of these seems to be +- // irrelevant to process by browser. By default accept only smb and sftp +- // protocols so far. ++ // irrelevant to process by browser. By default accept none. + nsresult rv = prefs->GetCharPref(MOZ_GIO_SUPPORTED_PROTOCOLS, + getter_Copies(mSupportedProtocols)); + if (NS_SUCCEEDED(rv)) { + mSupportedProtocols.StripWhitespace(); + ToLowerCase(mSupportedProtocols); + } +- else +- mSupportedProtocols.AssignLiteral("smb:,sftp:"); // use defaults ++ else { ++ mSupportedProtocols.AssignLiteral(""); // use none by default ++ } + + LOG(("gio: supported protocols \"%s\"\n", mSupportedProtocols.get())); + } +-- +2.13.2 +

1 0

[tor-browser-bundle/maint-7.0] Changelog update, and config.yml changes
by gk＠torproject.org 27 Jul '17

27 Jul '17

commit fb678ac1a95ed724f0edb8bc1f7c748d0ef8b8d1 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jul 27 08:06:44 2017 +0000 Changelog update, and config.yml changes --- Bundle-Data/Docs/ChangeLog.txt | 4 ++++ tools/update-responses/config.yml | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index c7cb8c2..d509505 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,7 @@ +Tor Browser 7.0.3 -- July 27 2017 + * Linux + * Bug 23044: Don't allow GIO supported protocols by default + Tor Browser 7.0.2 -- July 3 2017 * All Platforms * Update Tor to 0.3.0.9, fixing bug #22753 diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 9ff92ce..1547dfd 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -20,13 +20,13 @@ build_targets: osx64: Darwin_x86_64-gcc3 channels: alpha: 7.0a4 - release: 7.0.2 + release: 7.0.3 versions: - 7.0.2: + 7.0.3: platformVersion: 52.2.0 - detailsURL: https://blog.torproject.org/blog/tor-browser-702-released + detailsURL: https://blog.torproject.org/blog/tor-browser-703-released incremental_from: - - 7.0.1 + - 7.0.2 migrate_archs: osx32: osx64 migrate_langs:

1 0

[tor-browser/tor-browser-52.2.0esr-7.5-1] Bug 23044: Don't allow GIO supported protocols by default
by gk＠torproject.org 27 Jul '17

27 Jul '17

commit a96f898e0da42de751a5e1367a9899cc96fadb1f Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jul 27 07:31:38 2017 +0000 Bug 23044: Don't allow GIO supported protocols by default --- browser/app/profile/000-tor-browser.js | 3 +++ extensions/gio/nsGIOProtocolHandler.cpp | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index aaeba630422d..3edaad88f59e 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -210,6 +210,9 @@ pref("network.protocol-handler.warn-external.mailto", true); pref("network.protocol-handler.warn-external.news", true); pref("network.protocol-handler.warn-external.nntp", true); pref("network.protocol-handler.warn-external.snews", true); +// Make sure we don't have any GIO supported protocols (defense in depth +// measure) +pref("network.gio.supported-protocols", ""); pref("plugin.disable", true); // Disable to search plugins on first start pref("plugins.click_to_play", true); pref("plugin.state.flash", 1); diff --git a/extensions/gio/nsGIOProtocolHandler.cpp b/extensions/gio/nsGIOProtocolHandler.cpp index a378e8700821..5f6b2a0a2a57 100644 --- a/extensions/gio/nsGIOProtocolHandler.cpp +++ b/extensions/gio/nsGIOProtocolHandler.cpp @@ -922,16 +922,16 @@ nsGIOProtocolHandler::InitSupportedProtocolsPref(nsIPrefBranch *prefs) // Get user preferences to determine which protocol is supported. // Gvfs/GIO has a set of supported protocols like obex, network, archive, // computer, dav, cdda, gphoto2, trash, etc. Some of these seems to be - // irrelevant to process by browser. By default accept only smb and sftp - // protocols so far. + // irrelevant to process by browser. By default accept none. nsresult rv = prefs->GetCharPref(MOZ_GIO_SUPPORTED_PROTOCOLS, getter_Copies(mSupportedProtocols)); if (NS_SUCCEEDED(rv)) { mSupportedProtocols.StripWhitespace(); ToLowerCase(mSupportedProtocols); } - else - mSupportedProtocols.AssignLiteral("smb:,sftp:"); // use defaults + else { + mSupportedProtocols.AssignLiteral(""); // use none by default + } LOG(("gio: supported protocols \"%s\"\n", mSupportedProtocols.get())); }

1 0

[tor-browser/tor-browser-52.2.0esr-7.0-1] Bug 23044: Don't allow GIO supported protocols by default
by gk＠torproject.org 27 Jul '17

27 Jul '17

commit 720f9061496321aa978d2f022113c40e9aeb4847 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jul 27 07:31:38 2017 +0000 Bug 23044: Don't allow GIO supported protocols by default --- browser/app/profile/000-tor-browser.js | 3 +++ extensions/gio/nsGIOProtocolHandler.cpp | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index d2fb5e57378a..dc7e99701293 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -210,6 +210,9 @@ pref("network.protocol-handler.warn-external.mailto", true); pref("network.protocol-handler.warn-external.news", true); pref("network.protocol-handler.warn-external.nntp", true); pref("network.protocol-handler.warn-external.snews", true); +// Make sure we don't have any GIO supported protocols (defense in depth +// measure) +pref("network.gio.supported-protocols", ""); pref("plugin.disable", true); // Disable to search plugins on first start pref("plugins.click_to_play", true); pref("plugin.state.flash", 1); diff --git a/extensions/gio/nsGIOProtocolHandler.cpp b/extensions/gio/nsGIOProtocolHandler.cpp index a378e8700821..5f6b2a0a2a57 100644 --- a/extensions/gio/nsGIOProtocolHandler.cpp +++ b/extensions/gio/nsGIOProtocolHandler.cpp @@ -922,16 +922,16 @@ nsGIOProtocolHandler::InitSupportedProtocolsPref(nsIPrefBranch *prefs) // Get user preferences to determine which protocol is supported. // Gvfs/GIO has a set of supported protocols like obex, network, archive, // computer, dav, cdda, gphoto2, trash, etc. Some of these seems to be - // irrelevant to process by browser. By default accept only smb and sftp - // protocols so far. + // irrelevant to process by browser. By default accept none. nsresult rv = prefs->GetCharPref(MOZ_GIO_SUPPORTED_PROTOCOLS, getter_Copies(mSupportedProtocols)); if (NS_SUCCEEDED(rv)) { mSupportedProtocols.StripWhitespace(); ToLowerCase(mSupportedProtocols); } - else - mSupportedProtocols.AssignLiteral("smb:,sftp:"); // use defaults + else { + mSupportedProtocols.AssignLiteral(""); // use none by default + } LOG(("gio: supported protocols \"%s\"\n", mSupportedProtocols.get())); }

1 0

[tor-browser-build/master] README: mention which version of runc is needed
by boklm＠torproject.org 26 Jul '17

26 Jul '17

commit b386c5f8af06e605bdb84c5bae8bde3c8afbd485 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jul 26 12:10:54 2017 +0200 README: mention which version of runc is needed --- README | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README b/README index fa968ff..2fcfadf 100644 --- a/README +++ b/README @@ -5,8 +5,12 @@ Installing build dependencies ----------------------------- To build Tor Browser, you need a Linux distribution that has support -for runC (such as Debian jessie, Ubuntu 14.04, Fedora 20, etc ...). -On Debian jessie, the runc package is available in backports. +for runc (such as Debian jessie, Ubuntu 14.04, Fedora 20, etc ...). +On Debian jessie, the runc package is available in backports. On Debian +stretch, the runc package is available in the main repository. +Version 0.1.1 of runc is required (which is the version available in +Debian stretch and jessie-backports). It is not yet working with runc +version 1.0.0: https://trac.torproject.org/projects/tor/ticket/23039 Your user account should have access sudo access, which is required to be able to extract container file systems, start containers and copy

1 0

[tor-browser-build/master] Include uid in tmp containers directory
by boklm＠torproject.org 26 Jul '17

26 Jul '17

commit 9084d642cfc291df76b9fd4acecdce5aeb7f71b9 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jul 26 12:09:07 2017 +0200 Include uid in tmp containers directory This should allow multiple users to do builds on the same machine. --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index ce444d4..4ef6b90 100644 --- a/rbm.conf +++ b/rbm.conf @@ -28,7 +28,7 @@ var: build: [% c("build", { filename => 'f', output_dir => '/out' }) %] container: - dir: '[% c("tmp_dir") %]/rbm-containers/[% sha256(c("build_id")) %]' + dir: '[% c("tmp_dir") %]/[% c("uid") %]/rbm-containers/[% sha256(c("build_id")) %]' user: rbm input_files_list: | [% FOREACH file IN c("input_files_by_name").keys.sort -%]

1 0

[tor-browser-build/master] Remove some unused options
by boklm＠torproject.org 26 Jul '17

26 Jul '17

commit 0a9f7ef3459d4e19d22bc312cdaa5961eaa650da Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jul 26 11:40:54 2017 +0200 Remove some unused options --- projects/debootstrap-image/config | 3 --- 1 file changed, 3 deletions(-) diff --git a/projects/debootstrap-image/config b/projects/debootstrap-image/config index 15eec3b..ecb7f2d 100644 --- a/projects/debootstrap-image/config +++ b/projects/debootstrap-image/config @@ -5,9 +5,6 @@ pkg_type: build var: ubuntu_version: 17.04 - container_dir: '[% c("tmp_dir") %]/rbm-containers/[% sha256(c("build_id")) %]' - container_user: rbm - container: use_container: 1 # We need CAP_SYS_ADMIN for debootstrap to work

1 0

[tor-browser-bundle/maint-7.0] Bug 23028: update argparse URL
by gk＠torproject.org 25 Jul '17

25 Jul '17

1 0

[tor-browser-bundle/master] Bug 23028: update argparse URL
by gk＠torproject.org 25 Jul '17

25 Jul '17

1 0

[tor-browser-build/master] Bug 20929: Bump GCC version to 5.4.0
by gk＠torproject.org 25 Jul '17

25 Jul '17

commit 51ed356d2d4d411b7566987a7cc63d61c0ecd9d4 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Jul 25 14:32:21 2017 +0200 Bug 20929: Bump GCC version to 5.4.0 We bump our GCC compiler to 5.4.0 as this fixes some bugs in previous versions. It allows us in particular to build debug builds for Windows with mingw-w64. tor-browser-bundle.git author: Georg Koppen <gk(a)torproject.org> --- projects/gcc/config | 4 ++-- projects/mingw-w64/config | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/gcc/config b/projects/gcc/config index 6bf14ad..de4ecc5 100644 --- a/projects/gcc/config +++ b/projects/gcc/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -version: 5.1.0 +version: 5.4.0 var: container: use_container: 1 @@ -59,4 +59,4 @@ targets: input_files: - project: container-image - URL: 'https://ftp.gnu.org/gnu/gcc/gcc-[% c("version") %]/gcc-[% c("version") %].tar.bz2' - sha256sum: b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad + sha256sum: 608df76dec2d34de6558249d8af4cbee21eceddbcb580d666f7a5a583ca3303a diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config index 5e2c748..61a34bd 100644 --- a/projects/mingw-w64/config +++ b/projects/mingw-w64/config @@ -6,7 +6,7 @@ version: '[% c("abbrev") %]' var: container: use_container: 1 - gcc_version: 5.1.0 + gcc_version: 5.4.0 deps: - automake - build-essential @@ -21,7 +21,7 @@ var: input_files: - project: container-image - URL: 'https://ftp.gnu.org/gnu/gcc/gcc-[% c("var/gcc_version") %]/gcc-[% c("var/gcc_version") %].tar.bz2' - sha256sum: b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad + sha256sum: 608df76dec2d34de6558249d8af4cbee21eceddbcb580d666f7a5a583ca3303a - name: binutils project: binutils - filename: i686-w64-mingw32-g++

1 0

[tor-browser-bundle/master] Bug 20929: Bump GCC version to 5.4.0
by gk＠torproject.org 25 Jul '17

25 Jul '17

commit f890b38fd0ffc2572edc0e4dafc8a3aa3d16faa0 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jul 11 15:27:58 2017 +0000 Bug 20929: Bump GCC version to 5.4.0 We bump our GCC compiler to 5.4.0 as this fixes some bugs in previous versions. It allows us in particular to build debug builds for Windows with mingw-w64. --- 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 6351f27..025e277 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -56,7 +56,7 @@ GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 -GCC_VER=5.1.0 +GCC_VER=5.4.0 CLANG_VER=3.8.0 PYTHON_VER=2.7.5 PYCRYPTO_VER=2.6.1 @@ -128,7 +128,7 @@ GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 GO_HASH=5f5dea2447e7dcfdc50fa6b94c512e58bfba5673c039259fd843f68829d99fa6 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a -GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad +GCC_HASH=608df76dec2d34de6558249d8af4cbee21eceddbcb580d666f7a5a583ca3303a STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da diff --git a/gitian/versions.nightly b/gitian/versions.nightly index b89befb..f0c4be7 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -59,7 +59,7 @@ GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 -GCC_VER=5.1.0 +GCC_VER=5.4.0 CLANG_VER=3.8.0 PYTHON_VER=2.7.5 PYCRYPTO_VER=2.6.1 @@ -131,7 +131,7 @@ GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 GO_HASH=5f5dea2447e7dcfdc50fa6b94c512e58bfba5673c039259fd843f68829d99fa6 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a -GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad +GCC_HASH=608df76dec2d34de6558249d8af4cbee21eceddbcb580d666f7a5a583ca3303a STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da

1 0

[tor-launcher/master] Bug 22592: Default bridge settings are not removed
by gk＠torproject.org 25 Jul '17

25 Jul '17

commit 2a938feb78b49098ead0599769835cbc2a7dc183 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Jul 24 16:13:28 2017 -0400 Bug 22592: Default bridge settings are not removed When the user clicks on "Remove Settings and Connect", clear the preference `extensions.torlauncher.default_bridge_type` to ensure that default bridges are not used any more. --- src/chrome/content/network-settings.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 5df4e1e..830ef31 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -1493,6 +1493,9 @@ function applyBridgeSettings(aUseDefaults) if (!settings) return false; + if (aUseDefaults) + TorLauncherUtil.setCharPref(kPrefDefaultBridgeType, ""); + return setConfAndReportErrors(settings, "bridgeSettings"); }

1 0

[tor-browser-build/master] Bug 22499: Add fteproxy, obfsproxy, and dependencies, for Linux
by boklm＠torproject.org 24 Jul '17

24 Jul '17

commit 7ebcf64903bf540504ff96dbe5324284957e1524 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jul 24 10:47:43 2017 +0200 Bug 22499: Add fteproxy, obfsproxy, and dependencies, for Linux --- keyring/obfsproxy.gpg | Bin 0 -> 2215 bytes keyring/pyptlib.gpg | Bin 0 -> 2215 bytes projects/argparse/build | 16 ++++++++++++++++ projects/argparse/config | 19 +++++++++++++++++++ projects/fteproxy/build | 16 ++++++++++++++++ projects/fteproxy/config | 20 ++++++++++++++++++++ projects/libfte/build | 22 ++++++++++++++++++++++ projects/libfte/config | 23 +++++++++++++++++++++++ projects/obfsproxy/build | 18 ++++++++++++++++++ projects/obfsproxy/config | 22 ++++++++++++++++++++++ projects/parsley/build | 16 ++++++++++++++++ projects/parsley/config | 19 +++++++++++++++++++ projects/pycrypto/build | 24 ++++++++++++++++++++++++ projects/pycrypto/config | 20 ++++++++++++++++++++ projects/pyptlib/build | 16 ++++++++++++++++ projects/pyptlib/config | 21 +++++++++++++++++++++ projects/pyyaml/build | 16 ++++++++++++++++ projects/pyyaml/config | 19 +++++++++++++++++++ projects/twisted/build | 16 ++++++++++++++++ projects/twisted/config | 19 +++++++++++++++++++ projects/txsocksx/build | 21 +++++++++++++++++++++ projects/txsocksx/config | 19 +++++++++++++++++++ projects/zope.interface/build | 16 ++++++++++++++++ projects/zope.interface/config | 19 +++++++++++++++++++ 24 files changed, 417 insertions(+) diff --git a/keyring/obfsproxy.gpg b/keyring/obfsproxy.gpg new file mode 100644 index 0000000..4381baa Binary files /dev/null and b/keyring/obfsproxy.gpg differ diff --git a/keyring/pyptlib.gpg b/keyring/pyptlib.gpg new file mode 100644 index 0000000..4381baa Binary files /dev/null and b/keyring/pyptlib.gpg differ diff --git a/projects/argparse/build b/projects/argparse/build new file mode 100644 index 0000000..938c5e9 --- /dev/null +++ b/projects/argparse/build @@ -0,0 +1,16 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +distdir="/var/tmp/dist/[% project %]" +[% c("var/set_PTDIR_DOCSDIR") -%] +mkdir -p $PTDIR +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz +cd /var/tmp/build/[% project %]-[% c('version') %] +export PYTHON=python2 +$PYTHON setup.py build --build-lib build +cp -a build/argparse.py $PTDIR/ +cd $distdir +[% c('tar', { + tar_src => [ '.' ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/argparse/config b/projects/argparse/config new file mode 100644 index 0000000..87f80b0 --- /dev/null +++ b/projects/argparse/config @@ -0,0 +1,19 @@ +# vim: filetype=yaml sw=2 +version: 1.2.1 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +var: + container: + use_container: 1 + +targets: + linux: + var: + arch_deps: + - python-setuptools + - python-dev + +input_files: + - project: container-image + - URL: 'https://pypi.python.org/packages/source/a/argparse/argparse-[% c("version") %].tar.gz' + sha256sum: ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 diff --git a/projects/fteproxy/build b/projects/fteproxy/build new file mode 100644 index 0000000..b33c3a5 --- /dev/null +++ b/projects/fteproxy/build @@ -0,0 +1,16 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +distdir="/var/tmp/dist/[% project %]" +[% c("var/set_PTDIR_DOCSDIR") -%] +mkdir -p $PTDIR $DOCSDIR +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz +cd /var/tmp/build/[% project %]-[% c('version') %] +cp -a bin/fteproxy $PTDIR/fteproxy.bin +cp -ra fteproxy $PTDIR/ +cp -a {COPYING,README.md} $DOCSDIR/ +cd $distdir +[% c('tar', { + tar_src => [ '.' ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/fteproxy/config b/projects/fteproxy/config new file mode 100644 index 0000000..059381b --- /dev/null +++ b/projects/fteproxy/config @@ -0,0 +1,20 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/kpdyer/fteproxy.git +# tag 0.2.19 +git_hash: 597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +var: + container: + use_container: 1 + +targets: + linux: + var: + arch_deps: + - python-setuptools + - python-dev + +input_files: + - project: container-image diff --git a/projects/libfte/build b/projects/libfte/build new file mode 100644 index 0000000..fc7b9f6 --- /dev/null +++ b/projects/libfte/build @@ -0,0 +1,22 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +[% c("var/setarch") -%] +[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] +distdir="/var/tmp/dist/[% project %]" +[% c("var/set_PTDIR_DOCSDIR") -%] +mkdir -p $PTDIR $DOCSDIR +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz +cd /var/tmp/build/[% project %]-[% c('version') %] +tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/gmp') %] +ln -s /var/tmp/dist/gmp thirdparty/gmp +export PYTHON=python2 +make +cp -ra fte $PTDIR/ +cp -a {LICENSE,README.md} $DOCSDIR/ +cp -a thirdparty/re2/LICENSE $DOCSDIR/LICENSE.re2 +cd $distdir +[% c('tar', { + tar_src => [ '.' ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/libfte/config b/projects/libfte/config new file mode 100644 index 0000000..e2219a7 --- /dev/null +++ b/projects/libfte/config @@ -0,0 +1,23 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/kpdyer/libfte.git +git_hash: 85ef8ae58dbf0d02ea26b627e343784b5574c428 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +var: + container: + use_container: 1 + +targets: + linux: + var: + arch_deps: + - python-setuptools + - python-dev + +input_files: + - project: container-image + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + - project: gmp + name: gmp diff --git a/projects/obfsproxy/build b/projects/obfsproxy/build new file mode 100644 index 0000000..841c608 --- /dev/null +++ b/projects/obfsproxy/build @@ -0,0 +1,18 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +distdir="/var/tmp/dist/[% project %]" +[% c("var/set_PTDIR_DOCSDIR") -%] +mkdir -p $PTDIR $DOCSDIR +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz +cd /var/tmp/build/[% project %]-[% c('version') %] +export PYTHON=python2 +$PYTHON setup.py build --build-lib build +cp -a build/obfsproxy $PTDIR/ +cp -a bin/obfsproxy $PTDIR/obfsproxy.bin +cp -a {LICENSE,README} $DOCSDIR +cd $distdir +[% c('tar', { + tar_src => [ '.' ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/obfsproxy/config b/projects/obfsproxy/config new file mode 100644 index 0000000..ad436dd --- /dev/null +++ b/projects/obfsproxy/config @@ -0,0 +1,22 @@ +# vim: filetype=yaml sw=2 +version: 0.2.12 +git_url: https://git.torproject.org/pluggable-transports/obfsproxy.git +git_hash: 'obfsproxy-[% c("version") %]' +tag_gpg_id: 1 +gpg_keyring: obfsproxy.gpg +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +var: + DOCSDIR_project: Obsfproxy + container: + use_container: 1 + +targets: + linux: + var: + arch_deps: + - python-setuptools + - python-dev + +input_files: + - project: container-image diff --git a/projects/parsley/build b/projects/parsley/build new file mode 100644 index 0000000..ea5f19a --- /dev/null +++ b/projects/parsley/build @@ -0,0 +1,16 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +distdir="/var/tmp/dist/[% project %]" +[% c("var/set_PTDIR_DOCSDIR") -%] +mkdir -p $PTDIR +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf $rootdir/Parsley-[% c('version') %].tar.gz +cd /var/tmp/build/Parsley-[% c('version') %] +export PYTHON=python2 +$PYTHON setup.py build --build-lib build +cp -a build/parsley.py build/ometa build/terml $PTDIR/ +cd $distdir +[% c('tar', { + tar_src => [ '.' ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/parsley/config b/projects/parsley/config new file mode 100644 index 0000000..72d5bfc --- /dev/null +++ b/projects/parsley/config @@ -0,0 +1,19 @@ +# vim: filetype=yaml sw=2 +version: 1.2 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +var: + container: + use_container: 1 + +targets: + linux: + var: + arch_deps: + - python-setuptools + - python-dev + +input_files: + - project: container-image + - URL: 'https://pypi.python.org/packages/source/P/Parsley/Parsley-[% c("version") %].tar.gz' + sha256sum: 50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 diff --git a/projects/pycrypto/build b/projects/pycrypto/build new file mode 100644 index 0000000..9b005ab --- /dev/null +++ b/projects/pycrypto/build @@ -0,0 +1,24 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +[% c("var/setarch") -%] +[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] +distdir="/var/tmp/dist/[% project %]" +[% c("var/set_PTDIR_DOCSDIR") -%] +mkdir -p $PTDIR +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz +cd /var/tmp/build/[% project %]-[% c('version') %] +export PYTHON=python2 +[% IF c("var/linux-i686") -%] + export CFLAGS=-m32 + export CXXFLAGS=-m32 + export LDFLAGS=-m32 +[% END -%] +./configure --build=i686-linux-gnu [% c("var/configure_opt") %] +$PYTHON setup.py build --build-lib build +cp -a build/Crypto $PTDIR/ +cd $distdir +[% c('tar', { + tar_src => [ '.' ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/pycrypto/config b/projects/pycrypto/config new file mode 100644 index 0000000..3a9f24b --- /dev/null +++ b/projects/pycrypto/config @@ -0,0 +1,20 @@ +# vim: filetype=yaml sw=2 +version: 2.6.1 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +var: + container: + use_container: 1 + +targets: + linux: + var: + arch_deps: + - python-dev + - python-setuptools + +input_files: + - project: container-image + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + - URL: 'https://pypi.python.org/packages/source/p/pycrypto/pycrypto-[% c("version") %].tar.gz' + sha256sum: f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/projects/pyptlib/build b/projects/pyptlib/build new file mode 100644 index 0000000..1dc0c07 --- /dev/null +++ b/projects/pyptlib/build @@ -0,0 +1,16 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +distdir="/var/tmp/dist/[% project %]" +[% c("var/set_PTDIR_DOCSDIR") -%] +mkdir -p $PTDIR +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz +cd /var/tmp/build/[% project %]-[% c('version') %] +export PYTHON=python2 +$PYTHON setup.py build --build-lib build +cp -a build/pyptlib $PTDIR/ +cd $distdir +[% c('tar', { + tar_src => [ '.' ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/pyptlib/config b/projects/pyptlib/config new file mode 100644 index 0000000..e8ca100 --- /dev/null +++ b/projects/pyptlib/config @@ -0,0 +1,21 @@ +# vim: filetype=yaml sw=2 +version: 0.0.6 +git_url: https://git.torproject.org/pluggable-transports/pyptlib.git +git_hash: 'pyptlib-[% c("version") %]' +tag_gpg_id: 1 +gpg_keyring: pyptlib.gpg +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +var: + container: + use_container: 1 + +targets: + linux: + var: + arch_deps: + - python-setuptools + - python-dev + +input_files: + - project: container-image diff --git a/projects/pyyaml/build b/projects/pyyaml/build new file mode 100644 index 0000000..c10855c --- /dev/null +++ b/projects/pyyaml/build @@ -0,0 +1,16 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +distdir="/var/tmp/dist/[% project %]" +[% c("var/set_PTDIR_DOCSDIR") -%] +mkdir -p $PTDIR +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf $rootdir/PyYAML-[% c('version') %].tar.gz +cd /var/tmp/build/PyYAML-[% c('version') %] +export PYTHON=python2 +$PYTHON setup.py build --build-lib build +cp -a build/yaml $PTDIR/ +cd $distdir +[% c('tar', { + tar_src => [ '.' ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/pyyaml/config b/projects/pyyaml/config new file mode 100644 index 0000000..5324c10 --- /dev/null +++ b/projects/pyyaml/config @@ -0,0 +1,19 @@ +# vim: filetype=yaml sw=2 +version: 3.11 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +var: + container: + use_container: 1 + +targets: + linux: + var: + arch_deps: + - python-setuptools + - python-dev + +input_files: + - project: container-image + - URL: 'https://pypi.python.org/packages/source/P/PyYAML/PyYAML-[% c("version") %].tar.gz' + sha256sum: c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8 diff --git a/projects/twisted/build b/projects/twisted/build new file mode 100644 index 0000000..acc5c9d --- /dev/null +++ b/projects/twisted/build @@ -0,0 +1,16 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +distdir="/var/tmp/dist/[% project %]" +[% c("var/set_PTDIR_DOCSDIR") -%] +mkdir -p $PTDIR +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf $rootdir/Twisted-[% c('version') %].tar.bz2 +cd /var/tmp/build/Twisted-[% c('version') %] +export PYTHON=python2 +$PYTHON setup.py build --build-lib build +cp -a build/twisted $PTDIR/ +cd $distdir +[% c('tar', { + tar_src => [ '.' ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/twisted/config b/projects/twisted/config new file mode 100644 index 0000000..f2f7de8 --- /dev/null +++ b/projects/twisted/config @@ -0,0 +1,19 @@ +# vim: filetype=yaml sw=2 +version: 13.2.0 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +var: + container: + use_container: 1 + +targets: + linux: + var: + arch_deps: + - python-setuptools + - python-dev + +input_files: + - project: container-image + - URL: 'https://pypi.python.org/packages/source/T/Twisted/Twisted-[% c("version") %].tar.bz2' + sha256sum: 095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3 diff --git a/projects/txsocksx/build b/projects/txsocksx/build new file mode 100644 index 0000000..3491a26 --- /dev/null +++ b/projects/txsocksx/build @@ -0,0 +1,21 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +distdir="/var/tmp/dist/[% project %]" +[% c("var/set_PTDIR_DOCSDIR") -%] +mkdir -p $PTDIR +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz +cd /var/tmp/build/[% project %]-[% c('version') %] +# Let's pretend we have the setup dependency already as we don't want to get +# it downloaded during building. Just pretending and thus avoiding another +# dependency should be fine here as txsocksx catches the exception due to +# missing __version__ and __sha__ . +mkdir vcversioner-1.14.1.1-py2.7.egg +export PYTHON=python2 +$PYTHON setup.py build --build-lib build +cp -a build/txsocksx $PTDIR/ +cd $distdir +[% c('tar', { + tar_src => [ '.' ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/txsocksx/config b/projects/txsocksx/config new file mode 100644 index 0000000..6142943 --- /dev/null +++ b/projects/txsocksx/config @@ -0,0 +1,19 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/habnabit/txsocksx.git +git_hash: 216eb0894a1755872f4789f9458aa6cf543b8433 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +var: + container: + use_container: 1 + +targets: + linux: + var: + arch_deps: + - python-setuptools + - python-dev + +input_files: + - project: container-image diff --git a/projects/zope.interface/build b/projects/zope.interface/build new file mode 100644 index 0000000..23501a3 --- /dev/null +++ b/projects/zope.interface/build @@ -0,0 +1,16 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +distdir="/var/tmp/dist/[% project %]" +[% c("var/set_PTDIR_DOCSDIR") -%] +mkdir -p $PTDIR +mkdir -p /var/tmp/build +unzip -d /var/tmp/build $rootdir/[% project %]-[% c('version') %].zip +cd /var/tmp/build/[% project %]-[% c('version') %] +export PYTHON=python2 +$PYTHON setup.py build --build-lib build +cp -a build/zope $PTDIR/ +cd $distdir +[% c('tar', { + tar_src => [ '.' ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/zope.interface/config b/projects/zope.interface/config new file mode 100644 index 0000000..9743b79 --- /dev/null +++ b/projects/zope.interface/config @@ -0,0 +1,19 @@ +# vim: filetype=yaml sw=2 +version: 4.0.5 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +var: + container: + use_container: 1 + +targets: + linux: + var: + arch_deps: + - python-setuptools + - python-dev + +input_files: + - project: container-image + - URL: 'https://pypi.python.org/packages/source/z/zope.interface/zope.interface-[% c("version") %].zip' + sha256sum: 1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc

1 0

[tor-browser-build/master] Add a set_PTDIR_DOCSDIR option
by boklm＠torproject.org 24 Jul '17

24 Jul '17

commit 96d8b9e72e2eddb0c542b2fe5ddac0e39b3879a6 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jul 24 10:38:30 2017 +0200 Add a set_PTDIR_DOCSDIR option --- projects/meek/build | 8 +------- projects/obfs4/build | 6 +----- projects/snowflake/build | 8 ++------ rbm.conf | 8 ++++++++ 4 files changed, 12 insertions(+), 18 deletions(-) diff --git a/projects/meek/build b/projects/meek/build index 8d1beb7..81734be 100644 --- a/projects/meek/build +++ b/projects/meek/build @@ -2,13 +2,7 @@ [% c("var/set_default_env") -%] [% pc('go', 'var/setup', { go_tarfile => c('input_files_by_name/go') }) %] distdir=/var/tmp/dist/[% project %] -[% IF c("var/osx") %] - PTDIR="$distdir/Contents/MacOS/Tor/PluggableTransports" - DOCSDIR="$distdir/Contents/Resources/TorBrowser/Docs/meek" -[% ELSE %] - PTDIR="$distdir/TorBrowser/Tor/PluggableTransports" - DOCSDIR="$distdir/TorBrowser/Docs/meek" -[% END %] +[% c("var/set_PTDIR_DOCSDIR") -%] mkdir -p $PTDIR $DOCSDIR tar -C /var/tmp/dist -xf [% c('input_files_by_name/goptlib') %] diff --git a/projects/obfs4/build b/projects/obfs4/build index 61ef481..287704a 100644 --- a/projects/obfs4/build +++ b/projects/obfs4/build @@ -2,11 +2,7 @@ [% c("var/set_default_env") -%] [% pc('go', 'var/setup', { go_tarfile => c('input_files_by_name/go') }) %] distdir=/var/tmp/dist/[% project %] -[% IF c("var/osx") %] - PTDIR="$distdir/Contents/MacOS/Tor/PluggableTransports" -[% ELSE %] - PTDIR="$distdir/TorBrowser/Tor/PluggableTransports" -[% END %] +[% c("var/set_PTDIR_DOCSDIR") -%] mkdir -p $PTDIR tar -C /var/tmp/dist -xf [% c('input_files_by_name/goptlib') %] diff --git a/projects/snowflake/build b/projects/snowflake/build index 9d9c1fb..f3616f4 100644 --- a/projects/snowflake/build +++ b/projects/snowflake/build @@ -7,20 +7,16 @@ export PATH="/var/tmp/dist/binutils/bin:$PATH" [% END -%] distdir=/var/tmp/dist/[% project %] +[% c("var/set_PTDIR_DOCSDIR") -%] +mkdir -p $PTDIR $DOCSDIR [% IF c("var/osx") %] - PTDIR="$distdir/Contents/MacOS/Tor/PluggableTransports" - DOCSDIR="$distdir/Contents/Resources/TorBrowser/Docs/snowflake" export CGO_ENABLED=1 export CGO_CFLAGS="[% c("var/FLAGS") %] -mmacosx-version-min=10.7" export CGO_CXXFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=10.7" export CGO_LDFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=10.7" export CC="$clangdir/bin/clang" export CXX="$clangdir/bin/clang++" -[% ELSE %] - PTDIR="$distdir/TorBrowser/Tor/PluggableTransports" - DOCSDIR="$distdir/TorBrowser/Docs/snowflake" [% END %] -mkdir -p $PTDIR $DOCSDIR tar -C /var/tmp/dist -xf [% c('input_files_by_name/go-webrtc') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/uniuri') %] diff --git a/rbm.conf b/rbm.conf index 49899ca..ce444d4 100644 --- a/rbm.conf +++ b/rbm.conf @@ -82,6 +82,11 @@ var: export HOME=$rootdir umask 0022 + DOCSDIR_project: '[% project %]' + set_PTDIR_DOCSDIR: | + PTDIR="$distdir/TorBrowser/Tor/PluggableTransports" + DOCSDIR="$distdir/TorBrowser/Docs/[% c("var/DOCSDIR_project") %]" + targets: notarget: linux-x86_64 noint: @@ -202,6 +207,9 @@ targets: - zip - unzip faketime_path: /usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1 + set_PTDIR_DOCSDIR: | + PTDIR="$distdir/Contents/MacOS/Tor/PluggableTransports" + DOCSDIR="$distdir/Contents/Resources/TorBrowser/Docs/[% c("var/DOCSDIR_project") %]" # The no_build_id target can be useful if you want to quickly display # a build template or other option but don't want to spend time to

1 0

[tor-browser-build/master] Bug 22884: about:tor page is not showing up
by boklm＠torproject.org 20 Jul '17

20 Jul '17

commit c8adacae7f34fa569b09eb1b1fb1930fb638d6a8 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Jul 19 10:05:48 2017 -0400 Bug 22884: about:tor page is not showing up Whitelist about:tor so that NoScript does not block its JavaScript. --- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js b/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js index a34fb36..164835a 100644 --- a/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("noscript.default", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("noscript.mandatory", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false); diff --git a/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js b/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js index a34fb36..164835a 100644 --- a/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("noscript.default", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("noscript.mandatory", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false); diff --git a/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js b/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js index a34fb36..164835a 100644 --- a/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("noscript.default", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("noscript.mandatory", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false);

1 0

[tor-browser-bundle/master] Fixup: we don't install binutils for macOS (bug 22831)
by gk＠torproject.org 20 Jul '17

20 Jul '17

commit 135c3c89fcc2d2a523d0473a2ac5107bb47bd904 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jul 20 08:46:58 2017 +0000 Fixup: we don't install binutils for macOS (bug 22831) Found by boklm. --- gitian/descriptors/mac/gitian-webrtc.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/gitian/descriptors/mac/gitian-webrtc.yml b/gitian/descriptors/mac/gitian-webrtc.yml index c5f0509..4df2819 100644 --- a/gitian/descriptors/mac/gitian-webrtc.yml +++ b/gitian/descriptors/mac/gitian-webrtc.yml @@ -97,7 +97,6 @@ script: | GN_ARGS+=" is_clang=false use_sysroot=false" GN_ARGS+=" clang_use_chrome_plugins=false" GN_ARGS+=" clang_base_path=\"$HOME/build/clang\"" - GN_ARGS+=" gold_path=\"$INSTDIR/binutils/bin\"" # Avoid some dependencies. GN_ARGS+=" rtc_include_opus=false rtc_include_ilbc=false rtc_include_internal_audio_device=false" # Tests are needed for field_trial, metrics_default, and pc_test_utils targets

1 0

[tor-browser-build/master] Build go-webrtc and snowflake for mac.
by boklm＠torproject.org 19 Jul '17

19 Jul '17

commit 9b59107420ab527696b08ac89d787abd2c67d985 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jul 19 18:33:12 2017 +0200 Build go-webrtc and snowflake for mac. tor-browser-bundle.git author: David Fifield <david(a)bamsoftware.com> tor-browser-bundle.git commit: 26e0cd44f2886bfad1c3d30844ff7a21eb9d0478 Commit message from the tor-browser-bundle.git commit: Build go-webrtc and snowflake in the mac pluggable-transports descriptor. I had to apply two tricks to get a reproducible snowflake-client. The first is to use faketime to eliminate some timestamps. There were 11 variable timestamps in the file. Through experimentation, I found that 10 of them were dependent on the Go runtime (recompiling Go caused them to change) and 1 was dependent on snowflake-client itself (recompiling snowflake-client with the same runtime changed only that 1 timestamp). The underlying issue has to do with clang 3.8.0 on Darwin embedding timestamps, unsolved in the Go issue tracker as of 13 days ago. https://github.com/golang/go/issues/9206#issuecomment-310476743 The second is a sed command to clobber embedded paths of the form /tmp/go-buildXXXXXXXXX and /tmp/go-link-XXXXXXXXX. Their presence is caused by some combination of Clang and Darwin, and there is as yet no known workaround upstream. --- projects/go-webrtc/config | 28 +++++++++++++++++++++------- projects/go/build | 7 ++++++- projects/go/config | 2 ++ projects/macosx-toolchain/build | 2 ++ projects/macosx-toolchain/config | 2 +- projects/snowflake/build | 36 +++++++++++++++++++++++++++++++++++- projects/snowflake/config | 4 ++++ rbm.conf | 5 ++++- 8 files changed, 75 insertions(+), 11 deletions(-) diff --git a/projects/go-webrtc/config b/projects/go-webrtc/config index 673215b..c97a959 100644 --- a/projects/go-webrtc/config +++ b/projects/go-webrtc/config @@ -20,13 +20,23 @@ var: # Replace the prebuilt webrtc library with our own one. rm -rf include/ lib/ cp -a /var/tmp/dist/webrtc/{include,lib} . - # The go-webrtc package sets _GLIBCXX_USE_CXX11_ABI=0 for compatibility with - # the prebuilt libwebrtc-magic.a libraries. Since we build our own - # libwebrtc-magic.a with the C++11 ABI, we have to undo that setting here, - # using CGO_CXXFLAGS. - # __STDC_FORMAT_MACROS is needed for a definition of PRIxPTR from inttypes.h. - export CGO_CXXFLAGS="-D_GLIBCXX_USE_CXX11_ABI=1 -D__STDC_FORMAT_MACROS=1" - export CGO_LDFLAGS=-latomic + [% IF c("var/linux") -%] + # The go-webrtc package sets _GLIBCXX_USE_CXX11_ABI=0 for compatibility with + # the prebuilt libwebrtc-magic.a libraries. Since we build our own + # libwebrtc-magic.a with the C++11 ABI, we have to undo that setting here, + # using CGO_CXXFLAGS. + # __STDC_FORMAT_MACROS is needed for a definition of PRIxPTR from inttypes.h. + export CGO_CXXFLAGS="-D_GLIBCXX_USE_CXX11_ABI=1 -D__STDC_FORMAT_MACROS=1" + export CGO_LDFLAGS=-latomic + [% END -%] + [% IF c("var/osx") -%] + export CGO_ENABLED=1 + export CGO_CFLAGS="[% c("var/FLAGS") %] -mmacosx-version-min=10.7" + export CGO_CXXFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=10.7" + export CGO_LDFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=10.7" + export CC="$clangdir/bin/clang" + export CXX="$clangdir/bin/clang++" + [% END -%] targets: master: @@ -36,6 +46,10 @@ targets: arch_deps: - pkg-config - libx11-dev + osx-x86_64: + var: + arch_deps: + - pkg-config input_files: - project: container-image diff --git a/projects/go/build b/projects/go/build index 98f0522..3b51c32 100644 --- a/projects/go/build +++ b/projects/go/build @@ -52,7 +52,12 @@ cd /var/tmp/dist/go/src # http://golang.org/doc/install/source#environment export GOOS=darwin export GOARCH=amd64 - CGO_ENABLED=1 CC_FOR_TARGET="$CC_FOR_TARGET" CC= CFLAGS= LDFLAGS= ./make.bash + # faketime is needed because clang 3.8.0 on Darwin embeds the timestamps of + # certain intermediate object files (including those that arise here while + # compiling the Go runtime itself). Without this, variable timestamps would + # end up in snowflake-client. + # https://github.com/golang/go/issues/9206#issuecomment-310476743 + CGO_ENABLED=1 CC_FOR_TARGET="$CC_FOR_TARGET" CC= CFLAGS= LDFLAGS= [% c("var/faketime") %] ./make.bash [% ELSIF c("var/windows") -%] # 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. diff --git a/projects/go/config b/projects/go/config index 4b09e95..21669c9 100644 --- a/projects/go/config +++ b/projects/go/config @@ -60,6 +60,8 @@ targets: var: GOOS: darwin GOARCH: amd64 + arch_deps: + - faketime linux: var: GOOS: linux diff --git a/projects/macosx-toolchain/build b/projects/macosx-toolchain/build index e699e4f..f974cfc 100644 --- a/projects/macosx-toolchain/build +++ b/projects/macosx-toolchain/build @@ -10,6 +10,8 @@ tar -C $distdir -xf [% c('input_files_by_name/cctools') %] cd $distdir/cctools/bin ln -s ../../clang/bin/clang x86_64-apple-darwin10-clang ln -s ../../clang/bin/clang++ x86_64-apple-darwin10-clang++ +# "go link" expects to find a program called "dsymutil" exactly. +ln -sf x86_64-apple-darwin10-dsymutil dsymutil cd "/var/tmp/dist" [% c('tar', { diff --git a/projects/macosx-toolchain/config b/projects/macosx-toolchain/config index 1779eb8..bfdbdb6 100644 --- a/projects/macosx-toolchain/config +++ b/projects/macosx-toolchain/config @@ -6,7 +6,7 @@ var: use_container: 1 setup: | mkdir -p /var/tmp/dist - tar -C /var/tmp/dist -xf [% c("compiler_tarfile") %] + tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %] export sysrootdir=/var/tmp/dist/[% project %]/SDK/ export clangdir=/var/tmp/dist/[% project %]/clang export cctoolsdir=/var/tmp/dist/[% project %]/cctools/bin diff --git a/projects/snowflake/build b/projects/snowflake/build index 6e08b4e..9d9c1fb 100644 --- a/projects/snowflake/build +++ b/projects/snowflake/build @@ -10,6 +10,12 @@ distdir=/var/tmp/dist/[% project %] [% IF c("var/osx") %] PTDIR="$distdir/Contents/MacOS/Tor/PluggableTransports" DOCSDIR="$distdir/Contents/Resources/TorBrowser/Docs/snowflake" + export CGO_ENABLED=1 + export CGO_CFLAGS="[% c("var/FLAGS") %] -mmacosx-version-min=10.7" + export CGO_CXXFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=10.7" + export CGO_LDFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=10.7" + export CC="$clangdir/bin/clang" + export CXX="$clangdir/bin/clang++" [% ELSE %] PTDIR="$distdir/TorBrowser/Tor/PluggableTransports" DOCSDIR="$distdir/TorBrowser/Docs/snowflake" @@ -25,7 +31,35 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] cd client -go build -ldflags '-s' +[% IF c("var/osx") -%] + # Without faketime, snowflake-client would contain the timestamp of the + # temporary client.a file created during "go build". + [% c("var/faketime") %] go build -ldflags '-s' +[% ELSE -%] + go build -ldflags '-s' +[% END -%] +[% IF c("var/osx") -%] + # Hack: Overwrite variable absolute paths embedded in the binary. clang 3.8.0 + # on Darwin embeds such paths and the issue is unsolved in upstream Go as of + # 2016-06-28: + # https://github.com/golang/go/issues/9206#issuecomment-310476743 + # The two kinds of paths are ("000000000" stands for 9 random digits): + # /tmp/go-build000000000 + # /tmp/go-link-000000000 + # Such paths are the output of ioutil.TempDir("", "go-build") and + # ioutil.TempDir("", "go-link-"). + cp -a client client.stomped + sed -i -E -e 's#(/tmp/go-build|/tmp/go-link-)[0-9]{9}/#\1XXXXXXXXX/#g' client.stomped + # Sanity check: make sure the file actually changed. If it did not, it could + # mean that a change in go or clang has made this step unnecessary. + if cmp client client.stomped + then + echo "No paths replaced in snowflake-client. Maybe the replacement failed or is no longer needed." + echo "Check projects/snowflake/build" + exit 1 + fi + mv -f client.stomped client +[% END -%] cp -a client[% IF c("var/windows") %].exe[% END %] $PTDIR/snowflake-client[% IF c("var/windows") %].exe[% END %] cd .. diff --git a/projects/snowflake/config b/projects/snowflake/config index 89e3eb6..4bf438e 100644 --- a/projects/snowflake/config +++ b/projects/snowflake/config @@ -14,6 +14,10 @@ targets: arch_deps: - pkg-config - libx11-dev + osx-x86_64: + var: + arch_deps: + - faketime input_files: - project: container-image diff --git a/rbm.conf b/rbm.conf index c2143a9..49899ca 100644 --- a/rbm.conf +++ b/rbm.conf @@ -35,6 +35,7 @@ var: [% c("input_files_by_name/" _ file) %] [% END -%] + faketime: "faketime -f \"[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]\"" touch: "[% USE date %]touch -m -t [% date.format(c('timestamp'), format = '%Y%m%d%H%M') %]" locale_ja: ja @@ -130,7 +131,7 @@ targets: var: linux: 1 compiler: gcc - # We only build snowflake on linux for now + # We only build snowflake on linux and osx for now snowflake: 1 container: suite: wheezy @@ -190,6 +191,8 @@ targets: FLAGS: "-target x86_64-apple-darwin10 -mlinker-version=136 -B $cctoolsdir -isysroot $sysrootdir" LDFLAGS: "-Wl,-syslibroot,$sysrootdir -Wl,-dead_strip -Wl,-pie" locale_ja: ja-JP-mac + # We only build snowflake on linux and osx for now + snowflake: 1 deps: - build-essential - python

1 0

[tor-browser-build/master] Set bridges prefs depending on platform
by boklm＠torproject.org 19 Jul '17

19 Jul '17

commit 551dd7a7b870177c5f6d391e73017f9dca5163b9 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jul 19 18:49:17 2017 +0200 Set bridges prefs depending on platform --- projects/tor-browser/build | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 69469db..b9537a3 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -109,7 +109,17 @@ cp -a Bundle-Data/Docs/* $TBDIR/$DOCSPATH tar -C Bundle-Data/[% bundledata_osname %] -c . | tar -C $TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %] -x cat Bundle-Data/PTConfigs/[% bundledata_osname %]/torrc-defaults-appendix >> $TBDIR/$TORCONFIGPATH/torrc-defaults -cat Bundle-Data/PTConfigs/bridge_prefs.js >> $TBDIR/$EXTOVERRIDESPATH +[% IF c("var/linux") -%] + cat Bundle-Data/PTConfigs/bridge_prefs.js >> $TBDIR/$EXTOVERRIDESPATH +[% END -%] +[% IF c("var/windows") -%] + # We don't have snowflake available on Windows yet + grep -v 'default_bridge\.snowflake' Bundle-Data/PTConfigs/bridge_prefs.js >> $TBDIR/$EXTOVERRIDESPATH +[% END -%] +[% IF c("var/osx") -%] + # FTE is temporarily removed due to bug 18495. + grep -Ev 'default_bridge\.fte' Bundle-Data/PTConfigs/bridge_prefs.js >> $TBDIR/$EXTOVERRIDESPATH +[% END -%] cat Bundle-Data/PTConfigs/meek-http-helper-user.js >> $TBDIR/$MEEKPROFILEPATH/user.js [% IF c("var/osx") %]

1 0

[tor-browser-build/master] Bug 22831: Enable Snowflake for mac.
by boklm＠torproject.org 19 Jul '17

19 Jul '17

commit 1d38fb57874499b487e2ac26fa86b4a8bf427a8e Author: David Fifield <david(a)bamsoftware.com> Date: Wed Jul 5 23:10:10 2017 -0700 Bug 22831: Enable Snowflake for mac. --- projects/tor-browser/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix b/projects/tor-browser/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix index 271b36c..06dbec9 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix +++ b/projects/tor-browser/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix @@ -3,3 +3,6 @@ ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec PluggableTransports/ob ## meek configuration ClientTransportPlugin meek exec PluggableTransports/meek-client-torbrowser -- PluggableTransports/meek-client + +## snowflake configuration +ClientTransportPlugin snowflake exec PluggableTransports/snowflake-client -url https://snowflake-reg.appspot.com/ -front www.google.com -ice stun:stun.l.google.com:19302

1 0