tbb-commits November 2022

tbb-commits@lists.torproject.org

2 participants
110 discussions

[tor-browser-bundle-testsuite] branch main updated (2f1fd21 -> 03ccd93)
by gitolite role 10 Nov '22

10 Nov '22

This is an automated email from the git hooks/post-receive script. boklm pushed a change to branch main in repository tor-browser-bundle-testsuite. from 2f1fd21 Bug 40046: add base-browser nightly builds new ff860f9 Bug 40068: Fix cleaning of old nightly builds new 73c6fcf Bug 40065: Archive multi-locale and base-browser builds new 8f3eefc Bug 40065: Keep builds from last 10 days on nightlies.tbb.torproject.org new 03ccd93 Bug 40067: Update email-to list for nightly builds The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: config/tb-build-01.torproject.org | 4 +++- rbm-config/tb-build-01.torproject.org.rbm.local.conf | 8 +++++++- tools/tb-build-01-start-nightly-build | 11 +++++++---- 3 files changed, 17 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 4

[builders/tor-browser-build] branch main updated: Bug 40685: Remove targets/nightly/var/mar_locales from rbm.conf
by gitolite role 10 Nov '22

10 Nov '22

This is an automated email from the git hooks/post-receive script. boklm pushed a commit to branch main in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/main by this push: new 3afab9a8 Bug 40685: Remove targets/nightly/var/mar_locales from rbm.conf 3afab9a8 is described below commit 3afab9a8af2b41f6b3cb4714d94ecab690911edb Author: Nicolas Vigier <boklm(a)torproject.org> AuthorDate: Thu Nov 10 10:27:32 2022 +0100 Bug 40685: Remove targets/nightly/var/mar_locales from rbm.conf fixup for 98b4184d69ab7b6d55c90ef25ce6fc8005a589b8. --- rbm.conf | 7 ------- 1 file changed, 7 deletions(-) diff --git a/rbm.conf b/rbm.conf index 4313cdc7..0d34a766 100644 --- a/rbm.conf +++ b/rbm.conf @@ -212,13 +212,6 @@ targets: GET c("var_p/nightly_torbrowser_version"); END; -%] - # For nightly builds, we support updates for a limited set of locales - mar_locales: - - de - - es-ES - - fr - - ru - - uk max_torbrowser_incremental_from: 2 build_infos_json: 1 -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch main updated: fixup! Bug 40641: Use packaged locales on Firefox
by gitolite role 08 Nov '22

08 Nov '22

This is an automated email from the git hooks/post-receive script. boklm pushed a commit to branch main in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/main by this push: new 60146126 fixup! Bug 40641: Use packaged locales on Firefox 60146126 is described below commit 6014612651eebc355526981f93eaa5fbc519255b Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Tue Nov 8 14:32:56 2022 +0100 fixup! Bug 40641: Use packaged locales on Firefox Do not use firefox-l10n in testbuilds, since it is not available. --- projects/firefox/build | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index 10b93fdf..c6b940fa 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -134,11 +134,13 @@ export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system # Create .mozbuild to avoid interactive prompt in configure mkdir "$HOME/.mozbuild" -l10ncentral="$HOME/.mozbuild/l10n-central" -mkdir "$l10ncentral" -for tarball in $rootdir/[% c('input_files_by_name/firefox-l10n') %]/*; do - tar -C "$l10ncentral" -xf "$tarball" -done +[% IF !c("var/testbuild") -%] + l10ncentral="$HOME/.mozbuild/l10n-central" + mkdir "$l10ncentral" + for tarball in $rootdir/[% c('input_files_by_name/firefox-l10n') %]/*; do + tar -C "$l10ncentral" -xf "$tarball" + done +[% END %] # PyYAML tries to read files as ASCII, otherwise export LC_ALL=C.UTF-8 -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-102.4.0esr-12.0-2 updated: fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
by gitolite role 08 Nov '22

08 Nov '22

1 0

[torbutton] branch main updated: Bug 41410: Fix circuit display sizing hack for opening sub-menus.
by gitolite role 08 Nov '22

