- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-52.7.3esr-8.0-1] Bug 20283: Tor Browser should run without a `/proc` filesystem.
by gk＠torproject.org 16 Apr '18

16 Apr '18

commit 90e16dd25b6eb199c016fc8b5e9478a3454d36e1 Author: Richard Pospesel <richard(a)torproject.org> Date: Mon Apr 9 11:40:32 2018 -0700 Bug 20283: Tor Browser should run without a `/proc` filesystem. Firefox uses the current stack frame address and the stack size as a sort of heuristic for various things in the javascript engine. The js::GetNativeStackBaseImpl() function is used to get the base stack address (ie the address from which the stack grows, so this can be either the first or last memory address of the stack memory space depending on the CPU architecture). On Linux, this function is implemented using the pthreads APIs. For non-main threads, the queried thread info is stored in memory. The main thread does not have this information on hand, so it gets the stack memory range via the /proc/self/maps file ( see glibc's pthread_get_attr_np.c ). Fortunately (per discussions with the firefox devs in #jsapi) the base address only needs to be approximation. In reality, environment variables, args, and other things are stored in space between the end/beginning of the mapped stack memory and the 'top' of the stack space used by stack frames. We can get the top of this usable stack from __libc_stack_end, which is a void* set by glibc during program initialization. Non-main threads still get their stack-base through the usual pthreads APIs. This patch integrates the latest jsnativestack.cpp from mozilla- central, and creates a specific implementation of js::GetNativeStackBaseImpl() for non-android Linux using the described __libc_stack_end read. --- js/src/jsnativestack.cpp | 88 +++++++++++++++++++++++++++++------------------- 1 file changed, 54 insertions(+), 34 deletions(-) diff --git a/js/src/jsnativestack.cpp b/js/src/jsnativestack.cpp index 05928ea3dff3..0f4dae156c2b 100644 --- a/js/src/jsnativestack.cpp +++ b/js/src/jsnativestack.cpp @@ -8,22 +8,17 @@ #ifdef XP_WIN # include "jswin.h" - #elif defined(XP_DARWIN) || defined(DARWIN) || defined(XP_UNIX) # include <pthread.h> - # if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) # include <pthread_np.h> # endif - -# if defined(ANDROID) +# if defined(ANDROID) && !defined(__aarch64__) # include <sys/types.h> # include <unistd.h> # endif - #else # error "Unsupported platform" - #endif #if defined(XP_WIN) @@ -31,32 +26,8 @@ void* js::GetNativeStackBaseImpl() { -# if defined(_M_IX86) && defined(_MSC_VER) - /* - * offset 0x18 from the FS segment register gives a pointer to - * the thread information block for the current thread - */ - NT_TIB* pTib; - __asm { - MOV EAX, FS:[18h] - MOV pTib, EAX - } - return static_cast<void*>(pTib->StackBase); - -# elif defined(_M_X64) - PNT_TIB64 pTib = reinterpret_cast<PNT_TIB64>(NtCurrentTeb()); - return reinterpret_cast<void*>(pTib->StackBase); - -# elif defined(_M_ARM) PNT_TIB pTib = reinterpret_cast<PNT_TIB>(NtCurrentTeb()); return static_cast<void*>(pTib->StackBase); - -# elif defined(_WIN32) && defined(__GNUC__) - NT_TIB* pTib; - asm ("movl %%fs:0x18, %0\n" : "=r" (pTib)); - return static_cast<void*>(pTib->StackBase); - -# endif } #elif defined(SOLARIS) @@ -88,6 +59,55 @@ js::GetNativeStackBaseImpl() context.uc_stack.ss_size; } +#elif defined(XP_LINUX) && !defined(ANDROID) + +# include <dlfcn.h> +# include <sys/syscall.h> +static pid_t +gettid() +{ + return syscall(__NR_gettid); +} + +void* +js::GetNativeStackBaseImpl() +{ + // main thread, get stack base from __libc_stack_end rather than pthread APIs + // to avoid filesystem calls /proc/self/maps + if(gettid() == getpid()) { + void** pLibcStackEnd = (void**)dlsym(RTLD_DEFAULT, "__libc_stack_end"); + // if __libc_stack_end is not found, architecture specific frame pointer hopping will need + // to be implemented + MOZ_ASSERT(pLibcStackEnd); + void* stackBase = *pLibcStackEnd; + MOZ_ASSERT(stackBase); + // we don't need to fix stackBase, as it already roughly points to beginning of the stack + return stackBase; + } + // non-main threads have the required info stored in memory, no filesystem calls are made + else { + pthread_t thread = pthread_self(); + pthread_attr_t sattr; + pthread_attr_init(&sattr); + pthread_getattr_np(thread, &sattr); + // stackBase will be the lowest address on all architectures + void* stackBase = nullptr; + size_t stackSize = 0; + int rc = pthread_attr_getstack(&sattr, &stackBase, &stackSize); + if(rc) { + MOZ_CRASH(); + } + MOZ_ASSERT(stackBase); + pthread_attr_destroy(&sattr); + +# if JS_STACK_GROWTH_DIRECTION > 0 + return stackBase; +# else + return static_cast<char*>(stackBase) + stackSize; +# endif + } +} + #else /* XP_UNIX */ void* @@ -120,11 +140,11 @@ js::GetNativeStackBaseImpl() rc = pthread_stackseg_np(pthread_self(), &ss); stackBase = (void*)((size_t) ss.ss_sp - ss.ss_size); stackSize = ss.ss_size; -# elif defined(ANDROID) +# elif defined(ANDROID) && !defined(__aarch64__) if (gettid() == getpid()) { - // bionic's pthread_attr_getstack doesn't tell the truth for the main - // thread (see bug 846670). So we scan /proc/self/maps to find the - // segment which contains the stack. + // bionic's pthread_attr_getstack prior to API 21 doesn't tell the truth + // for the main thread (see bug 846670). So we scan /proc/self/maps to + // find the segment which contains the stack. rc = -1; // Put the string on the stack, otherwise there is the danger that it

1 0

[tor-browser/tor-browser-52.7.3esr-8.0-1] Bug 21537: Tests for secure .onion cookies
by gk＠torproject.org 13 Apr '18

13 Apr '18

commit 82cd8ae9a5de7c9f9fde591c29b0ccfa8b59d42f Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 13 17:00:11 2018 +0000 Bug 21537: Tests for secure .onion cookies --- netwerk/test/TestCookie.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/netwerk/test/TestCookie.cpp b/netwerk/test/TestCookie.cpp index 68c7ff1b3ef1..c382c33c7e3c 100644 --- a/netwerk/test/TestCookie.cpp +++ b/netwerk/test/TestCookie.cpp @@ -729,8 +729,18 @@ main(int32_t argc, char *argv[]) SetACookie(cookieService, "http://www.security.test/", nullptr, "test=non-security2; domain=security.test", nullptr); GetACookieNoHttp(cookieService, "http://www.security.test/", getter_Copies(cookie)); rv[8] = CheckResult(cookie.get(), MUST_CONTAIN, "test=non-security2"); - - allTestsPassed = PrintResult(rv, 9) && allTestsPassed; + // .onion secure cookie tests + SetACookie(cookieService, "http://123456789abcdef.onion/", nullptr, "test=onion-security; secure", nullptr); + GetACookieNoHttp(cookieService, "https://123456789abcdef.onion/", getter_Copies(cookie)); + rv[9] = CheckResult(cookie.get(), MUST_EQUAL, "test=onion-security"); + SetACookie(cookieService, "http://123456789abcdef.onion/", nullptr, "test=onion-security2; secure", nullptr); + GetACookieNoHttp(cookieService, "http://123456789abcdef.onion/", getter_Copies(cookie)); + rv[10] = CheckResult(cookie.get(), MUST_EQUAL, "test=onion-security2"); + SetACookie(cookieService, "https://123456789abcdef.onion/", nullptr, "test=onion-security3; secure", nullptr); + GetACookieNoHttp(cookieService, "http://123456789abcdef.onion/", getter_Copies(cookie)); + rv[11] = CheckResult(cookie.get(), MUST_EQUAL, "test=onion-security3"); + + allTestsPassed = PrintResult(rv, 12) && allTestsPassed; // *** nsICookieManager{2} interface tests sBuffer = PR_sprintf_append(sBuffer, "*** Beginning nsICookieManager{2} interface tests...\n");

1 0

[tor-browser/tor-browser-52.7.3esr-8.0-1] Bug 21537: Mark .onion cookies as secure
by gk＠torproject.org 13 Apr '18

13 Apr '18

