- tbb-commits - lists.torproject.org

[torbutton/master] Translations update
by gk＠torproject.org 14 Aug '20

14 Aug '20

commit 6c2cf4bce30cf21bb3cb121e940248cd3b8a164a Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 14 07:56:33 2020 +0000 Translations update --- chrome/locale/es-ES/torbutton.properties | 2 +- chrome/locale/fr/torbutton.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/chrome/locale/es-ES/torbutton.properties b/chrome/locale/es-ES/torbutton.properties index 59b0f505..9338bc3a 100644 --- a/chrome/locale/es-ES/torbutton.properties +++ b/chrome/locale/es-ES/torbutton.properties @@ -92,7 +92,7 @@ onionServices.rendezvousFailed.longDescription=Detalles: %S - El cliente no enco # Tor SOCKS error 0xF4: onionServices.clientAuthMissing.pageTitle=Se requiere autorización onionServices.clientAuthMissing.header=Onionsite requiere autorización -onionServices.clientAuthMissing=El acceso a onionsite necesita clave pero no se ha proporcionado ninguna. +onionServices.clientAuthMissing=El acceso al sitio onion necesita una clave, pero no se ha proporcionado ninguna. onionServices.clientAuthMissing.longDescription=Detalles: %S - El cliente descargó el descriptor de servicio de cebolla solicitado pero no pudo descifrar su contenido porque falta la información de autorización del cliente. # Tor SOCKS error 0xF5: onionServices.clientAuthIncorrect.pageTitle=Falló la autorización diff --git a/chrome/locale/fr/torbutton.properties b/chrome/locale/fr/torbutton.properties index 18edd134..e22e0366 100644 --- a/chrome/locale/fr/torbutton.properties +++ b/chrome/locale/fr/torbutton.properties @@ -49,7 +49,7 @@ canvas.neverAccessKey=j profileProblemTitle=Problème de profil %S profileReadOnly=Vous ne pouvez pas exécuter %S à partir d’un système de fichiers en lecture seul. Veuillez copier %S vers un autre emplacement avant d’essayer de l’utiliser. profileReadOnlyMac=Vous ne pouvez pas exécuter %S à partir d’un système de fichiers en lecture seul. Veuillez copier %S vers votre dossier Bureau ou Applications avant d’essayer de l’utiliser. -profileAccessDenied=%S n’a pas le droit d’accéder au profil. Veuillez ajuster les droits de votre système de fichiers et ressayer. +profileAccessDenied=%S n’a pas le droit d’accéder au profil. Veuillez ajuster les droits de votre système de fichiers et réessayer. profileMigrationFailed=La migration de votre profil existant %S a échoué.\nDe nouveaux paramètres vont être utilisés. # "Downloading update" string for the hamburger menu (see #28885). @@ -87,7 +87,7 @@ onionServices.introFailed.longDescription=Détails : %S – Échec de présenta # Tor SOCKS error 0xF3: onionServices.rendezvousFailed.pageTitle=Problème de chargement du site onion onionServices.rendezvousFailed.header=Impossible de se connecter au site onion -onionServices.rendezvousFailed=Le site onion est occupé ou le réseau Tor est surchargé. Veuillez ressayer plus tard. +onionServices.rendezvousFailed=Le site onion est occupé ou le réseau Tor est surchargé. Veuillez réessayer plus tard. onionServices.rendezvousFailed.longDescription=Détails : %S – Échec de rencontre du client avec le service, ce qui signifie que le client n’a pas réussi à finaliser la connexion. # Tor SOCKS error 0xF4: onionServices.clientAuthMissing.pageTitle=Une autorisation est exigée

1 0

[tor-launcher/master] Release preparations for 0.2.22
by gk＠torproject.org 14 Aug '20

14 Aug '20

commit 60978ad03d533a52b151013ed85715ced775b011 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 14 07:04:53 2020 +0000 Release preparations for 0.2.22 Version and min compat bump --- src/install.rdf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/install.rdf b/src/install.rdf index c6f33b8..8eed6d4 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.21.7</em:version> + <em:version>0.2.22</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL> @@ -16,7 +16,7 @@ <em:targetApplication> <Description> <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id> - <em:minVersion>24.0</em:minVersion> + <em:minVersion>78.0</em:minVersion> <em:maxVersion>*.*.*</em:maxVersion> </Description> </em:targetApplication>

1 0

[tor-launcher/master] Translations update
by gk＠torproject.org 14 Aug '20

14 Aug '20

