- tbb-commits - lists.torproject.org

[torbutton/maint-1.9.5] Include improved zh-CN banner translations
by gk＠torproject.org 10 Nov '16

10 Nov '16

commit a244925c0de7768e2c370e2a9a4b7b75d03b2f54 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 10 08:19:47 2016 +0000 Include improved zh-CN banner translations --- src/chrome/locale/zh-CN/aboutTor.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/chrome/locale/zh-CN/aboutTor.properties b/src/chrome/locale/zh-CN/aboutTor.properties index 4d017c3..421ac52 100644 --- a/src/chrome/locale/zh-CN/aboutTor.properties +++ b/src/chrome/locale/zh-CN/aboutTor.properties @@ -24,5 +24,5 @@ aboutTor.donationBanner.donate=立即捐助！ aboutTor.donationBanner.heart=Tor 是互联网自由的核心 aboutTor.donationBanner.tagline1=数百万人依靠 Tor 安全、私密地上网 aboutTor.donationBanner.tagline2=A Network of People Protecting People -aboutTor.donationBanner.tagline3=Surveillance = Oppression -aboutTor.donationBanner.tagline4=Protecting Journalists, Activists & Whistleblowers Since 2006 +aboutTor.donationBanner.tagline3=监视即压迫 +aboutTor.donationBanner.tagline4=为记者、告密者及活动人士提供保护，专注匿名安全 10 年

1 0

[torbutton/master] Update translations
by gk＠torproject.org 10 Nov '16

10 Nov '16

