March 2015 - tor-commits - lists.torproject.org

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 25 Mar '15

25 Mar '15

commit 7073b267bec3b15d8654e10a1bc7bd2ba78c318a Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 25 08:45:48 2015 +0000 Update translations for torbutton-torbuttondtd --- fa/torbutton.dtd | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/fa/torbutton.dtd b/fa/torbutton.dtd index 26dbcf3..518a836 100644 --- a/fa/torbutton.dtd +++ b/fa/torbutton.dtd @@ -13,9 +13,9 @@ <!ENTITY torbutton.about.title "دربارۀ دکمه تُر"> <!ENTITY torbutton.about.version "نسخه :"> <!ENTITY torbutton.about.summary "محافظت از حریم خصوصی در هنگام وبگردی با تُر."> -<!ENTITY torbutton.about.code "کانون کد :"> +<!ENTITY torbutton.about.code "همکاران کد :"> <!ENTITY torbutton.about.maintainer "نگهدارنده :"> -<!ENTITY torbutton.about.security_review "دیدگاه های ایمنی :"> +<!ENTITY torbutton.about.security_review "نکات امنیتی :"> <!ENTITY torbutton.about.donate "اگر مایل به استفاده از تُر هستید، میتوانید مدنظر قرار دهید"> <!ENTITY torbutton.about.make_donation "اهداء کمک نقدی."> <!ENTITY torbutton.pref_connection.notice "غيرفعال کردن دکمه تُر جهت تغيير دراين تنظيمات."> @@ -23,10 +23,10 @@ <!ENTITY torbutton.pref_connection_more_info.title "راهنما"> <!ENTITY torbutton.pref_connection_more_info.text "دکمه تُرهم اکنون فعال شده است.اگر می‌خواهيد تنظيمات پراکسی غيرمرتبط با تُر را تغيير دهيد، لطفا دکمه تُر را غيرفعال کنيد و دوباره به اينجا بازگرديد. اگر ميخواهيد تنظيمات تُر را تغيير دهيد، از پنجره تنظيمات دکمه تُر استفاده کنيد."> <!ENTITY torbutton.context_menu.new_identity "هویت جدید"> -<!ENTITY torbutton.context_menu.new_identity_key "من"> -<!ENTITY torbutton.context_menu.new_circuit "مدار جدید Tor برای این سایت"> +<!ENTITY torbutton.context_menu.new_identity_key "I"> +<!ENTITY torbutton.context_menu.new_circuit "شبکه جدید Tor برای این سایت"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.toggle "ضامن فعال/غيرفعال کردن تُر"> +<!ENTITY torbutton.context_menu.toggle "دکمه فعال/غيرفعال کردن تُر"> <!ENTITY torbutton.context_menu.toggle.key "T"> <!ENTITY torbutton.context_menu.preferences "حفظ حریم خصوصی و تنظیمات امنیتی"> <!ENTITY torbutton.context_menu.preferences.key "P"> @@ -34,7 +34,7 @@ <!ENTITY torbutton.context_menu.about.key "A"> <!ENTITY torbutton.context_menu.networksettings "تنظیمات شبکه تور"> <!ENTITY torbutton.context_menu.networksettings.key "S"> -<!ENTITY torbutton.context_menu.downloadUpdate "بررسی برای به روز رسانی Tor Browser ..."> +<!ENTITY torbutton.context_menu.downloadUpdate "بررسی بروز رسانی Tor Browser ..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "حفاظت کوکی ها..."> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> @@ -64,14 +64,14 @@ <!ENTITY torbutton.prefs.no_updates "غیرفعال کردن به‌روزرسانی در هنگام استفاده از تُر"> <!ENTITY torbutton.prefs.set_uagent "تعيين کاربر برای استفاده از تُر (بسیار مهم)"> <!ENTITY torbutton.prefs.dynamic "محتوای پویا"> -<!ENTITY torbutton.prefs.cookies "کلوچک‌ها"> +<!ENTITY torbutton.prefs.cookies "کوکی ها"> <!ENTITY torbutton.prefs.cache "ذخيره‌گاه"> <!ENTITY torbutton.prefs.history "تاریخچه"> <!ENTITY torbutton.prefs.no_search "غیرفعال کردن پیشنهادهای جستجو هنگام اجرای تُر (توصیه شده)"> -<!ENTITY torbutton.prefs.shutdown "بستن"> -<!ENTITY torbutton.prefs.tor_shutdown "پاک کردن کلوچک‌های تُردرهنگام بستن مرورگری که با تُر کار می‌کند"> -<!ENTITY torbutton.prefs.all_shutdown "پاک کردن کلوچک‌ها هنگام بستن هر مرورگری"> -<!ENTITY torbutton.prefs.no_shutdown "پاک نکردن کلوچک‌ها هنگام بستن"> +<!ENTITY torbutton.prefs.shutdown "خاموش کردن"> +<!ENTITY torbutton.prefs.tor_shutdown "پاک کردن کوکی های تُردرهنگام بستن مرورگری که با تُر کار می‌کند"> +<!ENTITY torbutton.prefs.all_shutdown "پاک کردن کوکی ها هنگام بستن هر مرورگری"> +<!ENTITY torbutton.prefs.no_shutdown "پاک نکردن کوکی ها هنگام بستن"> <!ENTITY torbutton.prefs.disable_sessionstore "غیرفعال کردن ذخیره‌سازی نشست (Session) ها (توصیه شده)"> <!ENTITY torbutton.prefs.headers "سربرگ‌ها"> <!ENTITY torbutton.prefs.spoof_english "جعل هویت یک مرورگر با زبان انگليسی آمریکایی">

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 25 Mar '15