08 Nov '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch main in repository torbutton. The following commit(s) were added to refs/heads/main by this push: new 362c914b Bug 41410: Fix circuit display sizing hack for opening sub-menus. 362c914b is described below commit 362c914b5630b30e9608a218880bffa3664693f4 Author: Henry Wilkes <henry(a)torproject.org> AuthorDate: Tue Nov 1 12:10:00 2022 +0000 Bug 41410: Fix circuit display sizing hack for opening sub-menus. We only apply our hack on popupshowing and popuphiding if the event target matches the panel popup. We also add a FIXME note since the sizing hack is fragile. We also use the "hidden" attribute to hide the circuit instead of setting the inline "display" style. --- chrome/content/tor-circuit-display.js | 27 ++++++++++++++++++--------- chrome/skin/tor-circuit-display.css | 6 +----- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/chrome/content/tor-circuit-display.js b/chrome/content/tor-circuit-display.js index e4b5ceea..76fb7454 100644 --- a/chrome/content/tor-circuit-display.js +++ b/chrome/content/tor-circuit-display.js @@ -266,9 +266,7 @@ let createTorCircuitDisplay = (function() { // __showCircuitDisplay(show)__. // If show === true, makes the circuit display visible. let showCircuitDisplay = function(show) { - document.getElementById("circuit-display-container").style.display = show - ? "block" - : "none"; + document.getElementById("circuit-display-container").hidden = !show; }; // __xmlTree(ns, data)__. @@ -404,8 +402,8 @@ let createTorCircuitDisplay = (function() { ]); // Hide the note about guards if we are using a bridge. - document.getElementById("circuit-guard-note-container").style.display = - nodeData[0].type === "bridge" ? "none" : "block"; + document.getElementById("circuit-guard-note-container").hidden = + nodeData[0].type === "bridge"; } else { // Only show the Tor circuit if we have credentials and node data. logger.eclog(4, "no SOCKS credentials found for current document."); @@ -473,7 +471,16 @@ let createTorCircuitDisplay = (function() { // __ensureCorrectPopupDimensions()__. // Make sure the identity popup always displays with the correct height. let ensureCorrectPopupDimensions = function() { - let setDimensions = () => { + // FIXME: This is hacking with the internals of the panel view, which also + // sets the width and height for transitions (see PanelMultiView.jsm), so + // this fix is fragile. + // Ideally the panel view would start using a non-XUL CSS layout, which + // would work regardless of the content. + let popupMenu = document.getElementById("identity-popup"); + let setDimensions = event => { + if (event.target !== popupMenu) { + return; + } setTimeout(() => { let view = document.querySelector( "#identity-popup-multiView .panel-viewcontainer" @@ -492,9 +499,12 @@ let createTorCircuitDisplay = (function() { view.setAttribute("width", newWidth); view.setAttribute("height", newHeight); } - }, 0); + }); }; - let removeDimensions = () => { + let removeDimensions = event => { + if (event.target !== popupMenu) { + return; + } let view = document.querySelector( "#identity-popup-multiView .panel-viewcontainer" ); @@ -509,7 +519,6 @@ let createTorCircuitDisplay = (function() { view2.style.minWidth = view2.style.maxWidth = ""; } }; - let popupMenu = document.getElementById("identity-popup"); popupMenu.addEventListener("popupshowing", setDimensions); popupMenu.addEventListener("popuphiding", removeDimensions); return () => { diff --git a/chrome/skin/tor-circuit-display.css b/chrome/skin/tor-circuit-display.css index c1dfcf79..4f03b882 100644 --- a/chrome/skin/tor-circuit-display.css +++ b/chrome/skin/tor-circuit-display.css @@ -53,7 +53,7 @@ and lines drawn between them to represent Tor network inter-relay connections. margin-bottom: 8px; } -#circuit-display-content > hbox { +#circuit-display-content > hbox:not([hidden]) { display: flex; } @@ -140,10 +140,6 @@ ul#circuit-display-nodes li:last-child { background-color: var(--button-primary-active-bgcolor); } -#circuit-guard-note-container { - -} - #circuit-guard-note-container div { margin-inline-start: 8px; } -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-102.4.0esr-12.0-2 updated (ab28234080bc -> 047ebcbe246c)
by gitolite role 08 Nov '22