commit c216bcf991b8be4fcb517b4a773cc065a8bcf5b8 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 10 08:07:56 2016 +0000 Update translations --- src/chrome/locale/de/torbutton.dtd | 4 +- src/chrome/locale/fr/aboutDialog.dtd | 14 ++--- src/chrome/locale/fr/aboutTBUpdate.dtd | 10 ++-- src/chrome/locale/fr/aboutTor.dtd | 26 ++++----- src/chrome/locale/fr/aboutTor.properties | 18 +++--- src/chrome/locale/fr/brand.dtd | 8 +-- src/chrome/locale/fr/brand.properties | 4 +- src/chrome/locale/fr/torbutton.dtd | 90 ++++++++++++++--------------- src/chrome/locale/ru/aboutTor.properties | 12 ++-- src/chrome/locale/ru/torbutton.dtd | 6 +- src/chrome/locale/zh-CN/aboutTor.properties | 4 +- 11 files changed, 98 insertions(+), 98 deletions(-) diff --git a/src/chrome/locale/de/torbutton.dtd b/src/chrome/locale/de/torbutton.dtd index 56253fe..4cc42e9 100644 --- a/src/chrome/locale/de/torbutton.dtd +++ b/src/chrome/locale/de/torbutton.dtd @@ -11,8 +11,8 @@ <!ENTITY torbutton.context_menu.cookieProtections "Cookie-Schutz …"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Klicken, um Torbutton zu aktivieren"> -<!ENTITY torbutton.prefs.security_settings "Tor Browser Security Settings"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> +<!ENTITY torbutton.prefs.security_settings "Tor-Browser-Sicherheitseinstellungen"> +<!ENTITY torbutton.prefs.restore_defaults "Standardeinstellungen wiederherstellen"> <!ENTITY torbutton.prefs.custom_warning "Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels."> <!ENTITY torbutton.cookiedialog.title "Cookie-Schutz verwalten"> <!ENTITY torbutton.cookiedialog.lockCol "Geschützt"> diff --git a/src/chrome/locale/fr/aboutDialog.dtd b/src/chrome/locale/fr/aboutDialog.dtd index bd4f2f1..7fde298 100644 --- a/src/chrome/locale/fr/aboutDialog.dtd +++ b/src/chrome/locale/fr/aboutDialog.dtd @@ -1,19 +1,19 @@ <!ENTITY project.start "&brandShortName; est développé par">  <!ENTITY project.tpoLink "le &vendorShortName;"> -<!ENTITY project.end ", une organisation à but non lucratif travaillant à défendre votre vie privée et liberté en ligne."> +<!ENTITY project.end ", une organisation sans but lucratif travaillant à la protection de vos renseignements personnels et de votre liberté en ligne."> -<!ENTITY help.start "voulez-vous aider ?"> +<!ENTITY help.start "Voulez-vous aider ?">  -<!ENTITY help.donateLink "Faire une donation"> +<!ENTITY help.donateLink "Faites un don"> <!ENTITY help.or "ou">  -<!ENTITY help.getInvolvedLink "s'engager"> +<!ENTITY help.getInvolvedLink "impliquez-vous"> <!ENTITY help.end "!">  <!ENTITY bottomLinks.questions "Des questions ?">  -<!ENTITY bottomLinks.grow "Aider le réseau Tor à grandir !"> +<!ENTITY bottomLinks.grow "Aidez à la croissance du réseau Tor !">  -<!ENTITY bottomLinks.license "Information sur les licences"> -<!ENTITY tor.TrademarkStatement ""Tor" et le "Logo Oignon" sont des marques déposés du Projet Tor, Inc."> +<!ENTITY bottomLinks.license "Informations de licence"> +<!ENTITY tor.TrademarkStatement "« Tor » et le « logo Oignon » sont des marques déposées de The Tor Project, Inc. "> diff --git a/src/chrome/locale/fr/aboutTBUpdate.dtd b/src/chrome/locale/fr/aboutTBUpdate.dtd index bbc32e1..fc83797 100644 --- a/src/chrome/locale/fr/aboutTBUpdate.dtd +++ b/src/chrome/locale/fr/aboutTBUpdate.dtd @@ -1,6 +1,6 @@ -<!ENTITY aboutTBUpdate.title "Mise à jour du Navigateur Tor"> -<!ENTITY aboutTBUpdate.updated "Le Navigateur Tor a été mis à jour"> -<!ENTITY aboutTBUpdate.linkPrefix "Pour avoir les informations les plus récentes sur cette version,"> -<!ENTITY aboutTBUpdate.linkLabel "visitez notre site web"> +<!ENTITY aboutTBUpdate.title "Mise à jour du navigateur Tor"> +<!ENTITY aboutTBUpdate.updated "Le navigateur Tor a été mis à jour."> +<!ENTITY aboutTBUpdate.linkPrefix "Pour les toutes dernières informations sur cette version,"> +<!ENTITY aboutTBUpdate.linkLabel "visitez notre site Web"> <!ENTITY aboutTBUpdate.linkSuffix "."> -<!ENTITY aboutTBUpdate.changeLogHeading "Changelog :"> +<!ENTITY aboutTBUpdate.changeLogHeading "Journal des changements :"> diff --git a/src/chrome/locale/fr/aboutTor.dtd b/src/chrome/locale/fr/aboutTor.dtd index ab91620..0fc5b1e 100644 --- a/src/chrome/locale/fr/aboutTor.dtd +++ b/src/chrome/locale/fr/aboutTor.dtd @@ -4,20 +4,20 @@ - vim: set sw=2 sts=2 ts=8 et syntax=xml: --> -<!ENTITY aboutTor.title "A propos de Tor "> +<!ENTITY aboutTor.title "À propos de Tor "> -<!ENTITY aboutTor.outOfDateTorOn.label "ATTENTION : ce navigateur n'est pas à jour."> +<!ENTITY aboutTor.outOfDateTorOn.label "AVERTISSEMENT : ce navigateur n'est pas à jour."> <!ENTITY aboutTor.outOfDateTorOff.label "DE PLUS, ce navigateur n'est pas à jour."> -<!ENTITY aboutTor.outOfDate2.label "Cliquez sur l'oignon et choisissez ensuite Vérifier les mises à jour du Navigateur Tor"> +<!ENTITY aboutTor.outOfDate2.label "Cliquer sur l'oignon, puis choisir Vérifier les màj. du navigateur Tor."> <!ENTITY aboutTor.check.label "Tester les paramètres du réseau Tor"> -<!ENTITY aboutTor.success.label "Bienvenue dans le Navigateur Tor"> +<!ENTITY aboutTor.success.label "Bienvenue dans le navigateur Tor"> <!ENTITY aboutTor.success2.label "Connecté au réseau Tor."> -<!ENTITY aboutTor.success3.label "Vous pouvez maintenant naviguer sur Internet de manière anonyme."> -<!ENTITY aboutTor.failure.label "Une erreur s'est produite !"> +<!ENTITY aboutTor.success3.label "Vous êtes maintenant libre de naviguer sur Internet anonymement."> +<!ENTITY aboutTor.failure.label "Une erreur s'est produite !"> <!ENTITY aboutTor.failure2.label "Tor ne fonctionne pas dans ce navigateur."> -<!ENTITY aboutTor.failure3prefix.label "Pour obtenir de l'aide, veuillez contacter"> +<!ENTITY aboutTor.failure3prefix.label "Pour de l'assistance, veuillez contacter"> <!ENTITY aboutTor.failure3Link "help-fr(a)rt.torproject.org"> <!ENTITY aboutTor.failure3suffix.label "."> @@ -30,20 +30,20 @@ <!ENTITY aboutTor.torInfo1.label "Informations supplémentaires :"> <!ENTITY aboutTor.torInfo2.label "Pays & adresse IP :"> <!ENTITY aboutTor.torInfo3.label "Nœud de sortie :"> -<!ENTITY aboutTor.torInfo4.label "Ce serveur n'enregistre aucune information sur les visites qu'il reçoit."> -<!ENTITY aboutTor.whatnextQuestion.label "Que faire ensuite ?"> -<!ENTITY aboutTor.whatnextAnswer.label "Tor n'est PAS tout ce dont vous avez besoin pour assurer votre anonymat ! Vous devrez peut-être changer certaines de vos habitudes de navigation pour garder votre identité en sécurité."> +<!ENTITY aboutTor.torInfo4.label "Ce serveur ne journalise aucune information sur les visteurs."> +<!ENTITY aboutTor.whatnextQuestion.label "Que faire ensuite ?"> +<!ENTITY aboutTor.whatnextAnswer.label "Tor n'est PAS tout ce dont vous avez besoin pour naviguer anonymement! Vous aurez peut-être à changer certaines de vos habitudes de navigation pour garder votre identité en sécurité."> <!ENTITY aboutTor.whatnext.label "Conseils pour rester anonyme »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html#warning"> <!ENTITY aboutTor.helpInfo1.label "Vous pouvez aider !"> -<!ENTITY aboutTor.helpInfo2.label "Vous pouvez aider à rendre le réseau Tor plus rapide et plus puissant de plusieurs manières :"> -<!ENTITY aboutTor.helpInfo3.label "Faire fonctionner un relai Tor »"> +<!ENTITY aboutTor.helpInfo2.label "Vous pouvez aider à rendre le réseau Tor plus rapide et plus puissant de plusieurs façons :"> +<!ENTITY aboutTor.helpInfo3.label "Faire tourner un nœud relais Tor »"> <!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html"> <!ENTITY aboutTor.helpInfo4.label "Devenir bénévole »"> <!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html"> <!ENTITY aboutTor.helpInfo5.label "Faire un don »"> <!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html"> -<!ENTITY aboutTor.footer.label "Le projet Tor est une organisation à but non lucratif (US 501(c)(3)) dédiée à la recherche, le développement et l'éducation sur l'anonymat et la vie privée en ligne."> +<!ENTITY aboutTor.footer.label "Le projet Tor est une organisation sans but lucratif US 501(c)(3) dédiée à la recherche, le développement et l'éducation sur l'anonymat et la vie privée en ligne."> <!ENTITY aboutTor.learnMore.label "En savoir plus sur le projet Tor »"> <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html"> diff --git a/src/chrome/locale/fr/aboutTor.properties b/src/chrome/locale/fr/aboutTor.properties index 5842c54..174b286 100644 --- a/src/chrome/locale/fr/aboutTor.properties +++ b/src/chrome/locale/fr/aboutTor.properties @@ -2,27 +2,27 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchSP.privacy=Rechercher <a href="%1$S">de manière sécurisée</a> avec <a href="%2$S">Startpage</a>. +aboutTor.searchSP.privacy=Rechercher <a href="%1$S">en toute sécurité</a> avec <a href="%2$S">Startpage</a>. # The following string is a link which replaces %1$S above. -aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +aboutTor.searchSP.privacy.link=https://startpage.com/fra/protect-privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchSP.search.link=https://startpage.com/ -aboutTor.searchDDG.privacy=Rechercher <a href="%1$S">de manière sécurisée</a> avec <a href="%2$S">DuckDuckGo</a>. +aboutTor.searchDDG.privacy=Rechercher <a href="%1$S">en toute sécurité</a> avec <a href="%2$S">DuckDuckGo</a>. # The following string is a link which replaces %1$S above. aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ -aboutTor.searchDC.privacy=Rechercher <a href="%1$S">de manière sécurisée</a> avec <a href="%2$S">Disconnect.me</a>. +aboutTor.searchDC.privacy=Rechercher <a href="%1$S">en toute sécurité</a> avec <a href="%2$S">Disconnect.me</a>. # The following string is a link which replaces %1$S above. aboutTor.searchDC.privacy.link=https://disconnect.me/privacy # The following string is a link which replaces %2$S above. aboutTor.searchDC.search.link=https://search.disconnect.me/ -aboutTor.donationBanner.donate=Donate Now! -aboutTor.donationBanner.heart=Tor is at the heart of Internet freedom -aboutTor.donationBanner.tagline1=Millions of People Depend on Tor for Online Security & Privacy -aboutTor.donationBanner.tagline2=A Network of People Protecting People +aboutTor.donationBanner.donate=Faites un don maintenant ! +aboutTor.donationBanner.heart=Tor est au cœur de la liberté sur Internet +aboutTor.donationBanner.tagline1=Des millions de personnes dépendent de Tor pour leur sécurité et la protection de leurs renseignements personnels en ligne +aboutTor.donationBanner.tagline2=Un réseau de personnes qui protège les gens aboutTor.donationBanner.tagline3=Surveillance = Oppression -aboutTor.donationBanner.tagline4=Protecting Journalists, Activists & Whistleblowers Since 2006 +aboutTor.donationBanner.tagline4=Nous protégeons les journalistes, les activistes et les lanceurs d'alerte depuis 2006 diff --git a/src/chrome/locale/fr/brand.dtd b/src/chrome/locale/fr/brand.dtd index 416aa42..b3fe3f1 100644 --- a/src/chrome/locale/fr/brand.dtd +++ b/src/chrome/locale/fr/brand.dtd @@ -9,7 +9,7 @@ <!ENTITY trademarkInfo.part1 "Firefox et les logos de Firefox sont des marques déposées de la Fondation Mozilla.">  -<!ENTITY plugins.installed.find "Cliquer pour charger les modules complémentaires du système installés"> -<!ENTITY plugins.installed.enable "Activer les modules complémentaires"> -<!ENTITY plugins.installed.disable "Désactiver les modules complémentaires"> -<!ENTITY plugins.installed.disable.tip "Cliquer pour empêcher le chargement de modules complémentaires du système"> +<!ENTITY plugins.installed.find "Cliquer pour charger les greffons système installés"> +<!ENTITY plugins.installed.enable "Activer les greffons"> +<!ENTITY plugins.installed.disable "Désactiver les greffons"> +<!ENTITY plugins.installed.disable.tip "Cliquer pour empêcher le chargement des greffons système"> diff --git a/src/chrome/locale/fr/brand.properties b/src/chrome/locale/fr/brand.properties index 375e8b1..f9fb5ac 100644 --- a/src/chrome/locale/fr/brand.properties +++ b/src/chrome/locale/fr/brand.properties @@ -10,7 +10,7 @@ vendorShortName=Projet Tor homePageSingleStartMain=Firefox Start, une page d'accueil rapide avec recherche intégrée homePageImport=Importez votre page d'accueil à partir de %S -homePageMigrationPageTitle=Sélection de la Page d'accueil -homePageMigrationDescription=S'il vous plaît sélectionnez la page d'accueil que vous souhaitez utiliser : +homePageMigrationPageTitle=Choix de la page d'accueil +homePageMigrationDescription=Veuillez choisir la page d'accueil que vous souhaitez utiliser : syncBrandShortName=Sync diff --git a/src/chrome/locale/fr/torbutton.dtd b/src/chrome/locale/fr/torbutton.dtd index 035203b..26c9eb1 100644 --- a/src/chrome/locale/fr/torbutton.dtd +++ b/src/chrome/locale/fr/torbutton.dtd @@ -2,61 +2,61 @@ <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "Nouveau circuit Tor pour ce site"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.preferences "Paramètres de sécurité ..."> +<!ENTITY torbutton.context_menu.preferences "Paramètres de sécurité..."> <!ENTITY torbutton.context_menu.preferences.key "S"> -<!ENTITY torbutton.context_menu.networksettings "Paramètres du réseau Tor"> +<!ENTITY torbutton.context_menu.networksettings "Paramètres du réseau Tor..."> <!ENTITY torbutton.context_menu.networksettings.key "N"> -<!ENTITY torbutton.context_menu.downloadUpdate "Vérifier les mises à jour du Navigateur Tor"> +<!ENTITY torbutton.context_menu.downloadUpdate "Vérifier les màj. du navigateur Tor"> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> -<!ENTITY torbutton.context_menu.cookieProtections "Protections contre les cookies"> -<!ENTITY torbutton.context_menu.cookieProtections.key "C"> -<!ENTITY torbutton.button.tooltip "Cliquez pour lancer Torbutton"> -<!ENTITY torbutton.prefs.security_settings "Tor Browser Security Settings"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.custom_warning "Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels."> -<!ENTITY torbutton.cookiedialog.title "Gérer les protections de cookies"> +<!ENTITY torbutton.context_menu.cookieProtections "Protections des fichiers témoins..."> +<!ENTITY torbutton.context_menu.cookieProtections.key "T"> +<!ENTITY torbutton.button.tooltip "Cliquer pour lancer Torbutton"> +<!ENTITY torbutton.prefs.security_settings "Paramètres de sécurité du navigateur Tor"> +<!ENTITY torbutton.prefs.restore_defaults "Revenir aux paramètres par défaut"> +<!ENTITY torbutton.prefs.custom_warning "Les préférences personnalisées de votre navigateur ont entraîné des paramètres de sécurité inhabituels. Pour des raisons de sécurité et de protection des informations personnelles, nous vous recommandons de choisir un des niveaux de sécurité par défaut."> +<!ENTITY torbutton.cookiedialog.title "Gérer les protections des fichiers témoins"> <!ENTITY torbutton.cookiedialog.lockCol "Protégé"> <!ENTITY torbutton.cookiedialog.domainCol "Hôte"> <!ENTITY torbutton.cookiedialog.nameCol "Nom"> <!ENTITY torbutton.cookiedialog.pathCol "Chemin"> -<!ENTITY torbutton.cookiedialog.protectCookie "Protéger le cookie"> -<!ENTITY torbutton.cookiedialog.removeCookie "Supprimer le cookie"> -<!ENTITY torbutton.cookiedialog.unprotectCookie "Déprotéger le cookie"> -<!ENTITY torbutton.cookiedialog.removeAllBut "Supprimer tous les cookies non protégés"> -<!ENTITY torbutton.cookiedialog.saveAllCookies "Protéger les nouveaux cookies"> -<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ne pas protéger les nouveaux cookies"> -<!ENTITY torbutton.prefs.restrict_thirdparty "Limiter les cookies tiers ainsi que les autres données de traçage"> +<!ENTITY torbutton.cookiedialog.protectCookie "Protéger le fichier témoin"> +<!ENTITY torbutton.cookiedialog.removeCookie "Enlever le fichier témoin"> +<!ENTITY torbutton.cookiedialog.unprotectCookie "Déprotéger le fichier témoin"> +<!ENTITY torbutton.cookiedialog.removeAllBut "Enlever tous les fichiers témoins non protégés"> +<!ENTITY torbutton.cookiedialog.saveAllCookies "Protéger les nouveaux fichiers témoins"> +<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ne pas protéger les nouveaux fichiers témoins"> +<!ENTITY torbutton.prefs.restrict_thirdparty "Limiter les fichiers témoins tiers et les autres données de traçage"> <!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R"> -<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets."> -<!ENTITY torbutton.prefs.resist_fingerprinting "Modifier les détails qui vous distinguent des autres utilisateurs du Navigateur Tor"> +<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Gardez cette case cochée pour empêcher que diverses fonctions du navigateur soient utilisées pour vous suivre à la trace lorsque vous surfez sur le Web. Les fonctions modifiées incluent les URL de grands objets binaires, les canaux de diffusion, le cache du navigateur, les fichiers fichiers témoins, les favoricônes, les en-têtes Auth HTTP, les préconnexions de liens, localStorage, les URL de sources de médias, les requêtes OCSP, les travailleurs Web SharedWorker, et les billets de session TLS."> +<!ENTITY torbutton.prefs.resist_fingerprinting "Modifier les détails qui vous distingue d'autres utilisateurs du navigateur Tor"> <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> -<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities."> +<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Gardez cette case cochée pour cacher aux sites Web certaines choses qui pourraient être uniques à votre sujet, incluant l'état de votre batterie, les performances de l'ordinateur, l'agencement du clavier, les paramètres de langue, l'emplacement des greffons installés, la liste de greffons installés, l'état de votre réseau, l'orientation de l'écran, les niveaux de zoom particuliers aux sites, les types de fichiers pris en charge, les couleurs système et les capacités WebGL."> <!ENTITY torbutton.prefs.sec_caption "Niveau de sécurité"> -<!ENTITY torbutton.prefs.sec_caption_tooltip "Le curseur de sécurité vous laisse mettre hors de service certaines fonctions de navigateur qui peuvent rendre votre navigateur plus vulnérable aux tentatives de piratage informatique."> -<!ENTITY torbutton.prefs.sec_low "Faible (par défaut)"> -<!ENTITY torbutton.prefs.sec_low_usable_desc "Cela offre l'expérience la plus agréable."> -<!ENTITY torbutton.prefs.sec_low_desc "A ce niveau de sécurité, toutes les fonctions de navigation sont activées."> -<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "Le mécanisme SVG OpenType de rendu des polices est désactivé."> -<!ENTITY torbutton.prefs.sec_med_low "Moyen-Bas"> -<!ENTITY torbutton.prefs.sec_gen_desc "À ce niveau de sécurité, les changements suivants s'appliquent (passez la souris au dessus pour afficher des détails) :"> -<!ENTITY torbutton.prefs.sec_html5_desc "Les média audio-vidéos HTML5 doivent être cliqués pour être lus (via NoScript)."> -<!ENTITY torbutton.prefs.sec_html5_tooltip "Sur quelques sites, vous pourriez avoir à utiliser le bouton de barre d'outils de NoScript pour autoriser ces objets multimédias."> -<!ENTITY torbutton.prefs.sec_some_jit_desc "Certaines optimisations liés à Javascript sont désactivées."> -<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "JIT ION, inférence de types, ASM.JS."> -<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "JIT Baseline."> -<!ENTITY torbutton.prefs.sec_jit_slower_desc "Les scripts sur certains sites peuvent être ralentis."> -<!ENTITY torbutton.prefs.sec_mathml_desc "Quelques mécanismes d'affichage d'équations mathématiques sont désactivés."> +<!ENTITY torbutton.prefs.sec_caption_tooltip "Le bouton coulissant Sécurité vous permet de désactiver certaines fonctions du navigateur qui le rendent plus vulnérable aux tentatives de piratage."> +<!ENTITY torbutton.prefs.sec_low "Bas (par défaut)"> +<!ENTITY torbutton.prefs.sec_low_usable_desc "Ceci offre l'expérience la plus conviviale."> +<!ENTITY torbutton.prefs.sec_low_desc "À ce niveau de sécurité, toutes les fonctions du navigateur sont activées."> +<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "Le mécanisme de rendu de police SVG OpenType est désactivé."> +<!ENTITY torbutton.prefs.sec_med_low "Moyen-bas"> +<!ENTITY torbutton.prefs.sec_gen_desc "À ce niveau de sécurité, les changements suivants sont applicables (survolez avec la souris pour plus de détails ) :"> +<!ENTITY torbutton.prefs.sec_html5_desc "Le contenu HTML5 vidéo et audio devient « cliquer pour lire » avec NoScript."> +<!ENTITY torbutton.prefs.sec_html5_tooltip "Pour certains sites, vous aurez peut-être à utiliser le bouton NoScript de la barre d'outils pour activer ces objets multimédias."> +<!ENTITY torbutton.prefs.sec_some_jit_desc "Certaines optimisations de performance de JavaScript sont désactivées."> +<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, inférence de type, ASM.JS."> +<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> +<!ENTITY torbutton.prefs.sec_jit_slower_desc "Les scripts pourraient être exécutés plus lentement sur certains sites."> +<!ENTITY torbutton.prefs.sec_mathml_desc "Certains mécanismes d'affichage des équations mathématiques sont désactivés."> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML est désactivé."> -<!ENTITY torbutton.prefs.sec_med_high "Moyennement haut"> -<!ENTITY torbutton.prefs.sec_all_jit_desc "Sur les sites où Javascript est permis, les optimisations de performance sont désactivées."> -<!ENTITY torbutton.prefs.sec_font_rend_desc "Certaines fonctionnalités de rendu de police sont désactivées."> -<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Le mécanisme de rendu de police de caractères Graphite est désactivé."> -<!ENTITY torbutton.prefs.sec_svg_desc "Certains formats d'images sont désactivés."> +<!ENTITY torbutton.prefs.sec_med_high "Moyen-haut"> +<!ENTITY torbutton.prefs.sec_all_jit_desc "Sur les sites où JavaScript est activé, les optimisations des performances sont désactivées."> +<!ENTITY torbutton.prefs.sec_font_rend_desc "Certaines fonctions de rendu de police sont désactivées."> +<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Le mécanisme de rendu de police Graphite est désactivé."> +<!ENTITY torbutton.prefs.sec_svg_desc "Certains types d'images sont désactivés."> <!ENTITY torbutton.prefs.sec_svg_desc_tooltip "Les images SVG sont désactivées."> -<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript est désactivé par défaut sur tous les sites non-HTTPS."> -<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript peut être activé selon le site via le bouton de barre d'outils NoScript."> -<!ENTITY torbutton.prefs.sec_high "Haut"> -<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript est désactivé par défaut sur tous les sites."> -<!ENTITY torbutton.prefs.sec_webfonts_desc "Certaines polices de caractères et icônes peuvent être affichées de façon incorrecte."> -<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Les fichiers de police de caractères fournis par des sites Web sont bloqués."> +<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript est désactivé par défaut pour tous les sites non HTTPS."> +<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript peut être activé par site avec le bouton NoScript de la barre d'outils"> +<!ENTITY torbutton.prefs.sec_high "Élevé"> +<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript est désactivé par défaut pour tous les sites."> +<!ENTITY torbutton.prefs.sec_webfonts_desc "Certains polices et icônes pourraient ne pas s'afficher correctement."> +<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Les polices fournies par les sites Web sont bloquées."> <!ENTITY torbutton.circuit_display.title "Circuit Tor pour ce site"> diff --git a/src/chrome/locale/ru/aboutTor.properties b/src/chrome/locale/ru/aboutTor.properties index 4d33808..055faae 100644 --- a/src/chrome/locale/ru/aboutTor.properties +++ b/src/chrome/locale/ru/aboutTor.properties @@ -20,9 +20,9 @@ aboutTor.searchDC.privacy.link=https://disconnect.me/privacy # The following string is a link which replaces %2$S above. aboutTor.searchDC.search.link=https://search.disconnect.me/ -aboutTor.donationBanner.donate=Donate Now! -aboutTor.donationBanner.heart=Tor is at the heart of Internet freedom -aboutTor.donationBanner.tagline1=Millions of People Depend on Tor for Online Security & Privacy -aboutTor.donationBanner.tagline2=A Network of People Protecting People -aboutTor.donationBanner.tagline3=Surveillance = Oppression -aboutTor.donationBanner.tagline4=Protecting Journalists, Activists & Whistleblowers Since 2006 +aboutTor.donationBanner.donate=Пожертвовать сейчас! +aboutTor.donationBanner.heart=Tor это сердце свободы Интернета +aboutTor.donationBanner.tagline1=Миллионы людей зависят от Tor в онлайн-безопасности и конфиденциальности +aboutTor.donationBanner.tagline2=Сеть людей, защищающих людей +aboutTor.donationBanner.tagline3=Наблюдение = Угнетение +aboutTor.donationBanner.tagline4=Защита журналистов, активистов и информаторов с 2006 года diff --git a/src/chrome/locale/ru/torbutton.dtd b/src/chrome/locale/ru/torbutton.dtd index de02dd2..c5c989a 100644 --- a/src/chrome/locale/ru/torbutton.dtd +++ b/src/chrome/locale/ru/torbutton.dtd @@ -11,9 +11,9 @@ <!ENTITY torbutton.context_menu.cookieProtections "Защита куки-файла"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Нажмите, чтобы инициализировать Torbutton"> -<!ENTITY torbutton.prefs.security_settings "Tor Browser Security Settings"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.custom_warning "Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels."> +<!ENTITY torbutton.prefs.security_settings "Настройки безопасности Tor Browser"> +<!ENTITY torbutton.prefs.restore_defaults "Восстановить значения по умолчанию"> +<!ENTITY torbutton.prefs.custom_warning "Ваши настройки браузера, привели к необычным параметрам безопасности. По соображениям безопасности и конфиденциальности, мы рекомендуем вам выбрать один из уровней безопасности по умолчанию."> <!ENTITY torbutton.cookiedialog.title "Управление защитой куки-файлов"> <!ENTITY torbutton.cookiedialog.lockCol "Защищено"> <!ENTITY torbutton.cookiedialog.domainCol "Ведущий узел"> diff --git a/src/chrome/locale/zh-CN/aboutTor.properties b/src/chrome/locale/zh-CN/aboutTor.properties index 4d017c3..421ac52 100644 --- a/src/chrome/locale/zh-CN/aboutTor.properties +++ b/src/chrome/locale/zh-CN/aboutTor.properties @@ -24,5 +24,5 @@ aboutTor.donationBanner.donate=立即捐助！ aboutTor.donationBanner.heart=Tor 是互联网自由的核心 aboutTor.donationBanner.tagline1=数百万人依靠 Tor 安全、私密地上网 aboutTor.donationBanner.tagline2=A Network of People Protecting People -aboutTor.donationBanner.tagline3=Surveillance = Oppression -aboutTor.donationBanner.tagline4=Protecting Journalists, Activists & Whistleblowers Since 2006 +aboutTor.donationBanner.tagline3=监视即压迫 +aboutTor.donationBanner.tagline4=为记者、告密者及活动人士提供保护，专注匿名安全 10 年

