- tbb-commits - lists.torproject.org

[tor-launcher/master] Version bump to 0.2.12
by gk＠torproject.org 14 Apr '17

14 Apr '17

commit b1ed80171050b6d583f6d8c604cf13c9e402ac6d Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 14 19:40:51 2017 +0000 Version bump to 0.2.12 --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index 881aa8a..ae89a4c 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.11.1</em:version> + <em:version>0.2.12</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>

1 0

[tor-browser-build/master] Bug 20426: Build libevent for osx using faketime
by boklm＠torproject.org 14 Apr '17

14 Apr '17

commit d2c018a26ec61f85a2fa7a0f9a7360025ff0fb24 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 14 15:56:53 2017 +0200 Bug 20426: Build libevent for osx using faketime --- projects/libevent/build | 4 ++++ projects/libevent/config | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/projects/libevent/build b/projects/libevent/build index 2bed816..0e4e074 100644 --- a/projects/libevent/build +++ b/projects/libevent/build @@ -7,6 +7,10 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] ./autogen.sh ./configure --disable-static [% c("var/configure_opt") %] --prefix=$distdir +[% IF c("var/osx") -%] + export LD_PRELOAD=[% c("var/faketime_path") %] + export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" +[% END -%] make -j4 make install cd /var/tmp/dist diff --git a/projects/libevent/config b/projects/libevent/config index 8bd4b4e..15ada11 100644 --- a/projects/libevent/config +++ b/projects/libevent/config @@ -7,6 +7,12 @@ gpg_keyring: libevent.gpg filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' remote_docker: 1 +targets: + osx-x86_64: + var: + arch_deps: + - faketime + input_files: - project: docker-image - name: '[% c("var/compiler") %]'

1 0

[tor-launcher/master] Translations update
by gk＠torproject.org 13 Apr '17

13 Apr '17

commit cd299eea7451d92fc7d47374d42080ec7b9712b1 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 13 20:30:03 2017 +0000 Translations update --- src/chrome/locale/ar/network-settings.dtd | 2 +- src/chrome/locale/bn/network-settings.dtd | 2 +- src/chrome/locale/da/network-settings.dtd | 52 +++++++++++++------------- src/chrome/locale/da/progress.dtd | 8 ++-- src/chrome/locale/da/torlauncher.properties | 18 ++++----- src/chrome/locale/es-MX/network-settings.dtd | 2 +- src/chrome/locale/es/network-settings.dtd | 28 +++++++------- src/chrome/locale/es/torlauncher.properties | 4 +- src/chrome/locale/fil/progress.dtd | 2 +- src/chrome/locale/fil/torlauncher.properties | 8 ++-- src/chrome/locale/fr-CA/network-settings.dtd | 4 +- src/chrome/locale/fr/network-settings.dtd | 28 +++++++------- src/chrome/locale/fr/torlauncher.properties | 6 +-- src/chrome/locale/hr-HR/network-settings.dtd | 4 +- src/chrome/locale/hr-HR/torlauncher.properties | 6 +-- src/chrome/locale/it/network-settings.dtd | 2 +- src/chrome/locale/lt/network-settings.dtd | 22 +++++------ src/chrome/locale/lt/torlauncher.properties | 20 +++++----- src/chrome/locale/nb/network-settings.dtd | 2 +- src/chrome/locale/pt/network-settings.dtd | 14 +++---- src/chrome/locale/pt/progress.dtd | 2 +- src/chrome/locale/pt/torlauncher.properties | 8 ++-- src/chrome/locale/ru/network-settings.dtd | 2 +- src/chrome/locale/sv/network-settings.dtd | 2 +- src/chrome/locale/zh-CN/network-settings.dtd | 2 +- 25 files changed, 125 insertions(+), 125 deletions(-) diff --git a/src/chrome/locale/ar/network-settings.dtd b/src/chrome/locale/ar/network-settings.dtd index 73be5a2..a20acd8 100644 --- a/src/chrome/locale/ar/network-settings.dtd +++ b/src/chrome/locale/ar/network-settings.dtd @@ -1,4 +1,4 @@ -<!ENTITY torsettings.dialog.title "إعدادات الشبكة"> +<!ENTITY torsettings.dialog.title "إعدادات شبكة تور">  <!ENTITY torlauncher.localePicker.title "لغة متصفح تور"> diff --git a/src/chrome/locale/bn/network-settings.dtd b/src/chrome/locale/bn/network-settings.dtd index a674a2c..5ebd2d0 100644 --- a/src/chrome/locale/bn/network-settings.dtd +++ b/src/chrome/locale/bn/network-settings.dtd @@ -1,4 +1,4 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.dialog.title "টর নেটওয়ার্ক সেটিংস">  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> diff --git a/src/chrome/locale/da/network-settings.dtd b/src/chrome/locale/da/network-settings.dtd index aa32a1f..2851032 100644 --- a/src/chrome/locale/da/network-settings.dtd +++ b/src/chrome/locale/da/network-settings.dtd @@ -1,75 +1,75 @@ <!ENTITY torsettings.dialog.title "Tor netværksindstillinger">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Sprog"> +<!ENTITY torlauncher.localePicker.title "Tor Browser sprog"> <!ENTITY torlauncher.localePicker.prompt "Vælg venligst et sprog.">  -<!ENTITY torsettings.prompt "Før du forbinder til Tor netværket, skal du indtaste information om denne computers Internetforbindelse."> +<!ENTITY torsettings.prompt "Før du opretter forbindelse til Tor-netværket, skal du indtaste information om denne computers internetforbindelse."> <!ENTITY torSettings.yes "Ja"> <!ENTITY torSettings.no "Nej"> <!ENTITY torSettings.firstQuestion "Hvilke af de følgende beskriver bedst din situation?"> <!ENTITY torSettings.configurePrompt1 "Denne computers internetforbindelse er censureret eller er etableret gennem en proxy."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "Jeg skal konfigurerer bro- og lokal proxyindstillinger før jeg opretter forbindelse til Tor-netværket."> <!ENTITY torSettings.configure "Indstil"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "Jeg vil foretage en direkte forbindelse til Tor-netværket."> <!ENTITY torSettings.connectPrompt3 "Dette vil virker i de fleste situationer"> <!ENTITY torSettings.connect "Tilslut"> <!ENTITY torSettings.proxyPageTitle "Lokale proxy indstillinger"> -<!ENTITY torSettings.proxyQuestion "Behøver denne computer bruge en lokal proxy for at tilgå Internettet?"> +<!ENTITY torSettings.proxyQuestion "Behøver denne computer bruge en lokal proxy for at tilgå internettet?">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "I de fleste tilfælde er en lokal proxy ikke nødvendig, men det kan være krævet når der oprettes forbindelse gennem netværket i en virksomhed, skole eller universitet."> +<!ENTITY torSettings.proxyExplanation2 "Hvis du ikke er sikker på hvad du skal svare til dette spørgsmål, så kig i internetindstillingerne i en anden browser og tjek dit systems netværksindstillinger, for at se hvorvidt det er nødvendigt med en lokal proxy."> <!ENTITY torSettings.enterProxy "Indtast proxy-indstillinger."> <!ENTITY torSettings.bridgePageTitle "Tor bridge konfiguration"> -<!ENTITY torSettings.bridgeQuestion "Blokerer eller censurerer din internetudbyder (ISP) forbindelser til Tor netværket?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeQuestion "Blokerer eller censurerer din internetudbyder (ISP) forbindelser til Tor-netværket?"> +<!ENTITY torSettings.bridgeExplanation1 "Hvis du ikke er sikker på hvad du skal svare til dette spørgsmål, så vælg Nej (hvis du ikke er i stand til at oprette forbindelse til Tor-netværket gennem en bro, så kan du tilføje en senere)."> +<!ENTITY torSettings.bridgeExplanation2 "Hvis du vælger Ja, så vil du blive spurgt om at konfigurere Tor-broer, hvilket er ulistede relæer som gøre det svære at blokere forbindelser til Tor-netværket."> <!ENTITY torSettings.bridgeSettingsPrompt "Du kan bruge det tildelte sæt broer eller du kan hente og indtaste et skræddersyet sæt broer.">  <!ENTITY torsettings.startingTor "Venter på at Tor starter..."> <!ENTITY torsettings.restartTor "Genstart Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Genkonfigurer"> -<!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.discardSettings.prompt "Du har konfigureret Tor-broer eller du har indtastet lokale proxyindstillinger.  For at kunne foretage direkte forbindelse til Tor-netværket, skal disse indstillinger fjernes."> +<!ENTITY torsettings.discardSettings.proceed "Fjern indstillinger og opret forbindelse"> <!ENTITY torsettings.optional "Valgfri"> -<!ENTITY torsettings.useProxy.checkbox "Denne computer skal bruge en lokal proxy for at tilgå Internettet"> +<!ENTITY torsettings.useProxy.checkbox "Denne computer skal bruge en lokal proxy for at tilgå internettet"> <!ENTITY torsettings.useProxy.type "Proxy type:"> <!ENTITY torsettings.useProxy.address "Adresse:"> <!ENTITY torsettings.useProxy.address.placeholder "IP adresse eller værtsnavn"> <!ENTITY torsettings.useProxy.port "Port:"> <!ENTITY torsettings.useProxy.username "Brugernavn:"> -<!ENTITY torsettings.useProxy.password "Kodeord:"> +<!ENTITY torsettings.useProxy.password "Adgangskode:"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> -<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> +<!ENTITY torsettings.useProxy.type.http "HTTP/HTTPS"> <!ENTITY torsettings.firewall.checkbox "Denne computer går gennem en firewall som kun tillader forbindelse til specifikke porte"> <!ENTITY torsettings.firewall.allowedPorts "Tilladte Porte:"> -<!ENTITY torsettings.useBridges.checkbox "Min udbyder (ISP) blokerer forbindelse til Tor netværket"> +<!ENTITY torsettings.useBridges.checkbox "Min internetudbyder (ISP) blokerer forbindelser til Tor-netværket"> <!ENTITY torsettings.useBridges.default "Forbind med tildelte broer"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> +<!ENTITY torsettings.useBridges.note "Hver type bro bruger forskellige metoder for at undgå censurering.  Hvis en bro ikke virker, så prøv igen med en anden."> +<!ENTITY torsettings.useBridges.type "Transporttype:"> <!ENTITY torsettings.useBridges.custom "Indtast skræddersyede broer"> -<!ENTITY torsettings.useBridges.label "Indtast et eller flere bro-relæer (et per linie)"> +<!ENTITY torsettings.useBridges.label "Indtast et eller flere bro-relæer (et pr. linje)"> <!ENTITY torsettings.useBridges.placeholder "type adresse:port"> <!ENTITY torsettings.copyLog "Kopier Tor loggen til udklipsholderen"> <!ENTITY torsettings.bridgeHelpTitle "Bro-relæ hjælp"> -<!ENTITY torsettings.bridgeHelp1 "Hvis du ikke kan forbinde dig til Tor netværket er det muligt at din internet udbyder (ISP) eller anden myndighed blokerer Tor.   Det er ofte muligt at komme rundt om en blokade ved at bruge en Tor bro. En bro er et relæ som ikke er på den offentliggjorte liste og som derfor er sværere at blokkere."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "På nettet"> +<!ENTITY torsettings.bridgeHelp1 "Hvis du ikke kan oprette forbindelse til Tor-netværket er det muligt at din internetudbyder (ISP) eller anden myndighed blokerer Tor.   Det er ofte muligt at omgå problemet ved at bruge Tor-broer. En bro er et relæ som ikke er på den offentliggjorte liste og som derfor er sværere at blokkere."> +<!ENTITY torsettings.bridgeHelp1B "Du kan bruge de prækonfigurerede, tildelte sæt af broadresser eller du kan få fat i et tilpasset sæt af adresser, ved at bruge en af disse metoder:"> +<!ENTITY torsettings.bridgeHelp2Heading "Gennem webbet"> <!ENTITY torsettings.bridgeHelp2 "Brug en browser og besøg https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Via den automatiske email service"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send e-mail til bridges(a)torproject.org med linjen 'get bridges' som det eneste i beskedteksten.  Men, for at gøre det sværere for en angriber at få kendskab til en masse broadresser, skal du sende din forespørgsel fra en af de følgende e-mailudbydere (i foretrukket rækkefølge):"> +<!ENTITY torsettings.bridgeHelp3Heading "Via den automatiske e-mailservice"> +<!ENTITY torsettings.bridgeHelp3.emailDesc "Send e-mail til bridges(a)torproject.org med linjen "get bridges" som det eneste i beskedteksten.  Men, for at gøre det sværere for en angriber at få kendskab til en masse broadresser, skal du sende din forespørgsel fra en af de følgende e-mailudbydere (i foretrukket rækkefølge):"> <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com eller https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Via vores Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "Som en sidste mulighed kan du bede om at få en bro adresse tilsendt ved at sende en venlig email to help(a)rt.torproject.org.  Bemærk venligst at alle emails besvares manuelt."> +<!ENTITY torsettings.bridgeHelp4 "Som en sidste mulighed kan du bede om at få en bro adresse tilsendt ved at sende en venlig e-mail to help(a)rt.torproject.org.  Bemærk venligst at alle e-mails besvares manuelt."> diff --git a/src/chrome/locale/da/progress.dtd b/src/chrome/locale/da/progress.dtd index 2a8a41a..063ad85 100644 --- a/src/chrome/locale/da/progress.dtd +++ b/src/chrome/locale/da/progress.dtd @@ -1,4 +1,4 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Åben Indstillinger"> -<!ENTITY torprogress.heading "Forbinder til Tor netværket"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.dialog.title "Tor status"> +<!ENTITY torprogress.openSettings "Åbn indstillinger"> +<!ENTITY torprogress.heading "Opretter forbindelse til Tor-netværket"> +<!ENTITY torprogress.pleaseWait "Vent venligst mens vi etablerer en forbindelse til Tor-netværket.  Det kan tage flere minutter."> diff --git a/src/chrome/locale/da/torlauncher.properties b/src/chrome/locale/da/torlauncher.properties index 2ca0df2..e18d62f 100644 --- a/src/chrome/locale/da/torlauncher.properties +++ b/src/chrome/locale/da/torlauncher.properties @@ -4,31 +4,31 @@ torlauncher.error_title=Tor starter torlauncher.tor_exited_during_startup=Tor lukkede under opstart. Det kan skyldes en fejl i din torrc-fil, en fejl i Tor eller et andet program på dit system, eller hardwarefejl. Tor Browser vil ikke starte, før du løser det underliggende problem og genstarter Tor. -torlauncher.tor_exited=Tor lukkede uventet. Dette kan skyldes en fejl i selve Tor, et andet program i dit system eller en hardware-fejl. Tor-browseren vil ikke være i stand til at forbinde til noget som helst website før du genstarter Tor. Send en kopi af din Tor-log til support-teamet hvis problemet fortsætter. +torlauncher.tor_exited=Tor lukkede uventet. Dette kan skyldes en fejl i selve Tor, et andet program i dit system eller en hardware-fejl. Tor-browseren vil ikke være i stand til at forbinde til noget som helst websted før du genstarter Tor. Send en kopi af din Tor-log til support-teamet hvis problemet fortsætter. torlauncher.tor_exited2=Fanebladene i din browser vil ikke blive lukket ved af at du genstarter Tor. torlauncher.tor_controlconn_failed=Kunne ikke forbinde til Tor kontrol-porten. torlauncher.tor_failed_to_start=Tor kunne ikke starte. torlauncher.tor_control_failed=Det lykkedes ikke at tage kontrol over Tor. -torlauncher.tor_bootstrap_failed=Tor kunne ikke etablere forbindelse til Tor netværket +torlauncher.tor_bootstrap_failed=Tor kunne ikke etablere forbindelse til Tor-netværket torlauncher.tor_bootstrap_failed_details=%1$S fejlede (%2$S). torlauncher.unable_to_start_tor=Kan ikke starte Tor.\n\n%S torlauncher.tor_missing=Kunne ikke finde Tor programmet. torlauncher.torrc_missing=torrc-filen mangler og kunne ikke dannes. torlauncher.datadir_missing=Tor-datamappen findes ikke og kunne ikke dannes. -torlauncher.password_hash_missing=Kunne ikke finde hash-værdi af kodeordet. +torlauncher.password_hash_missing=Kunne ikke finde hash-værdi af adgangskode. torlauncher.failed_to_get_settings=Kunne ikke læse Tor indstillingerne..⏎\n⏎\n%S torlauncher.failed_to_save_settings=Kunne ikke gemme Tor indstillingerne.⏎\n⏎\n%S torlauncher.ensure_tor_is_running=Kontroller venligst at Tor kører. -torlauncher.error_proxy_addr_missing=Du skal angive både IP adresse eller værts navn og en port, for at indstille Tor til at bruge en proxy som forbindelse til Internettet. +torlauncher.error_proxy_addr_missing=Du skal angive både IP adresse eller værts navn og en port, for at indstille Tor til at bruge en proxy som forbindelse til internettet. torlauncher.error_proxy_type_missing=Du skal vælge proxy-typen: torlauncher.error_bridges_missing=Du skal angive en eller flere broer. torlauncher.error_default_bridges_type_missing=Du skal vælge en transporttype for de tildelte broer. -torlauncher.error_bridge_bad_default_type=Ingen tildelte broer med transporttypen %S er tilgængelige. Venligst justér dine indstillinger. +torlauncher.error_bridge_bad_default_type=Ingen tildelte broer med transporttypen %S er tilgængelige. Justér venligst dine indstillinger. -torlauncher.recommended_bridge=(Anbefalet) +torlauncher.recommended_bridge=(anbefalet) torlauncher.connect=Tilslut torlauncher.restart_tor=Genstart Tor @@ -46,11 +46,11 @@ torlauncher.bootstrapStatus.handshake_dir=Opretter en krypteret mappe forbindels torlauncher.bootstrapStatus.requesting_status=Henter netværk status torlauncher.bootstrapStatus.loading_status=Henter netværk status torlauncher.bootstrapStatus.loading_keys=Henter nøglecentercertifikater -torlauncher.bootstrapStatus.requesting_descriptors=Beder om relæ information +torlauncher.bootstrapStatus.requesting_descriptors=Anmoder om relæ information torlauncher.bootstrapStatus.loading_descriptors=Henter relæ information -torlauncher.bootstrapStatus.conn_or=Forbinder til Tor netværk +torlauncher.bootstrapStatus.conn_or=Opretter forbindelse til Tor-netværket torlauncher.bootstrapStatus.handshake_or=Opretter et Tor kredsløb -torlauncher.bootstrapStatus.done=Forbundet til Tor netværket! +torlauncher.bootstrapStatus.done=Forbundet til Tor-netværket! torlauncher.bootstrapWarning.done=færdig torlauncher.bootstrapWarning.connectrefused=forbindelse afvist diff --git a/src/chrome/locale/es-MX/network-settings.dtd b/src/chrome/locale/es-MX/network-settings.dtd index 6dca5f8..ad001f4 100644 --- a/src/chrome/locale/es-MX/network-settings.dtd +++ b/src/chrome/locale/es-MX/network-settings.dtd @@ -40,7 +40,7 @@ <!ENTITY torsettings.discardSettings.prompt "Has configurado los puentes Tor o has introducido un proxy local settings.  Para hacer una conexión directa a la red Tor, esta configuración debe removerse. "> <!ENTITY torsettings.discardSettings.proceed "Remover configuración y conectarse"> -<!ENTITY torsettings.optional "Optional"> +<!ENTITY torsettings.optional "Opcional"> <!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> diff --git a/src/chrome/locale/es/network-settings.dtd b/src/chrome/locale/es/network-settings.dtd index 91a356a..dc01bb3 100644 --- a/src/chrome/locale/es/network-settings.dtd +++ b/src/chrome/locale/es/network-settings.dtd @@ -13,9 +13,9 @@ <!ENTITY torSettings.firstQuestion "¿Cuál de las siguientes opciones describe mejor su situación?"> <!ENTITY torSettings.configurePrompt1 "La conexión a Internet de este equipo está censurada o proxificada."> -<!ENTITY torSettings.configurePrompt2 "Necesito configurar los ajustes de puente de red o proxy local antes de conectar a la red Tor. "> +<!ENTITY torSettings.configurePrompt2 "Necesito configurar puentes de red o proxy local antes de conectar a la red Tor. "> <!ENTITY torSettings.configure "Configurar"> -<!ENTITY torSettings.connectPrompt2 "Quisiera hacer una conexión directa a la red Tor."> +<!ENTITY torSettings.connectPrompt2 "Me gustaría conectar directamente a la red Tor."> <!ENTITY torSettings.connectPrompt3 "Esto funcionará en la mayoría de las situaciones."> <!ENTITY torSettings.connect "Conectar"> @@ -23,13 +23,13 @@ <!ENTITY torSettings.proxyQuestion "¿Necesita mi computadora utilizar un proxy local para acceder a Internet?">  <!ENTITY torSettings.proxyExplanation1 "En la mayoría de los casos no se requiere un proxy (interpuesto) local, pero puede ser necesario al realizar una conexión a través de una red de empresa, de escuela, o universitaria. "> -<!ENTITY torSettings.proxyExplanation2 "Si no está seguro de cómo responder a esta pregunta, mire la configuración de Internet en otro navegador o compruebe la configuración de red de su sistema para ver si un proxy local es necesario."> -<!ENTITY torSettings.enterProxy "Introduzca los ajustes del proxy."> +<!ENTITY torSettings.proxyExplanation2 "Si no estás seguro de cómo responder a esta pregunta mira la configuración de Internet en otro navegador o comprueba la configuración de red de tu sistema para ver si necesitas un proxy local."> +<!ENTITY torSettings.enterProxy "Introduce los ajustes del proxy."> <!ENTITY torSettings.bridgePageTitle "Configuración de puentes de red Tor"> <!ENTITY torSettings.bridgeQuestion "Su proveedor de servicios de Internet (ISP) bloquea o censura de alguna forma las conexiones hacia la red Tor?"> -<!ENTITY torSettings.bridgeExplanation1 "Si no está seguro de cómo responder a esta pregunta, elija No (si no puede conectarse a la red Tor sin un puente de red (bridge), puede añadir uno más adelante)."> -<!ENTITY torSettings.bridgeExplanation2 "Si elige Sí, se le pedirá que configure los puentes de red (bridges) de Tor, que son repetidores no listados que dificultan el bloqueo de conexiones hacia la red Tor."> -<!ENTITY torSettings.bridgeSettingsPrompt "Puede utilizar el conjunto de puentes de red (bridges) proporcionado, o puede obtener e introducir un juego de puentes personalizado."> +<!ENTITY torSettings.bridgeExplanation1 "Si no estás seguro de cómo responder a esta pregunta elige No (si no puedes conectarte a la red Tor sin un puente de red o bridge, puedes añadir uno más adelante)."> +<!ENTITY torSettings.bridgeExplanation2 "Si eliges Sí se te pedirá que configures los puentes de red (bridges) de Tor, que son repetidores no listados que dificultan el bloqueo de conexiones hacia la red Tor."> +<!ENTITY torSettings.bridgeSettingsPrompt "Puedes utilizar el grupo de puentes de red (bridges) proporcionado, o puedes obtener e introducir un grupo de puentes propio.">  @@ -37,8 +37,8 @@ <!ENTITY torsettings.restartTor "Reiniciar Tor"> <!ENTITY torsettings.reconfigTor "Configurar de nuevo"> -<!ENTITY torsettings.discardSettings.prompt "Ha configurado los puentes de red (bridges) de Tor o ha introducido los ajustes para proxy (interpuesto) local.  Para realizar una conexión directa a la red Tor, estos ajustes deben ser borrados."> -<!ENTITY torsettings.discardSettings.proceed "Eliminar ajustes y conectar"> +<!ENTITY torsettings.discardSettings.prompt "Has configurado los puentes de red (bridges) de Tor o has introducido los ajustes para proxy (interpuesto) local.  Para realizar una conexión directa a la red Tor, estos ajustes se deben borrar."> +<!ENTITY torsettings.discardSettings.proceed "Elimina ajustes y conecta"> <!ENTITY torsettings.optional "Opcional"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Puertos permitidos:"> <!ENTITY torsettings.useBridges.checkbox "Mi Proveedor de Servicios de Internet (ISP) bloquea las conexiones a la red Tor"> <!ENTITY torsettings.useBridges.default "Conectar con los puentes proporcionados"> -<!ENTITY torsettings.useBridges.note "Cada tipo de puente de red usa un método diferente para evitar la censura.  Si un puente no funciona, inténtelo de nuevo utilizando otro distinto."> +<!ENTITY torsettings.useBridges.note "Cada tipo de puente de red usa un método diferente para evitar la censura.  Si un puente no funciona, inténtalo de nuevo utilizando otro."> <!ENTITY torsettings.useBridges.type "Tipo de transporte:"> <!ENTITY torsettings.useBridges.custom "Introducir puentes personalizados"> <!ENTITY torsettings.useBridges.label "Introduzca uno o más repetidores puente(uno por línea)."> @@ -65,12 +65,12 @@ <!ENTITY torsettings.copyLog "Copiar el registro de mensajes(log) de Tor al portapapeles"> <!ENTITY torsettings.bridgeHelpTitle "Ayuda de repetidores puente ('bridge relays')"> <!ENTITY torsettings.bridgeHelp1 "Si no puede conectarse a la red Tor, podría ser que su proveedor de servicios de Internet (ISP) u otra agencia, esté bloqueando Tor.  A menudo, puede evitar este problema usando puentes ('bridges') de Tor, que son repetidores ('relays') de salida de la red Tor que no son públicos, y es más difícil que sean bloqueados."> -<!ENTITY torsettings.bridgeHelp1B "Puede usar el juego preajustado de direcciones de puentes de red proporcionado, o puede obtener un juego personalizado de direcciones usando uno de estos métodos:"> +<!ENTITY torsettings.bridgeHelp1B "Puedes usar grupo de direcciones de puentes de red proporcionado aquí, o puedes obtener un nuevo grupo de direcciones usando uno de estos métodos:"> <!ENTITY torsettings.bridgeHelp2Heading "Mediante la web"> <!ENTITY torsettings.bridgeHelp2 "Use un navegador web para visitar https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Mediante el correo electrónico automático"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Envíe un correo electrónico a bridges(a)torproject.org únicamente con la línea 'get bridges' en el cuerpo del mensaje.  Sin embargo, para ponerle más difícil a un atacante el poder adquirir muchas direcciones de puentes, tiene que enviar esta petición desde uno de los siguientes proveedores de correo electrónico (listados en orden de preferencia):"> +<!ENTITY torsettings.bridgeHelp3.emailDesc "Envía un correo electrónico a bridges(a)torproject.org únicamente con la línea 'get bridges' en el cuerpo del mensaje.  Para que sea más difícil para un atacante adquirir muchas direcciones de puentes, tienes que enviar esta petición desde uno de los siguientes proveedores de correo electrónico (listados en orden de preferencia):"> <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com o https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Mediante el soporte de usuario"> -<!ENTITY torsettings.bridgeHelp4 "Como último recurso, puede pedir direcciones de repetidores puente enviando un cortés mensaje de correo a help(a)rt.torproject.org .  -Por favor tenga en cuenta que es una persona la que tendrá que responder a cada petición."> +<!ENTITY torsettings.bridgeHelp4 "Como último recurso, puedes pedir direcciones de repetidores puente enviando un mensaje de correo amable a help(a)rt.torproject.org .  +Por favor ten en cuenta que es una persona la que tendrá que responder a cada petición."> diff --git a/src/chrome/locale/es/torlauncher.properties b/src/chrome/locale/es/torlauncher.properties index 00bada5..d414c01 100644 --- a/src/chrome/locale/es/torlauncher.properties +++ b/src/chrome/locale/es/torlauncher.properties @@ -3,7 +3,7 @@ torlauncher.error_title=Arranque de Tor -torlauncher.tor_exited_during_startup=Tor se cerró durante el arranque. Esto se podría deber a un error en su fichero torrc, un fallo en Tor o en otro programa de su sistema, o a hardware defectuoso. Hasta que solucione el problema subyacente y reinice Tor, el Navegador Tor no se iniciará. +torlauncher.tor_exited_during_startup=Tor se cerró durante el arranque. Esto se podría deber a un error en tu fichero torrc, un fallo en Tor o en otro programa de tu sistema, o a hardware defectuoso. Hasta que soluciones el problema subyacente y reinices Tor, el Navegador Tor no se iniciará. torlauncher.tor_exited=Tor se cerró inesperadamente. Esto podría deberse a un fallo con el propio Tor, con otro programa de su sistema, o por hardware defectuoso. Hasta que reinicie Tor, el Navegador Tor no podrá abrir ningún sitio web. Si el problema persiste, por favor envíe una copia de su Registro de Tor (log) al equipo de soporte. torlauncher.tor_exited2=Al reiniciar Tor no se cerrarán las pestañas de su navegador. torlauncher.tor_controlconn_failed=No se pudo conectar al puerto de control de Tor @@ -37,7 +37,7 @@ torlauncher.quit_win=Salir torlauncher.done=Listo torlauncher.forAssistance=Para obtener ayuda, contacte con %S -torlauncher.forAssistance2=Para asistencia, visite %S +torlauncher.forAssistance2=Para asistencia, visita %S torlauncher.copiedNLogMessages=Copia completada. %S mensajes de registro ('log') de Tor están listos para ser pegados en un editor de texto o en un mensaje de correo electrónico. diff --git a/src/chrome/locale/fil/progress.dtd b/src/chrome/locale/fil/progress.dtd index b8256ea..c73883b 100644 --- a/src/chrome/locale/fil/progress.dtd +++ b/src/chrome/locale/fil/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Buksan ang Settings"> <!ENTITY torprogress.heading "Nakikipag-ugnayan sa network ng Tor."> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Mag-hintay habang ginagawa ang pag-establish ng connection sa Tor network.  Maari itong tumagal ng ilang minuto."> diff --git a/src/chrome/locale/fil/torlauncher.properties b/src/chrome/locale/fil/torlauncher.properties index c00fa3a..120c7d7 100644 --- a/src/chrome/locale/fil/torlauncher.properties +++ b/src/chrome/locale/fil/torlauncher.properties @@ -3,7 +3,7 @@ torlauncher.error_title=Tagapaglunsad ng 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_during_startup=Tor exited during startup. Maaring ang dahilan nito ay ang an error sa torrc file, bug sa Tor o iba pang program sa iyong system, or sirang hardware. Hanggat di mo na fix ang underlying problem at mag-restart ng Tor, ang Tor Browser ay hindi gagana. torlauncher.tor_exited=Ang Tor ay nagsara ng hindi sinasadya. Ito ay marahil sa isang bug sa Tor, ibang programa sa iyong sistema, o depektibong hardware. Hanggang ma-restart mo ang Tor, ang Tor Browser ay hindi makakapagabot sa kahit anong mga website. Kung ang problema ay nagpapatuloy, mag-sumite ng isang kopya ng iyong Tor Log sa support team. torlauncher.tor_exited2=Ang pag-restart sa Tor ay hindi magsasara ng mga tab sa browser. torlauncher.tor_controlconn_failed=Hindi makakonekta sa Tor control port. @@ -14,8 +14,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S nabigo (%2$S). torlauncher.unable_to_start_tor=Hindi magawang simulan ang Tor.\n\n%S torlauncher.tor_missing=Ang Tor executable ay nawawala. -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.torrc_missing=Ang torrc file ay missing at hindi ma create. +torlauncher.datadir_missing=Ang Tor data directory ay not exist at could not be created. torlauncher.password_hash_missing=Nabigong makakuha ng na-hash na password. torlauncher.failed_to_get_settings=Hindi nabawi ang mga setting ng Tor.\n\n%S @@ -37,7 +37,7 @@ torlauncher.quit_win=Lumabas torlauncher.done=Tapos na torlauncher.forAssistance=Para sa tulong, makipag-ugnay sa %S -torlauncher.forAssistance2=For assistance, visit %S +torlauncher.forAssistance2=Para sa gabay o tulong, bisitahin ang %S torlauncher.copiedNLogMessages=Kumpleto na ang Pag-kopya. %S Ang mga log messages ng Tor ay handa na ma-paste sa isang text editor o sa e-mail message. diff --git a/src/chrome/locale/fr-CA/network-settings.dtd b/src/chrome/locale/fr-CA/network-settings.dtd index a4056e0..212b983 100644 --- a/src/chrome/locale/fr-CA/network-settings.dtd +++ b/src/chrome/locale/fr-CA/network-settings.dtd @@ -27,7 +27,7 @@ <!ENTITY torSettings.enterProxy "Saisir les paramètres du serveur mandataire."> <!ENTITY torSettings.bridgePageTitle "Configuration des ponts Tor"> <!ENTITY torSettings.bridgeQuestion "Votre fournisseur d'accès à Internet (FAI) bloque-t-il ou censure-t-il vos connexions au réseau Tor?"> -<!ENTITY torSettings.bridgeExplanation1 "Si vous n'êtes pas certain de savoir comment répondre à cette question, choisissez Non (si vous n'arrivez pas à vous connecter au réseau Tor sans pont, pour pourrez en ajouter un ultérieurement)."> +<!ENTITY torSettings.bridgeExplanation1 "Si vous n'êtes pas certain de savoir comment répondre à cette question, choisissez Non (si vous n'arrivez pas à vous connecter au réseau Tor sans pont, vous pourrez en ajouter un ultérieurement)."> <!ENTITY torSettings.bridgeExplanation2 "Si vous choisissez Oui, l'on vous demandera de configurer des ponts Tor, qui sont des relais non répertoriés rendant le blocage des connexions au réseau Tor plus difficile."> <!ENTITY torSettings.bridgeSettingsPrompt "Vous pouvez utiliser le jeu de ponts fourni ou vous pouvez obtenir et saisir un jeu de ponts personnalisé."> @@ -58,7 +58,7 @@ <!ENTITY torsettings.useBridges.default "Se connecter avec les ponts fournis"> <!ENTITY torsettings.useBridges.note "Chaque type de pont utilise une méthode différente pour contourner la censure.  Si un pont ne fonctionne pas, ressayez en utilisant un autre type."> <!ENTITY torsettings.useBridges.type "Type de transport :"> -<!ENTITY torsettings.useBridges.custom "Saisir les ponts personnalisés"> +<!ENTITY torsettings.useBridges.custom "Saisir des ponts personnalisés"> <!ENTITY torsettings.useBridges.label "Saisir un ou plusieurs relais-ponts (un par ligne)."> <!ENTITY torsettings.useBridges.placeholder "type adresse:port"> diff --git a/src/chrome/locale/fr/network-settings.dtd b/src/chrome/locale/fr/network-settings.dtd index 078424e..5aae7f3 100644 --- a/src/chrome/locale/fr/network-settings.dtd +++ b/src/chrome/locale/fr/network-settings.dtd @@ -13,7 +13,7 @@ <!ENTITY torSettings.firstQuestion "Laquelle des suivantes décrit le mieux votre situation ?javascript:;"> <!ENTITY torSettings.configurePrompt1 "La connexion Internet de cet ordinateur est censurée ou relayée."> -<!ENTITY torSettings.configurePrompt2 "Je dois paramétrer un pont ou un mandataire local avant de me connecter au réseau Tor."> +<!ENTITY torSettings.configurePrompt2 "Je dois paramétrer un pont (Bridge) ou un mandataire local avant de me connecter au réseau Tor."> <!ENTITY torSettings.configure "Configurer"> <!ENTITY torSettings.connectPrompt2 "J'aimerais établir une connexion directe vers le réseau Tor."> <!ENTITY torSettings.connectPrompt3 "Cela fonctionnera dans la plupart des situations."> @@ -25,11 +25,11 @@ <!ENTITY torSettings.proxyExplanation1 "Dans la plupart des cas, un serveur mandataire local n'est pas requis, mais il pourrait être exigé pour une connexion par un réseau d'entreprise, d'école ou d'université."> <!ENTITY torSettings.proxyExplanation2 "Si vous n'êtes pas certain de savoir comment répondre à cette question, vérifiez les paramètres Internet d'un autre navigateur ou les paramètres réseau de votre système pour voir si un serveur mandataire local est requis."> <!ENTITY torSettings.enterProxy "Saisir les paramètres du serveur mandataire."> -<!ENTITY torSettings.bridgePageTitle "Configuration des ponts Tor"> +<!ENTITY torSettings.bridgePageTitle "Configuration des ponts (Bridges) Tor"> <!ENTITY torSettings.bridgeQuestion "Votre fournisseur d'accès à Internet (FAI) bloque-t-il ou censure-t-il vos connexions au réseau Tor ?"> -<!ENTITY torSettings.bridgeExplanation1 "Si vous n'êtes pas certain de savoir comment répondre à cette question, choisissez Non (si vous n'arrivez pas à vous connecter au réseau Tor sans pont, pour pourrez en ajouter un ultérieurement)."> -<!ENTITY torSettings.bridgeExplanation2 "Si vous choisissez Oui, il vous sera demandé de configurer des ponts Tor, qui sont des relais non répertoriés et qui rendent plus difficile le blocage du réseau Tor."> -<!ENTITY torSettings.bridgeSettingsPrompt "Vous pouvez utiliser le jeu de ponts fourni ou vous pouvez obtenir et saisir un jeu de ponts personnalisé."> +<!ENTITY torSettings.bridgeExplanation1 "Si vous n'êtes pas certain de savoir comment répondre à cette question, choisissez Non (si vous n'arrivez pas à vous connecter au réseau Tor sans pont (Bridge), vous pourrez en ajouter un ultérieurement)."> +<!ENTITY torSettings.bridgeExplanation2 "Si vous choisissez Oui, il vous sera demandé de configurer des ponts (Bridges) Tor, qui sont des relais non répertoriés et qui rendent plus difficile le blocage du réseau Tor."> +<!ENTITY torSettings.bridgeSettingsPrompt "Vous pouvez utiliser le jeu de ponts (Bridges) fourni ou vous pouvez obtenir et saisir un jeu de ponts personnalisé.">  @@ -37,7 +37,7 @@ <!ENTITY torsettings.restartTor "Redémarrer Tor"> <!ENTITY torsettings.reconfigTor "Reconfigurer"> -<!ENTITY torsettings.discardSettings.prompt "Vous avez configuré des ponts Tor ou vous avez saisi des paramètres de mandataire local.  Pour établir une connexion directe vers le réseau Tor, ces paramètres doivent être supprimés."> +<!ENTITY torsettings.discardSettings.prompt "Vous avez configuré des ponts Tor (Bridges) ou vous avez saisi des paramètres de mandataire local.  Pour établir une connexion directe vers le réseau Tor, ces paramètres doivent être supprimés."> <!ENTITY torsettings.discardSettings.proceed "Supprimer les paramètres et se connecter"> <!ENTITY torsettings.optional "Facultatif"> @@ -55,21 +55,21 @@ <!ENTITY torsettings.firewall.checkbox "Cet ordinateur passe par un pare-feu qui n'autorise que les connexions à certains ports"> <!ENTITY torsettings.firewall.allowedPorts "Ports autorisés :"> <!ENTITY torsettings.useBridges.checkbox "Mon fournisseur d'accès à Internet (FAI) bloque les connexions vers le réseau Tor"> -<!ENTITY torsettings.useBridges.default "Se connecter avec les ponts fournis"> -<!ENTITY torsettings.useBridges.note "Chaque type de pont utilise une méthode différente pour contourner la censure.  Si un pont ne fonctionne pas, ressayez en utilisant un autre type."> +<!ENTITY torsettings.useBridges.default "Se connecter avec les ponts (Bridges) fournis"> +<!ENTITY torsettings.useBridges.note "Chaque type de pont (Bridge) utilise une méthode différente pour contourner la censure.  Si un pont ne fonctionne pas, ressayez en utilisant un autre type."> <!ENTITY torsettings.useBridges.type "Type de transport :"> -<!ENTITY torsettings.useBridges.custom "Saisir les ponts personnalisés"> -<!ENTITY torsettings.useBridges.label "Saisir un ou plusieurs relais-ponts (un par ligne)."> +<!ENTITY torsettings.useBridges.custom "Saisir des ponts (Bridges) personnalisés"> +<!ENTITY torsettings.useBridges.label "Saisir un ou plusieurs relais-ponts (Bridge Relays) (un par ligne)."> <!ENTITY torsettings.useBridges.placeholder "type address:port"> <!ENTITY torsettings.copyLog "Copier le journal de Tor dans le presse-papiers"> -<!ENTITY torsettings.bridgeHelpTitle "Aide sur les relais-ponts"> -<!ENTITY torsettings.bridgeHelp1 "Si vous ne pouvez pas vous connecter au réseau Tor, il se peut que votre fournisseur d'accès à Internet (FAI) ou une autre organisme bloque Tor.  Vous pouvez souvent le contourner en utilisant des ponts Tor qui sont des relais non répertoriés, plus difficiles à bloquer."> -<!ENTITY torsettings.bridgeHelp1B "Vous pouvez utiliser le jeu préconfiguré d'adresses de ponts fourni ou vous pouvez obtenir un jeu personnalisé d'adresses en utilisant une de ces méthodes :"> +<!ENTITY torsettings.bridgeHelpTitle "Aide sur les relais-ponts ((Bridges Relays)"> +<!ENTITY torsettings.bridgeHelp1 "Si vous ne pouvez pas vous connecter au réseau Tor, il se peut que votre fournisseur d'accès à Internet (FAI) ou une autre organisme bloque Tor.  Vous pouvez souvent le contourner en utilisant des ponts (Bridges) Tor qui sont des relais non répertoriés, plus difficiles à bloquer."> +<!ENTITY torsettings.bridgeHelp1B "Vous pouvez utiliser le jeu préconfiguré d'adresses de ponts (Bridges) fourni ou vous pouvez obtenir un jeu personnalisé d'adresses en utilisant une de ces méthodes :"> <!ENTITY torsettings.bridgeHelp2Heading "Par le Web"> <!ENTITY torsettings.bridgeHelp2 "En utilisant un navigateur Web pour visiter https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Par le répondeur automatique de courriel"> <!ENTITY torsettings.bridgeHelp3.emailDesc "Envoyez un courriel à bridges(a)torproject.org avec la ligne « get bridges » seule dans le corps du message.  Cependant, afin qu'il soit plus difficile pour un attaquant de découvrir de nombreuses adresses de ponts, vous devez envoyer cette demande à partir d'un des fournisseurs de courriel suivants (listés par ordre de préférence) :"> <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com ou https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Par le centre d'assistance"> -<!ENTITY torsettings.bridgeHelp4 "En dernier recours, vous pouvez demander des adresses de ponts en envoyant un courriel poli à help(a)rt.torproject.org.  Veuillez remarquer qu'une personne devra répondre à chaque demande."> +<!ENTITY torsettings.bridgeHelp4 "En dernier recours, vous pouvez demander des adresses de ponts (Bridges) en envoyant un courriel poli à help(a)rt.torproject.org.  Veuillez remarquer qu'une personne devra répondre à chaque demande."> diff --git a/src/chrome/locale/fr/torlauncher.properties b/src/chrome/locale/fr/torlauncher.properties index 1b25457..93b11a8 100644 --- a/src/chrome/locale/fr/torlauncher.properties +++ b/src/chrome/locale/fr/torlauncher.properties @@ -24,9 +24,9 @@ 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_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. -torlauncher.error_bridge_bad_default_type=Aucun des pont fournis n'est disponible pour le type de transport %S, Veuillez ajuster vos paramètres. +torlauncher.error_bridges_missing=Vous devez spécifier un ou plusieurs ponts (Bridges). +torlauncher.error_default_bridges_type_missing=Vous devez sélectionner un type de transport pour les ponts (Bridges) fournis. +torlauncher.error_bridge_bad_default_type=Aucun des pont (Bridges) fournis n'est disponible pour le type de transport %S, Veuillez ajuster vos paramètres. torlauncher.recommended_bridge=(recommandé) diff --git a/src/chrome/locale/hr-HR/network-settings.dtd b/src/chrome/locale/hr-HR/network-settings.dtd index 902c4f0..0e4d96a 100644 --- a/src/chrome/locale/hr-HR/network-settings.dtd +++ b/src/chrome/locale/hr-HR/network-settings.dtd @@ -1,4 +1,4 @@ -<!ENTITY torsettings.dialog.title "Tor mrežne postavke"> +<!ENTITY torsettings.dialog.title "Postavke Tor mreže">  <!ENTITY torlauncher.localePicker.title "Jezik Tor Browsera"> @@ -13,7 +13,7 @@ internetskoj vezi ovog računala."> <!ENTITY torSettings.no "Ne"> <!ENTITY torSettings.firstQuestion "Koje od sljedećeg najbolje opisuje Vašu situaciju?"> -<!ENTITY torSettings.configurePrompt1 "Veza ovog računal s Internetom je cenzurirana ili iza proxy-a."> +<!ENTITY torSettings.configurePrompt1 "Veza ovog računala s Internetom je cenzurirana ili iza proxya."> <!ENTITY torSettings.configurePrompt2 "Trebam konfigurirati postavke mosta ili lokalnog proxya prije nego se spojim na Tor mrežu."> <!ENTITY torSettings.configure "Podesi"> <!ENTITY torSettings.connectPrompt2 "Želim direktnu vezu s Tor mrežom."> diff --git a/src/chrome/locale/hr-HR/torlauncher.properties b/src/chrome/locale/hr-HR/torlauncher.properties index 175e7b4..108f29e 100644 --- a/src/chrome/locale/hr-HR/torlauncher.properties +++ b/src/chrome/locale/hr-HR/torlauncher.properties @@ -1,9 +1,9 @@ ### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=Pokretač Tora +torlauncher.error_title=Tor Launcher -torlauncher.tor_exited_during_startup=Tor je izašao usred pokretanja. Do toga može doći zbog greške u Vašoj torrc datoteci, greške u Tor-u ili drugom programu u Vašem sustavu ili zbog neispravnog hardware-a. Dok ne popravite inicijalni problem i ponovno pokrenete Tor, Tor Browser se neće pokrenuti. +torlauncher.tor_exited_during_startup=Tor je izašao usred pokretanja. Do toga može doći zbog greške u Vašoj torrc datoteci, greške u Toru ili drugom programu u Vašem sustavu ili zbog neispravnog hardwarea. Dok ne popravite inicijalni problem i ponovno pokrenete Tor, Tor Browser se neće pokrenuti. torlauncher.tor_exited=Tor je neočekivano izašao. Ovo bi moglo biti zbog greške u samom Toru, drugog programa na Vašem sustavu ili neispravnog hardwarea. Dok ne pokrenete Tor ponovno, Tor Browser neće biti u mogućnosti pristupiti web stranicama. Ako problem ustraje, molimo Vas da pošaljete kopiju Vašeg Tor zapisa timu za podršku. torlauncher.tor_exited2=Ponovno pokretanje Tora neće zatvoriti Vaše kartice u pregledniku. torlauncher.tor_controlconn_failed=Nije se moguće spojiti na Torov upravljački port. @@ -60,4 +60,4 @@ torlauncher.bootstrapWarning.identity=nepodudaranje identiteta torlauncher.bootstrapWarning.timeout=vrijeme čekanja veze isteklo torlauncher.bootstrapWarning.noroute=nema rute do domaćina torlauncher.bootstrapWarning.ioerror=greška čitanja/pisanja -torlauncher.bootstrapWarning.pt_missing=nedostaje transport koji se može priključiti +torlauncher.bootstrapWarning.pt_missing=nedostaje priključni transport diff --git a/src/chrome/locale/it/network-settings.dtd b/src/chrome/locale/it/network-settings.dtd index beaabf6..b7a4411 100644 --- a/src/chrome/locale/it/network-settings.dtd +++ b/src/chrome/locale/it/network-settings.dtd @@ -23,7 +23,7 @@ <!ENTITY torSettings.proxyQuestion "Questo computer richiede l'uso di un proxy locale per accedere ad Internet?">  <!ENTITY torSettings.proxyExplanation1 "Nella maggior parte dei casi un proxy locale non è necessario, ma può essere richiesto quando ci si connette da una rete scolastica, universitaria o aziendale."> -<!ENTITY torSettings.proxyExplanation2 "Se non sei sicuro su come rispondere a questa domanda, controlla le impostazioni di Rete in un altro browser o nelle impostazioni del tuo sistema per vedere se è necessario un proxy locale."> +<!ENTITY torSettings.proxyExplanation2 "Se non sei sicuro su come rispondere a questa domanda, controlla le impostazioni Internet di un altro browser web per vedere se sia configurato l'uso di un proxy."> <!ENTITY torSettings.enterProxy "Inserisci le impostazioni del proxy."> <!ENTITY torSettings.bridgePageTitle "Configurazione Bridge di Tor"> <!ENTITY torSettings.bridgeQuestion "Il tuo fornitore di servizi internet (ISP) blocca o censura la connessione alla rete Tor?"> diff --git a/src/chrome/locale/lt/network-settings.dtd b/src/chrome/locale/lt/network-settings.dtd index ad55643..0da969f 100644 --- a/src/chrome/locale/lt/network-settings.dtd +++ b/src/chrome/locale/lt/network-settings.dtd @@ -1,17 +1,17 @@ <!ENTITY torsettings.dialog.title "Tor tinklo nustatymai">  -<!ENTITY torlauncher.localePicker.title "Tor Browser kalba"> +<!ENTITY torlauncher.localePicker.title "Tor naršyklės kalba"> <!ENTITY torlauncher.localePicker.prompt "Prašome pasirinkti kalbą.">  -<!ENTITY torsettings.prompt "Prieš tai, kaip prisijungsite prie Tor tinklo, jūs turite pateikti informaciją apie šio kompiuterio interneto ryšį."> +<!ENTITY torsettings.prompt "Prieš tai, kai prisijungsite prie Tor tinklo, jūs turite pateikti informaciją apie šio kompiuterio interneto ryšį."> <!ENTITY torSettings.yes "Taip"> <!ENTITY torSettings.no "Ne"> -<!ENTITY torSettings.firstQuestion "Kuris iš žemiau pateiktų apibrėžimų labiausiai atspindi Jūsų padėtį?"> +<!ENTITY torSettings.firstQuestion "Kuris iš žemiau pateiktų apibrėžimų labiausiai atspindi jūsų padėtį?"> <!ENTITY torSettings.configurePrompt1 "Šio kompiuterio interneto ryšys yra cenzūruojamas arba jungiamas per įgaliotąjį serverį."> <!ENTITY torSettings.configurePrompt2 "Prieš jungiantis prie Tor tinklo, man reikia sukonfigūruoti tinklų tiltą ar vietinius įgaliotojo serverio nustatymus."> <!ENTITY torSettings.configure "Konfigūruoti"> @@ -25,17 +25,17 @@ <!ENTITY torSettings.proxyExplanation1 "Daugeliu atveju, vietinis įgaliotasis serveris yra nereikalingas, tačiau jo gali prireikti, jungiantis per kompanijos, mokyklos ar universiteto tinklą."> <!ENTITY torSettings.proxyExplanation2 "Jeigu nesate tikri kaip atsakyti į šį klausimą, pažiūrėkite interneto nustatymus kitoje naršyklėje arba patikrinkite savo sistemos tinklo nustatymus, kad pamatytumėte ar vietinis įgaliotasis serveris yra reikalingas."> <!ENTITY torSettings.enterProxy "Įrašykite įgaliotojo serverio nustatymus."> -<!ENTITY torSettings.bridgePageTitle "Tor tiltų konfigūracija"> +<!ENTITY torSettings.bridgePageTitle "Tor tinklų tiltų konfigūracija"> <!ENTITY torSettings.bridgeQuestion "Ar jūsų interneto paslaugų tiekėjas (ISP) blokuoja ar kitaip cenzūruoja prisijungimus prie Tor tinklo?"> <!ENTITY torSettings.bridgeExplanation1 "Jeigu nesate tikri kaip atsakyti į šį klausimą, pasirinkite Ne (jeigu negalėsite prisijungti prie Tor tinklo be tinklų tilto, tuomet galėsite jį pridėti vėliau)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation2 "Jeigu pasirinksite Taip, jūsų bus paprašyta sukonfigūruoti Tor tinklų tiltus, kurie yra neišvardyti retransliavimai, trukdantys blokuoti ryšius su Tor tinklu."> <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">  -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> +<!ENTITY torsettings.startingTor "Laukiama, kol Tor bus paleistas…"> <!ENTITY torsettings.restartTor "Pakartotinai paleisti Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Konfigūruoti iš naujo"> <!ENTITY torsettings.discardSettings.prompt "Jūs esate sukofigūravę Tor tinklų tiltus arba esate įrašę vietinio įgaliotojo serverio nustatymus.  Tam, kad galėtumėte tiesiogiai prisijungti prie Tor tinklo, šie nustatymai privalo būti pašalinti."> <!ENTITY torsettings.discardSettings.proceed "Šalinti nustatymus ir prisijungti"> @@ -55,11 +55,11 @@ <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Leidžiami prievadai:"> <!ENTITY torsettings.useBridges.checkbox "Mano interneto paslaugų tiekėjas (ISP) blokuoja prisijungimus prie Tor tinklo"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> -<!ENTITY torsettings.useBridges.type "Transport type:"> +<!ENTITY torsettings.useBridges.default "Prisijungti, naudojant pateiktus tinklų tiltus"> +<!ENTITY torsettings.useBridges.note "Kiekvienas tinklų tilto tipas, tam, kad išvengtų cenzūros, naudoja skirtingą metodą.  Jeigu vienas tinklų tiltas neveikia, bandykite dar kartą, naudodami kitą tinklų tiltą."> +<!ENTITY torsettings.useBridges.type "Perdavimo tipas:"> <!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> +<!ENTITY torsettings.useBridges.label "Įveskite vieną ar daugiau tinklų tilto retransliavimus (kiekvieną atskiroje eilutėje)."> <!ENTITY torsettings.useBridges.placeholder "įrašykite adresą:prievadą"> <!ENTITY torsettings.copyLog "Kopijuoti Tor žurnalą į iškarpinę"> diff --git a/src/chrome/locale/lt/torlauncher.properties b/src/chrome/locale/lt/torlauncher.properties index ccdb8a8..19e97d8 100644 --- a/src/chrome/locale/lt/torlauncher.properties +++ b/src/chrome/locale/lt/torlauncher.properties @@ -4,8 +4,8 @@ torlauncher.error_title=Tor Leistuvas torlauncher.tor_exited_during_startup=Tor nustojo veikti paleisties metu. Taip galėjo nutikti dėl klaidos jūsų torrc faile, klaidos Tor ar kitoje jūsų sistemos programoje, arba dėl aparatinės įrangos kaltės. Tor naršyklė nepasileis tol, kol neištaisysite slypinčios problemos ir iš naujo nepaleisite Tor. -torlauncher.tor_exited=Tor netikėtai nustojo veikti. Taip galėjo atsitikti arba dėl klaidos Tor arba kitoje programoje, Jūsų sistemoje arba dėl sugedusios techninės įrangos. Kol iš naujo nepaleisite Tor, Tor Naršyklė negalės prisijungti prie jokių interneto tinklalapių. Jei problema kartojasi, prašome išsiųsti Tor įvykių žurnalo kopiją paramos grupei. -torlauncher.tor_exited2=Pakartotinai paleidus Tor naršyklės kortelės nebus uždarytos. +torlauncher.tor_exited=Tor netikėtai nustojo veikti. Taip galėjo atsitikti arba dėl klaidos Tor, arba dėl klaidos kitoje jūsų sistemos programoje, arba dėl sugedusios aparatinės įrangos. Kol iš naujo nepaleisite Tor, Tor naršyklė negalės prisijungti prie jokių interneto tinklalapių. Jei problema išlieka, prašome išsiųsti Tor įvykių žurnalo kopiją Tor palaikymo komandai. +torlauncher.tor_exited2=Paleidus Tor iš naujo, jūsų naršyklės kortelės nebus užvertos. torlauncher.tor_controlconn_failed=Nepavyko prisijungti prie Tor valdymo prievado. torlauncher.tor_failed_to_start=Tor nepavyko paleisti. torlauncher.tor_control_failed=Nepavyko perimti Tor valdymo @@ -24,9 +24,9 @@ torlauncher.ensure_tor_is_running=Įsitikinkite, kad Tor yra vykdomas. torlauncher.error_proxy_addr_missing=Jei norite, kad Tor prie interneto jungtųsi per įgaliotąjį serverį, turite nurodyti ir prievado numerį, ir serverio IP adresą arba serverio vardą. torlauncher.error_proxy_type_missing=Turite pasirinkti įgaliotojo serverio tipą. -torlauncher.error_bridges_missing=Turite nurodyti bent vieną tinklų tiltą -torlauncher.error_default_bridges_type_missing=Turite pasirinkti perdavimo būdą nurodytiems tinklų tiltams -torlauncher.error_bridge_bad_default_type=Nepasiekiamas nei vienas tinklų tiltas, kurio perdavimo tipas būtų %S. Prašome pakoreguoti nustatymo parametrus. +torlauncher.error_bridges_missing=Privalote nurodyti bent vieną tinklų tiltą. +torlauncher.error_default_bridges_type_missing=Privalote nurodytiems tinklų tiltams pasirinkti perdavimo tipą. +torlauncher.error_bridge_bad_default_type=Neprieinamas nei vienas tinklų tiltas, kurio perdavimo tipas būtų %S. Prašome sureguliuoti savo nustatymus. torlauncher.recommended_bridge=(rekomenduojama) @@ -41,13 +41,13 @@ torlauncher.forAssistance2=Norėdami gauti pagalbos, apsilankykite %S torlauncher.copiedNLogMessages=Kopijavimas atliktas. %S Tor įvykių žurnalas paruoštas įklijuoti į teksto redagavimo programą ar elektroninio pašto pranešimą. -torlauncher.bootstrapStatus.conn_dir=Jungiamasi prie retransliavimo taškų +torlauncher.bootstrapStatus.conn_dir=Jungiamasi prie retransliavimo katalogo torlauncher.bootstrapStatus.handshake_dir=Užmezgiamas ryšys torlauncher.bootstrapStatus.requesting_status=Nuskaitoma tinklo būklė torlauncher.bootstrapStatus.loading_status=Įkeliama tinklo būklė -torlauncher.bootstrapStatus.loading_keys=Įkeliami prieigos sertifikatai -torlauncher.bootstrapStatus.requesting_descriptors=Užklausiama retransliacijos taškų informacija -torlauncher.bootstrapStatus.loading_descriptors=Įkeliama retransliacijos taško informacija +torlauncher.bootstrapStatus.loading_keys=Įkeliami liudijimų įstaigos liudijimai +torlauncher.bootstrapStatus.requesting_descriptors=Užklausiama retransliavimo informacija +torlauncher.bootstrapStatus.loading_descriptors=Įkeliama retransliavimo informacija torlauncher.bootstrapStatus.conn_or=Jungiamasi prie Tor tinklo torlauncher.bootstrapStatus.handshake_or=Užmezgiamas sujungimas torlauncher.bootstrapStatus.done=Prisijungta prie Tor tinklo! @@ -60,4 +60,4 @@ torlauncher.bootstrapWarning.identity=tapatybės neatitiktis torlauncher.bootstrapWarning.timeout=per nustatytą laiką nepavyko prisijungti torlauncher.bootstrapWarning.noroute=nėra maršruto iki pagrindinio kompiuterio torlauncher.bootstrapWarning.ioerror=skaitymo/rašymo klaida -torlauncher.bootstrapWarning.pt_missing=Trūksta įterpiamojo perdavimo +torlauncher.bootstrapWarning.pt_missing=trūksta prijungiamo perdavimo diff --git a/src/chrome/locale/nb/network-settings.dtd b/src/chrome/locale/nb/network-settings.dtd index 51e6e52..56f41f1 100644 --- a/src/chrome/locale/nb/network-settings.dtd +++ b/src/chrome/locale/nb/network-settings.dtd @@ -1,7 +1,7 @@ <!ENTITY torsettings.dialog.title "Nettverksinnstillinger for Tor">  -<!ENTITY torlauncher.localePicker.title "Språk i Tor-nettleser"> +<!ENTITY torlauncher.localePicker.title "Språk i Tor-nettleseren"> <!ENTITY torlauncher.localePicker.prompt "Velg språk">  diff --git a/src/chrome/locale/pt/network-settings.dtd b/src/chrome/locale/pt/network-settings.dtd index eb93ba8..5c0ae5c 100644 --- a/src/chrome/locale/pt/network-settings.dtd +++ b/src/chrome/locale/pt/network-settings.dtd @@ -22,13 +22,13 @@ <!ENTITY torSettings.proxyPageTitle "Configuração do Proxy Local"> <!ENTITY torSettings.proxyQuestion "Este computador precisa de utilizar um proxy para aceder à Internet?">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "Na maioria dos casos não é necessário um proxy local, mas este poderá ser necessário quando ligar através da rede de uma empresa, escola ou universidade."> +<!ENTITY torSettings.proxyExplanation2 "Se não tem a certeza de como responder a esta pergunta, consulte as definições da Internet noutro navegador ou verifique as definições da rede do seu sistema para verificar se é necessário ou não um proxy local."> <!ENTITY torSettings.enterProxy "Insira as definições do proxy."> <!ENTITY torSettings.bridgePageTitle "Configuração das Pontes Tor"> <!ENTITY torSettings.bridgeQuestion "O seu Provedor de Serviços da Internet (ISP) bloqueia ou então censura as ligações à Rede Tor?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation1 "Se não tem a certeza sobre como responder a esta pergunta, escolha Não (se não consegue ligar-se à rede Tor sem uma ponte, pode adicionar uma mais tarde)."> +<!ENTITY torSettings.bridgeExplanation2 "Se escolher 'Sim', ser-lhe-á pedido para configurar as Pontes do Tor, que são retransmissões não listadas o que torna mais difícil o bloqueio das ligações à Rede Tor."> <!ENTITY torSettings.bridgeSettingsPrompt "Poderá utilizar o conjunto de pontes fornecido ou poderá obter um conjunto de pontes personalizadas.">  @@ -37,7 +37,7 @@ <!ENTITY torsettings.restartTor "Reiniciar Tor"> <!ENTITY torsettings.reconfigTor "Reconfigurar"> -<!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.prompt "Configurou as pontes do Tor ou inseriu as definições do proxy local.  Para efetuar uma ligação direta à rede Tor, estas definições devem ser removidas."> <!ENTITY torsettings.discardSettings.proceed "Remover Definições e Ligar"> <!ENTITY torsettings.optional "Opcional"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Portas permitidas:"> <!ENTITY torsettings.useBridges.checkbox "O meu Provedor de Serviço da Internet (ISP) bloqueia as ligações à rede Tor"> <!ENTITY torsettings.useBridges.default "Ligar com as pontes fornecidas"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "Cada tipo de ponte utiliza um método diferente para evitar a censura.  Se uma ponte não funcionar, tente novamente utilizando uma diferente."> <!ENTITY torsettings.useBridges.type "Tipo de transporte:"> <!ENTITY torsettings.useBridges.custom "Insira as pontes personalizadas"> <!ENTITY torsettings.useBridges.label "Insira uma ou mais retransmissões de ponte (uma por linha)."> @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copiar o Registo do Tor para a Área de Transferência"> <!ENTITY torsettings.bridgeHelpTitle "Ajuda da Retransmissão de Ponte"> <!ENTITY torsettings.bridgeHelp1 "Se não consegue ligar-se à rede Tor, pode ser devido a algum bloqueio do seu Provedor de Serviço de Internet (ISP) ou outra agência está a bloquear o Tor.  Frequentemente, pode contornar este problema utilizando Tor Bridges, o qual são pontos de passagem não listados que são mais difíceis de bloquear."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> +<!ENTITY torsettings.bridgeHelp1B "Poderá utilizar o conjunto de pontes pré-configurado fornecido ou poderá obter um conjunto de endereços personalizados, utilizando um deste métodos:"> <!ENTITY torsettings.bridgeHelp2Heading "Através da Web"> <!ENTITY torsettings.bridgeHelp2 "Utilize um navegador da Web para visitar https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Através do Respondedor Automático de Correio Eletrónico"> diff --git a/src/chrome/locale/pt/progress.dtd b/src/chrome/locale/pt/progress.dtd index 6ed4a63..f3a6922 100644 --- a/src/chrome/locale/pt/progress.dtd +++ b/src/chrome/locale/pt/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Estado do Tor"> <!ENTITY torprogress.openSettings "Abrir Configurações"> <!ENTITY torprogress.heading "A conetar à rede Tor"> -<!ENTITY torprogress.pleaseWait "Por favor aguarde enquanto estabelecemos a ligação à rede Tor.  Isto pode levar alguns minutos."> +<!ENTITY torprogress.pleaseWait "Por favor, aguarde, enquanto nós estabelecemos uma ligação à rede Tor.  Isto pode demorar alguns minutos."> diff --git a/src/chrome/locale/pt/torlauncher.properties b/src/chrome/locale/pt/torlauncher.properties index 41a235a..bd6085d 100644 --- a/src/chrome/locale/pt/torlauncher.properties +++ b/src/chrome/locale/pt/torlauncher.properties @@ -1,10 +1,10 @@ ### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=Executor Tor +torlauncher.error_title=Tor Launcher -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=O Tor encerrou inesperadamente. Isto pode ter acontecido devido a erro dentro do Tor, outro programa no seu sistema ou falha de hardware. Até que reinicie o Tor, o Navegador Tor não irá poder aceder a quaisquer sítios da Web. Se o problema persistir, por favor, envie uma cópia do Registo de Eventos do seu Tor para a equipa de suporte. +torlauncher.tor_exited_during_startup=O Tor fechou-se durante o arranque. Isto pode ter acontecido devido a erro no seu ficheiro torrc, um erro no Tor ou outro programa no seu sistema, ou falha de hardware. Até que corrija o problema em causa reinicie o Tor, o Tor Browser não irá iniciar. +torlauncher.tor_exited=O Tor encerrou inesperadamente. Isto pode ter acontecido devido a erro dentro do Tor, outro programa no seu sistema ou falha de hardware. Até que reinicie o Tor, o Tor Browser não irá poder aceder a quaisquer sítios da Web. Se o problema persistir, por favor, envie uma cópia do Registo de Eventos do seu Tor para a equipa de suporte. torlauncher.tor_exited2=Ao reiniciar o Tor não irá fechar os separadores do seu navegador. torlauncher.tor_controlconn_failed=Não foi possível ligar à porta de controlo do Tor. torlauncher.tor_failed_to_start=O Tor não foi iniciado. @@ -37,7 +37,7 @@ torlauncher.quit_win=Fechar torlauncher.done=Concluído torlauncher.forAssistance=Para assistência, contacte %S -torlauncher.forAssistance2=For assistance, visit %S +torlauncher.forAssistance2=Para assistência, visite %S torlauncher.copiedNLogMessages=Cópia completa. Estão prontas %S mensagens do registo de eventos do Tor para serem coladas num editor de texto ou numa mensagem de correio eletrónico. diff --git a/src/chrome/locale/ru/network-settings.dtd b/src/chrome/locale/ru/network-settings.dtd index b2663e7..ed79f3c 100644 --- a/src/chrome/locale/ru/network-settings.dtd +++ b/src/chrome/locale/ru/network-settings.dtd @@ -1,4 +1,4 @@ -<!ENTITY torsettings.dialog.title "Сетевые настройки Tor"> +<!ENTITY torsettings.dialog.title "Настройки сети Tor">  <!ENTITY torlauncher.localePicker.title "Язык браузера Tor"> diff --git a/src/chrome/locale/sv/network-settings.dtd b/src/chrome/locale/sv/network-settings.dtd index aab93e0..5975310 100644 --- a/src/chrome/locale/sv/network-settings.dtd +++ b/src/chrome/locale/sv/network-settings.dtd @@ -58,7 +58,7 @@ <!ENTITY torsettings.useBridges.default "Anslut med tillgängliga bryggor"> <!ENTITY torsettings.useBridges.note "Varje typ av brygga använder en egen metod för att undvika censur.  Om en brygga inte fungerar, försök igen genom att använda en annan."> <!ENTITY torsettings.useBridges.type "Transport-typ:"> -<!ENTITY torsettings.useBridges.custom "Fyll i anpassade bryggor"> +<!ENTITY torsettings.useBridges.custom "Ange egna bryggor"> <!ENTITY torsettings.useBridges.label "Ange en eller flera Tor-bryggor (en per rad)."> <!ENTITY torsettings.useBridges.placeholder "typ adress:port"> diff --git a/src/chrome/locale/zh-CN/network-settings.dtd b/src/chrome/locale/zh-CN/network-settings.dtd index 167a597..fe39f0f 100644 --- a/src/chrome/locale/zh-CN/network-settings.dtd +++ b/src/chrome/locale/zh-CN/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "点击复制 Tor 日志"> <!ENTITY torsettings.bridgeHelpTitle "网桥中继帮助"> <!ENTITY torsettings.bridgeHelp1 "如果 Tor 网络无法连接，可能是因为互联网服务提供商 (ISP) 或其他机构对 Tor 进行了封锁。通常，使用 Tor 网桥可以解决这种问题。网桥指未公开的网络中继，更难于封锁。"> -<!ENTITY torsettings.bridgeHelp1B "您可以使用集成的网桥，也可以以下列方式获取一些网桥并手动输入："> +<!ENTITY torsettings.bridgeHelp1B "您可以使用预先配置好的默认设置的网桥地址集成，也可以以下列方式获取一些自定的网桥地址："> <!ENTITY torsettings.bridgeHelp2Heading "网页方式"> <!ENTITY torsettings.bridgeHelp2 "使用浏览器访问 https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "电子邮件自动回复方式">

1 0

[torbutton/master] Version bump, and CHANGELOG update
by gk＠torproject.org 13 Apr '17

13 Apr '17

commit cb0b9fda68ad2c02aeea49856114dbdae0fffe27 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 13 19:58:27 2017 +0000 Version bump, and CHANGELOG update --- src/CHANGELOG | 10 ++++++++++ src/install.rdf | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index bc1092b..9de9989 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,13 @@ +1.9.7.2 + * Bug 21865: Update our JIT preferences in the security slider + * Bug 21747: Make 'New Tor Circuit for this Site' work in ESR52 + * Bug 21745: Fix handling of catch-all circuit + * Bug 21547: Fix circuit display under e10s + * Bug 21268: e10s compatibility for New Identity + * Bug 21267: Remove window resize implementation for now + * Bug 21201: Make Torbutton multiprocess compatible + * Translation updates + 1.9.7.1 * Bug 21396: Allow leaking of resource/chrome URIs (off by default) * Bug 21574: Add link for zh manual and create manual links dynamically diff --git a/src/install.rdf b/src/install.rdf index 5a698b3..670dbb6 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.9.7.1</em:version> + <em:version>1.9.7.2</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL>

1 0

[torbutton/master] Translation updates
by gk＠torproject.org 13 Apr '17

13 Apr '17

commit 8bef7336ccc10aac408aeb0e88099fc42baa0757 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 13 17:04:18 2017 +0000 Translation updates --- src/chrome/locale/fr/torbutton.properties | 2 +- src/chrome/locale/vi/aboutTor.dtd | 2 +- src/chrome/locale/zh-CN/aboutDialog.dtd | 2 +- src/chrome/locale/zh-CN/torbutton.dtd | 2 +- src/chrome/locale/zh-CN/torbutton.properties | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/chrome/locale/fr/torbutton.properties b/src/chrome/locale/fr/torbutton.properties index 51421c9..907babc 100644 --- a/src/chrome/locale/fr/torbutton.properties +++ b/src/chrome/locale/fr/torbutton.properties @@ -3,7 +3,7 @@ torbutton.circuit_display.ip_unknown = IP inconnue torbutton.circuit_display.onion_site = Site Oignon torbutton.circuit_display.this_browser = Ce navigateur torbutton.circuit_display.relay = relayer -torbutton.circuit_display.tor_bridge = Pont +torbutton.circuit_display.tor_bridge = Pont (Bridge) torbutton.circuit_display.unknown_country = Pays inconnu torbutton.content_sizer.margin_tooltip = Le navigateur Tor ajoute cette marge pour rendre la largeur et la hauteur de votre fenêtre moins distinctives, et pour réduire par conséquent la possibilité que l'on vous suive à la trace en ligne. torbutton.panel.tooltip.disabled = Cliquer pour activer Tor diff --git a/src/chrome/locale/vi/aboutTor.dtd b/src/chrome/locale/vi/aboutTor.dtd index d47d73a..4bc3ad5 100644 --- a/src/chrome/locale/vi/aboutTor.dtd +++ b/src/chrome/locale/vi/aboutTor.dtd @@ -30,7 +30,7 @@ <!ENTITY aboutTor.whatnext.label "Gợi ý cho việc ẩn danh »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser User Manual"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Hướng dẫn sử dụng Trình duyệt Tor"> <!ENTITY aboutTor.helpInfo1.label "Bạn có thể giúp đỡ!"> <!ENTITY aboutTor.helpInfo2.label "Có nhiều cách mà bạn có thể giúp mạng Tor nhanh hơn và tốt hơn."> <!ENTITY aboutTor.helpInfo3.label "Chạy một đầu mối tiếp sức Tor »"> diff --git a/src/chrome/locale/zh-CN/aboutDialog.dtd b/src/chrome/locale/zh-CN/aboutDialog.dtd index 0f6da79..4e7c254 100644 --- a/src/chrome/locale/zh-CN/aboutDialog.dtd +++ b/src/chrome/locale/zh-CN/aboutDialog.dtd @@ -1,7 +1,7 @@ <!ENTITY project.start "&brandShortName; 的开发者为">  <!ENTITY project.tpoLink "&vendorShortName;"> -<!ENTITY project.end "，一个捍卫您的隐私和自由上网权的非营利组织。"> +<!ENTITY project.end "，一个捍卫您的隐私和自由上网权利的非营利组织。"> <!ENTITY help.start "需要得到帮助？">  diff --git a/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd index 86c18bf..0977b3d 100644 --- a/src/chrome/locale/zh-CN/torbutton.dtd +++ b/src/chrome/locale/zh-CN/torbutton.dtd @@ -43,7 +43,7 @@ <!ENTITY torbutton.prefs.sec_some_jit_desc "禁用某些 JavaScript 性能优化。"> <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT、类型推断、ASM.JS。"> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT。"> -<!ENTITY torbutton.prefs.sec_jit_slower_desc "一些网站脚本可能会暂缓执行。"> +<!ENTITY torbutton.prefs.sec_jit_slower_desc "一些网站脚本可能会缓执行。"> <!ENTITY torbutton.prefs.sec_mathml_desc "禁用数学方程式的某些显示机制。"> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "禁用 MathML。"> <!ENTITY torbutton.prefs.sec_medium "中等"> diff --git a/src/chrome/locale/zh-CN/torbutton.properties b/src/chrome/locale/zh-CN/torbutton.properties index 52484d7..398b639 100644 --- a/src/chrome/locale/zh-CN/torbutton.properties +++ b/src/chrome/locale/zh-CN/torbutton.properties @@ -21,7 +21,7 @@ torbutton.popup.dontask = 以后自动下载文件 torbutton.popup.prompted_language = 为了更好地保护隐私， Torbutton 可以请求网页的英语版本。这可能导致您希望浏览的本土语言的网页以英语显示。\n\n为了更好地保护隐私，是否请求网页以英语显示？ torbutton.popup.no_newnym = Torbutton 无法安全地为您切换一个新身份。它无法访问 Tor 的控制端口。\n\n您目前正在使用 Tor 浏览器套件吗？ torbutton.title.prompt_torbrowser = Torbutton 重要信息 -torbutton.popup.prompt_torbrowser = Torbutton 工作方式有所改变：它不再支持临时关闭。\n\n做出这种改变是因为在非匿名浏览的浏览器中，同时使用 Torbutton 并不安全。有太多无法克服的错误。\n\n如果您希望正常使用 Firefox ，请卸载 Torbutton 插件，下载 Tor 浏览器套件。Tor 浏览器的隐私特性优于普通的 Firefox ，即使Firefox中使用了Torbutton。\n\n移除 Torbutton，请到工具Tools->附加组件Addons->扩展Extensions 中，在 Torbutton 旁点击卸载。 +torbutton.popup.prompt_torbrowser = Torbutton 工作方式有所改变：它不再能够关闭。\n\n做出这种改变是因为在非匿名浏览的浏览器中，同时使用 Torbutton 并不安全。有太多无法克服的错误。\n\n如果您希望正常使用 Firefox ，请卸载 Torbutton 插件，下载 Tor 浏览器套件。Tor 浏览器的隐私特性优于普通的 Firefox ，即使Firefox中使用了Torbutton。\n\n移除 Torbutton，请到工具Tools->附加组件Addons->扩展Extensions 中，在 Torbutton 旁点击卸载。 torbutton.popup.short_torbrowser = Torbutton 重要信息！\n\nTorbutton 目前已知处于启用状态。\n\n点击 Torbutton 获取更多信息。 torbutton.popup.confirm_plugins = Flash 之类的插件可对用户的隐私与匿名性造成危害。\n\n它们还可能绕过 Tor 而泄漏用户的当前位置和 IP 地址。\n\n是否确定启用插件？\n\n

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] Bug 21795: Fix github.com crashes on Windows
by gk＠torproject.org 13 Apr '17

13 Apr '17

commit c90a0868540a9771cc10bdc1cf91b8f6a8f37603 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 13 16:14:00 2017 +0000 Bug 21795: Fix github.com crashes on Windows This is https://bugzilla.mozilla.org/show_bug.cgi?id=1351278 --- js/src/jit/IonBuilder.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/js/src/jit/IonBuilder.cpp b/js/src/jit/IonBuilder.cpp index 0413b11..1d3377b 100644 --- a/js/src/jit/IonBuilder.cpp +++ b/js/src/jit/IonBuilder.cpp @@ -6592,7 +6592,12 @@ IonBuilder::jsop_funapply(uint32_t argc) if (argument->type() != MIRType::MagicOptimizedArguments) { // Optimize fun.apply(self, array) if the length is sane and there are no holes. TemporaryTypeSet* objTypes = argument->resultTypeSet(); - if (native && native->isNative() && native->native() == fun_apply && +#ifdef XP_WIN + bool opt = false; +#else + bool opt = true; +#endif + if (opt && native && native->isNative() && native->native() == fun_apply && objTypes && objTypes->getKnownClass(constraints()) == &ArrayObject::class_ && !objTypes->hasObjectFlags(constraints(), OBJECT_FLAG_LENGTH_OVERFLOW) &&

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.
by gk＠torproject.org 13 Apr '17

13 Apr '17

commit 5e44400548a9fd480e6715771c75dad75796f1e7 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 13 16:54:08 2017 +0200 fixup! Bug #4234: Use the Firefox Update Process for Tor Browser. Bug 19316: change update URL from update_2 to update_3 --- browser/app/profile/firefox.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index d8bfeac..6b3385e 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -134,7 +134,7 @@ pref("app.update.badge", false); pref("app.update.staging.enabled", true); // Update service URL: -pref("app.update.url", "https://aus1.torproject.org/torbrowser/update_2/%CHANNEL%/%BUILD_TARGET%/%V…"); +pref("app.update.url", "https://aus1.torproject.org/torbrowser/update_3/%CHANNEL%/%BUILD_TARGET%/%V…"); // app.update.url.manual is in branding section // app.update.url.details is in branding section

1 0

[tor-browser-bundle/maint-6.5] Picking up missing SSE2-related update patch
by gk＠torproject.org 13 Apr '17

13 Apr '17

commit 8b029dbb4394446afa0b157e18fe0014966c3dfd Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 13 15:18:21 2017 +0000 Picking up missing SSE2-related update patch --- gitian/versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions b/gitian/versions index 82f7e6e..7bde308 100755 --- a/gitian/versions +++ b/gitian/versions @@ -14,7 +14,7 @@ FIREFOX_VERSION=45.9.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build2 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build3 TOR_TAG=tor-0.2.9.10 TORLAUNCHER_TAG=0.2.10.3 TORBUTTON_TAG=1.9.6.14

1 0

[tor-browser/tor-browser-45.9.0esr-6.5-1] fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.
by gk＠torproject.org 13 Apr '17

13 Apr '17

commit 15cf08adee2d81031b12769e75edb02eab85042b Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 13 16:54:08 2017 +0200 fixup! Bug #4234: Use the Firefox Update Process for Tor Browser. Bug 19316: change update URL from update_2 to update_3 Change the update URL so that 6.5.1 users who don't have SSE available are not updated to 7.0 directly when it is avaible. --- browser/app/profile/firefox.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index ce16a75..c40c936 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -147,7 +147,7 @@ pref("app.update.badge", false); pref("app.update.staging.enabled", true); // Update service URL: -pref("app.update.url", "https://aus1.torproject.org/torbrowser/update_2/%CHANNEL%/%BUILD_TARGET%/%V…"); +pref("app.update.url", "https://aus1.torproject.org/torbrowser/update_3/%CHANNEL%/%BUILD_TARGET%/%V…"); // app.update.url.manual is in branding section // app.update.url.details is in branding section

1 0

[tor-browser-bundle/maint-6.5] Pick up a new tor-browser tag
by gk＠torproject.org 13 Apr '17

13 Apr '17

commit 652990244e81125aed75612a822eec86bb4c301c Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 13 14:55:10 2017 +0000 Pick up a new tor-browser tag We want to be able to deal with the SSE2 requirement for ESR52 without shipping a Tor Browser 6.5.3 just for that. --- Bundle-Data/Docs/ChangeLog.txt | 1 + gitian/versions | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 1808047..8e186ce 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -4,6 +4,7 @@ Tor Browser 6.5.2 -- April 19 2017 * Update HTTPS-Everywhere to 5.2.14 * Update NoScript to 5.0.2 * Bug 21555+16450: Don't remove Authorization header on subdomains (e.g. Twitter) + * Bug 19316: Make sure our Windows updates can deal with the SSE2 requirement * Bug 21917: Add new obfs4 bridges * Bug 21918: Move meek-amazon to d2cly7j4zqgua7.cloudfront.net backend * Windows diff --git a/gitian/versions b/gitian/versions index 1557a98..82f7e6e 100755 --- a/gitian/versions +++ b/gitian/versions @@ -14,7 +14,7 @@ FIREFOX_VERSION=45.9.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build2 TOR_TAG=tor-0.2.9.10 TORLAUNCHER_TAG=0.2.10.3 TORBUTTON_TAG=1.9.6.14

1 0

[tor-browser/tor-browser-45.9.0esr-6.5-1] fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.
by gk＠torproject.org 13 Apr '17

13 Apr '17

commit db3f92ed23e12a2a9b9eac5be773d475897edfca Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Mar 10 17:32:04 2017 +0100 fixup! Bug #4234: Use the Firefox Update Process for Tor Browser. Bug 19316: add support for a minInstructionSet attribute in the update manifests. --- toolkit/mozapps/update/nsUpdateService.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/toolkit/mozapps/update/nsUpdateService.js b/toolkit/mozapps/update/nsUpdateService.js index 4ad5bb8..d098597 100644 --- a/toolkit/mozapps/update/nsUpdateService.js +++ b/toolkit/mozapps/update/nsUpdateService.js @@ -1512,6 +1512,15 @@ function Update(update) { this.unsupported = (Services.vc.compare(osVersion, minOSVersion) < 0); } catch (e) {} } + if (!this.unsupported && update.hasAttribute("minSupportedInstructionSet")) { + let minInstructionSet = update.getAttribute("minSupportedInstructionSet"); + if (['MMX', 'SSE', 'SSE2', 'SSE3', + 'SSE4A', 'SSE4_1', 'SSE4_2'].indexOf(minInstructionSet) >= 0) { + try { + this.unsupported = !Services.sysinfo.getProperty("has" + minInstructionSet); + } catch (e) {} + } + } if (this._patches.length == 0 && !this.unsupported) { throw Cr.NS_ERROR_ILLEGAL_VALUE;

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] Backport of tjr's patch for bug 1353765
by gk＠torproject.org 13 Apr '17

13 Apr '17

commit db07e42c13b82aa62a6132be92974aca371546ac Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 13 14:25:03 2017 +0000 Backport of tjr's patch for bug 1353765 It's not clear if it is still needed but we take it to be on the safe side. This closes #21868. --- dom/filesystem/compat/FileSystemDirectoryReader.h | 1 + 1 file changed, 1 insertion(+) diff --git a/dom/filesystem/compat/FileSystemDirectoryReader.h b/dom/filesystem/compat/FileSystemDirectoryReader.h index d568990..391a793 100644 --- a/dom/filesystem/compat/FileSystemDirectoryReader.h +++ b/dom/filesystem/compat/FileSystemDirectoryReader.h @@ -10,6 +10,7 @@ #include "mozilla/Attributes.h" #include "mozilla/ErrorResult.h" #include "mozilla/dom/BindingDeclarations.h" +#include "mozilla/dom/FileSystemDirectoryEntry.h" #include "nsCycleCollectionParticipant.h" #include "nsWrapperCache.h"

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.
by gk＠torproject.org 13 Apr '17

13 Apr '17

commit 3e531451125720e28f3b7fd113af19b5d02aad18 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Mar 10 17:32:04 2017 +0100 fixup! Bug #4234: Use the Firefox Update Process for Tor Browser. Bug 19316: add support for a minInstructionSet attribute in the update manifests. --- toolkit/mozapps/update/nsUpdateService.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/toolkit/mozapps/update/nsUpdateService.js b/toolkit/mozapps/update/nsUpdateService.js index 699632d..8abc55a 100644 --- a/toolkit/mozapps/update/nsUpdateService.js +++ b/toolkit/mozapps/update/nsUpdateService.js @@ -1550,6 +1550,15 @@ function Update(update) { this.unsupported = (Services.vc.compare(osVersion, minOSVersion) < 0); } catch (e) {} } + if (!this.unsupported && update.hasAttribute("minSupportedInstructionSet")) { + let minInstructionSet = update.getAttribute("minSupportedInstructionSet"); + if (['MMX', 'SSE', 'SSE2', 'SSE3', + 'SSE4A', 'SSE4_1', 'SSE4_2'].indexOf(minInstructionSet) >= 0) { + try { + this.unsupported = !Services.sysinfo.getProperty("has" + minInstructionSet); + } catch (e) {} + } + } if (this._patches.length == 0 && !this.unsupported) { throw Cr.NS_ERROR_ILLEGAL_VALUE;

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] Bug 1335916 - Make sure the update driver only calls SetupMacCommandLine from the main thread. r=rstrong
by gk＠torproject.org 13 Apr '17

13 Apr '17

commit 899435e1997583bd01ab31e363fe3153486dd134 Author: Matt Howell <mhowell(a)mozilla.com> Date: Thu Feb 2 15:29:32 2017 -0800 Bug 1335916 - Make sure the update driver only calls SetupMacCommandLine from the main thread. r=rstrong MozReview-Commit-ID: 9nOgB6z8ooE --HG-- extra : rebase_source : 6a6a18f64297a0bd44e7d6f49b1812e035636e4c --- toolkit/xre/nsUpdateDriver.cpp | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/toolkit/xre/nsUpdateDriver.cpp b/toolkit/xre/nsUpdateDriver.cpp index a9dbeff..7af085a 100644 --- a/toolkit/xre/nsUpdateDriver.cpp +++ b/toolkit/xre/nsUpdateDriver.cpp @@ -32,6 +32,7 @@ #include "nsCommandLineServiceMac.h" #include "MacLaunchHelper.h" #include "updaterfileutils_osx.h" +#include "mozilla/Monitor.h" #endif #if defined(XP_WIN) @@ -91,6 +92,33 @@ static const int kAppUpdaterIOPrioClassDefault = IOPRIO_CLASS_IDLE; static const int kAppUpdaterIOPrioLevelDefault = 0; // Doesn't matter for CLASS IDLE #endif +#ifdef XP_MACOSX +static void +UpdateDriverSetupMacCommandLine(int& argc, char**& argv, bool restart) +{ + if (NS_IsMainThread()) { + CommandLineServiceMac::SetupMacCommandLine(argc, argv, restart); + return; + } + // Bug 1335916: SetupMacCommandLine calls a CoreFoundation function that + // asserts that it was called from the main thread, so if we are not the main + // thread, we have to dispatch that call to there. But we also have to get the + // result from it, so we can't just dispatch and return, we have to wait + // until the dispatched operation actually completes. So we also set up a + // monitor to signal us when that happens, and block until then. + Monitor monitor("nsUpdateDriver SetupMacCommandLine"); + + NS_DispatchToMainThread( + NS_NewRunnableFunction([&argc, &argv, restart, &monitor]() -> void + { + CommandLineServiceMac::SetupMacCommandLine(argc, argv, restart); + MonitorAutoLock(monitor).Notify(); + })); + + MonitorAutoLock(monitor).Wait(); +} +#endif + static nsresult GetCurrentWorkingDir(char *buf, size_t size) { @@ -735,7 +763,7 @@ SwitchToUpdatedApp(nsIFile *greDir, nsIFile *updateDir, } _exit(0); #elif defined(XP_MACOSX) - CommandLineServiceMac::SetupMacCommandLine(argc, argv, true); + UpdateDriverSetupMacCommandLine(argc, argv, true); LaunchChildMac(argc, argv); exit(0); #else @@ -1072,7 +1100,7 @@ ApplyUpdate(nsIFile *greDir, nsIFile *updateDir, nsIFile *statusFile, _exit(0); } #elif defined(XP_MACOSX) - CommandLineServiceMac::SetupMacCommandLine(argc, argv, restart); + UpdateDriverSetupMacCommandLine(argc, argv, restart); #ifdef DEBUG dump_argv("ApplyUpdate after SetupMacCommandLine", argv, argc); #endif

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] Bug 1342887 - Detect and log failures to dispatch SetupMacCommandLine to the main thread. r=rstrong
by gk＠torproject.org 13 Apr '17

13 Apr '17

commit 4cec6538e51ac73c6a46ec582ee0b2794c7d81d9 Author: Matt Howell <mhowell(a)mozilla.com> Date: Mon Feb 27 13:57:11 2017 -0800 Bug 1342887 - Detect and log failures to dispatch SetupMacCommandLine to the main thread. r=rstrong MozReview-Commit-ID: LMoxF5yfXq2 --HG-- extra : rebase_source : c206e32bf8abf1aa225901ff5cde390a8a2ecec7 --- toolkit/xre/nsUpdateDriver.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/toolkit/xre/nsUpdateDriver.cpp b/toolkit/xre/nsUpdateDriver.cpp index 7af085a..3abbf7f 100644 --- a/toolkit/xre/nsUpdateDriver.cpp +++ b/toolkit/xre/nsUpdateDriver.cpp @@ -108,14 +108,24 @@ UpdateDriverSetupMacCommandLine(int& argc, char**& argv, bool restart) // monitor to signal us when that happens, and block until then. Monitor monitor("nsUpdateDriver SetupMacCommandLine"); - NS_DispatchToMainThread( + nsresult rv = NS_DispatchToMainThread( NS_NewRunnableFunction([&argc, &argv, restart, &monitor]() -> void { CommandLineServiceMac::SetupMacCommandLine(argc, argv, restart); MonitorAutoLock(monitor).Notify(); })); - MonitorAutoLock(monitor).Wait(); + if (NS_FAILED(rv)) { + LOG(("Update driver error dispatching SetupMacCommandLine to main thread: %d\n", rv)); + return; + } + + // The length of this wait is arbitrary, but should be long enough that having + // it expire means something is seriously wrong. + rv = MonitorAutoLock(monitor).Wait(PR_SecondsToInterval(60)); + if (NS_FAILED(rv)) { + LOG(("Update driver timed out waiting for SetupMacCommandLine: %d\n", rv)); + } } #endif

1 0

[tor-browser-bundle/maint-6.5] Fix typo in changelog
by gk＠torproject.org 13 Apr '17

13 Apr '17

commit 7974cac344e5610f4f1cec42b668251e62579ac2 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 13 10:18:38 2017 +0000 Fix typo in changelog --- Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index c8d6fcc..1808047 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -3,7 +3,7 @@ Tor Browser 6.5.2 -- April 19 2017 * Update Firefox to 45.9.0esr * Update HTTPS-Everywhere to 5.2.14 * Update NoScript to 5.0.2 - * Bug 21555+16450: Don't remove Authorization header on subdomains (e.g. Twitter) + * Bug 21555+16450: Don't remove Authorization header on subdomains (e.g. Twitter) * Bug 21917: Add new obfs4 bridges * Bug 21918: Move meek-amazon to d2cly7j4zqgua7.cloudfront.net backend * Windows

1 0

[torbutton/master] Bug 21865: Update our JIT preferences in the slider
by gk＠torproject.org 13 Apr '17

13 Apr '17

commit cb73494b177f0dcb595920090a81af5621083f8d Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 13 09:24:04 2017 +0000 Bug 21865: Update our JIT preferences in the slider It turns out that the JIT *.content prefs are gone for a while now. This happened in https://bugzilla.mozilla.org/show_bug.cgi?id=939562 and the patch updates the security slider to take this into account. We got the tip to include `javascript.options.native_regexp` as well. `javascript.options.typeinference` is gone with https://bugzilla.mozilla.org/show_bug.cgi?id=972817 and we therefore remove it. And asm.js is disabled globally until we find a good solution for #19417. The tooltip text got updated accordingly. --- src/chrome/locale/en/torbutton.dtd | 2 +- src/modules/security-prefs.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd index 97a994f..6bc7141 100644 --- a/src/chrome/locale/en/torbutton.dtd +++ b/src/chrome/locale/en/torbutton.dtd @@ -41,7 +41,7 @@ <!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript."> <!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects."> <!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled."> -<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> +<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower."> <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled."> diff --git a/src/modules/security-prefs.js b/src/modules/security-prefs.js index 4a39ca8..3d3630b 100644 --- a/src/modules/security-prefs.js +++ b/src/modules/security-prefs.js @@ -19,12 +19,12 @@ let log = (level, msg) => logger.log(level, msg); // corresponding to the old 2-medium-high setting. const kSecuritySettings = { // Preference name : [0, 1-high 2-m 3-m 4-low] - "javascript.options.ion.content" : [, false, false, false, true ], - "javascript.options.typeinference" : [, false, false, false, true ], + "javascript.options.ion" : [, false, false, false, true ], + "javascript.options.baselinejit" : [, false, false, false, true ], + "javascript.options.native_regexp" : [, false, false, false, true ], "noscript.forbidMedia" : [, true, true, true, false], "media.webaudio.enabled" : [, false, false, false, true ], "mathml.disabled" : [, true, true, true, false], - "javascript.options.baselinejit.content" : [, false, false, false, true ], "gfx.font_rendering.opentype_svg.enabled" : [, false, false, false, true ], "noscript.global" : [, false, false, false, true ], "noscript.globalHttpsWhitelist" : [, false, true, true, false],

1 0

[tor-browser-build/master] Bug 21930: NSS libraries are missing from mar-tools archive
by boklm＠torproject.org 13 Apr '17

13 Apr '17

commit 867176ff839bb0b7067ab2a8e237621a14c98616 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 13 10:30:47 2017 +0200 Bug 21930: NSS libraries are missing from mar-tools archive The Linux sigmar program needs libfreeblpriv3.so and libsoftokn3.so, so include them in the mar-tools archive. tor-browser-bundle.git commit: c2bae45c6a41923712bf176df6fb9bd1f773d887 --- projects/firefox/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/build b/projects/firefox/build index 3985aec..1cf9be1 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -126,7 +126,7 @@ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ [% IF c("var/linux") %] cp -p obj-*/modules/libmar/tool/signmar $MARTOOLS/ cp -p obj-*/security/nss/cmd/certutil/certutil $MARTOOLS/ - NSS_LIBS="libmozsqlite3.so libnss3.so libnssdbm3.so libnssutil3.so libsmime3.so libssl3.so" + NSS_LIBS="libfreeblpriv3.so libmozsqlite3.so libnss3.so libnssdbm3.so libnssutil3.so libsmime3.so libsoftokn3.so libssl3.so" NSPR_LIBS="libnspr4.so libplc4.so libplds4.so" for LIB in $NSS_LIBS $NSPR_LIBS; do cp -p obj-*/dist/bin/$LIB $MARTOOLS/

1 0

[tor-browser-build/master] Bug 21887: Fix broken error pages on higher security levels
by boklm＠torproject.org 13 Apr '17

13 Apr '17

commit 08a94190b79720466e092c9e98deaadc77ff39ce Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 12 14:05:16 2017 +0000 Bug 21887: Fix broken error pages on higher security levels We need to allow JavaScript on `about:neterror` pages explicitly. Otherwise are those pages on higher security levels. --- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js b/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js index 3ccab99..09f3f8e 100644 --- a/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); -pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); -pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); +pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); +pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false); diff --git a/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js b/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js index 3ccab99..09f3f8e 100644 --- a/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); -pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); -pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); +pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); +pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false); diff --git a/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js b/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js index 3ccab99..09f3f8e 100644 --- a/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); -pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); -pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); +pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); +pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false);

1 0

[tor-browser-bundle/master] Bug 21930: NSS libraries are missing from mar-tools archive
by gk＠torproject.org 13 Apr '17

13 Apr '17

commit c2bae45c6a41923712bf176df6fb9bd1f773d887 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Apr 12 23:15:28 2017 -0400 Bug 21930: NSS libraries are missing from mar-tools archive The Linux sigmar program needs libfreeblpriv3.so and libsoftokn3.so, so include them in the mar-tools archive. --- gitian/descriptors/linux/gitian-firefox.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index d607f6a..c9ced44 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -119,7 +119,7 @@ script: | cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ cp -p obj-*/modules/libmar/tool/signmar $MARTOOLS/ cp -p obj-*/security/nss/cmd/certutil/certutil $MARTOOLS/ - NSS_LIBS="libmozsqlite3.so libnss3.so libnssdbm3.so libnssutil3.so libsmime3.so libssl3.so" + NSS_LIBS="libfreeblpriv3.so libmozsqlite3.so libnss3.so libnssdbm3.so libnssutil3.so libsmime3.so libsoftokn3.so libssl3.so" NSPR_LIBS="libnspr4.so libplc4.so libplds4.so" for LIB in $NSS_LIBS $NSPR_LIBS; do cp -p obj-*/dist/bin/$LIB $MARTOOLS/

1 0

[tor-browser-bundle/maint-6.5] Release preparations for 6.5.1
by gk＠torproject.org 12 Apr '17

12 Apr '17

commit 6e7d7a00118e4416f341ce0ff160a427f1319534 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 12 20:13:35 2017 +0000 Release preparations for 6.5.1 Version updates, changelog update, and config.yml changes --- Bundle-Data/Docs/ChangeLog.txt | 11 +++++++++++ gitian/versions | 12 ++++++------ tools/update-responses/config.yml | 10 +++++----- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 5438022..c8d6fcc 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,14 @@ +Tor Browser 6.5.2 -- April 19 2017 + * All Platforms + * Update Firefox to 45.9.0esr + * Update HTTPS-Everywhere to 5.2.14 + * Update NoScript to 5.0.2 + * Bug 21555+16450: Don't remove Authorization header on subdomains (e.g. Twitter) + * Bug 21917: Add new obfs4 bridges + * Bug 21918: Move meek-amazon to d2cly7j4zqgua7.cloudfront.net backend + * Windows + * Bug 21795: Fix Tor Browser crashing on github.com + Tor Browser 6.5.1 -- March 7 2017 * All Platforms * Update Firefox to 45.8.0esr diff --git a/gitian/versions b/gitian/versions index df49b55..1557a98 100755 --- a/gitian/versions +++ b/gitian/versions @@ -10,15 +10,15 @@ DATA_OUTSIDE_APP_DIR=1 VERIFY_TAGS=1 -FIREFOX_VERSION=45.8.0esr +FIREFOX_VERSION=45.9.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-2-build1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build1 TOR_TAG=tor-0.2.9.10 TORLAUNCHER_TAG=0.2.10.3 TORBUTTON_TAG=1.9.6.14 -HTTPSE_TAG=5.2.11 +HTTPSE_TAG=5.2.14 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable @@ -47,7 +47,7 @@ GITIAN_TAG=tor-browser-builder-4-1 OPENSSL_VER=1.0.2k GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build2 +FIREFOX_LANG_BUILD=build3 BINUTILS_VER=2.24 GCC_VER=5.1.0 CLANG_VER=r247539 @@ -68,7 +68,7 @@ NSIS_VER=2.51 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.9.5.3-fx+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-5.0.2-fx+sm.xpi TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -102,7 +102,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=ce9779a3a5a2574b958f8e4d079a99d43a8f84193bef52c587c704ed81c2fbbd +NOSCRIPT_HASH=31ba7743699deefb606bcc49197d26d926f6b4e3d3526cd2f8a339f857a04fb1 CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 2db2570..c43932f 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -20,13 +20,13 @@ build_targets: osx64: Darwin_x86_64-gcc3 channels: alpha: 6.5a6 - release: 6.5.1 + release: 6.5.2 versions: - 6.5.1: - platformVersion: 45.8.0 - detailsURL: https://blog.torproject.org/blog/tor-browser-651-released + 6.5.2: + platformVersion: 45.9.0 + detailsURL: https://blog.torproject.org/blog/tor-browser-652-released incremental_from: - - 6.5 + - 6.5.1 migrate_archs: osx32: osx64 migrate_langs:

1 0

[tor-browser-bundle/master] Bug 21887: Fix broken error pages on higher security levels
by gk＠torproject.org 12 Apr '17

12 Apr '17

commit 5d2f77c0c56a62199fab2034ba14686867808b82 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 12 14:05:16 2017 +0000 Bug 21887: Fix broken error pages on higher security levels We need to allow JavaScript on `about:neterror` pages explicitly. Otherwise are those pages on higher security levels. --- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js index 3ccab99..09f3f8e 100644 --- a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); -pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); -pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); +pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); +pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false); diff --git a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js index 3ccab99..09f3f8e 100644 --- a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); -pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); -pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); +pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); +pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false); diff --git a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js index 3ccab99..09f3f8e 100644 --- a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); -pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); -pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); +pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); +pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false);

1 0

[tor-browser/tor-browser-45.8.0esr-6.5-2] Bug 21795: Fix github.com crashes on Windows
by gk＠torproject.org 12 Apr '17

12 Apr '17

commit fd67e2869611a961893a868fa0891cf4ded173eb Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 12 11:15:40 2017 +0000 Bug 21795: Fix github.com crashes on Windows This is https://bugzilla.mozilla.org/show_bug.cgi?id=1351278 --- js/src/jit/IonBuilder.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/js/src/jit/IonBuilder.cpp b/js/src/jit/IonBuilder.cpp index 9e70e24..34520b3 100644 --- a/js/src/jit/IonBuilder.cpp +++ b/js/src/jit/IonBuilder.cpp @@ -6366,7 +6366,12 @@ IonBuilder::jsop_funapply(uint32_t argc) if (argument->type() != MIRType_MagicOptimizedArguments) { // Optimize fun.apply(self, array) if the length is sane and there are no holes. TemporaryTypeSet* objTypes = argument->resultTypeSet(); - if (native && native->isNative() && native->native() == fun_apply && +#ifdef XP_WIN + bool opt = false; +#else + bool opt = true; +#endif + if (opt && native && native->isNative() && native->native() == fun_apply && objTypes && objTypes->getKnownClass(constraints()) == &ArrayObject::class_ && !objTypes->hasObjectFlags(constraints(), OBJECT_FLAG_LENGTH_OVERFLOW) &&

1 0

[tor-launcher/master] Bug 21920: Don't show locale selection dialog
by gk＠torproject.org 12 Apr '17

12 Apr '17

commit afb9893b7626ce819d7b2b571a847d44277971f6 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 12 10:23:38 2017 +0000 Bug 21920: Don't show locale selection dialog The locale selection dialog was one of the features we included in the hardened series. It is not needed on the alpha or stable channel. We therefore disable it, keeping the code as we might be able to resue it for #17400 later on. --- src/modules/tl-util.jsm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index 2f8d14e..0d33267 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -290,7 +290,10 @@ let TorLauncherUtil = // Public get shouldPromptForLocale() { - const kPrefPromptForLocale = "extensions.torlauncher.prompt_for_locale"; + // We are not supporting locale selection on the alpha/stable channel + // right now. Thus, no prompt for the user. + return false; + /* const kPrefPromptForLocale = "extensions.torlauncher.prompt_for_locale"; try { const kEnvSkipLocalePrompt = "TOR_SKIP_LOCALE_PROMPT"; @@ -301,7 +304,7 @@ let TorLauncherUtil = // Public return ("1" != env.get(kEnvSkipLocalePrompt)); } catch(e) {} - return this.getBoolPref(kPrefPromptForLocale, true); + return this.getBoolPref(kPrefPromptForLocale, true); */ }, get shouldShowNetworkSettings()

1 0

[tor-browser-build/master] Update tor-browser.git commit
by boklm＠torproject.org 12 Apr '17

12 Apr '17

commit 2603af6dee70233dcc30f8717ee48a2b0121ff04 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Apr 12 10:57:28 2017 +0200 Update tor-browser.git commit --- projects/firefox/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/config b/projects/firefox/config index 7e685e7..0b8995b 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -2,7 +2,7 @@ version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' ## There is no signed tag yet, so we use a fixed commit -git_hash: 47fa36dc780f4962102205b390e18ce9ef74b1b9 +git_hash: 4c6219dc621d139cd39e8aaca578dd69b9c063d0 #git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' #tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] Bug 21907: Fix runtime error on CentOS 6
by gk＠torproject.org 12 Apr '17

12 Apr '17

commit 4c6219dc621d139cd39e8aaca578dd69b9c063d0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 10 16:07:23 2017 +0200 Bug 21907: Fix runtime error on CentOS 6 In Mozilla bug 1324780, support for building with glib 2.28 (the version available in CentOS 6) was added. However we are building on Debian Wheezy which has glib 2.32. We fix that by backing out all glib > 2.28 code paths. --- gfx/harfbuzz/src/hb-glib.cc | 41 ----------------------------------------- gfx/harfbuzz/src/hb-glib.h | 5 ----- 2 files changed, 46 deletions(-) diff --git a/gfx/harfbuzz/src/hb-glib.cc b/gfx/harfbuzz/src/hb-glib.cc index 2b91b5b..0971ca2 100644 --- a/gfx/harfbuzz/src/hb-glib.cc +++ b/gfx/harfbuzz/src/hb-glib.cc @@ -33,7 +33,6 @@ #include "hb-unicode-private.hh" -#if !GLIB_CHECK_VERSION(2,29,14) static const hb_script_t glib_script_to_script[] = { @@ -155,14 +154,10 @@ glib_script_to_script[] = HB_SCRIPT_SORA_SOMPENG, HB_SCRIPT_TAKRI }; -#endif hb_script_t hb_glib_script_to_script (GUnicodeScript script) { -#if GLIB_CHECK_VERSION(2,29,14) - return (hb_script_t) g_unicode_script_to_iso15924 (script); -#else if (likely ((unsigned int) script < ARRAY_LENGTH (glib_script_to_script))) return glib_script_to_script[script]; @@ -170,15 +165,11 @@ hb_glib_script_to_script (GUnicodeScript script) return HB_SCRIPT_INVALID; return HB_SCRIPT_UNKNOWN; -#endif } GUnicodeScript hb_glib_script_from_script (hb_script_t script) { -#if GLIB_CHECK_VERSION(2,29,14) - return g_unicode_script_from_iso15924 (script); -#else unsigned int count = ARRAY_LENGTH (glib_script_to_script); for (unsigned int i = 0; i < count; i++) if (glib_script_to_script[i] == script) @@ -188,7 +179,6 @@ hb_glib_script_from_script (hb_script_t script) return G_UNICODE_SCRIPT_INVALID_CODE; return G_UNICODE_SCRIPT_UNKNOWN; -#endif } @@ -243,10 +233,6 @@ hb_glib_unicode_compose (hb_unicode_funcs_t *ufuncs HB_UNUSED, hb_codepoint_t *ab, void *user_data HB_UNUSED) { -#if GLIB_CHECK_VERSION(2,29,12) - return g_unichar_compose (a, b, ab); -#endif - /* We don't ifdef-out the fallback code such that compiler always * sees it and makes sure it's compilable. */ @@ -280,10 +266,6 @@ hb_glib_unicode_decompose (hb_unicode_funcs_t *ufuncs HB_UNUSED, hb_codepoint_t *b, void *user_data HB_UNUSED) { -#if GLIB_CHECK_VERSION(2,29,12) - return g_unichar_decompose (ab, a, b); -#endif - /* We don't ifdef-out the fallback code such that compiler always * sees it and makes sure it's compilable. */ @@ -339,10 +321,6 @@ hb_glib_unicode_decompose_compatibility (hb_unicode_funcs_t *ufuncs HB_UNUSED, hb_codepoint_t *decomposed, void *user_data HB_UNUSED) { -#if GLIB_CHECK_VERSION(2,29,12) - return g_unichar_fully_decompose (u, true, decomposed, HB_UNICODE_MAX_DECOMPOSITION_LEN); -#endif - /* If the user doesn't have GLib >= 2.29.12 we have to perform * a round trip to UTF-8 and the associated memory management dance. */ gchar utf8[6]; @@ -381,22 +359,3 @@ hb_glib_get_unicode_funcs (void) return const_cast<hb_unicode_funcs_t *> (&_hb_glib_unicode_funcs); } - -#if GLIB_CHECK_VERSION(2,31,10) -/** - * hb_glib_blob_create: - * - * Since: 0.9.38 - **/ -hb_blob_t * -hb_glib_blob_create (GBytes *gbytes) -{ - gsize size = 0; - gconstpointer data = g_bytes_get_data (gbytes, &size); - return hb_blob_create ((const char *) data, - size, - HB_MEMORY_MODE_READONLY, - g_bytes_ref (gbytes), - (hb_destroy_func_t) g_bytes_unref); -} -#endif diff --git a/gfx/harfbuzz/src/hb-glib.h b/gfx/harfbuzz/src/hb-glib.h index 5f04183..4adbd7c 100644 --- a/gfx/harfbuzz/src/hb-glib.h +++ b/gfx/harfbuzz/src/hb-glib.h @@ -46,11 +46,6 @@ hb_glib_script_from_script (hb_script_t script); HB_EXTERN hb_unicode_funcs_t * hb_glib_get_unicode_funcs (void); -#if GLIB_CHECK_VERSION(2,31,10) -HB_EXTERN hb_blob_t * -hb_glib_blob_create (GBytes *gbytes); -#endif - HB_END_DECLS #endif /* HB_GLIB_H */

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] Bug 1352305 - Part2: Add a test case for making sure dialog windows will not be enforced to rounded sizes when fingerprinting resistance is enabled. r?ehsan
by gk＠torproject.org 12 Apr '17

12 Apr '17

commit e761b3ca2087275c165fb67b7f876a55286d47dd Author: Tim Huang <tihuang(a)mozilla.com> Date: Fri Mar 31 00:11:41 2017 -0800 Bug 1352305 - Part2: Add a test case for making sure dialog windows will not be enforced to rounded sizes when fingerprinting resistance is enabled. r?ehsan A browser chrome test which ensures the dialog windows will not be enforced to be rounded sizes when fingerprinting resistance is enabled. MozReview-Commit-ID: LQG13FMANav --- .../resistfingerprinting/test/browser/browser.ini | 1 + .../browser/browser_roundedWindow_dialogWindow.js | 30 ++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/browser/components/resistfingerprinting/test/browser/browser.ini b/browser/components/resistfingerprinting/test/browser/browser.ini index 713f3d2..4b81c91 100644 --- a/browser/components/resistfingerprinting/test/browser/browser.ini +++ b/browser/components/resistfingerprinting/test/browser/browser.ini @@ -4,6 +4,7 @@ support-files = file_dummy.html head.js +[browser_roundedWindow_dialogWindow.js] [browser_roundedWindow_newWindow.js] [browser_roundedWindow_open_max.js] [browser_roundedWindow_open_mid.js] diff --git a/browser/components/resistfingerprinting/test/browser/browser_roundedWindow_dialogWindow.js b/browser/components/resistfingerprinting/test/browser/browser_roundedWindow_dialogWindow.js new file mode 100644 index 0000000..839388e --- /dev/null +++ b/browser/components/resistfingerprinting/test/browser/browser_roundedWindow_dialogWindow.js @@ -0,0 +1,30 @@ +/** + * Bug 1352305 - A test case for dialog windows that it should not be rounded + * even after fingerprinting resistance is enabled. + */ + +add_task(async function setup() { + await SpecialPowers.pushPrefEnv({"set": + [["privacy.resistFingerprinting", true]] + }); +}); + +add_task(async function test_dialog_window() { + + let diagWin; + + await new Promise(resolve => { + // Open a dialog window which is not rounded size. + diagWin = window.openDialog("about:blank", null, + "innerWidth=250,innerHeight=350"); + + diagWin.addEventListener("load", function() { + resolve(); + }, {once: true}); + }); + + is(diagWin.innerWidth, 250, "The dialog window doesn't have a rounded size."); + is(diagWin.innerHeight, 350, "The dialog window doesn't have a rounded size."); + + await BrowserTestUtils.closeWindow(diagWin); +});

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] Bug 1352305 - Part 1: Making the XULWindow will not be enforecd to be rounded dimensions if it is
by gk＠torproject.org 12 Apr '17

12 Apr '17

commit 9ee872b57e55ae672a30f087cf55bccef18f3646 Author: Tim Huang <tihuang(a)mozilla.com> Date: Mon Apr 10 11:03:22 2017 -0700 Bug 1352305 - Part 1: Making the XULWindow will not be enforecd to be rounded dimensions if it is a window without a primary content when fingerprinting resistance is enabled. r?ehsan This patch making the nsXULWindow::ForceRoundedDimensions() will only be called when this window is a window which has a primary content when fingerprinting resistance is enabled. This will fix the problem that dialog windows are incorrectly resized after fingerprinting resistance is enabled. MozReview-Commit-ID: 6WD6c38CTPv --- xpfe/appshell/nsXULWindow.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/xpfe/appshell/nsXULWindow.cpp b/xpfe/appshell/nsXULWindow.cpp index a24318a..604c41a 100644 --- a/xpfe/appshell/nsXULWindow.cpp +++ b/xpfe/appshell/nsXULWindow.cpp @@ -1129,8 +1129,13 @@ void nsXULWindow::OnChromeLoaded() int32_t specWidth = -1, specHeight = -1; bool gotSize = false; + bool isContent = false; - if (nsContentUtils::ShouldResistFingerprinting()) { + GetHasPrimaryContent(&isContent); + + // If this window has a primary content and fingerprinting resistance is + // enabled, we enforce this window to rounded dimensions. + if (isContent && nsContentUtils::ShouldResistFingerprinting()) { ForceRoundedDimensions(); } else if (!mIgnoreXULSize) { gotSize = LoadSizeFromXUL(specWidth, specHeight);

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] Bug 21876: Always use esr policies for e10s.
by gk＠torproject.org 11 Apr '17

11 Apr '17

commit 1240ac3e85536322d6af0075c662eaf60ab078f9 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Apr 11 11:33:02 2017 -0400 Bug 21876: Always use esr policies for e10s. Always use the policies associated with the esr update channel so that the e10s behavior is the same for all Tor Browser builds. --- browser/extensions/e10srollout/bootstrap.js | 5 ++++- toolkit/xre/nsAppRunner.cpp | 9 +++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/browser/extensions/e10srollout/bootstrap.js b/browser/extensions/e10srollout/bootstrap.js index 8847501..e4e0738 100644 --- a/browser/extensions/e10srollout/bootstrap.js +++ b/browser/extensions/e10srollout/bootstrap.js @@ -58,7 +58,10 @@ function defineCohort() { } cohortDefinedOnThisSession = true; - let updateChannel = UpdateUtils.getUpdateChannel(false); + // For Tor Browser, always use the e10s policies associated with the esr + // update channel so that the e10s behavior is the same for all builds. + let updateChannel = "esr"; + if (!(updateChannel in TEST_THRESHOLD)) { setCohort("unsupportedChannel"); return; diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index 721f599..190fec1 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -5453,15 +5453,12 @@ MultiprocessBlockPolicy() { #endif /** - * Avoids enabling e10s for Windows XP users on the release channel. + * Avoid enabling e10s for all Windows XP users. */ #if defined(XP_WIN) if (!IsVistaOrLater()) { - nsAdoptingCString channelName = Preferences::GetDefaultCString("app.update.channel"); - if (channelName.EqualsLiteral("release") || channelName.EqualsLiteral("esr")) { - gMultiprocessBlockPolicy = kE10sDisabledForOperatingSystem; - return gMultiprocessBlockPolicy; - } + gMultiprocessBlockPolicy = kE10sDisabledForOperatingSystem; + return gMultiprocessBlockPolicy; } #endif // XP_WIN

1 0

[tor-browser-bundle/master] We are on tor-browser-builder-4 meanwhile
by gk＠torproject.org 11 Apr '17

11 Apr '17

commit beb571f4c3e96be1458c870e6be486e5f1561d39 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Apr 11 14:54:38 2017 +0000 We are on tor-browser-builder-4 meanwhile --- gitian/check-prerequisites.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh index d6e79fd..74ddab6 100755 --- a/gitian/check-prerequisites.sh +++ b/gitian/check-prerequisites.sh @@ -92,7 +92,7 @@ then echo echo "Please run:" echo " cd ../../ " - echo " torsocks git clone -b tor-browser-builder-3 https://git.torproject.org/builders/gitian-builder.git" + echo " torsocks git clone -b tor-browser-builder-4 https://git.torproject.org/builders/gitian-builder.git" echo " cd -" exit 1 fi

1 0

[tor-browser-build/master] Add some indentation in various places
by boklm＠torproject.org 11 Apr '17

11 Apr '17

commit 1c9ccca6e097a988283d9474d30118670cbbded8 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 10 21:17:06 2017 +0200 Add some indentation in various places Add some indentation to make things more clear. --- projects/binutils/build | 26 ++++---- projects/firefox-langpacks/build | 14 ++--- projects/firefox/build | 124 +++++++++++++++++++-------------------- projects/fonts/build | 8 +-- projects/tor/build | 90 ++++++++++++++-------------- 5 files changed, 131 insertions(+), 131 deletions(-) diff --git a/projects/binutils/build b/projects/binutils/build index e3064cf..8d4f09f 100644 --- a/projects/binutils/build +++ b/projects/binutils/build @@ -18,25 +18,25 @@ distdir=/var/tmp/dist/binutils tar xf [% project %]-[% c("version") %].tar.bz2 cd [% project %]-[% c("version") %] [% IF c('var/windows') -%] -# XXX: This is needed due to bug 10102. -sed 's/= extern_rt_rel_d;/= extern_rt_rel_d;\n memset (extern_rt_rel_d, 0, PE_IDATA5_SIZE);/' -i ld/pe-dll.c -# Needed for the hardening... -patch -p1 < ../enable-reloc-section-ld.patch -# Zeroing timestamps in PE headers reliably, see bug 12753. -patch -p1 < ../peXXigen.patch + # XXX: This is needed due to bug 10102. + sed 's/= extern_rt_rel_d;/= extern_rt_rel_d;\n memset (extern_rt_rel_d, 0, PE_IDATA5_SIZE);/' -i ld/pe-dll.c + # Needed for the hardening... + patch -p1 < ../enable-reloc-section-ld.patch + # Zeroing timestamps in PE headers reliably, see bug 12753. + patch -p1 < ../peXXigen.patch [% END -%] ./configure --prefix=$distdir [% c('var/configure_opt') %] make -j4 make install [% IF c("var/linux") %] -# Make sure gold is used with the hardening wrapper for full RELRO, see #13031. -cd $distdir/bin -rm ld -cp /usr/bin/hardened-ld ./ -mv ld.gold ld.gold.real -ln -sf hardened-ld ld.gold -ln -sf ld.gold ld + # Make sure gold is used with the hardening wrapper for full RELRO, see #13031. + cd $distdir/bin + rm ld + cp /usr/bin/hardened-ld ./ + mv ld.gold ld.gold.real + ln -sf hardened-ld ld.gold + ln -sf ld.gold ld [% END %] cd /var/tmp/dist diff --git a/projects/firefox-langpacks/build b/projects/firefox-langpacks/build index 9ac07cb..6bc1810 100644 --- a/projects/firefox-langpacks/build +++ b/projects/firefox-langpacks/build @@ -2,15 +2,15 @@ [% c("var/set_default_env") -%] [% FOREACH lang = c('var/locales') %] -[% SET lang = tmpl(lang) %] -[% SET filename = c("var/input_filename") _ '/' _ lang _ '.xpi'; %] -shasum=$(grep '[% c("var/ff_arch") %]/xpi/[% lang %].xpi$' SHA512SUMS-[% c("version") %] | sed 's| [% c("var/ff_arch") %]/xpi/[% lang %].xpi$||') -echo "$shasum [% filename %]" | sha512sum -c + [% SET lang = tmpl(lang) %] + [% SET filename = c("var/input_filename") _ '/' _ lang _ '.xpi'; %] + shasum=$(grep '[% c("var/ff_arch") %]/xpi/[% lang %].xpi$' SHA512SUMS-[% c("version") %] | sed 's| [% c("var/ff_arch") %]/xpi/[% lang %].xpi$||') + echo "$shasum [% filename %]" | sha512sum -c [% END %] mkdir -p [% dest_dir %]/[% c("filename") %] [% FOREACH lang = c('var/locales') %] -[% SET lang = tmpl(lang) %] -[% SET filename = c("var/input_filename") _ '/' _ lang _ '.xpi'; %] -cp -a [% filename %] [% dest_dir %]/[% c("filename") %]/ + [% SET lang = tmpl(lang) %] + [% SET filename = c("var/input_filename") _ '/' _ lang _ '.xpi'; %] + cp -a [% filename %] [% dest_dir %]/[% c("filename") %]/ [% END %] diff --git a/projects/firefox/build b/projects/firefox/build index 4d83b28..b10bab4 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -21,21 +21,21 @@ distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/build [% IF c("var/linux") %] -mkdir -p /var/tmp/dist -tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %] -export PATH="/var/tmp/dist/binutils/bin:$PATH" + mkdir -p /var/tmp/dist + tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %] + export PATH="/var/tmp/dist/binutils/bin:$PATH" [% END -%] tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz [% IF c("var/osx") %] -mkdir -p $distdir/TorBrowser.app/Contents/MacOS + mkdir -p $distdir/TorBrowser.app/Contents/MacOS [% ELSE %] -mkdir -p $distdir/Browser + mkdir -p $distdir/Browser [% END %] [% IF c("var/linux") %] -mkdir -p $distdir/Debug/Browser/gmp-clearkey/0.1 + mkdir -p $distdir/Debug/Browser/gmp-clearkey/0.1 [% END %] cd /var/tmp/build/[% project %]-[% c("version") %] @@ -49,29 +49,29 @@ then fi [% IF c("var/windows") %] -# FIXME -# Ideally, using LDFLAGS (and e.g. DLLFLAGS for NSS) would be enough to get -# all Firefox libraries linked against msvcr100. Alas, this does not hold for -# NSPR. Without patching it we get a "missing entry points for _strcmpi in -# msvcr100.dll". Now, this should be fixed in rev>=6179 as the def file there -# contains a proper patch according to the mingw-w64 developers. -# However, even with this patch the _strcmpi issue is still popping up, -# probably due to a bug in our current linking setup. The small patch below -# is therefore just a workaround which should get fixed but is at least -# justified as the signature of _strcmpi and _stricmp is the same, see: -# http://msdn.microsoft.com/en-us/library/k59z8dwe.aspx. -sed 's/strcmpi/stricmp/' -i nsprpub/pr/src/linking/prlink.c -export HOST_LDFLAGS=" " -export LDFLAGS="-specs=/var/tmp/dist/mingw-w64/msvcr100.spec" -# Our flags don't get passed to NSS. We need to do that manually using an -# obscure one. -export DLLFLAGS="-specs=/var/tmp/dist/mingw-w64/msvcr100.spec" + # FIXME + # Ideally, using LDFLAGS (and e.g. DLLFLAGS for NSS) would be enough to get + # all Firefox libraries linked against msvcr100. Alas, this does not hold for + # NSPR. Without patching it we get a "missing entry points for _strcmpi in + # msvcr100.dll". Now, this should be fixed in rev>=6179 as the def file there + # contains a proper patch according to the mingw-w64 developers. + # However, even with this patch the _strcmpi issue is still popping up, + # probably due to a bug in our current linking setup. The small patch below + # is therefore just a workaround which should get fixed but is at least + # justified as the signature of _strcmpi and _stricmp is the same, see: + # http://msdn.microsoft.com/en-us/library/k59z8dwe.aspx. + sed 's/strcmpi/stricmp/' -i nsprpub/pr/src/linking/prlink.c + export HOST_LDFLAGS=" " + export LDFLAGS="-specs=/var/tmp/dist/mingw-w64/msvcr100.spec" + # Our flags don't get passed to NSS. We need to do that manually using an + # obscure one. + export DLLFLAGS="-specs=/var/tmp/dist/mingw-w64/msvcr100.spec" [% END %] [% IF c("var/osname") == "linux-i686" -%] -export LDFLAGS=-m32 -export CFLAGS=-m32 -export CC='gcc -m32' + export LDFLAGS=-m32 + export CFLAGS=-m32 + export CC='gcc -m32' [% END -%] rm -f configure @@ -82,31 +82,31 @@ make -j8 -f client.mk build make -C obj-* package INNER_MAKE_PACKAGE=true [% IF c("var/osx") %] -cp -a obj-macos/dist/firefox/* $distdir -# Remove firefox-bin (we don't use it, see ticket #10126) -rm -f $distdir/TorBrowser.app/Contents/MacOS/firefox-bin - -# Adjust the Info.plist file -INFO_PLIST=$distdir/TorBrowser.app/Contents/Info.plist -mv $INFO_PLIST tmp.plist -python $rootdir/fix-info-plist.py '[% c("var/torbrowser_version") %]' '[% c("var/copyright_year") %]' < tmp.plist > $INFO_PLIST -rm -f tmp.plist + cp -a obj-macos/dist/firefox/* $distdir + # Remove firefox-bin (we don't use it, see ticket #10126) + rm -f $distdir/TorBrowser.app/Contents/MacOS/firefox-bin + + # Adjust the Info.plist file + INFO_PLIST=$distdir/TorBrowser.app/Contents/Info.plist + mv $INFO_PLIST tmp.plist + python $rootdir/fix-info-plist.py '[% c("var/torbrowser_version") %]' '[% c("var/copyright_year") %]' < tmp.plist > $INFO_PLIST + rm -f tmp.plist [% END %] [% IF c("var/linux") %] -cp -a obj-*/dist/firefox/* $distdir/Browser/ -# Remove firefox-bin (we don't use it, see ticket #10126) -rm -f $distdir/Browser/firefox-bin -# TODO: There goes FIPS-140.. We could upload these somewhere unique and -# subsequent builds could test to see if they've been uploaded before... -# But let's find out if it actually matters first.. -rm -f $distdir/Browser/*.chk + cp -a obj-*/dist/firefox/* $distdir/Browser/ + # Remove firefox-bin (we don't use it, see ticket #10126) + rm -f $distdir/Browser/firefox-bin + # TODO: There goes FIPS-140.. We could upload these somewhere unique and + # subsequent builds could test to see if they've been uploaded before... + # But let's find out if it actually matters first.. + rm -f $distdir/Browser/*.chk [% END %] [% IF c("var/windows") %] -cp -a obj-*/dist/firefox/* $distdir/Browser/ -cp -a $rootdir/msvcr100.dll $distdir/Browser -cp -a $gcclibs/libssp-0.dll $distdir/Browser + cp -a obj-*/dist/firefox/* $distdir/Browser/ + cp -a $rootdir/msvcr100.dll $distdir/Browser + cp -a $gcclibs/libssp-0.dll $distdir/Browser [% END %] # Make MAR-based update tools available for use during the bundle phase. @@ -121,26 +121,26 @@ cp -p tools/update-packaging/*.sh $MARTOOLS/ cp -p obj-*/dist/host/bin/mar $MARTOOLS/ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ [% IF c("var/linux") %] -cp -p obj-*/modules/libmar/tool/signmar $MARTOOLS/ -cp -p obj-*/security/nss/cmd/certutil/certutil $MARTOOLS/ -NSS_LIBS="libmozsqlite3.so libnss3.so libnssdbm3.so libnssutil3.so libsmime3.so libssl3.so" -NSPR_LIBS="libnspr4.so libplc4.so libplds4.so" -for LIB in $NSS_LIBS $NSPR_LIBS; do - cp -p obj-*/dist/bin/$LIB $MARTOOLS/ -done + cp -p obj-*/modules/libmar/tool/signmar $MARTOOLS/ + cp -p obj-*/security/nss/cmd/certutil/certutil $MARTOOLS/ + NSS_LIBS="libmozsqlite3.so libnss3.so libnssdbm3.so libnssutil3.so libsmime3.so libssl3.so" + NSPR_LIBS="libnspr4.so libplc4.so libplds4.so" + for LIB in $NSS_LIBS $NSPR_LIBS; do + cp -p obj-*/dist/bin/$LIB $MARTOOLS/ + done [% END %] cd $distdir [% IF c("var/linux") %] -# Strip and generate debuginfo for the firefox binary that we keep, all *.so -# files, the plugin-container, and the updater (see ticket #10126) -for LIB in Browser/*.so Browser/firefox Browser/plugin-container Browser/gmp-clearkey/0.1/*.so Browser/updater -do - objcopy --only-keep-debug $LIB Debug/$LIB - strip $LIB - objcopy --add-gnu-debuglink=./Debug/$LIB $LIB -done + # Strip and generate debuginfo for the firefox binary that we keep, all *.so + # files, the plugin-container, and the updater (see ticket #10126) + for LIB in Browser/*.so Browser/firefox Browser/plugin-container Browser/gmp-clearkey/0.1/*.so Browser/updater + do + objcopy --only-keep-debug $LIB Debug/$LIB + strip $LIB + objcopy --add-gnu-debuglink=./Debug/$LIB $LIB + done [% END %] # Re-zipping the omni.ja files is not needed to make them reproductible, @@ -156,8 +156,8 @@ done [% END %] [% IF c("var/windows") %] -cp $rootdir/msvcr100.dll Browser/ -cp $gcclibs/libssp-0.dll Browser/ + cp $rootdir/msvcr100.dll Browser/ + cp $gcclibs/libssp-0.dll Browser/ [% END %] mkdir -p [% dest_dir _ '/' _ c('filename') %] diff --git a/projects/fonts/build b/projects/fonts/build index e645c31..9b33da9 100644 --- a/projects/fonts/build +++ b/projects/fonts/build @@ -13,12 +13,12 @@ mkdir -p $distdir END; %] [% IF c("var/linux") || c("var/osx") %] -unzip -o STIXv1.1.1-latex.zip -d STIX -cp "STIX/Fonts/fonts/opentype/public/stix/STIXMath-Regular.otf" $distdir/ + unzip -o STIXv1.1.1-latex.zip -d STIX + cp "STIX/Fonts/fonts/opentype/public/stix/STIXMath-Regular.otf" $distdir/ [% END %] [% IF c("var/linux") %] -cp NotoEmoji-Regular.ttf $distdir/ -cp {NotoSansJP-Regular.otf,NotoSansKR-Regular.otf,NotoSansSC-Regular.otf,NotoSansTC-Regular.otf} $distdir/ + cp NotoEmoji-Regular.ttf $distdir/ + cp {NotoSansJP-Regular.otf,NotoSansKR-Regular.otf,NotoSansSC-Regular.otf,NotoSansTC-Regular.otf} $distdir/ [% END %] cd /var/tmp/dist [% c('tar', { diff --git a/projects/tor/build b/projects/tor/build index c1296fe..85e158f 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -5,17 +5,17 @@ distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/build [% IF c("var/linux") || c("var/windows") %] -TORCONFIGDIR="$distdir/Data/Tor" -mkdir -p $TORCONFIGDIR -mkdir -p "$distdir/Tor" + TORCONFIGDIR="$distdir/Data/Tor" + mkdir -p $TORCONFIGDIR + mkdir -p "$distdir/Tor" [% END %] [% IF c("var/osx") %] -TORBINDIR="$distdir/Contents/MacOS/Tor" -TORCONFIGDIR="$distdir/Contents/Resources/TorBrowser/Tor" -mkdir -p $distdir/bin -mkdir -p $TORBINDIR -mkdir -p $TORCONFIGDIR + TORBINDIR="$distdir/Contents/MacOS/Tor" + TORCONFIGDIR="$distdir/Contents/Resources/TorBrowser/Tor" + mkdir -p $distdir/bin + mkdir -p $TORBINDIR + mkdir -p $TORCONFIGDIR [% END %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/openssl') %] @@ -25,32 +25,32 @@ libeventdir=/var/tmp/dist/libevent openssldir=/var/tmp/dist/openssl [% IF c("var/windows") %] -tar -C /var/tmp/build -xf [% c('input_files_by_name/zlib') %] -zlibdir=/var/tmp/build/zlib -cp $zlibdir/lib/*.dll $openssldir/bin/*.dll $libeventdir/bin/*.dll \ - $gcclibs/*.dll $distdir/Tor/ + tar -C /var/tmp/build -xf [% c('input_files_by_name/zlib') %] + zlibdir=/var/tmp/build/zlib + cp $zlibdir/lib/*.dll $openssldir/bin/*.dll $libeventdir/bin/*.dll \ + $gcclibs/*.dll $distdir/Tor/ [% END %] [% IF c("var/linux") %] -mkdir -p "$distdir/Debug/Tor" -cp $openssldir/lib/libssl.so.1.0.0 "$distdir/Tor/" -cp $openssldir/lib/libcrypto.so.1.0.0 "$distdir/Tor/" -cp $libeventdir/lib/libevent-2.0.so.5 "$distdir/Tor/" -# We need to copy the libstdc++.so.6 for Tor Browser on older Linux distros. -# Copying it into /Browser, which feels more natural, and amending -# LD_LIBRARY_PATH breaks updates from a Tor Browser with the old -# LD_LIBRARY_PATH value to the Tor Browser with the newer one. Thus, we copy -# the libstdc++ into the directory with the libs tor depends on, too. See bug -# 13359 for further details. -cp /var/tmp/dist/gcc/[% c("var/libdir") %]/libstdc++.so.6 "$distdir/Tor/" -chmod 700 "$distdir"/Tor/*.so* -# This is needed to make RPATH unavailable. See bug 9150. -export LD_LIBRARY_PATH="$distdir/Tor/" + mkdir -p "$distdir/Debug/Tor" + cp $openssldir/lib/libssl.so.1.0.0 "$distdir/Tor/" + cp $openssldir/lib/libcrypto.so.1.0.0 "$distdir/Tor/" + cp $libeventdir/lib/libevent-2.0.so.5 "$distdir/Tor/" + # We need to copy the libstdc++.so.6 for Tor Browser on older Linux distros. + # Copying it into /Browser, which feels more natural, and amending + # LD_LIBRARY_PATH breaks updates from a Tor Browser with the old + # LD_LIBRARY_PATH value to the Tor Browser with the newer one. Thus, we copy + # the libstdc++ into the directory with the libs tor depends on, too. See bug + # 13359 for further details. + cp /var/tmp/dist/gcc/[% c("var/libdir") %]/libstdc++.so.6 "$distdir/Tor/" + chmod 700 "$distdir"/Tor/*.so* + # This is needed to make RPATH unavailable. See bug 9150. + export LD_LIBRARY_PATH="$distdir/Tor/" [% END %] [% IF c("var/osx") %] -cp $libeventdir/lib/libevent-*.dylib $TORBINDIR/ + cp $libeventdir/lib/libevent-*.dylib $TORBINDIR/ [% END %] cd /var/tmp/build/[% project %]-[% c('version') %] @@ -73,33 +73,33 @@ cp $distdir/share/tor/geoip $TORCONFIGDIR cp $distdir/share/tor/geoip6 $TORCONFIGDIR [% IF c("var/osx") %] -LIBEVENT_FILE=`basename $libeventdir/lib/libevent-*.dylib` -cd $distdir -cp bin/tor $TORBINDIR/ -cd $TORBINDIR/ -x86_64-apple-darwin10-install_name_tool -change $libeventdir/lib/$LIBEVENT_FILE @executable_path/$LIBEVENT_FILE tor + LIBEVENT_FILE=`basename $libeventdir/lib/libevent-*.dylib` + cd $distdir + cp bin/tor $TORBINDIR/ + cd $TORBINDIR/ + x86_64-apple-darwin10-install_name_tool -change $libeventdir/lib/$LIBEVENT_FILE @executable_path/$LIBEVENT_FILE tor [% END %] cd $distdir [% IF c("var/windows") %] -install -s $distdir/bin/tor.exe $distdir/Tor/ + install -s $distdir/bin/tor.exe $distdir/Tor/ [% IF c("var/expert_bundle") %] -install -s $distdir/bin/tor-gencert.exe $distdir/Tor/ + install -s $distdir/bin/tor-gencert.exe $distdir/Tor/ [% END %] [% END %] [% IF c("var/linux") %] -# Strip and generate debuginfo for libs -objcopy --only-keep-debug $distdir/bin/tor $distdir/Debug/Tor/tor -install -s $distdir/bin/tor $distdir/Tor/ -objcopy --add-gnu-debuglink=./Debug/Tor/tor $distdir/Tor/tor -for i in $distdir/Tor/*so* -do - LIB=`basename $i` - objcopy --only-keep-debug $distdir/Tor/$LIB $distdir/Debug/Tor/$LIB - strip $distdir/Tor/$LIB - objcopy --add-gnu-debuglink=./Debug/Tor/$LIB $distdir/Tor/$LIB -done + # Strip and generate debuginfo for libs + objcopy --only-keep-debug $distdir/bin/tor $distdir/Debug/Tor/tor + install -s $distdir/bin/tor $distdir/Tor/ + objcopy --add-gnu-debuglink=./Debug/Tor/tor $distdir/Tor/tor + for i in $distdir/Tor/*so* + do + LIB=`basename $i` + objcopy --only-keep-debug $distdir/Tor/$LIB $distdir/Debug/Tor/$LIB + strip $distdir/Tor/$LIB + objcopy --add-gnu-debuglink=./Debug/Tor/$LIB $distdir/Tor/$LIB + done [% END %] mkdir -p [% dest_dir _ '/' _ c('filename') %]

1 0

[tor-browser-build/master] Bug 21837: Fix reproducibility of accessibility code for Windows
by boklm＠torproject.org 11 Apr '17

11 Apr '17

commit bf7083a47fbe40f8e5ca423fde06bb0f0cd403b0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 10 21:18:50 2017 +0200 Bug 21837: Fix reproducibility of accessibility code for Windows tor-browser-bundle.git commit: f13a2dae1ca038a448483dc6b25f17e40c8f3c9b --- projects/firefox/build | 3 +++ 1 file changed, 3 insertions(+) diff --git a/projects/firefox/build b/projects/firefox/build index b10bab4..3985aec 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -66,6 +66,9 @@ fi # Our flags don't get passed to NSS. We need to do that manually using an # obscure one. export DLLFLAGS="-specs=/var/tmp/dist/mingw-w64/msvcr100.spec" + + # Make sure widl is not inserting random timestamps, see #21837. + export WIDL_TIME_OVERRIDE="0" [% END %] [% IF c("var/osname") == "linux-i686" -%]

1 0

[tor-browser-build/master] Bug 21917: Add new default bridges cymrubridge31:80 and cymrubridge33:80.
by boklm＠torproject.org 11 Apr '17

11 Apr '17

commit d7320b6a957ef07eb5d6b86412d2e0e0aaf6e9e4 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Mar 19 15:39:21 2017 -0700 Bug 21917: Add new default bridges cymrubridge31:80 and cymrubridge33:80. The second one uses some inline comment blocks to break up the format, as a test to see if censors' parsers can handle it. --- projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index 61e2a9e..bcf3a19 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -33,6 +33,8 @@ pref("extensions.torlauncher.default_bridge.obfs4.17", "obfs4 154.35.22.12:4304 pref("extensions.torlauncher.default_bridge.obfs4.18", "obfs4 154.35.22.13:16815 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.19", "obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1"); pref("extensions.torlauncher.default_bridge.obfs4.20", "obfs4 85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.21", "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1"); +/**/pref/**/(/**/"extensions.torlauncher.default_bridge.obfs4.22"/**/, /**/"obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-build/master] Update Tor Browser version number
by boklm＠torproject.org 11 Apr '17

11 Apr '17

commit 266cd147cd2364b2bd7ee493e5552272f9c6613a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 10 21:21:27 2017 +0200 Update Tor Browser version number --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 355c593..651acfa 100644 --- a/rbm.conf +++ b/rbm.conf @@ -7,7 +7,7 @@ build_log: 'logs/[% project %]-[% c("var/osname") %].log' pkg_type: build var: - torbrowser_version: '6.5n' + torbrowser_version: '7.0a3' project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/master] Bug 21904: Bump mingw-w64 commit to help with sandbox compilation
by boklm＠torproject.org 11 Apr '17

11 Apr '17

commit 476524702f8c6e2b5b104ae37919ee92bd5ade9d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 10 20:57:19 2017 +0200 Bug 21904: Bump mingw-w64 commit to help with sandbox compilation tor-browser-bundle.git commit: 2b565b9f4125d0cd54e705b2f54719e2b0f4db40 --- projects/mingw-w64/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config index 3065df7..060857c 100644 --- a/projects/mingw-w64/config +++ b/projects/mingw-w64/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: http://git.code.sf.net/p/mingw-w64/mingw-w64 -git_hash: 9c7c7122401cfd932e599bec5b4b7ca846deb5c0 +git_hash: 98e5b4930a717eafddd8ca0f0dfeb7c57c6b026a version: '[% c("abbrev") %]' remote_docker: 1 var:

1 0

[tor-browser-bundle/maint-6.5] Bug 21918: Move meek-amazon to the d2cly7j4zqgua7.cloudfront.net backend.
by gk＠torproject.org 11 Apr '17

11 Apr '17

commit 20f2bbb9d5888f639f08f9245c711decd06d9b41 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jan 23 17:48:50 2017 -0800 Bug 21918: Move meek-amazon to the d2cly7j4zqgua7.cloudfront.net backend. Still using the same TorLandMeek bridge. --- Bundle-Data/PTConfigs/bridge_prefs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 6861343..48d3465 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -36,5 +36,5 @@ pref("extensions.torlauncher.default_bridge.obfs4.20", "obfs4 85.17.30.79:443 FC pref("extensions.torlauncher.default_bridge.obfs4.21", "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1"); /**/pref/**/(/**/"extensions.torlauncher.default_bridge.obfs4.22"/**/, /**/"obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1"); -pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com"); +pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2cly7j4zqgua7.cloudfront.net/ front=a0.awsstatic.com"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-bundle/master] Bug 21918: Move meek-amazon to the d2cly7j4zqgua7.cloudfront.net backend.
by gk＠torproject.org 11 Apr '17

11 Apr '17

commit a285f1d1f723b2acc43dcd3c651d88f0c476949f Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jan 23 17:48:50 2017 -0800 Bug 21918: Move meek-amazon to the d2cly7j4zqgua7.cloudfront.net backend. Still using the same TorLandMeek bridge. --- Bundle-Data/PTConfigs/bridge_prefs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 922e181..fea436d 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -36,7 +36,7 @@ pref("extensions.torlauncher.default_bridge.obfs4.20", "obfs4 85.17.30.79:443 FC pref("extensions.torlauncher.default_bridge.obfs4.21", "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1"); /**/pref/**/(/**/"extensions.torlauncher.default_bridge.obfs4.22"/**/, /**/"obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1"); -pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com"); +pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2cly7j4zqgua7.cloudfront.net/ front=a0.awsstatic.com"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com"); pref("extensions.torlauncher.default_bridge.snowflake.1", "snowflake 0.0.3.0:1 2B280B23E1107BB62ABFC40DDCC8824814F80A72");

1 0

[tor-browser-bundle/maint-6.5] Bug 21917: Add new default bridges cymrubridge31:80 and cymrubridge33:80.
by gk＠torproject.org 11 Apr '17

11 Apr '17

commit cd8595914f0f163673591e1667a2e63a108ab7d1 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Mar 19 15:39:21 2017 -0700 Bug 21917: Add new default bridges cymrubridge31:80 and cymrubridge33:80. The second one uses some inline comment blocks to break up the format, as a test to see if censors' parsers can handle it. --- Bundle-Data/PTConfigs/bridge_prefs.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index a77a88e..6861343 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -33,6 +33,8 @@ pref("extensions.torlauncher.default_bridge.obfs4.17", "obfs4 154.35.22.12:4304 pref("extensions.torlauncher.default_bridge.obfs4.18", "obfs4 154.35.22.13:16815 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.19", "obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1"); pref("extensions.torlauncher.default_bridge.obfs4.20", "obfs4 85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.21", "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1"); +/**/pref/**/(/**/"extensions.torlauncher.default_bridge.obfs4.22"/**/, /**/"obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-bundle/master] Bug 21917: Add new default bridges cymrubridge31:80 and cymrubridge33:80.
by gk＠torproject.org 11 Apr '17

11 Apr '17

commit 67ce91e79e0eb6d673af6ad6c7a28533cc0b4903 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Mar 19 15:39:21 2017 -0700 Bug 21917: Add new default bridges cymrubridge31:80 and cymrubridge33:80. The second one uses some inline comment blocks to break up the format, as a test to see if censors' parsers can handle it. --- Bundle-Data/PTConfigs/bridge_prefs.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 64b7f23..922e181 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -33,6 +33,8 @@ pref("extensions.torlauncher.default_bridge.obfs4.17", "obfs4 154.35.22.12:4304 pref("extensions.torlauncher.default_bridge.obfs4.18", "obfs4 154.35.22.13:16815 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.19", "obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1"); pref("extensions.torlauncher.default_bridge.obfs4.20", "obfs4 85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.21", "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1"); +/**/pref/**/(/**/"extensions.torlauncher.default_bridge.obfs4.22"/**/, /**/"obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-bundle/master] Bug 21837: Fix reproducibility of accessibility code for Windows
by gk＠torproject.org 10 Apr '17

10 Apr '17

commit f13a2dae1ca038a448483dc6b25f17e40c8f3c9b Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 6 14:32:13 2017 +0000 Bug 21837: Fix reproducibility of accessibility code for Windows --- gitian/descriptors/windows/gitian-firefox.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index 7ba0615..a83ad5b 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -77,6 +77,8 @@ script: | #git archive HEAD | tar -x -C $OUTDIR/src rm -rf .git find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" + # Make sure widl is not inserting random timestamps, see #21837. + export WIDL_TIME_OVERRIDE="0" rm -f configure rm -f js/src/configure make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --with-distribution-id=org.torproject --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts"

1 0

[tor-browser-bundle/master] Bug 21904: Bump mingw-w64 commit to help with sandbox compilation
by gk＠torproject.org 10 Apr '17

10 Apr '17

commit 2b565b9f4125d0cd54e705b2f54719e2b0f4db40 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 10 07:13:27 2017 +0000 Bug 21904: Bump mingw-w64 commit to help with sandbox compilation --- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.nightly | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/versions b/gitian/versions index 48ad666..e64baa4 100755 --- a/gitian/versions +++ b/gitian/versions @@ -23,7 +23,7 @@ NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable CMAKE_TAG=v2.8.12.2 -MINGW_TAG=9c7c7122401cfd932e599bec5b4b7ca846deb5c0 +MINGW_TAG=98e5b4930a717eafddd8ca0f0dfeb7c57c6b026a PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 LIBFTE_TAG=85ef8ae58dbf0d02ea26b627e343784b5574c428 # sketch master with fix diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 2e6fb2c..dbdaa97 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -23,7 +23,7 @@ NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable CMAKE_TAG=v2.8.12.2 -MINGW_TAG=9c7c7122401cfd932e599bec5b4b7ca846deb5c0 +MINGW_TAG=98e5b4930a717eafddd8ca0f0dfeb7c57c6b026a PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 LIBFTE_TAG=85ef8ae58dbf0d02ea26b627e343784b5574c428 # sketch master with fix diff --git a/gitian/versions.nightly b/gitian/versions.nightly index b45e7d6..360f1ba 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -30,7 +30,7 @@ NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable CMAKE_TAG=v2.8.12.2 -MINGW_TAG=9c7c7122401cfd932e599bec5b4b7ca846deb5c0 +MINGW_TAG=98e5b4930a717eafddd8ca0f0dfeb7c57c6b026a PYPTLIB_TAG=master OBFSPROXY_TAG=master LIBFTE_TAG=master

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] Revert "Bug 19212: SIGSEGV with developer tools open"
by gk＠torproject.org 10 Apr '17

10 Apr '17

commit ef5d0175d652406190334a77bde5c1ccf492a9a7 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Apr 10 00:20:24 2017 -0700 Revert "Bug 19212: SIGSEGV with developer tools open" This reverts commit 6fd5ac8e307994411078e20e9bda1a322fc5e40e. --- js/src/jsapi.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp index d63f0fd..7635175 100644 --- a/js/src/jsapi.cpp +++ b/js/src/jsapi.cpp @@ -6754,12 +6754,9 @@ JS::CaptureCurrentStack(JSContext* cx, JS::MutableHandleObject stackp, { AssertHeapIsIdle(cx); CHECK_REQUEST(cx); - //MOZ_RELEASE_ASSERT(cx->compartment()); + MOZ_RELEASE_ASSERT(cx->compartment()); JSCompartment* compartment = cx->compartment(); - if (!compartment) - return false; - Rooted<SavedFrame*> frame(cx); if (!compartment->savedStacks().saveCurrentStack(cx, &frame, mozilla::Move(capture))) return false;

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] fixup! TB3: Tor Browser's official .mozconfigs.
by gk＠torproject.org 08 Apr '17

08 Apr '17

commit c84ce22e1716330306769ddb5488afd9f0bd3567 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Apr 8 16:10:48 2017 +0000 fixup! TB3: Tor Browser's official .mozconfigs. Use GTK2 for hardened-builds as well. --- .mozconfig-asan | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.mozconfig-asan b/.mozconfig-asan index a975274..096bcc6 100644 --- a/.mozconfig-asan +++ b/.mozconfig-asan @@ -25,6 +25,9 @@ ac_add_options --enable-optimize #ac_add_options --disable-optimize ac_add_options --enable-official-branding +# Let's support GTK2 for ESR52 +ac_add_options --enable-default-toolkit=cairo-gtk2 + ac_add_options --enable-tor-browser-update ac_add_options --enable-signmar ac_add_options --enable-verify-mar

1 0

[tor-browser-bundle/master] Revert "Bug 20683: Integrate Selfrando into alpha Linux builds"
by gk＠torproject.org 08 Apr '17

08 Apr '17

commit 10f7b535456382823aaaece31fdd302ef7791fb5 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Apr 8 13:58:07 2017 +0000 Revert "Bug 20683: Integrate Selfrando into alpha Linux builds" This reverts commit 0ea68f848f54aaeceeeed22dc1496d3723cbe128. Selfrando does not cope with ESR52 yet it seems, back this out. --- RelativeLink/start-tor-browser | 1 - gitian/descriptors/linux/gitian-firefox.yml | 17 ------------- gitian/descriptors/linux/gitian-utils.yml | 38 ---------------------------- gitian/fetch-inputs.sh | 4 +-- gitian/gpg/ELFUTILS.gpg | Bin 10483 -> 0 bytes gitian/mkbundle-linux.sh | 13 ++++------ gitian/verify-tags.sh | 3 +-- gitian/versions.alpha | 4 --- gitian/versions.nightly | 4 --- 9 files changed, 7 insertions(+), 77 deletions(-) diff --git a/RelativeLink/start-tor-browser b/RelativeLink/start-tor-browser index 2dd40fc..a78b367 100755 --- a/RelativeLink/start-tor-browser +++ b/RelativeLink/start-tor-browser @@ -270,7 +270,6 @@ fi LD_LIBRARY_PATH="${HOME}/TorBrowser/Tor/" export LD_LIBRARY_PATH -export SELFRANDO_write_layout_file= function setControlPortPasswd() { local ctrlPasswd=$1 diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index b20941a..d607f6a 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -27,8 +27,6 @@ reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor-browser.git" "dir": "tor-browser" -- "url": "https://github.com/immunant/selfrando.git" - "dir": "selfrando" files: - "binutils-linux32-utils.zip" - "binutils-linux64-utils.zip" @@ -38,8 +36,6 @@ files: - "re-dzip.sh" - "dzip.sh" - "versions" -# XXX: 64bits only for now :(, see #20683. -- "selfrando-linux64-utils.zip" script: | source versions INSTDIR="$HOME/install" @@ -57,11 +53,6 @@ script: | export DEB_BUILD_HARDENING_FORMAT=1 export DEB_BUILD_HARDENING_PIE=1 # - # XXX: 64bits only for now :(, see #20683. - if [ $GBUILD_BITS == "64" ]; - then - unzip -d $INSTDIR selfrando-linux64-utils.zip - fi # Preparing Binutils and GCC for Tor Browser unzip -d $INSTDIR binutils-linux$GBUILD_BITS-utils.zip # Make sure gold is used with the hardening wrapper for full RELRO, see @@ -103,14 +94,6 @@ script: | find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure - # XXX: 64bits only for now :(, see #20683. - if [ $GBUILD_BITS == "64" ]; - then - # Selfrando wrapper - export PATH="$HOME/build/selfrando/Tools/TorBrowser/tc-wrapper/:$PATH" - # We need to avoid the shuffling while building as this breaks compilation - export SELFRANDO_skip_shuffle= - fi make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --with-distribution-id=org.torproject --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" make $MAKEOPTS -f client.mk build diff --git a/gitian/descriptors/linux/gitian-utils.yml b/gitian/descriptors/linux/gitian-utils.yml index 1cadb61..d10422b 100644 --- a/gitian/descriptors/linux/gitian-utils.yml +++ b/gitian/descriptors/linux/gitian-utils.yml @@ -24,14 +24,10 @@ packages: - "libssl-dev" # Needed for binutils (64bit) as we are building with PIE enabled. - "libstdc++6-4.7-pic" -# Needed for Selfrando -- "scons" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://github.com/libevent/libevent.git" "dir": "libevent" -- "url": "https://github.com/immunant/selfrando.git" - "dir": "selfrando" files: - "binutils.tar.bz2" - "gcc.tar.bz2" @@ -41,7 +37,6 @@ files: - "go.tar.gz" - "versions" - "dzip.sh" -- "elfutils.tar.bz2" script: | INSTDIR="$HOME/install" source versions @@ -57,12 +52,6 @@ script: | export DEB_BUILD_HARDENING_FORMAT=1 export DEB_BUILD_HARDENING_PIE=1 - ARCH="" - if [ $GBUILD_BITS == "64" ]; - then - ARCH="64" - fi - # Building Binutils tar xjf binutils.tar.bz2 # The libstdc++ shipped by default is non-PIC which breaks the binutils build @@ -97,28 +86,6 @@ script: | cd .. export DEB_BUILD_HARDENING_FORMAT=1 - export PATH="$INSTDIR/binutils/bin:$INSTDIR/gcc/bin:$PATH" - export LD_LIBRARY_PATH="$INSTDIR/gcc/lib$ARCH" - - # XXX: 64bits only for now :(, see #20683. - if [ $GBUILD_BITS == "64" ]; - then - # Building Elfutils - tar xjf elfutils.tar.bz2 - cd elfutils*/ - ./configure --prefix=$INSTDIR/elfutils - make $MAKEOPTS - make install - cd .. - - # Building Selfrando - cd selfrando - scons -Q arch=x86_64 LIBELF_PATH="$INSTDIR/elfutils" FORCE_INPLACE=1 DEBUG_LEVEL=env WRITE_LAYOUTS=env LOG=console - mkdir -p $INSTDIR/selfrando - cp out/x86_64/bin/* $INSTDIR/selfrando/ - cd .. - fi - # Building Libevent cd libevent ./autogen.sh @@ -190,9 +157,4 @@ script: | ~/build/dzip.sh libevent-${LIBEVENT_TAG#release-}-linux$GBUILD_BITS-utils.zip libevent ~/build/dzip.sh gmp-$GMP_VER-linux$GBUILD_BITS-utils.zip gmp ~/build/dzip.sh go-$GO_VER-linux$GBUILD_BITS-utils.zip go - # XXX: 64bits only for now :(, see #20683. - if [ $GBUILD_BITS == "64" ]; - then - ~/build/dzip.sh selfrando-$SELFRANDO_TAG-linux$GBUILD_BITS-utils.zip selfrando - fi cp *utils.zip $OUTDIR/ diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index c110eb8..b7fcf36 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -113,7 +113,7 @@ update_git() { ############################################################################## # Get+verify sigs that exist -for i in OPENSSL BINUTILS GCC PYTHON_MSI GMP LLVM CFE LIBCXX LIBCXXABI ELFUTILS +for i in OPENSSL BINUTILS GCC PYTHON_MSI GMP LLVM CFE LIBCXX LIBCXXABI do PACKAGE="${i}_PACKAGE" URL="${i}_URL" @@ -252,7 +252,6 @@ ln -sf "$GO_PACKAGE" go.tar.gz ln -sf "$NSIS_PACKAGE" nsis.tar.bz2 ln -sf "$NSIS_DEBIAN_PACKAGE" nsis-debian.tar.xz ln -sf "$YASM_PACKAGE" yasm.tar.gz -ln -sf "$ELFUTILS_PACKAGE" elfutils.tar.bz2 # Fetch latest gitian-builder itself # XXX - this is broken if a non-standard inputs dir is selected using the command line flag. @@ -304,7 +303,6 @@ depot_tools https://chromium.googlesource.com/chromium/tools/depot_too go-webrtc https://github.com/keroserene/go-webrtc $GO_WEBRTC_TAG snowflake https://git.torproject.org/pluggable-transports/snowflake.git $SNOWFLAKE_TAG uniuri https://github.com/dchest/uniuri $UNIURI_TAG -selfrando https://github.com/immunant/selfrando.git $SELFRANDO_TAG EOF # HTTPS-Everywhere is special, too. We need to initialize the git submodules and diff --git a/gitian/gpg/ELFUTILS.gpg b/gitian/gpg/ELFUTILS.gpg deleted file mode 100644 index f1cd4b3..0000000 Binary files a/gitian/gpg/ELFUTILS.gpg and /dev/null differ diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 0a1613f..6dbbe51 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -35,7 +35,7 @@ fi if [ -z "$VM_MEMORY" ]; then - export VM_MEMORY=6000 + export VM_MEMORY=4000 fi ./make-vms.sh @@ -99,7 +99,7 @@ then fi cd $GITIAN_DIR -# XXX: 64bits selfrando only for now :(, see #20683. + if [ ! -f inputs/binutils-$BINUTILS_VER-linux32-utils.zip -o \ ! -f inputs/binutils-$BINUTILS_VER-linux64-utils.zip -o \ ! -f inputs/gcc-$GCC_VER-linux32-utils.zip -o \ @@ -111,14 +111,13 @@ if [ ! -f inputs/binutils-$BINUTILS_VER-linux32-utils.zip -o \ ! -f inputs/gmp-$GMP_VER-linux32-utils.zip -o \ ! -f inputs/gmp-$GMP_VER-linux64-utils.zip -o \ ! -f inputs/go-$GO_VER-linux32-utils.zip -o \ - ! -f inputs/go-$GO_VER-linux64-utils.zip -o \ - ! -f inputs/selfrando-$SELFRANDO_TAG-linux64-utils.zip ]; + ! -f inputs/go-$GO_VER-linux64-utils.zip ]; then echo echo "****** Starting Utilities Component of Linux Bundle (1/7 for Linux) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit libevent=$LIBEVENT_TAG,selfrando=$SELFRANDO_TAG $DESCRIPTOR_DIR/linux/gitian-utils.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit libevent=$LIBEVENT_TAG $DESCRIPTOR_DIR/linux/gitian-utils.yml if [ $? -ne 0 ]; then #mv var/build.log ./utils-fail-linux.log.`date +%Y%m%d%H%M%S` @@ -139,7 +138,6 @@ then ln -sf gmp-$GMP_VER-linux64-utils.zip gmp-linux64-utils.zip ln -sf go-$GO_VER-linux32-utils.zip go-linux32-utils.zip ln -sf go-$GO_VER-linux64-utils.zip go-linux64-utils.zip - ln -sf selfrando-$SELFRANDO_TAG-linux64-utils.zip selfrando-linux64-utils.zip cd .. #cp -a result/utils-linux-res.yml inputs/ else @@ -161,7 +159,6 @@ else ln -sf gmp-$GMP_VER-linux64-utils.zip gmp-linux64-utils.zip ln -sf go-$GO_VER-linux32-utils.zip go-linux32-utils.zip ln -sf go-$GO_VER-linux64-utils.zip go-linux64-utils.zip - ln -sf selfrando-$SELFRANDO_TAG-linux64-utils.zip selfrando-linux64-utils.zip cd .. fi @@ -196,7 +193,7 @@ then echo "****** Starting TorBrowser Component of Linux Bundle (3/7 for Linux) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit tor-browser=$TORBROWSER_TAG,faketime=$FAKETIME_TAG,selfrando=$SELFRANDO_TAG $DESCRIPTOR_DIR/linux/gitian-firefox.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit tor-browser=$TORBROWSER_TAG,faketime=$FAKETIME_TAG $DESCRIPTOR_DIR/linux/gitian-firefox.yml if [ $? -ne 0 ]; then #mv var/build.log ./firefox-fail-linux.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 7d551b8..dc207f5 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -125,11 +125,10 @@ depot_tools $DEPOT_TOOLS_TAG go-webrtc $GO_WEBRTC_TAG snowflake $SNOWFLAKE_TAG uniuri $UNIURI_TAG -selfrando $SELFRANDO_TAG EOF # Verify signatures on signed packages -for i in OPENSSL BINUTILS GCC PYTHON_MSI GMP LLVM CFE LIBCXX LIBCXXABI ELFUTILS +for i in OPENSSL BINUTILS GCC PYTHON_MSI GMP LLVM CFE LIBCXX LIBCXXABI do PACKAGE="${i}_PACKAGE" URL="${i}_URL" diff --git a/gitian/versions.alpha b/gitian/versions.alpha index be79310..2e6fb2c 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -47,7 +47,6 @@ WEBRTC_TAG=c279861207c5b15fc51069e96595782350e0ac12 # https://chromium.googlesou GO_WEBRTC_TAG=ab1b64862e0c4b4182010699911c2c5818f0a101 SNOWFLAKE_TAG=9f2e9a6ecb696149708716ca06ce842df03cf492 UNIURI_TAG=8902c56451e9b58ff940bbe5fec35d5f9c04584a -SELFRANDO_TAG=40bfacc7175301bcb9e01d2ad05e72c0e35291c8 GITIAN_TAG=tor-browser-builder-4-2 @@ -72,7 +71,6 @@ GO14_VER=1.4.3 GO_VER=1.7.5 NSIS_VER=2.51 YASM_VER=1.2.0 -ELFUTILS_VER=0.160 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -107,7 +105,6 @@ NOTOKRFONT_PACKAGE=NotoSansKR-Regular.otf NOTOSCFONT_PACKAGE=NotoSansSC-Regular.otf NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf YASM_PACKAGE=yasm-${YASM_VER}.tar.gz -ELFUTILS_PACKAGE=elfutils-${ELFUTILS_VER}.tar.bz2 # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 @@ -170,4 +167,3 @@ NOTOKRFONT_URL=${NOTOCJKBASE_URL}/${NOTOKRFONT_PACKAGE} NOTOSCFONT_URL=${NOTOCJKBASE_URL}/${NOTOSCFONT_PACKAGE} NOTOTCFONT_URL=${NOTOCJKBASE_URL}/${NOTOTCFONT_PACKAGE} YASM_URL=https://www.tortall.net/projects/yasm/releases/${YASM_PACKAGE} -ELFUTILS_URL=https://fedorahosted.org/releases/e/l/elfutils/${ELFUTILS_VER}/${ELFUTILS_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 43c5234..b45e7d6 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -54,7 +54,6 @@ WEBRTC_TAG=c279861207c5b15fc51069e96595782350e0ac12 # https://chromium.googlesou GO_WEBRTC_TAG=master SNOWFLAKE_TAG=master UNIURI_TAG=master -SELFRANDO_TAG=62932627f30551e7b0b8e12d0453100f0eede017 GITIAN_TAG=tor-browser-builder-4 @@ -79,7 +78,6 @@ GO14_VER=1.4.3 GO_VER=1.7.5 NSIS_VER=2.51 YASM_VER=1.2.0 -ELFUTILS_VER=0.166 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -114,7 +112,6 @@ NOTOKRFONT_PACKAGE=NotoSansKR-Regular.otf NOTOSCFONT_PACKAGE=NotoSansSC-Regular.otf NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf YASM_PACKAGE=yasm-${YASM_VER}.tar.gz -ELFUTILS_PACKAGE=elfutils-${ELFUTILS_VER}.tar.bz2 # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 @@ -177,4 +174,3 @@ NOTOKRFONT_URL=${NOTOCJKBASE_URL}/${NOTOKRFONT_PACKAGE} NOTOSCFONT_URL=${NOTOCJKBASE_URL}/${NOTOSCFONT_PACKAGE} NOTOTCFONT_URL=${NOTOCJKBASE_URL}/${NOTOTCFONT_PACKAGE} YASM_URL=https://www.tortall.net/projects/yasm/releases/${YASM_PACKAGE} -ELFUTILS_URL=https://fedorahosted.org/releases/e/l/elfutils/${ELFUTILS_VER}/${ELFUTILS_PACKAGE}

1 0

[tor-browser-bundle/hardened-builds] No old OSX things for verification either
by gk＠torproject.org 08 Apr '17

08 Apr '17

commit 6f4c8f9013eb6bd8966cf89bb76ed43d69f66560 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Apr 8 13:48:13 2017 +0000 No old OSX things for verification either --- gitian/verify-tags.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 575901b..4daccd8 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -146,8 +146,8 @@ do done # Verify packages with weak or no signatures via direct sha256 check -# (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all) -for i in OSXSDK OSXSDK_OLD TOOLCHAIN4_OLD CCTOOLS NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO14 GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN +# (OpenSSL is signed with MD5, and OSXSDK are not signed at all) +for i in OSXSDK CCTOOLS NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO14 GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH"

1 0

[tor-browser-bundle/hardened-builds] No old OS X toolchain anymore
by gk＠torproject.org 08 Apr '17

08 Apr '17

commit c71de11f9ee2828526fdd7397441163aa737d6bf Author: Georg Koppen <gk(a)torproject.org> Date: Sat Apr 8 13:46:47 2017 +0000 No old OS X toolchain anymore --- gitian/fetch-inputs.sh | 6 +++--- gitian/versions.nightly | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index e70eb4c..9665917 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -132,7 +132,7 @@ do fi done -for i in TOOLCHAIN4_OLD OSXSDK OSXSDK_OLD MSVCR100 +for i in OSXSDK MSVCR100 do PACKAGE="${i}_PACKAGE" URL="${MIRROR_URL}${!PACKAGE}" @@ -173,8 +173,8 @@ done wget -U "" -N ${NOSCRIPT_URL} # Verify packages with weak or no signatures via direct sha256 check -# (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all) -for i in OSXSDK OSXSDK_OLD TOOLCHAIN4_OLD CCTOOLS NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO14 GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN +# (OpenSSL is signed with MD5, and OSXSDK are not signed at all) +for i in OSXSDK CCTOOLS NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO14 GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/versions.nightly b/gitian/versions.nightly index ddbbc05..236af56 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -86,7 +86,6 @@ GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-5.0.2-fx+sm.xpi CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz -OSXSDK_OLD_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MSVCR100_PACKAGE=msvcr100.dll BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2

1 0

[tor-browser-bundle/master] Bug 20683: Integrate Selfrando into alpha Linux builds
by gk＠torproject.org 07 Apr '17

07 Apr '17

commit 0ea68f848f54aaeceeeed22dc1496d3723cbe128 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 7 16:50:29 2017 +0000 Bug 20683: Integrate Selfrando into alpha Linux builds Selfrando is a new defense against code reuse attacks developed by the Redactor and Readactor++ people. We should give it a wider testing audience by including it in the alpha series. This is currently only available for 64bit Linux builds, though. Supporting other platforms and architectures is work in progress. --- RelativeLink/start-tor-browser | 1 + gitian/descriptors/linux/gitian-firefox.yml | 17 +++++++++++++ gitian/descriptors/linux/gitian-utils.yml | 38 ++++++++++++++++++++++++++++ gitian/fetch-inputs.sh | 4 ++- gitian/gpg/ELFUTILS.gpg | Bin 0 -> 10483 bytes gitian/mkbundle-linux.sh | 13 ++++++---- gitian/verify-tags.sh | 3 ++- gitian/versions.alpha | 4 +++ gitian/versions.nightly | 4 +++ 9 files changed, 77 insertions(+), 7 deletions(-) diff --git a/RelativeLink/start-tor-browser b/RelativeLink/start-tor-browser index a78b367..2dd40fc 100755 --- a/RelativeLink/start-tor-browser +++ b/RelativeLink/start-tor-browser @@ -270,6 +270,7 @@ fi LD_LIBRARY_PATH="${HOME}/TorBrowser/Tor/" export LD_LIBRARY_PATH +export SELFRANDO_write_layout_file= function setControlPortPasswd() { local ctrlPasswd=$1 diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index d607f6a..b20941a 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -27,6 +27,8 @@ reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor-browser.git" "dir": "tor-browser" +- "url": "https://github.com/immunant/selfrando.git" + "dir": "selfrando" files: - "binutils-linux32-utils.zip" - "binutils-linux64-utils.zip" @@ -36,6 +38,8 @@ files: - "re-dzip.sh" - "dzip.sh" - "versions" +# XXX: 64bits only for now :(, see #20683. +- "selfrando-linux64-utils.zip" script: | source versions INSTDIR="$HOME/install" @@ -53,6 +57,11 @@ script: | export DEB_BUILD_HARDENING_FORMAT=1 export DEB_BUILD_HARDENING_PIE=1 # + # XXX: 64bits only for now :(, see #20683. + if [ $GBUILD_BITS == "64" ]; + then + unzip -d $INSTDIR selfrando-linux64-utils.zip + fi # Preparing Binutils and GCC for Tor Browser unzip -d $INSTDIR binutils-linux$GBUILD_BITS-utils.zip # Make sure gold is used with the hardening wrapper for full RELRO, see @@ -94,6 +103,14 @@ script: | find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure + # XXX: 64bits only for now :(, see #20683. + if [ $GBUILD_BITS == "64" ]; + then + # Selfrando wrapper + export PATH="$HOME/build/selfrando/Tools/TorBrowser/tc-wrapper/:$PATH" + # We need to avoid the shuffling while building as this breaks compilation + export SELFRANDO_skip_shuffle= + fi make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --with-distribution-id=org.torproject --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" make $MAKEOPTS -f client.mk build diff --git a/gitian/descriptors/linux/gitian-utils.yml b/gitian/descriptors/linux/gitian-utils.yml index d10422b..1cadb61 100644 --- a/gitian/descriptors/linux/gitian-utils.yml +++ b/gitian/descriptors/linux/gitian-utils.yml @@ -24,10 +24,14 @@ packages: - "libssl-dev" # Needed for binutils (64bit) as we are building with PIE enabled. - "libstdc++6-4.7-pic" +# Needed for Selfrando +- "scons" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://github.com/libevent/libevent.git" "dir": "libevent" +- "url": "https://github.com/immunant/selfrando.git" + "dir": "selfrando" files: - "binutils.tar.bz2" - "gcc.tar.bz2" @@ -37,6 +41,7 @@ files: - "go.tar.gz" - "versions" - "dzip.sh" +- "elfutils.tar.bz2" script: | INSTDIR="$HOME/install" source versions @@ -52,6 +57,12 @@ script: | export DEB_BUILD_HARDENING_FORMAT=1 export DEB_BUILD_HARDENING_PIE=1 + ARCH="" + if [ $GBUILD_BITS == "64" ]; + then + ARCH="64" + fi + # Building Binutils tar xjf binutils.tar.bz2 # The libstdc++ shipped by default is non-PIC which breaks the binutils build @@ -86,6 +97,28 @@ script: | cd .. export DEB_BUILD_HARDENING_FORMAT=1 + export PATH="$INSTDIR/binutils/bin:$INSTDIR/gcc/bin:$PATH" + export LD_LIBRARY_PATH="$INSTDIR/gcc/lib$ARCH" + + # XXX: 64bits only for now :(, see #20683. + if [ $GBUILD_BITS == "64" ]; + then + # Building Elfutils + tar xjf elfutils.tar.bz2 + cd elfutils*/ + ./configure --prefix=$INSTDIR/elfutils + make $MAKEOPTS + make install + cd .. + + # Building Selfrando + cd selfrando + scons -Q arch=x86_64 LIBELF_PATH="$INSTDIR/elfutils" FORCE_INPLACE=1 DEBUG_LEVEL=env WRITE_LAYOUTS=env LOG=console + mkdir -p $INSTDIR/selfrando + cp out/x86_64/bin/* $INSTDIR/selfrando/ + cd .. + fi + # Building Libevent cd libevent ./autogen.sh @@ -157,4 +190,9 @@ script: | ~/build/dzip.sh libevent-${LIBEVENT_TAG#release-}-linux$GBUILD_BITS-utils.zip libevent ~/build/dzip.sh gmp-$GMP_VER-linux$GBUILD_BITS-utils.zip gmp ~/build/dzip.sh go-$GO_VER-linux$GBUILD_BITS-utils.zip go + # XXX: 64bits only for now :(, see #20683. + if [ $GBUILD_BITS == "64" ]; + then + ~/build/dzip.sh selfrando-$SELFRANDO_TAG-linux$GBUILD_BITS-utils.zip selfrando + fi cp *utils.zip $OUTDIR/ diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index b7fcf36..c110eb8 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -113,7 +113,7 @@ update_git() { ############################################################################## # Get+verify sigs that exist -for i in OPENSSL BINUTILS GCC PYTHON_MSI GMP LLVM CFE LIBCXX LIBCXXABI +for i in OPENSSL BINUTILS GCC PYTHON_MSI GMP LLVM CFE LIBCXX LIBCXXABI ELFUTILS do PACKAGE="${i}_PACKAGE" URL="${i}_URL" @@ -252,6 +252,7 @@ ln -sf "$GO_PACKAGE" go.tar.gz ln -sf "$NSIS_PACKAGE" nsis.tar.bz2 ln -sf "$NSIS_DEBIAN_PACKAGE" nsis-debian.tar.xz ln -sf "$YASM_PACKAGE" yasm.tar.gz +ln -sf "$ELFUTILS_PACKAGE" elfutils.tar.bz2 # Fetch latest gitian-builder itself # XXX - this is broken if a non-standard inputs dir is selected using the command line flag. @@ -303,6 +304,7 @@ depot_tools https://chromium.googlesource.com/chromium/tools/depot_too go-webrtc https://github.com/keroserene/go-webrtc $GO_WEBRTC_TAG snowflake https://git.torproject.org/pluggable-transports/snowflake.git $SNOWFLAKE_TAG uniuri https://github.com/dchest/uniuri $UNIURI_TAG +selfrando https://github.com/immunant/selfrando.git $SELFRANDO_TAG EOF # HTTPS-Everywhere is special, too. We need to initialize the git submodules and diff --git a/gitian/gpg/ELFUTILS.gpg b/gitian/gpg/ELFUTILS.gpg new file mode 100644 index 0000000..f1cd4b3 Binary files /dev/null and b/gitian/gpg/ELFUTILS.gpg differ diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 6dbbe51..0a1613f 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -35,7 +35,7 @@ fi if [ -z "$VM_MEMORY" ]; then - export VM_MEMORY=4000 + export VM_MEMORY=6000 fi ./make-vms.sh @@ -99,7 +99,7 @@ then fi cd $GITIAN_DIR - +# XXX: 64bits selfrando only for now :(, see #20683. if [ ! -f inputs/binutils-$BINUTILS_VER-linux32-utils.zip -o \ ! -f inputs/binutils-$BINUTILS_VER-linux64-utils.zip -o \ ! -f inputs/gcc-$GCC_VER-linux32-utils.zip -o \ @@ -111,13 +111,14 @@ if [ ! -f inputs/binutils-$BINUTILS_VER-linux32-utils.zip -o \ ! -f inputs/gmp-$GMP_VER-linux32-utils.zip -o \ ! -f inputs/gmp-$GMP_VER-linux64-utils.zip -o \ ! -f inputs/go-$GO_VER-linux32-utils.zip -o \ - ! -f inputs/go-$GO_VER-linux64-utils.zip ]; + ! -f inputs/go-$GO_VER-linux64-utils.zip -o \ + ! -f inputs/selfrando-$SELFRANDO_TAG-linux64-utils.zip ]; then echo echo "****** Starting Utilities Component of Linux Bundle (1/7 for Linux) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit libevent=$LIBEVENT_TAG $DESCRIPTOR_DIR/linux/gitian-utils.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit libevent=$LIBEVENT_TAG,selfrando=$SELFRANDO_TAG $DESCRIPTOR_DIR/linux/gitian-utils.yml if [ $? -ne 0 ]; then #mv var/build.log ./utils-fail-linux.log.`date +%Y%m%d%H%M%S` @@ -138,6 +139,7 @@ then ln -sf gmp-$GMP_VER-linux64-utils.zip gmp-linux64-utils.zip ln -sf go-$GO_VER-linux32-utils.zip go-linux32-utils.zip ln -sf go-$GO_VER-linux64-utils.zip go-linux64-utils.zip + ln -sf selfrando-$SELFRANDO_TAG-linux64-utils.zip selfrando-linux64-utils.zip cd .. #cp -a result/utils-linux-res.yml inputs/ else @@ -159,6 +161,7 @@ else ln -sf gmp-$GMP_VER-linux64-utils.zip gmp-linux64-utils.zip ln -sf go-$GO_VER-linux32-utils.zip go-linux32-utils.zip ln -sf go-$GO_VER-linux64-utils.zip go-linux64-utils.zip + ln -sf selfrando-$SELFRANDO_TAG-linux64-utils.zip selfrando-linux64-utils.zip cd .. fi @@ -193,7 +196,7 @@ then echo "****** Starting TorBrowser Component of Linux Bundle (3/7 for Linux) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit tor-browser=$TORBROWSER_TAG,faketime=$FAKETIME_TAG $DESCRIPTOR_DIR/linux/gitian-firefox.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit tor-browser=$TORBROWSER_TAG,faketime=$FAKETIME_TAG,selfrando=$SELFRANDO_TAG $DESCRIPTOR_DIR/linux/gitian-firefox.yml if [ $? -ne 0 ]; then #mv var/build.log ./firefox-fail-linux.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index dc207f5..7d551b8 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -125,10 +125,11 @@ depot_tools $DEPOT_TOOLS_TAG go-webrtc $GO_WEBRTC_TAG snowflake $SNOWFLAKE_TAG uniuri $UNIURI_TAG +selfrando $SELFRANDO_TAG EOF # Verify signatures on signed packages -for i in OPENSSL BINUTILS GCC PYTHON_MSI GMP LLVM CFE LIBCXX LIBCXXABI +for i in OPENSSL BINUTILS GCC PYTHON_MSI GMP LLVM CFE LIBCXX LIBCXXABI ELFUTILS do PACKAGE="${i}_PACKAGE" URL="${i}_URL" diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 2e6fb2c..be79310 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -47,6 +47,7 @@ WEBRTC_TAG=c279861207c5b15fc51069e96595782350e0ac12 # https://chromium.googlesou GO_WEBRTC_TAG=ab1b64862e0c4b4182010699911c2c5818f0a101 SNOWFLAKE_TAG=9f2e9a6ecb696149708716ca06ce842df03cf492 UNIURI_TAG=8902c56451e9b58ff940bbe5fec35d5f9c04584a +SELFRANDO_TAG=40bfacc7175301bcb9e01d2ad05e72c0e35291c8 GITIAN_TAG=tor-browser-builder-4-2 @@ -71,6 +72,7 @@ GO14_VER=1.4.3 GO_VER=1.7.5 NSIS_VER=2.51 YASM_VER=1.2.0 +ELFUTILS_VER=0.160 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -105,6 +107,7 @@ NOTOKRFONT_PACKAGE=NotoSansKR-Regular.otf NOTOSCFONT_PACKAGE=NotoSansSC-Regular.otf NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf YASM_PACKAGE=yasm-${YASM_VER}.tar.gz +ELFUTILS_PACKAGE=elfutils-${ELFUTILS_VER}.tar.bz2 # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 @@ -167,3 +170,4 @@ NOTOKRFONT_URL=${NOTOCJKBASE_URL}/${NOTOKRFONT_PACKAGE} NOTOSCFONT_URL=${NOTOCJKBASE_URL}/${NOTOSCFONT_PACKAGE} NOTOTCFONT_URL=${NOTOCJKBASE_URL}/${NOTOTCFONT_PACKAGE} YASM_URL=https://www.tortall.net/projects/yasm/releases/${YASM_PACKAGE} +ELFUTILS_URL=https://fedorahosted.org/releases/e/l/elfutils/${ELFUTILS_VER}/${ELFUTILS_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index b45e7d6..43c5234 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -54,6 +54,7 @@ WEBRTC_TAG=c279861207c5b15fc51069e96595782350e0ac12 # https://chromium.googlesou GO_WEBRTC_TAG=master SNOWFLAKE_TAG=master UNIURI_TAG=master +SELFRANDO_TAG=62932627f30551e7b0b8e12d0453100f0eede017 GITIAN_TAG=tor-browser-builder-4 @@ -78,6 +79,7 @@ GO14_VER=1.4.3 GO_VER=1.7.5 NSIS_VER=2.51 YASM_VER=1.2.0 +ELFUTILS_VER=0.166 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -112,6 +114,7 @@ NOTOKRFONT_PACKAGE=NotoSansKR-Regular.otf NOTOSCFONT_PACKAGE=NotoSansSC-Regular.otf NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf YASM_PACKAGE=yasm-${YASM_VER}.tar.gz +ELFUTILS_PACKAGE=elfutils-${ELFUTILS_VER}.tar.bz2 # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 @@ -174,3 +177,4 @@ NOTOKRFONT_URL=${NOTOCJKBASE_URL}/${NOTOKRFONT_PACKAGE} NOTOSCFONT_URL=${NOTOCJKBASE_URL}/${NOTOSCFONT_PACKAGE} NOTOTCFONT_URL=${NOTOCJKBASE_URL}/${NOTOTCFONT_PACKAGE} YASM_URL=https://www.tortall.net/projects/yasm/releases/${YASM_PACKAGE} +ELFUTILS_URL=https://fedorahosted.org/releases/e/l/elfutils/${ELFUTILS_VER}/${ELFUTILS_PACKAGE}

1 0

[torbutton/master] Revert "Bug 21201.1: Use new svg.disabled pref"
by gk＠torproject.org 07 Apr '17

07 Apr '17

commit de57f2c4ef125ca1334e83efa1949770a87e7c38 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 7 08:26:32 2017 +0000 Revert "Bug 21201.1: Use new svg.disabled pref" This reverts commit 1b7ce9f53f6a27e8684fdcda0b3be086a914d054. We did not backport Mozilla's patch which uses the new preference. Thus we need to stick to the old one for now. Closes #21885. --- src/modules/security-prefs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/security-prefs.js b/src/modules/security-prefs.js index f508b87..4a39ca8 100644 --- a/src/modules/security-prefs.js +++ b/src/modules/security-prefs.js @@ -29,7 +29,7 @@ const kSecuritySettings = { "noscript.global" : [, false, false, false, true ], "noscript.globalHttpsWhitelist" : [, false, true, true, false], "noscript.forbidFonts" : [, true, false, false, false], - "svg.disabled" : [, true, false, false, false], + "svg.in-content.enabled" : [, false, true, true, true ], }; // The Security Settings prefs in question.

1 0

[tor-browser-build/master] Update mozconfig files
by boklm＠torproject.org 07 Apr '17

07 Apr '17

commit e6fb26f57bd0aca191e55798f63a533ea82675cd Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 7 13:41:03 2017 +0200 Update mozconfig files Update the mozconfig files with the changes from the versions in tor-browser.git. We are currently not using the mozconfig files from tor-browser.git directly as we need to modify some of them. --- projects/firefox/mozconfig-linux-i686 | 11 ++++------- projects/firefox/mozconfig-linux-x86_64 | 11 ++++------- projects/firefox/mozconfig-osx-x86_64 | 4 +--- projects/firefox/mozconfig-windows-i686 | 5 +---- 4 files changed, 10 insertions(+), 21 deletions(-) diff --git a/projects/firefox/mozconfig-linux-i686 b/projects/firefox/mozconfig-linux-i686 index 306b674..8b4ecb3 100755 --- a/projects/firefox/mozconfig-linux-i686 +++ b/projects/firefox/mozconfig-linux-i686 @@ -5,10 +5,6 @@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 -# Use jemalloc 4.x. In 52ESR, we should use -# the --enable-jemalloc=4 flag instead: -export MOZ_JEMALLOC4=1 - export CFLAGS=-m32 export CXXFLAGS=-m32 export LDFLAGS=-m32 @@ -21,8 +17,10 @@ ac_add_options --enable-optimize #ac_add_options --disable-optimize ac_add_options --enable-official-branding +# Let's support GTK2 for ESR52 +ac_add_options --enable-default-toolkit=cairo-gtk2 + ac_add_options --enable-tor-browser-update -ac_add_options --enable-update-packaging ac_add_options --enable-signmar ac_add_options --enable-verify-mar @@ -34,7 +32,6 @@ ac_add_options --disable-maintenance-service ac_add_options --disable-crashreporter ac_add_options --disable-webrtc # Let's not compile EME at least until we can enable ClearKey and only Clearkey. -# (Apart from that there is no Adobe CRM module for Linux right now) ac_add_options --disable-eme #ac_add_options --disable-ctypes -ac_add_options --disable-loop +ac_add_options --enable-jemalloc=4 diff --git a/projects/firefox/mozconfig-linux-x86_64 b/projects/firefox/mozconfig-linux-x86_64 index a419808..cde5b49 100755 --- a/projects/firefox/mozconfig-linux-x86_64 +++ b/projects/firefox/mozconfig-linux-x86_64 @@ -5,16 +5,14 @@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 -# Use jemalloc 4.x. In 52ESR, we should use -# the --enable-jemalloc=4 flag instead: -export MOZ_JEMALLOC4=1 - ac_add_options --enable-optimize #ac_add_options --disable-optimize ac_add_options --enable-official-branding +# Let's support GTK2 for ESR52 +ac_add_options --enable-default-toolkit=cairo-gtk2 + ac_add_options --enable-tor-browser-update -ac_add_options --enable-update-packaging ac_add_options --enable-signmar ac_add_options --enable-verify-mar @@ -26,7 +24,6 @@ ac_add_options --disable-maintenance-service ac_add_options --disable-crashreporter ac_add_options --disable-webrtc # Let's not compile EME at least until we can enable ClearKey and only Clearkey. -# (Apart from that there is no Adobe CRM module for Linux right now) ac_add_options --disable-eme #ac_add_options --disable-ctypes -ac_add_options --disable-loop +ac_add_options --enable-jemalloc=4 diff --git a/projects/firefox/mozconfig-osx-x86_64 b/projects/firefox/mozconfig-osx-x86_64 index 259e745..c75b2f5 100644 --- a/projects/firefox/mozconfig-osx-x86_64 +++ b/projects/firefox/mozconfig-osx-x86_64 @@ -18,7 +18,7 @@ export AR=${TOOLCHAIN_PREFIX}ar export RANLIB=${TOOLCHAIN_PREFIX}ranlib export STRIP=${TOOLCHAIN_PREFIX}strip export OTOOL=${TOOLCHAIN_PREFIX}otool -export DSYMUTIL=$topsrcdir/clang/bin/llvm-dsymutil +export DSYMUTIL="$TOOLCHAIN_DIR/clang/bin/llvm-dsymutil" export HOST_CC="$TOOLCHAIN_DIR/clang/helpers/clang" export HOST_CXX="$TOOLCHAIN_DIR/clang/helpers/clang++" @@ -43,7 +43,6 @@ ac_add_options --disable-debug ac_add_options --enable-tor-browser-data-outside-app-dir ac_add_options --enable-tor-browser-update -ac_add_options --enable-update-packaging ac_add_options --enable-signmar ac_add_options --enable-verify-mar @@ -55,4 +54,3 @@ ac_add_options --disable-tests # (Apart from that there is no Adobe CRM module for OS X right now) ac_add_options --disable-eme # ac_add_options --disable-ctypes -ac_add_options --disable-loop diff --git a/projects/firefox/mozconfig-windows-i686 b/projects/firefox/mozconfig-windows-i686 index 33ea6d4..de86c49 100644 --- a/projects/firefox/mozconfig-windows-i686 +++ b/projects/firefox/mozconfig-windows-i686 @@ -2,6 +2,7 @@ CROSS_COMPILE=1 ac_add_options --enable-application=browser ac_add_options --target=i686-w64-mingw32 +ac_add_options --with-toolchain-prefix=i686-w64-mingw32- ac_add_options --enable-default-toolkit=cairo-windows mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-mingw mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" @@ -14,7 +15,6 @@ ac_add_options --enable-strip ac_add_options --enable-official-branding ac_add_options --enable-tor-browser-update -ac_add_options --enable-update-packaging ac_add_options --enable-signmar ac_add_options --enable-verify-mar @@ -27,6 +27,3 @@ ac_add_options --disable-crashreporter ac_add_options --disable-maintenance-service ac_add_options --disable-webrtc ac_add_options --disable-tests - -#ac_add_options --disable-ctypes -ac_add_options --disable-loop

1 0

[tor-browser-build/master] Bug 21240: Bump mingw-w64 commit for ESR52 compilation
by boklm＠torproject.org 07 Apr '17

07 Apr '17

commit 580dad39db54fcd8d0f6e9f418bd791d02b1e8b3 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 7 13:24:37 2017 +0200 Bug 21240: Bump mingw-w64 commit for ESR52 compilation tor-browser-bundle.git commit: b5beb33b57643ff83838337ded870511599d45f5 --- projects/mingw-w64/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config index 425e125..3065df7 100644 --- a/projects/mingw-w64/config +++ b/projects/mingw-w64/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: http://git.code.sf.net/p/mingw-w64/mingw-w64 -git_hash: a0cd5afeb60be3be0860e9a203314c10485bb9b8 +git_hash: 9c7c7122401cfd932e599bec5b4b7ca846deb5c0 version: '[% c("abbrev") %]' remote_docker: 1 var:

1 0

[tor-browser-build/master] Switch to ESR52
by boklm＠torproject.org 07 Apr '17

07 Apr '17

commit cd08d1ab0fb638daed52ee5e7452dd78b07591c6 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 7 15:53:53 2017 +0200 Switch to ESR52 --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index dd96dcd..a645b92 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build2 + ff_build: build1 ff_arch: linux-i686 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' diff --git a/projects/firefox/config b/projects/firefox/config index 83307d0..7e685e7 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,14 +1,16 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +## There is no signed tag yet, so we use a fixed commit +git_hash: 47fa36dc780f4962102205b390e18ce9ef74b1b9 +#git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +#tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git -tag_gpg_id: 1 gpg_keyring: torbutton.gpg remote_docker: 1 var: - firefox_version: 45.8.0esr + firefox_version: 52.0.2esr torbrowser_branch: 7.0 torbrowser_update_channel: alpha copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' @@ -22,7 +24,7 @@ var: targets: nightly: - git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1' + git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2' tag_gpg_id: 0 var: torbrowser_update_channel: default

1 0

[tor-browser-build/master] Bump noscript version
by boklm＠torproject.org 07 Apr '17

07 Apr '17

commit 846dae993e531b638e981540ed0136c7d225a0e5 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 7 13:37:19 2017 +0200 Bump noscript version --- projects/tor-browser/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index f2c1d72..87cc6b2 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -52,9 +52,9 @@ input_files: name: snowflake enable: '[% c("var/snowflake") %]' - filename: Bundle-Data - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: ce9779a3a5a2574b958f8e4d079a99d43a8f84193bef52c587c704ed81c2fbbd + sha256sum: 31ba7743699deefb606bcc49197d26d926f6b4e3d3526cd2f8a339f857a04fb1 - filename: RelativeLink enable: '[% c("var/linux") %]' - project: libdmg-hfsplus

1 0

[tor-browser-build/master] Bug 18831: Use own Yasm for Firefox cross-compilation
by boklm＠torproject.org 07 Apr '17

07 Apr '17

commit f9b9039a8b7f5ed8b1bd823f4f3a9f8fc6302287 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 7 13:22:31 2017 +0200 Bug 18831: Use own Yasm for Firefox cross-compilation Starting with Firefox ESR52 Yasm < 1.2.0 is not sufficient anymore to compile our browser part for Windows. Ubuntu Precise still ships with such a version, though. We compile our own version until we get off of Precise. tor-browser-bundle.git commit: 910094fc33ae4e75e10fee754bec106e83e0eac5 --- projects/firefox/build | 4 ++++ projects/firefox/config | 3 +++ projects/yasm/build | 14 ++++++++++++++ projects/yasm/config | 10 ++++++++++ 4 files changed, 31 insertions(+) diff --git a/projects/firefox/build b/projects/firefox/build index abd699b..1dce495 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -11,6 +11,10 @@ # compiler setup so that mingw is first in the PATH. export LD_LIBRARY_PATH=$hgccdir/lib64 export PATH=$hgccdir/bin:$PATH + + # Firefox ESR52 needs Yasm >= 1.2.0 which Ubuntu Precise does not ship. + tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/yasm') %] + export PATH="/var/tmp/dist/yasm/bin:$PATH" [% END -%] [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] distdir=/var/tmp/dist/[% project %] diff --git a/projects/firefox/config b/projects/firefox/config index f7e89e5..c71025d 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -92,3 +92,6 @@ input_files: - project: gcc name: gcc enable: '[% c("var/windows") %]' + - project: yasm + name: yasm + enable: '[% c("var/windows") %]' diff --git a/projects/yasm/build b/projects/yasm/build new file mode 100644 index 0000000..82d037a --- /dev/null +++ b/projects/yasm/build @@ -0,0 +1,14 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +distdir=/var/tmp/dist/[% project %] +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf $rootdir/[% c('input_files_by_name/yasm') %] +cd /var/tmp/build/yasm-[% c("version") %] +./configure --prefix="$distdir" +make -j4 +make install +cd /var/tmp/dist +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/yasm/config b/projects/yasm/config new file mode 100644 index 0000000..3d8a28a --- /dev/null +++ b/projects/yasm/config @@ -0,0 +1,10 @@ +# vim: filetype=yaml sw=2 +version: 1.2.0 +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +remote_docker: 1 + +input_files: + - project: docker-image + - URL: 'https://www.tortall.net/projects/yasm/releases/yasm-[% c("version") %].tar.gz' + name: yasm + sha256sum: 768ffab457b90a20a6d895c39749adb547c1b7cb5c108e84b151a838a23ccf31

1 0

[tor-browser-build/master] Adapt OSX Firefox descriptor to ESR52
by boklm＠torproject.org 07 Apr '17

07 Apr '17

commit 449a330e2cb43e6eb9420987cf68fdd87561ff75 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 7 13:34:52 2017 +0200 Adapt OSX Firefox descriptor to ESR52 In tor-browser-bundle.git this change was done as part of commit cd4465477ac10d2b740d5a32505cdab5a197e405. --- projects/firefox/build | 1 - 1 file changed, 1 deletion(-) diff --git a/projects/firefox/build b/projects/firefox/build index 8b36428..4d83b28 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -152,7 +152,6 @@ done [% c("var/rezip", { rezip_file => 'Browser/browser/omni.ja' }) %] [% ELSIF c("var/osx") %] [% c("var/rezip", { rezip_file => 'TorBrowser.app/Contents/Resources/omni.ja' }) %] - [% c("var/rezip", { rezip_file => 'TorBrowser.app/Contents/Resources/webapprt/omni.ja' }) %] [% c("var/rezip", { rezip_file => 'TorBrowser.app/Contents/Resources/browser/omni.ja' }) %] [% END %]

1 0

[tor-browser-build/master] Bug 21239: Adapt Linux Firefox descriptor to ESR52
by boklm＠torproject.org 07 Apr '17

07 Apr '17

commit 67fbf56501a186f0934db144c7087834229d5da4 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 7 13:33:19 2017 +0200 Bug 21239: Adapt Linux Firefox descriptor to ESR52 tor-browser-bundle.git commit: f279b94f424c1c7eeabaa0119ccfc8fea326bed6 --- projects/firefox/build | 8 +++----- projects/firefox/config | 9 ++++----- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index 1dce495..8b36428 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -35,8 +35,7 @@ mkdir -p $distdir/Browser [% END %] [% IF c("var/linux") %] -mkdir -p $distdir/Debug/Browser/components -mkdir -p $distdir/Debug/Browser/browser/components +mkdir -p $distdir/Debug/Browser/gmp-clearkey/0.1 [% END %] cd /var/tmp/build/[% project %]-[% c("version") %] @@ -124,7 +123,7 @@ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ [% IF c("var/linux") %] cp -p obj-*/modules/libmar/tool/signmar $MARTOOLS/ cp -p obj-*/security/nss/cmd/certutil/certutil $MARTOOLS/ -NSS_LIBS="libfreebl3.so libmozsqlite3.so libnss3.so libnssdbm3.so libnssutil3.so libsmime3.so libsoftokn3.so libssl3.so" +NSS_LIBS="libmozsqlite3.so libnss3.so libnssdbm3.so libnssutil3.so libsmime3.so libssl3.so" NSPR_LIBS="libnspr4.so libplc4.so libplds4.so" for LIB in $NSS_LIBS $NSPR_LIBS; do cp -p obj-*/dist/bin/$LIB $MARTOOLS/ @@ -136,7 +135,7 @@ cd $distdir [% IF c("var/linux") %] # Strip and generate debuginfo for the firefox binary that we keep, all *.so # files, the plugin-container, and the updater (see ticket #10126) -for LIB in Browser/*.so Browser/webapprt-stub Browser/firefox Browser/plugin-container Browser/browser/components/*.so Browser/updater +for LIB in Browser/*.so Browser/firefox Browser/plugin-container Browser/gmp-clearkey/0.1/*.so Browser/updater do objcopy --only-keep-debug $LIB Debug/$LIB strip $LIB @@ -151,7 +150,6 @@ done [% IF c("var/windows") || c("var/linux") %] [% c("var/rezip", { rezip_file => 'Browser/omni.ja' }) %] [% c("var/rezip", { rezip_file => 'Browser/browser/omni.ja' }) %] - [% IF c("var/linux") %][% c("var/rezip", { rezip_file => 'Browser/webapprt/omni.ja' }) %][% END %] [% ELSIF c("var/osx") %] [% c("var/rezip", { rezip_file => 'TorBrowser.app/Contents/Resources/omni.ja' }) %] [% c("var/rezip", { rezip_file => 'TorBrowser.app/Contents/Resources/webapprt/omni.ja' }) %] diff --git a/projects/firefox/config b/projects/firefox/config index c71025d..83307d0 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -33,14 +33,14 @@ targets: arch_deps: - libgtk2.0-dev - libdbus-glib-1-dev - - libasound2-dev - - libgstreamer-plugins-base0.10-dev - libxt-dev - hardening-wrapper # To pass configure since ESR 31. - libpulse-dev # To pass configure since ESR 45. - libgconf2-dev + # To pass configure since ESR 52 + - libx11-xcb-dev # We built GCC but not the libmpc2, thus we need to install it - libmpc2 @@ -52,14 +52,13 @@ targets: - libc6-dev-i386 - libgtk2.0-dev:i386 - libdbus-glib-1-dev:i386 - - lib32asound2-dev - - libasound2-dev:i386 - - libgstreamer-plugins-base0.10-dev:i386 - libxt-dev:i386 # To pass configure since ESR 31. - libpulse-dev:i386 # To pass configure since ESR 45. - libgconf2-dev:i386 + # To pass configure since ESR 52 + - libx11-xcb-dev:i386 # We built GCC but not the libmpc2, thus we need to install it - libmpc2 - hardening-wrapper

1 0

[tor-browser-build/master] Bug 21723: Fix inconsistent generation of MOZ_MACBUNDLE_ID
by boklm＠torproject.org 07 Apr '17

07 Apr '17

commit ec86de4f618aa28c3694a5af1fb941cde802cae6 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 7 13:12:44 2017 +0200 Bug 21723: Fix inconsistent generation of MOZ_MACBUNDLE_ID Use org.torproject as the MOZ_DISTRIBUTION_ID. This results in a bundle ID of org.torproject.torbrowser. tor-browser-bundle.git commit: 50b6e6fff4a535044f9b506854535df757125267 --- projects/firefox/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/build b/projects/firefox/build index 496c215..abd699b 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -73,7 +73,7 @@ export CC='gcc -m32' rm -f configure rm -f js/src/configure -make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=[% c("var/torbrowser_version") %] --enable-update-channel=[% c("var/torbrowser_update_channel") %] --enable-bundled-fonts" +make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=[% c("var/torbrowser_version") %] --with-distribution-id=org.torproject --enable-update-channel=[% c("var/torbrowser_update_channel") %] --enable-bundled-fonts" make -j8 -f client.mk build make -C obj-* package INNER_MAKE_PACKAGE=true

1 0

[tor-browser-build/master] Bug 21709: Upgrade Go to 1.7.5.
by boklm＠torproject.org 07 Apr '17

07 Apr '17

commit 949c0d9e83d911b2fa80279edddb06c7e6299c80 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 7 13:11:41 2017 +0200 Bug 21709: Upgrade Go to 1.7.5. tor-browser-bundle.git commit: 1942f7b2f6e5f82c64dcfeab82713604866cb26f --- projects/go/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/go/config b/projects/go/config index dbd7aab..89b4b45 100644 --- a/projects/go/config +++ b/projects/go/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.7.4 +version: 1.7.5 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' remote_docker: 1 @@ -75,7 +75,7 @@ input_files: enable: '[% c("var/windows") || c("var/osx") %]' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: 4c189111e9ba651a2bb3ee868aa881fab36b2f2da3409e80885ca758a6b614cc + sha256sum: 4e834513a2079f8cbbd357502cccaac9507fd00a1efe672375798858ff291815 - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' name: go14 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] Bug 21849: Don't allow SSL key logging
by gk＠torproject.org 07 Apr '17

07 Apr '17

commit 47fa36dc780f4962102205b390e18ce9ef74b1b9 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Apr 6 17:09:09 2017 -0700 Bug 21849: Don't allow SSL key logging --- config/external/nss/Makefile.in | 2 +- security/nss/lib/ssl/ssl.gyp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/external/nss/Makefile.in b/config/external/nss/Makefile.in index 939529e..3f31d3b 100644 --- a/config/external/nss/Makefile.in +++ b/config/external/nss/Makefile.in @@ -241,7 +241,7 @@ DEFAULT_GMAKE_FLAGS += \ endif DEFAULT_GMAKE_FLAGS += FREEBL_NO_DEPEND=0 $(FREEBL_LOWHASH_FLAG) -DEFAULT_GMAKE_FLAGS += NSS_ALLOW_SSLKEYLOGFILE=1 +DEFAULT_GMAKE_FLAGS += NSS_ALLOW_SSLKEYLOGFILE=0 ifdef MOZ_NO_WLZDEFS DEFAULT_GMAKE_FLAGS += ZDEFS_FLAG= diff --git a/security/nss/lib/ssl/ssl.gyp b/security/nss/lib/ssl/ssl.gyp index 0306ab6..5c025d2 100644 --- a/security/nss/lib/ssl/ssl.gyp +++ b/security/nss/lib/ssl/ssl.gyp @@ -89,7 +89,7 @@ ], 'target_defaults': { 'defines': [ - 'NSS_ALLOW_SSLKEYLOGFILE=1' + 'NSS_ALLOW_SSLKEYLOGFILE=0' ] }, 'variables': {

1 0

[tor-browser-build/master] Bug 20426: set timestamp on files included in the Windows bundle
by boklm＠torproject.org 06 Apr '17

06 Apr '17

commit 2a15e10d49e437dd3637136692a86a9473c78e6d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 6 15:52:25 2017 +0200 Bug 20426: set timestamp on files included in the Windows bundle --- projects/tor-browser/build | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 814f7af..7134367 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -257,6 +257,7 @@ cd $distdir dmg_out => '$OUTDIR/TorBrowser-' _ c("var/torbrowser_version") _ '-osx64_${PKG_LOCALE}.dmg', }) %] [% ELSIF c("var/windows") %] + find "${TB_STAGE_DIR}" -exec [% c("var/touch") %] {} \; pushd "${TB_STAGE_DIR}" makensis torbrowser.nsi # Working around NSIS braindamage @@ -324,6 +325,7 @@ rm -rf $distdir/${PKG_DIR} dmg_out => '$OUTDIR/TorBrowser-' _ c("var/torbrowser_version") _ '-osx64_' _ lang _ '.dmg', }) %] [% ELSIF c("var/windows") %] + find "[% tbdir %]" -exec [% c("var/touch") %] {} \; pushd "[% tbdir %]" makensis torbrowser.nsi # Working around NSIS braindamage

1 0

[tor-browser-build/master] Bug 20426: build tor for Windows using faketime
by boklm＠torproject.org 06 Apr '17

06 Apr '17

commit 8cc61d29d348e154f43474b47a0b0746301602a9 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 6 15:50:11 2017 +0200 Bug 20426: build tor for Windows using faketime --- projects/tor/build | 4 ++-- projects/tor/config | 4 ++++ rbm.conf | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/projects/tor/build b/projects/tor/build index 064ff44..c1296fe 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -60,8 +60,8 @@ find -type f -print0 | xargs -0 [% c("var/touch") %] [% IF c("var/windows") %]--with-zlib-dir="$zlibdir"[% END %] \ [% IF c("var/osx") %]--enable-static-openssl[% END %] \ --prefix="$distdir" [% c("var/configure_opt") %] -[% IF c("var/osx") -%] - export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1 +[% IF c("var/osx") || c("var/windows") -%] + export LD_PRELOAD=[% c("var/faketime_path") %] export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" [% END -%] make -j4 diff --git a/projects/tor/config b/projects/tor/config index 55637dc..961c1f3 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -40,6 +40,10 @@ targets: var: arch_deps: - faketime + windows-i686: + var: + arch_deps: + - faketime expert-bundle: var: expert_bundle: 1 diff --git a/rbm.conf b/rbm.conf index d7c8b34..355c593 100644 --- a/rbm.conf +++ b/rbm.conf @@ -162,6 +162,7 @@ targets: - libtool - zip - unzip + faketime_path: /usr/lib/faketime/libfaketime.so.1 torbrowser-osx-x86_64: - osx-x86_64 @@ -184,6 +185,7 @@ targets: - libtool - zip - unzip + faketime_path: /usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1 # The no_build_id target can be useful if you want to quickly display # a build template or other option but don't want to spend time to

1 0

[tor-browser-build/master] Build openssl for OSX using the clang based toolchain
by boklm＠torproject.org 06 Apr '17

06 Apr '17

commit 385d1149f47e119df747104c16e750d67b8417a4 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 3 16:02:56 2017 +0200 Build openssl for OSX using the clang based toolchain Doing changes corresponding to #10369. --- projects/openssl/build | 5 +++++ projects/openssl/config | 9 +-------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/projects/openssl/build b/projects/openssl/build index 3a5365e..e831b68 100644 --- a/projects/openssl/build +++ b/projects/openssl/build @@ -8,6 +8,11 @@ cd /var/tmp/build/[% project %]-[% c('version') %] [% IF c("var/osname") == "linux-i686" -%] export CC='gcc -m32' [% END %] +[% IF c("var/osx") -%] + # Tricking OpenSSL into using our clang as cross-compiler + ln -s $clangdir/helpers/clang $clangdir/helpers/x86_64-apple-darwin10-cc + export CC="cc [% c("var/FLAGS") %]" +[% END -%] ./Configure --prefix=$distdir [% c('var/configure_opts') %] make make install diff --git a/projects/openssl/config b/projects/openssl/config index 8490b0b..1a2e4dd 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -15,14 +15,7 @@ targets: configure_opts: '-shared --cross-compile-prefix=i686-w64-mingw32- mingw "-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$gcclibs"' osx-x86_64: var: - configure_opts: --cross-compile-prefix=i686-apple-darwin11- $CFLAGS darwin64-x86_64-cc enable-ec_nistp_64_gcc_128 - deps: - - build-essential - arch_deps: - - libc6-i386 - - libstdc++6:i386 - pre_pkginst: dpkg --add-architecture i386 - compiler: macosx-toolchain-gcc + configure_opts: --cross-compile-prefix=x86_64-apple-darwin10- darwin64-x86_64-cc enable-ec_nistp_64_gcc_128 input_files: - project: docker-image

1 0

[tor-browser-build/master] Build libevent for OSX using the clang based toolchain
by boklm＠torproject.org 06 Apr '17

06 Apr '17

commit 54cd97cb195c2269bf0b2ba5bd65843cdb617c38 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 3 15:59:17 2017 +0200 Build libevent for OSX using the clang based toolchain Doing changes corresponding to #10369. --- projects/libevent/config | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/projects/libevent/config b/projects/libevent/config index 884a019..8bd4b4e 100644 --- a/projects/libevent/config +++ b/projects/libevent/config @@ -7,16 +7,6 @@ gpg_keyring: libevent.gpg filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' remote_docker: 1 -targets: - osx-x86_64: - var: - arch_deps: - - libc6-i386 - - libstdc++6:i386 - pre_pkginst: dpkg --add-architecture i386 - compiler: macosx-toolchain-gcc - configure_opt: --host=i686-apple-darwin11 - input_files: - project: docker-image - name: '[% c("var/compiler") %]'

1 0

[tor-browser-build/master] Build go for OSX using the clang based toolchain
by boklm＠torproject.org 06 Apr '17

06 Apr '17

commit a8d3b0b4e1dbbaffea0139eb1f128d2429eecc02 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 3 15:56:36 2017 +0200 Build go for OSX using the clang based toolchain Doing the changes corresponding to #21753. --- projects/go/build | 7 +++++-- projects/go/config | 8 +------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/projects/go/build b/projects/go/build index 72117f6..2f87bf5 100644 --- a/projects/go/build +++ b/projects/go/build @@ -38,16 +38,19 @@ cd /var/tmp/dist/go/src [% IF c("var/linux") -%] ./make.bash [% ELSIF c("var/osx") -%] + unset LDFLAGS + rm -Rf $clangdir/helpers + export CC="$clangdir/bin/clang [% c("var/FLAGS") %]" # Create a cc-for-target script that closes over CC, CFLAGS, and LDFLAGS. # Go's CC_FOR_TARGET only allows a command name, not a command with arguments. # https://github.com/golang/go/issues/15457 CC_FOR_TARGET="$(pwd)/cc-for-target" echo "#!/bin/sh" > "$CC_FOR_TARGET" - echo "exec $CC $CFLAGS $LDFLAGS -std=gnu99 \"\$@\"" >> "$CC_FOR_TARGET" + echo "exec $CC $CFLAGS $LDFLAGS \"\$@\"" >> "$CC_FOR_TARGET" chmod +x "$CC_FOR_TARGET" # http://golang.org/doc/install/source#environment export GOOS=darwin - export GOARCH=386 + export GOARCH=amd64 # Remove a preprocessor directive that causes problems when building with the 10.7 SDK. # https://github.com/golang/go/issues/17732 sed -i -e '/^#cgo CFLAGS:/s/-D__MAC_OS_X_VERSION_MAX_ALLOWED=1060//' crypto/x509/root_cgo_darwin.go diff --git a/projects/go/config b/projects/go/config index 870dc50..dbd7aab 100644 --- a/projects/go/config +++ b/projects/go/config @@ -56,14 +56,8 @@ targets: GOARCH: 386 osx-x86_64: var: - arch_deps: - - libc6-i386 - - libstdc++6:i386 - pre_pkginst: dpkg --add-architecture i386 - compiler: macosx-toolchain-gcc - 10_7_SDK: 1 GOOS: darwin - GOARCH: 386 + GOARCH: amd64 linux: var: GOOS: linux

1 0

[tor-browser-build/master] Build gmp for OSX using the clang based toolchain
by boklm＠torproject.org 06 Apr '17

06 Apr '17

commit a7545d82294661640369a88fef114066330c3f7f Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 3 16:04:19 2017 +0200 Build gmp for OSX using the clang based toolchain --- projects/gmp/config | 8 -------- 1 file changed, 8 deletions(-) diff --git a/projects/gmp/config b/projects/gmp/config index 4c730e5..913f181 100644 --- a/projects/gmp/config +++ b/projects/gmp/config @@ -7,14 +7,6 @@ targets: linux: var: configure_opt_gmp: --enable-fat - osx-x86_64: - var: - arch_deps: - - libc6-i386 - - libstdc++6:i386 - pre_pkginst: dpkg --add-architecture i386 - compiler: macosx-toolchain-gcc - configure_opt: --host=x86_64-apple-darwin11 input_files: - name: gmp

1 0

[tor-browser-build/master] macosx-toolchain setup: export LDFLAGS and CC
by boklm＠torproject.org 06 Apr '17

06 Apr '17

commit 0bad542a31e3353c29132454342c6d8c5af9c914 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 3 15:54:01 2017 +0200 macosx-toolchain setup: export LDFLAGS and CC --- projects/macosx-toolchain/config | 2 ++ rbm.conf | 1 + 2 files changed, 3 insertions(+) diff --git a/projects/macosx-toolchain/config b/projects/macosx-toolchain/config index 6458485..b237e4d 100644 --- a/projects/macosx-toolchain/config +++ b/projects/macosx-toolchain/config @@ -11,6 +11,8 @@ var: export cctoolsdir=/var/tmp/dist/[% project %]/cctools/bin export PATH="$clangdir/helpers:$clangdir/bin:$cctoolsdir:$PATH" export LD_LIBRARY_PATH=/var/tmp/dist/[% project %]/clang/lib + export CC="$clangdir/helpers/clang [% c('var/FLAGS') %]" + export LDFLAGS="[% c('var/LDFLAGS') %]" input_files: - name: llvm diff --git a/rbm.conf b/rbm.conf index e206193..868c30a 100644 --- a/rbm.conf +++ b/rbm.conf @@ -174,6 +174,7 @@ targets: compiler: 'macosx-toolchain' configure_opt: '--host=x86_64-apple-darwin10 CC="x86_64-apple-darwin10-clang [% c("var/FLAGS") %]" CXX="x86_64-apple-darwin10-clang++ [% c("var/FLAGS") %]"' FLAGS: "-target x86_64-apple-darwin10 -mlinker-version=136 -B $cctoolsdir -isysroot $sysrootdir" + LDFLAGS: "-Wl,-syslibroot,$sysrootdir -Wl,-dead_strip -Wl,-pie" locale_ja: ja-JP-mac deps: - build-essential

1 0

[tor-browser-build/master] Bug 21328: Updating to clang 3.8.0
by boklm＠torproject.org 06 Apr '17

06 Apr '17

commit 1dbc75556c4dac73438338d2c9267fe084e724af Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 3 16:13:05 2017 +0200 Bug 21328: Updating to clang 3.8.0 We use the new compiler Mozilla is using for Firefox 52 cross-builds as well. clang now requires GCC 4.8.5 for compiling which is not available in Debian Wheezy. We therefore build the macOS parts on Debian Jessie now. --- keyring/llvm.gpg | Bin 0 -> 2507 bytes projects/clang/build | 8 -------- projects/clang/config | 5 ----- projects/llvm/build | 15 ++++++++++++--- projects/llvm/config | 30 +++++++++++++++++++++++++----- projects/tor/build | 2 +- rbm.conf | 2 +- 7 files changed, 39 insertions(+), 23 deletions(-) diff --git a/keyring/llvm.gpg b/keyring/llvm.gpg new file mode 100644 index 0000000..9911f65 Binary files /dev/null and b/keyring/llvm.gpg differ diff --git a/projects/clang/build b/projects/clang/build deleted file mode 100644 index ac0f21b..0000000 --- a/projects/clang/build +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -tar xf [% project %]-[% c("version") %].tar.gz -mv [% project %]-[% c("version") %] [% project %] -[% c('tar', { - tar_src => [ project ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/clang/config b/projects/clang/config deleted file mode 100644 index 92b8d51..0000000 --- a/projects/clang/config +++ /dev/null @@ -1,5 +0,0 @@ -# vim: filetype=yaml sw=2 -version: r247539 -git_url: https://github.com/llvm-mirror/clang -git_hash: 592b43b609b42cffd1531a700c140e10766bf049 -filename: '[% project %]-src-[% c("version") %]-[% c("var/build_id") %].tar.gz' diff --git a/projects/llvm/build b/projects/llvm/build index 3773cfd..5241944 100644 --- a/projects/llvm/build +++ b/projects/llvm/build @@ -5,10 +5,19 @@ mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %] export PATH="/var/tmp/dist/cmake/bin:$PATH" mkdir -p /var/tmp/build -tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz -cd /var/tmp/build/[% project %]-[% c("version") %] +cd /var/tmp/build +tar -xf $rootdir/[% c('input_files_by_name/llvm') %] +tar -xf $rootdir/[% c('input_files_by_name/cfe') %] +tar -xf $rootdir/[% c('input_files_by_name/libcxx') %] +tar -xf $rootdir/[% c('input_files_by_name/libcxxabi') %] +mv cfe-* clang +mv libcxx-* libcxx +mv libcxxabi-* libcxxabi +mv clang llvm-*/tools +mv libcxx llvm-*/projects +mv libcxxabi llvm-*/projects +cd llvm-* export LLVM_HOME=$(pwd) -tar -C $LLVM_HOME/tools -xf $rootdir/[% c('input_files_by_name/clang') %] mkdir build cd build cmake .. -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$distdir -DCMAKE_BUILD_TYPE:STRING=Release $LLVM_HOME diff --git a/projects/llvm/config b/projects/llvm/config index 89ee637..81f7aaa 100644 --- a/projects/llvm/config +++ b/projects/llvm/config @@ -1,7 +1,5 @@ # vim: filetype=yaml sw=2 -version: 8f188e0ea735ac9383a65a0d1c846eb790c2ec74 -git_url: https://github.com/llvm-mirror/llvm -git_hash: '[% c("version") %]' +version: 3.8.0 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' remote_docker: 1 @@ -9,5 +7,27 @@ input_files: - project: docker-image - project: cmake name: cmake - - project: clang - name: clang + - URL: 'http://releases.llvm.org/[% c("version") %]/llvm-[% c("version") %].src.tar.xz' + # no proper HTTPS + name: llvm + sig_ext: sig + file_gpg_id: 1 + gpg_keyring: llvm.gpg + - URL: 'http://releases.llvm.org/[% c("version") %]/cfe-[% c("version") %].src.tar.xz' + # no proper HTTPS + name: cfe + sig_ext: sig + file_gpg_id: 1 + gpg_keyring: llvm.gpg + - URL: 'http://releases.llvm.org/[% c("version") %]/libcxx-[% c("version") %].src.tar.xz' + # no proper HTTPS + name: libcxx + sig_ext: sig + file_gpg_id: 1 + gpg_keyring: llvm.gpg + - URL: 'http://releases.llvm.org/[% c("version") %]/libcxxabi-[% c("version") %].src.tar.xz' + # no proper HTTPS + name: libcxxabi + sig_ext: sig + file_gpg_id: 1 + gpg_keyring: llvm.gpg diff --git a/projects/tor/build b/projects/tor/build index c56cddc..064ff44 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -61,7 +61,7 @@ find -type f -print0 | xargs -0 [% c("var/touch") %] [% IF c("var/osx") %]--enable-static-openssl[% END %] \ --prefix="$distdir" [% c("var/configure_opt") %] [% IF c("var/osx") -%] - export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 + export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1 export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" [% END -%] make -j4 diff --git a/rbm.conf b/rbm.conf index 868c30a..d7c8b34 100644 --- a/rbm.conf +++ b/rbm.conf @@ -166,7 +166,7 @@ targets: torbrowser-osx-x86_64: - osx-x86_64 osx-x86_64: - distribution: Debian-7.11 + distribution: Debian-8.7 arch: x86_64 var: osx: 1

1 0

[tor-browser-build/master] Bug 21754: remove the old GCC-based toolchain for macOS
by boklm＠torproject.org 06 Apr '17

06 Apr '17

commit 916f99775b4eabf50983441d95f65c7e149dbab9 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 3 16:08:19 2017 +0200 Bug 21754: remove the old GCC-based toolchain for macOS --- projects/macosx-toolchain-gcc/build | 7 ------ projects/macosx-toolchain-gcc/config | 41 ------------------------------------ 2 files changed, 48 deletions(-) diff --git a/projects/macosx-toolchain-gcc/build b/projects/macosx-toolchain-gcc/build deleted file mode 100644 index 4a8f0db..0000000 --- a/projects/macosx-toolchain-gcc/build +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -destdir='[% dest_dir _ '/' _ c('filename') %]' -mkdir -p "$destdir" -mv -f [% c('input_files_by_name/SDK') %] "$destdir"/apple-uni-sdk.deb -mv -f [% c('input_files_by_name/SDK_10_7') %] "$destdir"/MacOSX10.7.sdk.tar.gz -mv -f [% c('input_files_by_name/toolchain') %] "$destdir"/toolchain.tar.xz diff --git a/projects/macosx-toolchain-gcc/config b/projects/macosx-toolchain-gcc/config deleted file mode 100644 index 31ac46f..0000000 --- a/projects/macosx-toolchain-gcc/config +++ /dev/null @@ -1,41 +0,0 @@ -# vim: filetype=yaml sw=2 -filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]' -version: 1 -remote_docker: 1 -var: - setup: | - macosx_toolchain_gcc_dir=/var/tmp/dist/macosx-toolchain-gcc - mkdir -p $macosx_toolchain_gcc_dir - tar -C $macosx_toolchain_gcc_dir -xf [% c("compiler_tarfile") %]/toolchain.tar.xz - export PATH="$macosx_toolchain_gcc_dir/apple-osx/bin:$PATH" - # For OpenSSL - ln -s $macosx_toolchain_gcc_dir/apple-osx/bin/apple-osx-gcc $macosx_toolchain_gcc_dir/apple-osx/bin/i686-apple-darwin11-cc - #For gmp, need to trick it so it knows we're doing a 64 bit build - for i in $macosx_toolchain_gcc_dir/apple-osx/bin/i686-apple-darwin11-*; do j=`echo $i | sed 's/i686/x86_64/'`; ln -s $i $j; done; - - - [% IF pc(c('origin_project'), "var/10_7_SDK") %] - export AR=$macosx_toolchain_gcc_dir/apple-osx/bin/apple-osx-ar - export CC=$macosx_toolchain_gcc_dir/apple-osx/bin/apple-osx-gcc - export CXX=$macosx_toolchain_gcc_dir/apple-osx/bin/apple-osx-g++ - tar -C $macosx_toolchain_gcc_dir -xf [% c("compiler_tarfile") %]/MacOSX10.7.sdk.tar.gz - export CFLAGS="-isysroot $macosx_toolchain_gcc_dir/MacOSX10.7.sdk" - [% ELSE %] - dpkg-deb -x [% c("compiler_tarfile") %]/apple-uni-sdk.deb $macosx_toolchain_gcc_dir - # XXX Clean up these flags? - export CFLAGS="-m64 -I$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I$macosx_toolchain_gcc_dir/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" - export CXXFLAGS="-m64 -I$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I$macosx_toolchain_gcc_dir/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/i686-apple-darwin10/4.2.1 -mmacosx-version-min=10.5" - export LDFLAGS="-L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" - [% END %] - -input_files: - - name: SDK - URL: https://launchpad.net/~flosoft/+archive/cross-apple/+files/apple-uni-sdk-10… - sha256sum: 6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc - - name: SDK_10_7 - URL: https://people.torproject.org/~mikeperry/mirrors/sources/MacOSX10.7.sdk.tar… - sha256sum: da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf - - name: toolchain - URL: https://people.torproject.org/~mikeperry/mirrors/sources/multiarch-darwin11… - sha256sum: 65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 - - project: docker-image

1 0

[tor-browser-bundle/hardened-builds] Remove TOOLCHAIN4_OLD_URL reference
by gk＠torproject.org 06 Apr '17

06 Apr '17

commit bc99d24ed38a47bbea9ea1498298653d7e3c0e66 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 6 08:20:58 2017 +0000 Remove TOOLCHAIN4_OLD_URL reference --- gitian/versions.nightly | 1 - 1 file changed, 1 deletion(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 6615219..ddbbc05 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -141,7 +141,6 @@ NOTOTCFONT_HASH=e6b82f7d3dab605c428161124ceb5e169cde93de632d800297b167cdd88e7baa ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} -TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${TOOLCHAIN4_OLD_PACKAGE} CCTOOLS_URL=https://people.torproject.org/~gk/mirrors/sources/${CCTOOLS_PAC… OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE}

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] fixup! TB3: Tor Browser's official .mozconfigs.
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit 0fecb4a099ce227eca885532cf70cf8b4a4e688b Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 5 20:55:08 2017 +0000 fixup! TB3: Tor Browser's official .mozconfigs. Update the user agent we set to a Windows ESR 52 one. --- browser/app/profile/000-tor-browser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index c3c6b58..e07a5a1 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -118,7 +118,7 @@ pref("general.appname.override", "Netscape"); pref("general.appversion.override", "5.0 (Windows)"); pref("general.oscpu.override", "Windows NT 6.1"); pref("general.platform.override", "Win32"); -pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:45.0) Gecko/20100101 Firefox/45.0"); +pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:52.0) Gecko/20100101 Firefox/52.0"); pref("general.productSub.override", "20100101"); pref("general.buildID.override", "20100101"); pref("browser.startup.homepage_override.buildID", "20100101");

1 0

[tor-browser-bundle/hardened-builds] Nightly versions bump while switching to ESR 52
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit 37d51cdab5ad38bec95d80fa72c1abc595ae9bb7 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 5 11:13:08 2017 +0000 Nightly versions bump while switching to ESR 52 --- gitian/versions.nightly | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 59bc494..6615219 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -17,11 +17,11 @@ MULTI_LINGUAL=1 VERIFY_TAGS=0 -FIREFOX_VERSION=45.8.0esr +FIREFOX_VERSION=52.0.2esr TORBROWSER_UPDATE_CHANNEL=default -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.0-1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.0-2 TOR_TAG=master TORLAUNCHER_TAG=master TORBUTTON_TAG=master @@ -61,7 +61,7 @@ GITIAN_TAG=tor-browser-builder-4 OPENSSL_VER=1.0.2k GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build2 +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 GCC_VER=5.4.0 CLANG_VER=r247539 @@ -83,8 +83,7 @@ ELFUTILS_VER=0.160 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.9.5.3-fx+sm.xpi -TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz +NOSCRIPT_PACKAGE=noscript_security_suite-5.0.2-fx+sm.xpi CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz OSXSDK_OLD_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -116,9 +115,7 @@ ELFUTILS_PACKAGE=elfutils-${ELFUTILS_VER}.tar.bz2 OPENSSL_HASH=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf -OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc -TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=ce9779a3a5a2574b958f8e4d079a99d43a8f84193bef52c587c704ed81c2fbbd +NOSCRIPT_HASH=31ba7743699deefb606bcc49197d26d926f6b4e3d3526cd2f8a339f857a04fb1 CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/hardened-builds] Bug 21239: Adapt Linux Firefox descriptor to ESR52
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit f76d0980596273327554c96fdb88e0b749552036 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Mar 14 08:36:20 2017 +0000 Bug 21239: Adapt Linux Firefox descriptor to ESR52 --- gitian/descriptors/linux/gitian-firefox.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 8d38b3a..904ea3c 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -12,15 +12,14 @@ packages: - "libgtk2.0-dev" - "libdbus-glib-1-dev" - "yasm" -- "libasound2-dev" -- "libgstreamer-plugins-base0.10-dev" - "libxt-dev" - "hardening-wrapper" -- "python-dev" # To pass configure since ESR 31. - "libpulse-dev" # To pass configure since ESR 45. - "libgconf2-dev" +# To pass configure since ESR 52. +- "libx11-xcb-dev" # We built GCC but not the libmpc2, thus we need to install it. - "libmpc2" reference_datetime: "2000-01-01 00:00:00" @@ -80,8 +79,7 @@ script: | export LD_LIBRARY_PATH=$INSTDIR/gcc/lib64 # mkdir -p $INSTDIR/Browser/ - mkdir -p $INSTDIR/Debug/Browser/components - mkdir -p $INSTDIR/Debug/Browser/browser/components + mkdir -p $INSTDIR/Debug/Browser/gmp-clearkey/0.1 cd tor-browser mv .mozconfig-asan .mozconfig @@ -123,7 +121,7 @@ script: | cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ cp -p obj-*/modules/libmar/tool/signmar $MARTOOLS/ cp -p obj-*/security/nss/cmd/certutil/certutil $MARTOOLS/ - NSS_LIBS="libfreebl3.so libmozsqlite3.so libnss3.so libnssdbm3.so libnssutil3.so libsmime3.so libsoftokn3.so libssl3.so" + NSS_LIBS="libmozsqlite3.so libnss3.so libnssdbm3.so libnssutil3.so libsmime3.so libssl3.so" NSPR_LIBS="libnspr4.so libplc4.so libplds4.so" for LIB in $NSS_LIBS $NSPR_LIBS; do cp -p obj-*/dist/bin/$LIB $MARTOOLS/ @@ -136,7 +134,7 @@ script: | # Strip and generate debuginfo for the firefox binary that we keep, all *.so # files, the plugin-container, and the updater (see ticket #10126) cd $INSTDIR - for LIB in Browser/*.so Browser/webapprt-stub Browser/firefox Browser/plugin-container Browser/browser/components/*.so Browser/updater + for LIB in Browser/*.so Browser/firefox Browser/plugin-container Browser/gmp-clearkey/0.1/*.so Browser/updater do objcopy --only-keep-debug $LIB Debug/$LIB strip $LIB @@ -144,7 +142,6 @@ script: | done # ~/build/re-dzip.sh Browser/omni.ja - ~/build/re-dzip.sh Browser/webapprt/omni.ja ~/build/re-dzip.sh Browser/browser/omni.ja ~/build/dzip.sh tor-browser-linux$GBUILD_BITS-gbuilt.zip Browser/ ~/build/dzip.sh tor-browser-linux$GBUILD_BITS-debug.zip Debug/

1 0

[tor-browser-bundle/master] Bumping nightly versions for ESR52 switch
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit 0d331f7aee2e13f56dfd91d343b5d45966b331c4 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 5 11:13:08 2017 +0000 Bumping nightly versions for ESR52 switch --- gitian/versions.nightly | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index a696497..b45e7d6 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -17,11 +17,11 @@ MULTI_LINGUAL=1 VERIFY_TAGS=0 -FIREFOX_VERSION=45.8.0esr +FIREFOX_VERSION=52.0.2esr TORBROWSER_UPDATE_CHANNEL=default -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.0-1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.0-2 TOR_TAG=master TORLAUNCHER_TAG=master TORBUTTON_TAG=master @@ -60,7 +60,7 @@ GITIAN_TAG=tor-browser-builder-4 OPENSSL_VER=1.0.2k GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build2 +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 GCC_VER=5.1.0 CLANG_VER=3.8.0 @@ -82,7 +82,7 @@ YASM_VER=1.2.0 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.9.5.3-fx+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-5.0.2-fx+sm.xpi CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz MSVCR100_PACKAGE=msvcr100.dll @@ -117,7 +117,7 @@ YASM_PACKAGE=yasm-${YASM_VER}.tar.gz OPENSSL_HASH=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf -NOSCRIPT_HASH=ce9779a3a5a2574b958f8e4d079a99d43a8f84193bef52c587c704ed81c2fbbd +NOSCRIPT_HASH=31ba7743699deefb606bcc49197d26d926f6b4e3d3526cd2f8a339f857a04fb1 CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/master] Bug 21239: Adapt Linux Firefox descriptor to ESR52
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit f279b94f424c1c7eeabaa0119ccfc8fea326bed6 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Mar 14 08:36:20 2017 +0000 Bug 21239: Adapt Linux Firefox descriptor to ESR52 --- gitian/descriptors/linux/gitian-firefox.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 4a756b8..d607f6a 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -13,15 +13,14 @@ packages: - "libgtk2.0-dev" - "libdbus-glib-1-dev" - "yasm" -- "libasound2-dev" -- "libgstreamer-plugins-base0.10-dev" - "libxt-dev" - "hardening-wrapper" -- "python-dev" # To pass configure since ESR 31. - "libpulse-dev" # To pass configure since ESR 45. - "libgconf2-dev" +# To pass configure since ESR 52. +- "libx11-xcb-dev" # We built GCC but not the libmpc2, thus we need to install it. - "libmpc2" reference_datetime: "2000-01-01 00:00:00" @@ -84,8 +83,7 @@ script: | export LD_LIBRARY_PATH=$INSTDIR/gcc/lib$ARCH # mkdir -p $INSTDIR/Browser/ - mkdir -p $INSTDIR/Debug/Browser/components - mkdir -p $INSTDIR/Debug/Browser/browser/components + mkdir -p $INSTDIR/Debug/Browser/gmp-clearkey/0.1 cd tor-browser # run get-moz-build-date before removing .git, which is used to get the year @@ -121,7 +119,7 @@ script: | cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ cp -p obj-*/modules/libmar/tool/signmar $MARTOOLS/ cp -p obj-*/security/nss/cmd/certutil/certutil $MARTOOLS/ - NSS_LIBS="libfreebl3.so libmozsqlite3.so libnss3.so libnssdbm3.so libnssutil3.so libsmime3.so libsoftokn3.so libssl3.so" + NSS_LIBS="libmozsqlite3.so libnss3.so libnssdbm3.so libnssutil3.so libsmime3.so libssl3.so" NSPR_LIBS="libnspr4.so libplc4.so libplds4.so" for LIB in $NSS_LIBS $NSPR_LIBS; do cp -p obj-*/dist/bin/$LIB $MARTOOLS/ @@ -133,7 +131,7 @@ script: | # Strip and generate debuginfo for the firefox binary that we keep, all *.so # files, the plugin-container, and the updater (see ticket #10126) cd $INSTDIR - for LIB in Browser/*.so Browser/webapprt-stub Browser/firefox Browser/plugin-container Browser/browser/components/*.so Browser/updater + for LIB in Browser/*.so Browser/firefox Browser/plugin-container Browser/gmp-clearkey/0.1/*.so Browser/updater do objcopy --only-keep-debug $LIB Debug/$LIB strip $LIB @@ -141,7 +139,6 @@ script: | done # ~/build/re-dzip.sh Browser/omni.ja - ~/build/re-dzip.sh Browser/webapprt/omni.ja ~/build/re-dzip.sh Browser/browser/omni.ja ~/build/dzip.sh tor-browser-linux$GBUILD_BITS-gbuilt.zip Browser/ ~/build/dzip.sh tor-browser-linux$GBUILD_BITS-debug.zip Debug/

1 0

[tor-browser-bundle/master] Bug 21240: Bump mingw-w64 commit for ESR52 compilation
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit b5beb33b57643ff83838337ded870511599d45f5 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Mar 30 09:32:17 2017 +0000 Bug 21240: Bump mingw-w64 commit for ESR52 compilation --- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.nightly | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/versions b/gitian/versions index caaa487..48ad666 100755 --- a/gitian/versions +++ b/gitian/versions @@ -23,7 +23,7 @@ NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable CMAKE_TAG=v2.8.12.2 -MINGW_TAG=a0cd5afeb60be3be0860e9a203314c10485bb9b8 +MINGW_TAG=9c7c7122401cfd932e599bec5b4b7ca846deb5c0 PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 LIBFTE_TAG=85ef8ae58dbf0d02ea26b627e343784b5574c428 # sketch master with fix diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 0fe1846..2e6fb2c 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -23,7 +23,7 @@ NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable CMAKE_TAG=v2.8.12.2 -MINGW_TAG=a0cd5afeb60be3be0860e9a203314c10485bb9b8 +MINGW_TAG=9c7c7122401cfd932e599bec5b4b7ca846deb5c0 PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 LIBFTE_TAG=85ef8ae58dbf0d02ea26b627e343784b5574c428 # sketch master with fix diff --git a/gitian/versions.nightly b/gitian/versions.nightly index c0b68f5..a696497 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -30,7 +30,7 @@ NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable CMAKE_TAG=v2.8.12.2 -MINGW_TAG=a0cd5afeb60be3be0860e9a203314c10485bb9b8 +MINGW_TAG=9c7c7122401cfd932e599bec5b4b7ca846deb5c0 PYPTLIB_TAG=master OBFSPROXY_TAG=master LIBFTE_TAG=master

1 0

[tor-browser-bundle/master] Bug 18831: Use own Yasm for Firefox cross-compilation
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit 910094fc33ae4e75e10fee754bec106e83e0eac5 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 29 11:00:23 2017 +0000 Bug 18831: Use own Yasm for Firefox cross-compilation Starting with Firefox ESR52 Yasm < 1.2.0 is not sufficient anymore to compile our browser part for Windows. Ubuntu Precise still ships with such a version, though. We compile our own version until we get off of Precise. --- gitian/descriptors/windows/gitian-firefox.yml | 6 ++++-- gitian/descriptors/windows/gitian-utils.yml | 11 +++++++++++ gitian/fetch-inputs.sh | 5 +++-- gitian/mkbundle-windows.sh | 5 ++++- gitian/verify-tags.sh | 2 +- gitian/versions | 4 ++++ gitian/versions.alpha | 4 ++++ gitian/versions.nightly | 4 ++++ 8 files changed, 35 insertions(+), 6 deletions(-) diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index fabc40d..7ba0615 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -6,7 +6,6 @@ architectures: packages: - "unzip" - "autoconf2.13" -- "yasm" - "zip" reference_datetime: "2000-01-01 00:00:00" remotes: @@ -14,6 +13,7 @@ remotes: "dir": "tor-browser" files: - "gcc-linux32-precise-utils.zip" +- "yasm-linux32-precise-utils.zip" - "mingw-w64-win32-utils.zip" - "get-moz-build-date" - "re-dzip.sh" @@ -34,6 +34,8 @@ script: | # mkdir -p $INSTDIR/Browser/ mkdir -p $OUTDIR/ + # Firefox ESR52 needs Yasm >= 1.2.0 which Ubuntu Precise does not ship. + unzip -d $INSTDIR yasm-linux32-precise-utils.zip unzip -d $INSTDIR gcc-linux32-precise-utils.zip # We need a link to our GCC, otherwise the system cc gets used which points to # /usr/bin/gcc. @@ -42,7 +44,7 @@ script: | unzip -d $INSTDIR gcclibs-win32-utils.zip # Make sure our custom mingw and GCC (as host compiler) get used. export LD_LIBRARY_PATH=$INSTDIR/gcc/lib - export PATH=$INSTDIR/mingw-w64/bin:$INSTDIR/gcc/bin:$PATH + export PATH=$INSTDIR/mingw-w64/bin:$INSTDIR/gcc/bin:$INSTDIR/yasm/bin:$PATH # We don't want to link against msvcrt.dll due to bug 9084. i686-w64-mingw32-g++ -dumpspecs > msvcr100.spec diff --git a/gitian/descriptors/windows/gitian-utils.yml b/gitian/descriptors/windows/gitian-utils.yml index 9c31834..6cfbbf1 100644 --- a/gitian/descriptors/windows/gitian-utils.yml +++ b/gitian/descriptors/windows/gitian-utils.yml @@ -26,6 +26,7 @@ remotes: files: - "binutils.tar.bz2" - "gcc.tar.bz2" +- "yasm.tar.gz" - "openssl.tar.gz" - "gmp.tar.bz2" - "enable-reloc-section-ld.patch" @@ -52,6 +53,15 @@ script: | make install cd .. + # Building Yasm to use it for our Firefox compilation later. Firefox ESR52 + # requires Yasm >= 1.2.0 which Ubuntu Precise does not ship. + tar xaf yasm.tar.gz + cd yasm-* + ./configure --prefix=$INSTDIR/yasm + make $MAKEOPTS + make install + cd .. + # Building binutils tar xjf binutils.tar.bz2 cd binutils* @@ -186,6 +196,7 @@ script: | # We might want to bump binutils independent of bumping mingw-w64. touch binutils-$BINUTILS_VER-win32-utils.zip ~/build/dzip.sh gcc-$GCC_VER-linux32-precise-utils.zip gcc + ~/build/dzip.sh yasm-$YASM_VER-linux32-precise-utils.zip yasm ~/build/dzip.sh mingw-w64-$GCC_VER-win32-utils.zip mingw-w64 ~/build/dzip.sh zlib-${ZLIB_TAG#v}-win32-utils.zip zlib ~/build/dzip.sh libevent-${LIBEVENT_TAG#release-}-win32-utils.zip libevent diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 44f96aa..b7fcf36 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -162,7 +162,7 @@ do get "${!PACKAGE}" "${MIRROR_URL_ASN}${!PACKAGE}" done -for i in ZOPEINTERFACE TWISTED PY2EXE SETUPTOOLS PARSLEY GO14 GO STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN PYCRYPTO +for i in ZOPEINTERFACE TWISTED PY2EXE SETUPTOOLS PARSLEY GO14 GO STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN PYCRYPTO YASM do URL="${i}_URL" PACKAGE="${i}_PACKAGE" @@ -174,7 +174,7 @@ wget -U "" -N ${NOSCRIPT_URL} # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK are not signed at all) -for i in OSXSDK CCTOOLS NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO14 GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN +for i in OSXSDK CCTOOLS NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO14 GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN YASM do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" @@ -251,6 +251,7 @@ ln -sf "$GO14_PACKAGE" go14.tar.gz ln -sf "$GO_PACKAGE" go.tar.gz ln -sf "$NSIS_PACKAGE" nsis.tar.bz2 ln -sf "$NSIS_DEBIAN_PACKAGE" nsis-debian.tar.xz +ln -sf "$YASM_PACKAGE" yasm.tar.gz # Fetch latest gitian-builder itself # XXX - this is broken if a non-standard inputs dir is selected using the command line flag. diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 6254937..451bb29 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -108,7 +108,8 @@ if [ ! -f inputs/binutils-$BINUTILS_VER-win32-utils.zip -o \ ! -f inputs/libevent-${LIBEVENT_TAG_ORIG#release-}-win32-utils.zip -o \ ! -f inputs/openssl-$OPENSSL_VER-win32-utils.zip -o \ ! -f inputs/gmp-$GMP_VER-win32-utils.zip -o \ - ! -f inputs/nsis-$NSIS_VER-win32-utils.zip ]; + ! -f inputs/nsis-$NSIS_VER-win32-utils.zip -o \ + ! -f inputs/yasm-$YASM_VER-linux32-precise-utils.zip ]; then echo echo "****** Starting Utilities Component of Windows Bundle (1/5 for Windows) ******" @@ -131,6 +132,7 @@ then ln -sf gcclibs-$GCC_VER-win32-utils.zip gcclibs-win32-utils.zip ln -sf gcc-$GCC_VER-linux32-precise-utils.zip gcc-linux32-precise-utils.zip ln -sf nsis-$NSIS_VER-win32-utils.zip nsis-win32-utils.zip + ln -sf yasm-$YASM_VER-linux32-precise-utils.zip yasm-linux32-precise-utils.zip cd .. #cp -a result/utils-win-res.yml inputs/ else @@ -148,6 +150,7 @@ else ln -sf gcclibs-$GCC_VER-win32-utils.zip gcclibs-win32-utils.zip ln -sf gcc-$GCC_VER-linux32-precise-utils.zip gcc-linux32-precise-utils.zip ln -sf nsis-$NSIS_VER-win32-utils.zip nsis-win32-utils.zip + ln -sf yasm-$YASM_VER-linux32-precise-utils.zip yasm-linux32-precise-utils.zip cd .. fi diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 4facfa5..dc207f5 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -147,7 +147,7 @@ done # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK are not signed at all) -for i in OSXSDK CCTOOLS NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO14 GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN +for i in OSXSDK CCTOOLS NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO14 GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN YASM do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/versions b/gitian/versions index a13cc08..caaa487 100755 --- a/gitian/versions +++ b/gitian/versions @@ -67,6 +67,7 @@ PARSLEY_VER=1.2 GO14_VER=1.4.3 GO_VER=1.7.5 NSIS_VER=2.51 +YASM_VER=1.2.0 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -100,6 +101,7 @@ NOTOJPFONT_PACKAGE=NotoSansJP-Regular.otf NOTOKRFONT_PACKAGE=NotoSansKR-Regular.otf NOTOSCFONT_PACKAGE=NotoSansSC-Regular.otf NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf +YASM_PACKAGE=yasm-${YASM_VER}.tar.gz # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=4a6ee491a2fdb22e519c76fdc2a628bb3cec12762cd456861d207996c8a07088 @@ -127,6 +129,7 @@ NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da NOTOKRFONT_HASH=b21817200abcb37a8ee865befce588d65babd1c35c2c4d32d3cd3f5b4780a7a3 NOTOSCFONT_HASH=8c37936063c7c8ab747a939e13833894f9edc80dd41b98874ca8f3938a33c32f NOTOTCFONT_HASH=e6b82f7d3dab605c428161124ceb5e169cde93de632d800297b167cdd88e7baa +YASM_HASH=768ffab457b90a20a6d895c39749adb547c1b7cb5c108e84b151a838a23ccf31 ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -160,3 +163,4 @@ NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE} NOTOKRFONT_URL=${NOTOCJKBASE_URL}/${NOTOKRFONT_PACKAGE} NOTOSCFONT_URL=${NOTOCJKBASE_URL}/${NOTOSCFONT_PACKAGE} NOTOTCFONT_URL=${NOTOCJKBASE_URL}/${NOTOTCFONT_PACKAGE} +YASM_URL=https://www.tortall.net/projects/yasm/releases/${YASM_PACKAGE} diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 2655f23..0fe1846 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -70,6 +70,7 @@ PARSLEY_VER=1.2 GO14_VER=1.4.3 GO_VER=1.7.5 NSIS_VER=2.51 +YASM_VER=1.2.0 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -103,6 +104,7 @@ NOTOJPFONT_PACKAGE=NotoSansJP-Regular.otf NOTOKRFONT_PACKAGE=NotoSansKR-Regular.otf NOTOSCFONT_PACKAGE=NotoSansSC-Regular.otf NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf +YASM_PACKAGE=yasm-${YASM_VER}.tar.gz # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 @@ -130,6 +132,7 @@ NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da NOTOKRFONT_HASH=b21817200abcb37a8ee865befce588d65babd1c35c2c4d32d3cd3f5b4780a7a3 NOTOSCFONT_HASH=8c37936063c7c8ab747a939e13833894f9edc80dd41b98874ca8f3938a33c32f NOTOTCFONT_HASH=e6b82f7d3dab605c428161124ceb5e169cde93de632d800297b167cdd88e7baa +YASM_HASH=768ffab457b90a20a6d895c39749adb547c1b7cb5c108e84b151a838a23ccf31 ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -163,3 +166,4 @@ NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE} NOTOKRFONT_URL=${NOTOCJKBASE_URL}/${NOTOKRFONT_PACKAGE} NOTOSCFONT_URL=${NOTOCJKBASE_URL}/${NOTOSCFONT_PACKAGE} NOTOTCFONT_URL=${NOTOCJKBASE_URL}/${NOTOTCFONT_PACKAGE} +YASM_URL=https://www.tortall.net/projects/yasm/releases/${YASM_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 4fdc685..c0b68f5 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -77,6 +77,7 @@ PARSLEY_VER=1.2 GO14_VER=1.4.3 GO_VER=1.7.5 NSIS_VER=2.51 +YASM_VER=1.2.0 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -110,6 +111,7 @@ NOTOJPFONT_PACKAGE=NotoSansJP-Regular.otf NOTOKRFONT_PACKAGE=NotoSansKR-Regular.otf NOTOSCFONT_PACKAGE=NotoSansSC-Regular.otf NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf +YASM_PACKAGE=yasm-${YASM_VER}.tar.gz # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 @@ -137,6 +139,7 @@ NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da NOTOKRFONT_HASH=b21817200abcb37a8ee865befce588d65babd1c35c2c4d32d3cd3f5b4780a7a3 NOTOSCFONT_HASH=8c37936063c7c8ab747a939e13833894f9edc80dd41b98874ca8f3938a33c32f NOTOTCFONT_HASH=e6b82f7d3dab605c428161124ceb5e169cde93de632d800297b167cdd88e7baa +YASM_HASH=768ffab457b90a20a6d895c39749adb547c1b7cb5c108e84b151a838a23ccf31 ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -170,3 +173,4 @@ NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE} NOTOKRFONT_URL=${NOTOCJKBASE_URL}/${NOTOKRFONT_PACKAGE} NOTOSCFONT_URL=${NOTOCJKBASE_URL}/${NOTOSCFONT_PACKAGE} NOTOTCFONT_URL=${NOTOCJKBASE_URL}/${NOTOTCFONT_PACKAGE} +YASM_URL=https://www.tortall.net/projects/yasm/releases/${YASM_PACKAGE}

1 0

[tor-browser-bundle/master] Include changelog from 6.5.1 and 7.0a2-hardened
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit 67c826ad4fefaac0ee6f1bbc8784528d91b16e7c Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 5 11:30:40 2017 +0000 Include changelog from 6.5.1 and 7.0a2-hardened --- Bundle-Data/Docs/ChangeLog.txt | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 43e771f..58dc3d1 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,23 @@ +Tor Browser 7.0a2-hardened -- March 7 2017 + * All Platforms + * Update Firefox to 45.8.0esr + * Tor to 0.3.0.4-rc + * OpenSSL to 1.0.2k + * Update Torbutton to 1.9.7.1 + * Bug 21396: Allow leaking of resource/chrome URIs (off by default) + * Bug 21574: Add link for zh manual and create manual links dynamically + * Bug 21330: Non-usable scrollbar appears in tor browser security settings + * Bug 21324: Don't update NoScript button with timer update + * Translation updates + * Update HTTPS-Everywhere to 5.2.11 + * Bug 21514: Restore W^X JIT implementation removed from ESR45 + * Bug 21536: Remove scramblesuit bridge + * Bug 21342: Move meek-azure to the meek.azureedge.net backend and cymrubridge02 bridge + * Bug 21326: Update the "Using a system-installed Tor" section in start script + * Build system + * Bug 17034: Use our built binutils and GCC for building tor + * Code clean-up + Tor Browser 7.0a2 -- March 7 2017 * All Platforms * Update Firefox to 45.8.0esr @@ -23,6 +43,23 @@ Tor Browser 7.0a2 -- March 7 2017 * Bug 17034: Use our built binutils and GCC for building tor * Clean-up +Tor Browser 6.5.1 -- March 7 2017 + * All Platforms + * Update Firefox to 45.8.0esr + * Tor to 0.2.9.10 + * OpenSSL to 1.0.2k + * Update Torbutton to 1.9.6.14 + * Bug 21396: Allow leaking of resource/chrome URIs (off by default) + * Bug 21574: Add link for zh manual and create manual links dynamically + * Bug 21330: Non-usable scrollbar appears in tor browser security settings + * Translation updates + * Update HTTPS-Everywhere to 5.2.11 + * Bug 21514: Restore W^X JIT implementation removed from ESR45 + * Bug 21536: Remove scramblesuit bridge + * Bug 21342: Move meek-azure to the meek.azureedge.net backend and cymrubridge02 bridge + * Linux + * Bug 21326: Update the "Using a system-installed Tor" section in start script + Tor Browser 7.0a1-hardened -- January 25 2017 * All Platforms * Update Firefox to 45.7.0esr

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] Backport of tjr's patch for bug 1314979
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit b63cc0d449954e51a72721f34e3628e75daba59a Author: Georg Koppen <gk(a)torproject.org> Date: Wed Feb 1 19:25:39 2017 +0000 Backport of tjr's patch for bug 1314979 --- build/moz.configure/toolchain.configure | 6 +++++- moz.configure | 6 ++++-- old-configure.in | 12 +++++++++++- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure index 8b24161..288bf48 100644 --- a/build/moz.configure/toolchain.configure +++ b/build/moz.configure/toolchain.configure @@ -906,5 +906,9 @@ set_define('HAVE_VISIBILITY_ATTRIBUTE', set_config('WRAP_SYSTEM_INCLUDES', wrap_system_includes) set_config('VISIBILITY_FLAGS', visibility_flags) -include('windows.configure') +@depends(target, c_compiler) +def is_windows(target, compiler): + return target.kernel == 'WINNT' and compiler.type in ['msvc', 'clang-cl'] + +include('windows.configure', when=is_windows) include('rust.configure') diff --git a/moz.configure b/moz.configure index ec90697..8457d48 100644 --- a/moz.configure +++ b/moz.configure @@ -278,11 +278,13 @@ system_hunspell = pkg_check_modules('MOZ_HUNSPELL', 'hunspell', set_config('MOZ_SYSTEM_HUNSPELL', depends_if(system_hunspell)(lambda _: True)) -@depends(target) +@depends(target, c_compiler) @imports('os') -def makensis_progs(target): +def makensis_progs(target, compiler): if target.kernel != 'WINNT': return + elif target.kernel == 'WINNT' and compiler.type not in ['msvc', 'clang-cl']: + return candidates = [ 'makensis-3.0b3.exe', diff --git a/old-configure.in b/old-configure.in index 11a7d58..abf8323 100644 --- a/old-configure.in +++ b/old-configure.in @@ -3384,7 +3384,17 @@ if test -n "$MOZ_ANGLE_RENDERER"; then AC_MSG_RESULT([Windows SDK not found.]) fi else - AC_MSG_ERROR([Couldn't find Windows SDK 8.1 or higher needed for ANGLE.]) + if test "$target" != "$host"; then + case "$target" in + *-mingw*) + AC_MSG_RESULT([Windows SDK not needed for ANGLE in MinGW build.]) + ;; + *) + AC_MSG_ERROR([Couldn't find Windows SDK 8.1 or higher needed for ANGLE.]) + esac + else + AC_MSG_ERROR([Couldn't find Windows SDK 8.1 or higher needed for ANGLE.]) + fi fi if test -z "$MOZ_D3DCOMPILER_VISTA_DLL_PATH"; then

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] fixup! TB3: Tor Browser's official .mozconfigs.
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit 70fd0587c18f111fbae0e64b03ca7a273e5c0e94 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Mar 30 09:18:53 2017 +0000 fixup! TB3: Tor Browser's official .mozconfigs. --- .mozconfig-mingw | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.mozconfig-mingw b/.mozconfig-mingw index 74f5db8..de86c49b 100644 --- a/.mozconfig-mingw +++ b/.mozconfig-mingw @@ -2,6 +2,7 @@ CROSS_COMPILE=1 ac_add_options --enable-application=browser ac_add_options --target=i686-w64-mingw32 +ac_add_options --with-toolchain-prefix=i686-w64-mingw32- ac_add_options --enable-default-toolkit=cairo-windows mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-mingw mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" @@ -26,5 +27,3 @@ ac_add_options --disable-crashreporter ac_add_options --disable-maintenance-service ac_add_options --disable-webrtc ac_add_options --disable-tests - -#ac_add_options --disable-ctypes

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] Backport of tjr's patch for bug 1331349
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit d4b359c42ae2dbd3ab6406cdf99db796602aaedf Author: Georg Koppen <gk(a)torproject.org> Date: Wed Feb 1 11:52:36 2017 +0000 Backport of tjr's patch for bug 1331349 --- js/src/gc/Memory.cpp | 6 +++--- mfbt/Attributes.h | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/js/src/gc/Memory.cpp b/js/src/gc/Memory.cpp index 00f3c23..981ecc0 100644 --- a/js/src/gc/Memory.cpp +++ b/js/src/gc/Memory.cpp @@ -854,7 +854,7 @@ ProtectPages(void* p, size_t size) DWORD oldProtect; if (!VirtualProtect(p, size, PAGE_NOACCESS, &oldProtect)) { snprintf(sCrashReason, sizeof(sCrashReason), - "MOZ_CRASH(VirtualProtect(PAGE_NOACCESS) failed! Error code: %u)", GetLastError()); + "MOZ_CRASH(VirtualProtect(PAGE_NOACCESS) failed! Error code: %lu)", GetLastError()); MOZ_CRASH_ANNOTATE(sCrashReason); MOZ_REALLY_CRASH(); } @@ -875,7 +875,7 @@ MakePagesReadOnly(void* p, size_t size) DWORD oldProtect; if (!VirtualProtect(p, size, PAGE_READONLY, &oldProtect)) { snprintf(sCrashReason, sizeof(sCrashReason), - "MOZ_CRASH(VirtualProtect(PAGE_READONLY) failed! Error code: %u)", GetLastError()); + "MOZ_CRASH(VirtualProtect(PAGE_READONLY) failed! Error code: %lu)", GetLastError()); MOZ_CRASH_ANNOTATE(sCrashReason); MOZ_REALLY_CRASH(); } @@ -896,7 +896,7 @@ UnprotectPages(void* p, size_t size) DWORD oldProtect; if (!VirtualProtect(p, size, PAGE_READWRITE, &oldProtect)) { snprintf(sCrashReason, sizeof(sCrashReason), - "MOZ_CRASH(VirtualProtect(PAGE_READWRITE) failed! Error code: %u)", GetLastError()); + "MOZ_CRASH(VirtualProtect(PAGE_READWRITE) failed! Error code: %lu)", GetLastError()); MOZ_CRASH_ANNOTATE(sCrashReason); MOZ_REALLY_CRASH(); } diff --git a/mfbt/Attributes.h b/mfbt/Attributes.h index df6172f..bcd393c 100644 --- a/mfbt/Attributes.h +++ b/mfbt/Attributes.h @@ -594,7 +594,10 @@ * PR_snprintf and friends, which are "printf-like" but which assign * different meanings to the various formats. */ -#ifdef __GNUC__ +#ifdef __MINGW__ +#define MOZ_FORMAT_PRINTF(stringIndex, firstToCheck) \ + __attribute__ ((format (ms_printf, stringIndex, firstToCheck))) +#elseif __GNUC__ #define MOZ_FORMAT_PRINTF(stringIndex, firstToCheck) \ __attribute__ ((format (printf, stringIndex, firstToCheck))) #else

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] Fix SSE2 compilation for mingw-w64
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit 01f545c45a48f7805637b6eb0db26589dc079a96 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Mar 30 09:22:37 2017 +0000 Fix SSE2 compilation for mingw-w64 This is tjr's workaround for bug 1331335. --- gfx/angle/src/libANGLE/moz.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gfx/angle/src/libANGLE/moz.build b/gfx/angle/src/libANGLE/moz.build index 605f30d..d05c77c 100755 --- a/gfx/angle/src/libANGLE/moz.build +++ b/gfx/angle/src/libANGLE/moz.build @@ -112,7 +112,6 @@ UNIFIED_SOURCES += [ '../compiler/translator/VersionGLSL.cpp', '../image_util/copyimage.cpp', '../image_util/imageformats.cpp', - '../image_util/loadimage.cpp', '../image_util/loadimage_etc.cpp', '../third_party/compiler/ArrayBoundsClamper.cpp', '../third_party/murmurhash/MurmurHash3.cpp', @@ -290,10 +289,12 @@ SOURCES += [ '../compiler/translator/glslang_tab.cpp', '../compiler/translator/RewriteTexelFetchOffset.cpp', '../compiler/translator/ShaderLang.cpp', + '../image_util/loadimage.cpp', 'Display.cpp', 'renderer/d3d/DisplayD3D.cpp', 'renderer/d3d/HLSLCompiler.cpp', ] +SOURCES['../image_util/loadimage.cpp'].flags += CONFIG['SSE2_FLAGS'] if CONFIG['MOZ_HAS_WINSDK_WITH_D3D']: UNIFIED_SOURCES += [ 'renderer/d3d/d3d11/Blit11.cpp',

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] Getting Tor Browser to build with accessibility enabled on Windows
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit 1be3aec99fc7731563715dcfc7724fcd7ca4a6fb Author: Georg Koppen <gk(a)torproject.org> Date: Fri Feb 10 11:05:34 2017 +0000 Getting Tor Browser to build with accessibility enabled on Windows Patch by Jacek Caban --- ipc/mscom/Interceptor.h | 2 +- other-licenses/ia2/IA2TypeLibrary.idl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ipc/mscom/Interceptor.h b/ipc/mscom/Interceptor.h index ecddbdd..88acdf6 100644 --- a/ipc/mscom/Interceptor.h +++ b/ipc/mscom/Interceptor.h @@ -112,7 +112,7 @@ CreateInterceptor(STAUniquePtr<InterfaceT> aTargetInterface, return E_INVALIDARG; } - REFIID iidTarget = __uuidof(aTargetInterface); + REFIID iidTarget = __uuidof(InterfaceT); STAUniquePtr<IUnknown> targetUnknown(aTargetInterface.release()); return Interceptor::Create(Move(targetUnknown), aEventSink, iidTarget, diff --git a/other-licenses/ia2/IA2TypeLibrary.idl b/other-licenses/ia2/IA2TypeLibrary.idl index 2519aca..97aa08b 100644 --- a/other-licenses/ia2/IA2TypeLibrary.idl +++ b/other-licenses/ia2/IA2TypeLibrary.idl @@ -68,7 +68,7 @@ cpp_quote("") library IAccessible2Lib { importlib ("stdole2.tlb"); - importlib ("oleacc.dll"); + //importlib ("oleacc.dll"); interface IAccessible2; interface IAccessible2_2; interface IAccessible2_3;

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] squash! TB3: Tor Browser's official .mozconfigs.
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit b9d5e7c1a8ec3455857e2752d021b85dcc187ea9 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Mar 14 08:42:49 2017 +0000 squash! TB3: Tor Browser's official .mozconfigs. Bug 21239: Use GTK2 for ESR52 Linux builds --- .mozconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.mozconfig b/.mozconfig index 7b25244..cde5b49 100755 --- a/.mozconfig +++ b/.mozconfig @@ -9,6 +9,9 @@ ac_add_options --enable-optimize #ac_add_options --disable-optimize ac_add_options --enable-official-branding +# Let's support GTK2 for ESR52 +ac_add_options --enable-default-toolkit=cairo-gtk2 + ac_add_options --enable-tor-browser-update ac_add_options --enable-signmar ac_add_options --enable-verify-mar @@ -21,7 +24,6 @@ ac_add_options --disable-maintenance-service ac_add_options --disable-crashreporter ac_add_options --disable-webrtc # Let's not compile EME at least until we can enable ClearKey and only Clearkey. -# (Apart from that there is no Adobe CRM module for Linux right now) ac_add_options --disable-eme #ac_add_options --disable-ctypes ac_add_options --enable-jemalloc=4

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] Bug 1336527 Define RegisterIdlePeriod r=baku
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit a6a430bf6393f51a778b8dfe19103ae708bfcc5c Author: Tom Ritter <tom(a)mozilla.com> Date: Fri Feb 17 13:29:12 2017 -0600 Bug 1336527 Define RegisterIdlePeriod r=baku MozReview-Commit-ID: A41UJ6OHvP7 --HG-- extra : rebase_source : 0191c1bbece94bb9dabbf2daf56351a624efa481 --- dom/workers/WorkerThread.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dom/workers/WorkerThread.h b/dom/workers/WorkerThread.h index d1df133..f128702 100644 --- a/dom/workers/WorkerThread.h +++ b/dom/workers/WorkerThread.h @@ -77,6 +77,14 @@ public: uint32_t RecursionDepth(const WorkerThreadFriendKey& aKey) const; + // Required for MinGW build #1336527 to handle compiler bug: + // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79582 + NS_IMETHOD + RegisterIdlePeriod(already_AddRefed<nsIIdlePeriod> aIdlePeriod) override + { + return nsThread::RegisterIdlePeriod(already_AddRefed<nsIIdlePeriod>(aIdlePeriod.take())); + } + NS_DECL_ISUPPORTS_INHERITED private:

1 0

[tor-browser-bundle/master] Bug 21723: Fix inconsistent generation of MOZ_MACBUNDLE_ID
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit 50b6e6fff4a535044f9b506854535df757125267 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Mar 14 12:10:08 2017 -0400 Bug 21723: Fix inconsistent generation of MOZ_MACBUNDLE_ID Use org.torproject as the MOZ_DISTRIBUTION_ID. This results in a bundle ID of org.torproject.torbrowser. --- gitian/descriptors/linux/gitian-firefox.yml | 2 +- gitian/descriptors/mac/gitian-firefox.yml | 2 +- gitian/descriptors/windows/gitian-firefox.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 6f3d3ad..4a756b8 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -96,7 +96,7 @@ script: | find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure - make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" + make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --with-distribution-id=org.torproject --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" make $MAKEOPTS -f client.mk build make -C obj-* package INNER_MAKE_PACKAGE=true diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index 6355485..efa7acf 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -69,7 +69,7 @@ script: | find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure - make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" + make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --with-distribution-id=org.torproject --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" make $MAKEOPTS -f client.mk build # diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index ef956fc..fabc40d 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -77,7 +77,7 @@ script: | find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure - make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" + make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --with-distribution-id=org.torproject --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # mkdir -p ~/build/bin/

1 0

[tor-browser-bundle/hardened-builds] Bug 21723: Fix inconsistent generation of MOZ_MACBUNDLE_ID
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit 84f386e0783e1972db72b94df755766a5eb6e9ce Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Mar 14 12:10:08 2017 -0400 Bug 21723: Fix inconsistent generation of MOZ_MACBUNDLE_ID Use org.torproject as the MOZ_DISTRIBUTION_ID. This results in an bundle ID of org.torproject.torbrowser. --- gitian/descriptors/linux/gitian-firefox.yml | 2 +- gitian/descriptors/mac/gitian-firefox.yml | 2 +- gitian/descriptors/windows/gitian-firefox.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 002005f..8d38b3a 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -96,7 +96,7 @@ script: | # Self-Rando wrapper export PATH="$HOME/build/selfrando/Tools/TorBrowser/tc-wrapper/:$PATH" export SELFRANDO_skip_shuffle= - make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" + make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --with-distribution-id=org.torproject --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # Without disabling LSan our build is blowing up: # https://bugs.torproject.org/10599#comment:52 diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index 49b659a..417c7e6 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -69,7 +69,7 @@ script: | find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure - make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" + make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --with-distribution-id=org.torproject --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" make $MAKEOPTS -f client.mk build # diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index 8b68925..2825569 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -77,7 +77,7 @@ script: | find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure - make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" + make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --with-distribution-id=org.torproject --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # mkdir -p ~/build/bin/

1 0

[tor-browser-bundle/hardened-builds] Bug 21833 Update libvirt check for 16.10
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit 676200bdfeb1c8550082c16639ac952ff514db9c Author: Tom Ritter <tom(a)ritter.vg> Date: Wed Mar 29 11:42:41 2017 -0500 Bug 21833 Update libvirt check for 16.10 --- gitian/check-prerequisites.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh index 530e160..d6e79fd 100755 --- a/gitian/check-prerequisites.sh +++ b/gitian/check-prerequisites.sh @@ -15,6 +15,7 @@ DISTRO=`cat /etc/issue | grep -Eo 'Ubuntu|Debian*'` if [ $DISTRO = "Ubuntu" ]; then VERSION=`cat /etc/issue | grep -Eo '[0-9]{2}' | head -1` + FULL_VERSION=`cat /etc/issue | grep -Eo '[0-9.]+' | head -1` if [ "$VERSION" -ge "14" ]; then dpkg -s ruby apache2 git apt-cacher-ng qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion debian-archive-keyring curl pkg-config libgtk2.0-dev libglib2.0-dev torsocks tor 2>/dev/null >/dev/null @@ -124,7 +125,15 @@ then then libvirt_group=libvirt else - libvirt_group=libvirtd + if [ "$FULL_VERSION" = "16.10" ]; + then + libvirt_group=libvirt + elif [ "$VERSION" -gt "16" ]; + then + libvirt_group=libvirt + else + libvirt_group=libvirtd + fi fi groups | grep $libvirt_group > /dev/null if [ $? -ne 0 ];

1 0

[tor-browser-bundle/maint-6.5] Bug 21833 Update libvirt check for 16.10
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit 667a61b60c9caf3feb1d96d4c19b4a3d7f2d6ca5 Author: Tom Ritter <tom(a)ritter.vg> Date: Wed Mar 29 11:42:41 2017 -0500 Bug 21833 Update libvirt check for 16.10 --- gitian/check-prerequisites.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh index 858fd4d..711698d 100755 --- a/gitian/check-prerequisites.sh +++ b/gitian/check-prerequisites.sh @@ -15,6 +15,7 @@ DISTRO=`cat /etc/issue | grep -Eo 'Ubuntu|Debian*'` if [ $DISTRO = "Ubuntu" ]; then VERSION=`cat /etc/issue | grep -Eo '[0-9]{2}' | head -1` + FULL_VERSION=`cat /etc/issue | grep -Eo '[0-9.]+' | head -1` if [ "$VERSION" -ge "14" ]; then dpkg -s ruby apache2 git apt-cacher-ng qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion debian-archive-keyring torsocks tor 2>/dev/null >/dev/null @@ -124,7 +125,15 @@ then then libvirt_group=libvirt else - libvirt_group=libvirtd + if [ "$FULL_VERSION" = "16.10" ]; + then + libvirt_group=libvirt + elif [ "$VERSION" -gt "16" ]; + then + libvirt_group=libvirt + else + libvirt_group=libvirtd + fi fi groups | grep $libvirt_group > /dev/null if [ $? -ne 0 ];

1 0

[tor-browser-bundle/master] Bug 21833 Update libvirt check for 16.10
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit c95c5d1b57685c2eff102f809ec2cf9c865a6215 Author: Tom Ritter <tom(a)ritter.vg> Date: Wed Mar 29 11:42:41 2017 -0500 Bug 21833 Update libvirt check for 16.10 --- gitian/check-prerequisites.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh index 530e160..d6e79fd 100755 --- a/gitian/check-prerequisites.sh +++ b/gitian/check-prerequisites.sh @@ -15,6 +15,7 @@ DISTRO=`cat /etc/issue | grep -Eo 'Ubuntu|Debian*'` if [ $DISTRO = "Ubuntu" ]; then VERSION=`cat /etc/issue | grep -Eo '[0-9]{2}' | head -1` + FULL_VERSION=`cat /etc/issue | grep -Eo '[0-9.]+' | head -1` if [ "$VERSION" -ge "14" ]; then dpkg -s ruby apache2 git apt-cacher-ng qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion debian-archive-keyring curl pkg-config libgtk2.0-dev libglib2.0-dev torsocks tor 2>/dev/null >/dev/null @@ -124,7 +125,15 @@ then then libvirt_group=libvirt else - libvirt_group=libvirtd + if [ "$FULL_VERSION" = "16.10" ]; + then + libvirt_group=libvirt + elif [ "$VERSION" -gt "16" ]; + then + libvirt_group=libvirt + else + libvirt_group=libvirtd + fi fi groups | grep $libvirt_group > /dev/null if [ $? -ne 0 ];

1 0

[tor-browser-bundle/hardened-builds] Bug 21709: Upgrade Go to 1.7.5.
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit b26f04ec07d3de68cc1db8d71935e208415b08fa Author: David Fifield <david(a)bamsoftware.com> Date: Sat Mar 11 11:18:03 2017 -0800 Bug 21709: Upgrade Go to 1.7.5. --- gitian/versions | 4 ++-- gitian/versions.alpha | 4 ++-- gitian/versions.beta | 4 ++-- gitian/versions.nightly | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gitian/versions b/gitian/versions index a1f8bff..cfcbb61 100755 --- a/gitian/versions +++ b/gitian/versions @@ -67,7 +67,7 @@ SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 # We need a Go 1.4 to bootstrap later versions; see https://golang.org/doc/install/source#go14 GO14_VER=1.4.3 -GO_VER=1.7.4 +GO_VER=1.7.5 NSIS_VER=2.51 ## File names for the source packages @@ -121,7 +121,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 -GO_HASH=4c189111e9ba651a2bb3ee868aa881fab36b2f2da3409e80885ca758a6b614cc +GO_HASH=4e834513a2079f8cbbd357502cccaac9507fd00a1efe672375798858ff291815 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 145c9f9..8ea22e0 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -73,7 +73,7 @@ SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 # We need a Go 1.4 to bootstrap later versions; see https://golang.org/doc/install/source#go14 GO14_VER=1.4.3 -GO_VER=1.7.4 +GO_VER=1.7.5 NSIS_VER=2.51 ELFUTILS_VER=0.160 @@ -127,7 +127,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 -GO_HASH=4c189111e9ba651a2bb3ee868aa881fab36b2f2da3409e80885ca758a6b614cc +GO_HASH=4e834513a2079f8cbbd357502cccaac9507fd00a1efe672375798858ff291815 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a GCC_HASH=608df76dec2d34de6558249d8af4cbee21eceddbcb580d666f7a5a583ca3303a diff --git a/gitian/versions.beta b/gitian/versions.beta index 65b6546..ec3fcb7 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -56,7 +56,7 @@ SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 # We need a Go 1.4 to bootstrap later versions; see https://golang.org/doc/install/source#go14 GO14_VER=1.4.3 -GO_VER=1.7.4 +GO_VER=1.7.5 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -107,7 +107,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 -GO_HASH=4c189111e9ba651a2bb3ee868aa881fab36b2f2da3409e80885ca758a6b614cc +GO_HASH=4e834513a2079f8cbbd357502cccaac9507fd00a1efe672375798858ff291815 STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 5fde922..59bc494 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -76,7 +76,7 @@ SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 # We need a Go 1.4 to bootstrap later versions; see https://golang.org/doc/install/source#go14 GO14_VER=1.4.3 -GO_VER=1.7.4 +GO_VER=1.7.5 NSIS_VER=2.51 ELFUTILS_VER=0.160 @@ -130,7 +130,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 -GO_HASH=4c189111e9ba651a2bb3ee868aa881fab36b2f2da3409e80885ca758a6b614cc +GO_HASH=4e834513a2079f8cbbd357502cccaac9507fd00a1efe672375798858ff291815 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a GCC_HASH=608df76dec2d34de6558249d8af4cbee21eceddbcb580d666f7a5a583ca3303a

1 0

[tor-browser-bundle/master] Bug 21709: Upgrade Go to 1.7.5.
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit 1942f7b2f6e5f82c64dcfeab82713604866cb26f Author: David Fifield <david(a)bamsoftware.com> Date: Sat Mar 11 11:18:03 2017 -0800 Bug 21709: Upgrade Go to 1.7.5. --- gitian/versions | 4 ++-- gitian/versions.alpha | 4 ++-- gitian/versions.beta | 4 ++-- gitian/versions.nightly | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gitian/versions b/gitian/versions index cf07564..a13cc08 100755 --- a/gitian/versions +++ b/gitian/versions @@ -65,7 +65,7 @@ SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 # We need a Go 1.4 to bootstrap later versions; see https://golang.org/doc/install/source#go14 GO14_VER=1.4.3 -GO_VER=1.7.4 +GO_VER=1.7.5 NSIS_VER=2.51 ## File names for the source packages @@ -117,7 +117,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 -GO_HASH=4c189111e9ba651a2bb3ee868aa881fab36b2f2da3409e80885ca758a6b614cc +GO_HASH=4e834513a2079f8cbbd357502cccaac9507fd00a1efe672375798858ff291815 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad diff --git a/gitian/versions.alpha b/gitian/versions.alpha index b677fd1..2655f23 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -68,7 +68,7 @@ SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 # We need a Go 1.4 to bootstrap later versions; see https://golang.org/doc/install/source#go14 GO14_VER=1.4.3 -GO_VER=1.7.4 +GO_VER=1.7.5 NSIS_VER=2.51 ## File names for the source packages @@ -120,7 +120,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 -GO_HASH=4c189111e9ba651a2bb3ee868aa881fab36b2f2da3409e80885ca758a6b614cc +GO_HASH=4e834513a2079f8cbbd357502cccaac9507fd00a1efe672375798858ff291815 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad diff --git a/gitian/versions.beta b/gitian/versions.beta index e962c20..ed7c124 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -54,7 +54,7 @@ SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 # We need a Go 1.4 to bootstrap later versions; see https://golang.org/doc/install/source#go14 GO14_VER=1.4.3 -GO_VER=1.7.4 +GO_VER=1.7.5 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -99,7 +99,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 -GO_HASH=4c189111e9ba651a2bb3ee868aa881fab36b2f2da3409e80885ca758a6b614cc +GO_HASH=4e834513a2079f8cbbd357502cccaac9507fd00a1efe672375798858ff291815 STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 7a57980..4fdc685 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -75,7 +75,7 @@ SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 # We need a Go 1.4 to bootstrap later versions; see https://golang.org/doc/install/source#go14 GO14_VER=1.4.3 -GO_VER=1.7.4 +GO_VER=1.7.5 NSIS_VER=2.51 ## File names for the source packages @@ -127,7 +127,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 -GO_HASH=4c189111e9ba651a2bb3ee868aa881fab36b2f2da3409e80885ca758a6b614cc +GO_HASH=4e834513a2079f8cbbd357502cccaac9507fd00a1efe672375798858ff291815 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad

1 0

[tor-browser-bundle/master] Bug 19783: Remove unused macOS helper scripts
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit d744cac29e8df0efaf1a6bb3a626be90e930c118 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Mar 17 14:44:45 2017 +0000 Bug 19783: Remove unused macOS helper scripts After remmoving the last remnants of our old GCC based macOS toolchain in bug 10369 and bug 21753 we can now safely remove the helper scripts used for it as well. May they rest in peace. --- gitian/build-helpers/i686-apple-darwin11-g++ | 2 -- gitian/build-helpers/i686-apple-darwin11-gcc | 2 -- gitian/build-helpers/i686-apple-darwin11-ld | 2 -- 3 files changed, 6 deletions(-) diff --git a/gitian/build-helpers/i686-apple-darwin11-g++ b/gitian/build-helpers/i686-apple-darwin11-g++ deleted file mode 100755 index 90c794a..0000000 --- a/gitian/build-helpers/i686-apple-darwin11-g++ +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -/usr/apple-osx/bin/apple-osx-g++ -isysroot /usr/lib/apple/SDKs/MacOSX10.6.sdk/ -mmacosx-version-min=10.6 -DMAXOSX_DEPLOYEMENT_TARGET=10.6 "$@" diff --git a/gitian/build-helpers/i686-apple-darwin11-gcc b/gitian/build-helpers/i686-apple-darwin11-gcc deleted file mode 100755 index ba6f6bf..0000000 --- a/gitian/build-helpers/i686-apple-darwin11-gcc +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -/usr/apple-osx/bin/apple-osx-gcc -isysroot /usr/lib/apple/SDKs/MacOSX10.6.sdk/ -mmacosx-version-min=10.6 -DMAXOSX_DEPLOYEMENT_TARGET=10.6 "$@" diff --git a/gitian/build-helpers/i686-apple-darwin11-ld b/gitian/build-helpers/i686-apple-darwin11-ld deleted file mode 100755 index 05e5f89..0000000 --- a/gitian/build-helpers/i686-apple-darwin11-ld +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -/usr/apple-osx/bin/i686-apple-darwin11-ld -syslibroot /usr/lib/apple/SDKs/MacOSX10.6.sdk/ -macosx_version_min 10.6 "$@"

1 0

[tor-browser-bundle/master] Bug 21753: Replace our old GCC toolchain in PT descriptor
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit 2fe7170ac1f07b051fa69183b7dc852a62d4f9be Author: Georg Koppen <gk(a)torproject.org> Date: Thu Mar 16 18:05:06 2017 +0000 Bug 21753: Replace our old GCC toolchain in PT descriptor The GCC toolchain is pretty old and it is risky relying on it. We replace it with our clang/cctools-based one which is already used almost everywhere when cross-compiling for macOS. --- .../mac/gitian-pluggable-transports.yml | 27 +++++++++++++--------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index 5f47b47..c6846cc 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -4,7 +4,7 @@ distro: "debian" suites: - "wheezy" architectures: -- "i386" +- "amd64" packages: - "unzip" - "zip" @@ -28,8 +28,9 @@ files: - "versions" - "go14.tar.gz" - "go.tar.gz" +- "clang-linux64-wheezy-utils.zip" +- "cctools.tar.gz" - "MacOSX10.7.sdk.tar.gz" -- "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" - "dzip.sh" script: | INSTDIR="$HOME/install" @@ -44,7 +45,6 @@ script: | DOCSDIR="$TBDIR/TorBrowser/Docs" TORBINDIR="$TBDIR/TorBrowser/Tor" fi - export LIBRARY_PATH="$INSTDIR/lib" export REFERENCE_DATETIME export TZ=UTC export LC_ALL=C @@ -53,14 +53,19 @@ script: | mkdir -p $PTDIR/ mkdir -p $OUTDIR/ # - tar xaf multiarch-darwin*tar.xz + tar xaf cctools.tar.gz + unzip clang-linux64-wheezy-utils.zip # The 10.7 SDK is needed for Go: https://bugs.torproject.org/20023#comment:6 tar xaf MacOSX10.7.sdk.tar.gz - export PATH="$PATH:$HOME/build/apple-osx/bin/" - # - export AR=$HOME/build/apple-osx/bin/i686-apple-darwin11-ar - export CC=$HOME/build/apple-osx/bin/i686-apple-darwin11-gcc - export CXX=$HOME/build/apple-osx/bin/i686-apple-darwin11-g++ + # Preparing clang for cross-compilation, setting the proper flags and + # variables + # ld needs libLTO.so from llvm + export LD_LIBRARY_PATH="$HOME/build/clang/lib" + export PATH="$HOME/build/cctools/bin:$PATH" + CROSS_CCTOOLS_PATH="$HOME/build/cctools" + CROSS_SYSROOT="$HOME/build/MacOSX10.7.sdk" + FLAGS="-target x86_64-apple-darwin10 -mlinker-version=136 -B $CROSS_CCTOOLS_PATH/bin -isysroot $CROSS_SYSROOT" + export CC="$HOME/build/clang/bin/clang $FLAGS" # Building go 1.4.x # This is needed to bootstrap the go that we actually use @@ -80,12 +85,12 @@ script: | # https://github.com/golang/go/issues/15457 CC_FOR_TARGET="$(pwd)/cc-for-target" echo "#!/bin/sh" > "$CC_FOR_TARGET" - echo "exec $CC $CFLAGS $LDFLAGS -isysroot $HOME/build/MacOSX10.7.sdk -std=gnu99 \"\$@\"" >> "$CC_FOR_TARGET" + echo "exec $CC $CFLAGS $LDFLAGS \"\$@\"" >> "$CC_FOR_TARGET" chmod +x "$CC_FOR_TARGET" # http://golang.org/doc/install/source#environment export GOPATH="$HOME/go" export GOOS=darwin - export GOARCH=386 + export GOARCH=amd64 tar xvf go.tar.gz cd go/src # Remove a preprocessor directive that causes problems when building with the 10.7 SDK.

1 0

[tor-browser-bundle/master] Bug 10369: Don't use old GCC toolchain anymore for utils
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit e32cc7890a13d1707e9f3109fd8e888ac8623537 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Mar 16 14:39:40 2017 +0000 Bug 10369: Don't use old GCC toolchain anymore for utils We start using clang as the cross-compiler as we already do in the tor and Firefox descriptor. This should give us better code and should make the build more robust. --- gitian/descriptors/mac/gitian-utils.yml | 145 ++++++++++++++++---------------- 1 file changed, 73 insertions(+), 72 deletions(-) diff --git a/gitian/descriptors/mac/gitian-utils.yml b/gitian/descriptors/mac/gitian-utils.yml index 55d6c7f..0025e43 100644 --- a/gitian/descriptors/mac/gitian-utils.yml +++ b/gitian/descriptors/mac/gitian-utils.yml @@ -4,7 +4,6 @@ distro: "debian" suites: - "wheezy" architectures: -- "i386" - "amd64" packages: - "faketime" @@ -25,8 +24,8 @@ remotes: "dir": "cmake" files: - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" -- "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" - "openssl.tar.gz" +- "cctools.tar.gz" - "versions" - "dzip.sh" - "libfaketime.patch" @@ -37,78 +36,80 @@ script: | export LC_ALL=C umask 0022 - if [ $GBUILD_BITS == "64" ]; - then - # Cmake first - cd cmake - ./bootstrap --prefix=$INSTDIR/cmake - make $MAKEOPTS - make install - export PATH=$PATH:$INSTDIR/cmake/bin - # Clang - cd ../llvm - mv ../clang tools/ - export LLVM_HOME=`pwd` - mkdir build - cd build - cmake .. -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$INSTDIR/clang -DCMAKE_BUILD_TYPE:STRING=Release $LLVM_HOME - make $MAKEOPTS - make install - cd $INSTDIR - ~/build/dzip.sh clang-$CLANG_VER-linux64-wheezy-utils.zip clang - cp *utils.zip $OUTDIR/ - else - # Building libfaketime. - cd faketime - export GIT_COMMITTER_NAME="nobody" - export GIT_COMMITTER_EMAIL="nobody@localhost" - export GIT_COMMITTER_DATE="$REFERENCE_DATETIME" - git am ~/build/libfaketime.patch - make - DESTDIR="$INSTDIR/faketime" make install - export FAKETIME_SKIP_CMDS="make" - export FAKETIME=$REFERENCE_DATETIME - cd .. + # Cmake first + cd cmake + ./bootstrap --prefix=$INSTDIR/cmake + make $MAKEOPTS + make install + export PATH=$PATH:$INSTDIR/cmake/bin - # dpkg requires sbin directories in the PATH - export PATH="/usr/sbin:/sbin:$PATH" - sudo dpkg -i *.deb - tar xaf multiarch-darwin*tar.xz - export PATH="$PATH:$HOME/build/apple-osx/bin/" - # For OpenSSL - ln -s ~/build/apple-osx/bin/apple-osx-gcc ~/build/apple-osx/bin/i686-apple-darwin11-cc + # Clang + cd ../llvm + mv ../clang tools/ + export LLVM_HOME=`pwd` + mkdir build + cd build + cmake .. -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$INSTDIR/clang -DCMAKE_BUILD_TYPE:STRING=Release $LLVM_HOME + make $MAKEOPTS + make install - # XXX Clean up these flags? - export CFLAGS="-m64 -I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" - export CXXFLAGS="-m64 -I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/i686-apple-darwin10/4.2.1 -mmacosx-version-min=10.5" - export LDFLAGS="-L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" + # Building libfaketime. + cd ../../faketime + export GIT_COMMITTER_NAME="nobody" + export GIT_COMMITTER_EMAIL="nobody@localhost" + export GIT_COMMITTER_DATE="$REFERENCE_DATETIME" + git am ~/build/libfaketime.patch + make + DESTDIR="$INSTDIR/faketime" make install + export FAKETIME_SKIP_CMDS="make" + export FAKETIME=$REFERENCE_DATETIME - # Building Libevent - cd libevent - ./autogen.sh - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - ./configure --disable-static --host=i686-apple-darwin11 --prefix=$INSTDIR/libevent - export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" - make $MAKEOPTS - make install - cd .. + cd .. + ar x apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb + tar xaf data.tar.gz + tar xaf cctools.tar.gz - # Building OpenSSL - # We still need libfaketime here it seems, see #19856 for details. - tar xzf openssl.tar.gz - cd openssl-* - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - # TODO: Add enable-ec_nistp_64_gcc_128 for 64bit OS X. - ./Configure --cross-compile-prefix=i686-apple-darwin11- $CFLAGS darwin64-x86_64-cc --prefix=$INSTDIR/openssl enable-ec_nistp_64_gcc_128 - # Using $MAKEOPTS breaks the build. Might be the issue mentioned on - # http://cblfs.cross-lfs.org/index.php/OpenSSL. - make - make install - cd .. + # Preparing clang for cross-compilation, setting the proper flags and + # variables + # ld needs libLTO.so from llvm + export LD_LIBRARY_PATH="$INSTDIR/clang/lib" + export PATH="$HOME/build/cctools/bin:$PATH" + CROSS_CCTOOLS_PATH="$HOME/build/cctools" + CROSS_SYSROOT="$HOME/build/usr/lib/apple/SDKs/MacOSX10.6.sdk" + FLAGS="-target x86_64-apple-darwin10 -mlinker-version=136 -B $CROSS_CCTOOLS_PATH/bin -isysroot $CROSS_SYSROOT" + export CC="$INSTDIR/clang/bin/clang $FLAGS" + export LDFLAGS="-Wl,-syslibroot,$CROSS_SYSROOT -Wl,-dead_strip" - # Grabbing the results - cd $INSTDIR - ~/build/dzip.sh openssl-$OPENSSL_VER-mac64-utils.zip openssl - ~/build/dzip.sh libevent-${LIBEVENT_TAG#release-}-mac64-utils.zip libevent - cp *utils.zip $OUTDIR/ - fi + # Building Libevent + cd libevent + ./autogen.sh + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" + ./configure --disable-static --host=x86_64-apple-darwin10 --prefix=$INSTDIR/libevent + export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" + make $MAKEOPTS + make install + cd .. + + # Building OpenSSL + # XXX: We still need libfaketime here it seems, see #19856 for details. + # XXX: Check whether that's true after switching to clang as cross-compiler. + # Tricking OpenSSL into using our clang as cross-compiler + export CC="cc $FLAGS" + ln -s $INSTDIR/clang/bin/clang x86_64-apple-darwin10-cc + export PATH=$PATH:$HOME/build + tar xzf openssl.tar.gz + cd openssl-* + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" + ./Configure --cross-compile-prefix=x86_64-apple-darwin10- darwin64-x86_64-cc --prefix=$INSTDIR/openssl enable-ec_nistp_64_gcc_128 + # Using $MAKEOPTS breaks the build. Might be the issue mentioned on + # http://cblfs.cross-lfs.org/index.php/OpenSSL. + make + make install + cd .. + + # Grabbing the results + cd $INSTDIR + ~/build/dzip.sh clang-$CLANG_VER-linux64-wheezy-utils.zip clang + ~/build/dzip.sh openssl-$OPENSSL_VER-mac64-utils.zip openssl + ~/build/dzip.sh libevent-${LIBEVENT_TAG#release-}-mac64-utils.zip libevent + cp *utils.zip $OUTDIR/

1 0

[tor-browser-bundle/master] Bug 21754: Remove old GCC toolchain and macOS SDK
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit 11780c5d6d84c860cc9fa389cb08e1bf4680d7de Author: Georg Koppen <gk(a)torproject.org> Date: Mon Mar 20 09:06:02 2017 +0000 Bug 21754: Remove old GCC toolchain and macOS SDK We remove all hints to our old GCC-based toolchain for macOS and switch our descriptors to use the 10.7 SDK as 10.9 is the minimum requirement for Firefox 52 ESR now. We clean up the tor macOS descriptor a bit as well, removing unused environment variables and replacing '/home/debian' with '$HOME' as done in the utils descriptor. --- gitian/descriptors/mac/gitian-tor.yml | 20 ++++++++------------ gitian/descriptors/mac/gitian-utils.yml | 7 +++---- gitian/fetch-inputs.sh | 6 +++--- gitian/verify-tags.sh | 4 ++-- gitian/versions | 6 ------ gitian/versions.alpha | 6 ------ gitian/versions.beta | 8 ++------ gitian/versions.nightly | 6 ------ 8 files changed, 18 insertions(+), 45 deletions(-) diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 946f915..2e1fa3e 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -17,7 +17,7 @@ remotes: files: - "clang-linux64-wheezy-utils.zip" - "cctools.tar.gz" -- "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" +- "MacOSX10.7.sdk.tar.gz" - "versions" - "dzip.sh" - "openssl-mac64-utils.zip" @@ -43,10 +43,8 @@ script: | mkdir -p $TORCONFIGDIR/ mkdir -p $OUTDIR/ - # Extracting and copying all the necessary utilities and libraries. We still - # need the 10.6 SDK if we want to support OSX 10.6. - ar x apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb - tar xaf data.tar.gz + # Extracting and copying all the necessary utilities and libraries. + tar xaf MacOSX10.7.sdk.tar.gz tar xaf cctools.tar.gz unzip clang-linux64-wheezy-utils.zip unzip -d $INSTDIR openssl-mac64-utils.zip @@ -56,14 +54,12 @@ script: | # Setting the proper flags and variables # ld needs libLTO.so from llvm - export LD_LIBRARY_PATH="/home/debian/build/clang/lib" - export PATH="/home/debian/build/cctools/bin:$PATH" - CROSS_CCTOOLS_PATH="/home/debian/build/cctools" - CROSS_SYSROOT="/home/debian/build/usr/lib/apple/SDKs/MacOSX10.6.sdk" + export LD_LIBRARY_PATH="$HOME/build/clang/lib" + export PATH="$HOME/build/cctools/bin:$PATH" + CROSS_CCTOOLS_PATH="$HOME/build/cctools" + CROSS_SYSROOT="$HOME/build/MacOSX10.7.sdk" FLAGS="-target x86_64-apple-darwin10 -mlinker-version=136 -B $CROSS_CCTOOLS_PATH/bin -isysroot $CROSS_SYSROOT" - export CC="/home/debian/build/clang/bin/clang $FLAGS" - export CPP="/home/debian/build/clang/bin/clang $FLAGS -E" - export LLVMCONFIG="/home/debian/build/clang/bin/llvm-config" + export CC="$HOME/build/clang/bin/clang $FLAGS" export LDFLAGS="-Wl,-syslibroot,$CROSS_SYSROOT -Wl,-dead_strip" # Building tor diff --git a/gitian/descriptors/mac/gitian-utils.yml b/gitian/descriptors/mac/gitian-utils.yml index 0025e43..9191c52 100644 --- a/gitian/descriptors/mac/gitian-utils.yml +++ b/gitian/descriptors/mac/gitian-utils.yml @@ -23,7 +23,7 @@ remotes: - "url": "https://cmake.org/cmake.git" "dir": "cmake" files: -- "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" +- "MacOSX10.7.sdk.tar.gz" - "openssl.tar.gz" - "cctools.tar.gz" - "versions" @@ -65,8 +65,7 @@ script: | export FAKETIME=$REFERENCE_DATETIME cd .. - ar x apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb - tar xaf data.tar.gz + tar xaf MacOSX10.7.sdk.tar.gz tar xaf cctools.tar.gz # Preparing clang for cross-compilation, setting the proper flags and @@ -75,7 +74,7 @@ script: | export LD_LIBRARY_PATH="$INSTDIR/clang/lib" export PATH="$HOME/build/cctools/bin:$PATH" CROSS_CCTOOLS_PATH="$HOME/build/cctools" - CROSS_SYSROOT="$HOME/build/usr/lib/apple/SDKs/MacOSX10.6.sdk" + CROSS_SYSROOT="$HOME/build/MacOSX10.7.sdk" FLAGS="-target x86_64-apple-darwin10 -mlinker-version=136 -B $CROSS_CCTOOLS_PATH/bin -isysroot $CROSS_SYSROOT" export CC="$INSTDIR/clang/bin/clang $FLAGS" export LDFLAGS="-Wl,-syslibroot,$CROSS_SYSROOT -Wl,-dead_strip" diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index f141381..3be1fa2 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -132,7 +132,7 @@ do fi done -for i in TOOLCHAIN4_OLD OSXSDK OSXSDK_OLD MSVCR100 +for i in OSXSDK MSVCR100 do PACKAGE="${i}_PACKAGE" URL="${MIRROR_URL}${!PACKAGE}" @@ -173,8 +173,8 @@ done wget -U "" -N ${NOSCRIPT_URL} # Verify packages with weak or no signatures via direct sha256 check -# (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all) -for i in OSXSDK OSXSDK_OLD TOOLCHAIN4_OLD CCTOOLS NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO14 GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN +# (OpenSSL is signed with MD5, and OSXSDK are not signed at all) +for i in OSXSDK CCTOOLS NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO14 GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 4b17550..f1d89d4 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -148,8 +148,8 @@ do done # Verify packages with weak or no signatures via direct sha256 check -# (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all) -for i in OSXSDK OSXSDK_OLD TOOLCHAIN4_OLD CCTOOLS NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO14 GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN +# (OpenSSL is signed with MD5, and OSXSDK are not signed at all) +for i in OSXSDK CCTOOLS NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO14 GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/versions b/gitian/versions index 69abeb3..cbc323e 100755 --- a/gitian/versions +++ b/gitian/versions @@ -74,10 +74,8 @@ NSIS_VER=2.51 OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.11-fn+sm+fx.xpi -TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz -OSXSDK_OLD_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MSVCR100_PACKAGE=msvcr100.dll BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 @@ -105,8 +103,6 @@ NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf OPENSSL_HASH=4a6ee491a2fdb22e519c76fdc2a628bb3cec12762cd456861d207996c8a07088 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf -OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc -TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=fdd965a69188ac651b08a7d3ada54821a89db10a4685aa73ba59edc0b8243390 CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 @@ -133,9 +129,7 @@ NOTOTCFONT_HASH=e6b82f7d3dab605c428161124ceb5e169cde93de632d800297b167cdd88e7baa ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} -TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${TOOLCHAIN4_OLD_PACKAGE} CCTOOLS_URL=https://people.torproject.org/~gk/mirrors/sources/${CCTOOLS_PAC… -OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSXSDK_PACKAGE} BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} NOSCRIPT_URL=https://addons.cdn.mozilla.net/user-media/addons/722/${NOSCRIP… diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 3539d59..8a0e184 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -77,10 +77,8 @@ NSIS_VER=2.51 OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.9.5.3-fx+sm.xpi -TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz -OSXSDK_OLD_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MSVCR100_PACKAGE=msvcr100.dll BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 @@ -108,8 +106,6 @@ NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf OPENSSL_HASH=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf -OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc -TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=ce9779a3a5a2574b958f8e4d079a99d43a8f84193bef52c587c704ed81c2fbbd CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 @@ -136,9 +132,7 @@ NOTOTCFONT_HASH=e6b82f7d3dab605c428161124ceb5e169cde93de632d800297b167cdd88e7baa ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} -TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${TOOLCHAIN4_OLD_PACKAGE} CCTOOLS_URL=https://people.torproject.org/~gk/mirrors/sources/${CCTOOLS_PAC… -OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSXSDK_PACKAGE} BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} NOSCRIPT_URL=https://addons.cdn.mozilla.net/user-media/addons/722/${NOSCRIP… diff --git a/gitian/versions.beta b/gitian/versions.beta index d7db1fd..e962c20 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -60,9 +60,8 @@ GO_VER=1.7.4 OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.22-sm+fx+fn.xpi -TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz -OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MINGW_PACKAGE=mingw-w64-svn-snapshot.zip +OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz MSVCR100_PACKAGE=msvcr100.dll BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 @@ -87,8 +86,7 @@ NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 -OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc -TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 +OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf NOSCRIPT_HASH=5ec75d2f6fbf3ff7950a8eea2c7878d887ed3916aa89f99ec76b322b1e140c08 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 @@ -112,8 +110,6 @@ NOTOTCFONT_HASH=e6b82f7d3dab605c428161124ceb5e169cde93de632d800297b167cdd88e7baa ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} -TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${TOOLCHAIN4_OLD_PACKAGE} -OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSXSDK_PACKAGE} BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NO… diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 2045034..c7fb5bf 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -84,10 +84,8 @@ NSIS_VER=2.51 OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.9.5.3-fx+sm.xpi -TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz -OSXSDK_OLD_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MSVCR100_PACKAGE=msvcr100.dll BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 @@ -115,8 +113,6 @@ NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf OPENSSL_HASH=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf -OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc -TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=ce9779a3a5a2574b958f8e4d079a99d43a8f84193bef52c587c704ed81c2fbbd CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 @@ -143,9 +139,7 @@ NOTOTCFONT_HASH=e6b82f7d3dab605c428161124ceb5e169cde93de632d800297b167cdd88e7baa ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} -TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${TOOLCHAIN4_OLD_PACKAGE} CCTOOLS_URL=https://people.torproject.org/~gk/mirrors/sources/${CCTOOLS_PAC… -OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSXSDK_PACKAGE} BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} NOSCRIPT_URL=https://addons.cdn.mozilla.net/user-media/addons/722/${NOSCRIP…

1 0

[tor-browser-bundle/master] Bug 21328: Updating to clang 3.8.0
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit cd4465477ac10d2b740d5a32505cdab5a197e405 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Mar 31 17:21:51 2017 +0000 Bug 21328: Updating to clang 3.8.0 We use the new compiler Mozilla is using for Firefox 52 cross-builds as well. clang now requires GCC 4.8.5 for compiling which is not available in Debian Wheezy. We therefore build the macOS parts on Debian Jessie now. --- gitian/descriptors/mac/gitian-bundle.yml | 2 +- gitian/descriptors/mac/gitian-firefox.yml | 7 +++--- .../mac/gitian-pluggable-transports.yml | 6 ++--- gitian/descriptors/mac/gitian-tor.yml | 8 +++--- gitian/descriptors/mac/gitian-utils.yml | 27 ++++++++++++++------- gitian/fetch-inputs.sh | 8 +++--- gitian/gpg/CFE.gpg | Bin 0 -> 2507 bytes gitian/gpg/LIBCXX.gpg | Bin 0 -> 2507 bytes gitian/gpg/LIBCXXABI.gpg | Bin 0 -> 2507 bytes gitian/gpg/LLVM.gpg | Bin 0 -> 2507 bytes gitian/mkbundle-mac.sh | 6 ++--- gitian/verify-tags.sh | 4 +-- gitian/versions | 12 ++++++--- gitian/versions.alpha | 12 ++++++--- gitian/versions.nightly | 12 ++++++--- 15 files changed, 65 insertions(+), 39 deletions(-) diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index 571c6e0..8c7bbfc 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -2,7 +2,7 @@ name: "bundle-mac" distro: "debian" suites: -- "wheezy" +- "jessie" architectures: - "amd64" packages: diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index aae6139..6355485 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -2,7 +2,7 @@ name: "torbrowser-mac" distro: "debian" suites: -- "wheezy" +- "jessie" architectures: - "amd64" packages: @@ -16,7 +16,7 @@ remotes: - "url": "https://git.torproject.org/tor-browser.git" "dir": "tor-browser" files: -- "clang-linux64-wheezy-utils.zip" +- "clang-linux64-jessie-utils.zip" - "cctools.tar.gz" - "MacOSX10.7.sdk.tar.gz" - "get-moz-build-date" @@ -39,7 +39,7 @@ script: | # Extracting all the necessary tools tar xaf ../MacOSX10.7.sdk.tar.gz tar xaf ../cctools.tar.gz - unzip ../clang-linux64-wheezy-utils.zip + unzip ../clang-linux64-jessie-utils.zip # Bug 20439: build with PIE # If we add -fPIE to the FLAGS, the build fails in js/src/ctypes/libffi # with libtool giving an error: @@ -96,7 +96,6 @@ script: | ~/build/fix-info-plist.py $TORBROWSER_VERSION $COPYRIGHT_YEAR < tmp.plist > $INFO_PLIST rm -f tmp.plist ~/build/re-dzip.sh TorBrowser.app/Contents/Resources/omni.ja - ~/build/re-dzip.sh TorBrowser.app/Contents/Resources/webapprt/omni.ja ~/build/re-dzip.sh TorBrowser.app/Contents/Resources/browser/omni.ja cd TorBrowser.app/ ~/build/dzip.sh tor-browser-mac${GBUILD_BITS}-gbuilt.zip ./Contents diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index c6846cc..c430bb8 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -2,7 +2,7 @@ name: "pluggable-transports-mac" distro: "debian" suites: -- "wheezy" +- "jessie" architectures: - "amd64" packages: @@ -28,7 +28,7 @@ files: - "versions" - "go14.tar.gz" - "go.tar.gz" -- "clang-linux64-wheezy-utils.zip" +- "clang-linux64-jessie-utils.zip" - "cctools.tar.gz" - "MacOSX10.7.sdk.tar.gz" - "dzip.sh" @@ -54,7 +54,7 @@ script: | mkdir -p $OUTDIR/ # tar xaf cctools.tar.gz - unzip clang-linux64-wheezy-utils.zip + unzip clang-linux64-jessie-utils.zip # The 10.7 SDK is needed for Go: https://bugs.torproject.org/20023#comment:6 tar xaf MacOSX10.7.sdk.tar.gz # Preparing clang for cross-compilation, setting the proper flags and diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 2e1fa3e..cb3e99b 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -2,7 +2,7 @@ name: "tor-mac" distro: "debian" suites: -- "wheezy" +- "jessie" architectures: - "amd64" packages: @@ -15,7 +15,7 @@ remotes: - "url": "https://git.torproject.org/tor.git" "dir": "tor" files: -- "clang-linux64-wheezy-utils.zip" +- "clang-linux64-jessie-utils.zip" - "cctools.tar.gz" - "MacOSX10.7.sdk.tar.gz" - "versions" @@ -46,7 +46,7 @@ script: | # Extracting and copying all the necessary utilities and libraries. tar xaf MacOSX10.7.sdk.tar.gz tar xaf cctools.tar.gz - unzip clang-linux64-wheezy-utils.zip + unzip clang-linux64-jessie-utils.zip unzip -d $INSTDIR openssl-mac64-utils.zip unzip -d $INSTDIR libevent-mac64-utils.zip cp $INSTDIR/libevent/lib/libevent-*.dylib $TORBINDIR/ @@ -70,7 +70,7 @@ script: | ./autogen.sh find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" ./configure --enable-static-openssl --disable-asciidoc --host=x86_64-apple-darwin10 --with-libevent-dir=$INSTDIR/libevent --with-openssl-dir=$INSTDIR/openssl --prefix=$INSTDIR - export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 + export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1 make $MAKEOPTS make install cd $INSTDIR diff --git a/gitian/descriptors/mac/gitian-utils.yml b/gitian/descriptors/mac/gitian-utils.yml index 9191c52..33a8bf2 100644 --- a/gitian/descriptors/mac/gitian-utils.yml +++ b/gitian/descriptors/mac/gitian-utils.yml @@ -2,11 +2,10 @@ name: "utils-mac" distro: "debian" suites: -- "wheezy" +- "jessie" architectures: - "amd64" packages: -- "faketime" - "automake" - "libtool" - "zip" @@ -16,14 +15,14 @@ remotes: "dir": "libevent" - "url": "https://github.com/wolfcw/libfaketime" "dir": "faketime" -- "url": "https://github.com/llvm-mirror/llvm" - "dir": "llvm" -- "url": "https://github.com/llvm-mirror/clang" - "dir": "clang" - "url": "https://cmake.org/cmake.git" "dir": "cmake" files: - "MacOSX10.7.sdk.tar.gz" +- "llvm.tar.xz" +- "cfe.tar.xz" +- "libcxx.tar.xz" +- "libcxxabi.tar.xz" - "openssl.tar.gz" - "cctools.tar.gz" - "versions" @@ -44,8 +43,18 @@ script: | export PATH=$PATH:$INSTDIR/cmake/bin # Clang - cd ../llvm - mv ../clang tools/ + cd .. + tar xaf llvm.tar.xz + tar xaf cfe.tar.xz + tar xaf libcxx.tar.xz + tar xaf libcxxabi.tar.xz + mv cfe-* clang + mv libcxx-* libcxx + mv libcxxabi-* libcxxabi + mv clang llvm-*/tools + mv libcxx llvm-*/projects + mv libcxxabi llvm-*/projects + cd llvm-* export LLVM_HOME=`pwd` mkdir build cd build @@ -108,7 +117,7 @@ script: | # Grabbing the results cd $INSTDIR - ~/build/dzip.sh clang-$CLANG_VER-linux64-wheezy-utils.zip clang + ~/build/dzip.sh clang-$CLANG_VER-linux64-jessie-utils.zip clang ~/build/dzip.sh openssl-$OPENSSL_VER-mac64-utils.zip openssl ~/build/dzip.sh libevent-${LIBEVENT_TAG#release-}-mac64-utils.zip libevent cp *utils.zip $OUTDIR/ diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 3be1fa2..44f96aa 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -113,7 +113,7 @@ update_git() { ############################################################################## # Get+verify sigs that exist -for i in OPENSSL BINUTILS GCC PYTHON_MSI GMP +for i in OPENSSL BINUTILS GCC PYTHON_MSI GMP LLVM CFE LIBCXX LIBCXXABI do PACKAGE="${i}_PACKAGE" URL="${i}_URL" @@ -233,6 +233,10 @@ ln -sf "$NOSCRIPT_PACKAGE" noscript(a)noscript.net.xpi ln -sf "$OPENSSL_PACKAGE" openssl.tar.gz ln -sf "$BINUTILS_PACKAGE" binutils.tar.bz2 ln -sf "$GCC_PACKAGE" gcc.tar.bz2 +ln -sf "$LLVM_PACKAGE" llvm.tar.xz +ln -sf "$CFE_PACKAGE" cfe.tar.xz +ln -sf "$LIBCXX_PACKAGE" libcxx.tar.xz +ln -sf "$LIBCXXABI_PACKAGE" libcxxabi.tar.xz ln -sf "$PYTHON_MSI_PACKAGE" python.msi ln -sf "$PYCRYPTO_PACKAGE" pycrypto.tar.gz ln -sf "$ARGPARSE_PACKAGE" argparse.tar.gz @@ -275,8 +279,6 @@ torbutton https://git.torproject.org/torbutton.git $TORBU tor-launcher https://git.torproject.org/tor-launcher.git $TORLAUNCHER_TAG tor-browser https://git.torproject.org/tor-browser.git $TORBROWSER_TAG cmake https://cmake.org/cmake.git $CMAKE_TAG -llvm https://github.com/llvm-mirror/llvm $LLVM_TAG -clang https://github.com/llvm-mirror/clang $CLANG_TAG mingw-w64-git http://git.code.sf.net/p/mingw-w64/mingw-w64 $MINGW_TAG pyptlib https://git.torproject.org/pluggable-transports/pyptlib.git $PYPTLIB_TAG obfsproxy https://git.torproject.org/pluggable-transports/obfsproxy.git $OBFSPROXY_TAG diff --git a/gitian/gpg/CFE.gpg b/gitian/gpg/CFE.gpg new file mode 100644 index 0000000..9911f65 Binary files /dev/null and b/gitian/gpg/CFE.gpg differ diff --git a/gitian/gpg/LIBCXX.gpg b/gitian/gpg/LIBCXX.gpg new file mode 100644 index 0000000..9911f65 Binary files /dev/null and b/gitian/gpg/LIBCXX.gpg differ diff --git a/gitian/gpg/LIBCXXABI.gpg b/gitian/gpg/LIBCXXABI.gpg new file mode 100644 index 0000000..9911f65 Binary files /dev/null and b/gitian/gpg/LIBCXXABI.gpg differ diff --git a/gitian/gpg/LLVM.gpg b/gitian/gpg/LLVM.gpg new file mode 100644 index 0000000..9911f65 Binary files /dev/null and b/gitian/gpg/LLVM.gpg differ diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 789cc80..7f02f05 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -135,7 +135,7 @@ fi cd $GITIAN_DIR -if [ ! -f inputs/clang-$CLANG_VER-linux64-wheezy-utils.zip -o \ +if [ ! -f inputs/clang-$CLANG_VER-linux64-jessie-utils.zip -o \ ! -f inputs/openssl-$OPENSSL_VER-mac64-utils.zip -o \ ! -f inputs/libevent-${LIBEVENT_TAG_ORIG#release-}-mac64-utils.zip ]; then @@ -151,7 +151,7 @@ then cd inputs cp -a ../build/out/*-utils.zip . - ln -sf clang-$CLANG_VER-linux64-wheezy-utils.zip clang-linux64-wheezy-utils.zip + ln -sf clang-$CLANG_VER-linux64-jessie-utils.zip clang-linux64-jessie-utils.zip ln -sf openssl-$OPENSSL_VER-mac64-utils.zip openssl-mac64-utils.zip ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-mac64-utils.zip libevent-mac64-utils.zip cd .. @@ -164,7 +164,7 @@ else # We might have built the utilities in the past but maybe the links are # pointing to the wrong version. Refresh them. cd inputs - ln -sf clang-$CLANG_VER-linux64-wheezy-utils.zip clang-linux64-wheezy-utils.zip + ln -sf clang-$CLANG_VER-linux64-jessie-utils.zip clang-linux64-jessie-utils.zip ln -sf openssl-$OPENSSL_VER-mac64-utils.zip openssl-mac64-utils.zip ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-mac64-utils.zip libevent-mac64-utils.zip cd .. diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index f1d89d4..4facfa5 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -110,8 +110,6 @@ EOF while read dir commit; do check_git_hash "$dir" "$commit" done << EOF -llvm $LLVM_TAG -clang $CLANG_TAG mingw-w64-git $MINGW_TAG libdmg-hfsplus $LIBDMG_TAG libfte $LIBFTE_TAG @@ -130,7 +128,7 @@ uniuri $UNIURI_TAG EOF # Verify signatures on signed packages -for i in OPENSSL BINUTILS GCC PYTHON_MSI GMP +for i in OPENSSL BINUTILS GCC PYTHON_MSI GMP LLVM CFE LIBCXX LIBCXXABI do PACKAGE="${i}_PACKAGE" URL="${i}_URL" diff --git a/gitian/versions b/gitian/versions index cbc323e..cf07564 100755 --- a/gitian/versions +++ b/gitian/versions @@ -23,8 +23,6 @@ NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable CMAKE_TAG=v2.8.12.2 -LLVM_TAG=8f188e0ea735ac9383a65a0d1c846eb790c2ec74 # r247539 -CLANG_TAG=592b43b609b42cffd1531a700c140e10766bf049 # r247539 MINGW_TAG=a0cd5afeb60be3be0860e9a203314c10485bb9b8 PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 @@ -55,7 +53,7 @@ FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build2 BINUTILS_VER=2.24 GCC_VER=5.1.0 -CLANG_VER=r247539 +CLANG_VER=3.8.0 PYTHON_VER=2.7.5 PYCRYPTO_VER=2.6.1 ARGPARSE_VER=1.2.1 @@ -79,6 +77,10 @@ OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz MSVCR100_PACKAGE=msvcr100.dll BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 +LLVM_PACKAGE=llvm-${CLANG_VER}.src.tar.xz +CFE_PACKAGE=cfe-${CLANG_VER}.src.tar.xz +LIBCXX_PACKAGE=libcxx-${CLANG_VER}.src.tar.xz +LIBCXXABI_PACKAGE=libcxxabi-${CLANG_VER}.src.tar.xz PYTHON_MSI_PACKAGE=python-${PYTHON_VER}.msi PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz @@ -132,6 +134,10 @@ GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} CCTOOLS_URL=https://people.torproject.org/~gk/mirrors/sources/${CCTOOLS_PAC… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} +LLVM_URL=http://releases.llvm.org/${CLANG_VER}/${LLVM_PACKAGE} # no proper HTTPS +CFE_URL=http://releases.llvm.org/${CLANG_VER}/${CFE_PACKAGE} # no proper HTTPS +LIBCXX_URL=http://releases.llvm.org/${CLANG_VER}/${LIBCXX_PACKAGE} # no proper HTTPS +LIBCXXABI_URL=http://releases.llvm.org/${CLANG_VER}/${LIBCXXABI_PACKAGE} # no proper HTTPS NOSCRIPT_URL=https://addons.cdn.mozilla.net/user-media/addons/722/${NOSCRIP… PYTHON_MSI_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI… PYCRYPTO_URL=https://pypi.python.org/packages/source/p/pycrypto/${PYCRYPTO_… diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 8a0e184..b677fd1 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -23,8 +23,6 @@ NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable CMAKE_TAG=v2.8.12.2 -LLVM_TAG=8f188e0ea735ac9383a65a0d1c846eb790c2ec74 # r247539 -CLANG_TAG=592b43b609b42cffd1531a700c140e10766bf049 # r247539 MINGW_TAG=a0cd5afeb60be3be0860e9a203314c10485bb9b8 PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 @@ -58,7 +56,7 @@ FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build2 BINUTILS_VER=2.24 GCC_VER=5.1.0 -CLANG_VER=r247539 +CLANG_VER=3.8.0 PYTHON_VER=2.7.5 PYCRYPTO_VER=2.6.1 ARGPARSE_VER=1.2.1 @@ -82,6 +80,10 @@ OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz MSVCR100_PACKAGE=msvcr100.dll BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 +LLVM_PACKAGE=llvm-${CLANG_VER}.src.tar.xz +CFE_PACKAGE=cfe-${CLANG_VER}.src.tar.xz +LIBCXX_PACKAGE=libcxx-${CLANG_VER}.src.tar.xz +LIBCXXABI_PACKAGE=libcxxabi-${CLANG_VER}.src.tar.xz PYTHON_MSI_PACKAGE=python-${PYTHON_VER}.msi PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz @@ -135,6 +137,10 @@ GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} CCTOOLS_URL=https://people.torproject.org/~gk/mirrors/sources/${CCTOOLS_PAC… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} +LLVM_URL=http://releases.llvm.org/${CLANG_VER}/${LLVM_PACKAGE} # no proper HTTPS +CFE_URL=http://releases.llvm.org/${CLANG_VER}/${CFE_PACKAGE} # no proper HTTPS +LIBCXX_URL=http://releases.llvm.org/${CLANG_VER}/${LIBCXX_PACKAGE} # no proper HTTPS +LIBCXXABI_URL=http://releases.llvm.org/${CLANG_VER}/${LIBCXXABI_PACKAGE} # no proper HTTPS NOSCRIPT_URL=https://addons.cdn.mozilla.net/user-media/addons/722/${NOSCRIP… PYTHON_MSI_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI… PYCRYPTO_URL=https://pypi.python.org/packages/source/p/pycrypto/${PYCRYPTO_… diff --git a/gitian/versions.nightly b/gitian/versions.nightly index c7fb5bf..7a57980 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -30,8 +30,6 @@ NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable CMAKE_TAG=v2.8.12.2 -LLVM_TAG=8f188e0ea735ac9383a65a0d1c846eb790c2ec74 # r247539 -CLANG_TAG=592b43b609b42cffd1531a700c140e10766bf049 # r247539 MINGW_TAG=a0cd5afeb60be3be0860e9a203314c10485bb9b8 PYPTLIB_TAG=master OBFSPROXY_TAG=master @@ -65,7 +63,7 @@ FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build2 BINUTILS_VER=2.24 GCC_VER=5.1.0 -CLANG_VER=r247539 +CLANG_VER=3.8.0 PYTHON_VER=2.7.5 PYCRYPTO_VER=2.6.1 ARGPARSE_VER=1.2.1 @@ -89,6 +87,10 @@ OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz MSVCR100_PACKAGE=msvcr100.dll BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 +LLVM_PACKAGE=llvm-${CLANG_VER}.src.tar.xz +CFE_PACKAGE=cfe-${CLANG_VER}.src.tar.xz +LIBCXX_PACKAGE=libcxx-${CLANG_VER}.src.tar.xz +LIBCXXABI_PACKAGE=libcxxabi-${CLANG_VER}.src.tar.xz PYTHON_MSI_PACKAGE=python-${PYTHON_VER}.msi PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz @@ -142,6 +144,10 @@ GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} CCTOOLS_URL=https://people.torproject.org/~gk/mirrors/sources/${CCTOOLS_PAC… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} +LLVM_URL=http://releases.llvm.org/${CLANG_VER}/${LLVM_PACKAGE} # no proper HTTPS +CFE_URL=http://releases.llvm.org/${CLANG_VER}/${CFE_PACKAGE} # no proper HTTPS +LIBCXX_URL=http://releases.llvm.org/${CLANG_VER}/${LIBCXX_PACKAGE} # no proper HTTPS +LIBCXXABI_URL=http://releases.llvm.org/${CLANG_VER}/${LIBCXXABI_PACKAGE} # no proper HTTPS NOSCRIPT_URL=https://addons.cdn.mozilla.net/user-media/addons/722/${NOSCRIP… PYTHON_MSI_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI… PYCRYPTO_URL=https://pypi.python.org/packages/source/p/pycrypto/${PYCRYPTO_…

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] Bug 805173 - Enable HeapEnableTerminationOnCorruption for chrome processes on Windows. r=mhowell, tjr
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit 49d21424d9d25b47a263bacec751742ac7370683 Author: Alex Gaynor <agaynor(a)mozilla.com> Date: Fri Mar 31 16:15:56 2017 -0400 Bug 805173 - Enable HeapEnableTerminationOnCorruption for chrome processes on Windows. r=mhowell,tjr This is an exploit mitigation which causes the Windows system allocator to abort in the event it is in a corrupted state, rather than attempt to proceed in a potentially exploitable state. Because we use jemalloc, this only affects system libraries or plugins which still use the system allocator. The has been enabled on our content processes for a while without incident. r=mhowell,tjr MozReview-Commit-ID: 5ctXugtbI1A --HG-- extra : rebase_source : f6f134404be3b258a8e522c22fa061c32a47e313 --- toolkit/xre/nsAppRunner.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index 455b142..721f599 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -4189,6 +4189,13 @@ XREMain::XRE_mainStartup(bool* aExitFlag) } #endif /* DEBUG */ +#if defined(XP_WIN) + // Enable the HeapEnableTerminationOnCorruption exploit mitigation. We ignore + // the return code because it always returns success, although it has no + // effect on Windows older than XP SP3. + HeapSetInformation(NULL, HeapEnableTerminationOnCorruption, NULL, 0); +#endif /* XP_WIN */ + #if defined(MOZ_WIDGET_GTK) || defined(MOZ_ENABLE_XREMOTE) // Stash DESKTOP_STARTUP_ID in malloc'ed memory because gtk_init will clear it. #define HAVE_DESKTOP_STARTUP_ID

1 0

[torbutton/master] Bug 21201: Mark Torbutton as multiprocess compatible
by gk＠torproject.org 04 Apr '17

04 Apr '17

commit 7c8c20ff3b4f6747d57c259407a55194ffb62374 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Apr 4 10:08:06 2017 +0000 Bug 21201: Mark Torbutton as multiprocess compatible --- src/install.rdf | 1 + 1 file changed, 1 insertion(+) diff --git a/src/install.rdf b/src/install.rdf index 3077598..5a698b3 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,6 +7,7 @@ <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> <em:version>1.9.7.1</em:version> + <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[torbutton/master] Bug 21747: 'New Tor Circuit for this Site' in ESR52
by gk＠torproject.org 04 Apr '17

04 Apr '17

commit cfa9229fddb79067ebd3a0a6d8d0a10ab1bffc02 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Mar 17 13:08:16 2017 -0700 Bug 21747: 'New Tor Circuit for this Site' in ESR52 Also, make sure we renew catchall "--unknown--" domain if user chooses "New Tor Circuit" for about:addons, for example. --- src/chrome/content/torbutton.js | 7 ++----- src/components/domain-isolator.js | 3 +++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 970d2d0..9af7c57 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1014,11 +1014,8 @@ function torbutton_send_ctrl_cmd(command) { // Bug 1506 P4: Needed for New IP Address function torbutton_new_circuit() { - let thirdPartyUtil = Cc["@mozilla.org/thirdpartyutil;1"] - .getService(Ci.mozIThirdPartyUtil); - - let firstPartyDomain = thirdPartyUtil - .getFirstPartyHostForIsolation(gBrowser.currentURI); + let firstPartyDomain = gBrowser.contentPrincipal.originAttributes + .firstPartyDomain; let domainIsolator = Cc["@torproject.org/domain-isolator;1"] .getService(Ci.nsISupports).wrappedJSObject; diff --git a/src/components/domain-isolator.js b/src/components/domain-isolator.js index e43ee58..a52cccc 100644 --- a/src/components/domain-isolator.js +++ b/src/components/domain-isolator.js @@ -101,6 +101,9 @@ tor.nonce = function() { tor.newCircuitForDomain = function(domain) { // Re-generate the nonce for the domain. + if (domain === "") { + domain = "--unknown--"; + } tor.noncesForDomains[domain] = tor.nonce(); logger.eclog(3, "New domain isolation for " + domain + ": " + tor.noncesForDomains[domain]); };

1 0

[torbutton/master] Bug 21745: Fix handling of catch-all circuit
by gk＠torproject.org 04 Apr '17

04 Apr '17

commit 1324e306018779166674e9bc6101ddb9e2bbc68b Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Mar 17 12:16:36 2017 -0700 Bug 21745: Fix handling of catch-all circuit --- src/components/domain-isolator.js | 44 +++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/src/components/domain-isolator.js b/src/components/domain-isolator.js index a537429..e43ee58 100644 --- a/src/components/domain-isolator.js +++ b/src/components/domain-isolator.js @@ -6,7 +6,7 @@ // call earlier functions). The code file can be processed // with docco.js to provide clear documentation. -/* jshint moz: true */ +/* jshint esversion: 6 */ /* global Components, console, XPCOMUtils */ // ### Abbreviations @@ -91,19 +91,19 @@ tor.nonce = function() { // Convert the tag to a hex string. let tagStr = ""; - for (var i = 0; i < tag.length; i++) { + for (let i = 0; i < tag.length; i++) { tagStr += (tag[i] >>> 4).toString(16); tagStr += (tag[i] & 0x0F).toString(16); } return tagStr; -} +}; tor.newCircuitForDomain = function(domain) { // Re-generate the nonce for the domain. tor.noncesForDomains[domain] = tor.nonce(); logger.eclog(3, "New domain isolation for " + domain + ": " + tor.noncesForDomains[domain]); -} +}; // __tor.clearIsolation()_. // Clear the isolation state cache, forcing new circuits to be used for all @@ -115,7 +115,7 @@ tor.clearIsolation = function () { // Force a rotation on the next catch-all circuit use by setting the creation // time to the epoch. tor.unknownDirtySince = 0; -} +}; // __tor.isolateCircuitsByDomain()__. // For every HTTPChannel, replaces the default SOCKS proxy with one that authenticates @@ -124,29 +124,27 @@ tor.clearIsolation = function () { // combination. tor.isolateCircuitsByDomain = function () { mozilla.registerProxyChannelFilter(function (aChannel, aProxy) { - if (!tor.isolationEnabled) + if (!tor.isolationEnabled) { return aProxy; - + } try { - let channel = aChannel.QueryInterface(Ci.nsIChannel); - firstPartyDomain = channel.loadInfo.originAttributes.firstPartyDomain, + let channel = aChannel.QueryInterface(Ci.nsIChannel), proxy = aProxy.QueryInterface(Ci.nsIProxyInfo), - replacementProxy = tor.socksProxyCredentials(aProxy, firstPartyDomain); - logger.eclog(3, "tor SOCKS: " + channel.URI.spec + " via " + - replacementProxy.username + ":" + replacementProxy.password); - return replacementProxy; - } catch (err) { - logger.eclog(3, err.message); - if (Date.now() - tor.unknownDirtySince > 1000*10*60) { - logger.eclog(3, "tor catchall circuit has been dirty for over 10 minutes. Rotating."); - tor.newCircuitForDomain("--unknown--"); - tor.unknownDirtySince = Date.now(); + firstPartyDomain = channel.loadInfo.originAttributes.firstPartyDomain; + if (firstPartyDomain === "") { + firstPartyDomain = "--unknown--"; + if (Date.now() - tor.unknownDirtySince > 1000*10*60) { + logger.eclog(3, "tor catchall circuit has been dirty for over 10 minutes. Rotating."); + tor.newCircuitForDomain("--unknown--"); + tor.unknownDirtySince = Date.now(); + } } - let replacementProxy = tor.socksProxyCredentials(aProxy, "--unknown--"); - - logger.eclog(3, "tor SOCKS isolation catchall: " + aChannel.URI.spec + " via " + - replacementProxy.username + ":" + replacementProxy.password); + let replacementProxy = tor.socksProxyCredentials(aProxy, firstPartyDomain); + logger.eclog(3, `tor SOCKS: ${channel.URI.spec} via + ${replacementProxy.username}:${replacementProxy.password}`); return replacementProxy; + } catch (e) { + logger.eclog(4, `tor domain isolator error: ${e.message}`); } }, 0); };

1 0

[torbutton/master] Bug 21547: Fix circuit display under e10s
by gk＠torproject.org 04 Apr '17

04 Apr '17

commit 45184e903fd682f6eef5a44b6fa44df86a0dbc9f Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Sun Mar 5 23:50:15 2017 -0800 Bug 21547: Fix circuit display under e10s --- src/chrome/content/tor-circuit-display.js | 70 +++++++++++++++++++++---------- 1 file changed, 48 insertions(+), 22 deletions(-) diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index 14e5e8e..b5c24f8 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -26,7 +26,7 @@ let createTorCircuitDisplay = (function () { "use strict"; // Mozilla utilities -const Cu = Components.utils; +const { Cu : utils , Ci : interfaces } = Components.utils; Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/Task.jsm"); @@ -34,7 +34,7 @@ Cu.import("resource://gre/modules/Task.jsm"); let { controller } = Cu.import("resource://torbutton/modules/tor-control-port.js", {}); // Utility functions -let { bindPrefAndInit } = Cu.import("resource://torbutton/modules/utils.js", {}); +let { bindPrefAndInit, observe } = Cu.import("resource://torbutton/modules/utils.js", {}); // Make the TorButton logger available. let logger = Cc["@torproject.org/torbutton-logger;1"] @@ -47,7 +47,10 @@ let logger = Cc["@torproject.org/torbutton-logger;1"] let credentialsToNodeDataMap = {}, // A mutable map that reports `true` for IDs of "mature" circuits // (those that have conveyed a stream). - knownCircuitIDs = {}; + knownCircuitIDs = {}, + // A mutable map that records the SOCKS credentials for the + // latest channels for each browser. + browserToCredentialsMap = new Map(); // __trimQuotes(s)__. // Removes quotation marks around a quoted string. @@ -154,6 +157,42 @@ let collectIsolationData = function (aController, updateUI) { }).then(null, Cu.reportError)); }; +// __browserForChannel(channel)__. +// Returns the browser that loaded a given channel. +let browserForChannel = function (channel) { + if (!channel) return null; + let chan = channel.QueryInterface(Ci.nsIChannel); + let callbacks = chan.notificationCallbacks; + if (!callbacks) return null; + let loadContext; + try { + loadContext = callbacks.getInterface(Ci.nsILoadContext); + } catch (e) { + // Ignore + return null; + } + if (!loadContext) return null; + return loadContext.topFrameElement; +}; + +// __collectBrowserCredentials()__. +// Starts observing http channels. Each channel's proxyInfo +// username and password is recorded for the channel's browser. +let collectBrowserCredentials = function () { + return observe("http-on-modify-request", chan => { + try { + let proxyInfo = chan.QueryInterface(Ci.nsIProxiedChannel).proxyInfo; + let browser = browserForChannel(chan); + if (browser && proxyInfo) { + browserToCredentialsMap.set(browser, [proxyInfo.username, + proxyInfo.password]); + } + } catch (e) { + logger.eclog(3, `Error collecting browser credentials: ${e.message}, ${chan.URI.spec}`); + } + }); +}; + // ## User interface // __torbuttonBundle__. @@ -221,24 +260,6 @@ let nodeLines = function (nodeData) { return result; }; -// __getSOCKSCredentials(browser)__. -// Reads the SOCKS credentials for the corresponding browser object. -let getSOCKSCredentialsForBrowser = function (browser) { - if (browser === null) return null; - let docShell = browser.docShell; - if (docShell === null) return null; - let channel = docShell.currentDocumentChannel; - if (channel === null) return null; - if (channel instanceof Ci.nsIMultiPartChannel) { - channel = channel.baseChannel; - } - if (channel === null) return null; - if (!(channel instanceof Ci.nsIProxiedChannel)) return null; - let proxyInfo = channel.proxyInfo; - if (proxyInfo === null) return null; - return [proxyInfo.username, proxyInfo.password]; -}; - // __onionSiteRelayLine__. // When we have an onion site, we simply show the word '(relay)'. let onionSiteRelayLine = "<li class='relay'>(" + uiString("relay") + ")</li>"; @@ -249,7 +270,7 @@ let onionSiteRelayLine = "<li class='relay'>(" + uiString("relay") + ")</li>"; let updateCircuitDisplay = function () { let selectedBrowser = gBrowser.selectedBrowser; if (selectedBrowser) { - let credentials = getSOCKSCredentialsForBrowser(selectedBrowser), + let credentials = browserToCredentialsMap.get(selectedBrowser), nodeData = null; if (credentials) { let [SOCKS_username, SOCKS_password] = credentials; @@ -319,12 +340,16 @@ let syncDisplayWithSelectedTab = (function() { let setupDisplay = function (ipcFile, host, port, password, enablePrefName) { let myController = null, stopCollectingIsolationData = null, + stopCollectingBrowserCredentials = null, stop = function() { syncDisplayWithSelectedTab(false); if (myController) { if (stopCollectingIsolationData) { stopCollectingIsolationData(); } + if (stopCollectingBrowserCredentials) { + stopCollectingBrowserCredentials(); + } myController = null; } }, @@ -340,6 +365,7 @@ let setupDisplay = function (ipcFile, host, port, password, enablePrefName) { }); syncDisplayWithSelectedTab(true); stopCollectingIsolationData = collectIsolationData(myController, updateCircuitDisplay); + stopCollectingBrowserCredentials = collectBrowserCredentials(); } }; try {

1 0