25 Mar '15

commit cc025d9c8606238dcb935bf32d0ef35d6e86e2e1 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 25 08:15:47 2015 +0000 Update translations for torbutton-torbuttondtd --- fa/torbutton.dtd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fa/torbutton.dtd b/fa/torbutton.dtd index 69debb2..26dbcf3 100644 --- a/fa/torbutton.dtd +++ b/fa/torbutton.dtd @@ -9,7 +9,7 @@ <!ENTITY torbutton.prefs.proxy.host.ftp "پراکسی FTP:"> <!ENTITY torbutton.prefs.proxy.host.gopher "پراکسی Gopher:"> <!ENTITY torbutton.prefs.proxy.host.socks "ميزبان SOCKS:"> -<!ENTITY torbutton.prefs.proxy.port "درگاهی (Port):"> +<!ENTITY torbutton.prefs.proxy.port "درگاه (Port):"> <!ENTITY torbutton.about.title "دربارۀ دکمه تُر"> <!ENTITY torbutton.about.version "نسخه :"> <!ENTITY torbutton.about.summary "محافظت از حریم خصوصی در هنگام وبگردی با تُر."> @@ -158,14 +158,14 @@ <!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "مکانیسم رندر فونت SVG اپن تایپ غیر فعال است."> <!ENTITY torbutton.prefs.sec_med_low "متوسط - کم"> <!ENTITY torbutton.prefs.sec_gen_desc "در این سطح امنیتی، تغییرات زیر اعمال می شود (خلاصه شده برای جزئیات بیشتر):"> -<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript."> -<!ENTITY torbutton.prefs.sec_html5_tooltip "در برخی سایت ها، ممکن است شما نیاز به استفاده از دکمه نوار ابزار NoScript برای فعال کردن این اشیاء رسانه داشته باشید."> +<!ENTITY torbutton.prefs.sec_html5_desc "صدا و تصویر HTML5 از طریق دکمه NoScript نوار ابزار به حالت -کلیک برای پخش- در می آید"> +<!ENTITY torbutton.prefs.sec_html5_tooltip "در برخی سایت ها، ممکن است شما نیاز به استفاده از دکمه NoScript نوار ابزار برای فعال کردن این اشیاء رسانه داشته باشید."> <!ENTITY torbutton.prefs.sec_some_jit_desc "برخی از بهینه سازی عملکرد جاوا اسکریپت غیر فعال شده است."> <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "JIT در شروع مطالعه."> <!ENTITY torbutton.prefs.sec_jit_slower_desc "اسکریپت هل در برخی از سایت ها ممکن است آهسته تر اجرا شود."> <!ENTITY torbutton.prefs.sec_jar_desc "فایل های JAR از راه دور مسدود."> -<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks."> +<!ENTITY torbutton.prefs.sec_jar_tooltip "فایل ها با پسوند JAR به ندرت در وب استفاده می شوند ، ولی می توانند مبدایی برای هک به روش XSS و دیگر حملات هکری شوند."> <!ENTITY torbutton.prefs.sec_mathml_desc "برخی مکانیسم ها نمایش معادلات ریاضی غیر فعال می باشد."> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML غیر فعال است."> <!ENTITY torbutton.prefs.sec_med_high "متوسط - بالا"> @@ -175,7 +175,7 @@ <!ENTITY torbutton.prefs.sec_svg_desc "برخی از انواع تصاویر غیر فعال هستند."> <!ENTITY torbutton.prefs.sec_svg_desc_tooltip "تصاویر SVG غیر فعال می باشد."> <!ENTITY torbutton.prefs.sec_js_https_desc "جاوا اسکریپت به طور پیش فرض در تمامی سایت های غیر HTTPS غیر فعال است."> -<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button."> +<!ENTITY torbutton.prefs.sec_js_desc_tooltip "جاوا اسکریپ برای هر وب سایت از طریق دکمه NoScript نوار ابزار فعال می شود."> <!ENTITY torbutton.prefs.sec_high "زیاد"> <!ENTITY torbutton.prefs.sec_all_js_desc "جاوا اسکریپت به طور پیش فرض در تمامی سایت ها غیر فعال است."> <!ENTITY torbutton.prefs.sec_audio_video_desc "اکثر فرمت های صوتی و تصویری غیر فعال می باشد.">

