- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-52.1.2esr-7.0-1] Revert "Bug 10281: Use jemalloc4 and abort on redzone corruption"
by gk＠torproject.org 03 Jun '17

03 Jun '17

commit 272a0f8b342d90d0587b73f22a535561fb90170b Author: Georg Koppen <gk(a)torproject.org> Date: Sat Jun 3 19:06:31 2017 +0000 Revert "Bug 10281: Use jemalloc4 and abort on redzone corruption" This reverts commit b9e3e965adc6929383f8d30ba893ea5eb4fbc55c. --- .mozconfig | 1 - memory/build/jemalloc_config.cpp | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.mozconfig b/.mozconfig index 4eeb339..7d9ab1c 100755 --- a/.mozconfig +++ b/.mozconfig @@ -26,4 +26,3 @@ ac_add_options --disable-webrtc # Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme #ac_add_options --disable-ctypes -ac_add_options --enable-jemalloc=4 diff --git a/memory/build/jemalloc_config.cpp b/memory/build/jemalloc_config.cpp index 7962147..441fd8a 100644 --- a/memory/build/jemalloc_config.cpp +++ b/memory/build/jemalloc_config.cpp @@ -29,10 +29,10 @@ #ifdef DEBUG #define MOZ_MALLOC_BUILD_OPTIONS ",junk:true" #else -#define MOZ_MALLOC_BUILD_OPTIONS ",junk:true" +#define MOZ_MALLOC_BUILD_OPTIONS ",junk:free" #endif -#define MOZ_MALLOC_OPTIONS "narenas:1,tcache:false,redzone:true,abort:true" +#define MOZ_MALLOC_OPTIONS "narenas:1,tcache:false" MFBT_DATA const char* je_(malloc_conf) = MOZ_MALLOC_OPTIONS MOZ_MALLOC_BUILD_OPTIONS;

1 0

[tor-browser-bundle/maint-7.0] Bug 22479: create jessie amd64 VM in make-vms.sh
by gk＠torproject.org 03 Jun '17

03 Jun '17