08 Nov '22

This is an automated email from the git hooks/post-receive script. pierov pushed a change to branch tor-browser-102.4.0esr-12.0-2 in repository tor-browser. from ab28234080bc fixup! Bug 40933: Add tor-launcher functionality new e94b4fd243ec fixup! Bug 2176: Rebrand Firefox to TorBrowser new 047ebcbe246c fixup! Bug 10760: Integrate TorButton to TorBrowser core The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: browser/branding/alpha/locales/en-US/brand.dtd | 11 --------- browser/branding/alpha/locales/en-US/brand.ftl | 26 ---------------------- .../branding/alpha/locales/en-US/brand.properties | 14 ------------ browser/branding/alpha/locales/jar.mn | 8 +------ browser/branding/nightly/locales/en-US/brand.dtd | 2 +- browser/branding/nightly/locales/en-US/brand.ftl | 2 +- .../nightly/locales/en-US/brand.properties | 6 ++--- browser/branding/nightly/locales/jar.mn | 8 +------ browser/branding/official/locales/en-US/brand.dtd | 2 +- .../official/locales/en-US/brand.properties | 6 ++--- browser/branding/official/locales/jar.mn | 8 +------ browser/branding/unofficial/locales/jar.mn | 9 +------- mobile/android/branding/beta/locales/jar.mn | 9 +------- mobile/android/branding/nightly/locales/jar.mn | 9 +------- mobile/android/branding/official/locales/jar.mn | 9 +------- mobile/android/branding/unofficial/locales/jar.mn | 9 +------- toolkit/torproject/torbutton | 2 +- 17 files changed, 18 insertions(+), 122 deletions(-) delete mode 100644 browser/branding/alpha/locales/en-US/brand.dtd delete mode 100644 browser/branding/alpha/locales/en-US/brand.ftl delete mode 100644 browser/branding/alpha/locales/en-US/brand.properties -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 2

[tor-browser] branch tor-browser-102.4.0esr-12.0-2 updated: fixup! Bug 40933: Add tor-launcher functionality
by gitolite role 08 Nov '22

08 Nov '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch tor-browser-102.4.0esr-12.0-2 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-102.4.0esr-12.0-2 by this push: new ab28234080bc fixup! Bug 40933: Add tor-launcher functionality ab28234080bc is described below commit ab28234080bca4bebe36bcbee081fa63c6ccf661 Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Tue Nov 8 11:18:14 2022 +0100 fixup! Bug 40933: Add tor-launcher functionality Bug 41436: Fixed handling of settings array They were using a newline as a splitter, rather than repeating the key. Also, improved the logging to be more useful. Finally, linted again and switched from a `new Array` to `[]`. --- toolkit/components/tor-launcher/TorProtocolService.jsm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/toolkit/components/tor-launcher/TorProtocolService.jsm b/toolkit/components/tor-launcher/TorProtocolService.jsm index 3ccffd6883f5..de9c54c71137 100644 --- a/toolkit/components/tor-launcher/TorProtocolService.jsm +++ b/toolkit/components/tor-launcher/TorProtocolService.jsm @@ -233,11 +233,14 @@ const TorProtocolService = { this._returnConnection(); } else { // Connection is bad. + logger.warn( + "sendCommand returned an empty response, taking the connection as broken and closing it." + ); this._closeConnection(); } } } catch (e) { - logger.error("Cannot send a command", e); + logger.error(`Cannot send the command ${cmd}`, e); this._closeConnection(); } } catch (e) { @@ -299,7 +302,7 @@ const TorProtocolService = { if (valType === "boolean") { rv += val ? "1" : "0"; } else if (Array.isArray(val)) { - rv += val.map(TorParsers.escapeString).join("\n"); + rv += val.map(TorParsers.escapeString).join(` ${key}=`); } else if (valType === "string") { rv += TorParsers.escapeString(val); } else { @@ -666,7 +669,7 @@ const TorProtocolService = { const salt = Array.from(crypto.getRandomValues(new Uint8Array(8))); // Convert hex-encoded password to an array of bytes. - const password = new Array(); + const password = []; for (let i = 0; i < aHexPassword.length; i += 2) { password.push(parseInt(aHexPassword.substring(i, i + 2), 16)); } -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch maint-11.5 updated: Bug 40622: Update obfs4proxy 0.0.14
by gitolite role 08 Nov '22

