- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-78.4.0esr-10.0-2] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit 9633b5c7e832c047de34e1627398a2b7a62bfc3f Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 16 06:22:37 2020 +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 ad7c0b884586..e870d1aee4c1 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit ad7c0b884586f5d1f3cc8e9223ae806f77ca05af +Subproject commit e870d1aee4c1d7591cca867cbc8ba67ac8ed1d55

1 0

[torbutton/maint-10.0] Translations update
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit e870d1aee4c1d7591cca867cbc8ba67ac8ed1d55 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Oct 15 20:27:15 2020 +0000 Translations update --- chrome/locale/es-AR/aboutTor.dtd | 2 +- chrome/locale/he/aboutTor.dtd | 4 ++-- chrome/locale/mk/aboutTor.dtd | 2 +- chrome/locale/nl/aboutTor.dtd | 2 +- chrome/locale/pt-BR/aboutTor.dtd | 2 +- chrome/locale/th/browserOnboarding.properties | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/chrome/locale/es-AR/aboutTor.dtd b/chrome/locale/es-AR/aboutTor.dtd index ce843db0..c86c5eb8 100644 --- a/chrome/locale/es-AR/aboutTor.dtd +++ b/chrome/locale/es-AR/aboutTor.dtd @@ -31,5 +31,5 @@ <!ENTITY aboutTor.donationBanner.buttonA "Doná ahora">  -<!ENTITY aboutTor.ey2020.useamask "Usá un tapaboca, usá Tor."> +<!ENTITY aboutTor.ey2020.useamask "Usa un tapaboca, usa Tor."> <!ENTITY aboutTor.ey2020.resistsurveillance "Resistí a la pandemia de vigilancia."> diff --git a/chrome/locale/he/aboutTor.dtd b/chrome/locale/he/aboutTor.dtd index 90c2e8f0..be1a52eb 100644 --- a/chrome/locale/he/aboutTor.dtd +++ b/chrome/locale/he/aboutTor.dtd @@ -31,5 +31,5 @@ <!ENTITY aboutTor.donationBanner.buttonA "תרום עכשיו">  -<!ENTITY aboutTor.ey2020.useamask "שים מסיכה, שים Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "התנגד למגפת המעקב הסמוי."> +<!ENTITY aboutTor.ey2020.useamask "שימו מסכה, שימו Tor."> +<!ENTITY aboutTor.ey2020.resistsurveillance "התנגדו למגפת הריגול."> diff --git a/chrome/locale/mk/aboutTor.dtd b/chrome/locale/mk/aboutTor.dtd index 67a47e79..0ff2075f 100644 --- a/chrome/locale/mk/aboutTor.dtd +++ b/chrome/locale/mk/aboutTor.dtd @@ -32,4 +32,4 @@  <!ENTITY aboutTor.ey2020.useamask "Користи маска, користи Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Спротистави се на надзорот за време на пандемијата."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Спротивстави се на надзорот за време на пандемијата."> diff --git a/chrome/locale/nl/aboutTor.dtd b/chrome/locale/nl/aboutTor.dtd index b191f724..252902a9 100644 --- a/chrome/locale/nl/aboutTor.dtd +++ b/chrome/locale/nl/aboutTor.dtd @@ -32,4 +32,4 @@  <!ENTITY aboutTor.ey2020.useamask "Gebruik een masker, gebruik Tor."> -<!ENTITY aboutTor.ey2020.resistsurveillance "Weersta de surveillancepandemie."> +<!ENTITY aboutTor.ey2020.resistsurveillance "Wees bestand tegen de surveillancepandemie."> diff --git a/chrome/locale/pt-BR/aboutTor.dtd b/chrome/locale/pt-BR/aboutTor.dtd index 55f1000d..1ba8a0bb 100644 --- a/chrome/locale/pt-BR/aboutTor.dtd +++ b/chrome/locale/pt-BR/aboutTor.dtd @@ -32,5 +32,5 @@ <!ENTITY aboutTor.donationBanner.buttonA "Doe Agora">  -<!ENTITY aboutTor.ey2020.useamask "Use uma máscara, use Tor."> +<!ENTITY aboutTor.ey2020.useamask "Use uma mascara, use Tor."> <!ENTITY aboutTor.ey2020.resistsurveillance "Resista à pandemia de vigilância."> diff --git a/chrome/locale/th/browserOnboarding.properties b/chrome/locale/th/browserOnboarding.properties index 1ae6bafc..d216d3cf 100644 --- a/chrome/locale/th/browserOnboarding.properties +++ b/chrome/locale/th/browserOnboarding.properties @@ -16,7 +16,7 @@ onboarding.tour-tor-network=เครือข่าย Tor onboarding.tour-tor-network.title=นำทางเพื่อกระจายเครือข่าย onboarding.tour-tor-network.description=Tor Browser เชื่อมต่อคุณเข้ากับเครือข่าย Tor ที่ทำงานโดยอาสาสมัครกว่าพันคนทั่วโลก Tor Browser ต่างจาก VPN เพราะไม่มีใครสามารถระบุความผิดพลาดหรือหน่วยงานกลางได้ คุณต้องไว้วางใจเพื่อความเพลิดเพลินในการใช้อินเทอร์เน็ตอย่างเป็นส่วนตัว onboarding.tour-tor-network.description-para2=NEW: Tor Network Settings, including the ability to request bridges where Tor is blocked, can now be found in Preferences. -onboarding.tour-tor-network.action-button=Adjust Your Tor Network Settings +onboarding.tour-tor-network.action-button=ปรับแต่งการตั้งค่าเครือข่าย Tor ของคุณ onboarding.tour-tor-network.button=ไปที่วงจรหน้าจอ onboarding.tour-tor-circuit-display=วงจรหน้าจอ