1 0

[tor-browser-bundle/maint-6.0] Remove the Go update from Changelog
by gk＠torproject.org 09 Nov '16

09 Nov '16

commit fe44fa5dc3e1eb5889f64114d0a8a03d144e7891 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 9 20:40:21 2016 +0000 Remove the Go update from Changelog --- Bundle-Data/Docs/ChangeLog.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index b2a0719..0758477 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -21,10 +21,6 @@ Tor Browser 6.0.6 -- November 15 * Bug 20342: Add tor-gencert.exe to expert bundle * OS X * Bug 20204: Windows don't drag on macOS Sierra anymore - * Bug 20250: Meek fails on macOS Sierra if built with Go < 1.7 - * Build system - * All platforms - * Bug 20023: Upgrade Go to 1.7.3 Tor Browser 6.0.5 -- September 16 * All Platforms

1 0

[tor-browser-bundle/maint-6.0] Revert "Upgrade Go to 1.6.3."
by gk＠torproject.org 09 Nov '16

09 Nov '16

commit a10a5a000c5eaf294d7afc01ba4c6b9af9f67e50 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 9 20:38:09 2016 +0000 Revert "Upgrade Go to 1.6.3." This reverts commit 3dee56db1330daa8df7e4d0c90d88bff17b80fec. --- .../linux/gitian-pluggable-transports.yml | 12 ---------- .../mac/gitian-pluggable-transports.yml | 27 +++++---------------- .../windows/gitian-pluggable-transports.yml | 28 +++++----------------- gitian/fetch-inputs.sh | 5 ++-- gitian/verify-tags.sh | 2 +- gitian/versions | 9 ++----- gitian/versions.alpha | 9 ++----- gitian/versions.beta | 9 ++----- gitian/versions.nightly | 9 ++----- 9 files changed, 23 insertions(+), 87 deletions(-) diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index a1cdc48..38ae561 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -46,7 +46,6 @@ files: - "zope.interface.zip" - "twisted.tar.bz2" - "parsley.tar.gz" -- "go14.tar.gz" - "go.tar.gz" - "dzip.sh" - "gmp-linux32-utils.zip" @@ -75,17 +74,6 @@ script: | # FTE only needs libgmp.so.10 and no libgmpxx anymore. cp $INSTDIR/gmp/lib/libgmp.so.10 $INSTDIR/Tor - # Building go 1.4.x - # This is needed to bootstrap the go that we actually use - # https://golang.org/doc/install/source#go14 - tar xvf go14.tar.gz --transform='s,^go\>,go1.4,' - cd go1.4/src - # Disable cgo to avoid conflicts with newer GCC. cgo is not needed for the bootstrap go. - # https://github.com/golang/go/issues/13114#issuecomment-186922245 - CGO_ENABLED=0 ./make.bash - cd ../.. - export GOROOT_BOOTSTRAP="$PWD/go1.4" - # Building go # http://golang.org/doc/install/source#environment export GOPATH="$HOME/go" diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index 33b134e..fbf38c2 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -45,7 +45,6 @@ files: - "zope.interface.zip" - "twisted.tar.bz2" - "parsley.tar.gz" -- "go14.tar.gz" - "go.tar.gz" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" @@ -104,33 +103,19 @@ script: | 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/ -F/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks -mmacosx-version-min=10.5 -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/i686-apple-darwin10/4.2.1$FTE_EXTRA_CFLAGS" export LDFLAGS="-L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -F/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks -mmacosx-version-min=10.5" - # Building go 1.4.x - # This is needed to bootstrap the go that we actually use - # https://golang.org/doc/install/source#go14 - tar xvf go14.tar.gz --transform='s,^go\>,go1.4,' - cd go1.4/src - # Disable cgo to avoid conflicts with newer GCC. cgo is not needed for the bootstrap go. - # https://github.com/golang/go/issues/13114#issuecomment-186922245 - # Disable CC etc. that are set up for cross builds. - CGO_ENABLED=0 CC= CFLAGS= LDFLAGS= ./make.bash - cd ../.. - export GOROOT_BOOTSTRAP="$PWD/go1.4" - # Building go - # 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 \"\$@\"" >> "$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 tar xvf go.tar.gz cd go/src - CGO_ENABLED=1 CC_FOR_TARGET="$CC_FOR_TARGET" CC= CFLAGS= LDFLAGS= ./make.bash + # http://golang.org/cmd/cgo/: + # "To enable cgo during cross compiling builds, set the CGO_ENABLED + # environment variable to 1 when building the Go tools with make.bash. Also, + # set CC_FOR_TARGET to the C cross compiler for the target. CC will be used + # for compiling for the host." + CGO_ENABLED=1 CC_FOR_TARGET="$CC $CFLAGS $LDFLAGS" CC= CFLAGS= LDFLAGS= ./make.bash cd ../.. export PATH="$PATH:$PWD/go/bin" diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index 7e8a349..f073fd1 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -47,7 +47,6 @@ files: - "wine-wrappers" - "python.msi" - "py2exe.exe" -- "go14.tar.gz" - "go.tar.gz" - "dzip.sh" - "pyc-timestamp.sh" @@ -140,34 +139,19 @@ script: | cp -a dist/gcc.exe dist/g++.exe dist/dllwrap.exe $WINEROOT/windows/ cd .. - # Building go 1.4.x - # This is needed to bootstrap the go that we actually use - # https://golang.org/doc/install/source#go14 - tar xvf go14.tar.gz --transform='s,^go\>,go1.4,' - cd go1.4/src - # Disable cgo to avoid conflicts with newer GCC. cgo is not needed for the bootstrap go. - # https://github.com/golang/go/issues/13114#issuecomment-186922245 - # Disable CC etc. that are set up for cross builds. - CGO_ENABLED=0 CC= CFLAGS= LDFLAGS= ./make.bash - cd ../.. - export GOROOT_BOOTSTRAP="$PWD/go1.4" - # Building go - CC=i686-w64-mingw32-gcc - # 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 \"\$@\"" >> "$CC_FOR_TARGET" - chmod +x "$CC_FOR_TARGET" # http://golang.org/doc/install/source#environment export GOPATH="$HOME/go" export GOOS=windows export GOARCH=386 tar xvf go.tar.gz cd go/src - CGO_ENABLED=1 CC_FOR_TARGET="$CC_FOR_TARGET" CC= CFLAGS= LDFLAGS= ./make.bash + # http://golang.org/cmd/cgo/: + # "To enable cgo during cross compiling builds, set the CGO_ENABLED + # environment variable to 1 when building the Go tools with make.bash. Also, + # set CC_FOR_TARGET to the C cross compiler for the target. CC will be used + # for compiling for the host." + CGO_ENABLED=1 CC_FOR_TARGET="i686-w64-mingw32-gcc" CC= CFLAGS= LDFLAGS= ./make.bash cd ../.. export PATH="$PATH:$PWD/go/bin" diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 50daec0..b5adfc2 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 GO STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN PYCRYPTO 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 + 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 +for i in OSXSDK OSXSDK_OLD TOOLCHAIN4_OLD CCTOOLS NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT NSIS NSIS_DEBIAN do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" @@ -243,7 +243,6 @@ ln -sf "$PY2EXE_PACKAGE" py2exe.exe ln -sf "$SETUPTOOLS_PACKAGE" setuptools.tar.gz ln -sf "$GMP_PACKAGE" gmp.tar.bz2 ln -sf "$PARSLEY_PACKAGE" parsley.tar.gz -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 diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index d95b0e0..33b54a4 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -144,7 +144,7 @@ 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 +for i in OSXSDK OSXSDK_OLD TOOLCHAIN4_OLD CCTOOLS NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY 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 387b7c5..143d56d 100755 --- a/gitian/versions +++ b/gitian/versions @@ -60,9 +60,7 @@ TWISTED_VER=13.2.0 PY2EXE_VER=0.6.9 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.6.3 +GO_VER=1.4.3 NSIS_VER=2.51 ## File names for the source packages @@ -85,7 +83,6 @@ TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz -GO14_PACKAGE=go${GO14_VER}.src.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz NSIS_PACKAGE=nsis-${NSIS_VER}-src.tar.bz2 NSIS_DEBIAN_PACKAGE=nsis_${NSIS_VER}-1.debian.tar.xz @@ -113,8 +110,7 @@ TWISTED_HASH=095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3 PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 -GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 -GO_HASH=6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00 +GO_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad @@ -144,7 +140,6 @@ TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… PY2EXE_URL=http://downloads.sourceforge.net/py2exe/${PY2EXE_VER}/${PY2EXE_P… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… -GO14_URL=https://golang.org/dl/${GO14_PACKAGE} GO_URL=https://golang.org/dl/${GO_PACKAGE} NSIS_URL=http://downloads.sourceforge.net/nsis/${NSIS_PACKAGE} NSIS_DEBIAN_URL=http://http.debian.net/debian/pool/main/n/nsis/${NSIS_DEBIA… diff --git a/gitian/versions.alpha b/gitian/versions.alpha index d6044ce..65acf45 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -60,9 +60,7 @@ TWISTED_VER=13.2.0 PY2EXE_VER=0.6.9 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.6.3 +GO_VER=1.4.2 NSIS_VER=2.51 ## File names for the source packages @@ -85,7 +83,6 @@ TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz -GO14_PACKAGE=go${GO14_VER}.src.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz NSIS_PACKAGE=nsis-${NSIS_VER}-src.tar.bz2 NSIS_DEBIAN_PACKAGE=nsis_${NSIS_VER}-1.debian.tar.xz @@ -113,8 +110,7 @@ TWISTED_HASH=095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3 PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 -GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 -GO_HASH=6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00 +GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad @@ -144,7 +140,6 @@ TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… PY2EXE_URL=http://downloads.sourceforge.net/py2exe/${PY2EXE_VER}/${PY2EXE_P… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… -GO14_URL=https://golang.org/dl/${GO14_PACKAGE} GO_URL=https://golang.org/dl/${GO_PACKAGE} NSIS_URL=http://downloads.sourceforge.net/nsis/${NSIS_PACKAGE} NSIS_DEBIAN_URL=http://http.debian.net/debian/pool/main/n/nsis/${NSIS_DEBIA… diff --git a/gitian/versions.beta b/gitian/versions.beta index 1ff14b8..2564e41 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -47,9 +47,7 @@ TWISTED_VER=13.2.0 PY2EXE_VER=0.6.9 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.6.3 +GO_VER=1.4.2 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -70,7 +68,6 @@ TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz -GO14_PACKAGE=go${GO14_VER}.src.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz STIXMATHFONT_PACKAGE=STIXv1.1.1-latex.zip NOTOEMOJIFONT_PACKAGE=NotoEmoji-Regular.ttf @@ -95,8 +92,7 @@ TWISTED_HASH=095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3 PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 -GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 -GO_HASH=6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00 +GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da @@ -122,7 +118,6 @@ TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… PY2EXE_URL=http://downloads.sourceforge.net/py2exe/${PY2EXE_VER}/${PY2EXE_P… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… -GO14_URL=https://golang.org/dl/${GO14_PACKAGE} GO_URL=https://golang.org/dl/${GO_PACKAGE} STIXMATHFONT_URL=http://iweb.dl.sourceforge.net/project/stixfonts/Current%2… NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd… diff --git a/gitian/versions.nightly b/gitian/versions.nightly index f4475bc..781d4ae 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -67,9 +67,7 @@ TWISTED_VER=13.2.0 PY2EXE_VER=0.6.9 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.6.3 +GO_VER=1.4.2 NSIS_VER=2.51 ## File names for the source packages @@ -92,7 +90,6 @@ TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz -GO14_PACKAGE=go${GO14_VER}.src.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz NSIS_PACKAGE=nsis-${NSIS_VER}-src.tar.bz2 NSIS_DEBIAN_PACKAGE=nsis_${NSIS_VER}-1.debian.tar.xz @@ -120,8 +117,7 @@ TWISTED_HASH=095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3 PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 -GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 -GO_HASH=6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00 +GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad @@ -151,7 +147,6 @@ TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… PY2EXE_URL=http://downloads.sourceforge.net/py2exe/${PY2EXE_VER}/${PY2EXE_P… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… -GO14_URL=https://golang.org/dl/${GO14_PACKAGE} GO_URL=https://golang.org/dl/${GO_PACKAGE} NSIS_URL=http://downloads.sourceforge.net/nsis/${NSIS_PACKAGE} NSIS_DEBIAN_URL=http://http.debian.net/debian/pool/main/n/nsis/${NSIS_DEBIA…