commit 1bc6345e1746f72d706962185b706191de6dd540 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 14 07:02:15 2020 +0000 Translations update --- src/chrome/locale/ar/torlauncher.properties | 2 +- src/chrome/locale/es-ES/torlauncher.properties | 2 +- src/chrome/locale/fr/network-settings.dtd | 2 +- src/chrome/locale/fr/torlauncher.properties | 16 ++--- src/chrome/locale/he/torlauncher.properties | 2 +- src/chrome/locale/pl/network-settings.dtd | 14 ++-- src/chrome/locale/pt-PT/network-settings.dtd | 4 +- src/chrome/locale/si/network-settings.dtd | 83 ---------------------- src/chrome/locale/si/torlauncher.properties | 95 -------------------------- src/chrome/locale/sw/network-settings.dtd | 6 +- src/chrome/locale/zh-HK/network-settings.dtd | 4 +- 11 files changed, 26 insertions(+), 204 deletions(-) diff --git a/src/chrome/locale/ar/torlauncher.properties b/src/chrome/locale/ar/torlauncher.properties index 4cf4e1f..fb0e3c7 100644 --- a/src/chrome/locale/ar/torlauncher.properties +++ b/src/chrome/locale/ar/torlauncher.properties @@ -16,7 +16,7 @@ torlauncher.unable_to_start_tor=غير قادر علي بدء تشغيل تور. torlauncher.tor_missing=الملف التنفيذي لتور مفقود. torlauncher.torrc_missing=ملف torrc غير موجود وتعذّر إنشاؤه. torlauncher.datadir_missing=دليل بيانات تور غير موجود وتعذّر إنشاؤه. -torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. +torlauncher.onionauthdir_missing=دليل مصادقة Tor onion غير موجود ولا يمكن إنشاؤه. torlauncher.password_hash_missing=فشل في الحصول على كلمة المرور المجزأة. torlauncher.failed_to_get_settings=غير قادر علي جلب إعدادات تور.\n\n%S diff --git a/src/chrome/locale/es-ES/torlauncher.properties b/src/chrome/locale/es-ES/torlauncher.properties index 8ff77a1..6fd0b96 100644 --- a/src/chrome/locale/es-ES/torlauncher.properties +++ b/src/chrome/locale/es-ES/torlauncher.properties @@ -16,7 +16,7 @@ torlauncher.unable_to_start_tor=Imposible iniciar Tor.\n\n%S torlauncher.tor_missing=No se encuentra el archivo ejecutable de Tor. torlauncher.torrc_missing=No existe el fichero torcc y no puede ser creado. torlauncher.datadir_missing=El directorio de datos de Tor no existe y no puede ser creado -torlauncher.onionauthdir_missing=El directorio de autenticación de la cebolla de Tor no existe y no se podría crear. +torlauncher.onionauthdir_missing=El directorio de autenticación onion de Tor no existe y no se pudo crear. torlauncher.password_hash_missing=Fallo al obtener la contraseña cifrada. torlauncher.failed_to_get_settings=No se pudo recuperar las preferencias de Tor.\n\n%S diff --git a/src/chrome/locale/fr/network-settings.dtd b/src/chrome/locale/fr/network-settings.dtd index 1b26ec5..8e2c4aa 100644 --- a/src/chrome/locale/fr/network-settings.dtd +++ b/src/chrome/locale/fr/network-settings.dtd @@ -79,7 +79,7 @@ Selon votre position géographique, un pont pourrait fonctionner mieux qu’un a <!ENTITY torPreferences.requestBridgeDialogTitle "Demander un pont"> <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Connexion à BridgeDB. Veuillez patienter."> <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Résolvez le captcha pour demander un pont."> -<!ENTITY torPreferences.requestBridgeErrorBadSolution "La solution est erronée. Veuillez ressayer."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "La solution est erronée. Veuillez réessayer."> <!ENTITY torPreferences.viewTorLogs "Visualiser les journaux Tor."> <!ENTITY torPreferences.viewLogs "Visualiser les journaux…"> <!ENTITY torPreferences.torLogsDialogTitle "Journaux Tor"> diff --git a/src/chrome/locale/fr/torlauncher.properties b/src/chrome/locale/fr/torlauncher.properties index 8549565..bcf84c7 100644 --- a/src/chrome/locale/fr/torlauncher.properties +++ b/src/chrome/locale/fr/torlauncher.properties @@ -7,23 +7,23 @@ torlauncher.tor_exited_during_startup=Tor s’est fermé pendant le démarrage. torlauncher.tor_exited=Tor s’est fermé de manière imprévue. Cela peut être dû à un bogue dans Tor même, un autre programme dans votre système ou un matériel défectueux. Jusqu’à ce que vous redémarriez Tor, le Navigateur Tor ne pourra atteindre aucun site. Si le problème persiste, veuillez envoyer une copie de votre journal Tor à l’équipe de soutien. torlauncher.tor_exited2=Redémarrer Tor ne fermera pas les onglets de votre navigateur. torlauncher.tor_controlconn_failed=Impossible de se connecter au port de contrôle de Tor. -torlauncher.tor_failed_to_start=Tor n’a pas pu démarrer. +torlauncher.tor_failed_to_start=Échec de démarrage de Tor. torlauncher.tor_control_failed=La prise de contrôle de Tor a échoué. torlauncher.tor_bootstrap_failed=Échec lors de la connexion de Tor au réseau Tor. torlauncher.tor_bootstrap_failed_details=L’étape %1$S a échoué (%2$S). torlauncher.unable_to_start_tor=Impossible de démarrer Tor.\n\n%S -torlauncher.tor_missing=Il manque l’exécutable Tor. +torlauncher.tor_missing=Il manque l’exécutable de Tor. torlauncher.torrc_missing=Le fichier torrc manque et n’a pas pu être créé. torlauncher.datadir_missing=Le répertoire de données de Tor n’existe pas et n’a pas pu être créé. torlauncher.onionauthdir_missing=Le répertoire d’authentification onion de Tor n’existe pas et n’a pas pu être créé. -torlauncher.password_hash_missing=Impossible d’obtenir le mot de passe haché. +torlauncher.password_hash_missing=Échec d’obtention du mot de passe haché. torlauncher.failed_to_get_settings=Impossible de récupérer les paramètres de Tor.\n\n%S torlauncher.failed_to_save_settings=Impossible d’enregistrer les paramètres de Tor.\n\n%S -torlauncher.ensure_tor_is_running=Veuillez-vous assurer que Tor fonctionne. +torlauncher.ensure_tor_is_running=Veuillez vous assurer que Tor fonctionne. -torlauncher.error_proxy_addr_missing=Vous devez spécifier à la fois une adresse IP ou un nom d’hôte et un numéro de port afin de configurer Tor pour qu’il utilise un mandataire pour accéder à Internet. +torlauncher.error_proxy_addr_missing=Vous devez indiquer une adresse IP ou un nom d'hôte et un numéro de port pour que Tor puisse utiliser un mandataire afin d’accéder à Internet. torlauncher.error_proxy_type_missing=Vous devez choisir le type de mandataire. torlauncher.error_bridges_missing=Vous devez spécifier un ou plusieurs ponts. torlauncher.error_default_bridges_type_missing=Vous devez sélectionner un type de transport pour les ponts fournis. @@ -37,15 +37,15 @@ torlauncher.request_a_bridge=Demander un pont… torlauncher.request_a_new_bridge=Demander un nouveau pont… torlauncher.contacting_bridgedb=Connexion à BridgeDB. Veuillez patienter. torlauncher.captcha_prompt=Résolvez le captcha pour demander un pont. -torlauncher.bad_captcha_solution=La solution est erronée. Veuillez ressayer. +torlauncher.bad_captcha_solution=La solution est erronée. Veuillez réessayer. torlauncher.unable_to_get_bridge=Impossible d’obtenir un pont de BridgeDB.\n\n%S torlauncher.no_meek=Ce navigateur n’est pas configuré pour meek, qui est nécessaire pour obtenir des ponts. torlauncher.no_bridges_available=Aucun pont n’est proposé pour l’instant. Désolé. torlauncher.connect=Se connecter torlauncher.restart_tor=Redémarrer Tor -torlauncher.quit=Quitter -torlauncher.quit_win=Sortie +torlauncher.quit=Fermer +torlauncher.quit_win=Sortir torlauncher.done=Terminé torlauncher.forAssistance=Pour de l’assistance, contacter %S diff --git a/src/chrome/locale/he/torlauncher.properties b/src/chrome/locale/he/torlauncher.properties index fd464c5..15925a4 100644 --- a/src/chrome/locale/he/torlauncher.properties +++ b/src/chrome/locale/he/torlauncher.properties @@ -16,7 +16,7 @@ torlauncher.unable_to_start_tor=לא היה ניתן להתחיל את Tor.\n\n% torlauncher.tor_missing=קובץ ההפעלה של Tor חסר. torlauncher.torrc_missing=קובץ ה-torrc חסר ולא היה יכול להיווצר. torlauncher.datadir_missing=תיקיית הנתונים של Tor אינה קיימת ולא יכלה להיווצר. -torlauncher.onionauthdir_missing=סיפריית אימות הבצל של Tor אינה קיימת ולא יכלה להיווצר. +torlauncher.onionauthdir_missing=ספריית אימות הבצל של Tor אינה קיימת ולא יכלה להיווצר. torlauncher.password_hash_missing=נכשל בהשגת סיסמה מעורבלת. torlauncher.failed_to_get_settings=לא היה ניתן לאחזר הגדרות Tor.\n\n%S diff --git a/src/chrome/locale/pl/network-settings.dtd b/src/chrome/locale/pl/network-settings.dtd index 733730d..ab3c106 100644 --- a/src/chrome/locale/pl/network-settings.dtd +++ b/src/chrome/locale/pl/network-settings.dtd @@ -1,10 +1,10 @@ <!ENTITY torsettings.dialog.title "Ustawienia Sieci"> -<!ENTITY torsettings.wizard.title.default "Połącz z siecią Tor"> -<!ENTITY torsettings.wizard.title.configure "Ustawienia Sieci"> -<!ENTITY torsettings.wizard.title.connecting "Nawiązanie połączenia"> +<!ENTITY torsettings.wizard.title.default "Połącz z siecią Tor"> +<!ENTITY torsettings.wizard.title.configure "Ustawienia Sieci Tor"> +<!ENTITY torsettings.wizard.title.connecting "Nawiązywanie połączenia">  -<!ENTITY torlauncher.localePicker.title "Język przeglądarki Tor."> +<!ENTITY torlauncher.localePicker.title "Język przeglądarki Tor"> <!ENTITY torlauncher.localePicker.prompt "Wybierz język.">  @@ -20,7 +20,7 @@ <!ENTITY torsettings.restartTor "Zrestartuj Tora"> <!ENTITY torsettings.reconfigTor "Przekonfiguruj"> -<!ENTITY torsettings.discardSettings.prompt "Skonfigurowałeś mostki Tora lub wprowadziłeś lokalne ustawienia serwera proxy.  Aby nawiązać bezpośrednie połączenie do sieci Tor, ustawienia te muszą być usunięte."> +<!ENTITY torsettings.discardSettings.prompt "Skonfigurowałeś mostki Tora lub wprowadziłeś lokalne ustawienia serwera proxy.  Aby nawiązać bezpośrednie połączenie do sieci Tor, ustawienia te muszą zostać usunięte."> <!ENTITY torsettings.discardSettings.proceed "Usuń ustawienia i połącz"> <!ENTITY torsettings.optional "(opcjonalnie)"> @@ -39,13 +39,13 @@ <!ENTITY torsettings.firewall.checkbox "Ten komputer pozwala na połączenie z ustalonymi portami"> <!ENTITY torsettings.firewall.allowedPorts "Dozwolone porty"> <!ENTITY torsettings.useBridges.checkbox "Tor jest ocenzurowany w moim kraju"> -<!ENTITY torsettings.useBridges.default "Wybierz wbudowany mostek"> +<!ENTITY torsettings.useBridges.default "Wybierz wbudowany most"> <!ENTITY torsettings.useBridges.default.placeholder "wybierz mostek"> <!ENTITY torsettings.useBridges.bridgeDB "Uzyskaj mostek od torproject.org"> <!ENTITY torsettings.useBridges.captchaSolution.placeholder "Wprowadź znaki z obrazka"> <!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Poproś o inne zadanie"> <!ENTITY torsettings.useBridges.captchaSubmit "Podsumowując"> -<!ENTITY torsettings.useBridges.custom "Dostarcz mostek, który znam"> +<!ENTITY torsettings.useBridges.custom "Dostarcz most, który znam"> <!ENTITY torsettings.useBridges.label "Wprowadź informacje o mostku z zaufanego źródła."> <!ENTITY torsettings.useBridges.placeholder "wpisz adres:port (po jednym w każdej linii)"> diff --git a/src/chrome/locale/pt-PT/network-settings.dtd b/src/chrome/locale/pt-PT/network-settings.dtd index 529ee3e..2b83f00 100644 --- a/src/chrome/locale/pt-PT/network-settings.dtd +++ b/src/chrome/locale/pt-PT/network-settings.dtd @@ -45,7 +45,7 @@ <!ENTITY torsettings.useBridges.captchaSolution.placeholder "Insira os carateres da imagem"> <!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Obter um novo desafio"> <!ENTITY torsettings.useBridges.captchaSubmit "Submeter"> -<!ENTITY torsettings.useBridges.custom "Fornecer uma ponte que eu conheça"> +<!ENTITY torsettings.useBridges.custom "Fornecer uma ponte que eu conheço"> <!ENTITY torsettings.useBridges.label "Inserir a informação da ponte de uma fonte confiável."> <!ENTITY torsettings.useBridges.placeholder "digite address:port (uma por linha)"> @@ -70,7 +70,7 @@ <!ENTITY torPreferences.bridgesDescription "Pontes ajudam-no a aceder à Tor Network em sítios onde o Tor está bloqueado. Dependendo de onde estiver, uma ponte pode funcionar melhor que outra."> <!ENTITY torPreferences.useBridge "Use uma ponte"> <!ENTITY torPreferences.requestNewBridge "Solicitar uma Nova Ponte..."> -<!ENTITY torPreferences.provideBridge "Forneça uma ponte"> +<!ENTITY torPreferences.provideBridge "Fornecer uma ponte"> <!ENTITY torPreferences.advanced "Avançado"> <!ENTITY torPreferences.advancedDescription "Configure como o Tor Browser se contecta à internet."> <!ENTITY torPreferences.firewallPortsPlaceholder "Valores separados por vírgula"> diff --git a/src/chrome/locale/si/network-settings.dtd b/src/chrome/locale/si/network-settings.dtd deleted file mode 100644 index b1204fb..0000000 --- a/src/chrome/locale/si/network-settings.dtd +++ /dev/null @@ -1,83 +0,0 @@ -<!ENTITY torsettings.dialog.title "TOR ජාල සිටුවම්"> -<!ENTITY torsettings.wizard.title.default "Connect to Tor"> -<!ENTITY torsettings.wizard.title.configure "TOR ජාල සිටුවම්"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> - - -<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> -<!ENTITY torlauncher.localePicker.prompt "Please select a language."> - - - -<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> -<!ENTITY torSettings.configure "වින්‍යාස කරන්න"> -<!ENTITY torSettings.connect "සම්බන්ධ වෙන්න"> - - - -<!ENTITY torsettings.startingTor "TOR ආරම්භ වනතුරු …"> -<!ENTITY torsettings.restartTor "Restart Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> - -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> - -<!ENTITY torsettings.optional "අමතර"> - -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type"> -<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address"> -<!ENTITY torsettings.useProxy.address.placeholder "IP ලිපිනය හෝ සත්කාරක නාමය"> -<!ENTITY torsettings.useProxy.port "Port"> -<!ENTITY torsettings.useProxy.username "Username"> -<!ENTITY torsettings.useProxy.password "මුරපදය"> -<!ENTITY torsettings.useProxy.type.socks4 "4 වැනි සොකට්ටුව"> -<!ENTITY torsettings.useProxy.type.socks5 "5 වැනි සොකට්ටුව"> -<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "මෙම පරිගණකය විශේෂිත ports සදහා සම්බන්ධ වීමට ඉඩදෙන පරිදි firewall එකක් හරහා ගමන් කරයි."> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports"> -<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> -<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> -<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> -<!ENTITY torsettings.useBridges.captchaSubmit "Submit"> -<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> -<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> -<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> - -<!ENTITY torsettings.copyLog "Clipboard එකට Tor ලොගය පිටපත් කරන්න."> - -<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> -<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings."> - -<!ENTITY torsettings.bridgeHelpTitle "සේතු ප්‍රතියෝජක (Bridge Relay) උපකාරකය"> -<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> -<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> - - -<!ENTITY torPreferences.categoryTitle "Tor"> -<!ENTITY torPreferences.torSettings "Tor Settings"> -<!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." > -<!ENTITY torPreferences.learnMore "Learn More"> -<!ENTITY torPreferences.bridges "සේතු"> -<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another."> -<!ENTITY torPreferences.useBridge "Use a bridge"> -<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> -<!ENTITY torPreferences.provideBridge "Provide a bridge"> -<!ENTITY torPreferences.advanced "උසස් "> -<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet."> -<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values"> -<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge"> -<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait."> -<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> -<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> -<!ENTITY torPreferences.viewTorLogs "View the Tor logs."> -<!ENTITY torPreferences.viewLogs "View Logs…"> -<!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> diff --git a/src/chrome/locale/si/torlauncher.properties b/src/chrome/locale/si/torlauncher.properties deleted file mode 100644 index b434d3e..0000000 --- a/src/chrome/locale/si/torlauncher.properties +++ /dev/null @@ -1,95 +0,0 @@ -### Copyright (c) 2020, The Tor Project, Inc. -### See LICENSE for licensing information. - -torlauncher.error_title=Tor පුරනය - -torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. -torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. -torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. -torlauncher.tor_controlconn_failed=Tor පාලක පොර්ටයට සම්බන්ධ විය නොහැක. -torlauncher.tor_failed_to_start=Tor ආරම්භ කිරීමට අපොහොසත්ය. -torlauncher.tor_control_failed=Failed to take control of Tor. -torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. -torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). - -torlauncher.unable_to_start_tor=Tor ආරම්භ කිරීමට නොහැක.\n\n%S -torlauncher.tor_missing=Tor විධානය අස්ථානගත වී ඇත. -torlauncher.torrc_missing=The torrc file is missing and could not be created. -torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. -torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. -torlauncher.password_hash_missing=පුරණය කරනලද මුරපදය ලබාගැනීමට අපොහොසත්ය. - -torlauncher.failed_to_get_settings=Tor සිටුවම් සොයා ලබාගැනීමට අපොහොසත්ය.\n\n%S -torlauncher.failed_to_save_settings=Tor සිටුවම් ගබඩා කිරීමට අපොහොසත්ය.\n\n%S -torlauncher.ensure_tor_is_running=කරුණාකර Tor ක්‍රියාත්මක වන බව තහවුරු කර ගන්න. - -torlauncher.error_proxy_addr_missing=අන්තර්ජාලයට පිවිසීමට නියුතු සේවා දායකයෙකු භාවිතා කිරීමට Tor වින්‍යාසගත කිරීමේදී IP ලිපිනයක් හෝ සත්කාරක නාමයක් සහ පෝර්ට අංකයක් සදහන් කල යුතුය. -torlauncher.error_proxy_type_missing=ඔබ විසින් සේවාදායක වර්ගය තේරීම කලයුතුය. -torlauncher.error_bridges_missing=ඔබ විසින් සේතු එකක් හෝ කිහිපයක් සදහන් කලයුතුය. -torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. -torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. - -torlauncher.bridge_suffix.meek-amazon=(works in China) -torlauncher.bridge_suffix.meek-azure=(works in China) - -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S -torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. - -torlauncher.connect=සම්බන්ධ වෙන්න -torlauncher.restart_tor=Restart Tor -torlauncher.quit=ඉවත් වෙන්න -torlauncher.quit_win=අයින් වන්න -torlauncher.done=කරන ලදී - -torlauncher.forAssistance=සහය සදහා, සම්බන්ධ වන්න%S -torlauncher.forAssistance2=For assistance, visit %S - -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. - -torlauncher.bootstrapStatus.starting=Starting -torlauncher.bootstrapStatus.conn_pt=Connecting to bridge -torlauncher.bootstrapStatus.conn_done_pt=Connected to bridge -torlauncher.bootstrapStatus.conn_proxy=Connecting to proxy -torlauncher.bootstrapStatus.conn_done_proxy=Connected to proxy -torlauncher.bootstrapStatus.conn=Connecting to a Tor relay -torlauncher.bootstrapStatus.conn_done=Connected to a Tor relay -torlauncher.bootstrapStatus.handshake=Negotiating with a Tor relay -torlauncher.bootstrapStatus.handshake_done=Finished negotiating with a Tor relay -torlauncher.bootstrapStatus.onehop_create=සංකේත කරන ලද ඩිරෙක්ටරි සබැදුමක් ස්ථාපනය කරමින් -torlauncher.bootstrapStatus.requesting_status=ජාල තත්වය සමුධ්රණය කරමින් -torlauncher.bootstrapStatus.loading_status=ජාල තත්වය ප්‍රවේශනය කරමින් -torlauncher.bootstrapStatus.loading_keys=අධිකාරීත්ව සහතික ප්‍රවේශනය කරමින් -torlauncher.bootstrapStatus.requesting_descriptors=ප්‍රතියෝජක තොරතුරු අයදුම් කරමින් -torlauncher.bootstrapStatus.loading_descriptors=ප්‍රතියෝජක තොරතුරු ප්‍රවේශනය කරමින් -torlauncher.bootstrapStatus.enough_dirinfo=Finished loading relay information -torlauncher.bootstrapStatus.ap_conn_pt=Building circuits: Connecting to bridge -torlauncher.bootstrapStatus.ap_conn_done_pt=Building circuits: Connected to bridge -torlauncher.bootstrapStatus.ap_conn_proxy=Building circuits: Connecting to proxy -torlauncher.bootstrapStatus.ap_conn_done_proxy=Building circuits: Connected to proxy -torlauncher.bootstrapStatus.ap_conn=Building circuits: Connecting to a Tor relay -torlauncher.bootstrapStatus.ap_conn_done=Building circuits: Connected to a Tor relay -torlauncher.bootstrapStatus.ap_handshake=Building circuits: Negotiating with a Tor relay -torlauncher.bootstrapStatus.ap_handshake_done=Building circuits: Finished negotiating with a Tor relay -torlauncher.bootstrapStatus.circuit_create=Building circuits: Establishing a Tor circuit -torlauncher.bootstrapStatus.done=Tor ජාලයට සබැදියි - -torlauncher.bootstrapWarning.done=කරන ලදී -torlauncher.bootstrapWarning.connectrefused=සබැදුම ප්‍රතික්ෂේපකරන ලදී -torlauncher.bootstrapWarning.misc=විවිධ -torlauncher.bootstrapWarning.resourcelimit=ප්‍රමාණවත් නොවන සම්පත් -torlauncher.bootstrapWarning.identity=අනන්‍යතා නොගැලපුම -torlauncher.bootstrapWarning.timeout=සබැදුම කාලගතවිය -torlauncher.bootstrapWarning.noroute=සත්කාර කිරීමට මගක් නොමැත -torlauncher.bootstrapWarning.ioerror=කියවීම්/ලිවීම් දෝෂය -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport - -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. diff --git a/src/chrome/locale/sw/network-settings.dtd b/src/chrome/locale/sw/network-settings.dtd index e49ccf7..b227ee0 100644 --- a/src/chrome/locale/sw/network-settings.dtd +++ b/src/chrome/locale/sw/network-settings.dtd @@ -30,8 +30,8 @@ <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port"> -<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.port "Bandari"> +<!ENTITY torsettings.useProxy.username "Jina la mtumiaji"> <!ENTITY torsettings.useProxy.password "Nywila nenosiri"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> @@ -45,7 +45,7 @@ nenosiri"> <!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> <!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> <!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> -<!ENTITY torsettings.useBridges.captchaSubmit "Submit"> +<!ENTITY torsettings.useBridges.captchaSubmit "Wasilisha"> <!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> <!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> <!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> diff --git a/src/chrome/locale/zh-HK/network-settings.dtd b/src/chrome/locale/zh-HK/network-settings.dtd index 48ef6bd..8de8a27 100644 --- a/src/chrome/locale/zh-HK/network-settings.dtd +++ b/src/chrome/locale/zh-HK/network-settings.dtd @@ -44,7 +44,7 @@ <!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> <!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> <!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> -<!ENTITY torsettings.useBridges.captchaSubmit "Submit"> +<!ENTITY torsettings.useBridges.captchaSubmit "送出"> <!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> <!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> <!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> @@ -65,7 +65,7 @@ <!ENTITY torPreferences.categoryTitle "Tor工具"> <!ENTITY torPreferences.torSettings "Tor Settings"> <!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." > -<!ENTITY torPreferences.learnMore "Learn More"> +<!ENTITY torPreferences.learnMore "深入了解"> <!ENTITY torPreferences.bridges "Bridges"> <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another."> <!ENTITY torPreferences.useBridge "Use a bridge">

1 0

[tor-browser-build/master] Bug 34359: Adapt abicheck.cc to deal with newer GCC version
by sysrqb＠torproject.org 13 Aug '20

13 Aug '20

commit 756b3f0a6f3dd6b0a6ce262528f027f79b1e3c07 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Aug 12 08:32:50 2020 +0000 Bug 34359: Adapt abicheck.cc to deal with newer GCC version ESR 78 compiled with GCC 9.3.0 requires GLIBCXX_3.4.28. --- projects/firefox/abicheck.cc | 29 +++++++++++++++-------------- projects/firefox/build | 2 +- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/projects/firefox/abicheck.cc b/projects/firefox/abicheck.cc index ba5f858..53d1dcc 100644 --- a/projects/firefox/abicheck.cc +++ b/projects/firefox/abicheck.cc @@ -1,23 +1,24 @@ /* - * Bug 25485: Browser/TorBrowser/Tor/libstdc++.so.6: version `CXXABI_1.3.11' not found - * Bug 31646: Update abicheck to require newer libstdc++.so.6 + * Bug 34359: Update abicheck to require newer libstdc++.so.6 * This program is useful in determining if the libstdc++.so.6 installed - * on the system is recent enough. Specifically this program requires - * `GLIBCXX_3.4.25` which should be provided by libstdc++.so.6 from - * gcc >= 8.0.0. If the program executes successfully, that means we + * on the system is recent enough. Specifically, this program requires + * `GLIBCXX_3.4.28` which should be provided by libstdc++.so.6 from + * gcc >= 9.3.0. If the program executes successfully, that means we * should use the system version of libstdc++.so.6 and if not, that means * we should use the bundled version. * - * We use std::random_device::entropy() in order to require GLIBCXX_3.4.25: - * https://github.com/gcc-mirror/gcc/blob/gcc-8_3_0-release/libstdc%2B%2B-v3/c… + * We use std::pmr::monotonic_buffer_resource in order to require + * GLIBCXX_3.4.28: + * https://github.com/gcc-mirror/gcc/blob/9e4ebad20a064d10df451cfb2cea9853d339… + * The example below got inspired by + * https://www.mail-archive.com/gcc-patches@gcc.gnu.org/msg227964.html. */ -#include <iostream> -#include <random> +#include <memory_resource> -int main() -{ - std::random_device rd; - std::cout << "entropy: " << rd.entropy() << std::endl; - return 0; +int main () { + std::pmr::monotonic_buffer_resource res; + void* a = res.allocate(1); + res.release(); + return 0; } diff --git a/projects/firefox/build b/projects/firefox/build index 5ddd4de..ea03088 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -277,7 +277,7 @@ END; %] [% IF c("var/linux") %] - /var/tmp/dist/gcc/bin/g++ $rootdir/abicheck.cc -o Browser/abicheck + /var/tmp/dist/gcc/bin/g++ $rootdir/abicheck.cc -o Browser/abicheck -std=c++17 [% END %] [% c('tar', {

1 0

