tbb-commits

Download

tbb-commits@lists.torproject.org

April 2019

2 participants
80 discussions

[tor-browser-build/master] Bug 30325: Remove bison from default packages where it is not needed
by gk＠torproject.org 30 Apr '19

30 Apr '19

commit 92f1239bac2f4f20df38acfe587b1ef5bcceebd2 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 29 13:43:24 2019 +0200 Bug 30325: Remove bison from default packages where it is not needed Remove bison from the android, osx and common-stretch targets. --- rbm.conf | 3 --- 1 file changed, 3 deletions(-) diff --git a/rbm.conf b/rbm.conf index 9e4fc78..667af9c 100644 --- a/rbm.conf +++ b/rbm.conf @@ -168,7 +168,6 @@ targets: deps: - build-essential - python - - bison - automake - libtool - zip @@ -204,7 +203,6 @@ targets: deps: - build-essential - python - - bison - automake - libtool - zip @@ -331,7 +329,6 @@ targets: deps: - build-essential - python - - bison - automake - libtool - zip

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_30325_v3'
by gk＠torproject.org 30 Apr '19

30 Apr '19

commit a933db4a6d08879842d3898b752dccfd8e524e72 Merge: f7ae040 92f1239 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Apr 30 19:39:55 2019 +0000 Merge remote-tracking branch 'boklm/bug_30325_v3' rbm.conf | 3 --- 1 file changed, 3 deletions(-)

1 0

[tor-browser-build/maint-8.5] Bug 29981: Add yasm to the list of dependencies for android builds
by gk＠torproject.org 30 Apr '19

30 Apr '19

commit 7e784c57f614b97a9b2f614bc0550fd5ade1e735 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Apr 30 17:06:00 2019 +0200 Bug 29981: Add yasm to the list of dependencies for android builds Note: yasm is only needed for android-x86 builds. --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 1dc2cfd..6aa763e 100644 --- a/README +++ b/README @@ -208,7 +208,7 @@ with the following command: autoconf2.13 openjdk-8-jdk gettext-base autotools-dev \ automake autoconf libtool autopoint libssl-dev \ pkg-config zlib1g-dev libparallel-forkmanager-perl \ - libfile-slurp-perl bzip2 xz-utils apksigner + libfile-slurp-perl bzip2 xz-utils apksigner yasm Common Build Errors

1 0

[tor-browser-build/master] Bug 29981: Add yasm to the list of dependencies for android builds
by gk＠torproject.org 30 Apr '19

30 Apr '19

commit f7ae040da39ac0009776802371e088f15531b9e7 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Apr 30 17:06:00 2019 +0200 Bug 29981: Add yasm to the list of dependencies for android builds Note: yasm is only needed for android-x86 builds. --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 1dc2cfd..6aa763e 100644 --- a/README +++ b/README @@ -208,7 +208,7 @@ with the following command: autoconf2.13 openjdk-8-jdk gettext-base autotools-dev \ automake autoconf libtool autopoint libssl-dev \ pkg-config zlib1g-dev libparallel-forkmanager-perl \ - libfile-slurp-perl bzip2 xz-utils apksigner + libfile-slurp-perl bzip2 xz-utils apksigner yasm Common Build Errors

1 0

[tor-browser-build/maint-8.5] Bug 30280: Wrong SHA-256 sum for j2objc-annotations-1.1.jar
by gk＠torproject.org 30 Apr '19

30 Apr '19

1 0

[tor-browser-build/master] Bug 30280: Wrong SHA-256 sum for j2objc-annotations-1.1.jar
by gk＠torproject.org 30 Apr '19

30 Apr '19

1 0

[tor-browser/tor-browser-60.6.1esr-8.5-1] Bug 1532530 - Avoid loss of upload data by webRequest API r=kmag a=lizzard
by gk＠torproject.org 30 Apr '19

30 Apr '19