1 0

[tor-browser-bundle/maint-6.0] Revert "Bug 20023: Upgrade Go to 1.7.3."
by gk＠torproject.org 09 Nov '16

09 Nov '16

commit 8e93f0ddb6b018c6d5a28c2063554bb5174d9c45 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 9 20:37:53 2016 +0000 Revert "Bug 20023: Upgrade Go to 1.7.3." This reverts commit 4a0bf1ed2578e3e742e00f95385f914a241904fd. --- gitian/descriptors/mac/gitian-pluggable-transports.yml | 12 +++++------- gitian/versions | 4 ++-- gitian/versions.alpha | 4 ++-- gitian/versions.beta | 4 ++-- gitian/versions.nightly | 4 ++-- 5 files changed, 13 insertions(+), 15 deletions(-) diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index 519a3ee..33b134e 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -48,7 +48,6 @@ files: - "go14.tar.gz" - "go.tar.gz" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" -- "MacOSX10.7.sdk.tar.gz" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" - "dzip.sh" - "gmp-mac64-utils.zip" @@ -83,8 +82,6 @@ script: | export PATH="/usr/sbin:/sbin:$PATH" sudo dpkg -i *.deb tar xaf multiarch-darwin*tar.xz - # 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/" if [ "z$INCLUDE_FTE" = "z1" ]; then unzip -d $INSTDIR gmp-mac64-utils.zip @@ -102,6 +99,10 @@ script: | export CXX=$HOME/build/apple-osx/bin/i686-apple-darwin11-g++ # http://bugs.python.org/issue9437 export LDSHARED="$CC -pthread -shared" + # 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/ -F/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks -mmacosx-version-min=10.5 -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/i686-apple-darwin10/4.2.1$FTE_EXTRA_CFLAGS" + 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/ -F/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks -mmacosx-version-min=10.5 -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/i686-apple-darwin10/4.2.1$FTE_EXTRA_CFLAGS" + export LDFLAGS="-L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -F/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks -mmacosx-version-min=10.5" # Building go 1.4.x # This is needed to bootstrap the go that we actually use @@ -121,7 +122,7 @@ 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" @@ -129,9 +130,6 @@ script: | export GOARCH=386 tar xvf go.tar.gz cd go/src - # 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 CGO_ENABLED=1 CC_FOR_TARGET="$CC_FOR_TARGET" CC= CFLAGS= LDFLAGS= ./make.bash cd ../.. export PATH="$PATH:$PWD/go/bin" diff --git a/gitian/versions b/gitian/versions index 2be65b4..387b7c5 100755 --- a/gitian/versions +++ b/gitian/versions @@ -62,7 +62,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.3 +GO_VER=1.6.3 NSIS_VER=2.51 ## File names for the source packages @@ -114,7 +114,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 -GO_HASH=79430a0027a09b0b3ad57e214c4c1acfdd7af290961dd08d322818895af1ef44 +GO_HASH=6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 68be3f3..d6044ce 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -62,7 +62,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.3 +GO_VER=1.6.3 NSIS_VER=2.51 ## File names for the source packages @@ -114,7 +114,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 -GO_HASH=79430a0027a09b0b3ad57e214c4c1acfdd7af290961dd08d322818895af1ef44 +GO_HASH=6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad diff --git a/gitian/versions.beta b/gitian/versions.beta index e19f53b..1ff14b8 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -49,7 +49,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.3 +GO_VER=1.6.3 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -96,7 +96,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 -GO_HASH=79430a0027a09b0b3ad57e214c4c1acfdd7af290961dd08d322818895af1ef44 +GO_HASH=6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00 STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 75cb02b..f4475bc 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -69,7 +69,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.3 +GO_VER=1.6.3 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=79430a0027a09b0b3ad57e214c4c1acfdd7af290961dd08d322818895af1ef44 +GO_HASH=6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad

