April 2017 - tor-commits - lists.torproject.org

[tor-browser-bundle/master] Bug 21239: Adapt Linux Firefox descriptor to ESR52
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit f279b94f424c1c7eeabaa0119ccfc8fea326bed6 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Mar 14 08:36:20 2017 +0000 Bug 21239: Adapt Linux Firefox descriptor to ESR52 --- gitian/descriptors/linux/gitian-firefox.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 4a756b8..d607f6a 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -13,15 +13,14 @@ packages: - "libgtk2.0-dev" - "libdbus-glib-1-dev" - "yasm" -- "libasound2-dev" -- "libgstreamer-plugins-base0.10-dev" - "libxt-dev" - "hardening-wrapper" -- "python-dev" # To pass configure since ESR 31. - "libpulse-dev" # To pass configure since ESR 45. - "libgconf2-dev" +# To pass configure since ESR 52. +- "libx11-xcb-dev" # We built GCC but not the libmpc2, thus we need to install it. - "libmpc2" reference_datetime: "2000-01-01 00:00:00" @@ -84,8 +83,7 @@ script: | export LD_LIBRARY_PATH=$INSTDIR/gcc/lib$ARCH # mkdir -p $INSTDIR/Browser/ - mkdir -p $INSTDIR/Debug/Browser/components - mkdir -p $INSTDIR/Debug/Browser/browser/components + mkdir -p $INSTDIR/Debug/Browser/gmp-clearkey/0.1 cd tor-browser # run get-moz-build-date before removing .git, which is used to get the year @@ -121,7 +119,7 @@ script: | cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ cp -p obj-*/modules/libmar/tool/signmar $MARTOOLS/ cp -p obj-*/security/nss/cmd/certutil/certutil $MARTOOLS/ - NSS_LIBS="libfreebl3.so libmozsqlite3.so libnss3.so libnssdbm3.so libnssutil3.so libsmime3.so libsoftokn3.so libssl3.so" + NSS_LIBS="libmozsqlite3.so libnss3.so libnssdbm3.so libnssutil3.so libsmime3.so libssl3.so" NSPR_LIBS="libnspr4.so libplc4.so libplds4.so" for LIB in $NSS_LIBS $NSPR_LIBS; do cp -p obj-*/dist/bin/$LIB $MARTOOLS/ @@ -133,7 +131,7 @@ script: | # Strip and generate debuginfo for the firefox binary that we keep, all *.so # files, the plugin-container, and the updater (see ticket #10126) cd $INSTDIR - for LIB in Browser/*.so Browser/webapprt-stub Browser/firefox Browser/plugin-container Browser/browser/components/*.so Browser/updater + for LIB in Browser/*.so Browser/firefox Browser/plugin-container Browser/gmp-clearkey/0.1/*.so Browser/updater do objcopy --only-keep-debug $LIB Debug/$LIB strip $LIB @@ -141,7 +139,6 @@ script: | done # ~/build/re-dzip.sh Browser/omni.ja - ~/build/re-dzip.sh Browser/webapprt/omni.ja ~/build/re-dzip.sh Browser/browser/omni.ja ~/build/dzip.sh tor-browser-linux$GBUILD_BITS-gbuilt.zip Browser/ ~/build/dzip.sh tor-browser-linux$GBUILD_BITS-debug.zip Debug/

1 0