[tor-browser/tor-browser-78.1.0esr-10.0-1] Bug 40073: Disable remote Public Suffix List fetching
by gk＠torproject.org 13 Aug '20

13 Aug '20

commit d2c3d8f23856de0a6d1057202ea75742790c60a9 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 43565440dd17..0d7de1dc7d4f 100644 --- a/browser/components/BrowserGlue.jsm +++ b/browser/components/BrowserGlue.jsm @@ -695,7 +695,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", @@ -2579,10 +2578,6 @@ BrowserGlue.prototype = { this._addBreachesSyncHandler(); }, - () => { - PublicSuffixList.init(); - }, - () => { RemoteSecuritySettings.init(); },

1 0

[tor-browser-build/master] Bug 40039: Remove version_path in nss project
by gk＠torproject.org 13 Aug '20

13 Aug '20

commit e7d0ada804cff79b101a0b4b7517133c80f25f31 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Aug 13 09:47:06 2020 +0200 Bug 40039: Remove version_path in nss project Instead we generate the string from the version. --- projects/nss/config | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/projects/nss/config b/projects/nss/config index e2b875e..b260e77 100644 --- a/projects/nss/config +++ b/projects/nss/config @@ -3,8 +3,6 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil # The required versions for application-services can be found at the respective # commit in libs/build-all.sh version: 3.54 -# XXX: maybe that's extractable automatically from `version` somehow? -version_path: 3_54 nspr_version: 4.26 var: container: @@ -19,7 +17,7 @@ input_files: project: '[% c("var/compiler") %]' - name: ninja project: ninja - - URL: 'https://ftp.mozilla.org/pub/security/nss/releases/NSS_[% c("version_path") %]_RTM/src/nss-[% c("version") %]-with-nspr-[% c("nspr_version") %].tar.gz' + - URL: 'https://ftp.mozilla.org/pub/security/nss/releases/NSS_[% c("version") | replace("\\.", "_") %]_RTM/src/nss-[% c("version") %]-with-nspr-[% c("nspr_version") %].tar.gz' name: nss sha256sum: e0e81f0ff264d810f130d3cd9334722f7f883c752430483131d1ca5ac62d3f70 - filename: configure.patch

1 0

[tor-browser/tor-browser-78.1.0esr-10.0-1] squash! TB3: Tor Browser's official .mozconfigs.
by gk＠torproject.org 13 Aug '20

13 Aug '20

commit 618b2a814ab057f1cc94ed44072b395fd9fc2134 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Aug 6 11:26:45 2020 -0400 squash! TB3: Tor Browser's official .mozconfigs. Bug 40061: Omit the Windows default browser agent from the build --- .mozconfig-mingw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mozconfig-mingw b/.mozconfig-mingw index 6a9d3749b2ec..29c58d8fdab2 100644 --- a/.mozconfig-mingw +++ b/.mozconfig-mingw @@ -28,4 +28,4 @@ ac_add_options --enable-proxy-bypass-protection # Disable telemetry ac_add_options MOZ_TELEMETRY_REPORTING= - +ac_add_options --disable-default-browser-agent

1 0

[tor-browser/tor-browser-78.1.0esr-10.0-1] squash! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 13 Aug '20

13 Aug '20

commit f86772d1641216abb98128dd3870928c8c1c1d7c Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Aug 6 11:22:27 2020 -0400 squash! TB4: Tor Browser's Firefox preference overrides. Bug 40061: Omit the Windows default browser agent from the build --- browser/app/profile/000-tor-browser.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index eae29579ded6..7e29c788b720 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -90,6 +90,11 @@ pref("datareporting.policy.dataSubmissionEnabled", false); pref("toolkit.telemetry.unified", false); pref("toolkit.telemetry.enabled", false); pref("toolkit.telemetry.updatePing.enabled", false); // Make sure updater telemetry is disabled; see #25909. +#ifdef XP_WIN +// Defense-in-depth: ensure that the Windows default browser agent will +// not ping Mozilla if it is somehow present (we omit it at build time). +pref("default-browser-agent.enabled", false); +#endif pref("identity.fxaccounts.enabled", false); // Disable sync by default pref("services.sync.engine.prefs", false); // Never sync prefs, addons, or tabs with other browsers pref("services.sync.engine.addons", false);

1 0

[tor-browser/tor-browser-78.1.0esr-10.0-1] Merge remote-tracking branch 'gitlab/merge-requests/29' into tor-browser-78.1.0esr-10.0-1
by gk＠torproject.org 13 Aug '20

13 Aug '20

commit 236b57124c5bad238ff78d91c62d734cf387aca3 Merge: 8ebe00420de7 bad0647c6b70 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 13 08:46:51 2020 +0000 Merge remote-tracking branch 'gitlab/merge-requests/29' into tor-browser-78.1.0esr-10.0-1 browser/app/profile/000-tor-browser.js | 48 ++++++++++++++++++++++++++- mobile/android/app/000-tor-browser-android.js | 3 ++ 2 files changed, 50 insertions(+), 1 deletion(-)

1 0

[tor-browser/tor-browser-78.1.0esr-10.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 13 Aug '20

13 Aug '20

commit bad0647c6b70b20a336f8c643a57e80fc3e62cf2 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Aug 6 10:12:51 2020 -0400 fixup! TB4: Tor Browser's Firefox preference overrides. --- browser/app/profile/000-tor-browser.js | 48 ++++++++++++++++++++++++++- mobile/android/app/000-tor-browser-android.js | 3 ++ 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 3be6e460b628..eae29579ded6 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -100,13 +100,50 @@ pref("browser.search.region", "US"); // The next two prefs disable GeoIP search pref("browser.search.geoip.url", ""); pref("browser.fixup.alternate.enabled", false); // Bug #16783: Prevent .onion fixups // Make sure there is no Tracking Protection active in Tor Browser, see: #17898. +pref("privacy.trackingprotection.enabled", false); pref("privacy.trackingprotection.pbmode.enabled", false); +pref("privacy.trackingprotection.annotate_channels", false); +pref("privacy.trackingprotection.cryptomining.enabled", false); +pref("privacy.trackingprotection.fingerprinting.enabled", false); +pref("privacy.trackingprotection.socialtracking.enabled", false); +pref("privacy.socialtracking.block_cookies.enabled", false); +pref("privacy.annotate_channels.strict_list.enabled", false); + // Disable the Pocket extension (Bug #18886 and #31602) pref("extensions.pocket.enabled", false); pref("network.http.referer.hideOnionSource", true); -// Disable ServiceWorkers by default +// Disable use of WiFi location information +pref("browser.region.network.scan", false); +pref("browser.region.network.url", ""); + +// Don't load Mozilla domains in a separate tab process +pref("browser.tabs.remote.separatedMozillaDomains", ""); + +// Avoid DNS lookups on search terms +pref("browser.urlbar.dnsResolveSingleWordsAfterSearch", 0); + +// Disable about:newtab and "first run" experiments +pref("messaging-system.rsexperimentloader.enabled", false); +pref("trailhead.firstrun.branches", ""); + +// Clear the list of trusted recursive resolver services +pref("network.trr.resolvers", ""); + +// Disable crlite +pref("security.pki.crlite_mode", 0); + +// Disable website password breach alerts +pref("signon.management.page.breach-alerts.enabled", false); +pref("extensions.fxmonitor.enabled", false); + +// Remove mobile app tracking URLs +pref("signon.management.page.mobileAndroidURL", ""); +pref("signon.management.page.mobileAppleURL", ""); + +// Disable ServiceWorkers and push notifications by default pref("dom.serviceWorkers.enabled", false); +pref("dom.push.enabled", false); // Fingerprinting pref("webgl.disable-extensions", true); @@ -298,6 +335,15 @@ pref("browser.download.panel.shown", true); // Treat .onions as secure pref("dom.securecontext.whitelist_onions", true); +// Disable special URL bar behaviors +pref("browser.urlbar.suggest.topsites", false); +pref("browser.urlbar.update1.interventions", false); +pref("browser.urlbar.update1.searchTips", false); + +// Skip checking omni.ja and other files for corruption since the result +// is only reported via telemetry (which is disabled). +pref("corroborator.enabled", false); + // Onboarding. pref("browser.onboarding.tourset-version", 5); pref("browser.onboarding.newtour", "welcome,privacy,tor-network-9.0,circuit-display,security,expect-differences,onion-services,learn-more"); diff --git a/mobile/android/app/000-tor-browser-android.js b/mobile/android/app/000-tor-browser-android.js index 23fd39beac77..61c8a0cd7fa1 100644 --- a/mobile/android/app/000-tor-browser-android.js +++ b/mobile/android/app/000-tor-browser-android.js @@ -30,6 +30,9 @@ pref("media.realtime_decoder.enabled", false); // Enable touch events on Android (highlighting text, etc) pref("dom.w3c_touch_events.enabled", 2); +// Ensure that pointer events are disabled +pref("dom.w3c_pointer_events.multiprocess.android.enabled", false); + // No HLS support for now due to browser freezing, see: #29859. pref("media.hls.enabled", false);

1 0

[tor-browser-build/master] Bug 40017: Enable stripping again on Windows
by gk＠torproject.org 11 Aug '20

11 Aug '20

commit cc88f7409ca972802f70a6d0d3ec4effc3486828 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 11 09:46:23 2020 +0000 Bug 40017: Enable stripping again on Windows Mozilla fixed the regression in bug 1651680. --- projects/firefox/mozconfig-windows-i686 | 1 + projects/firefox/mozconfig-windows-x86_64 | 1 + 2 files changed, 2 insertions(+) diff --git a/projects/firefox/mozconfig-windows-i686 b/projects/firefox/mozconfig-windows-i686 index f32db84..3708dd7 100644 --- a/projects/firefox/mozconfig-windows-i686 +++ b/projects/firefox/mozconfig-windows-i686 @@ -23,6 +23,7 @@ export MOZILLA_OFFICIAL=1 ac_add_options --disable-debug ac_add_options --enable-optimize +ac_add_options --enable-strip ac_add_options --enable-official-branding ac_add_options --enable-tor-browser-update diff --git a/projects/firefox/mozconfig-windows-x86_64 b/projects/firefox/mozconfig-windows-x86_64 index 8dac1e8..52956e2 100644 --- a/projects/firefox/mozconfig-windows-x86_64 +++ b/projects/firefox/mozconfig-windows-x86_64 @@ -23,6 +23,7 @@ export MOZILLA_OFFICIAL=1 ac_add_options --disable-debug ac_add_options --enable-optimize +ac_add_options --enable-strip ac_add_options --enable-official-branding ac_add_options --enable-tor-browser-update

1 0

[tor-browser/tor-browser-78.1.0esr-10.0-1] Bug 1651680 - Replace PKG_SKIP_STRIP with PKG_STRIP. r=nalexander
by gk＠torproject.org 11 Aug '20

11 Aug '20

commit 904d2bbec4fa8984cc29e27478ddcf69c4ba9594 Author: Mike Hommey <mh+mozilla(a)glandium.org> Date: Tue Aug 11 02:44:17 2020 +0000 Bug 1651680 - Replace PKG_SKIP_STRIP with PKG_STRIP. r=nalexander Differential Revision: https://phabricator.services.mozilla.com/D86648 --- moz.configure | 8 +------- python/mozbuild/mozpack/executables.py | 2 +- testing/testsuite-targets.mk | 2 +- toolkit/mozapps/installer/l10n-repack.py | 2 +- toolkit/mozapps/installer/strip.py | 2 +- toolkit/mozapps/installer/unpack.py | 2 +- 6 files changed, 6 insertions(+), 12 deletions(-) diff --git a/moz.configure b/moz.configure index e86018b1e814..f22c7185f300 100755 --- a/moz.configure +++ b/moz.configure @@ -682,13 +682,7 @@ set_config('ENABLE_STRIP', True, when='--enable-strip') js_option('--disable-install-strip', when=may_strip, help='Enable stripping of libs & executables when packaging') -# The nested depends is because depending on --enable-install-strip needs the -# `when=may_strip`, but we also need to test when may_strip is False. -@depends(depends('--enable-install-strip', when=may_strip)(lambda x: x), may_strip) -def pkg_skip_strip(install_strip, may_strip): - return not install_strip or not may_strip - -set_config('PKG_SKIP_STRIP', True, when=pkg_skip_strip) +set_config('PKG_STRIP', True, when='--enable-install-strip') @depends('--enable-strip', '--enable-install-strip', when=may_strip) diff --git a/python/mozbuild/mozpack/executables.py b/python/mozbuild/mozpack/executables.py index da12ab0aa33f..593a2e571a94 100644 --- a/python/mozbuild/mozpack/executables.py +++ b/python/mozbuild/mozpack/executables.py @@ -86,7 +86,7 @@ def may_strip(path): Return whether strip() should be called ''' from buildconfig import substs - return not substs.get('PKG_SKIP_STRIP') + return bool(substs.get('PKG_STRIP')) def strip(path): diff --git a/testing/testsuite-targets.mk b/testing/testsuite-targets.mk index 39a69c662ad0..157c030a09c3 100644 --- a/testing/testsuite-targets.mk +++ b/testing/testsuite-targets.mk @@ -195,7 +195,7 @@ stage-jstests: make-stage-dir ifdef OBJCOPY ifneq ($(OBJCOPY), :) # see build/autoconf/toolchain.m4:102 for why this is necessary -ifndef PKG_SKIP_STRIP +ifdef PKG_STRIP STRIP_COMPILED_TESTS := 1 endif endif diff --git a/toolkit/mozapps/installer/l10n-repack.py b/toolkit/mozapps/installer/l10n-repack.py index cf1b83dfe2c4..fbdadd0718a1 100644 --- a/toolkit/mozapps/installer/l10n-repack.py +++ b/toolkit/mozapps/installer/l10n-repack.py @@ -49,7 +49,7 @@ def main(): args = parser.parse_args() buildconfig.substs['USE_ELF_HACK'] = False - buildconfig.substs['PKG_SKIP_STRIP'] = True + buildconfig.substs['PKG_STRIP'] = False l10n.repack(args.build, args.l10n, extra_l10n=dict(args.extra_l10n), non_resources=args.non_resource, non_chrome=NON_CHROME) diff --git a/toolkit/mozapps/installer/strip.py b/toolkit/mozapps/installer/strip.py index d6e81f280bfa..734d6c8fa5a3 100644 --- a/toolkit/mozapps/installer/strip.py +++ b/toolkit/mozapps/installer/strip.py @@ -14,7 +14,7 @@ def strip(dir): copier = FileCopier() # The FileFinder will give use ExecutableFile instances for files # that can be stripped, and copying ExecutableFiles defaults to - # stripping them unless buildconfig.substs['PKG_SKIP_STRIP'] is set. + # stripping them when buildconfig.substs['PKG_STRIP'] is set. for p, f in FileFinder(dir, find_executables=True): copier.add(p, f) copier.copy(dir) diff --git a/toolkit/mozapps/installer/unpack.py b/toolkit/mozapps/installer/unpack.py index f7e9e00622a0..03af61b7b93c 100644 --- a/toolkit/mozapps/installer/unpack.py +++ b/toolkit/mozapps/installer/unpack.py @@ -18,7 +18,7 @@ def main(): options = parser.parse_args(sys.argv[1:]) buildconfig.substs['USE_ELF_HACK'] = False - buildconfig.substs['PKG_SKIP_STRIP'] = True + buildconfig.substs['PKG_STRIP'] = False unpack(options.directory, options.omnijar) if __name__ == "__main__":

1 0

[tor-browser/tor-browser-78.1.0esr-10.0-1] Bug 1651680 - Support --enable-strip/--enable-install-strip on mingw. r=nalexander
by gk＠torproject.org 11 Aug '20

11 Aug '20

commit 8ebe00420de77ac6b8814359f6377e133f403494 Author: Mike Hommey <mh+mozilla(a)glandium.org> Date: Tue Aug 11 02:53:34 2020 +0000 Bug 1651680 - Support --enable-strip/--enable-install-strip on mingw. r=nalexander Differential Revision: https://phabricator.services.mozilla.com/D86649 --- moz.configure | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/moz.configure b/moz.configure index f22c7185f300..9b0e78460113 100755 --- a/moz.configure +++ b/moz.configure @@ -671,21 +671,30 @@ add_old_configure_assignment( 'MOZ_DISABLE_ICF', '1', when=depends('--enable-icf')(lambda x: not x)) -@depends(compile_environment, target) -def may_strip(compile_environment, target): - return compile_environment and target.kernel != 'WINNT' +js_option('--enable-strip', when=compile_environment, + help='Enable stripping of libs & executables') -js_option('--enable-strip', when=may_strip, help='Enable stripping of libs & executables') +# This should be handled as a `when` once bug 1617793 is fixed. +@depends('--enable-strip', c_compiler, when=compile_environment) +def enable_strip(strip, c_compiler): + if strip and c_compiler.type != 'clang-cl': + return True -set_config('ENABLE_STRIP', True, when='--enable-strip') +set_config('ENABLE_STRIP', enable_strip) -js_option('--disable-install-strip', when=may_strip, +js_option('--disable-install-strip', when=compile_environment, help='Enable stripping of libs & executables when packaging') -set_config('PKG_STRIP', True, when='--enable-install-strip') +# This should be handled as a `when` once bug 1617793 is fixed. +@depends('--enable-install-strip', c_compiler, when=compile_environment) +def enable_install_strip(strip, c_compiler): + if strip and c_compiler.type != 'clang-cl': + return True + +set_config('PKG_STRIP', enable_install_strip) -@depends('--enable-strip', '--enable-install-strip', when=may_strip) +@depends('--enable-strip', '--enable-install-strip', when=compile_environment) def strip(strip, install_strip): return strip or install_strip

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gkgl/bug_40037_v2'
by sysrqb＠torproject.org 10 Aug '20

10 Aug '20

commit 0de43304b95255095b66a93fe326f82f818dca6a Merge: 01cb89f 99c1bd0 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Aug 10 17:17:27 2020 +0000 Merge remote-tracking branch 'gkgl/bug_40037_v2' projects/{clang => clang-source}/43909.patch | 0 projects/clang-source/build | 31 ++++ projects/clang-source/config | 32 ++++ projects/clang/build | 18 +- projects/clang/config | 23 +-- projects/fenix-clang/build | 18 +- projects/fenix-clang/config | 23 +-- projects/macosx-toolchain/43909.patch | 252 --------------------------- projects/macosx-toolchain/build | 30 +--- projects/macosx-toolchain/config | 25 +-- projects/mingw-w64-clang/build | 39 ++--- projects/mingw-w64-clang/config | 17 +- 12 files changed, 100 insertions(+), 408 deletions(-)

1 0

[tor-browser-build/master] Bug 40037: Add clang-source project
by sysrqb＠torproject.org 10 Aug '20

10 Aug '20

commit 56eed81fdbfb786dc2248347d899cbbfd1c591b2 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Aug 9 10:32:26 2020 +0000 Bug 40037: Add clang-source project --- projects/clang-source/build | 36 ++++++++++++++++++++++++++++++++++++ projects/clang-source/config | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) diff --git a/projects/clang-source/build b/projects/clang-source/build new file mode 100644 index 0000000..5aebfb1 --- /dev/null +++ b/projects/clang-source/build @@ -0,0 +1,36 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +distdir=/var/tmp/dist/[% project %] +mkdir -p /var/tmp/dist +mkdir -p /var/tmp/build +cd /var/tmp/build +tar -xf $rootdir/[% c('input_files_by_name/llvm') %] +tar -xf $rootdir/[% c('input_files_by_name/clang') %] +tar -xf $rootdir/[% c('input_files_by_name/clang-tools-extra') %] +tar -xf $rootdir/[% c('input_files_by_name/libcxx') %] +tar -xf $rootdir/[% c('input_files_by_name/libcxxabi') %] +tar -xf $rootdir/[% c('input_files_by_name/lld') %] +tar -xf $rootdir/[% c('input_files_by_name/compiler-rt') %] +tar -xf $rootdir/[% c('input_files_by_name/libunwind') %] +mv llvm-* llvm +# LLVM has reproducibility issues when optimizing bitcode, which we need to +# patch. See: #32053 for more details. +patch -p1 < $rootdir/43909.patch +mv clang-* llvm/tools/clang +extra_dir=llvm/tools/clang/tools/extra +mkdir $extra_dir +mv clang-tools-extra-* $extra_dir +mv libcxx-* llvm/projects/libcxx +mv libcxxabi-* llvm/projects/libcxxabi +mv lld-* llvm/tools/lld +mv compiler-rt-* llvm/projects/compiler-rt +# We need libunwind only for mingw-w64-clang, don't include it as tightly by +# putting it into projects/ +mv libunwind-* llvm/libunwind +mv llvm $distdir + +cd /var/tmp/dist +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/clang-source/config b/projects/clang-source/config new file mode 100644 index 0000000..d0ae90c --- /dev/null +++ b/projects/clang-source/config @@ -0,0 +1,32 @@ +# vim: filetype=yaml sw=2 +version: 9.0.1 +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +gpg_keyring: clang.gpg +sig_ext: sig + +input_files: + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/llvm-[% c("version") %].src.tar.xz' + name: llvm + file_gpg_id: 1 + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/clang-[% c("version") %].src.tar.xz' + name: clang + file_gpg_id: 1 + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/clang-tools-extra-[% c("version") %].src.tar.xz' + name: clang-tools-extra + file_gpg_id: 1 + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/libcxx-[% c("version") %].src.tar.xz' + name: libcxx + file_gpg_id: 1 + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/libcxxabi-[% c("version") %].src.tar.xz' + name: libcxxabi + file_gpg_id: 1 + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/lld-[% c("version") %].src.tar.xz' + name: lld + file_gpg_id: 1 + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/compiler-rt-[% c("version") %].src.tar.xz' + name: compiler-rt + file_gpg_id: 1 + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/libunwind-[% c("version") %].src.tar.xz' + name: libunwind + file_gpg_id: 1 + - filename: 43909.patch