1 0

[tor-browser-bundle/maint-6.0] Use the tor browser build2 tag
by gk＠torproject.org 09 Nov '16

09 Nov '16

commit 7268d7b63d3a6dc8c71fbb1d5ff8892d25884019 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 9 18:52:10 2016 +0000 Use the tor browser build2 tag --- gitian/versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions b/gitian/versions index c08c7be..2be65b4 100755 --- a/gitian/versions +++ b/gitian/versions @@ -14,7 +14,7 @@ FIREFOX_VERSION=45.5.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build2 TOR_TAG=tor-0.2.8.9 TORLAUNCHER_TAG=0.2.9.4 TORBUTTON_TAG=1.9.5.8

1 0

[tor-browser/tor-browser-45.5.0esr-6.0-1] fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.
by gk＠torproject.org 09 Nov '16

09 Nov '16

commit f0382d95b8145b91bae099024bce64affff34523 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Nov 9 12:02:00 2016 -0500 fixup! Bug #4234: Use the Firefox Update Process for Tor Browser. Modify the AddSymlink implementation to use absolute paths when creating symlinks. This fixes a compile error that was introduced due to the changes Mozilla made for https://bugzilla.mozilla.org/show_bug.cgi?id=1246972. --- toolkit/mozapps/update/updater/updater.cpp | 47 ++++++++++++++++++------------ 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/toolkit/mozapps/update/updater/updater.cpp b/toolkit/mozapps/update/updater/updater.cpp index 9e45698..d6d0f09 100644 --- a/toolkit/mozapps/update/updater/updater.cpp +++ b/toolkit/mozapps/update/updater/updater.cpp @@ -1986,9 +1986,7 @@ PatchIfFile::Finish(int status) class AddSymlink : public Action { public: - AddSymlink() : mLinkName(NULL) - , mTarget(NULL) - , mAdded(false) + AddSymlink() : mAdded(false) { } virtual int Parse(NS_tchar *line); @@ -1997,8 +1995,9 @@ public: virtual void Finish(int status); private: - const NS_tchar *mLinkName; - const NS_tchar *mTarget; + mozilla::UniquePtr<NS_tchar[]> mLinkPath; + mozilla::UniquePtr<NS_tchar[]> mRelPath; + mozilla::UniquePtr<NS_tchar[]> mTarget; bool mAdded; }; @@ -2007,26 +2006,36 @@ AddSymlink::Parse(NS_tchar *line) { // format "<linkname>" "target" - mLinkName = get_valid_path(&line); - if (!mLinkName) + NS_tchar * validPath = get_valid_path(&line); + if (!validPath) return PARSE_ERROR; + mRelPath = mozilla::MakeUnique<NS_tchar[]>(MAXPATHLEN); + NS_tstrcpy(mRelPath.get(), validPath); + mLinkPath.reset(get_full_path(validPath)); + if (!mLinkPath) { + return PARSE_ERROR; + } + // consume whitespace between args NS_tchar *q = mstrtok(kQuote, &line); if (!q) return PARSE_ERROR; - mTarget = get_valid_path(&line, false, true); - if (!mTarget) + validPath = get_valid_path(&line, false, true); + if (!validPath) return PARSE_ERROR; + mTarget = mozilla::MakeUnique<NS_tchar[]>(MAXPATHLEN); + NS_tstrcpy(mTarget.get(), validPath); + return OK; } int AddSymlink::Prepare() { - LOG(("PREPARE ADDSYMLINK " LOG_S " -> " LOG_S, mLinkName, mTarget)); + LOG(("PREPARE ADDSYMLINK " LOG_S " -> " LOG_S, mRelPath.get(), mTarget.get())); return OK; } @@ -2034,26 +2043,26 @@ AddSymlink::Prepare() int AddSymlink::Execute() { - LOG(("EXECUTE ADDSYMLINK " LOG_S " -> " LOG_S, mLinkName, mTarget)); + LOG(("EXECUTE ADDSYMLINK " LOG_S " -> " LOG_S, mRelPath.get(), mTarget.get())); // First make sure that we can actually get rid of any existing file or link. struct stat linkInfo; - int rv = lstat(mLinkName, &linkInfo); + int rv = lstat(mLinkPath.get(), &linkInfo); if ((0 == rv) && !S_ISLNK(linkInfo.st_mode)) { - rv = NS_taccess(mLinkName, F_OK); + rv = NS_taccess(mLinkPath.get(), F_OK); } if (rv == 0) { - rv = backup_create(mLinkName); + rv = backup_create(mLinkPath.get()); if (rv) return rv; } else { - rv = ensure_parent_dir(mLinkName); + rv = ensure_parent_dir(mLinkPath.get()); if (rv) return rv; } // Create the link. - rv = symlink(mTarget, mLinkName); + rv = symlink(mTarget.get(), mLinkPath.get()); if (!rv) { mAdded = true; } @@ -2064,12 +2073,12 @@ AddSymlink::Execute() void AddSymlink::Finish(int status) { - LOG(("FINISH ADDSYMLINK " LOG_S " -> " LOG_S, mLinkName, mTarget)); + LOG(("FINISH ADDSYMLINK " LOG_S " -> " LOG_S, mRelPath.get(), mTarget.get())); // When there is an update failure and a link has been added it is removed // here since there might not be a backup to replace it. if (status && mAdded) - NS_tremove(mLinkName); - backup_finish(mLinkName, status); + NS_tremove(mLinkPath.get()); + backup_finish(mLinkPath.get(), mRelPath.get(), status); } #endif