1 0

[tor-browser-bundle/master] Bug 13766: Raise MaxCircuitDirtiness to 2 hours
by mikeperry＠torproject.org 25 Mar '15

25 Mar '15

commit 824116042a03683ae20fa6e7d0768d8fd6fd6f95 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Mar 24 21:43:03 2015 -0700 Bug 13766: Raise MaxCircuitDirtiness to 2 hours Well, 1 second shy, so we're sure the torbutton update pings go over new circuits. --- Bundle-Data/linux/Data/Tor/torrc-defaults | 1 + Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults | 1 + Bundle-Data/windows/Data/Tor/torrc-defaults | 1 + 3 files changed, 3 insertions(+) diff --git a/Bundle-Data/linux/Data/Tor/torrc-defaults b/Bundle-Data/linux/Data/Tor/torrc-defaults index 819b9e8..e502356 100644 --- a/Bundle-Data/linux/Data/Tor/torrc-defaults +++ b/Bundle-Data/linux/Data/Tor/torrc-defaults @@ -8,3 +8,4 @@ Log notice stdout SocksPort 9150 ControlPort 9151 CookieAuthentication 1 +MaxCircuitDirtiness 7199 diff --git a/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults b/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults index 819b9e8..e502356 100644 --- a/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults +++ b/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults @@ -8,3 +8,4 @@ Log notice stdout SocksPort 9150 ControlPort 9151 CookieAuthentication 1 +MaxCircuitDirtiness 7199 diff --git a/Bundle-Data/windows/Data/Tor/torrc-defaults b/Bundle-Data/windows/Data/Tor/torrc-defaults index 819b9e8..e502356 100644 --- a/Bundle-Data/windows/Data/Tor/torrc-defaults +++ b/Bundle-Data/windows/Data/Tor/torrc-defaults @@ -8,3 +8,4 @@ Log notice stdout SocksPort 9150 ControlPort 9151 CookieAuthentication 1 +MaxCircuitDirtiness 7199

1 0

[torbutton/master] Bug 13766: Raise update check frequency to 2 hours.
by mikeperry＠torproject.org 25 Mar '15

25 Mar '15

commit 270eed437c93987b8d0f31f52d3545321facb0e0 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Mar 24 21:12:56 2015 -0700 Bug 13766: Raise update check frequency to 2 hours. To match Nick's suggested 2 hour circuit dirtiness timeout in #13766. --- src/chrome/content/torbutton.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 69efb5f..5eb704e 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1175,7 +1175,7 @@ function torbutton_do_async_versioncheck() { } // Suppress update check if done recently. - const kMinSecsBetweenChecks = 90 * 60; // 1.5 hours + const kMinSecsBetweenChecks = 120 * 60; // 2.0 hours var now = Date.now() / 1000; var lastCheckTime; try {

1 0

[stem/master] Stop mentioning vidalia on the front page
by atagar＠torproject.org 25 Mar '15

25 Mar '15