1 0

[tor-browser-build/master] Bug 40037: Move projects over to clang-source
by sysrqb＠torproject.org 10 Aug '20

10 Aug '20

commit 99c1bd0186171c06fc5f07136e9efbd9192fb35a Author: Georg Koppen <gk(a)torproject.org> Date: Sun Aug 9 10:40:38 2020 +0000 Bug 40037: Move projects over to clang-source --- projects/{clang => clang-source}/43909.patch | 0 projects/clang-source/build | 27 ++- projects/clang/build | 18 +- projects/clang/config | 23 +-- projects/fenix-clang/build | 18 +- projects/fenix-clang/config | 23 +-- projects/macosx-toolchain/43909.patch | 252 --------------------------- projects/macosx-toolchain/build | 30 +--- projects/macosx-toolchain/config | 25 +-- projects/mingw-w64-clang/build | 39 ++--- projects/mingw-w64-clang/config | 17 +- 11 files changed, 48 insertions(+), 424 deletions(-) diff --git a/projects/clang/43909.patch b/projects/clang-source/43909.patch similarity index 100% rename from projects/clang/43909.patch rename to projects/clang-source/43909.patch diff --git a/projects/clang-source/build b/projects/clang-source/build index 5aebfb1..860b8e4 100644 --- a/projects/clang-source/build +++ b/projects/clang-source/build @@ -1,9 +1,5 @@ #!/bin/bash [% c("var/set_default_env") -%] -distdir=/var/tmp/dist/[% project %] -mkdir -p /var/tmp/dist -mkdir -p /var/tmp/build -cd /var/tmp/build tar -xf $rootdir/[% c('input_files_by_name/llvm') %] tar -xf $rootdir/[% c('input_files_by_name/clang') %] tar -xf $rootdir/[% c('input_files_by_name/clang-tools-extra') %] @@ -12,24 +8,23 @@ tar -xf $rootdir/[% c('input_files_by_name/libcxxabi') %] tar -xf $rootdir/[% c('input_files_by_name/lld') %] tar -xf $rootdir/[% c('input_files_by_name/compiler-rt') %] tar -xf $rootdir/[% c('input_files_by_name/libunwind') %] -mv llvm-* llvm + +mv llvm-[% c("version") %].src llvm # LLVM has reproducibility issues when optimizing bitcode, which we need to # patch. See: #32053 for more details. patch -p1 < $rootdir/43909.patch -mv clang-* llvm/tools/clang -extra_dir=llvm/tools/clang/tools/extra -mkdir $extra_dir -mv clang-tools-extra-* $extra_dir -mv libcxx-* llvm/projects/libcxx -mv libcxxabi-* llvm/projects/libcxxabi -mv lld-* llvm/tools/lld -mv compiler-rt-* llvm/projects/compiler-rt +mv clang-[% c("version") %].src llvm/tools/clang +# Having clang-tidy available seems like a good idea +mv clang-tools-extra-[% c("version") %].src llvm/tools/clang/tools/extra +mv libcxx-[% c("version") %].src llvm/projects/libcxx +mv libcxxabi-[% c("version") %].src llvm/projects/libcxxabi +mv lld-[% c("version") %].src llvm/tools/lld +mv compiler-rt-[% c("version") %].src llvm/projects/compiler-rt # We need libunwind only for mingw-w64-clang, don't include it as tightly by # putting it into projects/ -mv libunwind-* llvm/libunwind -mv llvm $distdir +mv libunwind-[% c("version") %].src llvm/libunwind +mv llvm [% project %] -cd /var/tmp/dist [% c('tar', { tar_src => [ project ], tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), diff --git a/projects/clang/build b/projects/clang/build index d61ed43..33688e5 100644 --- a/projects/clang/build +++ b/projects/clang/build @@ -15,22 +15,8 @@ export PATH="/var/tmp/dist/cmake/bin:$PATH" [% END -%] mkdir -p /var/tmp/build cd /var/tmp/build -tar -xf $rootdir/[% c('input_files_by_name/llvm') %] -tar -xf $rootdir/[% c('input_files_by_name/clang') %] -tar -xf $rootdir/[% c('input_files_by_name/libcxx') %] -tar -xf $rootdir/[% c('input_files_by_name/libcxxabi') %] -tar -xf $rootdir/[% c('input_files_by_name/lld') %] -tar -xf $rootdir/[% c('input_files_by_name/compiler-rt') %] -mv llvm-* llvm -# LLVM has reproducibility issues when optimizing bitcode, which we need to -# patch. See: #32053 for more details. -patch -p1 < $rootdir/43909.patch -mv clang-* llvm/tools/clang -mv libcxx-* llvm/projects/libcxx -mv libcxxabi-* llvm/projects/libcxxabi -mv lld-* llvm/tools/lld -mv compiler-rt-* llvm/projects/compiler-rt -cd llvm +tar -xf $rootdir/[% c('input_files_by_name/clang-source') %] +cd clang-source export LLVM_HOME=$(pwd) mkdir build cd build diff --git a/projects/clang/config b/projects/clang/config index c4b7efc..46d308a 100644 --- a/projects/clang/config +++ b/projects/clang/config @@ -1,8 +1,6 @@ # vim: filetype=yaml sw=2 version: 9.0.1 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -gpg_keyring: clang.gpg -sig_ext: sig var: container: @@ -18,22 +16,5 @@ input_files: enable: '[% c("var/linux") %]' - project: cmake name: cmake - - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/llvm-[% c("version") %].src.tar.xz' - name: llvm - file_gpg_id: 1 - - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/clang-[% c("version") %].src.tar.xz' - name: clang - file_gpg_id: 1 - - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/libcxx-[% c("version") %].src.tar.xz' - name: libcxx - file_gpg_id: 1 - - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/libcxxabi-[% c("version") %].src.tar.xz' - name: libcxxabi - file_gpg_id: 1 - - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/lld-[% c("version") %].src.tar.xz' - name: lld - file_gpg_id: 1 - - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/compiler-rt-[% c("version") %].src.tar.xz' - name: compiler-rt - file_gpg_id: 1 - - filename: 43909.patch + - project: clang-source + name: clang-source diff --git a/projects/fenix-clang/build b/projects/fenix-clang/build index d61ed43..33688e5 100644 --- a/projects/fenix-clang/build +++ b/projects/fenix-clang/build @@ -15,22 +15,8 @@ export PATH="/var/tmp/dist/cmake/bin:$PATH" [% END -%] mkdir -p /var/tmp/build cd /var/tmp/build -tar -xf $rootdir/[% c('input_files_by_name/llvm') %] -tar -xf $rootdir/[% c('input_files_by_name/clang') %] -tar -xf $rootdir/[% c('input_files_by_name/libcxx') %] -tar -xf $rootdir/[% c('input_files_by_name/libcxxabi') %] -tar -xf $rootdir/[% c('input_files_by_name/lld') %] -tar -xf $rootdir/[% c('input_files_by_name/compiler-rt') %] -mv llvm-* llvm -# LLVM has reproducibility issues when optimizing bitcode, which we need to -# patch. See: #32053 for more details. -patch -p1 < $rootdir/43909.patch -mv clang-* llvm/tools/clang -mv libcxx-* llvm/projects/libcxx -mv libcxxabi-* llvm/projects/libcxxabi -mv lld-* llvm/tools/lld -mv compiler-rt-* llvm/projects/compiler-rt -cd llvm +tar -xf $rootdir/[% c('input_files_by_name/clang-source') %] +cd clang-source export LLVM_HOME=$(pwd) mkdir build cd build diff --git a/projects/fenix-clang/config b/projects/fenix-clang/config index c4b7efc..46d308a 100644 --- a/projects/fenix-clang/config +++ b/projects/fenix-clang/config @@ -1,8 +1,6 @@ # vim: filetype=yaml sw=2 version: 9.0.1 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -gpg_keyring: clang.gpg -sig_ext: sig var: container: @@ -18,22 +16,5 @@ input_files: enable: '[% c("var/linux") %]' - project: cmake name: cmake - - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/llvm-[% c("version") %].src.tar.xz' - name: llvm - file_gpg_id: 1 - - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/clang-[% c("version") %].src.tar.xz' - name: clang - file_gpg_id: 1 - - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/libcxx-[% c("version") %].src.tar.xz' - name: libcxx - file_gpg_id: 1 - - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/libcxxabi-[% c("version") %].src.tar.xz' - name: libcxxabi - file_gpg_id: 1 - - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/lld-[% c("version") %].src.tar.xz' - name: lld - file_gpg_id: 1 - - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("version") %]/compiler-rt-[% c("version") %].src.tar.xz' - name: compiler-rt - file_gpg_id: 1 - - filename: 43909.patch + - project: clang-source + name: clang-source diff --git a/projects/macosx-toolchain/43909.patch b/projects/macosx-toolchain/43909.patch deleted file mode 100644 index 78d2a75..0000000 --- a/projects/macosx-toolchain/43909.patch +++ /dev/null @@ -1,252 +0,0 @@ -From c95310f2d4fd3c88241c3b5d6dbf6251d34a3256 Mon Sep 17 00:00:00 2001 -From: Nikita Popov <nikita.ppv(a)gmail.com> -Date: Sat, 16 Nov 2019 16:22:18 +0100 -Subject: [PATCH] Restructure caching - -Variant on D70103. The caching is switched to always use a BB to -cache entry map, which then contains per-value caches. A separate -set contains value handles with a deletion callback. This allows us -to properly invalidate overdefined values. - -A possible alternative would be to always cache by value first and -have per-BB maps/sets in the each cache entry. In that case we could -use a ValueMap and would avoid the separate value handle set. I went -with the BB indexing at the top level to make it easier to integrate -D69914, but possibly that's not the right choice. - -Differential Revision: https://reviews.llvm.org/D70376 - -diff --git a/llvm/lib/Analysis/LazyValueInfo.cpp b/llvm/lib/Analysis/LazyValueInfo.cpp -index 110c085d3f3..aa6862cb588 100644 ---- a/llvm/lib/Analysis/LazyValueInfo.cpp -+++ b/llvm/lib/Analysis/LazyValueInfo.cpp -@@ -133,12 +133,9 @@ namespace { - /// A callback value handle updates the cache when values are erased. - class LazyValueInfoCache; - struct LVIValueHandle final : public CallbackVH { -- // Needs to access getValPtr(), which is protected. -- friend struct DenseMapInfo<LVIValueHandle>; -- - LazyValueInfoCache *Parent; - -- LVIValueHandle(Value *V, LazyValueInfoCache *P) -+ LVIValueHandle(Value *V, LazyValueInfoCache *P = nullptr) - : CallbackVH(V), Parent(P) { } - - void deleted() override; -@@ -152,89 +149,63 @@ namespace { - /// This is the cache kept by LazyValueInfo which - /// maintains information about queries across the clients' queries. - class LazyValueInfoCache { -- /// This is all of the cached block information for exactly one Value*. -- /// The entries are sorted by the BasicBlock* of the -- /// entries, allowing us to do a lookup with a binary search. -- /// Over-defined lattice values are recorded in OverDefinedCache to reduce -- /// memory overhead. -- struct ValueCacheEntryTy { -- ValueCacheEntryTy(Value *V, LazyValueInfoCache *P) : Handle(V, P) {} -- LVIValueHandle Handle; -- SmallDenseMap<PoisoningVH<BasicBlock>, ValueLatticeElement, 4> BlockVals; -+ /// This is all of the cached information for one basic block. It contains -+ /// the per-value lattice elements, as well as a separate set for -+ /// overdefined values to reduce memory usage. -+ struct BlockCacheEntryTy { -+ SmallDenseMap<AssertingVH<Value>, ValueLatticeElement, 4> LatticeElements; -+ SmallDenseSet<AssertingVH<Value>, 4> OverDefined; - }; - -- /// This tracks, on a per-block basis, the set of values that are -- /// over-defined at the end of that block. -- typedef DenseMap<PoisoningVH<BasicBlock>, SmallPtrSet<Value *, 4>> -- OverDefinedCacheTy; -- /// Keep track of all blocks that we have ever seen, so we -- /// don't spend time removing unused blocks from our caches. -- DenseSet<PoisoningVH<BasicBlock> > SeenBlocks; -- -- /// This is all of the cached information for all values, -- /// mapped from Value* to key information. -- DenseMap<Value *, std::unique_ptr<ValueCacheEntryTy>> ValueCache; -- OverDefinedCacheTy OverDefinedCache; -- -+ /// Cached information per basic block. -+ DenseMap<PoisoningVH<BasicBlock>, BlockCacheEntryTy> BlockCache; -+ /// Set of value handles used to erase values from the cache on deletion. -+ DenseSet<LVIValueHandle, DenseMapInfo<Value *>> ValueHandles; - - public: - void insertResult(Value *Val, BasicBlock *BB, - const ValueLatticeElement &Result) { -- SeenBlocks.insert(BB); -- -+ auto &CacheEntry = BlockCache.try_emplace(BB).first->second; - // Insert over-defined values into their own cache to reduce memory - // overhead. - if (Result.isOverdefined()) -- OverDefinedCache[BB].insert(Val); -- else { -- auto It = ValueCache.find_as(Val); -- if (It == ValueCache.end()) { -- ValueCache[Val] = make_unique<ValueCacheEntryTy>(Val, this); -- It = ValueCache.find_as(Val); -- assert(It != ValueCache.end() && "Val was just added to the map!"); -- } -- It->second->BlockVals[BB] = Result; -- } -- } -- -- bool isOverdefined(Value *V, BasicBlock *BB) const { -- auto ODI = OverDefinedCache.find(BB); -- -- if (ODI == OverDefinedCache.end()) -- return false; -+ CacheEntry.OverDefined.insert(Val); -+ else -+ CacheEntry.LatticeElements.insert({ Val, Result }); - -- return ODI->second.count(V); -+ auto HandleIt = ValueHandles.find_as(Val); -+ if (HandleIt == ValueHandles.end()) -+ ValueHandles.insert({ Val, this }); - } - - bool hasCachedValueInfo(Value *V, BasicBlock *BB) const { -- if (isOverdefined(V, BB)) -- return true; -- -- auto I = ValueCache.find_as(V); -- if (I == ValueCache.end()) -+ auto It = BlockCache.find(BB); -+ if (It == BlockCache.end()) - return false; - -- return I->second->BlockVals.count(BB); -+ return It->second.OverDefined.count(V) || -+ It->second.LatticeElements.count(V); - } - - ValueLatticeElement getCachedValueInfo(Value *V, BasicBlock *BB) const { -- if (isOverdefined(V, BB)) -+ auto It = BlockCache.find(BB); -+ if (It == BlockCache.end()) -+ return ValueLatticeElement(); -+ -+ if (It->second.OverDefined.count(V)) - return ValueLatticeElement::getOverdefined(); - -- auto I = ValueCache.find_as(V); -- if (I == ValueCache.end()) -+ auto LatticeIt = It->second.LatticeElements.find(V); -+ if (LatticeIt == It->second.LatticeElements.end()) - return ValueLatticeElement(); -- auto BBI = I->second->BlockVals.find(BB); -- if (BBI == I->second->BlockVals.end()) -- return ValueLatticeElement(); -- return BBI->second; -+ -+ return LatticeIt->second; - } - - /// clear - Empty the cache. - void clear() { -- SeenBlocks.clear(); -- ValueCache.clear(); -- OverDefinedCache.clear(); -+ BlockCache.clear(); -+ ValueHandles.clear(); - } - - /// Inform the cache that a given value has been deleted. -@@ -248,23 +219,18 @@ namespace { - /// OldSucc might have (unless also overdefined in NewSucc). This just - /// flushes elements from the cache and does not add any. - void threadEdgeImpl(BasicBlock *OldSucc,BasicBlock *NewSucc); -- -- friend struct LVIValueHandle; - }; - } - - void LazyValueInfoCache::eraseValue(Value *V) { -- for (auto I = OverDefinedCache.begin(), E = OverDefinedCache.end(); I != E;) { -- // Copy and increment the iterator immediately so we can erase behind -- // ourselves. -- auto Iter = I++; -- SmallPtrSetImpl<Value *> &ValueSet = Iter->second; -- ValueSet.erase(V); -- if (ValueSet.empty()) -- OverDefinedCache.erase(Iter); -+ for (auto &Pair : BlockCache) { -+ Pair.second.LatticeElements.erase(V); -+ Pair.second.OverDefined.erase(V); - } - -- ValueCache.erase(V); -+ auto HandleIt = ValueHandles.find_as(V); -+ if (HandleIt != ValueHandles.end()) -+ ValueHandles.erase(HandleIt); - } - - void LVIValueHandle::deleted() { -@@ -274,18 +240,7 @@ void LVIValueHandle::deleted() { - } - - void LazyValueInfoCache::eraseBlock(BasicBlock *BB) { -- // Shortcut if we have never seen this block. -- DenseSet<PoisoningVH<BasicBlock> >::iterator I = SeenBlocks.find(BB); -- if (I == SeenBlocks.end()) -- return; -- SeenBlocks.erase(I); -- -- auto ODI = OverDefinedCache.find(BB); -- if (ODI != OverDefinedCache.end()) -- OverDefinedCache.erase(ODI); -- -- for (auto &I : ValueCache) -- I.second->BlockVals.erase(BB); -+ BlockCache.erase(BB); - } - - void LazyValueInfoCache::threadEdgeImpl(BasicBlock *OldSucc, -@@ -303,10 +258,11 @@ void LazyValueInfoCache::threadEdgeImpl(BasicBlock *OldSucc, - std::vector<BasicBlock*> worklist; - worklist.push_back(OldSucc); - -- auto I = OverDefinedCache.find(OldSucc); -- if (I == OverDefinedCache.end()) -+ auto I = BlockCache.find(OldSucc); -+ if (I == BlockCache.end() || I->second.OverDefined.empty()) - return; // Nothing to process here. -- SmallVector<Value *, 4> ValsToClear(I->second.begin(), I->second.end()); -+ SmallVector<Value *, 4> ValsToClear(I->second.OverDefined.begin(), -+ I->second.OverDefined.end()); - - // Use a worklist to perform a depth-first search of OldSucc's successors. - // NOTE: We do not need a visited list since any blocks we have already -@@ -320,10 +276,10 @@ void LazyValueInfoCache::threadEdgeImpl(BasicBlock *OldSucc, - if (ToUpdate == NewSucc) continue; - - // If a value was marked overdefined in OldSucc, and is here too... -- auto OI = OverDefinedCache.find(ToUpdate); -- if (OI == OverDefinedCache.end()) -+ auto OI = BlockCache.find(ToUpdate); -+ if (OI == BlockCache.end() || OI->second.OverDefined.empty()) - continue; -- SmallPtrSetImpl<Value *> &ValueSet = OI->second; -+ auto &ValueSet = OI->second.OverDefined; - - bool changed = false; - for (Value *V : ValsToClear) { -@@ -333,11 +289,6 @@ void LazyValueInfoCache::threadEdgeImpl(BasicBlock *OldSucc, - // If we removed anything, then we potentially need to update - // blocks successors too. - changed = true; -- -- if (ValueSet.empty()) { -- OverDefinedCache.erase(OI); -- break; -- } - } - - if (!changed) continue; --- -2.24.0 - diff --git a/projects/macosx-toolchain/build b/projects/macosx-toolchain/build index 0f67c38..5716a9e 100644 --- a/projects/macosx-toolchain/build +++ b/projects/macosx-toolchain/build @@ -2,19 +2,14 @@ [% c("var/set_default_env") -%] builddir=/var/tmp/build mkdir $builddir -distdir="/var/tmp/dist/[% project %]" +distdir=/var/tmp/dist/[% project %] mkdir -p "$distdir" tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/ninja') %] -tar -C /var/tmp/dist -xf [% c('input_files_by_name/clang_compiler') %] -tar -C $builddir -xf [% c('input_files_by_name/llvm') %] -tar -C $builddir -xf [% c('input_files_by_name/clang') %] -tar -C $builddir -xf [% c('input_files_by_name/libcxx') %] -tar -C $builddir -xf [% c('input_files_by_name/libcxxabi') %] -tar -C $builddir -xf [% c('input_files_by_name/lld') %] -tar -C $builddir -xf [% c('input_files_by_name/compiler-rt') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/clang') %] tar -C $distdir -xf [% c('input_files_by_name/SDK') %] tar -C $distdir -xf [% c('input_files_by_name/cctools') %] +tar -C $builddir -xf [% c('input_files_by_name/clang-source') %] clangdir=/var/tmp/dist/clang/bin cctoolsdir=$distdir/cctools/bin @@ -24,19 +19,10 @@ sysrootdir=$distdir/MacOSX10.11.sdk/ export PATH="/var/tmp/dist/ninja:/var/tmp/dist/cmake/bin:$cctoolsdir:$PATH" export MACOSX_DEPLOYMENT_TARGET=[% c("var/macosx_deployment_target") %] -cd $builddir -mv llvm-* llvm -# LLVM has reproducibility issues when optimizing bitcode, which we need to -# patch. See: #32053 for more details. -patch -p1 < $rootdir/43909.patch -mv clang-* llvm/tools/clang -mv libcxx-* llvm/projects/libcxx -mv libcxxabi-* llvm/projects/libcxxabi -mv lld-* llvm/tools/lld -mv compiler-rt-* compiler-rt +cd $builddir/clang-source/projects patch -p1 < $rootdir/compiler-rt-cross-compile.patch patch -p1 < $rootdir/compiler-rt-no-codesign.patch -mv compiler-rt llvm/projects +cd .. mkdir build cd build # We follow quite closely Mozilla's build/build-clang/build-clang.py with the @@ -68,7 +54,7 @@ cmake -GNinja \ -DCMAKE_SYSTEM_VERSION=10.10 \ -DLLVM_ENABLE_THREADS=OFF \ -DCOMPILER_RT_BUILD_XRAY=OFF \ - -DLIBCXXABI_LIBCXX_INCLUDES=$builddir/llvm/projects/libcxx/include \ + -DLIBCXXABI_LIBCXX_INCLUDES=$builddir/clang-source/projects/libcxx/include \ -DCMAKE_OSX_SYSROOT=$sysrootdir \ -DCMAKE_FIND_ROOT_PATH=$sysrootdir \ -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER \ @@ -78,13 +64,13 @@ cmake -GNinja \ -DCMAKE_OSX_ARCHITECTURES=x86_64 \ -DDARWIN_osx_ARCHS=x86_64 \ -DDARWIN_osx_SYSROOT=$sysrootdir \ - -DLLVM_DEFAULT_TARGET_TRIPLE=x86_64-apple-darwin $builddir/llvm + -DLLVM_DEFAULT_TARGET_TRIPLE=x86_64-apple-darwin $builddir/clang-source ninja install -v # We now have a native macosx64 toolchain. # What we want is a native linux64 toolchain which can target macosx64. # Overlay the linux64 toolchain that we used for this build. Note: we don't do -# any ASan builds for macOS (yet). Once we do we need to preserve at least +# any ASan builds for macOS (yet). Once we do that we need to preserve at least # `llvm-symbolizer` as that one seems to get shipped with sanitizer builds (at # least that's what Mozilla claims). cd $distdir diff --git a/projects/macosx-toolchain/config b/projects/macosx-toolchain/config index 937478b..95f650b 100644 --- a/projects/macosx-toolchain/config +++ b/projects/macosx-toolchain/config @@ -1,8 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' version: 10.11-1 -gpg_keyring: clang.gpg -sig_ext: sig var: container: use_container: 1 @@ -20,7 +18,7 @@ var: input_files: - project: container-image - - name: clang_compiler + - name: clang project: clang - name: cctools project: cctools @@ -33,24 +31,7 @@ input_files: - name: SDK URL: https://people.torproject.org/~gk/mirrors/sources/MacOSX10.11.sdk.tar.bz2 sha256sum: d11e410d757d023be66d2fe7eaa85a1d232da3ac04f177eff3d8b8275cd9ffca - - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% pc("clang", "version") %]/llvm-[% pc("clang", "version") %].src.tar.xz' - name: llvm - file_gpg_id: 1 - - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% pc("clang", "version") %]/clang-[% pc("clang", "version") %].src.tar.xz' - name: clang - file_gpg_id: 1 - - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% pc("clang", "version") %]/libcxx-[% pc("clang", "version") %].src.tar.xz' - name: libcxx - file_gpg_id: 1 - - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% pc("clang", "version") %]/libcxxabi-[% pc("clang", "version") %].src.tar.xz' - name: libcxxabi - file_gpg_id: 1 - - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% pc("clang", "version") %]/lld-[% pc("clang", "version") %].src.tar.xz' - name: lld - file_gpg_id: 1 - - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% pc("clang", "version") %]/compiler-rt-[% pc("clang", "version") %].src.tar.xz' - name: compiler-rt - file_gpg_id: 1 + - name: clang-source + project: clang-source - filename: compiler-rt-cross-compile.patch - filename: compiler-rt-no-codesign.patch - - filename: 43909.patch diff --git a/projects/mingw-w64-clang/build b/projects/mingw-w64-clang/build index ecb0e2c..44a913f 100644 --- a/projects/mingw-w64-clang/build +++ b/projects/mingw-w64-clang/build @@ -11,14 +11,7 @@ mkdir -p $builddir cd $builddir tar -xf $rootdir/mingw-w64-clang-[% c('version') %].tar.gz mv mingw-w64-clang-[% c('version') %] mingw-w64-clang -tar -xf $rootdir/[% c('input_files_by_name/libcxx') %] -mv libcxx-* libcxx -tar -xf $rootdir/[% c('input_files_by_name/libcxxabi') %] -mv libcxxabi-* libcxxabi -tar -xf $rootdir/[% c('input_files_by_name/libunwind') %] -mv libunwind-* libunwind -tar -xf $rootdir/[% c('input_files_by_name/compiler-rt') %] -mv compiler-rt-* compiler-rt +tar -xf $rootdir/[% c('input_files_by_name/clang-source') %] tar -xf $rootdir/[% c('input_files_by_name/llvm-mingw') %] # Adding the wrappers and symlinks we need @@ -98,9 +91,8 @@ make -j[% c("buildconf/num_procs") %] make -j[% c("buildconf/num_procs") %] install # compiler-rt -cd $builddir/compiler-rt +cd $builddir/clang-source/projects/compiler-rt mkdir build && cd build -CLANG_VERSION=$(basename $(dirname $(dirname $(dirname $($CC --print-libgcc-file-name -rtlib=compiler-rt))))) cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_C_COMPILER=$CC \ -DCMAKE_SYSTEM_NAME=Windows \ @@ -109,13 +101,14 @@ cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_C_COMPILER_WORKS=1 \ -DCMAKE_C_COMPILER_TARGET=$compiler_rt_machine-windows-gnu \ -DCOMPILER_RT_DEFAULT_TARGET_ONLY=TRUE \ - $builddir/compiler-rt/lib/builtins + $builddir/clang-source/projects/compiler-rt/lib/builtins make -j[% c("buildconf/num_procs") %] - mkdir -p $distdir/lib/clang/$CLANG_VERSION/lib/windows - cp lib/windows/libclang_rt.builtins-$compiler_rt_machine.a $distdir/lib/clang/$CLANG_VERSION/lib/windows/ + rtdir=$distdir/lib/clang/[% pc("clang-source", "version") %]/lib/windows + mkdir -p $rtdir + cp lib/windows/libclang_rt.builtins-$compiler_rt_machine.a $rtdir/ # libunwind -cd $builddir/libunwind +cd $builddir/clang-source/libunwind mkdir build && cd build cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$distdir/[% c("arch") %]-w64-mingw32 \ @@ -136,14 +129,14 @@ cmake -DCMAKE_BUILD_TYPE=Release \ -DLIBUNWIND_ENABLE_THREADS=TRUE \ -DLIBUNWIND_ENABLE_SHARED=FALSE \ -DLIBUNWIND_ENABLE_CROSS_UNWINDING=FALSE \ - -DCMAKE_CXX_FLAGS="-Wno-dll-attribute-on-redeclaration -nostdinc++ -I$builddir/libcxx/include -DPSAPI_VERSION=2" \ + -DCMAKE_CXX_FLAGS="-Wno-dll-attribute-on-redeclaration -nostdinc++ -I$builddir/clang-source/projects/libcxx/include -DPSAPI_VERSION=2" \ -DCMAKE_C_FLAGS="-Wno-dll-attribute-on-redeclaration" \ - $builddir/libunwind + $builddir/clang-source/libunwind make -j[% c("buildconf/num_procs") %] make -j[% c("buildconf/num_procs") %] install # libcxxabi -cd $builddir/libcxxabi +cd $builddir/clang-source/projects/libcxxabi mkdir build && cd build cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$distdir/[% c("arch") %]-w64-mingw32 \ @@ -162,16 +155,16 @@ cmake -DCMAKE_BUILD_TYPE=Release \ -DLIBCXXABI_ENABLE_THREADS=ON \ -DLIBCXXABI_TARGET_TRIPLE=[% c("arch") %]-w64-mingw32 \ -DLIBCXXABI_ENABLE_SHARED=OFF \ - -DLIBCXXABI_LIBCXX_INCLUDES=$builddir/libcxx/include \ + -DLIBCXXABI_LIBCXX_INCLUDES=$builddir/clang-source/projects/libcxx/include \ -DLLVM_NO_OLD_LIBSTDCXX=TRUE \ -DCXX_SUPPORTS_CXX11=TRUE \ -DCXX_SUPPORTS_CXX_STD=True \ -DCMAKE_CXX_FLAGS="-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS -D_LIBCPP_HAS_THREAD_API_WIN32" \ - $builddir/libcxxabi + $builddir/clang-source/projects/libcxxabi make -j[% c("buildconf/num_procs") %] VERBOSE=1 # libcxx -cd $builddir/libcxx +cd $builddir/clang-source/projects/libcxx mkdir build && cd build cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$distdir/[% c("arch") %]-w64-mingw32 \ @@ -197,10 +190,10 @@ cmake -DCMAKE_BUILD_TYPE=Release \ -DLIBCXX_ENABLE_FILESYSTEM=OFF \ -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=TRUE \ -DLIBCXX_CXX_ABI=libcxxabi \ - -DLIBCXX_CXX_ABI_INCLUDE_PATHS=$builddir/libcxxabi/include \ - -DLIBCXX_CXX_ABI_LIBRARY_PATH=$builddir/libcxxabi/build/lib \ + -DLIBCXX_CXX_ABI_INCLUDE_PATHS=$builddir/clang-source/projects/libcxxabi/include \ + -DLIBCXX_CXX_ABI_LIBRARY_PATH=$builddir/clang-source/projects/libcxxabi/build/lib \ -DCMAKE_CXX_FLAGS="-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS" \ - $builddir/libcxx + $builddir/clang-source/projects/libcxx make -j[% c("buildconf/num_procs") %] VERBOSE=1 make -j[% c("buildconf/num_procs") %] install diff --git a/projects/mingw-w64-clang/config b/projects/mingw-w64-clang/config index 9ae0e61..1bf5954 100644 --- a/projects/mingw-w64-clang/config +++ b/projects/mingw-w64-clang/config @@ -3,9 +3,6 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: https://git.code.sf.net/p/mingw-w64/mingw-w64 git_hash: 1b373beec6d07478ffba33726bb3bb21f32e4411 version: '[% c("abbrev") %]' -llvm_version: 9.0.1 -gpg_keyring: clang.gpg -sig_ext: sig var: container: @@ -21,18 +18,8 @@ input_files: name: clang - project: cmake name: cmake - - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("llvm_version") %]/libcxx-[% c("llvm_version") %].src.tar.xz' - name: libcxx - file_gpg_id: 1 - - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("llvm_version") %]/libcxxabi-[% c("llvm_version") %].src.tar.xz' - name: libcxxabi - file_gpg_id: 1 - - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("llvm_version") %]/libunwind-[% c("llvm_version") %].src.tar.xz' - name: libunwind - file_gpg_id: 1 - - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% c("llvm_version") %]/compiler-rt-[% c("llvm_version") %].src.tar.xz' - name: compiler-rt - file_gpg_id: 1 + - project: clang-source + name: clang-source - project: llvm-mingw name: llvm-mingw - filename: mingw-winrt.patch