1 0

[torbutton/master] Bug 20264: Change security slider to 3 options (H, M, L)
by gk＠torproject.org 09 Nov '16

09 Nov '16

commit 6c423a9aa505882bbb7685f3175dc131baad8809 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Oct 19 11:55:21 2016 -0700 Bug 20264: Change security slider to 3 options (H,M,L) --- src/chrome/content/preferences.js | 13 ++++++++--- src/chrome/content/preferences.xul | 47 ++++++-------------------------------- src/chrome/locale/en/torbutton.dtd | 3 +-- src/modules/security-prefs.js | 19 ++++++++++----- 4 files changed, 31 insertions(+), 51 deletions(-) diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js index 7856ef1..3bb6c0c 100644 --- a/src/chrome/content/preferences.js +++ b/src/chrome/content/preferences.js @@ -7,11 +7,16 @@ let { getBoolPref, getIntPref, setBoolPref, setIntPref } = // Description elements have the follow names. const descNames = - [, "desc_high", "desc_medium_high", "desc_medium_low", "desc_low"]; + [, "desc_high", "desc_medium", "desc_low"]; // A single `state` object that reflects the user settings in this UI. let state = { slider : 0, custom : false}; +// Utility functions to convert between the legacy 4-value pref index +// and the 3-valued security slider. +let sliderPositionToPrefSetting = pos => [, 1, 2, 4][pos]; +let prefSettingToSliderPosition = pref => [, 1, 2, 2, 3][pref]; + // Set the desired slider value and update UI. function torbutton_set_slider(sliderPosition) { state.slider = sliderPosition; @@ -33,12 +38,14 @@ function torbutton_set_custom(customValue) { // Read prefs 'extensions.torbutton.security_slider' and // 'extensions.torbutton.security_custom', and initialize the UI. function torbutton_init_security_ui() { - torbutton_set_slider(getIntPref("extensions.torbutton.security_slider")); + torbutton_set_slider(prefSettingToSliderPosition( + getIntPref("extensions.torbutton.security_slider"))); torbutton_set_custom(getBoolPref("extensions.torbutton.security_custom")); }; // Write the two prefs from the current settings. function torbutton_save_security_settings() { - setIntPref("extensions.torbutton.security_slider", state.slider); + setIntPref("extensions.torbutton.security_slider", + sliderPositionToPrefSetting(state.slider)); setBoolPref("extensions.torbutton.security_custom", state.custom); }; diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul index 53abd7f..c6432e0 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -28,7 +28,7 @@ <vbox> <hbox height="200"> <vbox> - <scale id="torbutton_sec_slider" flex="1" min="1" max="4" + <scale id="torbutton_sec_slider" flex="1" min="1" max="3" movetoclick="true" orient="vertical" onchange="torbutton_set_slider(this.value)"/> </vbox> @@ -41,22 +41,15 @@ </description> </hbox> <hbox flex="1" align="center"> - <description id="torbutton_sec_med_high" + <description id="torbutton_sec_medium" onclick="torbutton_set_slider(2);" - tooltip="mh_preview"> - &torbutton.prefs.sec_med_high; - </description> - </hbox> - <hbox flex="1" align="center"> - <description id="torbutton_sec_med_low" - onclick="torbutton_set_slider(3);" - tooltip="ml_preview"> - &torbutton.prefs.sec_med_low; + tooltip="medium_preview"> + &torbutton.prefs.sec_medium; </description> </hbox> <hbox flex="1" align="end"> <description id="torbutton_sec_low" - onclick="torbutton_set_slider(4);" + onclick="torbutton_set_slider(3);" tooltip="low_preview"> &torbutton.prefs.sec_low; </description> @@ -101,7 +94,7 @@ &torbutton.prefs.sec_webfonts_desc; </description> </vbox> - <vbox id="desc_medium_high" collapsed="true"> + <vbox id="desc_medium" collapsed="true"> <description class="slider-text-size, slider-text-weight"> &torbutton.prefs.sec_gen_desc; @@ -127,24 +120,6 @@ &torbutton.prefs.sec_font_rend_desc; </description> </vbox> - <vbox id="desc_medium_low" collapsed="true"> - <description - class="slider-text-size, slider-text-weight"> - &torbutton.prefs.sec_gen_desc; - </description> - <description class="slider-text-size" - tooltiptext="&torbutton.prefs.sec_jit_desc_tooltip;"> - &torbutton.prefs.sec_some_jit_desc; &torbutton.prefs.sec_jit_slower_desc; - </description> - <description class="slider-text-size" - tooltiptext="&torbutton.prefs.sec_html5_tooltip;"> - &torbutton.prefs.sec_html5_desc; - </description> - <description class="slider-text-size" - tooltiptext="&torbutton.prefs.sec_mathml_desc_tooltip;"> - &torbutton.prefs.sec_mathml_desc; - </description> - </vbox> <vbox id="desc_low" collapsed="false"> <description class="slider-text-size, slider-text-weight"> @@ -185,7 +160,7 @@ <html:div>&torbutton.prefs.sec_svg_desc;</html:div> <html:div>&torbutton.prefs.sec_webfonts_desc;</html:div> </tooltip> - <tooltip id="mh_preview"> + <tooltip id="medium_preview"> <html:b>&torbutton.prefs.sec_gen_desc;</html:b> <html:br></html:br> <html:br></html:br> @@ -195,14 +170,6 @@ <html:div>&torbutton.prefs.sec_mathml_desc;</html:div> <html:div>&torbutton.prefs.sec_font_rend_desc;</html:div> </tooltip> - <tooltip id="ml_preview"> - <html:b>&torbutton.prefs.sec_gen_desc;</html:b> - <html:br></html:br> - <html:br></html:br> - <html:div>&torbutton.prefs.sec_some_jit_desc; &torbutton.prefs.sec_jit_slower_desc;</html:div> - <html:div>&torbutton.prefs.sec_html5_desc;</html:div> - <html:div>&torbutton.prefs.sec_mathml_desc;</html:div> - </tooltip> <tooltip id="low_preview"> <html:b>&torbutton.prefs.sec_low_desc;</html:b> <html:br></html:br> diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd index 0c10406..97a994f 100644 --- a/src/chrome/locale/en/torbutton.dtd +++ b/src/chrome/locale/en/torbutton.dtd @@ -37,7 +37,6 @@ <!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience."> <!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled."> <!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled."> -<!ENTITY torbutton.prefs.sec_med_low "Medium-Low"> <!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):"> <!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."> @@ -47,7 +46,7 @@ <!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."> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled."> -<!ENTITY torbutton.prefs.sec_med_high "Medium-High"> +<!ENTITY torbutton.prefs.sec_medium "Medium"> <!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled."> <!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled."> <!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled."> diff --git a/src/modules/security-prefs.js b/src/modules/security-prefs.js index fa30aba..e6a888c 100644 --- a/src/modules/security-prefs.js +++ b/src/modules/security-prefs.js @@ -15,18 +15,19 @@ let log = (level, msg) => logger.log(level, msg); // __kSecuritySettings__. // A table of all prefs bound to the security slider, and the value -// for each security setting. +// for each security setting. Note that 2-m and 3-m are identical, +// corresponding to the old 2-medium-high setting. const kSecuritySettings = { - // Preference name : [0, 1-high 2-mh 3-ml 4-low] + // 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 ], "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, true, true ], - "gfx.font_rendering.opentype_svg.enabled" : [, false, false, true, true ], - "noscript.global" : [, false, false, true, true ], - "noscript.globalHttpsWhitelist" : [, false, true, false, 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], "noscript.forbidFonts" : [, true, false, false, false], "svg.in-content.enabled" : [, false, true, true, true ], }; @@ -123,6 +124,12 @@ var initialize = function () { setBoolPref(kCustomPref, false); } }); + // Migrate from old medium-low (3) to new medium (2). + if (getBoolPref("extensions.torbutton.security_custom") === false && + getIntPref("extensions.torbutton.security_slider") === 3) { + setIntPref("extensions.torbutton.security_slider", 2); + write_setting_to_prefs(2); + } log(4, "security-prefs.js initialization complete"); };