1 0

[tor-browser-build/maint-10.0] Tor Browser 10.0.2 release preparations
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit c3a8697358b03386ddc3f516a82226396a8f47df Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Oct 15 20:37:50 2020 +0000 Tor Browser 10.0.2 release preparations Version bumps and Changelog update --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 4 ++-- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 7 +++++++ projects/tor-browser/config | 4 ++-- rbm.conf | 5 +++-- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 34d6fad..17a707a 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build1 + ff_build: build2 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' targets: diff --git a/projects/firefox/config b/projects/firefox/config index 8db58d5..9d08d8c 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-build4' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-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.3.0 + firefox_platform_version: 78.4.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 10.0 branding_directory: 'browser/branding/alpha' diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 890aace..ac85f33 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,10 @@ +Tor Browser 10.0.2 -- October 20 2020 + * Windows + OS X + Linux + * Update Firefox to 78.4.0esr + * Update NoScript to 11.1.3 + * Bug 40192: Backport Mozilla Bug 1658881 + * Translations update + Tor Browser 10.0.1 -- October 13 2020 * Windows + OS X + Linux * Update NoScript to 11.1.1 diff --git a/projects/tor-browser/config b/projects/tor-browser/config index e9a17d5..8b201f8 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -77,9 +77,9 @@ input_files: enable: '[% c("var/snowflake") && ! c("var/android") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: bdc99f11a75ea050934b692c8717c363493d5f717397ba9ef35b1a2e9078516c + sha256sum: 08543e4a03e0becacd10c3cdbf5eaab1ff35a1648babe6f1522ae335e21de7d4 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' diff --git a/rbm.conf b/rbm.conf index 0530620..218f8ef 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,10 +24,11 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '10.0.1' - torbrowser_build: 'build2' + torbrowser_version: '10.0.2' + torbrowser_build: 'build1' torbrowser_incremental_from: - 10.0 + - 10.0.1 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/maint-10.0] Fix Changelog typos
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit 45312a158f2af25e1f1e0da9817a681cbb0df8ba Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Oct 13 17:08:05 2020 +0000 Fix Changelog typos --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 2bf6fb5..890aace 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -9,13 +9,13 @@ Tor Browser 10.0.1 -- October 13 2020 * Bug 40148: Disable Picture-in-Picture until we investigate and possibly fix it [tor-browser] * Translations update * Windows - * Bug 40140: Videos stop working with Tor Browser 10.0 on Windows + * Bug 40140: Videos stop working with Tor Browser 10.0 on Windows [tor-browser] * Build System * Windows + OS X + Linux * Bump Go to 1.14.9 * Bump openssl to 1.1.1h * Windows - * Bug 40051: Remove SOURCE_DATE_EPOCH patch + * Bug 40051: Remove SOURCE_DATE_EPOCH patch [tor-browser-build] Tor Browser 10.0 -- September 22 2020 * Windows + OS X + Linux

