- tbb-commits - lists.torproject.org

[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] 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-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/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/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 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-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