1 0

[tor-browser/tor-browser-45.4.0esr-6.5-1] fixup! TB3: Tor Browser's official .mozconfigs.
by gk＠torproject.org 09 Nov '16

09 Nov '16

commit db846f717b90c587b1934c65dd973e0ba0f14acd Author: Nicolas Vigier <boklm(a)mars-attacks.org> Date: Tue Nov 8 17:20:36 2016 +0100 fixup! TB3: Tor Browser's official .mozconfigs. Bug 20439: make the build PIE on OSX --- .mozconfig-mac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mozconfig-mac b/.mozconfig-mac index 96f036a..cda309a 100644 --- a/.mozconfig-mac +++ b/.mozconfig-mac @@ -10,7 +10,7 @@ export CC="$topsrcdir/clang/bin/clang $FLAGS" export CXX="$topsrcdir/clang/bin/clang++ $FLAGS" export CPP="$topsrcdir/clang/bin/clang $FLAGS -E" export LLVMCONFIG=$topsrcdir/clang/bin/llvm-config -export LDFLAGS="-Wl,-syslibroot,$CROSS_SYSROOT -Wl,-dead_strip" +export LDFLAGS="-Wl,-syslibroot,$CROSS_SYSROOT -Wl,-dead_strip -Wl,-pie" export TOOLCHAIN_PREFIX=$CROSS_CCTOOLS_PATH/bin/x86_64-apple-darwin10- #TODO: bug 1184202 - would be nice if these could be detected with TOOLCHAIN_PREFIX automatically export AR=${TOOLCHAIN_PREFIX}ar