commit 9a8fec8f5eff7299dc7c4996d46d52b205e93a7f Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Mar 24 21:10:18 2015 -0700 Stop mentioning vidalia on the front page The link is a 404 so little point in giving it as an example for what you can do with the control port. --- docs/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.rst b/docs/index.rst index 5e8b97a..cac41ad 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -1,7 +1,7 @@ Welcome to Stem! ================ -Stem is a Python controller library for `Tor <https://www.torproject.org/>`_. With it you can use Tor's `control protocol <https://gitweb.torproject.org/torspec.git/tree/control-spec.txt>`_ to script against the Tor process, or build things similar to `Vidalia <https://www.torproject.org/projects/vidalia.html.en>`_ and `arm <https://www.atagar.com/arm/>`_. Stem's latest version is **1.3.0** (released December 21st, 2014). +Stem is a Python controller library for `Tor <https://www.torproject.org/>`_. With it you can use Tor's `control protocol <https://gitweb.torproject.org/torspec.git/tree/control-spec.txt>`_ to script against the Tor process, or build things such as `arm <https://www.atagar.com/arm/>`_. Stem's latest version is **1.3.0** (released December 21st, 2014). .. Main Stem Logo Source: http://www.wpclipart.com/plants/assorted/P/plant_stem.png.html

1 0

[torbutton/master] Bug 13766: Set a 10 minute circuit dirty timeout for the catch-all circ.
by mikeperry＠torproject.org 25 Mar '15

25 Mar '15

commit 2359bd808367673ed7738a8b96b0fcb8571883dc Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Mar 24 20:27:20 2015 -0700 Bug 13766: Set a 10 minute circuit dirty timeout for the catch-all circ. This will allow us to raise the circuit dirty timeout value for all other circs. --- src/components/domain-isolator.js | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/src/components/domain-isolator.js b/src/components/domain-isolator.js index 6e6201e..a05fee2 100644 --- a/src/components/domain-isolator.js +++ b/src/components/domain-isolator.js @@ -53,6 +53,10 @@ let tor = tor || {}; // A mutable map that records what nonce we are using for each domain. tor.noncesForDomains = {}; +// __tor.unknownDirtySince__. +// Specifies when the current catch-all circuit was first used +tor.unknownDirtySince = Date.now(); + // __tor.socksProxyCredentials(originalProxy, domain)__. // Takes a proxyInfo object (originalProxy) and returns a new proxyInfo // object with the same properties, except the username is set to the @@ -74,6 +78,17 @@ tor.socksProxyCredentials = function (originalProxy, domain) { proxy.failoverProxy); }; +tor.newCircuitForDomain = function(domain) { + // Check if we already have a nonce. If not, create + // one for this domain. + if (!tor.noncesForDomains.hasOwnProperty(domain)) { + tor.noncesForDomains[domain] = 0; + } else { + tor.noncesForDomains[domain] += 1; + } + logger.eclog(3, "New domain isolation count " +tor.noncesForDomains[domain] + " for " + domain); +} + // __tor.isolateCircuitsByDomain()__. // For every HTTPChannel, replaces the default SOCKS proxy with one that authenticates // to the SOCKS server (the tor client process) with a username (the first party domain) @@ -93,8 +108,16 @@ tor.isolateCircuitsByDomain = function () { replacementProxy.username + ":" + replacementProxy.password); return replacementProxy; } catch (err) { - // If we fail, then just use the default proxyInfo. - return aProxy; + 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); + return replacementProxy; } }, 0); }; @@ -125,14 +148,7 @@ DomainIsolator.prototype = { } }, newCircuitForDomain: function (domain) { - // Check if we already have a nonce. If not, create - // one for this domain. - if (!tor.noncesForDomains.hasOwnProperty(domain)) { - tor.noncesForDomains[domain] = 0; - } else { - tor.noncesForDomains[domain] += 1; - } - logger.eclog(3, "New domain isolation count " +tor.noncesForDomains[domain] + " for " + domain); + tor.newCircuitForDomain(domain); }, wrappedJSObject: null

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 24 Mar '15

24 Mar '15

commit e530d286a5689432e757a83d13a53b77597f719b Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 25 00:45:59 2015 +0000 Update translations for torbutton-torbuttonproperties --- it/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/it/torbutton.properties b/it/torbutton.properties index d6e4e5e..57a39e8 100644 --- a/it/torbutton.properties +++ b/it/torbutton.properties @@ -55,7 +55,7 @@ torbutton.popup.confirm_plugins = Alcuni plugin come Flash possono violare la tu torbutton.popup.never_ask_again = Non chiedermelo più torbutton.popup.confirm_newnym = Tor Browser chiuderà tutte le schede e finestre. Tutte le sezioni dei siti andranno perse.\n\nRiavviare ora Tor Browser per azzerare la tua identità?\n\n -torbutton.slider_notification = The green onion menu has now a security slider which lets you adjust your security level. Check it out! +torbutton.slider_notification = Il menù della cipolla verde ha ora una slider di sicurezza che ti permette di regolare il livello di sicurezza. Dai un'occhiata! torbutton.slider_notification_button = Apri impostazioni sicurezza # Canvas permission prompt. Strings are kept here for ease of translation.

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 24 Mar '15