[tor-browser-bundle/master] Bumping nightly versions for ESR52 switch
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit 0d331f7aee2e13f56dfd91d343b5d45966b331c4 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 5 11:13:08 2017 +0000 Bumping nightly versions for ESR52 switch --- gitian/versions.nightly | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index a696497..b45e7d6 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -17,11 +17,11 @@ MULTI_LINGUAL=1 VERIFY_TAGS=0 -FIREFOX_VERSION=45.8.0esr +FIREFOX_VERSION=52.0.2esr TORBROWSER_UPDATE_CHANNEL=default -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.0-1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.0-2 TOR_TAG=master TORLAUNCHER_TAG=master TORBUTTON_TAG=master @@ -60,7 +60,7 @@ GITIAN_TAG=tor-browser-builder-4 OPENSSL_VER=1.0.2k GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build2 +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 GCC_VER=5.1.0 CLANG_VER=3.8.0 @@ -82,7 +82,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-2.9.5.3-fx+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-5.0.2-fx+sm.xpi CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz MSVCR100_PACKAGE=msvcr100.dll @@ -117,7 +117,7 @@ YASM_PACKAGE=yasm-${YASM_VER}.tar.gz OPENSSL_HASH=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf -NOSCRIPT_HASH=ce9779a3a5a2574b958f8e4d079a99d43a8f84193bef52c587c704ed81c2fbbd +NOSCRIPT_HASH=31ba7743699deefb606bcc49197d26d926f6b4e3d3526cd2f8a339f857a04fb1 CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/master] Include changelog from 6.5.1 and 7.0a2-hardened
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit 67c826ad4fefaac0ee6f1bbc8784528d91b16e7c Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 5 11:30:40 2017 +0000 Include changelog from 6.5.1 and 7.0a2-hardened --- Bundle-Data/Docs/ChangeLog.txt | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 43e771f..58dc3d1 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,23 @@ +Tor Browser 7.0a2-hardened -- March 7 2017 + * All Platforms + * Update Firefox to 45.8.0esr + * Tor to 0.3.0.4-rc + * OpenSSL to 1.0.2k + * Update Torbutton to 1.9.7.1 + * Bug 21396: Allow leaking of resource/chrome URIs (off by default) + * Bug 21574: Add link for zh manual and create manual links dynamically + * Bug 21330: Non-usable scrollbar appears in tor browser security settings + * Bug 21324: Don't update NoScript button with timer update + * Translation updates + * Update HTTPS-Everywhere to 5.2.11 + * Bug 21514: Restore W^X JIT implementation removed from ESR45 + * Bug 21536: Remove scramblesuit bridge + * Bug 21342: Move meek-azure to the meek.azureedge.net backend and cymrubridge02 bridge + * Bug 21326: Update the "Using a system-installed Tor" section in start script + * Build system + * Bug 17034: Use our built binutils and GCC for building tor + * Code clean-up + Tor Browser 7.0a2 -- March 7 2017 * All Platforms * Update Firefox to 45.8.0esr @@ -23,6 +43,23 @@ Tor Browser 7.0a2 -- March 7 2017 * Bug 17034: Use our built binutils and GCC for building tor * Clean-up +Tor Browser 6.5.1 -- March 7 2017 + * All Platforms + * Update Firefox to 45.8.0esr + * Tor to 0.2.9.10 + * OpenSSL to 1.0.2k + * Update Torbutton to 1.9.6.14 + * Bug 21396: Allow leaking of resource/chrome URIs (off by default) + * Bug 21574: Add link for zh manual and create manual links dynamically + * Bug 21330: Non-usable scrollbar appears in tor browser security settings + * Translation updates + * Update HTTPS-Everywhere to 5.2.11 + * Bug 21514: Restore W^X JIT implementation removed from ESR45 + * Bug 21536: Remove scramblesuit bridge + * Bug 21342: Move meek-azure to the meek.azureedge.net backend and cymrubridge02 bridge + * Linux + * Bug 21326: Update the "Using a system-installed Tor" section in start script + Tor Browser 7.0a1-hardened -- January 25 2017 * All Platforms * Update Firefox to 45.7.0esr

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] Backport of tjr's patch for bug 1331349
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit d4b359c42ae2dbd3ab6406cdf99db796602aaedf Author: Georg Koppen <gk(a)torproject.org> Date: Wed Feb 1 11:52:36 2017 +0000 Backport of tjr's patch for bug 1331349 --- js/src/gc/Memory.cpp | 6 +++--- mfbt/Attributes.h | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/js/src/gc/Memory.cpp b/js/src/gc/Memory.cpp index 00f3c23..981ecc0 100644 --- a/js/src/gc/Memory.cpp +++ b/js/src/gc/Memory.cpp @@ -854,7 +854,7 @@ ProtectPages(void* p, size_t size) DWORD oldProtect; if (!VirtualProtect(p, size, PAGE_NOACCESS, &oldProtect)) { snprintf(sCrashReason, sizeof(sCrashReason), - "MOZ_CRASH(VirtualProtect(PAGE_NOACCESS) failed! Error code: %u)", GetLastError()); + "MOZ_CRASH(VirtualProtect(PAGE_NOACCESS) failed! Error code: %lu)", GetLastError()); MOZ_CRASH_ANNOTATE(sCrashReason); MOZ_REALLY_CRASH(); } @@ -875,7 +875,7 @@ MakePagesReadOnly(void* p, size_t size) DWORD oldProtect; if (!VirtualProtect(p, size, PAGE_READONLY, &oldProtect)) { snprintf(sCrashReason, sizeof(sCrashReason), - "MOZ_CRASH(VirtualProtect(PAGE_READONLY) failed! Error code: %u)", GetLastError()); + "MOZ_CRASH(VirtualProtect(PAGE_READONLY) failed! Error code: %lu)", GetLastError()); MOZ_CRASH_ANNOTATE(sCrashReason); MOZ_REALLY_CRASH(); } @@ -896,7 +896,7 @@ UnprotectPages(void* p, size_t size) DWORD oldProtect; if (!VirtualProtect(p, size, PAGE_READWRITE, &oldProtect)) { snprintf(sCrashReason, sizeof(sCrashReason), - "MOZ_CRASH(VirtualProtect(PAGE_READWRITE) failed! Error code: %u)", GetLastError()); + "MOZ_CRASH(VirtualProtect(PAGE_READWRITE) failed! Error code: %lu)", GetLastError()); MOZ_CRASH_ANNOTATE(sCrashReason); MOZ_REALLY_CRASH(); } diff --git a/mfbt/Attributes.h b/mfbt/Attributes.h index df6172f..bcd393c 100644 --- a/mfbt/Attributes.h +++ b/mfbt/Attributes.h @@ -594,7 +594,10 @@ * PR_snprintf and friends, which are "printf-like" but which assign * different meanings to the various formats. */ -#ifdef __GNUC__ +#ifdef __MINGW__ +#define MOZ_FORMAT_PRINTF(stringIndex, firstToCheck) \ + __attribute__ ((format (ms_printf, stringIndex, firstToCheck))) +#elseif __GNUC__ #define MOZ_FORMAT_PRINTF(stringIndex, firstToCheck) \ __attribute__ ((format (printf, stringIndex, firstToCheck))) #else

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] Backport of tjr's patch for bug 1314979
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit b63cc0d449954e51a72721f34e3628e75daba59a Author: Georg Koppen <gk(a)torproject.org> Date: Wed Feb 1 19:25:39 2017 +0000 Backport of tjr's patch for bug 1314979 --- build/moz.configure/toolchain.configure | 6 +++++- moz.configure | 6 ++++-- old-configure.in | 12 +++++++++++- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure index 8b24161..288bf48 100644 --- a/build/moz.configure/toolchain.configure +++ b/build/moz.configure/toolchain.configure @@ -906,5 +906,9 @@ set_define('HAVE_VISIBILITY_ATTRIBUTE', set_config('WRAP_SYSTEM_INCLUDES', wrap_system_includes) set_config('VISIBILITY_FLAGS', visibility_flags) -include('windows.configure') +@depends(target, c_compiler) +def is_windows(target, compiler): + return target.kernel == 'WINNT' and compiler.type in ['msvc', 'clang-cl'] + +include('windows.configure', when=is_windows) include('rust.configure') diff --git a/moz.configure b/moz.configure index ec90697..8457d48 100644 --- a/moz.configure +++ b/moz.configure @@ -278,11 +278,13 @@ system_hunspell = pkg_check_modules('MOZ_HUNSPELL', 'hunspell', set_config('MOZ_SYSTEM_HUNSPELL', depends_if(system_hunspell)(lambda _: True)) -@depends(target) +@depends(target, c_compiler) @imports('os') -def makensis_progs(target): +def makensis_progs(target, compiler): if target.kernel != 'WINNT': return + elif target.kernel == 'WINNT' and compiler.type not in ['msvc', 'clang-cl']: + return candidates = [ 'makensis-3.0b3.exe', diff --git a/old-configure.in b/old-configure.in index 11a7d58..abf8323 100644 --- a/old-configure.in +++ b/old-configure.in @@ -3384,7 +3384,17 @@ if test -n "$MOZ_ANGLE_RENDERER"; then AC_MSG_RESULT([Windows SDK not found.]) fi else - AC_MSG_ERROR([Couldn't find Windows SDK 8.1 or higher needed for ANGLE.]) + if test "$target" != "$host"; then + case "$target" in + *-mingw*) + AC_MSG_RESULT([Windows SDK not needed for ANGLE in MinGW build.]) + ;; + *) + AC_MSG_ERROR([Couldn't find Windows SDK 8.1 or higher needed for ANGLE.]) + esac + else + AC_MSG_ERROR([Couldn't find Windows SDK 8.1 or higher needed for ANGLE.]) + fi fi if test -z "$MOZ_D3DCOMPILER_VISTA_DLL_PATH"; then

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] Bug 1336527 Define RegisterIdlePeriod r=baku
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit a6a430bf6393f51a778b8dfe19103ae708bfcc5c Author: Tom Ritter <tom(a)mozilla.com> Date: Fri Feb 17 13:29:12 2017 -0600 Bug 1336527 Define RegisterIdlePeriod r=baku MozReview-Commit-ID: A41UJ6OHvP7 --HG-- extra : rebase_source : 0191c1bbece94bb9dabbf2daf56351a624efa481 --- dom/workers/WorkerThread.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dom/workers/WorkerThread.h b/dom/workers/WorkerThread.h index d1df133..f128702 100644 --- a/dom/workers/WorkerThread.h +++ b/dom/workers/WorkerThread.h @@ -77,6 +77,14 @@ public: uint32_t RecursionDepth(const WorkerThreadFriendKey& aKey) const; + // Required for MinGW build #1336527 to handle compiler bug: + // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79582 + NS_IMETHOD + RegisterIdlePeriod(already_AddRefed<nsIIdlePeriod> aIdlePeriod) override + { + return nsThread::RegisterIdlePeriod(already_AddRefed<nsIIdlePeriod>(aIdlePeriod.take())); + } + NS_DECL_ISUPPORTS_INHERITED private:

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] Fix SSE2 compilation for mingw-w64
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit 01f545c45a48f7805637b6eb0db26589dc079a96 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Mar 30 09:22:37 2017 +0000 Fix SSE2 compilation for mingw-w64 This is tjr's workaround for bug 1331335. --- gfx/angle/src/libANGLE/moz.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gfx/angle/src/libANGLE/moz.build b/gfx/angle/src/libANGLE/moz.build index 605f30d..d05c77c 100755 --- a/gfx/angle/src/libANGLE/moz.build +++ b/gfx/angle/src/libANGLE/moz.build @@ -112,7 +112,6 @@ UNIFIED_SOURCES += [ '../compiler/translator/VersionGLSL.cpp', '../image_util/copyimage.cpp', '../image_util/imageformats.cpp', - '../image_util/loadimage.cpp', '../image_util/loadimage_etc.cpp', '../third_party/compiler/ArrayBoundsClamper.cpp', '../third_party/murmurhash/MurmurHash3.cpp', @@ -290,10 +289,12 @@ SOURCES += [ '../compiler/translator/glslang_tab.cpp', '../compiler/translator/RewriteTexelFetchOffset.cpp', '../compiler/translator/ShaderLang.cpp', + '../image_util/loadimage.cpp', 'Display.cpp', 'renderer/d3d/DisplayD3D.cpp', 'renderer/d3d/HLSLCompiler.cpp', ] +SOURCES['../image_util/loadimage.cpp'].flags += CONFIG['SSE2_FLAGS'] if CONFIG['MOZ_HAS_WINSDK_WITH_D3D']: UNIFIED_SOURCES += [ 'renderer/d3d/d3d11/Blit11.cpp',

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] fixup! TB3: Tor Browser's official .mozconfigs.
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit 70fd0587c18f111fbae0e64b03ca7a273e5c0e94 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Mar 30 09:18:53 2017 +0000 fixup! TB3: Tor Browser's official .mozconfigs. --- .mozconfig-mingw | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.mozconfig-mingw b/.mozconfig-mingw index 74f5db8..de86c49b 100644 --- a/.mozconfig-mingw +++ b/.mozconfig-mingw @@ -2,6 +2,7 @@ CROSS_COMPILE=1 ac_add_options --enable-application=browser ac_add_options --target=i686-w64-mingw32 +ac_add_options --with-toolchain-prefix=i686-w64-mingw32- ac_add_options --enable-default-toolkit=cairo-windows mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-mingw mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" @@ -26,5 +27,3 @@ ac_add_options --disable-crashreporter ac_add_options --disable-maintenance-service ac_add_options --disable-webrtc ac_add_options --disable-tests - -#ac_add_options --disable-ctypes

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] Getting Tor Browser to build with accessibility enabled on Windows
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit 1be3aec99fc7731563715dcfc7724fcd7ca4a6fb Author: Georg Koppen <gk(a)torproject.org> Date: Fri Feb 10 11:05:34 2017 +0000 Getting Tor Browser to build with accessibility enabled on Windows Patch by Jacek Caban --- 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 ecddbdd..88acdf6 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, diff --git a/other-licenses/ia2/IA2TypeLibrary.idl b/other-licenses/ia2/IA2TypeLibrary.idl index 2519aca..97aa08b 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/tor-browser-52.0.2esr-7.0-2] squash! TB3: Tor Browser's official .mozconfigs.
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit b9d5e7c1a8ec3455857e2752d021b85dcc187ea9 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Mar 14 08:42:49 2017 +0000 squash! TB3: Tor Browser's official .mozconfigs. Bug 21239: Use GTK2 for ESR52 Linux builds --- .mozconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.mozconfig b/.mozconfig index 7b25244..cde5b49 100755 --- a/.mozconfig +++ b/.mozconfig @@ -9,6 +9,9 @@ ac_add_options --enable-optimize #ac_add_options --disable-optimize ac_add_options --enable-official-branding +# Let's support GTK2 for ESR52 +ac_add_options --enable-default-toolkit=cairo-gtk2 + ac_add_options --enable-tor-browser-update ac_add_options --enable-signmar ac_add_options --enable-verify-mar @@ -21,7 +24,6 @@ ac_add_options --disable-maintenance-service ac_add_options --disable-crashreporter ac_add_options --disable-webrtc # Let's not compile EME at least until we can enable ClearKey and only Clearkey. -# (Apart from that there is no Adobe CRM module for Linux right now) ac_add_options --disable-eme #ac_add_options --disable-ctypes ac_add_options --enable-jemalloc=4

1 0