commit 30a070eefe4c881a1804690b8983db2911c2c99b Author: Rob Wu <rob(a)robwu.nl> Date: Mon Mar 25 21:16:49 2019 +0000 Bug 1532530 - Avoid loss of upload data by webRequest API r=kmag a=lizzard When an extension requests access to the request body of a request, `nsConverterInputStream` is used to parse the input streams that make up a request body. These input streams are later (re)used to upload the form data to the original destination (server). `nsConverterInputStream`'s destructor does however close the input streams, which results in data loss when the object is garbage-collected before the upload completes. This patch fixes the issue by explicitly nulling the underlying stream before returning from the form parser. Differential Revision: https://phabricator.services.mozilla.com/D24539 --HG-- extra : source : 574c141c8dd619a00ffa90fc40c2ba614afb46da extra : intermediate-source : 85efc85e2cf3e5d3e26cfdf8a716bbb9ac3551b5 --- toolkit/modules/addons/WebRequestUpload.jsm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/toolkit/modules/addons/WebRequestUpload.jsm b/toolkit/modules/addons/WebRequestUpload.jsm index 10770d7ee771..294a394cd93f 100644 --- a/toolkit/modules/addons/WebRequestUpload.jsm +++ b/toolkit/modules/addons/WebRequestUpload.jsm @@ -192,6 +192,7 @@ function parseFormData(stream, channel, lenient = false) { const BUFFER_SIZE = 8192; let touchedStreams = new Set(); + let converterStreams = []; /** * Creates a converter input stream from the given raw input stream, @@ -210,10 +211,12 @@ function parseFormData(stream, channel, lenient = false) { } touchedStreams.add(stream); - return ConverterInputStream( + let converterStream = ConverterInputStream( stream, "UTF-8", 0, lenient ? Ci.nsIConverterInputStream.DEFAULT_REPLACEMENT_CHARACTER : 0); + converterStreams.push(converterStream); + return converterStream; } /** @@ -382,6 +385,12 @@ function parseFormData(stream, channel, lenient = false) { for (let stream of touchedStreams) { rewind(stream); } + for (let converterStream of converterStreams) { + // Release the reference to the underlying input stream, to prevent the + // destructor of nsConverterInputStream from closing the stream, which + // would cause uploads to break. + converterStream.init(null, null, 0, 0); + } } return null;

1 0

[tor-browser/tor-browser-60.6.1esr-8.5-1] Bug 28369: stop shipping pingsender executable
by gk＠torproject.org 29 Apr '19

29 Apr '19