commit c70454fd10efeb9f4cabc69f94a9a7a633c10174 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 13 16:59:24 2018 +0000 Bug 21537: Mark .onion cookies as secure --- netwerk/cookie/nsCookieService.cpp | 60 ++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/netwerk/cookie/nsCookieService.cpp b/netwerk/cookie/nsCookieService.cpp index cf1d91e2df36..f9390d7ef093 100644 --- a/netwerk/cookie/nsCookieService.cpp +++ b/netwerk/cookie/nsCookieService.cpp @@ -3112,6 +3112,26 @@ PathMatches(nsCookie* aCookie, const nsACString& aPath) { return true; } +static bool +IsSecureHost(nsIURI *aHostURI) { + bool isSecure = true; + // If SchemeIs fails, assume an insecure connection, to be on the safe side. + if (aHostURI && NS_FAILED(aHostURI->SchemeIs("https", &isSecure))) { + isSecure = false; + } + // In case HTTPS is not used check whether we have a .onion host in which + // case the cookie is secure, too. + if (aHostURI && !isSecure) { + nsresult rv; + nsAutoCString hostFromURI; + rv = aHostURI->GetAsciiHost(hostFromURI); + if (NS_SUCCEEDED(rv)) { + isSecure = StringEndsWith(hostFromURI, NS_LITERAL_CSTRING(".onion")); + } + } + return isSecure; +} + void nsCookieService::GetCookieStringInternal(nsIURI *aHostURI, bool aIsForeign, @@ -3164,13 +3184,10 @@ nsCookieService::GetCookieStringInternal(nsIURI *aHostURI, // If it changes, please update that function, or file a bug for someone // else to do so. - // check if aHostURI is using an https secure protocol. - // if it isn't, then we can't send a secure cookie over the connection. - // if SchemeIs fails, assume an insecure connection, to be on the safe side - bool isSecure; - if (NS_FAILED(aHostURI->SchemeIs("https", &isSecure))) { - isSecure = false; - } + // Check if aHostURI is using the HTTPS protocol or if the domain is a + // .onion. If it isn't, then we can't send a secure cookie over the + // connection. + bool isSecure = IsSecureHost(aHostURI); nsCookie *cookie; AutoTArray<nsCookie*, 8> foundCookieList; @@ -3316,20 +3333,10 @@ nsCookieService::SetCookieInternal(nsIURI *aHostURI, // so we can handle them separately. bool newCookie = ParseAttributes(aCookieHeader, cookieAttributes); - // Collect telemetry on how often secure cookies are set from non-secure - // origins, and vice-versa. - // - // 0 = nonsecure and "http:" - // 1 = nonsecure and "https:" - // 2 = secure and "http:" - // 3 = secure and "https:" - bool isHTTPS; - nsresult rv = aHostURI->SchemeIs("https", &isHTTPS); - if (NS_SUCCEEDED(rv)) { - Telemetry::Accumulate(Telemetry::COOKIE_SCHEME_SECURITY, - ((cookieAttributes.isSecure)? 0x02 : 0x00) | - ((isHTTPS)? 0x01 : 0x00)); - } + // Check if aHostURI is using the HTTPS protocol or if the domain is a + // .onion. If it isn't, then we can't send a secure cookie over the + // connection. + bool isSecure = IsSecureHost(aHostURI); int64_t currentTimeInUsec = PR_Now(); @@ -3369,7 +3376,7 @@ nsCookieService::SetCookieInternal(nsIURI *aHostURI, return newCookie; } // magic prefix checks. MUST be run after CheckDomain() and CheckPath() - if (!CheckPrefixes(cookieAttributes, isHTTPS)) { + if (!CheckPrefixes(cookieAttributes, isSecure)) { COOKIE_LOGFAILURE(SET_COOKIE, aHostURI, savedCookieHeader, "failed the prefix tests"); return newCookie; } @@ -3457,13 +3464,10 @@ nsCookieService::AddInternal(const nsCookieKey &aKey, return; } - bool isSecure = true; - if (aHostURI && NS_FAILED(aHostURI->SchemeIs("https", &isSecure))) { - isSecure = false; - } + bool isSecure = IsSecureHost(aHostURI); - // If the new cookie is non-https and wants to set secure flag, - // browser have to ignore this new cookie. + // If the new cookie is non-https or not set by a .onion domain, and wants to + // set secure flag, browser have to ignore this new cookie. // (draft-ietf-httpbis-cookie-alone section 3.1) if (mLeaveSecureAlone && aCookie->IsSecure() && !isSecure) { COOKIE_LOGFAILURE(SET_COOKIE, aHostURI, aCookieHeader,

1 0

[tor-browser-build/master] Bug 25481: Enable rust support in Linux nightlies
by boklm＠torproject.org 13 Apr '18

13 Apr '18

commit 5be41831b52795ee87c57cdbd18da68bf73fe1cc Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 13 14:29:20 2018 +0000 Bug 25481: Enable rust support in Linux nightlies We enable Rust support for tor in our Linux nightly builds as a first step to enabling it on all supported platforms. --- keyring/rust.gpg | Bin 0 -> 5311 bytes projects/cmake/config | 2 +- projects/rust/binaryen.patch | 22 +++++++++++++++ projects/rust/build | 38 ++++++++++++++++++++++++++ projects/rust/config | 62 +++++++++++++++++++++++++++++++++++++++++++ projects/tor/build | 8 ++++-- projects/tor/config | 4 +++ 7 files changed, 133 insertions(+), 3 deletions(-) diff --git a/keyring/rust.gpg b/keyring/rust.gpg new file mode 100644 index 0000000..e81f452 Binary files /dev/null and b/keyring/rust.gpg differ diff --git a/projects/cmake/config b/projects/cmake/config index 357370d..492b99c 100644 --- a/projects/cmake/config +++ b/projects/cmake/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2.8.12.2 +version: 3.4.3 git_url: https://cmake.org/cmake.git git_hash: 'v[% c("version") %]' tag_gpg_id: 1 diff --git a/projects/rust/binaryen.patch b/projects/rust/binaryen.patch new file mode 100644 index 0000000..fee9b6a --- /dev/null +++ b/projects/rust/binaryen.patch @@ -0,0 +1,22 @@ +From 820f26810baf35c1961763f6b0013e4f7e7380da Mon Sep 17 00:00:00 2001 +From: Georg Koppen <gk(a)torproject.org> +Date: Thu, 12 Apr 2018 13:10:13 +0000 +Subject: [PATCH] Use our gcc/c++ + + +diff --git a/src/librustc_binaryen/build.rs b/src/librustc_binaryen/build.rs +index f23ff3cee5..2496dd1be9 100644 +--- a/src/librustc_binaryen/build.rs ++++ b/src/librustc_binaryen/build.rs +@@ -26,6 +26,8 @@ fn main() { + + Config::new("../binaryen") + .define("BUILD_STATIC_LIB", "ON") ++ .define("CMAKE_C_COMPILER", "gcc") ++ .define("CMAKE_CXX_COMPILER", "c++") + .build_target("binaryen") + .build(); + +-- +2.16.3 + diff --git a/projects/rust/build b/projects/rust/build new file mode 100644 index 0000000..e20df55 --- /dev/null +++ b/projects/rust/build @@ -0,0 +1,38 @@ +#!/bin/bash +[% c('var/setarch') %] +[% c("var/set_default_env") -%] +distdir=/var/tmp/dist/[% project %] +mkdir -p /var/tmp/dist +tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %] +export PATH="/var/tmp/dist/cmake/bin:$PATH" +tar -C /var/tmp/dist -xf [% c('input_files_by_name/prev_rust') %] +cd /var/tmp/dist/rust-[% c('var/prev_version') %]-[% c('arch') %]-unknown-linux-gnu +./install.sh --prefix=$distdir-rust-old +export PATH="$distdir-rust-old/bin:$PATH" + +[% IF c("var/linux") %] + [% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcc') }) %] +[% END -%] + +cd $rootdir +mkdir /var/tmp/build +tar -C /var/tmp/build -xf [% c('input_files_by_name/rust') %] +cd /var/tmp/build/rustc-[% c('version') %]-src + +[% IF c("var/linux") %] + # binaryen hardcodes /usr/bin/cc and /usr/bin/c++ as the C and C++ compiler. + # But that is too old on Debian Wheezy which is why we need to patch it, so + # we can use our own GCC instead. + patch -p1 < $rootdir/binaryen.patch +[% END %] + +mkdir build +cd build +../configure --prefix=$distdir [% c("var/configure_opt") %] +make -j[% c("buildconf/num_procs") %] +make install +cd /var/tmp/dist +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/rust/config b/projects/rust/config new file mode 100644 index 0000000..49fc3ab --- /dev/null +++ b/projects/rust/config @@ -0,0 +1,62 @@ +# vim: filetype=yaml sw=2 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +version: 1.25.0 +var: + prev_version: 1.24.1 + container: + use_container: 1 + +targets: + linux: + var: + arch_deps: + - hardening-wrapper + - libssl-dev + - pkg-config + # We use + # `--enable-local-rust` to avoid downloading the required compiler during + # build time + # + # `--enable-vendor` to avoid downloading crates during build time and just + # use the ones which are shipped with the source + # + # `--enable-extended` to build not only rustc but cargo as well + # + # `--release-channel=stable` to just include stable features in the + # compiler + # + # `--sysconfdir=etc` to avoid install failures as |make install| wants to + # write to /etc otherwise + # + # the `target` triple to explicitly specify the architecture and platform + # for the compiler/std lib. Ideally, it should not be needed unless one is + # cross-compiling, but compiling `alloc_jemalloc` fails without that in a + # 32bit container. "--host=x86_64-unknown-linux-gnu" is used in its + # configure script in this case. + # `--set=` to explicitly specify the C compiler. We need to compile the + # bundled LLVM and it wants to use `cc`. However, we don't have that in + # our compiled GCC resulting in weird errors due to C and C++ compiler + # version mismatch. We avoid that with this configure option. We need to + # build our own GCC in the first place as 4.7.2 is too old to get all the + # Rust pieces compiled. + configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=[% c("arch") %]-unknown-linux-gnu --set=target.[% c("arch") %]-unknown-linux-gnu.cc=gcc + +input_files: + - project: container-image + - project: cmake + name: cmake + - project: gcc + name: gcc + enable: '[% c("var/linux") %]' + - URL: 'https://static.rust-lang.org/dist/rustc-[% c("version") %]-src.tar.gz' + name: rust + sig_ext: asc + file_gpg_id: 1 + gpg_keyring: rust.gpg + - URL: 'https://static.rust-lang.org/dist/rust-[% c("var/prev_version") %]-[% c("arch") %]-unknown-linux-gnu.tar.xz' + name: prev_rust + sig_ext: asc + file_gpg_id: 1 + gpg_keyring: rust.gpg + - filename: binaryen.patch + enable: '[% c("var/linux") %]' diff --git a/projects/tor/build b/projects/tor/build index e52e43b..bf7db83 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -20,6 +20,10 @@ mkdir -p /var/tmp/build tar -C /var/tmp/dist -xf [% c('input_files_by_name/openssl') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/libevent') %] +[% IF c("var/linux") && c("var/nightly") %] + tar -C /var/tmp/dist -xf [% c('input_files_by_name/rust') %] + export PATH=/var/tmp/dist/rust/bin:$PATH +[% END %] tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz libeventdir=/var/tmp/dist/libevent openssldir=/var/tmp/dist/openssl @@ -31,7 +35,6 @@ openssldir=/var/tmp/dist/openssl $gcclibs/*.dll $distdir/Tor/ [% END %] - [% IF c("var/linux") %] mkdir -p "$distdir/Debug/Tor" cp $openssldir/lib/libssl.so.1.0.0 "$distdir/Tor/" @@ -62,10 +65,11 @@ cd /var/tmp/build/[% project %]-[% c('version') %] echo '"[% c("abbrev", { abbrev_length => 16 }) %]"' > micro-revision.i ./autogen.sh find -type f -print0 | xargs -0 [% c("var/touch") %] -./configure --disable-asciidoc --with-libevent-dir="$libeventdir" --with-openssl-dir="$openssldir" \ +[% IF c("var/linux") && c("var/nightly") %]TOR_RUST_DEPENDENCIES=`pwd`/src/ext/rust/crates[% END %] ./configure --disable-asciidoc --with-libevent-dir="$libeventdir" --with-openssl-dir="$openssldir" \ [% IF c("var/asan") %]--enable-fragile-hardening[% END %] \ [% IF c("var/windows") %]--with-zlib-dir="$zlibdir"[% END %] \ [% IF c("var/osx") %]--enable-static-openssl[% END %] \ + [% IF c("var/linux") && c("var/nightly") %]--enable-rust[% END %] \ --prefix="$distdir" [% c("var/configure_opt") %] [% IF c("var/osx") || c("var/windows") -%] export LD_PRELOAD=[% c("var/faketime_path") %] diff --git a/projects/tor/config b/projects/tor/config index e650b6e..7029880 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -3,6 +3,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil version: 0.3.3.3-alpha git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git +git_submodule: 1 gpg_keyring: tor.gpg tag_gpg_id: 1 @@ -57,3 +58,6 @@ input_files: enable: '[% c("var/windows") %]' - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' + - name: rust + project: rust + enable: '[% c("var/linux") && c("var/nightly") %]'

1 0

[tor-browser-build/master] Bug 25572: Update NoScript to version 5.1.8.5
by gk＠torproject.org 12 Apr '18

12 Apr '18

commit 36cfa493d65da45022aad17c6d7b21ee0a9b2fae Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 11 11:59:12 2018 +0000 Bug 25572: Update NoScript to version 5.1.8.5 --- 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 661b8e2..dec5648 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -66,9 +66,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://secure.informaction.com/download/releases/noscript-5.1.8.5.xpi name: noscript - sha256sum: 1c85a72cd0d7d210f8dd463f9700214703a5f28319c2b1679db00f861a5289f7 + sha256sum: 7180f8d24ca31989682dee229b95e3503699f2bb25cb593a6a1f2ce0a2253792 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop'

1 0

[torbutton/master] Release preparations for 1.9.9.1
by gk＠torproject.org 11 Apr '18

11 Apr '18

commit 800fa9565409544e8ad134c803501f06ab902116 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 11 09:25:03 2018 +0000 Release preparations for 1.9.9.1 Version bump, Changelog update, and minVersion bump. We've forgotten the latter for a while now but this Torbutton requires at least a Firefox 52. --- src/CHANGELOG | 4 ++++ src/install.rdf | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 1ad2400..0ea09ce 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,7 @@ +1.9.9.1 + * Bug 25126: Make about:tor layout responsive + * Translations update + 1.9.9 * Bug 24159: Version check does not deal with platform specific checks * Bug 25016: Remove 2017 donation banner diff --git a/src/install.rdf b/src/install.rdf index 5ecdb6d..98db46a 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.9</em:version> + <em:version>1.9.9.1</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> @@ -17,7 +17,7 @@ <em:targetApplication> <Description> <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id> - <em:minVersion>45.0</em:minVersion> + <em:minVersion>52.0</em:minVersion> <em:maxVersion>10000.0</em:maxVersion> </Description> </em:targetApplication>

1 0

[torbutton/master] Translations update
by gk＠torproject.org 11 Apr '18

11 Apr '18

commit aad3b7bd2c6aaf6d684d624211e0a7cc506d9a69 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 11 09:21:46 2018 +0000 Translations update --- src/chrome/locale/ar/torbutton.dtd | 4 ++-- src/chrome/locale/es/aboutTor.dtd | 2 +- src/chrome/locale/es/torbutton.properties | 2 +- src/chrome/locale/nl/torbutton.dtd | 6 +++--- src/chrome/locale/nl/torbutton.properties | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/chrome/locale/ar/torbutton.dtd b/src/chrome/locale/ar/torbutton.dtd index 6e45989..1605070 100644 --- a/src/chrome/locale/ar/torbutton.dtd +++ b/src/chrome/locale/ar/torbutton.dtd @@ -35,10 +35,10 @@ <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts."> <!ENTITY torbutton.prefs.sec_standard_label "عادي"> <!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled."> -<!ENTITY torbutton.prefs.sec_safer_label "Safer"> +<!ENTITY torbutton.prefs.sec_safer_label "آمِن جدا"> <!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality."> <!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:"> -<!ENTITY torbutton.prefs.sec_safest_label "Safest"> +<!ENTITY torbutton.prefs.sec_safest_label "جِدّ آمِن"> <!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts."> <!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:"> <!ENTITY torbutton.prefs.sec_learn_more_label "تعرّف على المزيد"> diff --git a/src/chrome/locale/es/aboutTor.dtd b/src/chrome/locale/es/aboutTor.dtd index 35be7ee..6354df7 100644 --- a/src/chrome/locale/es/aboutTor.dtd +++ b/src/chrome/locale/es/aboutTor.dtd @@ -8,7 +8,7 @@ <!ENTITY aboutTor.outOfDateTorOn.label "ADVERTENCIA: Este navegador no está actualizado."> <!ENTITY aboutTor.outOfDateTorOff.label "ADEMÁS, este navegador tampoco está actualizado."> -<!ENTITY aboutTor.outOfDate2.label "Haga clic en la cebolla y luego seleccione Comprobar actualizaciones del Navegador Tor."> +<!ENTITY aboutTor.outOfDate2.label "Haz clic en la cebolla y luego selecciona Comprobar actualizaciones del Navegador Tor."> <!ENTITY aboutTor.check.label "Probar las preferencias de red Tor"> diff --git a/src/chrome/locale/es/torbutton.properties b/src/chrome/locale/es/torbutton.properties index b197bbf..35a796a 100644 --- a/src/chrome/locale/es/torbutton.properties +++ b/src/chrome/locale/es/torbutton.properties @@ -31,7 +31,7 @@ torbutton.popup.confirm_newnym = El Navegador Tor cerrará todas las ventanas y torbutton.slider_notification = El menú de la cebolla verde ahora tiene un control deslizante que le permite ajustar su nivel de seguridad. ¡Échele un vistazo! torbutton.slider_notification_button = Abrir ajustes de seguridad -torbutton.maximize_warning = Maximizar el navegador Tor puede permitir a los sitios web determinar el tamaño de su monitor, lo que se puede usar para rastrearle. Le recomendamos que deje las ventanas del navegador Tor a su tamaño predeterminado original. +torbutton.maximize_warning = Maximizar el navegador Tor puede permitir a los sitios web determinar el tamaño de tu monitor, lo que podría usarse para rastrearte. Te recomendamos que dejes las ventanas del navegador Tor en su tamaño predeterminado. # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=Este sitio web (%s) intentó extraer datos de imagen de un lienzo HTML5, que podrían usarse para identificar de forma única su computadora.\n\n¿Debe permitir el Navegador Tor a este sitio web extraer los datos de imagen de lienzos HTML5? diff --git a/src/chrome/locale/nl/torbutton.dtd b/src/chrome/locale/nl/torbutton.dtd index 7cba67c..ce0e13a 100644 --- a/src/chrome/locale/nl/torbutton.dtd +++ b/src/chrome/locale/nl/torbutton.dtd @@ -34,12 +34,12 @@ <!ENTITY torbutton.prefs.sec_caption "Beveiligingsniveau"> <!ENTITY torbutton.prefs.sec_caption_tooltip "De beveiligingsschuifbalk laat je toe sommige functies uit te schakelen die je browser mogelijk blootstellen aan beveiligingsrisico's."> <!ENTITY torbutton.prefs.sec_standard_label "Standaard"> -<!ENTITY torbutton.prefs.sec_standard_description "Alle Tor Browser- en website functies zijn ingeschakeld."> +<!ENTITY torbutton.prefs.sec_standard_description "Alle Tor Browser- en websitefuncties zijn ingeschakeld."> <!ENTITY torbutton.prefs.sec_safer_label "Veiliger"> -<!ENTITY torbutton.prefs.sec_safer_description "Uitgeschakelde website functies die zijn meestal gevaarlijk, waardoor sommige sites functionaliteit vaak verliezen."> +<!ENTITY torbutton.prefs.sec_safer_description "Uitgeschakelde websitefuncties die zijn meestal gevaarlijk, waardoor sommige sites functionaliteit vaak verliezen."> <!ENTITY torbutton.prefs.sec_safer_list_label "Op de veiliger instelling:"> <!ENTITY torbutton.prefs.sec_safest_label "Veiligste"> -<!ENTITY torbutton.prefs.sec_safest_description "Alleen website-functies toestaan die vereist zijn voor statische sites en basis diensten. Deze wijzigingen zijn van invloed op afbeeldingen, media en scripts."> +<!ENTITY torbutton.prefs.sec_safest_description "Alleen websitefuncties toestaan die vereist zijn voor statische sites en basis diensten. Deze wijzigingen zijn van invloed op afbeeldingen, media en scripts."> <!ENTITY torbutton.prefs.sec_safest_list_label "Op de veiligste instelling:"> <!ENTITY torbutton.prefs.sec_learn_more_label "Leer Meer"> <!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript zijn uitgeschakeld op non-HTTP sites."> diff --git a/src/chrome/locale/nl/torbutton.properties b/src/chrome/locale/nl/torbutton.properties index 056e445..87595e2 100644 --- a/src/chrome/locale/nl/torbutton.properties +++ b/src/chrome/locale/nl/torbutton.properties @@ -28,7 +28,7 @@ torbutton.popup.confirm_plugins = plug-ins zoals flash kunnen u privacy en anoni torbutton.popup.never_ask_again = Vraag me dit nooit meer. torbutton.popup.confirm_newnym = De Tor Browser zal alle windows en tabs sluiten. Alle website sessies zullen verloren gaan.\n\nHerstart de Tor Browser om je identiteit te resetten?\n\n -torbutton.slider_notification = Het groene ui menu heeft nu een schuif regelaar waar u uw veiligheids level aan kunt passen. Bekijk het eens! +torbutton.slider_notification = Het groene ui menu heeft nu een schuifregelaar waar u uw beveiligingsniveau aan kunt passen. Bekijk het eens! torbutton.slider_notification_button = Open de beveiligingsvoorkeuren torbutton.maximize_warning = Het maximaliseren van Tor Browser stelt webpagina's in staat uw beeldschermgrootte vast te stellen; dit kan worden gebruikt om u te traceren. We raden aan dat u vensters van Tor Browser in hun oorspronkelijke grootte laat.

1 0

[tor-browser-build/master] Bump rbm (picking up fix for #25746)
by gk＠torproject.org 11 Apr '18

11 Apr '18

commit 80a65a334622562272af637b18afbce3d71e03da Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 11 09:08:29 2018 +0000 Bump rbm (picking up fix for #25746) --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index db41d8e..8adbc46 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit db41d8e754ed8cd6cee7bca18d76d59f8f7f369b +Subproject commit 8adbc46dc9e8358abad75ac81faf4646d8165b9e

1 0

[rbm/master] Bug 25746: fix git_submodule option with submodule in subdirectory
by gk＠torproject.org 11 Apr '18

11 Apr '18

commit 8adbc46dc9e8358abad75ac81faf4646d8165b9e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 9 18:54:04 2018 +0200 Bug 25746: fix git_submodule option with submodule in subdirectory To create an archive containing all submodules, we were creating a temporary archive of each submodule before appending them to the main archive. We were using the submodule path in the temporary archive filename, which was failing if the submodule is in a subdirectory. To avoid that, we are removing the path from the temporary archive's filename and directly appending it to the main archive. --- lib/RBM.pm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/RBM.pm b/lib/RBM.pm index f987130..8875a7c 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -557,13 +557,9 @@ sub maketar { ($stdout, $stderr, $success, $exit_code) = capture_exec('git', 'submodule', 'foreach', "git archive --prefix=$project-$version/\$path/" - . " --output=$tmpdir/submodule-\$name.tar \$sha1"); + . " --output=$tmpdir/submodule.tar \$sha1;" + . "tar -Af \"$dest_dir/$tar_file\" $tmpdir/submodule.tar"); exit_error 'Error running git archive on submodules.' unless $success; - foreach my $file (sort glob "$tmpdir/*.tar") { - ($stdout, $stderr, $success, $exit_code) - = capture_exec('tar', '-Af', "$dest_dir/$tar_file", $file); - exit_error "Error appending submodule tar:\n$stderr" unless $success; - } } } else { system('hg', 'archive', '-r', $commit_hash, '-t', 'tar',

1 0

[tor-browser-build/master] Bug 25420: update gcc to 6.4.0 for the Windows build
by gk＠torproject.org 11 Apr '18

11 Apr '18

commit d3e2dd7fad0c5a6fc0171719b6eb3f9e0883d84f Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Feb 28 12:02:33 2018 +0100 Bug 25420: update gcc to 6.4.0 for the Windows build --- projects/mingw-w64/build | 2 +- projects/mingw-w64/config | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/mingw-w64/build b/projects/mingw-w64/build index 8d3e567..8ce5048 100644 --- a/projects/mingw-w64/build +++ b/projects/mingw-w64/build @@ -21,7 +21,7 @@ make install cd /var/tmp/build mkdir gcc cd gcc -tar xjf $rootdir/gcc-[% c("var/gcc_version") %].tar.bz2 +tar xJf $rootdir/gcc-[% c("var/gcc_version") %].tar.xz # We don't want to link against msvcrt.dll due to bug 9084. [% c("arch") %]-w64-mingw32-g++ -dumpspecs > $distdir/msvcr100.spec sed 's/msvcrt/msvcr100/' -i $distdir/msvcr100.spec diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config index 5bfc93f..01d0c37 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.4.0 + gcc_version: 6.4.0 deps: - automake - build-essential @@ -30,7 +30,7 @@ targets: - g++-mingw-w64-x86-64 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: 608df76dec2d34de6558249d8af4cbee21eceddbcb580d666f7a5a583ca3303a + - URL: 'https://ftp.gnu.org/gnu/gcc/gcc-[% c("var/gcc_version") %]/gcc-[% c("var/gcc_version") %].tar.xz' + sha256sum: 850bf21eafdfe5cd5f6827148184c08c4a0852a37ccf36ce69855334d2c914d4 - name: binutils project: binutils

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_25420_v4'
by gk＠torproject.org 11 Apr '18

11 Apr '18

commit dcce85b6d858d5438bdc68098e846c8ea73c5df6 Merge: 8e21b34 d3e2dd7 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 11 08:28:31 2018 +0000 Merge remote-tracking branch 'boklm/bug_25420_v4' projects/mingw-w64/build | 2 +- projects/mingw-w64/config | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)

1 0

[tor-browser/tor-browser-52.7.3esr-8.0-1] Bug 1372870 - Compiling with mingw-w64 based on GCC 6.3.0 breaks (operands to ?: have different types) r=mattwoodrow
by gk＠torproject.org 11 Apr '18

11 Apr '18

commit d463bad82114ae420b165f8c3f2a690b9d663a19 Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 22 17:33:39 2017 +0200 Bug 1372870 - Compiling with mingw-w64 based on GCC 6.3.0 breaks (operands to ?: have different types) r=mattwoodrow --- gfx/layers/d3d11/TextureD3D11.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gfx/layers/d3d11/TextureD3D11.h b/gfx/layers/d3d11/TextureD3D11.h index 831342aa2e0b..bd0fbf659777 100644 --- a/gfx/layers/d3d11/TextureD3D11.h +++ b/gfx/layers/d3d11/TextureD3D11.h @@ -237,7 +237,7 @@ public: virtual ID3D11ShaderResourceView* GetShaderResourceView() override; // Returns nullptr if this texture was created by a DXGI TextureHost. - virtual DataTextureSource* AsDataTextureSource() override { return mAllowTextureUploads ? this : false; } + virtual DataTextureSource* AsDataTextureSource() override { return mAllowTextureUploads ? this : nullptr; } virtual void DeallocateDeviceData() override { mTexture = nullptr; }

1 0

[tor-browser/tor-browser-52.7.3esr-8.0-1] Bug 1407601 Revert to the previous behavior in MozGrMalloc.h for Linux, and add extern C to correct Solaris build break r=baku
by gk＠torproject.org 11 Apr '18

11 Apr '18

commit 645b11df3349f9045779d1d6c82d6c3722b6b2b2 Author: Tom Ritter <tom(a)mozilla.com> Date: Wed Oct 11 10:16:32 2017 -0500 Bug 1407601 Revert to the previous behavior in MozGrMalloc.h for Linux, and add extern C to correct Solaris build break r=baku MozReview-Commit-ID: GP6N6pcqQp --- gfx/graphite2/src/MozGrMalloc.h | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/gfx/graphite2/src/MozGrMalloc.h b/gfx/graphite2/src/MozGrMalloc.h index 0a853ab5d322..5d6a9f3910a9 100644 --- a/gfx/graphite2/src/MozGrMalloc.h +++ b/gfx/graphite2/src/MozGrMalloc.h @@ -12,19 +12,33 @@ #include "mozilla/mozalloc.h" -inline void* malloc(size_t size) +#if defined(XP_LINUX) + +#define malloc moz_xmalloc +#define calloc moz_xcalloc +#define realloc moz_xrealloc + +#else + +// extern "C" is needed for the Solaris build, while the inline +// functions are needed for the MinGW build. They break gcc 5.4.0 +// on Linux however, so keep the old #define's above for Linux + +extern "C" inline void* malloc(size_t size) { return moz_xmalloc(size); } -inline void* calloc(size_t nmemb, size_t size) +extern "C" inline void* calloc(size_t nmemb, size_t size) { return moz_xcalloc(nmemb, size); } -inline void* realloc(void *ptr, size_t size) +extern "C" inline void* realloc(void *ptr, size_t size) { return moz_xrealloc(ptr, size); } +#endif // defined(XP_LINUX) + #endif // MOZ_GR_MALLOC_H

1 0

[tor-browser/tor-browser-52.7.3esr-8.0-1] Bug 1389965 Redefine macros to inline functions to fix MinGW build r=jfkthame
by gk＠torproject.org 11 Apr '18

11 Apr '18

commit 5a3775152eac3be01e3e947214748e33712bec68 Author: Tom Ritter <tom(a)mozilla.com> Date: Mon Oct 2 12:46:26 2017 -0500 Bug 1389965 Redefine macros to inline functions to fix MinGW build r=jfkthame MozReview-Commit-ID: 55Rr9Tk2tdD --- gfx/graphite2/src/MozGrMalloc.h | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/gfx/graphite2/src/MozGrMalloc.h b/gfx/graphite2/src/MozGrMalloc.h index acaae1236c49..0a853ab5d322 100644 --- a/gfx/graphite2/src/MozGrMalloc.h +++ b/gfx/graphite2/src/MozGrMalloc.h @@ -12,8 +12,19 @@ #include "mozilla/mozalloc.h" -#define malloc moz_xmalloc -#define calloc moz_xcalloc -#define realloc moz_xrealloc +inline void* malloc(size_t size) +{ + return moz_xmalloc(size); +} + +inline void* calloc(size_t nmemb, size_t size) +{ + return moz_xcalloc(nmemb, size); +} + +inline void* realloc(void *ptr, size_t size) +{ + return moz_xrealloc(ptr, size); +} #endif // MOZ_GR_MALLOC_H

1 0

[tor-browser-build/master] Bug 20302: Fix FTE compilation for Windows with GCC 6.4.0
by gk＠torproject.org 11 Apr '18

11 Apr '18

commit 8e21b3462302b724aabae24f32b1a7329a32b06a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 6 14:27:23 2018 +0200 Bug 20302: Fix FTE compilation for Windows with GCC 6.4.0 --- projects/libfte/bug20302.patch | 36 ++++++++++++++++++++++++++++++++++++ projects/libfte/build | 1 + projects/libfte/config | 2 ++ 3 files changed, 39 insertions(+) diff --git a/projects/libfte/bug20302.patch b/projects/libfte/bug20302.patch new file mode 100644 index 0000000..a190e1d --- /dev/null +++ b/projects/libfte/bug20302.patch @@ -0,0 +1,36 @@ +From a2cee5aaf51df9660de6df98ada6706546739d13 Mon Sep 17 00:00:00 2001 +From: Georg Koppen <gk(a)torproject.org> +Date: Fri, 7 Oct 2016 09:10:41 +0000 +Subject: [PATCH] Compiling with GCC 6.4.0 based mingw-w64 is broken + +Due to a bug in Python (https://bugs.python.org/issue11566) compiling +with a GCC 6.4.0 based mingw-w64 is broken. This patch adds a workaround +for this issue. + +diff --git a/setup.py b/setup.py +index f546f1f..721b113 100644 +--- a/setup.py ++++ b/setup.py +@@ -11,16 +11,16 @@ import os + + if os.name == 'nt': + libraries = ['gmp.dll'] ++ extra_compile_args=['-O3', '-fPIC', '-D_hypot=hypot'] + else: + libraries = ['gmp'] ++ extra_compile_args=['-O3', '-fPIC'] + + fte_cDFA = Extension('fte.cDFA', + include_dirs=['fte', + 'thirdparty/gmp/include', + ], +- extra_compile_args=['-O3', +- '-fPIC', +- ], ++ extra_compile_args=extra_compile_args, + library_dirs=['thirdparty/gmp/bin', + 'thirdparty/gmp/lib', + ], +-- +2.9.3 + diff --git a/projects/libfte/build b/projects/libfte/build index 9493f30..4f3455f 100644 --- a/projects/libfte/build +++ b/projects/libfte/build @@ -13,6 +13,7 @@ ln -s /var/tmp/dist/gmp thirdparty/gmp mkdir -p $distdir tar -C $distdir -xf $rootdir/[% c('input_files_by_name/obfsproxy') %] [% IF c("var/windows") -%] + patch -p1 < $rootdir/bug20302.patch pydir=$distdir/python export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" export LD_PRELOAD= diff --git a/projects/libfte/config b/projects/libfte/config index 3b33cf6..2079040 100644 --- a/projects/libfte/config +++ b/projects/libfte/config @@ -29,3 +29,5 @@ input_files: name: gmp - project: obfsproxy name: obfsproxy + - filename: bug20302.patch + enable: '[% c("var/windows") %]'

1 0

[tor-browser-build/master] Bug 23384: Add user arthuredelstein on build-sunet-a.torproject.net
by boklm＠torproject.org 10 Apr '18

10 Apr '18

commit 76319b785d20d8d7103aa1d850716b3cd52396b4 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Apr 10 10:49:10 2018 +0200 Bug 23384: Add user arthuredelstein on build-sunet-a.torproject.net --- tools/ansible/roles/tbb-team/defaults/main.yml | 1 + tools/ansible/roles/tbb-team/files/arthuredelstein.pub | 1 + 2 files changed, 2 insertions(+) diff --git a/tools/ansible/roles/tbb-team/defaults/main.yml b/tools/ansible/roles/tbb-team/defaults/main.yml index dd92149..1445fce 100644 --- a/tools/ansible/roles/tbb-team/defaults/main.yml +++ b/tools/ansible/roles/tbb-team/defaults/main.yml @@ -1,5 +1,6 @@ --- tbb_team_members: + - arthuredelstein - boklm - brade - gk diff --git a/tools/ansible/roles/tbb-team/files/arthuredelstein.pub b/tools/ansible/roles/tbb-team/files/arthuredelstein.pub new file mode 100644 index 0000000..e7f0c39 --- /dev/null +++ b/tools/ansible/roles/tbb-team/files/arthuredelstein.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDTn6K3kVN90fKK4BFC2I6wU9Ngb0v1U9JG9Ongt8UlTnbT58tLXATj65a7JwLcFHTjfTyDe2YLA5ujec2Az9LVYNezf4lIbykkDMg125En0HVhjanae9JwCWbOH9BhaEcB9ILc/gAeEXedxvZjpdTkcuJRoYem0jzyBXIm1eCb7gSbGJ5ma9JVFysOxFFor3SiOAjTDotgqVtfG3SF0ecRnViO/dfW9sCzwpTABOg0FZTKV/0AzbPoLE9w8OGe3qZU/eyK+Uw4gP/ZmF9veP1Npnvhf3wS4xkyg0zIvhIeOWQyArbir7dr0xTPhoOv3+GrDwKfCVfEvLEAwcL4TZPx arthur(a)Arthur.local

1 0

[tor-browser/tor-browser-52.7.3esr-8.0-1] Bug 1448771 - Update hnjstdio to handle additional functions from stdio.h that libhyphen wants to use. r=glandium, a=RyanVM
by gk＠torproject.org 10 Apr '18

10 Apr '18

commit 0e1e49d4971bb891152c93b8b62665f24bd8a0c2 Author: Jonathan Kew <jkew(a)mozilla.com> Date: Wed Mar 28 10:17:51 2018 +0100 Bug 1448771 - Update hnjstdio to handle additional functions from stdio.h that libhyphen wants to use. r=glandium, a=RyanVM --HG-- extra : source : 846bcaa210aa2264bec412c0595113964fafc972 --- intl/hyphenation/glue/hnjalloc.h | 6 +++++ intl/hyphenation/glue/hnjstdio.cpp | 50 ++++++++++++++++++++++++++------------ 2 files changed, 41 insertions(+), 15 deletions(-) diff --git a/intl/hyphenation/glue/hnjalloc.h b/intl/hyphenation/glue/hnjalloc.h index fec3a4bc9009..5cee1be1b6d7 100644 --- a/intl/hyphenation/glue/hnjalloc.h +++ b/intl/hyphenation/glue/hnjalloc.h @@ -31,6 +31,8 @@ #define fopen(path,mode) hnjFopen(path,mode) #define fclose(file) hnjFclose(file) #define fgets(buf,count,file) hnjFgets(buf,count,file) +#define feof(file) hnjFeof(file) +#define fgetc(file) hnjFgetc(file) typedef struct hnjFile_ hnjFile; @@ -44,6 +46,10 @@ int hnjFclose(hnjFile* f); char* hnjFgets(char* s, int n, hnjFile* f); +int hnjFeof(hnjFile* f); + +int hnjFgetc(hnjFile* f); + #ifdef __cplusplus } #endif diff --git a/intl/hyphenation/glue/hnjstdio.cpp b/intl/hyphenation/glue/hnjstdio.cpp index 660ebaf13291..8d50ae17f57b 100644 --- a/intl/hyphenation/glue/hnjstdio.cpp +++ b/intl/hyphenation/glue/hnjstdio.cpp @@ -22,6 +22,7 @@ struct hnjFile_ { char mBuffer[BUFSIZE]; uint32_t mCurPos; uint32_t mLimit; + bool mEOF; }; // replacement for fopen() @@ -58,6 +59,7 @@ hnjFopen(const char* aURISpec, const char* aMode) f->mStream = instream; f->mCurPos = 0; f->mLimit = 0; + f->mEOF = false; return f; } @@ -79,6 +81,27 @@ hnjFclose(hnjFile* f) return result; } +// replacement for fgetc() +int +hnjFgetc(hnjFile* f) +{ + if (f->mCurPos >= f->mLimit) { + f->mCurPos = 0; + + nsresult rv = f->mStream->Read(f->mBuffer, BUFSIZE, &f->mLimit); + if (NS_FAILED(rv)) { + f->mLimit = 0; + } + + if (f->mLimit == 0) { + f->mEOF = true; + return EOF; + } + } + + return f->mBuffer[f->mCurPos++]; +} + // replacement for fgets() // (not a full reimplementation, but sufficient for libhyphen's needs) char* @@ -88,24 +111,15 @@ hnjFgets(char* s, int n, hnjFile* f) int i = 0; while (i < n - 1) { - if (f->mCurPos < f->mLimit) { - char c = f->mBuffer[f->mCurPos++]; - s[i++] = c; - if (c == '\n' || c == '\r') { - break; - } - continue; - } - - f->mCurPos = 0; + int c = hnjFgetc(f); - nsresult rv = f->mStream->Read(f->mBuffer, BUFSIZE, &f->mLimit); - if (NS_FAILED(rv)) { - f->mLimit = 0; - return nullptr; + if (c == EOF) { + break; } - if (f->mLimit == 0) { + s[i++] = c; + + if (c == '\n' || c == '\r') { break; } } @@ -117,3 +131,9 @@ hnjFgets(char* s, int n, hnjFile* f) s[i] = '\0'; // null-terminate the returned string return s; } + +int +hnjFeof(hnjFile* f) +{ + return f->mEOF ? EOF : 0; +}

1 0

[tor-browser/tor-browser-52.7.3esr-8.0-1] Bug 1448771 - Merge fix from upstream. r=ryanvm, a=RyanVM
by gk＠torproject.org 10 Apr '18

10 Apr '18

commit c6167b77baf79a28bd55b4f09dba85422515c5bc Author: Jonathan Kew <jkew(a)mozilla.com> Date: Mon Mar 26 20:35:48 2018 +0100 Bug 1448771 - Merge fix from upstream. r=ryanvm, a=RyanVM --HG-- extra : source : f5db47b5c6416a3cef546de1aa9089d98109f95f --- intl/hyphenation/hyphen/hyphen.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/intl/hyphenation/hyphen/hyphen.c b/intl/hyphenation/hyphen/hyphen.c index 9a132d0262f2..9f2b7112c848 100644 --- a/intl/hyphenation/hyphen/hyphen.c +++ b/intl/hyphenation/hyphen/hyphen.c @@ -438,11 +438,25 @@ for (k = 0; k < 2; k++) { } if (k == 0 || nextlevel) { - while (fgets (buf, sizeof(buf), f) != NULL) { + while (fgets(buf, sizeof(buf), f) != NULL) { + + /* discard lines that don't fit in buffer */ + if (!feof(f) && strchr(buf, '\n') == NULL) { + int c; + while ((c = fgetc(f)) != '\n' && c != EOF); + /* issue warning if not a comment */ + if (buf[0] != '%') { + fprintf(stderr, "Warning: skipping too long pattern (more than %lu chars)\n", sizeof(buf)); + } + continue; + } + if (strncmp(buf, "NEXTLEVEL", 9) == 0) { - nextlevel = 1; - break; - } else if (buf[0] != '%') hnj_hyphen_load_line(buf, dict[k], hashtab); + nextlevel = 1; + break; + } else if (buf[0] != '%') { + hnj_hyphen_load_line(buf, dict[k], hashtab); + } } } else if (k == 1) { /* default first level: hyphen and ASCII apostrophe */

1 0

[tor-browser-build/master] Fold in stable changelogs
by gk＠torproject.org 09 Apr '18

09 Apr '18

commit 0934a2b696f786b648501324eae142ead0338e5a Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 9 09:44:44 2018 +0000 Fold in stable changelogs --- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 34b78e4..aeb0cac 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -10,6 +10,12 @@ Tor Browser 8.0a5 -- March 27 2018 * Update Snowflake * Bug 21312+25579+25449: Fix crashes and memory/file descriptor leaks in go-webrtc +Tor Browser 7.5.3 -- March 26 2018 + * All platforms + * Update Firefox to 52.7.3esr + * Update HTTPS Everywhere to 2018.3.13 + * Bug 25339: Adapt build system for Python 3.6 based build procedure + Tor Browser 8.0a4 -- March 17 2018 * All platforms * Update Firefox to 52.7.2esr @@ -32,6 +38,23 @@ Tor Browser 8.0a3 -- March 13 2018 * Windows * Bug 25112: No sandboxing on 64-bit Windows <= Vista +Tor Browser 7.5.1 -- March 13 2018 + * All platforms + * Update Firefox to 52.7.0esr + * Update Tor to 0.3.2.10 + * Update Torbutton to 1.9.8.6 + * Bug 24159: Version check does not deal with platform specific checks + * Bug 25016: Remove 2017 donation banner + * Translations update + * Update Tor Launcher to 0.2.14.4 + * Bug 25089: Special characters are not escaped in proxy password + * Translations update + * Update NoScript to 5.1.8.4 + * Bug 25356: Update obfs4proxy to v0.0.7 + * Bug 25000: Add [System+Principal] to the NoScript whitelist + * Windows + * Bug 25112: Disable sandboxing on 64-bit Windows <= Vista + Tor Browser 8.0a2 -- February 23 2018 * All Platforms * Update Tor to 0.3.3.2-alpha

1 0

[tor-browser-build/master] Bug 25304: update gcc to 6.4.0 for the Linux build
by gk＠torproject.org 06 Apr '18

06 Apr '18

commit 049196094eeb5a64b6504defaf12e1ab3e2546c3 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Feb 20 15:08:56 2018 +0100 Bug 25304: update gcc to 6.4.0 for the Linux build --- projects/gcc/build | 9 +++++++-- projects/gcc/config | 6 +++--- projects/tor/build | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/projects/gcc/build b/projects/gcc/build index 79cc5f7..1d055b4 100644 --- a/projects/gcc/build +++ b/projects/gcc/build @@ -6,7 +6,12 @@ export DEB_BUILD_HARDENING=1 export DEB_BUILD_HARDENING_STACKPROTECTOR=1 export DEB_BUILD_HARDENING_FORTIFY=1 - export DEB_BUILD_HARDENING_PIE=1 + # Since r223796 landed on GCC master enforcing PIE breaks GCC compilation. + # The compiler gets built with `-fno-PIE` and linked with `-no-pie` as not + # doing so would make precompiled headers (PCH) fail. + # It is okay for us to omit this right now as it does not change any hardening + # flags in the resulting bundles. + export DEB_BUILD_HARDENING_PIE=0 # We need to disable `-Werror=format-security` as GCC does not build with it # anymore. It seems it got audited for those problems already: # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=48817. @@ -14,7 +19,7 @@ [% END -%] distdir=/var/tmp/dist/[% project %] mkdir /var/tmp/build -tar -C /var/tmp/build -xf [% project %]-[% c("version") %].tar.bz2 +tar -C /var/tmp/build -xf [% project %]-[% c("version") %].tar.xz cd /var/tmp/build/[% project %]-[% c("version") %] ./configure --prefix=$distdir [% c("var/configure_opt") %] make -j[% c("buildconf/num_procs") %] diff --git a/projects/gcc/config b/projects/gcc/config index 03241ef..1d74a0a 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.4.0 +version: 6.4.0 var: container: use_container: 1 @@ -58,5 +58,5 @@ targets: - libc6-dev-i386 input_files: - project: container-image - - URL: 'https://ftp.gnu.org/gnu/gcc/gcc-[% c("version") %]/gcc-[% c("version") %].tar.bz2' - sha256sum: 608df76dec2d34de6558249d8af4cbee21eceddbcb580d666f7a5a583ca3303a + - URL: 'https://ftp.gnu.org/gnu/gcc/gcc-[% c("version") %]/gcc-[% c("version") %].tar.xz' + sha256sum: 850bf21eafdfe5cd5f6827148184c08c4a0852a37ccf36ce69855334d2c914d4 diff --git a/projects/tor/build b/projects/tor/build index eeeaa5c..e52e43b 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -45,7 +45,7 @@ openssldir=/var/tmp/dist/openssl # 13359 for further details. cp /var/tmp/dist/gcc/[% c("var/libdir") %]/libstdc++.so.6 "$distdir/Tor/" [% IF c("var/asan") -%] - cp /var/tmp/dist/gcc/[% c("var/libdir") %]/libasan.so.2 "$distdir/Tor/" + cp /var/tmp/dist/gcc/[% c("var/libdir") %]/libasan.so.3 "$distdir/Tor/" cp /var/tmp/dist/gcc/[% c("var/libdir") %]/libubsan.so.0 "$distdir/Tor/" [% END -%] chmod 700 "$distdir"/Tor/*.so*

1 0

[torbutton/master] Bug 25126: Make about:tor layout responsive
by gk＠torproject.org 05 Apr '18

05 Apr '18

commit fb8c46b3fb3e89b0fd182f87ba3139f5b31ad186 Author: Igor Oliveira <igt0(a)torproject.org> Date: Tue Apr 3 20:15:38 2018 -0300 Bug 25126: Make about:tor layout responsive Use flexbox and media queries to make the layout responsive. For small and medium break points, remove the tor status image since there isn't enough space. --- src/chrome/content/aboutTor/aboutTor.xhtml | 149 +++++++++++++++-------------- src/chrome/skin/aboutTor.css | 87 +++++++++++------ 2 files changed, 132 insertions(+), 104 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 7ae4b8b..0d8f680 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?>  @@ -31,87 +31,88 @@ window.addEventListener("pageshow", function() { </script> </head> <body dir="&locale.dir;"> -<div id="torstatus" class="top"> - <div id="torstatus-version"/> - <div id="torstatus-image"/> - <div id="torstatus-on-container" class="hideIfTorOff torstatus-container"> - <h1>&aboutTor.success.label;</h1> - <br/> - <h3 class="hideIfTBBNeedsUpdate">&aboutTor.success3.label;</h3> - <br/> - <div style="margin-top: 20px;"> - <a id="testTorSettings" href="about:blank">&aboutTor.check.label;</a> - </div> - </div> - <div id="torstatus-off-container" class="hideIfTorOn torstatus-container"> - <h1>&aboutTor.failure.label;</h1> - <br/> - <h2>&aboutTor.failure2.label;</h2> - </div> -</div> -<div class="top"> <div class="hideIfTorIsUpToDate"> - <h1 class="hideIfTorOff">&aboutTor.outOfDateTorOn.label;</h1> - <h1 class="hideIfTorOn">&aboutTor.outOfDateTorOff.label;</h1> - <h3 id="updatePrompt">&aboutTor.outOfDate2.label;</h3> - - <div id="toolbarIconArrowHead" class="arrow"/> - <div id="toolbarIconArrowVertExtension" class="arrow"/> - <div id="toolbarIconArrowBend" class="arrow"/> - <div id="toolbarIconArrowHorzExtension" class="arrow"/> + <div id="toolbarIconArrowHead" class="arrow"/> + <div id="toolbarIconArrowVertExtension" class="arrow"/> + <div id="toolbarIconArrowBend" class="arrow"/> + <div id="toolbarIconArrowHorzExtension" class="arrow"/> </div> -</div> + <div class="torcontent-container"> + <div id="torstatus-version"/> + <div id="torstatus" class="top"> + <div id="torstatus-image"/> + <div id="torstatus-on-container" class="hideIfTorOff torstatus-container"> + <h1>&aboutTor.success.label;</h1> + <br/> + <h3 class="hideIfTBBNeedsUpdate">&aboutTor.success3.label;</h3> + <br/> + <div style="margin-top: 20px;"> + <a id="testTorSettings" href="about:blank">&aboutTor.check.label;</a> + </div> + </div> + <div id="torstatus-off-container" class="hideIfTorOn torstatus-container"> + <h1>&aboutTor.failure.label;</h1> + <br/> + <h2>&aboutTor.failure2.label;</h2> + </div> + </div> + <div class="top"> + <div class="hideIfTorIsUpToDate"> + <h1 class="hideIfTorOff">&aboutTor.outOfDateTorOn.label;</h1> + <h1 class="hideIfTorOn">&aboutTor.outOfDateTorOff.label;</h1> + <div> + <h3 id="updatePrompt">&aboutTor.outOfDate2.label;</h3> + </div> + </div> + </div> -<div class="searchbox hideIfTorOff">  - <form action="&aboutTor.searchDDGPost.link;" method="post"> - <div id="sxw"> - <div id="sbutton"> - <input name="b" id="sb" value="" title="&aboutTor.search.label;" - alt="&aboutTor.search.label;" type="submit"/> + <div class="searchbox hideIfTorOff">  + <form action="&aboutTor.searchDDGPost.link;" method="post"> + <div id="sxw"> + <div id="sbutton"> + <input name="b" id="sb" value="" title="&aboutTor.search.label;" + alt="&aboutTor.search.label;" type="submit"/> + </div> + <input name="q" autocomplete="off" id="sx" type="text"/> + </div> + <h4 id="searchProviderInfo" /> + </form> </div> - <input name="q" autocomplete="off" id="sx" type="text"/> - </div> - <h4 id="searchProviderInfo" /> - </form> -</div> -<div class="hideIfTorOn" style="height:100px"/> + <div class="hideIfTorOn" style="height:100px"/> -<div id="middle" class="hideIfTorOff"> - <div class="bubbleRow"> - <div class="bubble"> - <h1>&aboutTor.whatnextQuestion.label;</h1> - <p>&aboutTor.whatnextAnswer.label;</p> - <ul> - <li> - <a href="&aboutTor.whatnext.link;"> - &aboutTor.whatnext.label; - </a> - </li> - <li class="showForManual"> - <a id="manualLink"> - &aboutTor.torbrowser_user_manual.label; » - </a> - </li> - </ul> - </div> + <div id="middle" class="hideIfTorOff"> + <div class="bubble"> + <h1>&aboutTor.whatnextQuestion.label;</h1> + <p>&aboutTor.whatnextAnswer.label;</p> + <ul> + <li> + <a href="&aboutTor.whatnext.link;"> + &aboutTor.whatnext.label; + </a> + </li> + <li class="showForManual"> + <a id="manualLink"> + &aboutTor.torbrowser_user_manual.label; » + </a> + </li> + </ul> + </div> + <div class="bubble"> + <h1>&aboutTor.helpInfo1.label;</h1> + <p>&aboutTor.helpInfo2.label;</p> + <ul> + <li><a href="&aboutTor.helpInfo3.link;">&aboutTor.helpInfo3.label;</a></li> + <li><a href="&aboutTor.helpInfo4.link;">&aboutTor.helpInfo4.label;</a></li> + <li><a href="&aboutTor.helpInfo5.link;">&aboutTor.helpInfo5.label;</a></li> + </ul> + </div> + </div>  - <div class="bubble"> - <h1>&aboutTor.helpInfo1.label;</h1> - <p>&aboutTor.helpInfo2.label;</p> - <ul> - <li><a href="&aboutTor.helpInfo3.link;">&aboutTor.helpInfo3.label;</a></li> - <li><a href="&aboutTor.helpInfo4.link;">&aboutTor.helpInfo4.label;</a></li> - <li><a href="&aboutTor.helpInfo5.link;">&aboutTor.helpInfo5.label;</a></li> - </ul> + <div id="bottom"> + <p>&aboutTor.footer.label; + <a href="&aboutTor.learnMore.link;">&aboutTor.learnMore.label;</a></p> </div> </div> -</div>  - -<div id="bottom"> - <p>&aboutTor.footer.label; -<a href="&aboutTor.learnMore.link;">&aboutTor.learnMore.label;</a></p> -</div> - </body> </html> diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css index c0d2ebc..7ba7e7c 100644 --- a/src/chrome/skin/aboutTor.css +++ b/src/chrome/skin/aboutTor.css @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, The Tor Project, Inc. + * Copyright (c) 2018, The Tor Project, Inc. * See LICENSE for licensing information. * * vim: set sw=2 sts=2 ts=8 et syntax=css: @@ -11,8 +11,6 @@ } body { - min-width: 920px; - max-width: 920px; width: 100%; height: 100%; margin: 0px auto; @@ -43,8 +41,14 @@ body:not([initialized]) { display: none; } +.torcontent-container { + margin: 40px 20px; + display: flex; + flex-direction: column; +} + #torstatus-version { - position: fixed; + position: absolute; top: 6px; right: 6px; height: 30px; @@ -59,8 +63,9 @@ body[toron] #torstatus-image { } #torstatus-image { + display: none; position: absolute; - left: 70px; + left: 85px; height: 128px; width: 128px; background-image: url('chrome://torbutton/content/aboutTor/tor-off.png'); @@ -116,17 +121,19 @@ a:hover { #torstatus { position: relative; /* needed for torstatus-image positioning */ - max-width: 620px; + display: flex; + justify-content: center; min-height: 148px; - padding: 15px 128px 0px 128px; - margin: 20px auto 0px auto; } .top { - text-align: center; white-space: nowrap; } +.torstatus-container { + text-align: center; +} + body[toron][torNeedsUpdate] .hideIfTBBNeedsUpdate, body:not([torNeedsUpdate]) .hideIfTorIsUpToDate { display: none; @@ -145,19 +152,22 @@ body:not([showmanual]) .showForManual { display: none; } +div.hideIfTorIsUpToDate { + display: flex; + flex-direction: column; +} + div.hideIfTorIsUpToDate, body .top div.hideIfTorIsUpToDate h1 { color: black; -} - -body .top div.hideIfTorIsUpToDate h1.hideIfTorOff { - margin-left: 30px; + text-align: center; } /* Use inline-block for text-oriented elements whose widths need to measured. */ .torstatus-container *, .top div.hideIfTorIsUpToDate h3 { display: inline-block; + text-align: center; } .top div.hideIfTorOff h1 { @@ -183,28 +193,21 @@ body .top div.hideIfTorIsUpToDate h1.hideIfTorOff { } #middle { - display: table; - width: 904px; /* 920px - (2 * 8px extra side margin) */ - margin: 40px auto 10px auto; - border-spacing: 100px 0px; - border-collapse: separate; - text-align: center; + display: flex; + flex-flow: row wrap; font-size: 1.6em; + justify-content: space-evenly; + margin-top: 40px; } -.bubbleRow { - display: table-row; -} - -.bubbleRow div.bubble { - display: table-cell; - width: 50%; - height: 100%; +.bubble { + width: 242px; padding: 20px 30px; color: #3B503C; background-color: #FFFFFF; border: none; border-radius: 16px; + margin-bottom: 40px; text-align: start; vertical-align: top; } @@ -227,15 +230,13 @@ body .top div.hideIfTorIsUpToDate h1.hideIfTorOff { } #bottom { - margin: 30px 0px 0px 0px; padding-bottom: 40px; - float: left; } #bottom p { font-size: 1.6em; text-align: start; - margin: 10px 125px 0px 125px; + margin: auto; } #bottom a { @@ -310,3 +311,29 @@ body .top div.hideIfTorIsUpToDate h1.hideIfTorOff { font-size: 18px; } +@media only screen and (min-width : 820px) { +.torcontent-container { + margin: auto; + margin-top: 40px; + max-width: 920px; + min-width: 920px; + } + + #torstatus-image { + display: block; + } + + #bottom p { + margin: 10px 125px 0px 125px; + } +} + +@media only screen and (max-width : 436px) { + .searchbox form { + width: auto; + } + + #sx { + width: calc(100% - 46px); + } +}

1 0

[tor-browser-build/master] Bug 25710: Extract from $rootdir in mingw-w64's setup.
by boklm＠torproject.org 04 Apr '18

04 Apr '18

commit 5ebf06b020bb3358a1bfeea5c8ff48fd70939308 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Apr 4 00:15:14 2018 -0700 Bug 25710: Extract from $rootdir in mingw-w64's setup. This makes it consistent with the setup of gcc and macosx-toolchain. --- projects/mingw-w64/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config index 73961e4..5bfc93f 100644 --- a/projects/mingw-w64/config +++ b/projects/mingw-w64/config @@ -14,7 +14,7 @@ var: setup: | [% c("var/setarch") -%] 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 PATH="/var/tmp/dist/mingw-w64/helpers:/var/tmp/dist/mingw-w64/bin:$PATH" export gcclibs=/var/tmp/dist/mingw-w64/gcclibs targets:

1 0

[tor-browser/tor-browser-52.7.3esr-8.0-1] fixup! Bug 16940: After update, load local change notes.
by gk＠torproject.org 27 Mar '18

27 Mar '18

commit 7719a132533d0e245602b9aee496875a8cb03cd5 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Jan 17 14:01:51 2018 -0500 fixup! Bug 16940: After update, load local change notes. Always load about:tbupdate in a content process. To improve compatiblity with future sandboxing efforts, relocate the code that accesses the file system (changelog) to the chrome process. Avoid using a query string to pass the "more info" link to the about:tbupdate page. Remove obsolete flag nsIAboutModule::MAKE_UNLINKABLE (about: pages are unlinkable by default). --- browser/base/content/browser.js | 22 +++-- browser/base/content/tab-content.js | 104 ++++++++---------------- browser/base/jar.mn | 2 +- browser/base/moz.build | 3 + browser/components/about/AboutRedirector.cpp | 2 +- browser/components/nsBrowserContentHandler.js | 5 +- browser/components/nsBrowserGlue.js | 9 +++ browser/modules/AboutTBUpdate.jsm | 111 ++++++++++++++++++++++++++ browser/modules/moz.build | 5 ++ toolkit/modules/AppConstants.jsm | 7 ++ toolkit/modules/moz.build | 3 + 11 files changed, 186 insertions(+), 87 deletions(-) diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 5c0d9a4d7161..5eabd3373b71 100755 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -215,9 +215,6 @@ this.__defineSetter__("AddonManager", function (val) { var gInitialPages = [ "about:tor", -#ifdef TOR_BROWSER_UPDATE - "about:tbupdate", -#endif "about:blank", "about:newtab", "about:home", @@ -225,6 +222,9 @@ var gInitialPages = [ "about:welcomeback", "about:sessionrestore" ]; +if (AppConstants.TOR_BROWSER_UPDATE) { + gInitialPages.push("about:tbupdate"); +} function* browserWindows() { let windows = Services.wm.getEnumerator("navigator:browser"); @@ -2420,13 +2420,8 @@ function URLBarSetURI(aURI) { // 2. if remote newtab is enabled and it's the default remote newtab page let defaultRemoteURL = gAboutNewTabService.remoteEnabled && uri.spec === gAboutNewTabService.newTabURL; -#ifdef TOR_BROWSER_UPDATE - if ((gInitialPages.includes(uri.spec.split('?')[0]) || defaultRemoteURL) && - checkEmptyPageOrigin(gBrowser.selectedBrowser, uri)) -#else if ((gInitialPages.includes(uri.spec) || defaultRemoteURL) && checkEmptyPageOrigin(gBrowser.selectedBrowser, uri)) -#endif { value = ""; } else { @@ -7453,11 +7448,12 @@ var gIdentityHandler = { this._uriHasHost = false; } -#ifdef TOR_BROWSER_UPDATE - let whitelist = /^(?:accounts|addons|cache|config|crashes|customizing|downloads|healthreport|home|license|newaddon|permissions|preferences|privatebrowsing|rights|searchreset|sessionrestore|support|welcomeback|tor|tbupdate)(?:[?#]|$)/i; -#else - let whitelist = /^(?:accounts|addons|cache|config|crashes|customizing|downloads|healthreport|home|license|newaddon|permissions|preferences|privatebrowsing|rights|searchreset|sessionrestore|support|welcomeback|tor)(?:[?#]|$)/i; -#endif + let whitelist; + if (AppConstants.TOR_BROWSER_UPDATE) { + whitelist = /^(?:accounts|addons|cache|config|crashes|customizing|downloads|healthreport|home|license|newaddon|permissions|preferences|privatebrowsing|rights|searchreset|sessionrestore|support|welcomeback|tor|tbupdate)(?:[?#]|$)/i; + } else { + whitelist = /^(?:accounts|addons|cache|config|crashes|customizing|downloads|healthreport|home|license|newaddon|permissions|preferences|privatebrowsing|rights|searchreset|sessionrestore|support|welcomeback|tor)(?:[?#]|$)/i; + } this._isSecureInternalUI = uri.schemeIs("about") && whitelist.test(uri.path); // Create a channel for the sole purpose of getting the resolved URI diff --git a/browser/base/content/tab-content.js b/browser/base/content/tab-content.js index d7d565ec50de..9aefa567fbae 100644 --- a/browser/base/content/tab-content.js +++ b/browser/base/content/tab-content.js @@ -5,19 +5,11 @@ /* This content script contains code that requires a tab browser. */ -#ifdef TOR_BROWSER_VERSION -# Add double-quotes back on (stripped by JarMaker.py). -#expand const TOR_BROWSER_VERSION = "__TOR_BROWSER_VERSION__"; -#endif - var {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components; Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/ExtensionContent.jsm"); -#ifdef TOR_BROWSER_UPDATE -Cu.import("resource://gre/modules/NetUtil.jsm"); -#endif XPCOMUtils.defineLazyModuleGetter(this, "E10SUtils", "resource:///modules/E10SUtils.jsm"); @@ -408,80 +400,50 @@ let AboutTBUpdateListener = { }, get isAboutTBUpdate() { - return content.document.documentURI.split('?')[0].toLowerCase() - == "about:tbupdate"; + return content.document.documentURI.toLowerCase() == "about:tbupdate"; }, handleEvent: function(aEvent) { - if (this.isAboutTBUpdate && (aEvent.type == "AboutTBUpdateLoad")) - this.onPageLoad(); - }, + if (!this.isAboutTBUpdate) + return; - onPageLoad: function() { - let doc = content.document; - doc.getElementById("infolink").setAttribute("href", this.getPostUpdateURL()); - doc.getElementById("changelog").textContent = this.getChangeLogText(); - - const kBrandBundle = "chrome://branding/locale/brand.properties"; - let brandBundle = Cc["@mozilla.org/intl/stringbundle;1"] - .getService(Ci.nsIStringBundleService) - .createBundle(kBrandBundle); - let productName = brandBundle.GetStringFromName("brandFullName"); - doc.getElementById("torbrowser-version").textContent = productName + "\n" - + TOR_BROWSER_VERSION; + switch (aEvent.type) { + case "AboutTBUpdateLoad": + this.onPageLoad(); + break; + case "pagehide": + this.onPageHide(aEvent); + break; + } }, - // Extract the post update URL from this page's query string. - getPostUpdateURL: function() { - let idx = content.document.documentURI.indexOf('?'); - if (idx > 0) - return decodeURIComponent(content.document.documentURI.substring(idx+1)); - - // No query string: use the default URL. - return Services.urlFormatter.formatURLPref("startup.homepage_override_url"); + receiveMessage: function(aMessage) { + if (this.isAboutTBUpdate && (aMessage.name == "AboutTBUpdate:Update")) + this.onUpdate(aMessage.data); }, - // Read and return the text from the beginning of the changelog file that is - // located at TorBrowser/Docs/ChangeLog.txt. - // On Mac OS, when building with --enable-tor-browser-data-outside-app-dir - // to support Gatekeeper signing, the file is located in - // TorBrowser.app/Contents/Resources/TorBrowser/Docs/. - // - // When electrolysis is enabled we will need to adopt an architecture that is - // more similar to the one that is used for about:home (see AboutHomeListener - // in this file and browser/modules/AboutHome.jsm). - getChangeLogText: function() { - try { -#ifdef TOR_BROWSER_DATA_OUTSIDE_APP_DIR - // "XREExeF".parent is the directory that contains firefox, i.e., - // Browser/ or, on Mac OS, TorBrowser.app/Contents/MacOS/. - let f = Services.dirsvc.get("XREExeF", Ci.nsIFile).parent; -#ifdef XP_MACOSX - f = f.parent; - f.append("Resources"); -#endif - f.append("TorBrowser"); -#else - // "DefProfRt" is .../TorBrowser/Data/Browser - let f = Cc["@mozilla.org/file/directory_service;1"] - .getService(Ci.nsIProperties).get("DefProfRt", Ci.nsIFile); - f = f.parent.parent; // Remove "Data/Browser" -#endif - f.append("Docs"); - f.append("ChangeLog.txt"); - - let fs = Cc["@mozilla.org/network/file-input-stream;1"] - .createInstance(Ci.nsIFileInputStream); - fs.init(f, -1, 0, 0); - let s = NetUtil.readInputStreamToString(fs, fs.available()); - fs.close(); + onUpdate: function(aData) { + let doc = content.document; + doc.getElementById("torbrowser-version").textContent = aData.productInfo; + if (aData.moreInfoURL) + doc.getElementById("infolink").setAttribute("href", aData.moreInfoURL); + doc.getElementById("changelog").textContent = aData.changeLog; + }, - // Truncate at the first empty line. - return s.replace(/[\r\n][\r\n][\s\S]*$/m, ""); - } catch (e) {} + onPageLoad: function() { + addMessageListener("AboutTBUpdate:Update", this); + addEventListener("pagehide", this, true); + sendAsyncMessage("AboutTBUpdate:RequestUpdate"); + }, - return ""; + onPageHide: function(aEvent) { + if (aEvent.target.defaultView.frameElement) { + return; + } + removeMessageListener("AboutTBUpdate:Update", this); + removeEventListener("pagehide", this, true); }, + }; AboutTBUpdateListener.init(this); #endif diff --git a/browser/base/jar.mn b/browser/base/jar.mn index 2b0f744b42cb..9d2f100a9717 100644 --- a/browser/base/jar.mn +++ b/browser/base/jar.mn @@ -75,7 +75,7 @@ browser.jar: content/browser/abouttbupdate/aboutTBUpdateLogo.png (content/abouttbupdate/aboutTBUpdateLogo.png) #endif * content/browser/browser.css (content/browser.css) -* content/browser/browser.js (content/browser.js) + content/browser/browser.js (content/browser.js) * content/browser/browser.xul (content/browser.xul) content/browser/browser-addons.js (content/browser-addons.js) content/browser/browser-captivePortal.js (content/browser-captivePortal.js) diff --git a/browser/base/moz.build b/browser/base/moz.build index 46634999261c..dc15e2902bb8 100644 --- a/browser/base/moz.build +++ b/browser/base/moz.build @@ -47,4 +47,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'cocoa'): if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3'): DEFINES['MENUBAR_CAN_AUTOHIDE'] = 1 +if CONFIG['TOR_BROWSER_UPDATE']: + DEFINES['TOR_BROWSER_UPDATE'] = 1 + JAR_MANIFESTS += ['jar.mn'] diff --git a/browser/components/about/AboutRedirector.cpp b/browser/components/about/AboutRedirector.cpp index 016d75cb68c7..364f78d46957 100644 --- a/browser/components/about/AboutRedirector.cpp +++ b/browser/components/about/AboutRedirector.cpp @@ -107,8 +107,8 @@ static RedirEntry kRedirMap[] = { #ifdef TOR_BROWSER_UPDATE { "tbupdate", "chrome://browser/content/abouttbupdate/aboutTBUpdate.xhtml", nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | + nsIAboutModule::URI_MUST_LOAD_IN_CHILD | nsIAboutModule::ALLOW_SCRIPT | - nsIAboutModule::MAKE_UNLINKABLE | nsIAboutModule::HIDE_FROM_ABOUTABOUT }, #endif }; diff --git a/browser/components/nsBrowserContentHandler.js b/browser/components/nsBrowserContentHandler.js index ee0c6a5a4a7a..583010e937ed 100644 --- a/browser/components/nsBrowserContentHandler.js +++ b/browser/components/nsBrowserContentHandler.js @@ -576,7 +576,10 @@ nsBrowserContentHandler.prototype = { #ifdef TOR_BROWSER_UPDATE if (overridePage) - overridePage = "about:tbupdate?" + encodeURIComponent(overridePage); + { + prefb.setCharPref("torbrowser.post_update.url", overridePage); + overridePage = "about:tbupdate" + } #endif break; } diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js index bb2351d41014..562ca20e19a4 100644 --- a/browser/components/nsBrowserGlue.js +++ b/browser/components/nsBrowserGlue.js @@ -78,6 +78,11 @@ if (AppConstants.MOZ_CRASHREPORTER) { "resource://gre/modules/CrashSubmit.jsm"); } +if (AppConstants.TOR_BROWSER_UPDATE) { + XPCOMUtils.defineLazyModuleGetter(this, "AboutTBUpdate", + "resource:///modules/AboutTBUpdate.jsm"); +} + XPCOMUtils.defineLazyGetter(this, "gBrandBundle", function() { return Services.strings.createBundle('chrome://branding/locale/brand.properties'); }); @@ -714,6 +719,10 @@ BrowserGlue.prototype = { UnsubmittedCrashHandler.init(); } + if (AppConstants.TOR_BROWSER_UPDATE) { + AboutTBUpdate.init(); + } + Services.obs.notifyObservers(null, "browser-ui-startup-complete", ""); }, diff --git a/browser/modules/AboutTBUpdate.jsm b/browser/modules/AboutTBUpdate.jsm new file mode 100644 index 000000000000..49d9d9b0e18d --- /dev/null +++ b/browser/modules/AboutTBUpdate.jsm @@ -0,0 +1,111 @@ +// Copyright (c) 2018, The Tor Project, Inc. +// See LICENSE for licensing information. +// +// vim: set sw=2 sts=2 ts=8 et syntax=javascript: + +"use strict"; + +var Cc = Components.classes; +var Ci = Components.interfaces; +var Cu = Components.utils; + +this.EXPORTED_SYMBOLS = [ "AboutTBUpdate" ]; + +Cu.import("resource://gre/modules/Services.jsm"); +Cu.import("resource://gre/modules/NetUtil.jsm"); + +const kRequestUpdateMessageName = "AboutTBUpdate:RequestUpdate"; +const kSendUpdateMessageName = "AboutTBUpdate:Update"; + +#ifdef TOR_BROWSER_VERSION +#expand const TOR_BROWSER_VERSION = __TOR_BROWSER_VERSION__; +#endif + +/** + * This code provides services to the about:tbupdate page. Whenever + * about:tbupdate needs to do something chrome-privileged, it sends a + * message that's handled here. It is modeled after Mozilla's about:home + * implementation. + */ +var AboutTBUpdate = { + init: function() { + let mm = Cc["@mozilla.org/globalmessagemanager;1"] + .getService(Ci.nsIMessageListenerManager); + mm.addMessageListener(kRequestUpdateMessageName, this); + }, + + receiveMessage: function(aMessage) { + if (aMessage.name == kRequestUpdateMessageName) + this.sendAboutTBUpdateData(aMessage.target); + }, + + sendAboutTBUpdateData: function(aTarget) { + let data = { productInfo: this.productInfo, + moreInfoURL: this.moreInfoURL, + changeLog: this.changeLog }; + + if (aTarget && aTarget.messageManager) { + aTarget.messageManager.sendAsyncMessage(kSendUpdateMessageName, data); + } else { + let mm = Cc["@mozilla.org/globalmessagemanager;1"] + .getService(Ci.nsIMessageListenerManager); + mm.broadcastAsyncMessage(kSendUpdateMessageName, data); + } + }, + + get productInfo() { + const kBrandBundle = "chrome://branding/locale/brand.properties"; + let brandBundle = Cc["@mozilla.org/intl/stringbundle;1"] + .getService(Ci.nsIStringBundleService) + .createBundle(kBrandBundle); + return brandBundle.GetStringFromName("brandFullName") + + "\n" + TOR_BROWSER_VERSION; + }, + + get moreInfoURL() { + try { + return Services.prefs.getCharPref("torbrowser.post_update.url"); + } catch (e) {} + + // Use the default URL as a fallback. + return Services.urlFormatter.formatURLPref("startup.homepage_override_url"); + }, + + // Read and return the text from the beginning of the changelog file that is + // located at TorBrowser/Docs/ChangeLog.txt. + // On Mac OS, when building with --enable-tor-browser-data-outside-app-dir + // to support Gatekeeper signing, the file is located in + // TorBrowser.app/Contents/Resources/TorBrowser/Docs/. + get changeLog() { + try { +#ifdef TOR_BROWSER_DATA_OUTSIDE_APP_DIR + // "XREExeF".parent is the directory that contains firefox, i.e., + // Browser/ or, on Mac OS, TorBrowser.app/Contents/MacOS/. + let f = Services.dirsvc.get("XREExeF", Ci.nsIFile).parent; +#ifdef XP_MACOSX + f = f.parent; + f.append("Resources"); +#endif + f.append("TorBrowser"); +#else + // "DefProfRt" is .../TorBrowser/Data/Browser + let f = Cc["@mozilla.org/file/directory_service;1"] + .getService(Ci.nsIProperties).get("DefProfRt", Ci.nsIFile); + f = f.parent.parent; // Remove "Data/Browser" +#endif + f.append("Docs"); + f.append("ChangeLog.txt"); + + let fs = Cc["@mozilla.org/network/file-input-stream;1"] + .createInstance(Ci.nsIFileInputStream); + fs.init(f, -1, 0, 0); + let s = NetUtil.readInputStreamToString(fs, fs.available()); + fs.close(); + + // Truncate at the first empty line. + return s.replace(/[\r\n][\r\n][\s\S]*$/m, ""); + } catch (e) {} + + return ""; + }, +}; diff --git a/browser/modules/moz.build b/browser/modules/moz.build index 2526272249e8..4fe8adeb6c49 100644 --- a/browser/modules/moz.build +++ b/browser/modules/moz.build @@ -52,6 +52,11 @@ if not CONFIG['TOR_BROWSER_VERSION']: 'CastingApps.jsm', ] +if CONFIG['TOR_BROWSER_UPDATE']: + EXTRA_PP_JS_MODULES += [ + 'AboutTBUpdate.jsm', + ] + if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': EXTRA_JS_MODULES += [ 'Windows8WindowFrameColor.jsm', diff --git a/toolkit/modules/AppConstants.jsm b/toolkit/modules/AppConstants.jsm index 7ce8e1f09af4..82e5753be12a 100644 --- a/toolkit/modules/AppConstants.jsm +++ b/toolkit/modules/AppConstants.jsm @@ -340,4 +340,11 @@ this.AppConstants = Object.freeze({ #else false, #endif + + TOR_BROWSER_UPDATE: +#ifdef TOR_BROWSER_UPDATE + true, +#else + false, +#endif }); diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build index 7d4b0f3fa713..6c3d273804fc 100644 --- a/toolkit/modules/moz.build +++ b/toolkit/modules/moz.build @@ -159,4 +159,7 @@ for var in ('MOZ_TOOLKIT_SEARCH', if CONFIG[var]: DEFINES[var] = True +if CONFIG['TOR_BROWSER_UPDATE']: + DEFINES['TOR_BROWSER_UPDATE'] = 1 + DEFINES['TOPOBJDIR'] = TOPOBJDIR

1 0

[tor-browser/tor-browser-52.7.3esr-8.0-1] Revert "Orfox: Fix #1 - Improve build instructions"
by gk＠torproject.org 27 Mar '18

27 Mar '18

commit cc4c7e19e9474e423aebbc00be898824f27d496a Author: Georg Koppen <gk(a)torproject.org> Date: Tue Mar 27 06:25:17 2018 +0000 Revert "Orfox: Fix #1 - Improve build instructions" This reverts commit c981d290167b8547789849194ed12dd763f1f892. --- README.md | 20 -------------------- README.txt | 27 +++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md deleted file mode 100644 index 8cf5ca26625a..000000000000 --- a/README.md +++ /dev/null @@ -1,20 +0,0 @@ -## ORFOX BUILD STEPS: - -1) Move .mozconfig-android to .mozconfig OR run: -``` -export MOZCONFIG="tor-browser/.mozconfig-android" -``` -2) Checks if the all requirements for the build are fine with: -``` -./mach configure -``` -3) Builds the repo with: -``` -./mach build -``` -4) Creates the apk in tor-browser/MOZ_OBJDIR/dist/fennec-38.0.en-US.android-arm.apk -``` -./mach package -``` -### Note: this does not ship the addons, that is managed in a different repo: https://github.com/amoghbl1/orfox-addons. -### Steps to include these addons can be figured out looking at the jenkins script at https://github.com/amoghbl1/Orfox/blob/master/jenkins-build diff --git a/README.txt b/README.txt new file mode 100644 index 000000000000..658c0dce3174 --- /dev/null +++ b/README.txt @@ -0,0 +1,27 @@ +An explanation of the Mozilla Source Code Directory Structure and links to +project pages with documentation can be found at: + + https://developer.mozilla.org/en/Mozilla_Source_Code_Directory_Structure + +For information on how to build Mozilla from the source code, see: + + http://developer.mozilla.org/en/docs/Build_Documentation + +To have your bug fix / feature added to Mozilla, you should create a patch and +submit it to Bugzilla (https://bugzilla.mozilla.org) Instructions are at: + + http://developer.mozilla.org/en/docs/Creating_a_patch + http://developer.mozilla.org/en/docs/Getting_your_patch_in_the_tree + +If you have a question about developing Mozilla, and can't find the solution +on http://developer.mozilla.org, you can try asking your question in a +mozilla.* Usenet group, or on IRC at irc.mozilla.org. [The Mozilla news groups +are accessible on Google Groups, or news.mozilla.org with a NNTP reader.] + +You can download nightly development builds from the Mozilla FTP server. +Keep in mind that nightly builds, which are used by Mozilla developers for +testing, may be buggy. Firefox nightlies, for example, can be found at: + + https://archive.mozilla.org/pub/firefox/nightly/latest-mozilla-central/ + - or - + http://nightly.mozilla.org/

1 0

[tor-browser-build/master] Revert "Merge remote-tracking branch 'boklm/bug_16472_v8'"
by gk＠torproject.org 25 Mar '18

25 Mar '18

commit 1087afecd27f1cb535c3c1187b3d468ee454a15d Author: Georg Koppen <gk(a)torproject.org> Date: Sun Mar 25 09:55:21 2018 +0000 Revert "Merge remote-tracking branch 'boklm/bug_16472_v8'" This reverts commit b8bae5882eac6159c8a6ad466b9dc4a7b18ba27b, reversing changes made to 42720c512520ecef5437d23e405d8ce011764661. It turns out this binutils update is causing non-reproducible outomces. We need to investigate those further in #16472. --- keyring/binutils.gpg | Bin 2242 -> 25772 bytes projects/binutils/64bit-fixups.patch | 31 ++-- projects/binutils/binutils-224-gold.patch | 98 +++++++++++++ projects/binutils/build | 9 ++ projects/binutils/config | 8 +- projects/binutils/enable-reloc-section-ld.patch | 83 +++++------ projects/binutils/fix-warning-bfd.patch | 186 ++++++++++++++++++++++++ projects/binutils/peXXigen.patch | 14 ++ projects/mingw-w64/build | 8 +- projects/nsis/build | 31 +--- projects/openssl/config | 2 +- projects/selfrando/config | 2 +- projects/zlib/build | 4 +- rbm.conf | 2 +- 14 files changed, 378 insertions(+), 100 deletions(-) diff --git a/keyring/binutils.gpg b/keyring/binutils.gpg index eab4406..f24bb01 100644 Binary files a/keyring/binutils.gpg and b/keyring/binutils.gpg differ diff --git a/projects/binutils/64bit-fixups.patch b/projects/binutils/64bit-fixups.patch index 7dc1294..33c0297 100644 --- a/projects/binutils/64bit-fixups.patch +++ b/projects/binutils/64bit-fixups.patch @@ -1,19 +1,14 @@ -From 05164a1162d5f6f696d7f7c4b1bc61ef06d1c288 Mon Sep 17 00:00:00 2001 +From f3ba95e14437f10de8b8f296930ff2a8495d18c6 Mon Sep 17 00:00:00 2001 From: Georg Koppen <gk(a)torproject.org> Date: Tue, 12 Sep 2017 07:21:16 +0000 Subject: [PATCH] 64bit fixups ---- - ld/emultempl/pep.em | 4 ++-- - ld/pep-dll.c | 1 + - ld/pep-dll.h | 1 + - 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ld/emultempl/pep.em b/ld/emultempl/pep.em -index fccbd63..f7c0a57 100644 +index b566903b14..27006bdf79 100644 --- a/ld/emultempl/pep.em +++ b/ld/emultempl/pep.em -@@ -742,7 +742,7 @@ gld${EMULATION_NAME}_handle_option (int optc) +@@ -730,7 +730,7 @@ gld${EMULATION_NAME}_handle_option (int optc) pep_dll_exclude_all_symbols = 1; break; case OPTION_ENABLE_RELOC_SECTION: @@ -22,17 +17,17 @@ index fccbd63..f7c0a57 100644 break; case OPTION_EXCLUDE_LIBS: pep_dll_add_excludes (optarg, EXCLUDELIBS); -@@ -1862,7 +1862,7 @@ gld_${EMULATION_NAME}_finish (void) +@@ -1623,7 +1623,7 @@ gld_${EMULATION_NAME}_finish (void) + #ifdef DLL_SUPPORT - if (bfd_link_pic (&link_info) - || (!bfd_link_relocatable (&link_info) -- && pe_dll_enable_reloc_section) -+ && pep_dll_enable_reloc_section) - || (!bfd_link_relocatable (&link_info) - && pep_def_file->num_exports != 0)) + if (link_info.shared +- || (!link_info.relocatable && pe_dll_enable_reloc_section) ++ || (!link_info.relocatable && pep_dll_enable_reloc_section) + || (!link_info.relocatable && pep_def_file->num_exports != 0)) { + pep_dll_fill_sections (link_info.output_bfd, &link_info); diff --git a/ld/pep-dll.c b/ld/pep-dll.c -index b8c017f..5ad5733 100644 +index 0e5e8b1523..b5f99b90e0 100644 --- a/ld/pep-dll.c +++ b/ld/pep-dll.c @@ -31,6 +31,7 @@ @@ -44,7 +39,7 @@ index b8c017f..5ad5733 100644 #define pe_dll_stdcall_aliases pep_dll_stdcall_aliases #define pe_dll_warn_dup_exports pep_dll_warn_dup_exports diff --git a/ld/pep-dll.h b/ld/pep-dll.h -index 0a27c1f..95d9c15 100644 +index 1e7e3d65d4..c31e69cc8e 100644 --- a/ld/pep-dll.h +++ b/ld/pep-dll.h @@ -31,6 +31,7 @@ extern def_file * pep_def_file; @@ -56,5 +51,5 @@ index 0a27c1f..95d9c15 100644 extern int pep_dll_stdcall_aliases; extern int pep_dll_warn_dup_exports; -- -2.1.4 +2.14.1 diff --git a/projects/binutils/binutils-224-gold.patch b/projects/binutils/binutils-224-gold.patch new file mode 100644 index 0000000..a45e49c --- /dev/null +++ b/projects/binutils/binutils-224-gold.patch @@ -0,0 +1,98 @@ +From f984741df04cd68bb116073fdfa9405808810ab4 Mon Sep 17 00:00:00 2001 +From: Cary Coutant <ccoutant(a)google.com> +Date: Wed, 5 Feb 2014 22:59:02 -0800 +Subject: [PATCH] Fix issues with gold undefined symbol diagnostics. + +PR binutils/15435 complains that gold issues a visibility error for an +weak undefined symbol with hidden visibility. The message should be +suppressed if the symbol is a weak undef. + +An earlier patch to add an extra note about key functions when a class's +vtable symbol is undefined missed a case where the reference to the +vtable came from a shared library. This patch moves the check to a +lower-level routine that catches both cases. + +gold/ + +2014-02-05 Cary Coutant <ccoutant(a)google.com> + + * errors.cc (Errors::undefined_symbol): Move undef vtable symbol + check to here. + * target-reloc.h (is_strong_undefined): New function. + (relocate_section): Move undef vtable symbol check from here. + Check for is_strong_undefined. + +diff --git a/gold/ChangeLog b/gold/ChangeLog +index dcf7ed41f8..dd7ef72980 100644 +--- a/gold/ChangeLog ++++ b/gold/ChangeLog +@@ -1,3 +1,14 @@ ++2014-02-05 Cary Coutant <ccoutant(a)google.com> ++ ++ Fix issues with gold undefined symbol diagnostics. ++ ++ PR binutils/15435 ++ * errors.cc (Errors::undefined_symbol): Move undef vtable symbol ++ check to here. ++ * target-reloc.h (is_strong_undefined): New function. ++ (relocate_section): Move undef vtable symbol check from here. ++ Check for is_strong_undefined. ++ + 2013-11-22 Cary Coutant <ccoutant(a)google.com> + + * testsuite/Makefile.am (exception_x86_64_bnd_test): Use in-tree +diff --git a/gold/errors.cc b/gold/errors.cc +index b79764bd1d..98db0fdd86 100644 +--- a/gold/errors.cc ++++ b/gold/errors.cc +@@ -193,6 +193,11 @@ Errors::undefined_symbol(const Symbol* sym, const std::string& location) + fprintf(stderr, + _("%s: %s: undefined reference to '%s', version '%s'\n"), + location.c_str(), zmsg, sym->demangled_name().c_str(), version); ++ ++ if (sym->is_cxx_vtable()) ++ gold_info(_("%s: the vtable symbol may be undefined because " ++ "the class is missing its key function"), ++ program_name); + } + + // Issue a debugging message. +diff --git a/gold/target-reloc.h b/gold/target-reloc.h +index b544c78f37..d609bcbaa8 100644 +--- a/gold/target-reloc.h ++++ b/gold/target-reloc.h +@@ -144,6 +144,12 @@ class Default_comdat_behavior + } + }; + ++inline bool ++is_strong_undefined(const Symbol* sym) ++{ ++ return sym->is_undefined() && sym->binding() != elfcpp::STB_WEAK; ++} ++ + // Give an error for a symbol with non-default visibility which is not + // defined locally. + +@@ -411,16 +417,10 @@ relocate_section( + } + + if (issue_undefined_symbol_error(sym)) +- { +- gold_undefined_symbol_at_location(sym, relinfo, i, offset); +- if (sym->is_cxx_vtable()) +- gold_info(_("%s: the vtable symbol may be undefined because " +- "the class is missing its key function"), +- program_name); +- } ++ gold_undefined_symbol_at_location(sym, relinfo, i, offset); + else if (sym != NULL + && sym->visibility() != elfcpp::STV_DEFAULT +- && (sym->is_undefined() || sym->is_from_dynobj())) ++ && (is_strong_undefined(sym) || sym->is_from_dynobj())) + visibility_error(sym); + + if (sym != NULL && sym->has_warning()) +-- +2.11.0 + diff --git a/projects/binutils/build b/projects/binutils/build index 8a4ae3f..ee6db1a 100644 --- a/projects/binutils/build +++ b/projects/binutils/build @@ -21,12 +21,21 @@ cd [% project %]-[% c("version") %] [% IF c('var/windows') -%] # XXX: This is needed due to bug 10102. sed 's/= extern_rt_rel_d;/= extern_rt_rel_d;\n memset (extern_rt_rel_d, 0, PE_IDATA5_SIZE);/' -i ld/pe-dll.c + # Zeroing timestamps in PE headers reliably, see bug 12753. + patch -p1 < ../peXXigen.patch # Needed for the hardening... patch -p1 < ../enable-reloc-section-ld.patch + # fix "right-hand operand of comma expression has no effect" warning + patch -p1 < ../fix-warning-bfd.patch [% END -%] [% IF c('var/windows-x86_64') -%] patch -p1 < ../64bit-fixups.patch [% END -%] +[% IF c("var/linux") && ! c("var/release") -%] + # We need to work around a gold linker bug in 2.24 to get selfrando working, + # see bug 20683. + patch -p1 < $rootdir/binutils-224-gold.patch +[% END -%] ./configure --prefix=$distdir [% c('var/configure_opt') %] make -j[% c("buildconf/num_procs") %] make install diff --git a/projects/binutils/config b/projects/binutils/config index 7ac3799..5c35588 100644 --- a/projects/binutils/config +++ b/projects/binutils/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2.29.1 +version: 2.24 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: configure_opt: '--disable-multilib --enable-gold --enable-deterministic-archives --enable-plugins' @@ -19,5 +19,11 @@ input_files: - project: container-image - filename: enable-reloc-section-ld.patch enable: '[% c("var/windows") %]' + - filename: fix-warning-bfd.patch + enable: '[% c("var/windows") %]' - filename: 64bit-fixups.patch enable: '[% c("var/windows-x86_64") %]' + - filename: peXXigen.patch + enable: '[% c("var/windows") %]' + - filename: binutils-224-gold.patch + enable: '[% c("var/linux") %]' diff --git a/projects/binutils/enable-reloc-section-ld.patch b/projects/binutils/enable-reloc-section-ld.patch index a6600c3..f393f51 100644 --- a/projects/binutils/enable-reloc-section-ld.patch +++ b/projects/binutils/enable-reloc-section-ld.patch @@ -1,29 +1,30 @@ -From fba503a78c50d6134943245d55e820f53e8f19cd Mon Sep 17 00:00:00 2001 +From 093b08a9e7af23a258306b710ebc4556d12f94f7 Mon Sep 17 00:00:00 2001 From: Erinn Clark <erinn(a)torproject.org> Date: Fri, 8 Aug 2014 14:23:44 -0400 Subject: [PATCH] add relocation section so Windows bundles can have ASLR Patch by skruffy. + --- - ld/emultempl/pe.em | 7 ++++++ - ld/emultempl/pep.em | 11 ++++++++-- + ld/emultempl/pe.em | 6 +++++ + ld/emultempl/pep.em | 8 ++++++- ld/pe-dll.c | 63 ++++++++++++++++++++++++++++++----------------------- ld/pe-dll.h | 1 + - 4 files changed, 53 insertions(+), 29 deletions(-) + 4 files changed, 50 insertions(+), 28 deletions(-) diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em -index 339b7c5..3958b81 100644 +index 5d6da9e..14c07f7 100644 --- a/ld/emultempl/pe.em +++ b/ld/emultempl/pe.em -@@ -272,6 +272,7 @@ fragment <<EOF +@@ -268,6 +268,7 @@ fragment <<EOF + #define OPTION_TERMINAL_SERVER_AWARE (OPTION_WDM_DRIVER + 1) + /* Determinism. */ #define OPTION_INSERT_TIMESTAMP (OPTION_TERMINAL_SERVER_AWARE + 1) - #define OPTION_NO_INSERT_TIMESTAMP (OPTION_INSERT_TIMESTAMP + 1) - #define OPTION_BUILD_ID (OPTION_NO_INSERT_TIMESTAMP + 1) -+#define OPTION_ENABLE_RELOC_SECTION (OPTION_BUILD_ID + 1) ++#define OPTION_ENABLE_RELOC_SECTION (OPTION_INSERT_TIMESTAMP + 1) static void gld${EMULATION_NAME}_add_options -@@ -315,6 +316,7 @@ gld${EMULATION_NAME}_add_options +@@ -310,6 +311,7 @@ gld${EMULATION_NAME}_add_options {"export-all-symbols", no_argument, NULL, OPTION_EXPORT_ALL}, {"exclude-symbols", required_argument, NULL, OPTION_EXCLUDE_SYMBOLS}, {"exclude-all-symbols", no_argument, NULL, OPTION_EXCLUDE_ALL_SYMBOLS}, @@ -31,7 +32,7 @@ index 339b7c5..3958b81 100644 {"exclude-libs", required_argument, NULL, OPTION_EXCLUDE_LIBS}, {"exclude-modules-for-implib", required_argument, NULL, OPTION_EXCLUDE_MODULES_FOR_IMPLIB}, {"kill-at", no_argument, NULL, OPTION_KILL_ATS}, -@@ -782,6 +784,9 @@ gld${EMULATION_NAME}_handle_option (int optc) +@@ -773,6 +775,9 @@ gld${EMULATION_NAME}_handle_option (int optc) case OPTION_EXCLUDE_ALL_SYMBOLS: pe_dll_exclude_all_symbols = 1; break; @@ -41,30 +42,29 @@ index 339b7c5..3958b81 100644 case OPTION_EXCLUDE_LIBS: pe_dll_add_excludes (optarg, EXCLUDELIBS); break; -@@ -2076,6 +2081,8 @@ gld_${EMULATION_NAME}_finish (void) +@@ -1839,6 +1844,7 @@ gld_${EMULATION_NAME}_finish (void) + if (link_info.shared #if !defined(TARGET_IS_shpe) - || (!bfd_link_relocatable (&link_info) - && pe_def_file->num_exports != 0) -+ || (!bfd_link_relocatable (&link_info) -+ && pe_dll_enable_reloc_section) + || (!link_info.relocatable && pe_def_file->num_exports != 0) ++ || (!link_info.relocatable && pe_dll_enable_reloc_section) #endif ) { diff --git a/ld/emultempl/pep.em b/ld/emultempl/pep.em -index c253d2f..fccbd63 100644 +index b738800..b566903 100644 --- a/ld/emultempl/pep.em +++ b/ld/emultempl/pep.em -@@ -246,7 +246,8 @@ enum options +@@ -242,7 +242,8 @@ enum options + OPTION_NO_BIND, + OPTION_WDM_DRIVER, OPTION_INSERT_TIMESTAMP, - OPTION_NO_INSERT_TIMESTAMP, - OPTION_TERMINAL_SERVER_AWARE, -- OPTION_BUILD_ID -+ OPTION_BUILD_ID, +- OPTION_TERMINAL_SERVER_AWARE ++ OPTION_TERMINAL_SERVER_AWARE, + OPTION_ENABLE_RELOC_SECTION }; static void -@@ -288,6 +289,7 @@ gld${EMULATION_NAME}_add_options +@@ -284,6 +285,7 @@ gld${EMULATION_NAME}_add_options {"export-all-symbols", no_argument, NULL, OPTION_EXPORT_ALL}, {"exclude-symbols", required_argument, NULL, OPTION_EXCLUDE_SYMBOLS}, {"exclude-all-symbols", no_argument, NULL, OPTION_EXCLUDE_ALL_SYMBOLS}, @@ -72,7 +72,7 @@ index c253d2f..fccbd63 100644 {"exclude-libs", required_argument, NULL, OPTION_EXCLUDE_LIBS}, {"exclude-modules-for-implib", required_argument, NULL, OPTION_EXCLUDE_MODULES_FOR_IMPLIB}, {"kill-at", no_argument, NULL, OPTION_KILL_ATS}, -@@ -739,6 +741,9 @@ gld${EMULATION_NAME}_handle_option (int optc) +@@ -727,6 +729,9 @@ gld${EMULATION_NAME}_handle_option (int optc) case OPTION_EXCLUDE_ALL_SYMBOLS: pep_dll_exclude_all_symbols = 1; break; @@ -82,22 +82,19 @@ index c253d2f..fccbd63 100644 case OPTION_EXCLUDE_LIBS: pep_dll_add_excludes (optarg, EXCLUDELIBS); break; -@@ -1857,7 +1862,9 @@ gld_${EMULATION_NAME}_finish (void) +@@ -1618,6 +1623,7 @@ gld_${EMULATION_NAME}_finish (void) + #ifdef DLL_SUPPORT - if (bfd_link_pic (&link_info) - || (!bfd_link_relocatable (&link_info) -- && pep_def_file->num_exports != 0)) -+ && pe_dll_enable_reloc_section) -+ || (!bfd_link_relocatable (&link_info) -+ && pep_def_file->num_exports != 0)) + if (link_info.shared ++ || (!link_info.relocatable && pe_dll_enable_reloc_section) + || (!link_info.relocatable && pep_def_file->num_exports != 0)) { pep_dll_fill_sections (link_info.output_bfd, &link_info); - if (command_line.out_implib_filename) diff --git a/ld/pe-dll.c b/ld/pe-dll.c -index c398f23..3797f1a 100644 +index e9e133b..4230dc3 100644 --- a/ld/pe-dll.c +++ b/ld/pe-dll.c -@@ -151,6 +151,7 @@ def_file * pe_def_file = 0; +@@ -152,6 +152,7 @@ def_file * pe_def_file = 0; int pe_dll_export_everything = 0; int pe_dll_exclude_all_symbols = 0; int pe_dll_do_default_excludes = 1; @@ -105,10 +102,10 @@ index c398f23..3797f1a 100644 int pe_dll_kill_ats = 0; int pe_dll_stdcall_aliases = 0; int pe_dll_warn_dup_exports = 0; -@@ -3430,8 +3431,15 @@ pe_dll_build_sections (bfd *abfd, struct bfd_link_info *info) +@@ -3370,8 +3371,15 @@ pe_dll_build_sections (bfd *abfd, struct bfd_link_info *info) process_def_file_and_drectve (abfd, info); - if (pe_def_file->num_exports == 0 && !bfd_link_pic (info)) + if (pe_def_file->num_exports == 0 && !info->shared) - return; - + { @@ -123,7 +120,7 @@ index c398f23..3797f1a 100644 generate_edata (abfd, info); build_filler_bfd (1); pe_output_file_set_long_section_names (filler_bfd); -@@ -3446,13 +3454,9 @@ pe_exe_build_sections (bfd *abfd, struct bfd_link_info *info ATTRIBUTE_UNUSED) +@@ -3386,13 +3394,9 @@ pe_exe_build_sections (bfd *abfd, struct bfd_link_info *info ATTRIBUTE_UNUSED) pe_output_file_set_long_section_names (filler_bfd); } @@ -139,13 +136,13 @@ index c398f23..3797f1a 100644 generate_reloc (abfd, info); if (reloc_sz > 0) { -@@ -3469,38 +3473,43 @@ pe_dll_fill_sections (bfd *abfd, struct bfd_link_info *info) +@@ -3409,38 +3413,43 @@ pe_dll_fill_sections (bfd *abfd, struct bfd_link_info *info) lang_do_assignments (lang_final_phase_enum); } - fill_edata (abfd, info); - -- if (bfd_link_dll (info)) +- if (info->shared && !info->pie) - pe_data (abfd)->dll = 1; - - edata_s->contents = edata_d; @@ -177,7 +174,7 @@ index c398f23..3797f1a 100644 - /* Resize the sections. */ - lang_reset_memory_regions (); - lang_size_sections (NULL, TRUE); -+ if (bfd_link_pic (info) && !bfd_link_pie (info)) ++ if (info->shared && !info->pie) + pe_data (abfd)->dll = 1; - /* Redo special stuff. */ @@ -203,10 +200,10 @@ index c398f23..3797f1a 100644 bfd_boolean diff --git a/ld/pe-dll.h b/ld/pe-dll.h -index 48d169b..05ff72b 100644 +index 4697390..2bf71d9 100644 --- a/ld/pe-dll.h +++ b/ld/pe-dll.h -@@ -30,6 +30,7 @@ extern def_file *pe_def_file; +@@ -31,6 +31,7 @@ extern def_file *pe_def_file; extern int pe_dll_export_everything; extern int pe_dll_exclude_all_symbols; extern int pe_dll_do_default_excludes; @@ -215,5 +212,5 @@ index 48d169b..05ff72b 100644 extern int pe_dll_stdcall_aliases; extern int pe_dll_warn_dup_exports; -- -2.1.4 +2.0.1 diff --git a/projects/binutils/fix-warning-bfd.patch b/projects/binutils/fix-warning-bfd.patch new file mode 100644 index 0000000..fa04405 --- /dev/null +++ b/projects/binutils/fix-warning-bfd.patch @@ -0,0 +1,186 @@ +From 27b829ee701e29804216b3803fbaeb629be27491 Mon Sep 17 00:00:00 2001 +From: Nick Clifton <nickc(a)redhat.com> +Date: Wed, 29 Jan 2014 13:46:39 +0000 +Subject: [PATCH] Following up on Tom's suggestion I am checking in a patch to + replace the various bfd_xxx_set macros with static inline functions, so that + we can avoid compile time warnings about comma expressions with unused + values. + + * bfd-in.h (bfd_set_section_vma): Delete. + (bfd_set_section_alignment): Delete. + (bfd_set_section_userdata): Delete. + (bfd_set_cacheable): Delete. + * bfd.c (bfd_set_cacheable): New static inline function. + * section.c (bfd_set_section_userdata): Likewise. + (bfd_set_section_vma): Likewise. + (bfd_set_section_alignment): Likewise. + * bfd-in2.h: Regenerate. +--- + bfd/bfd-in.h | 5 ----- + bfd/bfd-in2.h | 41 +++++++++++++++++++++++++++++++++++------ + bfd/bfd.c | 8 ++++++++ + bfd/section.c | 26 ++++++++++++++++++++++++++ + 5 files changed, 81 insertions(+), 11 deletions(-) + +diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h +index 3afd71b..c7c5a7d 100644 +--- a/bfd/bfd-in.h ++++ b/bfd/bfd-in.h +@@ -292,9 +292,6 @@ typedef struct bfd_section *sec_ptr; + + #define bfd_is_com_section(ptr) (((ptr)->flags & SEC_IS_COMMON) != 0) + +-#define bfd_set_section_vma(bfd, ptr, val) (((ptr)->vma = (ptr)->lma = (val)), ((ptr)->user_set_vma = TRUE), TRUE) +-#define bfd_set_section_alignment(bfd, ptr, val) (((ptr)->alignment_power = (val)),TRUE) +-#define bfd_set_section_userdata(bfd, ptr, val) (((ptr)->userdata = (val)),TRUE) + /* Find the address one past the end of SEC. */ + #define bfd_get_section_limit(bfd, sec) \ + (((bfd)->direction != write_direction && (sec)->rawsize != 0 \ +@@ -517,8 +514,6 @@ extern void warn_deprecated (const char *, const char *, int, const char *); + + #define bfd_get_symbol_leading_char(abfd) ((abfd)->xvec->symbol_leading_char) + +-#define bfd_set_cacheable(abfd,bool) (((abfd)->cacheable = bool), TRUE) +- + extern bfd_boolean bfd_cache_close + (bfd *abfd); + /* NB: This declaration should match the autogenerated one in libbfd.h. */ +diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h +index 71996db..b5aeb40 100644 +--- a/bfd/bfd-in2.h ++++ b/bfd/bfd-in2.h +@@ -299,9 +299,6 @@ typedef struct bfd_section *sec_ptr; + + #define bfd_is_com_section(ptr) (((ptr)->flags & SEC_IS_COMMON) != 0) + +-#define bfd_set_section_vma(bfd, ptr, val) (((ptr)->vma = (ptr)->lma = (val)), ((ptr)->user_set_vma = TRUE), TRUE) +-#define bfd_set_section_alignment(bfd, ptr, val) (((ptr)->alignment_power = (val)),TRUE) +-#define bfd_set_section_userdata(bfd, ptr, val) (((ptr)->userdata = (val)),TRUE) + /* Find the address one past the end of SEC. */ + #define bfd_get_section_limit(bfd, sec) \ + (((bfd)->direction != write_direction && (sec)->rawsize != 0 \ +@@ -524,8 +521,6 @@ extern void warn_deprecated (const char *, const char *, int, const char *); + + #define bfd_get_symbol_leading_char(abfd) ((abfd)->xvec->symbol_leading_char) + +-#define bfd_set_cacheable(abfd,bool) (((abfd)->cacheable = bool), TRUE) +- + extern bfd_boolean bfd_cache_close + (bfd *abfd); + /* NB: This declaration should match the autogenerated one in libbfd.h. */ +@@ -1029,7 +1024,7 @@ bfd *bfd_openr (const char *filename, const char *target); + + bfd *bfd_fdopenr (const char *filename, const char *target, int fd); + +-bfd *bfd_openstreamr (const char *, const char *, void *); ++bfd *bfd_openstreamr (const char * filename, const char * target, void * stream); + + bfd *bfd_openr_iovec (const char *filename, const char *target, + void *(*open_func) (struct bfd *nbfd, +@@ -1596,6 +1591,32 @@ struct relax_table { + int size; + }; + ++/* Note: the following are provided as inline functions rather than macros ++ because not all callers use the return value. A macro implementation ++ would use a comma expression, eg: "((ptr)->foo = val, TRUE)" and some ++ compilers will complain about comma expressions that have no effect. */ ++static inline bfd_boolean ++bfd_set_section_userdata (bfd * abfd ATTRIBUTE_UNUSED, asection * ptr, void * val) ++{ ++ ptr->userdata = val; ++ return TRUE; ++} ++ ++static inline bfd_boolean ++bfd_set_section_vma (bfd * abfd ATTRIBUTE_UNUSED, asection * ptr, bfd_vma val) ++{ ++ ptr->vma = ptr->lma = val; ++ ptr->user_set_vma = TRUE; ++ return TRUE; ++} ++ ++static inline bfd_boolean ++bfd_set_section_alignment (bfd * abfd ATTRIBUTE_UNUSED, asection * ptr, unsigned int val) ++{ ++ ptr->alignment_power = val; ++ return TRUE; ++} ++ + /* These sections are global, and are managed by BFD. The application + and target back end are not permitted to change the values in + these sections. */ +@@ -6415,6 +6436,14 @@ struct bfd + unsigned int selective_search : 1; + }; + ++/* See note beside bfd_set_section_userdata. */ ++static inline bfd_boolean ++bfd_set_cacheable (bfd * abfd, bfd_boolean val) ++{ ++ abfd->cacheable = val; ++ return TRUE; ++} ++ + typedef enum bfd_error + { + bfd_error_no_error = 0, +diff --git a/bfd/bfd.c b/bfd/bfd.c +index 8d0580c..2d174f3 100644 +--- a/bfd/bfd.c ++++ b/bfd/bfd.c +@@ -311,6 +311,14 @@ CODE_FRAGMENT + . unsigned int selective_search : 1; + .}; + . ++.{* See note beside bfd_set_section_userdata. *} ++.static inline bfd_boolean ++.bfd_set_cacheable (bfd * abfd, bfd_boolean val) ++.{ ++. abfd->cacheable = val; ++. return TRUE; ++.} ++. + */ + + #include "sysdep.h" +diff --git a/bfd/section.c b/bfd/section.c +index fb19d8c..a661228 100644 +--- a/bfd/section.c ++++ b/bfd/section.c +@@ -542,6 +542,32 @@ CODE_FRAGMENT + . int size; + .}; + . ++.{* Note: the following are provided as inline functions rather than macros ++. because not all callers use the return value. A macro implementation ++. would use a comma expression, eg: "((ptr)->foo = val, TRUE)" and some ++. compilers will complain about comma expressions that have no effect. *} ++.static inline bfd_boolean ++.bfd_set_section_userdata (bfd * abfd ATTRIBUTE_UNUSED, asection * ptr, void * val) ++.{ ++. ptr->userdata = val; ++. return TRUE; ++.} ++. ++.static inline bfd_boolean ++.bfd_set_section_vma (bfd * abfd ATTRIBUTE_UNUSED, asection * ptr, bfd_vma val) ++.{ ++. ptr->vma = ptr->lma = val; ++. ptr->user_set_vma = TRUE; ++. return TRUE; ++.} ++. ++.static inline bfd_boolean ++.bfd_set_section_alignment (bfd * abfd ATTRIBUTE_UNUSED, asection * ptr, unsigned int val) ++.{ ++. ptr->alignment_power = val; ++. return TRUE; ++.} ++. + .{* These sections are global, and are managed by BFD. The application + . and target back end are not permitted to change the values in + . these sections. *} +-- +2.1.4 + diff --git a/projects/binutils/peXXigen.patch b/projects/binutils/peXXigen.patch new file mode 100644 index 0000000..785aa02 --- /dev/null +++ b/projects/binutils/peXXigen.patch @@ -0,0 +1,14 @@ +diff -crB binutils-2.24/bfd/peXXigen.c binutils-2.24/bfd/peXXigen.c +*** binutils-2.24/bfd/peXXigen.c Tue Nov 26 11:37:33 2013 +--- binutils-2.24/bfd/peXXigen.c Mon Aug 4 07:10:15 2014 +*************** +*** 795,800 **** +--- 795,802 ---- + /* Only use a real timestamp if the option was chosen. */ + if ((pe_data (abfd)->insert_timestamp)) + H_PUT_32 (abfd, time(0), filehdr_out->f_timdat); ++ else ++ H_PUT_32 (abfd, 0, filehdr_out->f_timdat); + + PUT_FILEHDR_SYMPTR (abfd, filehdr_in->f_symptr, + filehdr_out->f_symptr); diff --git a/projects/mingw-w64/build b/projects/mingw-w64/build index 8acd41d..8d3e567 100644 --- a/projects/mingw-w64/build +++ b/projects/mingw-w64/build @@ -29,7 +29,7 @@ sed 's/msvcrt/msvcr100/' -i $distdir/msvcr100.spec sed 's/msvcrt/msvcr100/' -i gcc-[% c("var/gcc_version") %]/gcc/config/i386/t-mingw-w32 # LDFLAGS_FOR_TARGET does not work for some reason. Thus, we take # CFLAGS_FOR_TARGET. -export CFLAGS_FOR_TARGET="-specs=$distdir/msvcr100.spec -Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-insert-timestamp" +export CFLAGS_FOR_TARGET="-specs=$distdir/msvcr100.spec -Wl,--nxcompat -Wl,--dynamicbase" gcc-[% c("var/gcc_version") %]/configure --prefix=$distdir --target=[% c("arch") %]-w64-mingw32 --disable-multilib --enable-languages=c,c++ make -j[% c("buildconf/num_procs") %] all-gcc make install-gcc @@ -59,17 +59,17 @@ mkdir -p $distdir/helpers cat > $distdir/helpers/[% c("arch") %]-w64-mingw32-g++ << 'EOF' #!/bin/sh -/var/tmp/dist/mingw-w64/bin/[% c("arch") %]-w64-mingw32-g++ -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -fstack-protector --param ssp-buffer-size=4 -fno-strict-overflow "$@" +/var/tmp/dist/mingw-w64/bin/[% c("arch") %]-w64-mingw32-g++ -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -fstack-protector --param ssp-buffer-size=4 -fno-strict-overflow "$@" EOF cat > $distdir/helpers/[% c("arch") %]-w64-mingw32-gcc << 'EOF' #!/bin/sh -/var/tmp/dist/mingw-w64/bin/[% c("arch") %]-w64-mingw32-gcc -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -fstack-protector --param ssp-buffer-size=4 -fno-strict-overflow "$@" +/var/tmp/dist/mingw-w64/bin/[% c("arch") %]-w64-mingw32-gcc -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -fstack-protector --param ssp-buffer-size=4 -fno-strict-overflow "$@" EOF cat > $distdir/helpers/[% c("arch") %]-w64-mingw32-ld << 'EOF' #!/bin/sh -/var/tmp/dist/mingw-w64/bin/[% c("arch") %]-w64-mingw32-ld --dynamicbase --nxcompat --enable-reloc-section --no-insert-timestamp -lssp -L$gcclibs "$@" +/var/tmp/dist/mingw-w64/bin/[% c("arch") %]-w64-mingw32-ld --dynamicbase --nxcompat --enable-reloc-section -lssp -L$gcclibs "$@" EOF chmod +x $distdir/helpers/* diff --git a/projects/nsis/build b/projects/nsis/build index 7a66884..af19dd7 100755 --- a/projects/nsis/build +++ b/projects/nsis/build @@ -1,35 +1,8 @@ #!/bin/bash [% c("var/set_default_env") -%] [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] -# Some of the hardening flags are causing the build to fail, so we -# overwrite the helpers with only the flags required to make the build -# reproducible. -helpersdir=/var/tmp/dist/mingw-w64/helpers -cat > $helpersdir/[% c("arch") %]-w64-mingw32-g++ << 'EOF' -#!/bin/sh -/var/tmp/dist/mingw-w64/bin/[% c("arch") %]-w64-mingw32-g++ -Wl,--no-insert-timestamp "$@" -EOF - -cat > $helpersdir/[% c("arch") %]-w64-mingw32-gcc << 'EOF' -#!/bin/sh -/var/tmp/dist/mingw-w64/bin/[% c("arch") %]-w64-mingw32-gcc -Wl,--no-insert-timestamp "$@" -EOF - -cat > $helpersdir/[% c("arch") %]-w64-mingw32-ld << 'EOF' -#!/bin/sh -/var/tmp/dist/mingw-w64/bin/[% c("arch") %]-w64-mingw32-ld --no-insert-timestamp "$@" -EOF -# the nsis build system expects all toolchain binaries to be in the same -# directory, so we create wrappers for the other commands in the same -# directory. -for util in ar ranlib windres -do - cat > $helpersdir/[% c("arch") %]-w64-mingw32-$util <<EOF -#!/bin/sh -/var/tmp/dist/mingw-w64/bin/[% c("arch") %]-w64-mingw32-$util "\$@" -EOF - chmod +x $helpersdir/[% c("arch") %]-w64-mingw32-$util -done +# remove hardening wrappers +rm -Rf /var/tmp/dist/mingw-w64/helpers mkdir -p /var/tmp/dist mkdir -p /var/tmp/build tar -C /var/tmp/build -xf nsis-[% c('version') %].tar.bz2 diff --git a/projects/openssl/config b/projects/openssl/config index fc8e1ff..378ee53 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -15,7 +15,7 @@ targets: configure_opts: -shared linux-generic32 windows: var: - configure_opts: '-shared --cross-compile-prefix=[% c("arch") %]-w64-mingw32- mingw[% IF c("var/windows-x86_64") %]64[% END %] "-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$gcclibs"' + configure_opts: '-shared --cross-compile-prefix=[% c("arch") %]-w64-mingw32- mingw[% IF c("var/windows-x86_64") %]64[% END %] "-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$gcclibs"' osx-x86_64: var: configure_opts: --cross-compile-prefix=x86_64-apple-darwin10- darwin64-x86_64-cc enable-ec_nistp_64_gcc_128 diff --git a/projects/selfrando/config b/projects/selfrando/config index 07195f7..f8afa5d 100644 --- a/projects/selfrando/config +++ b/projects/selfrando/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -version: 0.4.1 +version: 0.3.3 git_hash: 'tb-v[% c("version") %]' git_url: https://github.com/immunant/selfrando.git gpg_keyring: selfrando.gpg diff --git a/projects/zlib/build b/projects/zlib/build index ef26882..4cb384b 100644 --- a/projects/zlib/build +++ b/projects/zlib/build @@ -7,8 +7,8 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] export CFLAGS="[% c("var/CFLAGS") %]" export LDFLAGS="[% c("var/LDFLAGS") %]" -make BINARY_PATH=$distdir/lib INCLUDE_PATH=$distdir/include LIBRARY_PATH=$distdir/lib -f win32/Makefile.gcc PREFIX=[% c("arch") %]-w64-mingw32- -j4 SHARED_MODE=1 LOC="-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$gcclibs" -make BINARY_PATH=$distdir/lib INCLUDE_PATH=$distdir/include LIBRARY_PATH=$distdir/lib -f win32/Makefile.gcc PREFIX=[% c("arch") %]-w64-mingw32- -j4 SHARED_MODE=1 LOC="-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$gcclibs" install +make BINARY_PATH=$distdir/lib INCLUDE_PATH=$distdir/include LIBRARY_PATH=$distdir/lib -f win32/Makefile.gcc PREFIX=[% c("arch") %]-w64-mingw32- -j4 SHARED_MODE=1 LOC="-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$gcclibs" +make BINARY_PATH=$distdir/lib INCLUDE_PATH=$distdir/include LIBRARY_PATH=$distdir/lib -f win32/Makefile.gcc PREFIX=[% c("arch") %]-w64-mingw32- -j4 SHARED_MODE=1 LOC="-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$gcclibs" install cd /var/tmp/dist [% c('tar', { diff --git a/rbm.conf b/rbm.conf index b2ba2ab..13005b7 100644 --- a/rbm.conf +++ b/rbm.conf @@ -218,7 +218,7 @@ targets: suite: jessie configure_opt: '--host=[% c("arch") %]-w64-mingw32 CFLAGS="[% c("var/CFLAGS") %]" LDFLAGS="[% c("var/LDFLAGS") %]"' CFLAGS: '[% c("var/flag_mwindows") %] -fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security' - LDFLAGS: '[% c("var/flag_mwindows") %] -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$gcclibs' + LDFLAGS: '[% c("var/flag_mwindows") %] -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$gcclibs' flag_mwindows: '-mwindows' compiler: mingw-w64 deps:

1 0