08 Nov '22

This is an automated email from the git hooks/post-receive script. boklm pushed a commit to branch maint-11.5 in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/maint-11.5 by this push: new 01f22b55 Bug 40622: Update obfs4proxy 0.0.14 01f22b55 is described below commit 01f22b559060db64f1c8f34d1d967f14de3f8faf Author: meskio <meskio(a)torproject.org> AuthorDate: Thu Oct 20 20:11:02 2022 +0200 Bug 40622: Update obfs4proxy 0.0.14 Use our own copy of the repo that includes uTLS support. --- projects/{gocompress => andybalholm-brotli}/config | 9 ++--- projects/gobsaes/config | 30 ----------------- projects/goutls/config | 38 ---------------------- projects/goxcrypto/config | 2 +- projects/goxnet/config | 2 +- projects/{gocompress => klauspost-compress}/config | 9 ++--- projects/obfs4/build | 2 +- projects/obfs4/config | 12 +++---- projects/refraction-utls/config | 11 ++++++- 9 files changed, 29 insertions(+), 86 deletions(-) diff --git a/projects/gocompress/config b/projects/andybalholm-brotli/config similarity index 63% copy from projects/gocompress/config copy to projects/andybalholm-brotli/config index 799c6b63..7b695cf2 100644 --- a/projects/gocompress/config +++ b/projects/andybalholm-brotli/config @@ -1,15 +1,16 @@ # vim: filetype=yaml sw=2 -version: '[% c("abbrev") %]' -git_url: https://github.com/dsnet/compress -git_hash: cc9eb1d7ad760af14e8f918698f745e80377af4f +version: 1.0.4 +git_url: https://github.com/andybalholm/brotli.git +git_hash: '1d750214c25205863625bb3eb8190a51b2cef26d' filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + container: use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - go_lib: github.com/dsnet/compress + go_lib: github.com/andybalholm/brotli input_files: - project: container-image diff --git a/projects/gobsaes/config b/projects/gobsaes/config deleted file mode 100644 index a3d2b280..00000000 --- a/projects/gobsaes/config +++ /dev/null @@ -1,30 +0,0 @@ -# vim: filetype=yaml sw=2 -git_url: https://gitlab.com/yawning/bsaes.git -version: '[% c("abbrev") %]' -git_hash: 0a714cd429ec754482b4001e918db30cd2094405 -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -container: - use_container: 1 - -build: '[% c("projects/go/var/build_go_lib") %]' - -var: - go_lib: gitlab.com/yawning/bsaes.git - go_lib_deps: - - goxsys - -targets: - android: - var: - build_go_lib_pre: | - [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] - -input_files: - - project: container-image - - name: go - project: go - - name: goxsys - project: goxsys - - name: '[% c("var/compiler") %]' - project: '[% c("var/compiler") %]' - enable: '[% c("var/android") %]' diff --git a/projects/goutls/config b/projects/goutls/config deleted file mode 100644 index 91df0b7c..00000000 --- a/projects/goutls/config +++ /dev/null @@ -1,38 +0,0 @@ -# vim: filetype=yaml sw=2 -git_url: https://gitlab.com/yawning/utls.git -version: 0.0.12-1 -git_hash: 'v[% c("version") %]' -tag_gpg_id: 1 -gpg_keyring: yawning.gpg -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -container: - use_container: 1 - -build: '[% c("projects/go/var/build_go_lib") %]' - -var: - go_lib: gitlab.com/yawning/utls.git - go_lib_deps: - - goxcrypto - - gocompress - - gobsaes - -targets: - android: - var: - build_go_lib_pre: | - [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] - -input_files: - - project: container-image - - name: go - project: go - - name: goxcrypto - project: goxcrypto - - name: gocompress - project: gocompress - - name: gobsaes - project: gobsaes - - name: '[% c("var/compiler") %]' - project: '[% c("var/compiler") %]' - enable: '[% c("var/android") %]' diff --git a/projects/goxcrypto/config b/projects/goxcrypto/config index 036cc869..a10ae9a0 100644 --- a/projects/goxcrypto/config +++ b/projects/goxcrypto/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://go.googlesource.com/crypto -git_hash: 69ecbb4d6d5dab05e49161c6e77ea40a030884e1 +git_hash: c86fa9a7ed909e2f2a8ab8298254fca727aba16a filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' container: use_container: 1 diff --git a/projects/goxnet/config b/projects/goxnet/config index 77813dd3..7ae6e784 100644 --- a/projects/goxnet/config +++ b/projects/goxnet/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://go.googlesource.com/net -git_hash: da137c7871d730100384dbcf36e6f8fa493aef5b +git_hash: bea034e7d591acfddd606603cf48fae48bbdd340 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' container: use_container: 1 diff --git a/projects/gocompress/config b/projects/klauspost-compress/config similarity index 63% rename from projects/gocompress/config rename to projects/klauspost-compress/config index 799c6b63..44461f9d 100644 --- a/projects/gocompress/config +++ b/projects/klauspost-compress/config @@ -1,15 +1,16 @@ # vim: filetype=yaml sw=2 -version: '[% c("abbrev") %]' -git_url: https://github.com/dsnet/compress -git_hash: cc9eb1d7ad760af14e8f918698f745e80377af4f +version: 1.15.9 +git_url: https://github.com/klauspost/compress.git +git_hash: '9559b037e79ad673c71f6ef7c732c00949014cd2' filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + container: use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - go_lib: github.com/dsnet/compress + go_lib: github.com/klauspost/compress input_files: - project: container-image diff --git a/projects/obfs4/build b/projects/obfs4/build index 3aa2167e..93ff80f1 100644 --- a/projects/obfs4/build +++ b/projects/obfs4/build @@ -18,7 +18,7 @@ tar -C /var/tmp/dist -xf [% c('input_files_by_name/edwards25519-extra') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/siphash') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxcrypto') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxnet') %] -tar -C /var/tmp/dist -xf [% c('input_files_by_name/goutls') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/refraction-utls') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxtext') %] mkdir -p /var/tmp/build diff --git a/projects/obfs4/config b/projects/obfs4/config index 99041b90..f8a34092 100644 --- a/projects/obfs4/config +++ b/projects/obfs4/config @@ -1,9 +1,9 @@ # vim: filetype=yaml sw=2 -version: 0.0.12 -git_url: https://gitlab.com/yawning/obfs4.git +version: 0.0.14-tor2 +git_url: https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/obfs… git_hash: 'obfs4proxy-[% c("version") %]' tag_gpg_id: 1 -gpg_keyring: yawning.gpg +gpg_keyring: anti-censorship.gpg filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' container: @@ -11,7 +11,7 @@ container: targets: nightly: - git_hash: master + git_hash: main version: '[% c("abbrev") %]' tag_gpg_id: 0 @@ -31,8 +31,8 @@ input_files: project: goxcrypto - name: goxnet project: goxnet - - name: goutls - project: goutls + - name: refraction-utls + project: refraction-utls - name: goxtext project: goxtext - name: '[% c("var/compiler") %]' diff --git a/projects/refraction-utls/config b/projects/refraction-utls/config index c354437b..7991d982 100644 --- a/projects/refraction-utls/config +++ b/projects/refraction-utls/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/refraction-networking/utls -git_hash: 0b2885c8c0d4467cfe98136748a9d011d0b8fff0 #v1.0.0 +git_hash: 862fe372d939c53bb10cb4fd11263f3766589892 #v1.1.5 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' container: use_container: 1 @@ -12,6 +12,9 @@ var: go_lib: github.com/refraction-networking/utls go_lib_deps: - goxcrypto + - goxnet + - klauspost-compress + - andybalholm-brotli input_files: - project: container-image @@ -19,3 +22,9 @@ input_files: project: go - name: goxcrypto project: goxcrypto + - name: goxnet + project: goxnet + - name: klauspost-compress + project: klauspost-compress + - name: andybalholm-brotli + project: andybalholm-brotli -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch main updated: Bug 40622: Update obfs4proxy 0.0.14
by gitolite role 08 Nov '22