commit c1262822e77cf26780d240646bacd14a67e6c301 Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Apr 10 17:52:51 2019 +0200 Bug 28369: stop shipping pingsender executable --- browser/app/macbuild/Contents/MacOS-files.in | 1 - browser/installer/package-manifest.in | 4 ---- browser/installer/windows/nsis/shared.nsh | 1 - python/mozbuild/mozbuild/artifacts.py | 2 -- toolkit/components/telemetry/TelemetrySend.jsm | 17 +---------------- toolkit/components/telemetry/moz.build | 1 - 6 files changed, 1 insertion(+), 25 deletions(-) diff --git a/browser/app/macbuild/Contents/MacOS-files.in b/browser/app/macbuild/Contents/MacOS-files.in index bd87bc5116b7..cfa17eca813b 100644 --- a/browser/app/macbuild/Contents/MacOS-files.in +++ b/browser/app/macbuild/Contents/MacOS-files.in @@ -9,7 +9,6 @@ #if defined(MOZ_ASAN) || defined(MOZ_TSAN) /llvm-symbolizer #endif -/pingsender /pk12util /ssltunnel /webrtc-gtest diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index ede92eca6e58..bc6082198b02 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -778,10 +778,6 @@ bin/libfreebl_32int64_3.so #endif #endif -; [ Ping Sender ] -; -@BINPATH@/pingsender@BIN_SUFFIX@ - @RESPATH@/components/dom_audiochannel.xpt ; Shutdown Terminator diff --git a/browser/installer/windows/nsis/shared.nsh b/browser/installer/windows/nsis/shared.nsh index 4263f379db64..a0cd06cdae68 100755 --- a/browser/installer/windows/nsis/shared.nsh +++ b/browser/installer/windows/nsis/shared.nsh @@ -1337,7 +1337,6 @@ Push "xpcom.dll" Push "crashreporter.exe" Push "minidump-analyzer.exe" - Push "pingsender.exe" Push "updater.exe" Push "${FileMainEXE}" !macroend diff --git a/python/mozbuild/mozbuild/artifacts.py b/python/mozbuild/mozbuild/artifacts.py index 2afe9c43fcb0..b2d560a713c9 100644 --- a/python/mozbuild/mozbuild/artifacts.py +++ b/python/mozbuild/mozbuild/artifacts.py @@ -278,7 +278,6 @@ class LinuxArtifactJob(ArtifactJob): 'firefox/firefox', 'firefox/firefox-bin', 'firefox/minidump-analyzer', - 'firefox/pingsender', 'firefox/platform.ini', 'firefox/plugin-container', 'firefox/updater', @@ -363,7 +362,6 @@ class MacArtifactJob(ArtifactJob): 'libmozavutil.dylib', 'libmozavcodec.dylib', 'libsoftokn3.dylib', - 'pingsender', 'plugin-container.app/Contents/MacOS/plugin-container', 'updater.app/Contents/MacOS/org.mozilla.updater', # 'xpcshell', diff --git a/toolkit/components/telemetry/TelemetrySend.jsm b/toolkit/components/telemetry/TelemetrySend.jsm index 00992ebaa786..249d142d82cf 100644 --- a/toolkit/components/telemetry/TelemetrySend.jsm +++ b/toolkit/components/telemetry/TelemetrySend.jsm @@ -1339,21 +1339,6 @@ var TelemetrySendImpl = { }, runPingSender(url, pingPath) { - if (AppConstants.platform === "android") { - throw Cr.NS_ERROR_NOT_IMPLEMENTED; - } - - const exeName = AppConstants.platform === "win" ? "pingsender.exe" - : "pingsender"; - - let exe = Services.dirsvc.get("GreBinD", Ci.nsIFile); - exe.append(exeName); - - let process = Cc["@mozilla.org/process/util;1"] - .createInstance(Ci.nsIProcess); - process.init(exe); - process.startHidden = true; - process.noShell = true; - process.run(/* blocking */ false, [url, pingPath], 2); + throw Cr.NS_ERROR_NOT_IMPLEMENTED; }, }; diff --git a/toolkit/components/telemetry/moz.build b/toolkit/components/telemetry/moz.build index c36296a13cb7..3ddd8625def5 100644 --- a/toolkit/components/telemetry/moz.build +++ b/toolkit/components/telemetry/moz.build @@ -12,7 +12,6 @@ FINAL_LIBRARY = 'xul' DIRS = [ 'hybrid-content', - 'pingsender', ] DEFINES['MOZ_APP_VERSION'] = '"%s"' % CONFIG['MOZ_APP_VERSION']

1 0

[tor-browser-build/master] Bug 29981: Fix some reproducibility issue in the android build
by gk＠torproject.org 29 Apr '19

29 Apr '19