1 0

[tor-browser-build/master] Bug 40010: Add NSS for application-services
by sysrqb＠torproject.org 10 Aug '20

10 Aug '20

commit 53131fdc6d54bdd3bda261c64aa81fc3e8fbe228 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jun 30 10:12:32 2020 +0000 Bug 40010: Add NSS for application-services --- projects/nss/bug_13028.patch | 79 ++++++++++++++++++++++++ projects/nss/build | 139 +++++++++++++++++++++++++++++++++++++++++++ projects/nss/config | 27 +++++++++ projects/nss/config.patch | 37 ++++++++++++ projects/nss/configure.patch | 11 ++++ 5 files changed, 293 insertions(+) diff --git a/projects/nss/bug_13028.patch b/projects/nss/bug_13028.patch new file mode 100644 index 0000000..60bbd35 --- /dev/null +++ b/projects/nss/bug_13028.patch @@ -0,0 +1,79 @@ +From 2f0888c348561249d3083555db33c5619840dbfa Mon Sep 17 00:00:00 2001 +From: Mike Perry <mikeperry-git(a)torproject.org> +Date: Mon, 29 Sep 2014 14:30:19 -0700 +Subject: [PATCH] Bug 13028: Prevent potential proxy bypass cases. + +It looks like these cases should only be invoked in the NSS command line +tools, and not the browser, but I decided to patch them anyway because there +literally is a maze of network function pointers being passed around, and it's +very hard to tell if some random code might not pass in the proper proxied +versions of the networking code here by accident. + +diff --git a/security/nss/lib/certhigh/ocsp.c b/security/nss/lib/certhigh/ocsp.c +index cea8456606bf..86fa971cfbef 100644 +--- a/security/nss/lib/certhigh/ocsp.c ++++ b/security/nss/lib/certhigh/ocsp.c +@@ -2932,6 +2932,14 @@ ocsp_ConnectToHost(const char *host, PRUint16 port) + PRNetAddr addr; + char *netdbbuf = NULL; + ++ // XXX: Do we need a unittest ifdef here? We don't want to break the tests, but ++ // we want to ensure nothing can ever hit this code in production. ++#if 1 ++ printf("Tor Browser BUG: Attempted OSCP direct connect to %s, port %u\n", host, ++ port); ++ goto loser; ++#endif ++ + sock = PR_NewTCPSocket(); + if (sock == NULL) + goto loser; +diff --git a/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c b/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c +index e8698376b5be..85791d84a932 100644 +--- a/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c ++++ b/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c +@@ -1334,6 +1334,13 @@ pkix_pl_Socket_Create( + plContext), + PKIX_COULDNOTCREATESOCKETOBJECT); + ++ // XXX: Do we need a unittest ifdef here? We don't want to break the tests, but ++ // we want to ensure nothing can ever hit this code in production. ++#if 1 ++ printf("Tor Browser BUG: Attempted pkix direct socket connect\n"); ++ PKIX_ERROR(PKIX_PRNEWTCPSOCKETFAILED); ++#endif ++ + socket->isServer = isServer; + socket->timeout = timeout; + socket->clientSock = NULL; +@@ -1433,6 +1440,13 @@ pkix_pl_Socket_CreateByName( + + localCopyName = PL_strdup(serverName); + ++ // XXX: Do we need a unittest ifdef here? We don't want to break the tests, but ++ // we want to ensure nothing can ever hit this code in production. ++#if 1 ++ printf("Tor Browser BUG: Attempted pkix direct connect to %s\n", serverName); ++ PKIX_ERROR(PKIX_PRNEWTCPSOCKETFAILED); ++#endif ++ + sepPtr = strchr(localCopyName, ':'); + /* First strip off the portnum, if present, from the end of the name */ + if (sepPtr) { +@@ -1582,6 +1596,13 @@ pkix_pl_Socket_CreateByHostAndPort( + PKIX_ENTER(SOCKET, "pkix_pl_Socket_CreateByHostAndPort"); + PKIX_NULLCHECK_THREE(hostname, pStatus, pSocket); + ++ // XXX: Do we need a unittest ifdef here? We don't want to break the tests, but ++ // we want to ensure nothing can ever hit this code in production. ++#if 1 ++ printf("Tor Browser BUG: Attempted pkix direct connect to %s, port %u\n", hostname, ++ portnum); ++ PKIX_ERROR(PKIX_PRNEWTCPSOCKETFAILED); ++#endif + + prstatus = PR_GetHostByName(hostname, buf, sizeof(buf), &hostent); + +-- +2.27.0 + diff --git a/projects/nss/build b/projects/nss/build new file mode 100644 index 0000000..791a680 --- /dev/null +++ b/projects/nss/build @@ -0,0 +1,139 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] +distdir=/var/tmp/dist/nss +builddir=/var/tmp/build/[% project %] +mkdir /var/tmp/build +tar -C /var/tmp/dist -xf [% c('input_files_by_name/ninja') %] +export PATH=/var/tmp/dist/ninja:$PATH + +# application-services uses a newer NDK, 21d, than all the other projects... +export ANDROID_NDK_API_VERSION=[% pc("fenix-android-toolchain", "var/android_ndk_version") %][% pc('fenix-android-toolchain', 'var/android_ndk_revision') %] +export ANDROID_NDK_HOME=/var/tmp/dist/[% c('var/compiler') %]/android-ndk/android-ndk-r$ANDROID_NDK_API_VERSION +# We need to add the new path to our build tools to PATH +export PATH=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH +export ANDROID_NDK_ROOT=$ANDROID_NDK_HOME +export NDK_HOST_TAG=linux-x86_64 + +nspr_64="" +[% IF c("var/configure_host") == "arm-linux-androideabi" -%] + gyp_arch="arm" +[% ELSIF c("var/configure_host") == "i686-linux-android" -%] + gyp_arch="ia32" +[% ELSIF c("var/configure_host") == "x86_64-linux-android" -%] + gyp_arch="x64" + nspr_64="--enable-64bit" +[% ELSIF c("var/configure_host") == "aarch64-linux-android" -%] + gyp_arch="arm64" + nspr_64="--enable-64bit" +[% END -%] + +export AR="[% c('var/cross_prefix') %]-ar" +# XXX: Mozilla really uses the NDK_API_VERSION here, which is weird. +export CC="[% c('var/cross_prefix') %][% pc('fenix-android-toolchain', 'var/android_ndk_version') %]-clang" +export CXX="[% c('var/cross_prefix') %][% pc('fenix-android-toolchain', 'var/android_ndk_version') %]-clang++" +export LD="[% c('var/cross_prefix') %]-ld" +export NM="[% c('var/cross_prefix') %]-nm" +export RANLIB="[% c('var/cross_prefix') %]-ranlib" +export READELF="[% c('var/cross_prefix') %]-readelf" + +tar -C /var/tmp/build -xf [% c('input_files_by_name/nss') %] +mv /var/tmp/build/[% project %]-[% c('version') %] $builddir +cd $builddir +# Early return hack to prevent NSPR Android setup +# which does not work with ndk unified headers and clang. See: +# application-services/libs/build-all.sh +cat $rootdir/configure.patch | patch nspr/configure +# Some NSS symbols clash with OpenSSL symbols, rename them using +# C preprocessor define macros. See: +# application-services/libs/build-all.sh +patch -p2 < $rootdir/config.patch +# Let's apply our proxy bypass defense-in-depth here as well to be on the safe +# side. +patch -p2 < $rootdir/bug_13028.patch + +# Building NSPR +mkdir $builddir/nspr_build +cd $builddir/nspr_build +../nspr/configure \ + $nspr_64 \ + --target=[% c("var/configure_host") %] \ + --disable-debug \ + --enable-optimize +make +cd .. + +# Building NSS +mkdir $builddir/nss_build +gyp -f ninja-android "$builddir/nss/nss.gyp" \ + --depth "$builddir/nss/" \ + --generator-output=. \ + -DOS=android \ + -Dnspr_lib_dir="$builddir/nspr_build/dist/lib" \ + -Dnspr_include_dir="$builddir/nspr_build/dist/include/nspr" \ + -Dnss_dist_dir="$builddir/nss_build" \ + -Dnss_dist_obj_dir="$builddir/nss_build" \ + -Dhost_arch="$gyp_arch" \ + -Dtarget_arch="$gyp_arch" \ + -Dstatic_libs=1 \ + -Ddisable_dbm=1 \ + -Dsign_libs=0 \ + -Denable_sslkeylogfile=0 \ + -Ddisable_tests=1 \ + -Ddisable_libpkix=1 + +gendir="$builddir/nss/out/Release" +ninja -C "$gendir" + +mkdir -p $distdir/include/nss +mkdir -p $distdir/lib +cp -p -L "$builddir/nss_build/lib/libcertdb.a" "$distdir/lib" +cp -p -L "$builddir/nss_build/lib/libcerthi.a" "$distdir/lib" +cp -p -L "$builddir/nss_build/lib/libcryptohi.a" "$distdir/lib" +cp -p -L "$builddir/nss_build/lib/libfreebl_static.a" "$distdir/lib" +cp -p -L "$builddir/nss_build/lib/libnss_static.a" "$distdir/lib" +cp -p -L "$builddir/nss_build/lib/libnssb.a" "$distdir/lib" +cp -p -L "$builddir/nss_build/lib/libnssdev.a" "$distdir/lib" +cp -p -L "$builddir/nss_build/lib/libnsspki.a" "$distdir/lib" +cp -p -L "$builddir/nss_build/lib/libnssutil.a" "$distdir/lib" +cp -p -L "$builddir/nss_build/lib/libpk11wrap_static.a" "$distdir/lib" +cp -p -L "$builddir/nss_build/lib/libpkcs12.a" "$distdir/lib" +cp -p -L "$builddir/nss_build/lib/libpkcs7.a" "$distdir/lib" +cp -p -L "$builddir/nss_build/lib/libsmime.a" "$distdir/lib" +cp -p -L "$builddir/nss_build/lib/libsoftokn_static.a" "$distdir/lib" +cp -p -L "$builddir/nss_build/lib/libssl.a" "$distdir/lib" + +# HW specific. +# https://searchfox.org/nss/rev/08c4d05078d00089f8d7540651b0717a9d66f87e/lib/… +[% IF c("var/configure_host") == "i686-linux-android" || c("var/configure_host") == "x86_64-linux-android"-%] + cp -p -L "$builddir/nss_build/lib/libgcm-aes-x86_c_lib.a" "$distdir/lib" +[% END %] +[% IF c("var/configure_host") == "arm-linux-androideabi" || c("var/configure_host") == "aarch64-linux-android"-%] + cp -p -L "$builddir/nss_build/lib/libarmv8_c_lib.a" "$distdir/lib" +[% END %] +[% IF c("var/configure_host") == "aarch64-linux-android" -%] + cp -p -L "$builddir/nss_build/lib/libgcm-aes-aarch64_c_lib.a" "$distdir/lib" +[% END %] +[% IF c("var/configure_host") == "arm-linux-androideabi" -%] + cp -p -L "$builddir/nss_build/lib/libgcm-aes-arm32-neon_c_lib.a" "$distdir/lib" +[% END %] +# https://searchfox.org/nss/rev/08c4d05078d00089f8d7540651b0717a9d66f87e/lib/… +# https://searchfox.org/nss/rev/08c4d05078d00089f8d7540651b0717a9d66f87e/lib/… +[% IF c("var/configure_host") == "x86_64-linux-android"-%] + cp -p -L "$builddir/nss_build/lib/libintel-gcm-wrap_c_lib.a" "$distdir/lib" + cp -p -L "$builddir/nss_build/lib/libintel-gcm-s_lib.a" "$distdir/lib" + cp -p -L "$builddir/nss_build/lib/libhw-acc-crypto-avx.a" "$distdir/lib" + cp -p -L "$builddir/nss_build/lib/libhw-acc-crypto-avx2.a" "$distdir/lib" +[% END %] +cp -p -L "$builddir/nspr_build/dist/lib/libplc4.a" "$distdir/lib" +cp -p -L "$builddir/nspr_build/dist/lib/libplds4.a" "$distdir/lib" +cp -p -L "$builddir/nspr_build/dist/lib/libnspr4.a" "$distdir/lib" + +cp -p -L -R "$builddir/nss_build/public/nss/"* "$distdir/include/nss" +cp -p -L -R "$builddir/nspr_build/dist/include/nspr/"* "$distdir/include/nss" + +cd /var/tmp/dist +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/nss/config b/projects/nss/config new file mode 100644 index 0000000..e2b875e --- /dev/null +++ b/projects/nss/config @@ -0,0 +1,27 @@ +# vim: filetype=yaml sw=2 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +# The required versions for application-services can be found at the respective +# commit in libs/build-all.sh +version: 3.54 +# XXX: maybe that's extractable automatically from `version` somehow? +version_path: 3_54 +nspr_version: 4.26 +var: + container: + use_container: 1 + deps: + - build-essential + - gyp + +input_files: + - project: container-image + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + - name: ninja + project: ninja + - URL: 'https://ftp.mozilla.org/pub/security/nss/releases/NSS_[% c("version_path") %]_RTM/src/nss-[% c("version") %]-with-nspr-[% c("nspr_version") %].tar.gz' + name: nss + sha256sum: e0e81f0ff264d810f130d3cd9334722f7f883c752430483131d1ca5ac62d3f70 + - filename: configure.patch + - filename: config.patch + - filename: bug_13028.patch diff --git a/projects/nss/config.patch b/projects/nss/config.patch new file mode 100644 index 0000000..e7f5012 --- /dev/null +++ b/projects/nss/config.patch @@ -0,0 +1,37 @@ +From c11dc3a73349fc7d8fa451f9e3a4e3952aa54fd2 Mon Sep 17 00:00:00 2001 +From: Georg Koppen <gk(a)torproject.org> +Date: Wed, 1 Jul 2020 09:57:01 +0000 +Subject: [PATCH] Patch for building NSS for application-services + +See: application-services/libs/build-all.sh + +diff --git a/security/nss/coreconf/config.gypi b/security/nss/coreconf/config.gypi +index 62d3cc71ecaf..dd30de079081 100644 +--- a/security/nss/coreconf/config.gypi ++++ b/security/nss/coreconf/config.gypi +@@ -144,6 +144,23 @@ + '<(nspr_include_dir)', + '<(nss_dist_dir)/private/<(module)', + ], ++ 'defines': [ ++ 'HMAC_Update=NSS_HMAC_Update', ++ 'HMAC_Init=NSS_HMAC_Init', ++ 'CMAC_Update=NSS_CMAC_Update', ++ 'CMAC_Init=NSS_CMAC_Init', ++ 'MD5_Update=NSS_MD5_Update', ++ 'SHA1_Update=NSS_SHA1_Update', ++ 'SHA256_Update=NSS_SHA256_Update', ++ 'SHA224_Update=NSS_SHA224_Update', ++ 'SHA512_Update=NSS_SHA512_Update', ++ 'SHA384_Update=NSS_SHA384_Update', ++ 'SEED_set_key=NSS_SEED_set_key', ++ 'SEED_encrypt=NSS_SEED_encrypt', ++ 'SEED_decrypt=NSS_SEED_decrypt', ++ 'SEED_ecb_encrypt=NSS_SEED_ecb_encrypt', ++ 'SEED_cbc_encrypt=NSS_SEED_cbc_encrypt', ++ ], + 'conditions': [ + [ 'mozpkix_only==1 and OS=="linux"', { + 'include_dirs': [ +-- +2.27.0 diff --git a/projects/nss/configure.patch b/projects/nss/configure.patch new file mode 100644 index 0000000..4ce8465 --- /dev/null +++ b/projects/nss/configure.patch @@ -0,0 +1,11 @@ +@@ -2662,6 +2662,9 @@ + + case "$target" in + *-android*|*-linuxandroid*) ++ $as_echo "#define ANDROID 1" >>confdefs.h ++ ;; ++ unreachable) + if test -z "$android_ndk" ; then + as_fn_error $? "You must specify --with-android-ndk=/path/to/ndk when targeting Android." "$LINENO" 5 + fi +