1 0

[tor-browser-build/master] Changelog fixes
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit 5e51b7fbdf7cad129287826c2347d3cbcb3de7d1 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 16 06:03:17 2020 +0000 Changelog fixes --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 953c3fd..e33a54d 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -10,12 +10,12 @@ Tor Browser 10.0.1 -- October 13 2020 * Bug 40148: Disable Picture-in-Picture until we investigate and possibly fix it [tor-browser] * Translations update * Windows - * Bug 40140: Videos stop working with Tor Browser 10.0 on Windows + * Bug 40140: Videos stop working with Tor Browser 10.0 on Windows [tor-browser] * Build System * Windows + OS X + Linux * Bump Go to 1.14.9 * Windows - * Bug 40051: Remove SOURCE_DATE_EPOCH patch for OpenSSL + * Bug 40051: Remove SOURCE_DATE_EPOCH patch for OpenSSL [tor-browser-build] Tor Browser 10.0a8 -- October 8 2020 * Android

1 0

[tor-browser-build/master] Bump tor-browser-bundle-testsuite commit
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit e3063faf925e90b329bd97106d98dca9a8dc1a22 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 15 19:44:34 2020 +0000 Bump tor-browser-bundle-testsuite commit --- tools/ansible/roles/tbb-nightly-build/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ansible/roles/tbb-nightly-build/defaults/main.yml b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml index 131983e..1e45b1a 100644 --- a/tools/ansible/roles/tbb-nightly-build/defaults/main.yml +++ b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml @@ -5,7 +5,7 @@ nightly_build_cron_minute: 20 nightly_build_keep_builds: 3 testsuite_dir: "/home/{{ nightly_build_user }}/tbb-testsuite" testsuite_git_url: https://git.torproject.org/tor-browser-bundle-testsuite.git -testsuite_git_commit: f87d747ce6dc5eee2bbc2b878203f0fefbb06be7 +testsuite_git_commit: 71bce1264f10e8f184095aad54cf27e81f56a7a4 nightly_build_wwwdir: "/home/{{ nightly_build_user }}/www" nightly_build_nginx_enable: true nightly_build_nginx_listen: 127.0.0.1:80

1 0

[Git][tpo/applications/fenix][tor-browser-82.0.0b4-10.0-1] 3 commits: fixup! Bug 40026: Integrate Security Level settings
by Matthew Finkel 15 Oct '20

15 Oct '20