commit 0fc15a39f2adcf029676810c2ec37c566886879e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Apr 10 18:45:51 2019 +0200 Bug 29981: Fix some reproducibility issue in the android build Add files to the apk in sorted order, to avoid reproducibility issues. --- projects/tor-browser/build.android | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/projects/tor-browser/build.android b/projects/tor-browser/build.android index 7592c6b..be36abc 100644 --- a/projects/tor-browser/build.android +++ b/projects/tor-browser/build.android @@ -12,16 +12,25 @@ mv $rootdir/[% c('input_files_by_name/noscript') %] $ext_dir/{73a6fe31-595d-460b [% c("var/touch") %] $ext_dir $ext_dir/* zip -d $apk META-INF/\* -zip -r -X $apk $ext_dir +[% c('zip', { + zip_src => [ '$ext_dir' ], + zip_args => '$apk', + }) %] unzip $apk lib/* zip -d $apk lib/\* [% IF c("var/android-x86") %] - zip $apk lib/x86/* + [% c('zip', { + zip_src => [ 'lib/x86/*' ], + zip_args => '$apk', + }) %] [% END %] [% IF c("var/android-armv7") %] - zip $apk lib/armeabi-v7a/* + [% c('zip', { + zip_src => [ 'lib/armeabi-v7a/*' ], + zip_args => '$apk', + }) %] [% END %] rm -fR lib

1 0

[tor-browser-build/master] Bug 29981: Add option to build without using containers
by gk＠torproject.org 29 Apr '19

29 Apr '19

commit 9072578261fc2e4198e39b81313683bf2674c5b4 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 4 14:35:37 2019 +0200 Bug 29981: Add option to build without using containers We do that by adding support for a no_containers target which defines the new option var/container/global_disable in rbm.conf. We already had the option var/container/use_container doing something similar to this new option, however it can not be overriden in rbm.conf as we define it in each project's configuration, which has priority over rbm.conf. --- README | 29 +++++++++++++++++++++++++++++ projects/container-image/config | 9 +++++++++ projects/firefox/build | 4 ++-- projects/release/config | 7 +++++++ rbm.conf | 19 +++++++++++++------ 5 files changed, 60 insertions(+), 8 deletions(-) diff --git a/README b/README index 2b09ab1..1dc2cfd 100644 --- a/README +++ b/README @@ -182,6 +182,35 @@ of files and containers that would be removed without doing it, you can use 'make clean-dry-run'. +Building without containers (Android builds only) +------------------------------------------------- + +By default the build is done inside containers. Adding the no_containers +target will disable the use of containers. The following commands can +be used to build the alpha version for android-armv7 and android-x86: + + ./rbm/rbm build release --target no_containers --target testbuild \ + --target torbrowser-android-armv7 + ./rbm/rbm build release --target no_containers --target testbuild \ + --target torbrowser-android-x86 + +Note: the logs will still show the use and creation of a container image +called "containers_disabled". This is due to the way we disable the use +of containers: the container-image project is still called, but it will +just create an empty file instead of a real container image. + +The build without containers is currently only supported for the Android +builds, and will require that you run Debian Stretch and install build +dependencies for all the components that are built. This can be done +with the following command: + + # apt-get install build-essential python automake libtool zip unzip + autoconf2.13 openjdk-8-jdk gettext-base autotools-dev \ + automake autoconf libtool autopoint libssl-dev \ + pkg-config zlib1g-dev libparallel-forkmanager-perl \ + libfile-slurp-perl bzip2 xz-utils apksigner + + Common Build Errors ------------------- diff --git a/projects/container-image/config b/projects/container-image/config index 68c401a..effcdf3 100644 --- a/projects/container-image/config +++ b/projects/container-image/config @@ -13,6 +13,15 @@ lsb_release: codename: wheezy release: 7.11 +targets: + no_containers: + filename: containers_disabled + pre: '' + input_files: [] + build: | + mkdir -p [% dest_dir %] + touch [% dest_dir _ '/' _ c('filename') %] + pre: | #!/bin/sh # [% c('var/container/suite') %] diff --git a/projects/firefox/build b/projects/firefox/build index c070770..aace388 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -98,8 +98,8 @@ mv -f $rootdir/[% c('input_files_by_name/mozconfig') %] .mozconfig [% END -%] [% IF c("var/android") %] - export GRADLE_MAVEN_REPOSITORIES="file:///var/tmp/gradle-dependencies" - gradle_repo=/var/tmp/gradle-dependencies + gradle_repo=/var/tmp/dist/gradle-dependencies + export GRADLE_MAVEN_REPOSITORIES="file://$gradle_repo" # Move Gradle Repo to hard-coded location. This location is embedded in the file # chrome/toolkit/content/global/buildconfig.html so needs to be standard for reproducibility mv $rootdir/[% c('input_files_by_name/gradle-dependencies') %] $gradle_repo diff --git a/projects/release/config b/projects/release/config index 52a416a..ddb17d1 100644 --- a/projects/release/config +++ b/projects/release/config @@ -6,6 +6,7 @@ var: signed_status: unsigned today: '[% USE date; date.format(format = "%Y-%m-%d") %]' publish_dir: '[% c("var/signed_status") %]/[% c("version") %]-[% c("var/torbrowser_build") %]' + containers_target: with_containers targets: torbrowser-all: @@ -85,6 +86,10 @@ targets: build_target: torbrowser-testbuild publish_dir: '' + no_containers: + var: + containers_target: no_containers + signed: var: signed_status: signed @@ -100,6 +105,7 @@ input_files: project: tor-browser enable: '[% c("var/torbrowser-android-armv7") %]' target: + - '[% c("var/containers_target") %]' - '[% c("var/build_target") %]' - torbrowser-android-armv7 @@ -107,6 +113,7 @@ input_files: project: tor-browser enable: '[% c("var/torbrowser-android-x86") %]' target: + - '[% c("var/containers_target") %]' - '[% c("var/build_target") %]' - torbrowser-android-x86 diff --git a/rbm.conf b/rbm.conf index a3482ac..9e4fc78 100644 --- a/rbm.conf +++ b/rbm.conf @@ -40,7 +40,7 @@ var: build_id_txt: | [% c("version") %] [% IF c("git_hash") || c("hg_hash"); GET c("abbrev"); END; %] - [% IF c("var/container/use_container") -%] + [% IF c("var/container/use_container") && ! c("var/container/global_disable") -%] [% c("var/container/suite") %] [% c("var/container/arch") %] [% END -%] @@ -118,6 +118,9 @@ var: export SHELL=/bin/bash export HOME=$rootdir umask 0022 + [% IF c("var/container/global_disable") -%] + rm -Rf /var/tmp/build /var/tmp/dist + [% END -%] DOCSDIR_project: '[% project %]' set_PTDIR_DOCSDIR: | @@ -351,6 +354,10 @@ targets: var: build_id: 1 + no_containers: + var: + container: + global_disable: 1 # change the default gpg_wrapper to allow git tag signed using an # expired key. @@ -376,11 +383,11 @@ gpg_wrapper: | exec [% c('gpg_bin') %] [% c('gpg_args') %] --with-fingerprint [% gpg_kr %] "$@" fi -remote_start: '[% IF c("var/container/use_container") %][% c("runc/remote_start") %][% END %]' -remote_exec: '[% IF c("var/container/use_container") %][% c("runc/remote_exec") %][% END %]' -remote_put: '[% IF c("var/container/use_container") %][% c("runc/remote_put") %][% END %]' -remote_get: '[% IF c("var/container/use_container") %][% c("runc/remote_get") %][% END %]' -remote_finish: '[% IF c("var/container/use_container") %][% c("runc/remote_finish") %][% END %]' +remote_start: '[% IF c("var/container/use_container") && ! c("var/container/global_disable") %][% c("runc/remote_start") %][% END %]' +remote_exec: '[% IF c("var/container/use_container") && ! c("var/container/global_disable") %][% c("runc/remote_exec") %][% END %]' +remote_put: '[% IF c("var/container/use_container") && ! c("var/container/global_disable") %][% c("runc/remote_put") %][% END %]' +remote_get: '[% IF c("var/container/use_container") && ! c("var/container/global_disable") %][% c("runc/remote_get") %][% END %]' +remote_finish: '[% IF c("var/container/use_container") && ! c("var/container/global_disable") %][% c("runc/remote_finish") %][% END %]' runc: remote_start: |

1 0