08 Nov '22

This is an automated email from the git hooks/post-receive script. boklm pushed a commit to branch main in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/main by this push: new 02d54d8c Bug 40622: Update obfs4proxy 0.0.14 02d54d8c is described below commit 02d54d8cb233b34c167d7a246e6e34fafcb604af Author: meskio <meskio(a)torproject.org> AuthorDate: Thu Oct 20 20:11:02 2022 +0200 Bug 40622: Update obfs4proxy 0.0.14 Use our own copy of the repo that includes uTLS support. --- projects/{gocompress => andybalholm-brotli}/config | 9 ++--- projects/gobsaes/config | 30 ----------------- projects/goutls/config | 38 ---------------------- projects/goxcrypto/config | 2 +- projects/goxnet/config | 2 +- projects/{gocompress => klauspost-compress}/config | 9 ++--- projects/obfs4/build | 2 +- projects/obfs4/config | 12 +++---- projects/refraction-utls/config | 11 ++++++- 9 files changed, 29 insertions(+), 86 deletions(-) diff --git a/projects/gocompress/config b/projects/andybalholm-brotli/config similarity index 63% copy from projects/gocompress/config copy to projects/andybalholm-brotli/config index 799c6b63..7b695cf2 100644 --- a/projects/gocompress/config +++ b/projects/andybalholm-brotli/config @@ -1,15 +1,16 @@ # vim: filetype=yaml sw=2 -version: '[% c("abbrev") %]' -git_url: https://github.com/dsnet/compress -git_hash: cc9eb1d7ad760af14e8f918698f745e80377af4f +version: 1.0.4 +git_url: https://github.com/andybalholm/brotli.git +git_hash: '1d750214c25205863625bb3eb8190a51b2cef26d' filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + container: use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - go_lib: github.com/dsnet/compress + go_lib: github.com/andybalholm/brotli input_files: - project: container-image diff --git a/projects/gobsaes/config b/projects/gobsaes/config deleted file mode 100644 index a3d2b280..00000000 --- a/projects/gobsaes/config +++ /dev/null @@ -1,30 +0,0 @@ -# vim: filetype=yaml sw=2 -git_url: https://gitlab.com/yawning/bsaes.git -version: '[% c("abbrev") %]' -git_hash: 0a714cd429ec754482b4001e918db30cd2094405 -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -container: - use_container: 1 - -build: '[% c("projects/go/var/build_go_lib") %]' - -var: - go_lib: gitlab.com/yawning/bsaes.git - go_lib_deps: - - goxsys - -targets: - android: - var: - build_go_lib_pre: | - [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] - -input_files: - - project: container-image - - name: go - project: go - - name: goxsys - project: goxsys - - name: '[% c("var/compiler") %]' - project: '[% c("var/compiler") %]' - enable: '[% c("var/android") %]' diff --git a/projects/goutls/config b/projects/goutls/config deleted file mode 100644 index 91df0b7c..00000000 --- a/projects/goutls/config +++ /dev/null @@ -1,38 +0,0 @@ -# vim: filetype=yaml sw=2 -git_url: https://gitlab.com/yawning/utls.git -version: 0.0.12-1 -git_hash: 'v[% c("version") %]' -tag_gpg_id: 1 -gpg_keyring: yawning.gpg -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -container: - use_container: 1 - -build: '[% c("projects/go/var/build_go_lib") %]' - -var: - go_lib: gitlab.com/yawning/utls.git - go_lib_deps: - - goxcrypto - - gocompress - - gobsaes - -targets: - android: - var: - build_go_lib_pre: | - [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] - -input_files: - - project: container-image - - name: go - project: go - - name: goxcrypto - project: goxcrypto - - name: gocompress - project: gocompress - - name: gobsaes - project: gobsaes - - name: '[% c("var/compiler") %]' - project: '[% c("var/compiler") %]' - enable: '[% c("var/android") %]' diff --git a/projects/goxcrypto/config b/projects/goxcrypto/config index 036cc869..a10ae9a0 100644 --- a/projects/goxcrypto/config +++ b/projects/goxcrypto/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://go.googlesource.com/crypto -git_hash: 69ecbb4d6d5dab05e49161c6e77ea40a030884e1 +git_hash: c86fa9a7ed909e2f2a8ab8298254fca727aba16a filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' container: use_container: 1 diff --git a/projects/goxnet/config b/projects/goxnet/config index 77813dd3..7ae6e784 100644 --- a/projects/goxnet/config +++ b/projects/goxnet/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://go.googlesource.com/net -git_hash: da137c7871d730100384dbcf36e6f8fa493aef5b +git_hash: bea034e7d591acfddd606603cf48fae48bbdd340 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' container: use_container: 1 diff --git a/projects/gocompress/config b/projects/klauspost-compress/config similarity index 63% rename from projects/gocompress/config rename to projects/klauspost-compress/config index 799c6b63..44461f9d 100644 --- a/projects/gocompress/config +++ b/projects/klauspost-compress/config @@ -1,15 +1,16 @@ # vim: filetype=yaml sw=2 -version: '[% c("abbrev") %]' -git_url: https://github.com/dsnet/compress -git_hash: cc9eb1d7ad760af14e8f918698f745e80377af4f +version: 1.15.9 +git_url: https://github.com/klauspost/compress.git +git_hash: '9559b037e79ad673c71f6ef7c732c00949014cd2' filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + container: use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - go_lib: github.com/dsnet/compress + go_lib: github.com/klauspost/compress input_files: - project: container-image diff --git a/projects/obfs4/build b/projects/obfs4/build index d063d4f1..acd62b61 100644 --- a/projects/obfs4/build +++ b/projects/obfs4/build @@ -17,7 +17,7 @@ tar -C /var/tmp/dist -xf [% c('input_files_by_name/edwards25519-extra') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/siphash') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxcrypto') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxnet') %] -tar -C /var/tmp/dist -xf [% c('input_files_by_name/goutls') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/refraction-utls') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxtext') %] mkdir -p /var/tmp/build diff --git a/projects/obfs4/config b/projects/obfs4/config index 99041b90..f8a34092 100644 --- a/projects/obfs4/config +++ b/projects/obfs4/config @@ -1,9 +1,9 @@ # vim: filetype=yaml sw=2 -version: 0.0.12 -git_url: https://gitlab.com/yawning/obfs4.git +version: 0.0.14-tor2 +git_url: https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/obfs… git_hash: 'obfs4proxy-[% c("version") %]' tag_gpg_id: 1 -gpg_keyring: yawning.gpg +gpg_keyring: anti-censorship.gpg filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' container: @@ -11,7 +11,7 @@ container: targets: nightly: - git_hash: master + git_hash: main version: '[% c("abbrev") %]' tag_gpg_id: 0 @@ -31,8 +31,8 @@ input_files: project: goxcrypto - name: goxnet project: goxnet - - name: goutls - project: goutls + - name: refraction-utls + project: refraction-utls - name: goxtext project: goxtext - name: '[% c("var/compiler") %]' diff --git a/projects/refraction-utls/config b/projects/refraction-utls/config index c354437b..7991d982 100644 --- a/projects/refraction-utls/config +++ b/projects/refraction-utls/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/refraction-networking/utls -git_hash: 0b2885c8c0d4467cfe98136748a9d011d0b8fff0 #v1.0.0 +git_hash: 862fe372d939c53bb10cb4fd11263f3766589892 #v1.1.5 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' container: use_container: 1 @@ -12,6 +12,9 @@ var: go_lib: github.com/refraction-networking/utls go_lib_deps: - goxcrypto + - goxnet + - klauspost-compress + - andybalholm-brotli input_files: - project: container-image @@ -19,3 +22,9 @@ input_files: project: go - name: goxcrypto project: goxcrypto + - name: goxnet + project: goxnet + - name: klauspost-compress + project: klauspost-compress + - name: andybalholm-brotli + project: andybalholm-brotli -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-102.4.0esr-12.0-2 updated: fixup! Bug 40597: Implement TorSettings module
by gitolite role 07 Nov '22

07 Nov '22

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

tbb-commits November 2022