24 Mar '15

commit d7a33dea5d32bba4c0fb0d3ccfa7ebe2138f0e47 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 24 22:16:07 2015 +0000 Update translations for torbutton-torbuttonproperties --- nb/torbutton.properties | 4 ++-- nl/torbutton.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nb/torbutton.properties b/nb/torbutton.properties index f892811..581203f 100644 --- a/nb/torbutton.properties +++ b/nb/torbutton.properties @@ -55,8 +55,8 @@ torbutton.popup.confirm_plugins = Nettlesertillegg som f.eks Flash kan skade per torbutton.popup.never_ask_again = Ikke spør meg igjen torbutton.popup.confirm_newnym = TOR nettleseren vil stenge alle vinduer og faner. Alle nettstedssesjoner vil gå tapt.\n\n\nRestart TOR nettleseren nå for å resette din identitet?\n\n -torbutton.slider_notification = The green onion menu has now a security slider which lets you adjust your security level. Check it out! -torbutton.slider_notification_button = Open security settings +torbutton.slider_notification = Den grønne løk-menyen har nå en glidebryter som lar deg justere ditt sikkerhetsnivå. Sjekk den ut! +torbutton.slider_notification_button = Åpne sikkerhetsinnstillinger # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=Denne nettsiden (%S) prøvde å pakke ut HTML5-canvas billeddata, hvilket kan brukes til å tilkjennegi din datamaskin spesifikt i identifiseringsøyemed.\n\nSkal Tor-nettleseren tillate denne nettsiden å pakke ut HTML5-canvas billeddata? diff --git a/nl/torbutton.properties b/nl/torbutton.properties index 9bd9063..3849470 100644 --- a/nl/torbutton.properties +++ b/nl/torbutton.properties @@ -56,7 +56,7 @@ torbutton.popup.never_ask_again = Vraag me dit nooit meer. torbutton.popup.confirm_newnym = De Tor Browser zal alle windows en tabs sluiten. Alle website sessies zullen verloren gaan.\n\nHerstart de Tor Browser om je identiteit te resetten?\n\n torbutton.slider_notification = The green onion menu has now a security slider which lets you adjust your security level. Check it out! -torbutton.slider_notification_button = Open security settings +torbutton.slider_notification_button = Open de beveiligingsvoorkeuren # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=De website (%S) heeft geprobeerd HTML5 canvas image data op te vragen, wat kan gebruikt worden voor een unieke identificatie van je computer.\n\nMoet Tor Browser deze website toestaan om HTML5 canvas image data op te vragen?

1 0

[tor-browser/tor-browser-31.5.0esr-4.5-1] Bug 15406: Only include forced updates if extensions differ.
by mikeperry＠torproject.org 24 Mar '15

24 Mar '15