1 0

[tor-browser-bundle/master] Bug 20439: make the build PIE on OSX
by gk＠torproject.org 09 Nov '16

09 Nov '16

commit 565f2cc6e5c8e496bc50f03defa98947e24c93c4 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Nov 8 17:32:00 2016 +0100 Bug 20439: make the build PIE on OSX --- gitian/descriptors/mac/gitian-firefox.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index 7461031..aae6139 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -40,6 +40,23 @@ script: | tar xaf ../MacOSX10.7.sdk.tar.gz tar xaf ../cctools.tar.gz unzip ../clang-linux64-wheezy-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: + # libtool: compile: unable to infer tagged configuration + # To avoid this error, we add -fPIE using wrappers on clang and clang++ + mv clang/bin/clang clang/bin/clang.real + mv clang/bin/clang++ clang/bin/clang++.real + cat > clang/bin/clang << EOF + #!/bin/sh + exec $(pwd)/clang/bin/clang.real -fPIE "\$@" + EOF + cat > clang/bin/clang++ << EOF + #!/bin/sh + exec $(pwd)/clang/bin/clang++.real -fPIE "\$@" + EOF + chmod +x clang/bin/clang clang/bin/clang++ + # TB_COMMIT_DATE=$(git show -s --format='%ci') COPYRIGHT_YEAR=${TB_COMMIT_DATE%%-*} mv .mozconfig-mac .mozconfig

1 0