- tbb-commits - lists.torproject.org

[tor-browser-build/maint-10.5] Bug 40358: Make OpenSSL 1.1.1l buildable for macOS
by sysrqb＠torproject.org 03 Sep '21

03 Sep '21

commit 269b0bf650e10d830f46b50ad298f4523e1eae51 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Sep 3 20:51:55 2021 +0000 Bug 40358: Make OpenSSL 1.1.1l buildable for macOS --- .../0001-Revert-apple-getentropy-removal.patch | 39 ++++++++++++++++++++++ projects/openssl/build | 1 + projects/openssl/config | 2 ++ 3 files changed, 42 insertions(+) diff --git a/projects/openssl/0001-Revert-apple-getentropy-removal.patch b/projects/openssl/0001-Revert-apple-getentropy-removal.patch new file mode 100644 index 0000000..d101203 --- /dev/null +++ b/projects/openssl/0001-Revert-apple-getentropy-removal.patch @@ -0,0 +1,39 @@ +From 8b9e95ae8a9d81b1942be28cba95c35f2303ee2d Mon Sep 17 00:00:00 2001 +From: Matthew Finkel <sysrqb(a)torproject.org> +Date: Fri, 3 Sep 2021 20:48:53 +0000 +Subject: [PATCH] Revert "apple getentropy removal" + +This reverts commit b58ac9f1e3f828b5c65c9edd5bb86603a4886a26. +--- + crypto/rand/rand_unix.c | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c +index 43f1069d15..2dfced2052 100644 +--- a/crypto/rand/rand_unix.c ++++ b/crypto/rand/rand_unix.c +@@ -34,9 +34,6 @@ + #if defined(__OpenBSD__) + # include <sys/param.h> + #endif +-#if defined(__APPLE__) +-# include <CommonCrypto/CommonRandom.h> +-#endif + + #if defined(OPENSSL_SYS_UNIX) || defined(__DJGPP__) + # include <sys/types.h> +@@ -381,11 +378,6 @@ static ssize_t syscall_random(void *buf, size_t buflen) + if (errno != ENOSYS) + return -1; + } +-# elif defined(__APPLE__) +- if (CCRandomGenerateBytes(buf, buflen) == kCCSuccess) +- return (ssize_t)buflen; +- +- return -1; + # else + union { + void *p; +-- +2.25.1 + diff --git a/projects/openssl/build b/projects/openssl/build index f8c4cbf..bf0b16f 100644 --- a/projects/openssl/build +++ b/projects/openssl/build @@ -12,6 +12,7 @@ export CC='gcc -m32' # Tricking OpenSSL into using our clang as cross-compiler ln -s $clangdir/bin/clang $clangdir/bin/x86_64-apple-darwin-cc export CC="cc [% c("var/FLAGS") %]" + patch -p1 < $rootdir/0001-Revert-apple-getentropy-removal.patch [% END -%] export SOURCE_DATE_EPOCH='[% c("timestamp") %]' ./Configure [% c('var/configure_opts') %] diff --git a/projects/openssl/config b/projects/openssl/config index e679b0b..f0f6ef3 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -32,3 +32,5 @@ input_files: project: '[% c("var/compiler") %]' - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz' sha256sum: 0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1 + - filename: 0001-Revert-apple-getentropy-removal.patch + enable: '[% c("var/osx") %]'

1 0

[tor-browser-build/maint-10.5] Release preparations for 10.5.6
by sysrqb＠torproject.org 03 Sep '21

03 Sep '21

commit 9cc5fc9e707cbb1f1b2fb39e1e128e34fd76815a Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Sep 2 03:18:45 2021 +0000 Release preparations for 10.5.6 Version and Changelog updates --- projects/firefox/config | 4 ++-- projects/openssl/config | 4 ++-- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 5 +++++ rbm.conf | 5 ++--- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 44e9933..28bed9c 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,14 +1,14 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 78.13.0 + firefox_platform_version: 78.14.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 10.5 branding_directory: 'browser/branding/alpha' diff --git a/projects/openssl/config b/projects/openssl/config index 09a8407..e679b0b 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.1.1k +version: 1.1.1l filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: @@ -31,4 +31,4 @@ input_files: - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz' - sha256sum: 892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5 + sha256sum: 0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index cde8d6b..a039c19 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,8 @@ +Tor Browser 10.5.6 -- September 7 2021 + * Windows + OS X + Linux + * Update Openssl to 1.1.1l + * Update Firefox to 78.14.0esr + Tor Browser 10.5.5 -- August 18 2021 * All Platforms * Update Tor to 0.4.5.10 diff --git a/rbm.conf b/rbm.conf index bdb14ab..560db9b 100644 --- a/rbm.conf +++ b/rbm.conf @@ -57,11 +57,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '10.5.5' + torbrowser_version: '10.5.6' torbrowser_build: 'build1' torbrowser_incremental_from: - - 10.5.2 - - 10.5.4 + - 10.5.5 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/master] Release preparations for 11.0a6
by sysrqb＠torproject.org 01 Sep '21