commit 39e3a2b282d4d89c8c6498162ae155c018d79a68 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Mar 24 16:34:43 2015 -0400 Bug 15406: Only include forced updates if extensions differ. For the NoScript and HTTPS Everywhere extensions, only force files to be included in incremental MARs if the extension has changed. For NoScript we detect this by comparing the old and new .xpi files. For HTTPS Everywhere (which is unpacked) we only check install.rdf; our assumption is that the version number will be changed for each new release. --- tools/update-packaging/make_incremental_update.sh | 41 ++++++++++++++++++--- 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/tools/update-packaging/make_incremental_update.sh b/tools/update-packaging/make_incremental_update.sh index 010101c..10af358 100755 --- a/tools/update-packaging/make_incremental_update.sh +++ b/tools/update-packaging/make_incremental_update.sh @@ -69,12 +69,8 @@ if [ $# = 0 ]; then exit 1 fi -# TODO: it would be better to pass these paths via command line options. -ext_path='TorBrowser/Data/Browser/profile.default/extensions' -https_everywhere='https-everywhere(a)eff.org' -noscript='{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi' -requested_forced_updates="$ext_path/$https_everywhere/* $ext_path/$noscript" -directories_to_remove="$ext_path/$https_everywhere" +requested_forced_updates="" +directories_to_remove="" while getopts "hqf:" flag do @@ -109,6 +105,39 @@ updatemanifestv2="$workdir/updatev2.manifest" updatemanifestv3="$workdir/updatev3.manifest" archivefiles="updatev2.manifest updatev3.manifest" +# If the NoScript or HTTPS Everywhere extensions have changed between +# releases, add them to the "force updates" list. +ext_path='TorBrowser/Data/Browser/profile.default/extensions' +https_everywhere='https-everywhere(a)eff.org' +noscript='{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi' + +# NoScript is a packed extension, so we simply compare the old and the new +# .xpi files. +noscript_path="$ext_path/$noscript" +diff -a "$olddir/$noscript_path" "$newdir/$noscript_path" > /dev/null +rc=$? +if [ $rc -gt 1 ]; then + notice "Unexpected exit $rc from $noscript_path diff command" + exit 2 +elif [ $rc -eq 1 ]; then + requested_forced_updates="$requested_forced_updates $noscript_path" +fi + +# HTTPS Everywhere is an unpacked extension, so we need to determine if any of +# the unpacked files have changed. Since that is messy, we simply compare the +# old extension's install.rdf file to the new one. +https_everywhere_install_rdf="$ext_path/$https_everywhere/install.rdf" +diff "$olddir/$https_everywhere_install_rdf" \ + "$newdir/$https_everywhere_install_rdf" > /dev/null +rc=$? +if [ $rc -gt 1 ]; then + notice "Unexpected exit $rc from $https_everywhere_install_rdf diff command" + exit 2 +elif [ $rc -eq 1 ]; then + requested_forced_updates="$requested_forced_updates $ext_path/$https_everywhere/*" + directories_to_remove="$directories_to_remove $ext_path/$https_everywhere" +fi + mkdir -p "$workdir" # On Mac, the precomplete file added by Bug 386760 will cause OS X to reload the

1 0

[tor-browser/tor-browser-31.5.0esr-4.5-1] Bug 15406: Do not force updates for Torbutton and Tor Launcher.
by mikeperry＠torproject.org 24 Mar '15

24 Mar '15

commit 74d1e1309dd53363481140d463edae3a905cea97 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Mar 24 11:12:35 2015 -0400 Bug 15406: Do not force updates for Torbutton and Tor Launcher. Since we have disabled updates for Torbutton and Tor Launcher, there is no need to force these extensions to be updated (replaced) when generating our incremental MAR files. Also, we no longer force an update to the pdf.js extension (it is now built into the browser) or to the firefox binary on Mac OS (Mozilla forces firefox to be replaced on Mac OS due to code signing / signature issues with partner builds; see https://bugzilla.mozilla.org/show_bug.cgi?id=770996) --- tools/update-packaging/make_incremental_update.sh | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/tools/update-packaging/make_incremental_update.sh b/tools/update-packaging/make_incremental_update.sh index 60c5a4b..010101c 100755 --- a/tools/update-packaging/make_incremental_update.sh +++ b/tools/update-packaging/make_incremental_update.sh @@ -69,18 +69,12 @@ if [ $# = 0 ]; then exit 1 fi -# The last .xpi is NoScript. -ext_path='TorBrowser/Data/Browser/profile.default/extensions'; -# TODO: it would be better to pass this as a command line option. -exts='https-everywhere(a)eff.org/* tor-launcher(a)torproject.org.xpi torbutton(a)torproject.org.xpi uriloader(a)pdf.js.xpi {73a6fe31-595d-460b-a920-fcc0f8843232}.xpi' -requested_forced_updates='Contents/MacOS/TorBrowser.app/Contents/MacOS/firefox' -for ext in $exts; do - requested_forced_updates="$requested_forced_updates $ext_path/$ext" -done - - -# TODO: it would be better to pass this as a command line option. -directories_to_remove='TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org' +# TODO: it would be better to pass these paths via command line options. +ext_path='TorBrowser/Data/Browser/profile.default/extensions' +https_everywhere='https-everywhere(a)eff.org' +noscript='{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi' +requested_forced_updates="$ext_path/$https_everywhere/* $ext_path/$noscript" +directories_to_remove="$ext_path/$https_everywhere" while getopts "hqf:" flag do

1 0