1 0

[tor-browser-build/master] Bug 40011: Add SQLCipher for application-services
by sysrqb＠torproject.org 10 Aug '20

10 Aug '20

commit 01cb89f0a1c6e46db7add953cfb63b1924ee8377 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jul 1 14:32:40 2020 +0000 Bug 40011: Add SQLCipher for application-services --- projects/sqlcipher/build | 131 ++++++++++++++++++++++++++++++++++++++++++++++ projects/sqlcipher/config | 21 ++++++++ 2 files changed, 152 insertions(+) diff --git a/projects/sqlcipher/build b/projects/sqlcipher/build new file mode 100644 index 0000000..d364000 --- /dev/null +++ b/projects/sqlcipher/build @@ -0,0 +1,131 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] +distdir=/var/tmp/dist/sqlcipher +builddir=/var/tmp/build/[% project %] +mkdir /var/tmp/build +tar -C /var/tmp/dist -xf [% c('input_files_by_name/nss') %] + +# application-services uses a newer NDK, 21d, than all the other projects... +export ANDROID_NDK_API_VERSION=[% pc("fenix-android-toolchain", "var/android_ndk_version") %][% pc('fenix-android-toolchain', 'var/android_ndk_revision') %] +export ANDROID_NDK_HOME=/var/tmp/dist/[% c('var/compiler') %]/android-ndk/android-ndk-r$ANDROID_NDK_API_VERSION +# We need to add the new path to our build tools to PATH +export PATH=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH +export ANDROID_NDK_ROOT=$ANDROID_NDK_HOME +export NDK_HOST_TAG=linux-x86_64 + +export AR="[% c('var/cross_prefix') %]-ar" +# XXX: Mozilla really uses the NDK_API_VERSION here, which is weird. +export CC="[% c('var/cross_prefix') %][% pc('fenix-android-toolchain', 'var/android_ndk_version') %]-clang" +export CXX="[% c('var/cross_prefix') %][% pc('fenix-android-toolchain', 'var/android_ndk_version') %]-clang++" +export LD="[% c('var/cross_prefix') %]-ld" +export RANLIB="[% c('var/cross_prefix') %]-ranlib" + +host="" +[% IF c("var/configure_host") == "arm-linux-androideabi" -%] + host="arm-linux" +[% ELSIF c("var/configure_host") == "i686-linux-android" -%] + host="i686-linux" +[% ELSIF c("var/configure_host") == "x86_64-linux-android" -%] + host="x86_64-linux" +[% ELSIF c("var/configure_host") == "aarch64-linux-android" -%] + host="arm-linux" +[% END -%] + +SQLCIPHER_CFLAGS=" \ + -DSQLITE_HAS_CODEC \ + -DSQLITE_SOUNDEX \ + -DHAVE_USLEEP=1 \ + -DSQLITE_MAX_VARIABLE_NUMBER=99999 \ + -DSQLITE_THREADSAFE=1 \ + -DSQLITE_DEFAULT_JOURNAL_SIZE_LIMIT=1048576 \ + -DNDEBUG=1 \ + -DSQLITE_ENABLE_MEMORY_MANAGEMENT=1 \ + -DSQLITE_ENABLE_LOAD_EXTENSION \ + -DSQLITE_ENABLE_COLUMN_METADATA \ + -DSQLITE_ENABLE_UNLOCK_NOTIFY \ + -DSQLITE_ENABLE_RTREE \ + -DSQLITE_ENABLE_STAT3 \ + -DSQLITE_ENABLE_STAT4 \ + -DSQLITE_ENABLE_JSON1 \ + -DSQLITE_ENABLE_FTS3_PARENTHESIS \ + -DSQLITE_ENABLE_FTS4 \ + -DSQLITE_ENABLE_FTS5 \ + -DSQLCIPHER_CRYPTO_NSS \ + -DSQLITE_ENABLE_DBSTAT_VTAB \ + -DSQLITE_SECURE_DELETE \ + -DSQLITE_DEFAULT_PAGE_SIZE=32768 \ + -DSQLITE_MAX_DEFAULT_PAGE_SIZE=32768 \ + -I/var/tmp/dist/nss/include \ +" + +LIBS="\ + -lcertdb \ + -lcerthi \ + -lcryptohi \ + -lfreebl_static \ + -lnspr4 \ + -lnss_static \ + -lnssb \ + -lnssdev \ + -lnsspki \ + -lnssutil \ + -lpk11wrap_static \ + -lplc4 \ + -lplds4 \ + -lsoftokn_static \ +" + +[% IF c("var/configure_host") == "i686-linux-android" || c("var/configure_host") == "x86_64-linux-android"-%] + LIBS="${LIBS} -lgcm-aes-x86_c_lib" +[% END %] +[% IF c("var/configure_host") == "arm-linux-android" || c("var/configure_host") == "aarch64-linux-android"-%] + LIBS="${LIBS} -larmv8_c_lib" +[% END %] +[% IF c("var/configure_host") == "aarch64-linux-android" -%] + LIBS="${LIBS} -lgcm-aes-aarch64_c_lib" +[% END %] +[% IF c("var/configure_host") == "arm-linux-androideabi" -%] + LIBS="${LIBS} -lgcm-aes-arm32-neon_c_lib" +[% END %] +[% IF c("var/configure_host") == "x86_64-linux-android"-%] + LIBS="${LIBS} -lintel-gcm-wrap_c_lib -lintel-gcm-s_lib -lhw-acc-crypto-avx -lhw-acc-crypto-avx2" +[% END %] + +tar -C /var/tmp/build -xf [% c('input_files_by_name/sqlcipher') %] +mv /var/tmp/build/[% project %]-[% c('version') %] $builddir +cd $builddir + +mkdir $builddir/build +cd build +../configure \ + --host="$host" \ + --with-pic \ + --verbose \ + --disable-shared \ + --with-crypto-lib=none \ + --disable-tcl \ + --enable-tempstore=yes \ + CFLAGS="${SQLCIPHER_CFLAGS}" \ + LDFLAGS="-L/var/tmp/dist/nss/lib" \ + LIBS="${LIBS} -llog -lm" + +make sqlite3.h +make sqlite3ext.h +make libsqlcipher.la + +mkdir -p $distdir/include/sqlcipher +mkdir -p $distdir/lib + +cp -p "$builddir/build/sqlite3.h" "$distdir/include/sqlcipher" +cp -p "$builddir/build/sqlite3ext.h" "$distdir/include/sqlcipher" +cp -p "$builddir/build/.libs/libsqlcipher.a" "$distdir/lib" + +# Just in case, ensure that the created binaries are not -w. +chmod +w "$distdir/lib/libsqlcipher.a" + +cd /var/tmp/dist +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/sqlcipher/config b/projects/sqlcipher/config new file mode 100644 index 0000000..fb4ae3a --- /dev/null +++ b/projects/sqlcipher/config @@ -0,0 +1,21 @@ +# vim: filetype=yaml sw=2 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +# The required versions for application-services can be found at the respective +# commit in libs/build-all.sh +version: 4.4.0 +var: + container: + use_container: 1 + deps: + - build-essential + - tcl + +input_files: + - project: container-image + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + - name: nss + project: nss + - URL: 'https://github.com/sqlcipher/sqlcipher/archive/v[% c("version") %].tar.gz' + name: sqlcipher + sha256sum: 0924b2ae1079717954498bda78a30de20ce2a6083076b16214a711567821d148