01 Sep '21

commit f10140fb87c2538d55ad471681f2e07c5bdf1c55 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Aug 31 21:15:27 2021 +0000 Release preparations for 11.0a6 Version and Changelog updates --- projects/geckoview/config | 4 +- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 + projects/tor-browser/allowed_addons.json | 160 +++++++++++---------- rbm.conf | 2 +- 4 files changed, 89 insertions(+), 81 deletions(-) diff --git a/projects/geckoview/config b/projects/geckoview/config index 400d9d3..e25939e 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -1,14 +1,14 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'geckoview-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -git_hash: 'tor-browser-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +git_hash: 'tor-browser-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-1-build2' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 gpg_keyring: torbutton.gpg var: - geckoview_version: 91.0 + geckoview_version: 92.0b9 torbrowser_branch: 11.0 copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' deps: diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index b1ac5f9..b74f7a5 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,7 @@ +Tor Browser 11.0a6 -- September 2 2021 + * Android + * Bug 40611: Rebase geckoview patches onto 92.0b9 [tor-browser] + Tor Browser 11.0a5 -- August 22 2021 * All Platforms * Update Tor to 0.4.6.7 diff --git a/projects/tor-browser/allowed_addons.json b/projects/tor-browser/allowed_addons.json index 1982ed7..d6b10b8 100644 --- a/projects/tor-browser/allowed_addons.json +++ b/projects/tor-browser/allowed_addons.json @@ -17,7 +17,7 @@ "picture_url": "https://addons.cdn.mozilla.net/user-media/userpics/13/13299/13299734.png?mo…" } ], - "average_daily_users": 644430, + "average_daily_users": 661457, "categories": { "android": [ "experimental", @@ -237,10 +237,10 @@ "category": "recommended" }, "ratings": { - "average": 4.5625, - "bayesian_average": 4.561144198825585, - "count": 3781, - "text_count": 1229 + "average": 4.5641, + "bayesian_average": 4.562755895987041, + "count": 3838, + "text_count": 1244 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/reviews/", "requires_payment": false, @@ -329,7 +329,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/versions/", - "weekly_downloads": 20979 + "weekly_downloads": 21102 }, "notes": null }, @@ -345,7 +345,7 @@ "picture_url": "https://addons.cdn.mozilla.net/user-media/userpics/5/5474/5474073.png?modif…" } ], - "average_daily_users": 698997, + "average_daily_users": 704025, "categories": { "android": [ "security-privacy" @@ -478,10 +478,10 @@ "category": "recommended" }, "ratings": { - "average": 4.6638, - "bayesian_average": 4.661285021224816, - "count": 2091, - "text_count": 414 + "average": 4.6632, + "bayesian_average": 4.66069632192248, + "count": 2111, + "text_count": 415 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/https-everywhere/reviews/", "requires_payment": false, @@ -508,7 +508,7 @@ "type": "extension", "url": "https://www.eff.org/https-everywhere", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/https-everywhere/versions/", - "weekly_downloads": 13184 + "weekly_downloads": 12652 }, "notes": null }, @@ -524,7 +524,7 @@ "picture_url": "https://addons.cdn.mozilla.net/user-media/userpics/6/6937/6937656.png?modif…" } ], - "average_daily_users": 203826, + "average_daily_users": 207951, "categories": { "android": [ "security-privacy" @@ -737,10 +737,10 @@ "category": "recommended" }, "ratings": { - "average": 4.8026, - "bayesian_average": 4.797832558455313, - "count": 1140, - "text_count": 221 + "average": 4.8002, + "bayesian_average": 4.795452199110953, + "count": 1151, + "text_count": 223 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/reviews/", "requires_payment": false, @@ -814,11 +814,16 @@ "zh-CN": "https://decentraleyes.org", "zh-TW": "https://decentraleyes.org" }, - "tags": [], + "tags": [ + "anti tracker", + "content blocker", + "privacy", + "security" + ], "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/versions/", - "weekly_downloads": 4748 + "weekly_downloads": 4400 }, "notes": null }, @@ -834,7 +839,7 @@ "picture_url": "https://addons.cdn.mozilla.net/user-media/userpics/5/5474/5474073.png?modif…" } ], - "average_daily_users": 919041, + "average_daily_users": 928678, "categories": { "android": [ "security-privacy" @@ -846,7 +851,7 @@ "contributions_url": "https://www.paypal.me/SupportEFF?utm_content=product-page-contribute&utm_me…", "created": "2014-05-01T18:23:16Z", "current_version": { - "id": 5247789, + "id": 5282284, "compatibility": { "firefox": { "min": "52.0", @@ -857,19 +862,19 @@ "max": "*" } }, - "edit_url": "https://addons.mozilla.org/en-US/developers/addon/privacy-badger17/versions…", + "edit_url": "https://addons.mozilla.org/en-US/developers/addon/privacy-badger17/versions…", "files": [ { - "id": 3792149, - "created": "2021-06-08T18:48:00Z", - "hash": "sha256:72579f77035a5146b7332e39a28063c6bb48ca7284d5b1383cab24dca65372a8", + "id": 3826636, + "created": "2021-08-17T21:36:14Z", + "hash": "sha256:b7a4ad974856a4a1e1dd286d67f3e029bb74036e6b6f518451c2a1640bf769da", "is_restart_required": false, "is_webextension": true, "is_mozilla_signed_extension": false, "platform": "all", - "size": 1379278, + "size": 1381527, "status": "public", - "url": "https://addons.mozilla.org/firefox/downloads/file/3792149/privacy_badger-20…", + "url": "https://addons.mozilla.org/firefox/downloads/file/3826636/privacy_badger-20…", "permissions": [ "tabs", "http://*/*", @@ -878,7 +883,6 @@ "webRequest", "webRequestBlocking", "storage", - "cookies", "privacy", "https://*.facebook.com/*", "http://*.facebook.com/*", @@ -1305,10 +1309,10 @@ "url": "http://www.gnu.org/licenses/gpl-3.0.html" }, "release_notes": { - "en-US": "<ul><li>Disabled Google's Federated Learning of Cohorts (FLoC). To learn more, visit <a href=\"https://outgoing.prod.mozaws.net/v1/b53e836b99444d8d9da04dc38e94534a6331295…" rel=\"nofollow\">https://www.eff.org/deeplinks/2021/03/googles-floc-terrible-idea</a></li><li>Improved tracker detection and blocking by looking up known CNAME tracker aliases. Thanks to AdGuard for providing the CNAME DNS data behind this feature.</li><li>You can now see in the popup when first-party protections such as link unwrapping are active on the site you are on</li><li>Fixed various site breakages</li><li>Added Greek and Hungarian translations</li><li>Improved translations (Simplified Chinese, Esperanto, Hebrew, Korean, European Portuguese, Turkish, Swedish)</li></ul>" + "en-US": "2021.8.17 is a bug fix release to fix link clicking on various websites. Notes for 2021.8.11:\n\n<ul><li>Improved buttons in the popup: Disable and Report are larger and use less text, Donate is now a link</li><li>Removed \"Prevent WebRTC from leaking local IP address\" from the options page. If you previously enabled this setting, it remains available for now. However, the setting is now deprecated and will be removed in a future update. To learn more, visit <a href=\"https://outgoing.prod.mozaws.net/v1/af49a1a8134f54e070543c835f324c55c326cee…" rel=\"nofollow\">https://github.com/EFForg/privacybadger/issues/2782</a></li><li>Improved dark theme in Chrome</li><li>Fixed various site breakages</li><li>Improved translations (Simplified Chinese, Esperanto, French, German, Greek, Hebrew, Italian, Polish, Spanish, Swedish, Ukrainian)</li></ul>" }, "reviewed": null, - "version": "2021.6.8" + "version": "2021.8.17" }, "default_locale": "en-US", "description": { @@ -1332,7 +1336,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2021-06-10T13:59:18Z", + "last_updated": "2021-08-18T09:03:50Z", "name": { "en-US": "Privacy Badger" }, @@ -1378,10 +1382,10 @@ "category": "recommended" }, "ratings": { - "average": 4.79, - "bayesian_average": 4.787096578335282, - "count": 1867, - "text_count": 372 + "average": 4.7917, + "bayesian_average": 4.788806543982308, + "count": 1887, + "text_count": 376 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/reviews/", "requires_payment": false, @@ -1405,7 +1409,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/versions/", - "weekly_downloads": 16478 + "weekly_downloads": 15952 }, "notes": null }, @@ -1421,7 +1425,7 @@ "picture_url": null } ], - "average_daily_users": 4802067, + "average_daily_users": 4899877, "categories": { "android": [ "security-privacy" @@ -1605,7 +1609,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2021-08-03T18:10:45Z", + "last_updated": "2021-08-27T15:05:49Z", "name": { "ar": "uBlock Origin", "bg": "uBlock Origin", @@ -1750,10 +1754,10 @@ "category": "recommended" }, "ratings": { - "average": 4.7677, - "bayesian_average": 4.767258229630384, - "count": 12211, - "text_count": 3334 + "average": 4.7674, + "bayesian_average": 4.766958863380986, + "count": 12311, + "text_count": 3351 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/reviews/", "requires_payment": false, @@ -1808,7 +1812,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/versions/", - "weekly_downloads": 104095 + "weekly_downloads": 113962 }, "notes": null }, @@ -1824,7 +1828,7 @@ "picture_url": null } ], - "average_daily_users": 75482, + "average_daily_users": 78944, "categories": { "android": [ "photos-media" @@ -1944,10 +1948,10 @@ "category": "recommended" }, "ratings": { - "average": 4.5214, - "bayesian_average": 4.5163761769011925, - "count": 1007, - "text_count": 382 + "average": 4.5203, + "bayesian_average": 4.51525768651512, + "count": 1009, + "text_count": 381 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/re…", "requires_payment": false, @@ -1969,7 +1973,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/ve…", - "weekly_downloads": 252 + "weekly_downloads": 349 }, "notes": null }, @@ -1985,7 +1989,7 @@ "picture_url": null } ], - "average_daily_users": 95478, + "average_daily_users": 95431, "categories": { "android": [ "experimental", @@ -2124,10 +2128,10 @@ "category": "recommended" }, "ratings": { - "average": 4.4567, - "bayesian_average": 4.4419080387168455, - "count": 335, - "text_count": 94 + "average": 4.4718, + "bayesian_average": 4.456933270509478, + "count": 337, + "text_count": 95 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/reviews/", "requires_payment": false, @@ -2147,7 +2151,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/versions/", - "weekly_downloads": 1498 + "weekly_downloads": 1484 }, "notes": null }, @@ -2163,7 +2167,7 @@ "picture_url": "https://addons.cdn.mozilla.net/user-media/userpics/12/12929/12929064.png?mo…" } ], - "average_daily_users": 184338, + "average_daily_users": 186586, "categories": { "android": [ "photos-media", @@ -2385,10 +2389,10 @@ "category": "recommended" }, "ratings": { - "average": 4.6538, - "bayesian_average": 4.648338870899628, - "count": 959, - "text_count": 188 + "average": 4.655, + "bayesian_average": 4.649572141760124, + "count": 971, + "text_count": 193 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/reviews/", "requires_payment": false, @@ -2409,7 +2413,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/versions/", - "weekly_downloads": 5098 + "weekly_downloads": 3454 }, "notes": null }, @@ -2432,7 +2436,7 @@ "picture_url": null } ], - "average_daily_users": 54815, + "average_daily_users": 58115, "categories": { "android": [ "other" @@ -2714,9 +2718,9 @@ "category": "recommended" }, "ratings": { - "average": 4.4583, - "bayesian_average": 4.4534654745605655, - "count": 1030, + "average": 4.4575, + "bayesian_average": 4.452669484127272, + "count": 1036, "text_count": 281 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/reviews/", @@ -2737,7 +2741,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/versions/", - "weekly_downloads": 23 + "weekly_downloads": 29 }, "notes": null }, @@ -2753,7 +2757,7 @@ "picture_url": "https://addons.cdn.mozilla.net/user-media/userpics/0/0/143.png?modified=150…" } ], - "average_daily_users": 352126, + "average_daily_users": 351112, "categories": { "android": [ "performance", @@ -2890,7 +2894,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2021-07-29T21:05:38Z", + "last_updated": "2021-08-25T21:20:48Z", "name": { "de": "NoScript", "el": "NoScript", @@ -2978,9 +2982,9 @@ "category": "recommended" }, "ratings": { - "average": 4.3841, - "bayesian_average": 4.381399656724418, - "count": 1807, + "average": 4.3838, + "bayesian_average": 4.381087184465328, + "count": 1811, "text_count": 722 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/reviews/", @@ -3017,7 +3021,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/versions/", - "weekly_downloads": 8077 + "weekly_downloads": 8234 }, "notes": null }, @@ -3033,7 +3037,7 @@ "picture_url": null } ], - "average_daily_users": 121156, + "average_daily_users": 122541, "categories": { "android": [ "performance", @@ -3166,10 +3170,10 @@ "category": "recommended" }, "ratings": { - "average": 3.9103, - "bayesian_average": 3.906014033763375, - "count": 992, - "text_count": 359 + "average": 3.9125, + "bayesian_average": 3.9081909928823353, + "count": 994, + "text_count": 358 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/revi…", "requires_payment": false, @@ -3188,7 +3192,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/vers…", - "weekly_downloads": 1948 + "weekly_downloads": 1402 }, "notes": null } diff --git a/rbm.conf b/rbm.conf index 187e297..1d6effc 100644 --- a/rbm.conf +++ b/rbm.conf @@ -57,7 +57,7 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '11.0a5' + torbrowser_version: '11.0a6' torbrowser_build: 'build1' torbrowser_incremental_from: - 11.0a4

1 0

[tor-browser/tor-browser-92.0b9-11.0-1] Revert "fixup! Bug 10760: Integrate TorButton to TorBrowser core"
by sysrqb＠torproject.org 31 Aug '21

31 Aug '21

commit 9a2c11034ad6789cc48c2ecb8511522cb3ea7860 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Aug 31 23:07:06 2021 +0000 Revert "fixup! Bug 10760: Integrate TorButton to TorBrowser core" This reverts commit 4793b1605fd68413712b6490433e4eafc69e282e. --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 0197c6fec132..5264bddf8bc7 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 0197c6fec132dd0d672fb1f13b5cdb3ad58c57b7 +Subproject commit 5264bddf8bc71cbb4e88921b55e7b95fa4522b69

1 0

[tor-browser/tor-browser-92.0b9-11.0-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by sysrqb＠torproject.org 31 Aug '21

31 Aug '21

commit 4793b1605fd68413712b6490433e4eafc69e282e Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Aug 27 20:56:14 2021 +0000 fixup! Bug 10760: Integrate TorButton to TorBrowser core --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 5264bddf8bc7..0197c6fec132 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 5264bddf8bc71cbb4e88921b55e7b95fa4522b69 +Subproject commit 0197c6fec132dd0d672fb1f13b5cdb3ad58c57b7

1 0

[tor-browser/tor-browser-92.0b9-11.0-1] Bug 40171: Make WebRequest and GeckoWebExecutor First-Party aware
by sysrqb＠torproject.org 31 Aug '21

31 Aug '21

commit 4f8120aa0b6892ad17c54c88bc38c215043c8a97 Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Nov 4 15:58:22 2020 +0100 Bug 40171: Make WebRequest and GeckoWebExecutor First-Party aware --- .../main/java/org/mozilla/geckoview/WebRequest.java | 18 ++++++++++++++++++ widget/android/WebExecutorSupport.cpp | 10 ++++++++++ 2 files changed, 28 insertions(+) diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebRequest.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebRequest.java index d1d6e06b7396..4e17bc034edb 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebRequest.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebRequest.java @@ -51,6 +51,11 @@ public class WebRequest extends WebMessage { */ public final @Nullable String referrer; + /** + * The value of the origin of this request. + */ + public final @Nullable String origin; + @Retention(RetentionPolicy.SOURCE) @IntDef({CACHE_MODE_DEFAULT, CACHE_MODE_NO_STORE, CACHE_MODE_RELOAD, CACHE_MODE_NO_CACHE, @@ -112,6 +117,7 @@ public class WebRequest extends WebMessage { method = builder.mMethod; cacheMode = builder.mCacheMode; referrer = builder.mReferrer; + origin = builder.mOrigin; if (builder.mBody != null) { body = builder.mBody.asReadOnlyBuffer(); @@ -128,6 +134,7 @@ public class WebRequest extends WebMessage { /* package */ String mMethod = "GET"; /* package */ int mCacheMode = CACHE_MODE_DEFAULT; /* package */ String mReferrer; + /* package */ String mOrigin; /** * Construct a Builder instance with the specified URI. @@ -226,6 +233,17 @@ public class WebRequest extends WebMessage { return this; } + /** + * Set the origin URI. + * + * @param origin A URI String + * @return This Builder instance. + */ + public @NonNull Builder origin(final @Nullable String origin) { + mOrigin = origin; + return this; + } + /** * @return A {@link WebRequest} constructed with the values from this Builder instance. */ diff --git a/widget/android/WebExecutorSupport.cpp b/widget/android/WebExecutorSupport.cpp index 99e7de95a0fb..bbdcc8f36bd6 100644 --- a/widget/android/WebExecutorSupport.cpp +++ b/widget/android/WebExecutorSupport.cpp @@ -393,6 +393,16 @@ nsresult WebExecutorSupport::CreateStreamLoader( MOZ_ASSERT(cookieJarSettings); nsCOMPtr<nsILoadInfo> loadInfo = channel->LoadInfo(); + + RefPtr<nsIURI> originUri; + const auto origin = req->Origin(); + if (origin) { + rv = NS_NewURI(getter_AddRefs(originUri), origin->ToString()); + NS_ENSURE_SUCCESS(rv, NS_ERROR_MALFORMED_URI); + OriginAttributes attrs = loadInfo->GetOriginAttributes(); + attrs.SetFirstPartyDomain(true, originUri); + loadInfo->SetOriginAttributes(attrs); + } loadInfo->SetCookieJarSettings(cookieJarSettings); // setup http/https specific things

1 0

[tor-browser/tor-browser-92.0b9-11.0-1] Bug 40198: Expose privacy.spoof_english pref in GeckoView
by sysrqb＠torproject.org 31 Aug '21

31 Aug '21

commit 28e6d1e3677a12f1ef6b8fed5aa0952216a1ae9c Author: Alex Catarineu <acat(a)torproject.org> Date: Sun Oct 18 17:06:04 2020 +0200 Bug 40198: Expose privacy.spoof_english pref in GeckoView --- mobile/android/geckoview/api.txt | 3 ++ .../mozilla/geckoview/GeckoRuntimeSettings.java | 33 ++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/mobile/android/geckoview/api.txt b/mobile/android/geckoview/api.txt index b8d1b565095b..8847517954c5 100644 --- a/mobile/android/geckoview/api.txt +++ b/mobile/android/geckoview/api.txt @@ -735,6 +735,7 @@ package org.mozilla.geckoview { method public boolean getRemoteDebuggingEnabled(); method @Nullable public GeckoRuntime getRuntime(); method @Nullable public Rect getScreenSizeOverride(); + method public boolean getSpoofEnglish(); method @Nullable public RuntimeTelemetry.Delegate getTelemetryDelegate(); method public int getTorSecurityLevel(); method public boolean getUseMaxScreenDepth(); @@ -757,6 +758,7 @@ package org.mozilla.geckoview { method @NonNull public GeckoRuntimeSettings setLoginAutofillEnabled(boolean); method @NonNull public GeckoRuntimeSettings setPreferredColorScheme(int); method @NonNull public GeckoRuntimeSettings setRemoteDebuggingEnabled(boolean); + method @NonNull public GeckoRuntimeSettings setSpoofEnglish(boolean); method @NonNull public GeckoRuntimeSettings setTorSecurityLevel(int); method @NonNull public GeckoRuntimeSettings setWebFontsEnabled(boolean); method @NonNull public GeckoRuntimeSettings setWebManifestEnabled(boolean); @@ -797,6 +799,7 @@ package org.mozilla.geckoview { method @NonNull public GeckoRuntimeSettings.Builder preferredColorScheme(int); method @NonNull public GeckoRuntimeSettings.Builder remoteDebuggingEnabled(boolean); method @NonNull public GeckoRuntimeSettings.Builder screenSizeOverride(int, int); + method @NonNull public GeckoRuntimeSettings.Builder spoofEnglish(boolean); method @NonNull public GeckoRuntimeSettings.Builder telemetryDelegate(@NonNull RuntimeTelemetry.Delegate); method @NonNull public GeckoRuntimeSettings.Builder torSecurityLevel(int); method @NonNull public GeckoRuntimeSettings.Builder useMaxScreenDepth(boolean); diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java index d88e296d554a..5b54447cb6e6 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java @@ -483,6 +483,17 @@ public final class GeckoRuntimeSettings extends RuntimeSettings { getSettings().mTorSecurityLevel.set(level); return this; } + + /** + * Sets whether we should spoof locale to English for webpages. + * + * @param flag True if we should spoof locale to English for webpages, false otherwise. + * @return This Builder instance. + */ + public @NonNull Builder spoofEnglish(final boolean flag) { + getSettings().mSpoofEnglish.set(flag ? 2 : 1); + return this; + } } private GeckoRuntime mRuntime; @@ -541,6 +552,8 @@ public final class GeckoRuntimeSettings extends RuntimeSettings { "dom.ipc.processCount", 2); /* package */ final Pref<Integer> mTorSecurityLevel = new Pref<>( "extensions.torbutton.security_slider", 4); + /* package */ final Pref<Integer> mSpoofEnglish = new Pref<>( + "privacy.spoof_english", 0); /* package */ int mPreferredColorScheme = COLOR_SCHEME_SYSTEM; @@ -1319,6 +1332,26 @@ public final class GeckoRuntimeSettings extends RuntimeSettings { return this; } + /** + * Get whether we should spoof locale to English for webpages. + * + * @return Whether we should spoof locale to English for webpages. + */ + public boolean getSpoofEnglish() { + return mSpoofEnglish.get() == 2; + } + + /** + * Set whether we should spoof locale to English for webpages. + * + * @param flag A flag determining whether we should locale to English for webpages. + * @return This GeckoRuntimeSettings instance. + */ + public @NonNull GeckoRuntimeSettings setSpoofEnglish(final boolean flag) { + mSpoofEnglish.commit(flag ? 2 : 1); + return this; + } + @Override // Parcelable public void writeToParcel(final Parcel out, final int flags) { super.writeToParcel(out, flags);

1 0

[tor-browser/tor-browser-92.0b9-11.0-1] Bug 40432: Prevent probing installed applications
by sysrqb＠torproject.org 31 Aug '21

31 Aug '21

commit c45ca70e0a5c4f778691dc9e8fc785382df2bc94 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon May 17 18:09:09 2021 +0000 Bug 40432: Prevent probing installed applications --- .../exthandler/nsExternalHelperAppService.cpp | 30 ++++++++++++++++++---- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/uriloader/exthandler/nsExternalHelperAppService.cpp b/uriloader/exthandler/nsExternalHelperAppService.cpp index 2bc43fbc86b5..c218aa4f1447 100644 --- a/uriloader/exthandler/nsExternalHelperAppService.cpp +++ b/uriloader/exthandler/nsExternalHelperAppService.cpp @@ -1068,8 +1068,33 @@ nsresult nsExternalHelperAppService::GetFileTokenForPath( ////////////////////////////////////////////////////////////////////////////////////////////////////// // begin external protocol service default implementation... ////////////////////////////////////////////////////////////////////////////////////////////////////// + +static const char kExternalProtocolPrefPrefix[] = + "network.protocol-handler.external."; +static const char kExternalProtocolDefaultPref[] = + "network.protocol-handler.external-default"; + NS_IMETHODIMP nsExternalHelperAppService::ExternalProtocolHandlerExists( const char* aProtocolScheme, bool* aHandlerExists) { + + // Replicate the same check performed in LoadURI. + // Deny load if the prefs say to do so + nsAutoCString externalPref(kExternalProtocolPrefPrefix); + externalPref += aProtocolScheme; + bool allowLoad = false; + *aHandlerExists = false; + if (NS_FAILED(Preferences::GetBool(externalPref.get(), &allowLoad))) { + // no scheme-specific value, check the default + if (NS_FAILED( + Preferences::GetBool(kExternalProtocolDefaultPref, &allowLoad))) { + return NS_OK; // missing default pref + } + } + + if (!allowLoad) { + return NS_OK; // explicitly denied + } + nsCOMPtr<nsIHandlerInfo> handlerInfo; nsresult rv = GetProtocolHandlerInfo(nsDependentCString(aProtocolScheme), getter_AddRefs(handlerInfo)); @@ -1112,11 +1137,6 @@ NS_IMETHODIMP nsExternalHelperAppService::IsExposedProtocol( return NS_OK; } -static const char kExternalProtocolPrefPrefix[] = - "network.protocol-handler.external."; -static const char kExternalProtocolDefaultPref[] = - "network.protocol-handler.external-default"; - NS_IMETHODIMP nsExternalHelperAppService::LoadURI(nsIURI* aURI, nsIPrincipal* aTriggeringPrincipal,

1 0

[tor-browser/tor-browser-92.0b9-11.0-1] Bug 40073: Disable remote Public Suffix List fetching
by sysrqb＠torproject.org 31 Aug '21

31 Aug '21

commit 41eb052e77705a9cb6970587ada0909f3189168f Author: Alex Catarineu <acat(a)torproject.org> Date: Thu Aug 13 11:05:03 2020 +0200 Bug 40073: Disable remote Public Suffix List fetching In https://bugzilla.mozilla.org/show_bug.cgi?id=1563246 Firefox implemented fetching the Public Suffix List via RemoteSettings and replacing the default one at runtime, which we do not want. --- browser/components/BrowserGlue.jsm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm index 7edc1623e39b..0c52b3457be4 100644 --- a/browser/components/BrowserGlue.jsm +++ b/browser/components/BrowserGlue.jsm @@ -69,7 +69,6 @@ XPCOMUtils.defineLazyModuleGetters(this, { PluralForm: "resource://gre/modules/PluralForm.jsm", PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm", ProcessHangMonitor: "resource:///modules/ProcessHangMonitor.jsm", - PublicSuffixList: "resource://gre/modules/netwerk-dns/PublicSuffixList.jsm", RemoteSettings: "resource://services-settings/remote-settings.js", RemoteSecuritySettings: "resource://gre/modules/psm/RemoteSecuritySettings.jsm", @@ -2688,10 +2687,6 @@ BrowserGlue.prototype = { this._addBreachesSyncHandler(); }, - () => { - PublicSuffixList.init(); - }, - () => { RemoteSecuritySettings.init(); },

1 0

[tor-browser/tor-browser-92.0b9-11.0-1] Bug 40125: Expose Security Level pref in GeckoView
by sysrqb＠torproject.org 31 Aug '21

31 Aug '21

commit 0b2d98804f41e78b75e1486317d3a9fc0da72a7c Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Sep 14 02:52:28 2020 +0000 Bug 40125: Expose Security Level pref in GeckoView --- mobile/android/geckoview/api.txt | 3 ++ .../mozilla/geckoview/GeckoRuntimeSettings.java | 33 ++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/mobile/android/geckoview/api.txt b/mobile/android/geckoview/api.txt index 4e0a41221119..b8d1b565095b 100644 --- a/mobile/android/geckoview/api.txt +++ b/mobile/android/geckoview/api.txt @@ -736,6 +736,7 @@ package org.mozilla.geckoview { method @Nullable public GeckoRuntime getRuntime(); method @Nullable public Rect getScreenSizeOverride(); method @Nullable public RuntimeTelemetry.Delegate getTelemetryDelegate(); + method public int getTorSecurityLevel(); method public boolean getUseMaxScreenDepth(); method public boolean getWebFontsEnabled(); method public boolean getWebManifestEnabled(); @@ -756,6 +757,7 @@ package org.mozilla.geckoview { method @NonNull public GeckoRuntimeSettings setLoginAutofillEnabled(boolean); method @NonNull public GeckoRuntimeSettings setPreferredColorScheme(int); method @NonNull public GeckoRuntimeSettings setRemoteDebuggingEnabled(boolean); + method @NonNull public GeckoRuntimeSettings setTorSecurityLevel(int); method @NonNull public GeckoRuntimeSettings setWebFontsEnabled(boolean); method @NonNull public GeckoRuntimeSettings setWebManifestEnabled(boolean); field public static final int ALLOW_ALL = 0; @@ -796,6 +798,7 @@ package org.mozilla.geckoview { method @NonNull public GeckoRuntimeSettings.Builder remoteDebuggingEnabled(boolean); method @NonNull public GeckoRuntimeSettings.Builder screenSizeOverride(int, int); method @NonNull public GeckoRuntimeSettings.Builder telemetryDelegate(@NonNull RuntimeTelemetry.Delegate); + method @NonNull public GeckoRuntimeSettings.Builder torSecurityLevel(int); method @NonNull public GeckoRuntimeSettings.Builder useMaxScreenDepth(boolean); method @NonNull public GeckoRuntimeSettings.Builder webFontsEnabled(boolean); method @NonNull public GeckoRuntimeSettings.Builder webManifest(boolean); diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java index 5de0b00f7a0c..c573ee7688f3 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java @@ -472,6 +472,17 @@ public final class GeckoRuntimeSettings extends RuntimeSettings { getSettings().setAllowInsecureConnections(level); return this; } + + /** + * Set security level. + * + * @param level A value determining the security level. Default is 0. + * @return This Builder instance. + */ + public @NonNull Builder torSecurityLevel(final int level) { + getSettings().mTorSecurityLevel.set(level); + return this; + } } private GeckoRuntime mRuntime; @@ -528,6 +539,8 @@ public final class GeckoRuntimeSettings extends RuntimeSettings { "dom.security.https_only_mode_pbm", false); /* package */ final Pref<Integer> mProcessCount = new Pref<>( "dom.ipc.processCount", 2); + /* package */ final Pref<Integer> mTorSecurityLevel = new Pref<>( + "extensions.torbutton.security_slider", 4); /* package */ int mPreferredColorScheme = COLOR_SCHEME_SYSTEM; @@ -1280,6 +1293,26 @@ public final class GeckoRuntimeSettings extends RuntimeSettings { return this; } + /** + * Gets the current security level. + * + * @return current security protection level + */ + public int getTorSecurityLevel() { + return mTorSecurityLevel.get(); + } + + /** + * Sets the Tor Security Level. + * + * @param level security protection level + * @return This GeckoRuntimeSettings instance. + */ + public @NonNull GeckoRuntimeSettings setTorSecurityLevel(final int level) { + mTorSecurityLevel.commit(level); + return this; + } + @Override // Parcelable public void writeToParcel(final Parcel out, final int flags) { super.writeToParcel(out, flags);

1 0