commit 1bf37e1a096c6fe12cba1a26a4ac7dd800722ad2 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sat Jun 3 11:16:17 2017 +0200 Bug 22479: create jessie amd64 VM in make-vms.sh --- gitian/make-vms.sh | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/gitian/make-vms.sh b/gitian/make-vms.sh index f47deca..b5e4be2 100755 --- a/gitian/make-vms.sh +++ b/gitian/make-vms.sh @@ -32,7 +32,7 @@ build_and_test_vm() { then export LXC_SUITE=$dist export LXC_ARCH=$arch - if [ "$dist" = "wheezy" ]; + if [ "$dist" = "wheezy" -o "$dist" = "jessie" ]; then export DISTRO=debian ./bin/make-base-vm --distro debian --suite $dist --lxc --arch $arch @@ -41,7 +41,7 @@ build_and_test_vm() { ./bin/make-base-vm --suite $dist --lxc --arch $arch fi else - if [ "$dist" = "wheezy" ]; + if [ "$dist" = "wheezy" -o "$dist" = "jessie" ]; then export DISTRO=debian ./bin/make-base-vm --distro debian --suite $dist --arch $arch @@ -89,6 +89,15 @@ do echo done +while ! build_and_test_vm jessie amd64 64 +do + stop-target 64 jessie + rm ./base-jessie-amd64* + echo + echo "Jessie amd64 VM build failed... Trying again" + echo +done + while ! build_and_test_vm precise i386 32 do stop-target 32 precise

1 0

[tor-browser-bundle/maint-7.0] Release preparations for 7.0
by gk＠torproject.org 02 Jun '17

02 Jun '17

commit e23767abdf49958fef9a2c668d69d58466b032a1 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 2 13:33:14 2017 +0000 Release preparations for 7.0 Changelog update, versions bump, and config.yml update --- Bundle-Data/Docs/ChangeLog.txt | 134 ++++++++++++++++++++++++++++++++++++++ gitian/versions | 16 ++--- tools/update-responses/config.yml | 20 +++--- 3 files changed, 154 insertions(+), 16 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 9f00100..4411b56 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,137 @@ +Tor Browser 7.0 -- June 6 2017 + * All Platforms + * Update Firefox to 52.1.2esr + * Update Tor to 0.3.0.7 + * Update Torbutton to 1.9.7.3 + * Bug 22104: Adjust our content policy whitelist for ff52-esr + * Bug 22457: Allow resources loaded by view-source:// + * Bug 21627: Ignore HTTP 304 responses when checking redirects + * Bug 22459: Adapt our use of the nsIContentPolicy to e10s mode + * Bug 21865: Update our JIT preferences in the security slider + * Bug 21747: Make 'New Tor Circuit for this Site' work in ESR52 + * Bug 21745: Fix handling of catch-all circuit + * Bug 21547: Fix circuit display under e10s + * Bug 21268: e10s compatibility for New Identity + * Bug 21267: Remove window resize implementation for now + * Bug 21201: Make Torbutton multiprocess compatible + * Translations update + * Update Tor Launcher to 0.2.12.2 + * Bug 22283: Linux 7.0a4 broken after update due to unix: lines in torrc + * Bug 20761: Don't ignore additional SocksPorts + * Bug 21920: Don't show locale selection dialog + * Bug 21546: Mark Tor Launcher as multiprocess compatible + * Bug 21264: Add a README file + * Translations update + * Update HTTPS-Everywhere to 5.2.17 + * Update NoScript to 5.0.5 + * Update Go to 1.8.3 (bug 22398) + * Bug 21962: Fix crash on about:addons page + * Bug 21766: Fix crash when the external application helper dialog is invoked + * Bug 21886: Download is stalled in non-e10s mode + * Bug 21778: Canvas prompt is not shown in Tor Browser based on ESR52 + * Bug 21569: Add first-party domain to Permissions key + * Bug 22165: Don't allow collection of local IP addresses + * Bug 13017: Work around audio fingerprinting by disabling the Web Audio API + * Bug 10286: Disable Touch API and add fingerprinting resistance as fallback + * Bug 13612: Disable Social API + * Bug 10283: Disable SpeechSynthesis API + * Bug 22333: Disable WebGL2 API for now + * Bug 21861: Disable additional mDNS code to avoid proxy bypasses + * Bug 21684: Don't expose navigator.AddonManager to content + * Bug 21431: Clean-up system extensions shipped in Firefox 52 + * Bug 22320: Use preference name 'referer.hideOnionSource' everywhere + * Bug 16285: Don't ship ClearKey EME system and update EME preferences + * Bug 21675: Spoof window.navigator.hardwareConcurrency + * Bug 21792: Suppress MediaError.message + * Bug 16337: Round times exposed by Animation API to nearest 100ms + * Bug 21972: about:support is partially broken + * Bug 21726: Keep Graphite support disabled + * Bug 21323: Enable Mixed Content Blocking + * Bug 21685: Disable remote new tab pages + * Bug 21790: Disable captive portal detection + * Bug 21686: Disable Microsoft Family Safety support + * Bug 22073: Make sure Mozilla's experiments are disabled + * Bug 21683: Disable newly added Safebrowsing capabilities + * Bug 22071: Disable Kinto-based blocklist update mechanism + * Bug 22415: Fix format error in our pipeline patch + * Bug 22072: Hide TLS error reporting checkbox + * Bug 20761: Don't ignore additional SocksPorts + * Bug 21862: Rip out potentially unsafe Rust code + * Bug 16485: Improve about:cache page + * Bug 22462: Backport of patch for bug 1329521 to fix assertion failure + * Bug 21340: Identify and backport new patches from Firefox + * Bug 22153: Fix broken feeds on higher security levels + * Bug 22025: Fix broken certificate error pages on higher security levels + * Bug 21887: Fix broken error pages on higher security levels + * Bug 22458: Fix broken `about:cache` page on higher security levels + * Bug 21876: Enable e10s by default on all supported platforms + * Bug 21876: Always use esr policies for e10s + * Bug 20905: Fix resizing issues after moving to a direct Firefox patch + * Bug 21875: Modal dialogs are maximized in ESR52 nightly builds + * Bug 21885: SVG is not disabled in Tor Browser based on ESR52 + * Bug 17334: Hide Referer when leaving a .onion domain (improved patch) + * Bug 18531: Uncaught exception when opening ip-check.info + * Bug 18574: Uncaught exception when clicking items in Library + * Bug 22327: Isolate Page Info media previews to first party domain + * Bug 22452: Isolate tab list menuitem favicons to first party domain + * Bug 15555: View-source requests are not isolated by first party domain + * Bug 3246: Double-key cookies + * Bug 8842: Fix XML parsing error + * Bug 5293: Neuter fingerprinting with Battery API + * Bug 16886: 16886: "Add-on compatibility check dialog" contains Firefox logo + * Bug 19645: TBB zooms text when resizing browser window + * Bug 19192: Untrust Blue Coat CA + * Bug 19955: Avoid confusing warning that favicon load request got cancelled + * Bug 20005: Backport fixes for memory leaks investigation + * Bug 20755: ltn.com.tw is broken in Tor Browser + * Bug 21896: Commenting on website is broken due to CAPTCHA not being displayed + * Bug 20680: Rebase Tor Browser patches to 52 ESR + * Bug 22429: Add IPv6 address for Lisbeth:443 obfs4 bridge + * Bug 22468: Add default obfs4 bridges frosty and dragon + * Windows + * Bug 22419: Prevent access to file:// + * Bug 12426: Make use of HeapEnableTerminationOnCorruption + * Bug 19316: Make sure our Windows updates can deal with the SSE2 requirement + * Bug 21868: Fix build bustage with FIREFOX_52_0_2esr_RELEASE for Windows + * OS X + * Bug 21940: Don't allow privilege escalation during update + * Bug 22044: Fix broken default search engine on macOS + * Bug 21879: Use our default bookmarks on OSX + * Bug 21779: Non-admin users can't access Tor Browser on macOS + * Bug 21723: Fix inconsistent generation of MOZ_MACBUNDLE_ID + * Bug 21724: Make Firefox and Tor Browser distinct macOS apps + * Bug 21931: Backport OSX SetupMacCommandLine updater fixes + * Bug 15910: Don't download GMPs via the local fallback + * Linux + * Bug 16285: Remove ClearKey related library stripping + * Bug 22041: Fix update error during update to 7.0a3 + * Bug 22238: Fix use of hardened wrapper for Firefox build + * Bug 21907: Fix runtime error on CentOS 6 + * Bug 15910: Don't download GMPs via the local fallback + * Android + * Bug 19078: Disable RtspMediaResource stuff in Orfox + * Build system + * Windows + * Bug 21837: Fix reproducibility of accessibility code for Windows + * Bug 21240: Create patches to fix mingw-w64 compilation of Firefox ESR 52 + * Bug 21904: Bump mingw-w64 commit to help with sandbox compilation + * Bug 18831: Use own Yasm for Firefox cross-compilation + * OS X + * Bug 21328: Updating to clang 3.8.0 + * Bug 21754: Remove old GCC toolchain and macOS SDK + * Bug 19783: Remove unused macOS helper scripts + * Bug 10369: Don't use old GCC toolchain anymore for utils + * Bug 21753: Replace our old GCC toolchain in PT descriptor + * Bug 18530: ESR52 based Tor Browser only runs on macOS 10.9+ + * Bug 22328: Remove clang PIE wrappers + * Linux + * Bug 21930: NSS libraries are missing from mar-tools archive + * Bug 21239: Adapt Linux Firefox descriptor to ESR52 (use GTK2) + * Bug 21960: Linux bundles based on ESR 52 are not reproducible anymore + * Bug 21629: Fix broken ASan builds when switching to ESR 52 + * Bug 22444: Use hardening-wrapper when building GCC + * Bug 22361: Fix hardening of libraries built in linux/gitian-utils.yml + Tor Browser 7.0a4 -- May 15 2017 * All Platforms * Update Firefox to 52.1.1esr diff --git a/gitian/versions b/gitian/versions index 95c4e26..d385801 100755 --- a/gitian/versions +++ b/gitian/versions @@ -10,15 +10,15 @@ DATA_OUTSIDE_APP_DIR=1 VERIFY_TAGS=1 -FIREFOX_VERSION=52.1.1esr +FIREFOX_VERSION=52.1.2esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.0-1-build2 -TOR_TAG=tor-0.3.0.6 -TORLAUNCHER_TAG=0.2.12.1 -TORBUTTON_TAG=1.9.7.2 -HTTPSE_TAG=5.2.16 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.0-1-build1 +TOR_TAG=tor-0.3.0.7 +TORLAUNCHER_TAG=0.2.12.2 +TORBUTTON_TAG=1.9.7.3 +HTTPSE_TAG=5.2.17 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable @@ -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.4-fx+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-5.0.5-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=cd8e5561bdd7331d9fdd510fb1bd1cb6460d64f351076b523d31361ff9853c76 +NOSCRIPT_HASH=bf1dee39f6e5936df2b03b794c1efc9236b440536a05fafcff667e33903e6aed CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 6a9a142..8b98b8e 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -20,19 +20,23 @@ build_targets: osx64: Darwin_x86_64-gcc3 channels: alpha: 7.0a4 - release: 6.0.1 + release: 7.0 versions: - 6.0.1: - platformVersion: 45.2.0 - detailsURL: https://blog.torproject.org/blog/tor-browser-601-released + 7.0: + platformVersion: 52.1.2 + detailsURL: https://blog.torproject.org/blog/tor-browser-70-released incremental_from: - - 5.5.5 - - 6.0 + - 6.5.2 migrate_archs: osx32: osx64 + migrate_langs: + pt-PT: pt-BR + win32: + minSupportedInstructionSet: SSE2 osx32: - minSupportedOSVersion: 10.8 - detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#upda… + minSupportedOSVersion: 10.9 + osx64: + minSupportedOSVersion: 10.9 7.0a4: platformVersion: 52.1.1 detailsURL: https://blog.torproject.org/blog/tor-browser-70a4-released

1 0

[torbutton/master] Version bump and CHANGELOG update
by gk＠torproject.org 02 Jun '17

02 Jun '17

commit d3a485c83cd2a95d6fa6b255e4b28ed810d9afb0 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 2 10:14:41 2017 +0000 Version bump and CHANGELOG update --- src/CHANGELOG | 7 +++++++ src/install.rdf | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 9de9989..1dce5c2 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,10 @@ +1.9.7.3 + * Bug 22104: Adjust our content policy whitelist for ff52-esr + * Bug 22457: Allow resources loaded by view-source:// + * Bug 21627: Ignore HTTP 304 responses when checking redirects + * Bug 22459: Adapt our use of the nsIContentPolicy to e10s mode + * Translations update + 1.9.7.2 * Bug 21865: Update our JIT preferences in the security slider * Bug 21747: Make 'New Tor Circuit for this Site' work in ESR52 diff --git a/src/install.rdf b/src/install.rdf index 670dbb6..8c28f40 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.9.7.2</em:version> + <em:version>1.9.7.3</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL>

1 0

[tor-browser-build/master] Bug 22468: Add default obfs4 bridges frosty and dragon.
by boklm＠torproject.org 02 Jun '17

02 Jun '17

commit 7125ca7bdefed1a8cb93ab4c96f65557c7f3d095 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jun 1 13:45:58 2017 -0700 Bug 22468: Add default obfs4 bridges frosty and dragon. --- projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index 9cbb326..d2f4236 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -36,6 +36,8 @@ pref("extensions.torlauncher.default_bridge.obfs4.20", "obfs4 85.17.30.79:443 FC pref("extensions.torlauncher.default_bridge.obfs4.21", "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1"); /**/pref/**/(/**/"extensions.torlauncher.default_bridge.obfs4.22"/**/, /**/"obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1"); pref("extensions.torlauncher.default_bridge.obfs4.23", "obfs4 [2001:470:b381:bfff:216:3eff:fe23:d6c3]:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1"); +pref("extensions.torlauncher.default_bridge.obfs4.24", "obfs4 37.218.240.34:40035 88CD36D45A35271963EF82E511C8827A24730913 cert=eGXYfWODcgqIdPJ+rRupg4GGvVGfh25FWaIXZkit206OSngsp7GAIiGIXOJJROMxEqFKJg iat-mode=1"); +pref("extensions.torlauncher.default_bridge.obfs4.25", "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2cly7j4zqgua7.cloudfront.net/ front=a0.awsstatic.com"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-build/master] Bug 22398: Upgrade go to 1.8.3.
by boklm＠torproject.org 02 Jun '17

02 Jun '17

commit 7519198c362ce6de859ad0ae9780ae5fd8dc1791 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Jun 2 13:07:46 2017 +0200 Bug 22398: Upgrade go to 1.8.3. tor-browser-bundle.git author: David Fifield <david(a)bamsoftware.com> tor-browser-bundle.git commit: fbe1263eb9601e5d435131aa3d96306b8bfdb465 --- projects/go/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/go/config b/projects/go/config index 1aa3052..4b09e95 100644 --- a/projects/go/config +++ b/projects/go/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.8.1 +version: 1.8.3 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: @@ -77,7 +77,7 @@ input_files: enable: '[% c("var/windows") || c("var/osx") %]' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: 33daf4c03f86120fdfdc66bddf6bfff4661c7ca11c5da473e537f4d69b470e57 + sha256sum: 5f5dea2447e7dcfdc50fa6b94c512e58bfba5673c039259fd843f68829d99fa6 - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' name: go14 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959

1 0

[tor-browser-build/master] Bug 16285: Remove clearkey related library stripping
by boklm＠torproject.org 02 Jun '17

02 Jun '17

commit f6652ffc1aa81d5dd4c8af54026d8819710ea302 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Jun 2 12:51:43 2017 +0200 Bug 16285: Remove clearkey related library stripping We don't ship the clearkey DRM system yet, thus we don't need to strip the respective binaries. tor-browser-bundle.git author: Georg Koppen <gk(a)torproject.org> tor-browser-bundle.git commit: e8d869e142439436104b8b1f8b807406fd68e104 tor-browser-bundle.git commit: c18c6f80c49d7da97d006d3fd5201b11f1312bbc --- projects/firefox/build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index afb11bb..fd9fee5 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -45,7 +45,7 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz [% END %] [% IF c("var/linux") %] - mkdir -p $distdir/Debug/Browser/gmp-clearkey/0.1 + mkdir -p $distdir/Debug/Browser/ [% END %] cd /var/tmp/build/[% project %]-[% c("version") %] @@ -148,7 +148,7 @@ cd $distdir [% IF c("var/linux") %] # Strip and generate debuginfo for the firefox binary that we keep, all *.so # files, the plugin-container, and the updater (see ticket #10126) - for LIB in Browser/*.so Browser/firefox Browser/plugin-container Browser/gmp-clearkey/0.1/*.so Browser/updater + for LIB in Browser/*.so Browser/firefox Browser/plugin-container Browser/updater do objcopy --only-keep-debug $LIB Debug/$LIB strip $LIB

1 0

[tor-browser-build/master] Bug 21710: Upgrade Go to 1.8.1.
by boklm＠torproject.org 02 Jun '17

02 Jun '17

commit 8b3f00023bad97241fdd2b50e0f033b57511b725 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Jun 2 13:04:02 2017 +0200 Bug 21710: Upgrade Go to 1.8.1. Remove workaround for fixed upstream bug, GitHub #17732 (__MAC_OS_X_VERSION_MAX_ALLOWED). I wasn't able to remove the cc-for-target workaround for GitHub #15457 (CC_FOR_TARGET). Even though according to https://github.com/golang/go/issues/15457 it has been been fixed, make.bash still seems to lose all but the first argument of CC_FOR_TARGET somewhere. tor-browser-bundle.git author: David Fifield <david(a)bamsoftware.com> tor-browser-bundle.git commit: 9d546f20ae711e7df9c574d9bdfccf34ddf1b650 --- projects/go/build | 3 --- projects/go/config | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/projects/go/build b/projects/go/build index b7fac08..98f0522 100644 --- a/projects/go/build +++ b/projects/go/build @@ -52,9 +52,6 @@ cd /var/tmp/dist/go/src # http://golang.org/doc/install/source#environment export GOOS=darwin export GOARCH=amd64 - # 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 [% ELSIF c("var/windows") -%] # Create a cc-for-target script that closes over CC, CFLAGS, and LDFLAGS. diff --git a/projects/go/config b/projects/go/config index b36f211..1aa3052 100644 --- a/projects/go/config +++ b/projects/go/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.7.5 +version: 1.8.1 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: @@ -77,7 +77,7 @@ input_files: enable: '[% c("var/windows") || c("var/osx") %]' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: 4e834513a2079f8cbbd357502cccaac9507fd00a1efe672375798858ff291815 + sha256sum: 33daf4c03f86120fdfdc66bddf6bfff4661c7ca11c5da473e537f4d69b470e57 - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' name: go14 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959

1 0

[tor-browser-build/master] Revert "Bug 21779: Non-admin users can't access Tor Browser on macOS."
by boklm＠torproject.org 02 Jun '17

02 Jun '17

commit fa17542f246d7724b75c10ff8875b89dc657c29e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Jun 2 12:55:07 2017 +0200 Revert "Bug 21779: Non-admin users can't access Tor Browser on macOS." This reverts commit dd6349a4c118d05797eb211d538ac36b6d08bb59. The problem was the script for recreating the .dmg files after the code-signing set the permissions wrong. No need to fix anything in the bundle descriptor. tor-browser-bundle.git author: Georg Koppen <gk(a)torproject.org> tor-browser-bundle.git commit: 082738a4bd83943d97e084fa04045e481772b998 --- projects/tor-browser/build | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index d580284..69469db 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -229,12 +229,6 @@ rm -f precomplete python $MARTOOLS/createprecomplete.py popd -[% IF c("var/osx") -%] - # Ensure that files and directories are accessible by non-admin users - # if the app bundle is placed in /Applications. See bug 21779. - chmod -R o+rX "$TBDIR" -[% END -%] - cd $distdir [% IF c("var/build_mar") -%] @@ -307,12 +301,6 @@ rm -rf $distdir/${PKG_DIR} python $MARTOOLS/createprecomplete.py popd - [% IF c("var/osx") -%] - # Ensure that files and directories are accessible by non-admin users - # if the app bundle is placed in /Applications. See bug 21779. - chmod -R o+rX "[% browserdir %]" - [% END -%] - # Create full MAR file and compressed package for this locale. MAR_FILE=tor-browser-[% c("var/mar_osname") %]-[% c("var/torbrowser_version") %]_[% lang %].mar MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/$MAR_FILE "[% browserdir %]"

1 0

[tor-browser-build/master] Bug 22328: remove clang PIE wrappers
by boklm＠torproject.org 02 Jun '17

02 Jun '17

commit 2e9d63ba9b06b518e21e6f9cbd523d2f8ce11865 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Jun 2 13:14:53 2017 +0200 Bug 22328: remove clang PIE wrappers Those wrappers are no longer necessary to produce PIE binaries. --- projects/firefox/mozconfig-osx-x86_64 | 12 ++++++------ projects/macosx-toolchain/build | 17 ----------------- projects/macosx-toolchain/config | 4 ++-- projects/openssl/build | 2 +- 4 files changed, 9 insertions(+), 26 deletions(-) diff --git a/projects/firefox/mozconfig-osx-x86_64 b/projects/firefox/mozconfig-osx-x86_64 index c75b2f5..1658e18 100644 --- a/projects/firefox/mozconfig-osx-x86_64 +++ b/projects/firefox/mozconfig-osx-x86_64 @@ -7,9 +7,9 @@ CROSS_SYSROOT=$TOOLCHAIN_DIR/SDK CROSS_PRIVATE_FRAMEWORKS=$CROSS_SYSROOT/System/Library/PrivateFrameworks FLAGS="-target x86_64-apple-darwin10 -mlinker-version=136 -B $CROSS_CCTOOLS_PATH/bin -isysroot $CROSS_SYSROOT" -export CC="$TOOLCHAIN_DIR/clang/helpers/clang $FLAGS" -export CXX="$TOOLCHAIN_DIR/clang/helpers/clang++ $FLAGS" -export CPP="$TOOLCHAIN_DIR/clang/helpers/clang $FLAGS -E" +export CC="$TOOLCHAIN_DIR/clang/bin/clang $FLAGS" +export CXX="$TOOLCHAIN_DIR/clang/bin/clang++ $FLAGS" +export CPP="$TOOLCHAIN_DIR/clang/bin/clang $FLAGS -E" export LLVMCONFIG=$TOOLCHAIN_DIR/clang/bin/llvm-config export LDFLAGS="-Wl,-syslibroot,$CROSS_SYSROOT -Wl,-dead_strip -Wl,-pie" export TOOLCHAIN_PREFIX=$CROSS_CCTOOLS_PATH/bin/x86_64-apple-darwin10- @@ -20,9 +20,9 @@ export STRIP=${TOOLCHAIN_PREFIX}strip export OTOOL=${TOOLCHAIN_PREFIX}otool export DSYMUTIL="$TOOLCHAIN_DIR/clang/bin/llvm-dsymutil" -export HOST_CC="$TOOLCHAIN_DIR/clang/helpers/clang" -export HOST_CXX="$TOOLCHAIN_DIR/clang/helpers/clang++" -export HOST_CPP="$TOOLCHAIN_DIR/clang/helpers/clang -E" +export HOST_CC="$TOOLCHAIN_DIR/clang/bin/clang" +export HOST_CXX="$TOOLCHAIN_DIR/clang/bin/clang++" +export HOST_CPP="$TOOLCHAIN_DIR/clang/bin/clang -E" export HOST_CFLAGS="-g" export HOST_CXXFLAGS="-g" export HOST_LDFLAGS="-g" diff --git a/projects/macosx-toolchain/build b/projects/macosx-toolchain/build index b718023..e699e4f 100644 --- a/projects/macosx-toolchain/build +++ b/projects/macosx-toolchain/build @@ -11,23 +11,6 @@ cd $distdir/cctools/bin ln -s ../../clang/bin/clang x86_64-apple-darwin10-clang ln -s ../../clang/bin/clang++ x86_64-apple-darwin10-clang++ -cd $distdir -# Bug 20439: build with PIE -# If we add -fPIE to the FLAGS, the firefox build fails in js/src/ctypes/libffi -# with libtool giving an error: -# libtool: compile: unable to infer tagged configuration -# To avoid this error, we add -fPIE using wrappers on clang and clang++ -mkdir clang/helpers -cat > clang/helpers/clang << EOF -#!/bin/sh -exec $distdir/clang/bin/clang -fPIE "\$@" -EOF -cat > clang/helpers/clang++ << EOF -#!/bin/sh -exec $distdir/clang/bin/clang++ -fPIE "\$@" -EOF -chmod +x clang/helpers/clang clang/helpers/clang++ - cd "/var/tmp/dist" [% c('tar', { tar_src => [ project ], diff --git a/projects/macosx-toolchain/config b/projects/macosx-toolchain/config index 55fb554..1779eb8 100644 --- a/projects/macosx-toolchain/config +++ b/projects/macosx-toolchain/config @@ -10,9 +10,9 @@ var: export sysrootdir=/var/tmp/dist/[% project %]/SDK/ export clangdir=/var/tmp/dist/[% project %]/clang export cctoolsdir=/var/tmp/dist/[% project %]/cctools/bin - export PATH="$clangdir/helpers:$clangdir/bin:$cctoolsdir:$PATH" + export PATH="$clangdir/bin:$cctoolsdir:$PATH" export LD_LIBRARY_PATH=/var/tmp/dist/[% project %]/clang/lib - export CC="$clangdir/helpers/clang [% c('var/FLAGS') %]" + export CC="$clangdir/bin/clang [% c('var/FLAGS') %]" export LDFLAGS="[% c('var/LDFLAGS') %]" input_files: diff --git a/projects/openssl/build b/projects/openssl/build index e831b68..3851346 100644 --- a/projects/openssl/build +++ b/projects/openssl/build @@ -10,7 +10,7 @@ export CC='gcc -m32' [% END %] [% IF c("var/osx") -%] # Tricking OpenSSL into using our clang as cross-compiler - ln -s $clangdir/helpers/clang $clangdir/helpers/x86_64-apple-darwin10-cc + ln -s $clangdir/bin/clang $clangdir/bin/x86_64-apple-darwin10-cc export CC="cc [% c("var/FLAGS") %]" [% END -%] ./Configure --prefix=$distdir [% c('var/configure_opts') %]

1 0