Matthew Finkel pushed to branch tor-browser-82.0.0b4-10.0-1 at The Tor Project / Applications / fenix Commits: 268e56f4 by Matthew Finkel at 2020-10-14T20:04:47+00:00 fixup! Bug 40026: Integrate Security Level settings Bug 40053: Provide feedback in onboarding Security Level card - - - - - be57d067 by Matthew Finkel at 2020-10-14T20:04:51+00:00 fixup! Bug 40026: Integrate Security Level settings Bug 40082: Use Security Level preference at startup - - - - - e8d4affa by Matthew Finkel at 2020-10-16T01:26:23+00:00 Merge branch 'bug_40053_00' into tor-browser-82.0.0b4-10.0-1 - - - - - 5 changed files: - app/src/main/java/org/mozilla/fenix/components/Core.kt - app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/TorOnboardingSecurityLevelViewHolder.kt - app/src/main/java/org/mozilla/fenix/utils/Settings.kt - app/src/main/res/layout/tor_onboarding_security_level.xml - app/src/main/res/values/torbrowser_strings.xml Changes: ===================================== app/src/main/java/org/mozilla/fenix/components/Core.kt ===================================== @@ -92,7 +92,8 @@ class Core(private val context: Context, private val crashReporter: CrashReporti fontInflationEnabled = context.settings().shouldUseAutoSize, suspendMediaWhenInactive = false, forceUserScalableContent = context.settings().forceEnableZoom, - loginAutofillEnabled = context.settings().shouldAutofillLogins + loginAutofillEnabled = context.settings().shouldAutofillLogins, + torSecurityLevel = context.settings().torSecurityLevel().intRepresentation ) GeckoEngine( ===================================== app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/TorOnboardingSecurityLevelViewHolder.kt ===================================== @@ -69,9 +69,20 @@ class TorOnboardingSecurityLevelViewHolder( safestSecurityLevel.onClickListener { updateSecurityLevel(SecurityLevel.SAFEST) } + + updateSecurityLevel(securityLevel) } private fun updateSecurityLevel(newLevel: SecurityLevel) { + val resources = itemView.context.resources + val securityLevel = when (newLevel) { + SecurityLevel.STANDARD -> resources.getString(R.string.tor_security_level_standard_option) + SecurityLevel.SAFER -> resources.getString(R.string.tor_security_level_safer_option) + SecurityLevel.SAFEST -> resources.getString(R.string.tor_security_level_safest_option) + } + itemView.current_level.text = resources.getString( + R.string.tor_onboarding_chosen_security_level_label, securityLevel + ) itemView.context.components.let { it.core.engine.settings.torSecurityLevel = newLevel.intRepresentation } ===================================== app/src/main/java/org/mozilla/fenix/utils/Settings.kt ===================================== @@ -40,6 +40,7 @@ import org.mozilla.fenix.settings.deletebrowsingdata.DeleteBrowsingDataOnQuitTyp import org.mozilla.fenix.settings.logins.SavedLoginsSortingStrategyMenu import org.mozilla.fenix.settings.logins.SortingStrategy import org.mozilla.fenix.settings.registerOnSharedPreferenceChangeListener +import org.mozilla.fenix.tor.SecurityLevel import java.security.InvalidParameterException private const val AUTOPLAY_USER_SETTING = "AUTOPLAY_USER_SETTING" @@ -176,6 +177,33 @@ class Settings(private val appContext: Context) : PreferencesHolder { true ) + var standardSecurityLevel by booleanPreference( + appContext.getPreferenceKey(SecurityLevel.STANDARD.preferenceKey), + default = true + ) + + var saferSecurityLevel by booleanPreference( + appContext.getPreferenceKey(SecurityLevel.SAFER.preferenceKey), + default = false + ) + + var safestSecurityLevel by booleanPreference( + appContext.getPreferenceKey(SecurityLevel.SAFEST.preferenceKey), + default = false + ) + + // torSecurityLevel is defined as the first |true| preference, + // beginning at the safest level. + // If multiple preferences are true, then that is a bug and the + // highest |true| security level is chosen. + // Standard is the default level. + fun torSecurityLevel(): SecurityLevel = when { + safestSecurityLevel -> SecurityLevel.SAFEST + saferSecurityLevel -> SecurityLevel.SAFER + standardSecurityLevel -> SecurityLevel.STANDARD + else -> SecurityLevel.STANDARD + } + // If any of the prefs have been modified, quit displaying the fenix moved tip fun shouldDisplayFenixMovingTip(): Boolean = preferences.getBoolean( ===================================== app/src/main/res/layout/tor_onboarding_security_level.xml ===================================== @@ -32,9 +32,18 @@ android:textAppearance="@style/Body14TextStyle" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/header_text" + app:layout_constraintTop_toBottomOf="@id/current_level" tools:text="@string/tor_onboarding_security_level_description" /> + <TextView + android:id="@+id/current_level" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="12dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/header_text" + tools:text="@string/tor_onboarding_chosen_security_level_label" /> <org.mozilla.fenix.onboarding.OnboardingRadioButton android:id="@+id/security_level_standard_option" ===================================== app/src/main/res/values/torbrowser_strings.xml ===================================== @@ -20,6 +20,7 @@ <string name="tor_onboarding_security_level">Set your Security Level</string> <string name="tor_onboarding_security_level_description">Disable certain web features that can be used to attack you, and harm your security, anonymity, and privacy.</string> + <string name="tor_onboarding_chosen_security_level_label">Current Security Level: %s</string> <string name="tor_onboarding_security_settings_button">Open Security Settings</string> <string name="tor_onboarding_donate_header">Donate and keep Tor safe</string> <string name="tor_onboarding_donate_description">Tor is free to use because of donations from people like you.</string> View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/15968de01cbf… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/15968de01cbf… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor-browser-build/master] Bug 40131: Remove unused binutils patches
by sysrqb＠torproject.org 15 Oct '20

15 Oct '20

commit 0d8484271a1eb7838bd4145e256231fbdb84bd72 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Oct 14 09:16:34 2020 +0000 Bug 40131: Remove unused binutils patches --- projects/binutils/64bit-fixups.patch | 60 ------- projects/binutils/enable-reloc-section-ld.patch | 219 ------------------------ 2 files changed, 279 deletions(-) diff --git a/projects/binutils/64bit-fixups.patch b/projects/binutils/64bit-fixups.patch deleted file mode 100644 index 7dc1294..0000000 --- a/projects/binutils/64bit-fixups.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 05164a1162d5f6f696d7f7c4b1bc61ef06d1c288 Mon Sep 17 00:00:00 2001 -From: Georg Koppen <gk(a)torproject.org> -Date: Tue, 12 Sep 2017 07:21:16 +0000 -Subject: [PATCH] 64bit fixups - ---- - ld/emultempl/pep.em | 4 ++-- - ld/pep-dll.c | 1 + - ld/pep-dll.h | 1 + - 3 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/ld/emultempl/pep.em b/ld/emultempl/pep.em -index fccbd63..f7c0a57 100644 ---- a/ld/emultempl/pep.em -+++ b/ld/emultempl/pep.em -@@ -742,7 +742,7 @@ gld${EMULATION_NAME}_handle_option (int optc) - pep_dll_exclude_all_symbols = 1; - break; - case OPTION_ENABLE_RELOC_SECTION: -- pe_dll_enable_reloc_section = 1; -+ pep_dll_enable_reloc_section = 1; - break; - case OPTION_EXCLUDE_LIBS: - pep_dll_add_excludes (optarg, EXCLUDELIBS); -@@ -1862,7 +1862,7 @@ gld_${EMULATION_NAME}_finish (void) - #ifdef DLL_SUPPORT - if (bfd_link_pic (&link_info) - || (!bfd_link_relocatable (&link_info) -- && pe_dll_enable_reloc_section) -+ && pep_dll_enable_reloc_section) - || (!bfd_link_relocatable (&link_info) - && pep_def_file->num_exports != 0)) - { -diff --git a/ld/pep-dll.c b/ld/pep-dll.c -index b8c017f..5ad5733 100644 ---- a/ld/pep-dll.c -+++ b/ld/pep-dll.c -@@ -31,6 +31,7 @@ - #define pe_dll_export_everything pep_dll_export_everything - #define pe_dll_exclude_all_symbols pep_dll_exclude_all_symbols - #define pe_dll_do_default_excludes pep_dll_do_default_excludes -+#define pe_dll_enable_reloc_section pep_dll_enable_reloc_section - #define pe_dll_kill_ats pep_dll_kill_ats - #define pe_dll_stdcall_aliases pep_dll_stdcall_aliases - #define pe_dll_warn_dup_exports pep_dll_warn_dup_exports -diff --git a/ld/pep-dll.h b/ld/pep-dll.h -index 0a27c1f..95d9c15 100644 ---- a/ld/pep-dll.h -+++ b/ld/pep-dll.h -@@ -31,6 +31,7 @@ extern def_file * pep_def_file; - extern int pep_dll_export_everything; - extern int pep_dll_exclude_all_symbols; - extern int pep_dll_do_default_excludes; -+extern int pep_dll_enable_reloc_section; - extern int pep_dll_kill_ats; - extern int pep_dll_stdcall_aliases; - extern int pep_dll_warn_dup_exports; --- -2.1.4 - diff --git a/projects/binutils/enable-reloc-section-ld.patch b/projects/binutils/enable-reloc-section-ld.patch deleted file mode 100644 index a6600c3..0000000 --- a/projects/binutils/enable-reloc-section-ld.patch +++ /dev/null @@ -1,219 +0,0 @@ -From fba503a78c50d6134943245d55e820f53e8f19cd Mon Sep 17 00:00:00 2001 -From: Erinn Clark <erinn(a)torproject.org> -Date: Fri, 8 Aug 2014 14:23:44 -0400 -Subject: [PATCH] add relocation section so Windows bundles can have ASLR - -Patch by skruffy. ---- - ld/emultempl/pe.em | 7 ++++++ - ld/emultempl/pep.em | 11 ++++++++-- - ld/pe-dll.c | 63 ++++++++++++++++++++++++++++++----------------------- - ld/pe-dll.h | 1 + - 4 files changed, 53 insertions(+), 29 deletions(-) - -diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em -index 339b7c5..3958b81 100644 ---- a/ld/emultempl/pe.em -+++ b/ld/emultempl/pe.em -@@ -272,6 +272,7 @@ fragment <<EOF - #define OPTION_INSERT_TIMESTAMP (OPTION_TERMINAL_SERVER_AWARE + 1) - #define OPTION_NO_INSERT_TIMESTAMP (OPTION_INSERT_TIMESTAMP + 1) - #define OPTION_BUILD_ID (OPTION_NO_INSERT_TIMESTAMP + 1) -+#define OPTION_ENABLE_RELOC_SECTION (OPTION_BUILD_ID + 1) - - static void - gld${EMULATION_NAME}_add_options -@@ -315,6 +316,7 @@ gld${EMULATION_NAME}_add_options - {"export-all-symbols", no_argument, NULL, OPTION_EXPORT_ALL}, - {"exclude-symbols", required_argument, NULL, OPTION_EXCLUDE_SYMBOLS}, - {"exclude-all-symbols", no_argument, NULL, OPTION_EXCLUDE_ALL_SYMBOLS}, -+ {"enable-reloc-section", no_argument, NULL, OPTION_ENABLE_RELOC_SECTION}, - {"exclude-libs", required_argument, NULL, OPTION_EXCLUDE_LIBS}, - {"exclude-modules-for-implib", required_argument, NULL, OPTION_EXCLUDE_MODULES_FOR_IMPLIB}, - {"kill-at", no_argument, NULL, OPTION_KILL_ATS}, -@@ -782,6 +784,9 @@ gld${EMULATION_NAME}_handle_option (int optc) - case OPTION_EXCLUDE_ALL_SYMBOLS: - pe_dll_exclude_all_symbols = 1; - break; -+ case OPTION_ENABLE_RELOC_SECTION: -+ pe_dll_enable_reloc_section = 1; -+ break; - case OPTION_EXCLUDE_LIBS: - pe_dll_add_excludes (optarg, EXCLUDELIBS); - break; -@@ -2076,6 +2081,8 @@ gld_${EMULATION_NAME}_finish (void) - #if !defined(TARGET_IS_shpe) - || (!bfd_link_relocatable (&link_info) - && pe_def_file->num_exports != 0) -+ || (!bfd_link_relocatable (&link_info) -+ && pe_dll_enable_reloc_section) - #endif - ) - { -diff --git a/ld/emultempl/pep.em b/ld/emultempl/pep.em -index c253d2f..fccbd63 100644 ---- a/ld/emultempl/pep.em -+++ b/ld/emultempl/pep.em -@@ -246,7 +246,8 @@ enum options - OPTION_INSERT_TIMESTAMP, - OPTION_NO_INSERT_TIMESTAMP, - OPTION_TERMINAL_SERVER_AWARE, -- OPTION_BUILD_ID -+ OPTION_BUILD_ID, -+ OPTION_ENABLE_RELOC_SECTION - }; - - static void -@@ -288,6 +289,7 @@ gld${EMULATION_NAME}_add_options - {"export-all-symbols", no_argument, NULL, OPTION_EXPORT_ALL}, - {"exclude-symbols", required_argument, NULL, OPTION_EXCLUDE_SYMBOLS}, - {"exclude-all-symbols", no_argument, NULL, OPTION_EXCLUDE_ALL_SYMBOLS}, -+ {"enable-reloc-section", no_argument, NULL, OPTION_ENABLE_RELOC_SECTION}, - {"exclude-libs", required_argument, NULL, OPTION_EXCLUDE_LIBS}, - {"exclude-modules-for-implib", required_argument, NULL, OPTION_EXCLUDE_MODULES_FOR_IMPLIB}, - {"kill-at", no_argument, NULL, OPTION_KILL_ATS}, -@@ -739,6 +741,9 @@ gld${EMULATION_NAME}_handle_option (int optc) - case OPTION_EXCLUDE_ALL_SYMBOLS: - pep_dll_exclude_all_symbols = 1; - break; -+ case OPTION_ENABLE_RELOC_SECTION: -+ pe_dll_enable_reloc_section = 1; -+ break; - case OPTION_EXCLUDE_LIBS: - pep_dll_add_excludes (optarg, EXCLUDELIBS); - break; -@@ -1857,7 +1862,9 @@ gld_${EMULATION_NAME}_finish (void) - #ifdef DLL_SUPPORT - if (bfd_link_pic (&link_info) - || (!bfd_link_relocatable (&link_info) -- && pep_def_file->num_exports != 0)) -+ && pe_dll_enable_reloc_section) -+ || (!bfd_link_relocatable (&link_info) -+ && pep_def_file->num_exports != 0)) - { - pep_dll_fill_sections (link_info.output_bfd, &link_info); - if (command_line.out_implib_filename) -diff --git a/ld/pe-dll.c b/ld/pe-dll.c -index c398f23..3797f1a 100644 ---- a/ld/pe-dll.c -+++ b/ld/pe-dll.c -@@ -151,6 +151,7 @@ def_file * pe_def_file = 0; - int pe_dll_export_everything = 0; - int pe_dll_exclude_all_symbols = 0; - int pe_dll_do_default_excludes = 1; -+int pe_dll_enable_reloc_section = 0; - int pe_dll_kill_ats = 0; - int pe_dll_stdcall_aliases = 0; - int pe_dll_warn_dup_exports = 0; -@@ -3430,8 +3431,15 @@ pe_dll_build_sections (bfd *abfd, struct bfd_link_info *info) - process_def_file_and_drectve (abfd, info); - - if (pe_def_file->num_exports == 0 && !bfd_link_pic (info)) -- return; -- -+ { -+ if (pe_dll_enable_reloc_section) -+ { -+ build_filler_bfd (0); -+ pe_output_file_set_long_section_names (filler_bfd); -+ } -+ return; -+ } -+ - generate_edata (abfd, info); - build_filler_bfd (1); - pe_output_file_set_long_section_names (filler_bfd); -@@ -3446,13 +3454,9 @@ pe_exe_build_sections (bfd *abfd, struct bfd_link_info *info ATTRIBUTE_UNUSED) - pe_output_file_set_long_section_names (filler_bfd); - } - --void --pe_dll_fill_sections (bfd *abfd, struct bfd_link_info *info) -+static void -+pe_dll_create_reloc (bfd *abfd, struct bfd_link_info *info) - { -- pe_dll_id_target (bfd_get_target (abfd)); -- pe_output_file_set_long_section_names (abfd); -- image_base = pe_data (abfd)->pe_opthdr.ImageBase; -- - generate_reloc (abfd, info); - if (reloc_sz > 0) - { -@@ -3469,38 +3473,43 @@ pe_dll_fill_sections (bfd *abfd, struct bfd_link_info *info) - lang_do_assignments (lang_final_phase_enum); - } - -- fill_edata (abfd, info); -- -- if (bfd_link_dll (info)) -- pe_data (abfd)->dll = 1; -- -- edata_s->contents = edata_d; - reloc_s->contents = reloc_d; - } - - void --pe_exe_fill_sections (bfd *abfd, struct bfd_link_info *info) -+pe_dll_fill_sections (bfd *abfd, struct bfd_link_info *info) - { -+ if (!reloc_s && !edata_s) -+ return; - pe_dll_id_target (bfd_get_target (abfd)); - pe_output_file_set_long_section_names (abfd); - image_base = pe_data (abfd)->pe_opthdr.ImageBase; - -- generate_reloc (abfd, info); -- if (reloc_sz > 0) -+ if (reloc_s) -+ pe_dll_create_reloc (abfd, info); -+ -+ if (edata_s) - { -- bfd_set_section_size (filler_bfd, reloc_s, reloc_sz); -+ fill_edata (abfd, info); -+ edata_s->contents = edata_d; -+ } - -- /* Resize the sections. */ -- lang_reset_memory_regions (); -- lang_size_sections (NULL, TRUE); -+ if (bfd_link_pic (info) && !bfd_link_pie (info)) -+ pe_data (abfd)->dll = 1; - -- /* Redo special stuff. */ -- ldemul_after_allocation (); - -- /* Do the assignments again. */ -- lang_do_assignments (lang_final_phase_enum); -- } -- reloc_s->contents = reloc_d; -+} -+ -+void -+pe_exe_fill_sections (bfd *abfd, struct bfd_link_info *info) -+{ -+ if (!reloc_s) -+ return; -+ pe_dll_id_target (bfd_get_target (abfd)); -+ pe_output_file_set_long_section_names (abfd); -+ image_base = pe_data (abfd)->pe_opthdr.ImageBase; -+ -+ pe_dll_create_reloc (abfd, info); - } - - bfd_boolean -diff --git a/ld/pe-dll.h b/ld/pe-dll.h -index 48d169b..05ff72b 100644 ---- a/ld/pe-dll.h -+++ b/ld/pe-dll.h -@@ -30,6 +30,7 @@ extern def_file *pe_def_file; - extern int pe_dll_export_everything; - extern int pe_dll_exclude_all_symbols; - extern int pe_dll_do_default_excludes; -+extern int pe_dll_enable_reloc_section; - extern int pe_dll_kill_ats; - extern int pe_dll_stdcall_aliases; - extern int pe_dll_warn_dup_exports; --- -2.1.4 -

1 0

[Git][tpo/applications/fenix][tor-browser-82.0.0b4-10.0-1] 4 commits: fixup! Bug 40058: Hide option for disallowing addon in private mode
by Matthew Finkel 15 Oct '20

15 Oct '20

Matthew Finkel pushed to branch tor-browser-82.0.0b4-10.0-1 at The Tor Project / Applications / fenix Commits: 8031e181 by Alex Catarineu at 2020-10-15T13:11:10+02:00 fixup! Bug 40058: Hide option for disallowing addon in private mode Fixes #40086: Disabling/Enabling addon still shows option to disallow in private mode. - - - - - 53ea7a05 by Alex Catarineu at 2020-10-15T17:30:46+02:00 fixup! Bug 40028: Implement Tor Service controller Part of #40078 fix. - - - - - 10fcc45a by Matthew Finkel at 2020-10-15T20:41:28+00:00 Merge remote-tracking branch 'acatgl/40078+1' into tor-browser-82.0.0b4-10.0-1 - - - - - 15968de0 by Matthew Finkel at 2020-10-15T20:42:44+00:00 Merge remote-tracking branch 'acatgl/40086' into tor-browser-82.0.0b4-10.0-1 - - - - - 2 changed files: - app/src/main/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragment.kt - app/src/main/java/org/mozilla/fenix/tor/TorController.kt Changes: ===================================== app/src/main/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragment.kt ===================================== @@ -113,7 +113,7 @@ class InstalledAddonDetailsFragment : Fragment() { runIfFragmentIsAttached { this.addon = it switch.isClickable = true - privateBrowsingSwitch.isVisible = it.isEnabled() + privateBrowsingSwitch.isVisible = false privateBrowsingSwitch.isChecked = it.isAllowedInPrivateBrowsing() switch.setText(R.string.mozac_feature_addons_enabled) view.settings.isVisible = shouldSettingsBeVisible() ===================================== app/src/main/java/org/mozilla/fenix/tor/TorController.kt ===================================== @@ -119,13 +119,6 @@ class TorController( Prefs.setBridgesList(value) } - init { - // Bug 40040: Hacky: Initialize TorService when we are instantiated. This should - // help avoid a race condition involving copying assets and starting tor in TorService. - val torServiceStatus = Intent(context, TorService::class.java) - context.startService(torServiceStatus) - } - fun start() { // Register receiver lbm.registerReceiver( View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/460d5891f278… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/460d5891f278… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor-browser/tor-browser-78.4.0esr-10.0-2] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by sysrqb＠torproject.org 15 Oct '20

15 Oct '20

commit 301b7a0134ec3f28f49ce87952d19e0805917a45 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Oct 15 20:30:12 2020 +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 dd24967b1bb8..ad7c0b884586 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit dd24967b1bb89e83b656a22ff887eff81946be45 +Subproject commit ad7c0b884586f5d1f3cc8e9223ae806f77ca05af

1 0