1 0

[tor-browser/tor-browser-78.1.0esr-10.0-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by gk＠torproject.org 10 Aug '20

10 Aug '20

commit 09628dac32ee9a839cfeef284e8531ddb161e15d Author: Georg Koppen <gk(a)torproject.org> Date: Mon Aug 10 07:35:16 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 6a779b549e59..f55f5953c6ad 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 6a779b549e59dbb72ca81e0808619643a1a1926e +Subproject commit f55f5953c6adb6d75cad74fbb6c3b8fa2d617004

1 0

[tor-browser/tor-browser-78.1.0esr-10.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 07 Aug '20

07 Aug '20

commit 502fe9064244210138e634bdb44b1a1712092d21 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Aug 5 15:07:30 2020 -0400 fixup! TB4: Tor Browser's Firefox preference overrides. Fixes #40066. --- browser/app/profile/000-tor-browser.js | 10 +--------- mobile/android/app/000-tor-browser-android.js | 10 ---------- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index e86252ccd98c..3be6e460b628 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -33,10 +33,6 @@ pref("app.releaseNotesURL", "about:blank"); pref("app.update.staging.enabled", false); #endif -// No need to contact the Kinto-based blocklist system in addition to the old -// one which is still used, see bug 22071. -pref("services.blocklist.update_enabled", false); - // Disable "Slow startup" warnings and associated disk history // (bug #13346) pref("browser.slowStartup.notificationDisabled", true); @@ -73,7 +69,7 @@ pref("browser.ssb.enabled", false); // Misc privacy: Remote pref("browser.send_pings", false); pref("geo.enabled", false); -pref("geo.wifi.uri", ""); +pref("geo.provider.network.url", ""); pref("browser.search.suggest.enabled", false); pref("browser.safebrowsing.malware.enabled", false); pref("browser.safebrowsing.phishing.enabled", false); @@ -94,9 +90,6 @@ pref("datareporting.policy.dataSubmissionEnabled", false); pref("toolkit.telemetry.unified", false); pref("toolkit.telemetry.enabled", false); pref("toolkit.telemetry.updatePing.enabled", false); // Make sure updater telemetry is disabled; see #25909. -// No experiments, use Tor Browser. See 21797. -pref("experiments.enabled", false); -pref("browser.syncPromoViewsLeftMap", "{\"addons\":0, \"passwords\":0, \"bookmarks\":0}"); // Don't promote sync pref("identity.fxaccounts.enabled", false); // Disable sync by default pref("services.sync.engine.prefs", false); // Never sync prefs, addons, or tabs with other browsers pref("services.sync.engine.addons", false); @@ -133,7 +126,6 @@ pref("dom.w3c_pointer_events.enabled", false); pref("dom.vr.enabled", false); // Bug 21607: Disable WebVR for now // Disable randomised Firefox HTTP cache decay user test groups (Bug: 13575) pref("security.webauth.webauthn", false); // Bug 26614: Disable Web Authentication API for now -pref("browser.cache.frecency_experiment", -1); // Disable intermediate preloading (Bug 30682) pref("security.remote_settings.intermediates.enabled", false); // Bug 2874: Block Components.interfaces from content diff --git a/mobile/android/app/000-tor-browser-android.js b/mobile/android/app/000-tor-browser-android.js index db9e23063738..23fd39beac77 100644 --- a/mobile/android/app/000-tor-browser-android.js +++ b/mobile/android/app/000-tor-browser-android.js @@ -24,19 +24,9 @@ pref("privacy.clearOnShutdown.passwords",true); pref("privacy.clearOnShutdown.sessions",true); pref("privacy.clearOnShutdown.siteSettings",true); -// Disable Control media casting & mirroring features -pref("browser.casting.enabled", false); - // controls if we want camera support -pref("device.camera.enabled", false); pref("media.realtime_decoder.enabled", false); -// Do not fetch updated per-site user-agent strings from Mozilla -// See ua-update.json.in for the packaged UA override list -// See https://bugzilla.mozilla.org/show_bug.cgi?id=897221 -pref("general.useragent.updates.enabled", false); -pref("general.useragent.updates.url", ""); - // Enable touch events on Android (highlighting text, etc) pref("dom.w3c_touch_events.enabled", 2);

1 0

[tor-browser-build/master] Bug 40016: update Snowflake to discover NAT type
by gk＠torproject.org 07 Aug '20

07 Aug '20

commit 251a6f767679b14b4e13b09920fe909d41462814 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Thu Jul 9 13:03:30 2020 +0000 Bug 40016: update Snowflake to discover NAT type This updates Snowflake and the set of default stun servers used by the Snowflake client. --- projects/pion-stun/config | 2 +- projects/snowflake/config | 2 +- .../tor-browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix | 2 +- projects/tor-browser/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix | 2 +- .../tor-browser/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix | 2 +- .../tor-onion-proxy-library/0001-Bug-30318-Add-snowflake-support.patch | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/projects/pion-stun/config b/projects/pion-stun/config index 37405eb..546e379 100644 --- a/projects/pion-stun/config +++ b/projects/pion-stun/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/stun -git_hash: 51fef3542ed793994ff3da9c9b897fb23d744503 # v0.3.3 +git_hash: 4fa7a9d658b6037114fd35b6cb257979ed474a9b # v0.3.5 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' diff --git a/projects/snowflake/config b/projects/snowflake/config index 898fe70..10fe1cc 100644 --- a/projects/snowflake/config +++ b/projects/snowflake/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://git.torproject.org/pluggable-transports/snowflake.git -git_hash: 7043a055f9fb0680281ecffd7d458a43f2ce65b5 +git_hash: 82031289a3362ff3fa199628276d76e840491431 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix b/projects/tor-browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix index ac89698..411c6e1 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix +++ b/projects/tor-browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix @@ -2,4 +2,4 @@ ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec ./TorBrowser/Tor/PluggableTransports/obfs4proxy ## snowflake configuration -ClientTransportPlugin snowflake exec ./TorBrowser/Tor/PluggableTransports/snowflake-client -url https://snowflake-broker.azureedge.net/ -front ajax.aspnetcdn.com -ice stun:stun.l.google.com:19302 +ClientTransportPlugin snowflake exec ./TorBrowser/Tor/PluggableTransports/snowflake-client -url https://snowflake-broker.azureedge.net/ -front ajax.aspnetcdn.com -ice stun:stun.l.google.com:19302,stun:stun.voip.blackberry.com:3478,stun:stun.altar.com.pl:3478,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.sonetel.net:3478,stun:stun.stunprotocol.org:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix b/projects/tor-browser/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix index 154bda4..baa0a6e 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix +++ b/projects/tor-browser/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix @@ -2,4 +2,4 @@ ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec PluggableTransports/obfs4proxy ## snowflake configuration -ClientTransportPlugin snowflake exec PluggableTransports/snowflake-client -url https://snowflake-broker.azureedge.net/ -front ajax.aspnetcdn.com -ice stun:stun.l.google.com:19302 +ClientTransportPlugin snowflake exec PluggableTransports/snowflake-client -url https://snowflake-broker.azureedge.net/ -front ajax.aspnetcdn.com -ice stun:stun.l.google.com:19302,stun:stun.voip.blackberry.com:3478,stun:stun.altar.com.pl:3478,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.sonetel.net:3478,stun:stun.stunprotocol.org:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix b/projects/tor-browser/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix index af16b3c..42502f4 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix +++ b/projects/tor-browser/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix @@ -2,4 +2,4 @@ ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec TorBrowser\Tor\PluggableTransports\obfs4proxy.exe ## snowflake configuration -ClientTransportPlugin snowflake exec TorBrowser\Tor\PluggableTransports\snowflake-client.exe -url https://snowflake-broker.azureedge.net/ -front ajax.aspnetcdn.com -ice stun:stun.l.google.com:19302 +ClientTransportPlugin snowflake exec TorBrowser\Tor\PluggableTransports\snowflake-client.exe -url https://snowflake-broker.azureedge.net/ -front ajax.aspnetcdn.com -ice stun:stun.l.google.com:19302,stun:stun.voip.blackberry.com:3478,stun:stun.altar.com.pl:3478,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.sonetel.net:3478,stun:stun.stunprotocol.org:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 diff --git a/projects/tor-onion-proxy-library/0001-Bug-30318-Add-snowflake-support.patch b/projects/tor-onion-proxy-library/0001-Bug-30318-Add-snowflake-support.patch index 03e06aa..f168eed 100644 --- a/projects/tor-onion-proxy-library/0001-Bug-30318-Add-snowflake-support.patch +++ b/projects/tor-onion-proxy-library/0001-Bug-30318-Add-snowflake-support.patch @@ -71,7 +71,7 @@ index 2405097..bcb6a37 100644 - buffer.append("ClientTransportPlugin meek_lite,obfs3,obfs4 exec ").append(clientPath).append('\n'); + public TorConfigBuilder transportPlugin(String obfsPath, String snowPath) { + buffer.append("ClientTransportPlugin meek_lite,obfs3,obfs4 exec ").append(obfsPath).append('\n'); -+ buffer.append("ClientTransportPlugin snowflake exec ").append(snowPath).append(" -url https://snowflake-broker.azureedge.net/ -front ajax.aspnetcdn.com -ice stun:stun.l.google.com:19302\n"); ++ buffer.append("ClientTransportPlugin snowflake exec ").append(snowPath).append(" -url https://snowflake-broker.azureedge.net/ -front ajax.aspnetcdn.com -ice stun:stun.l.google.com:19302,stun:stun.voip.blackberry.com:3478,stun:stun.altar.com.pl:3478,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.sonetel.net:3478,stun:stun.stunprotocol.org:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478\n"); return this; }

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gitlab/merge-requests/11' into master
by gk＠torproject.org 07 Aug '20

07 Aug '20

commit de185dd7b4e5188905ed972496e69dd537bd0534 Merge: eeb2153 251a6f7 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 7 18:27:14 2020 +0000 Merge remote-tracking branch 'gitlab/merge-requests/11' into master projects/pion-stun/config | 2 +- projects/snowflake/config | 2 +- .../tor-browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix | 2 +- projects/tor-browser/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix | 2 +- .../tor-browser/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix | 2 +- .../tor-onion-proxy-library/0001-Bug-30318-Add-snowflake-support.patch | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-)

1 0

[tor-browser/tor-browser-78.1.0esr-10.0-1] fixup! Bug 21952: Implement Onion-Location
by gk＠torproject.org 07 Aug '20

07 Aug '20

commit 9a78f236a3243d7748e44262ce5a0f1a4be44144 Author: Alex Catarineu <acat(a)torproject.org> Date: Thu Jul 2 21:38:54 2020 +0200 fixup! Bug 21952: Implement Onion-Location Fixes #40019. --- dom/base/Document.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dom/base/Document.cpp b/dom/base/Document.cpp index acc59f5fe70c..0d49a6a18419 100644 --- a/dom/base/Document.cpp +++ b/dom/base/Document.cpp @@ -6029,16 +6029,17 @@ void Document::GetHeaderData(nsAtom* aHeaderField, nsAString& aData) const { static bool IsValidOnionLocation(nsIURI* aDocumentURI, nsIURI* aOnionLocationURI) { bool isHttpish; - nsAutoCString onionHost; + nsAutoCString host; return aDocumentURI && aOnionLocationURI && NS_SUCCEEDED(aDocumentURI->SchemeIs("https", &isHttpish)) && - isHttpish && + isHttpish && NS_SUCCEEDED(aDocumentURI->GetAsciiHost(host)) && + !StringEndsWith(host, NS_LITERAL_CSTRING(".onion")) && ((NS_SUCCEEDED(aOnionLocationURI->SchemeIs("http", &isHttpish)) && isHttpish) || (NS_SUCCEEDED(aOnionLocationURI->SchemeIs("https", &isHttpish)) && isHttpish)) && - NS_SUCCEEDED(aOnionLocationURI->GetAsciiHost(onionHost)) && - StringEndsWith(onionHost, NS_LITERAL_CSTRING(".onion")); + NS_SUCCEEDED(aOnionLocationURI->GetAsciiHost(host)) && + StringEndsWith(host, NS_LITERAL_CSTRING(".onion")); } void Document::SetHeaderData(nsAtom* aHeaderField, const nsAString& aData) {

1 0

[torbutton/master] Merge remote-tracking branch 'gitlab/merge-requests/3' into master
by gk＠torproject.org 07 Aug '20

07 Aug '20

commit f55f5953c6adb6d75cad74fbb6c3b8fa2d617004 Merge: c36ccb58 0b80394c Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 7 14:31:41 2020 +0000 Merge remote-tracking branch 'gitlab/merge-requests/3' into master components/domain-isolator.js | 8 +++++++- components/dragDropFilter.js | 9 ++++++++- components/external-app-blocker.js | 9 ++++++++- components/startup-observer.js | 9 ++++++++- components/torCheckService.js | 9 ++++++++- components/torbutton-logger.js | 16 ++++++++-------- 6 files changed, 47 insertions(+), 13 deletions(-)

1 0

[torbutton/master] Bug 40002: Fix generateNSGetFactory being moved to ComponentUtils
by gk＠torproject.org 07 Aug '20

07 Aug '20

commit 0b80394c77f8d3c4f9df7594e692da857300b60f Author: Alex Catarineu <acat(a)torproject.org> Date: Thu Jul 30 20:53:07 2020 +0200 Bug 40002: Fix generateNSGetFactory being moved to ComponentUtils This was changed in https://bugzilla.mozilla.org/show_bug.cgi?id=1649554. --- components/domain-isolator.js | 8 +++++++- components/dragDropFilter.js | 9 ++++++++- components/external-app-blocker.js | 9 ++++++++- components/startup-observer.js | 9 ++++++++- components/torCheckService.js | 9 ++++++++- components/torbutton-logger.js | 16 ++++++++-------- 6 files changed, 47 insertions(+), 13 deletions(-) diff --git a/components/domain-isolator.js b/components/domain-isolator.js index 38d0abe8..06fe1e2e 100644 --- a/components/domain-isolator.js +++ b/components/domain-isolator.js @@ -11,6 +11,10 @@ const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); +XPCOMUtils.defineLazyModuleGetters(this, { + ComponentUtils: "resource://gre/modules/ComponentUtils.jsm", +}); + // Make the logger available. let logger = Cc["@torproject.org/torbutton-logger;1"] .getService(Ci.nsISupports).wrappedJSObject; @@ -199,4 +203,6 @@ DomainIsolator.prototype = { }; // Assign factory to global object. -const NSGetFactory = XPCOMUtils.generateNSGetFactory([DomainIsolator]); +const NSGetFactory = XPCOMUtils.generateNSGetFactory + ? XPCOMUtils.generateNSGetFactory([DomainIsolator]) + : ComponentUtils.generateNSGetFactory([DomainIsolator]); diff --git a/components/dragDropFilter.js b/components/dragDropFilter.js index f48d1b38..361424d1 100644 --- a/components/dragDropFilter.js +++ b/components/dragDropFilter.js @@ -9,6 +9,10 @@ const { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); +XPCOMUtils.defineLazyModuleGetters(this, { + ComponentUtils: "resource://gre/modules/ComponentUtils.jsm", +}); + // Module specific constants const kMODULE_NAME = "Torbutton Drag and Drop Handler"; const kCONTRACT_ID = "@torproject.org/torbutton-dragDropFilter;1"; @@ -79,4 +83,7 @@ DragDropFilter.prototype = } }; -var NSGetFactory = XPCOMUtils.generateNSGetFactory([DragDropFilter]); +// Assign factory to global object. +const NSGetFactory = XPCOMUtils.generateNSGetFactory + ? XPCOMUtils.generateNSGetFactory([DragDropFilter]) + : ComponentUtils.generateNSGetFactory([DragDropFilter]); diff --git a/components/external-app-blocker.js b/components/external-app-blocker.js index 89d6d252..2fa80d9d 100644 --- a/components/external-app-blocker.js +++ b/components/external-app-blocker.js @@ -16,6 +16,10 @@ const { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { PromptUtils } = ChromeUtils.import("resource://gre/modules/SharedPromptUtils.jsm"); +XPCOMUtils.defineLazyModuleGetters(this, { + ComponentUtils: "resource://gre/modules/ComponentUtils.jsm", +}); + let { torbutton_get_property_string } = ChromeUtils.import("resource://torbutton/modules/utils.js", {}); // Module specific constants @@ -131,4 +135,7 @@ ExternalAppBlocker.prototype = }, }; -var NSGetFactory = XPCOMUtils.generateNSGetFactory([ExternalAppBlocker]); +// Assign factory to global object. +const NSGetFactory = XPCOMUtils.generateNSGetFactory + ? XPCOMUtils.generateNSGetFactory([ExternalAppBlocker]) + : ComponentUtils.generateNSGetFactory([ExternalAppBlocker]); diff --git a/components/startup-observer.js b/components/startup-observer.js index d2d1d610..c81eebab 100644 --- a/components/startup-observer.js +++ b/components/startup-observer.js @@ -15,6 +15,10 @@ const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); +XPCOMUtils.defineLazyModuleGetters(this, { + ComponentUtils: "resource://gre/modules/ComponentUtils.jsm", +}); + XPCOMUtils.defineLazyModuleGetters(this, { FileUtils: "resource://gre/modules/FileUtils.jsm", FileSource: "resource://gre/modules/L10nRegistry.jsm", @@ -205,4 +209,7 @@ StartupObserver.prototype = { _xpcom_categories: [{category:"profile-after-change"}], }; -var NSGetFactory = XPCOMUtils.generateNSGetFactory([StartupObserver]); +// Assign factory to global object. +const NSGetFactory = XPCOMUtils.generateNSGetFactory + ? XPCOMUtils.generateNSGetFactory([StartupObserver]) + : ComponentUtils.generateNSGetFactory([StartupObserver]); diff --git a/components/torCheckService.js b/components/torCheckService.js index 409cc2c5..07b1aa99 100644 --- a/components/torCheckService.js +++ b/components/torCheckService.js @@ -10,6 +10,10 @@ const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); +XPCOMUtils.defineLazyModuleGetters(this, { + ComponentUtils: "resource://gre/modules/ComponentUtils.jsm", +}); + // Module specific constants const kMODULE_NAME = "Torbutton Tor Check Service"; const kMODULE_CONTRACTID = "@torproject.org/torbutton-torCheckService;1"; @@ -131,4 +135,7 @@ TBTorCheckService.prototype = }, }; -var NSGetFactory = XPCOMUtils.generateNSGetFactory([TBTorCheckService]); +// Assign factory to global object. +const NSGetFactory = XPCOMUtils.generateNSGetFactory + ? XPCOMUtils.generateNSGetFactory([TBTorCheckService]) + : ComponentUtils.generateNSGetFactory([TBTorCheckService]); diff --git a/components/torbutton-logger.js b/components/torbutton-logger.js index 1c946fa7..d80d13c4 100644 --- a/components/torbutton-logger.js +++ b/components/torbutton-logger.js @@ -16,6 +16,10 @@ const kMODULE_CID = Components.ID("f36d72c9-9718-4134-b550-e109638331d7"); const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); +XPCOMUtils.defineLazyModuleGetters(this, { + ComponentUtils: "resource://gre/modules/ComponentUtils.jsm", +}); + function TorbuttonLogger() { // Register observer Services.prefs.addObserver("extensions.torbutton", this); @@ -154,11 +158,7 @@ TorbuttonLogger.prototype = } } -/** -* XPCOMUtils.generateNSGetFactory was introduced in Mozilla 2 (Firefox 4). -* XPCOMUtils.generateNSGetModule is for Mozilla 1.9.2 (Firefox 3.6). -*/ -if (XPCOMUtils.generateNSGetFactory) - var NSGetFactory = XPCOMUtils.generateNSGetFactory([TorbuttonLogger]); -else - var NSGetModule = XPCOMUtils.generateNSGetModule([TorbuttonLogger]); +// Assign factory to global object. +const NSGetFactory = XPCOMUtils.generateNSGetFactory + ? XPCOMUtils.generateNSGetFactory([TorbuttonLogger]) + : ComponentUtils.generateNSGetFactory([TorbuttonLogger]);

1 0