tbb-commits January 2015

tbb-commits@lists.torproject.org

3 participants
61 discussions

[torbutton/master] Update CHANGELOG; update translations
by gk＠torproject.org 14 Jan '15

14 Jan '15

commit ac15b60896018504e2ea466a53438270ecc6a104 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 14 10:08:25 2015 +0000 Update CHANGELOG; update translations --- src/CHANGELOG | 11 +++++++++++ src/chrome/locale/ar/torbutton.dtd | 14 +++++++------- src/chrome/locale/ja/torbutton.dtd | 2 +- src/chrome/locale/ko/torbutton.dtd | 14 +++++++------- src/chrome/locale/tr/torbutton.dtd | 2 +- src/chrome/locale/zh-CN/torbutton.dtd | 14 +++++++------- src/chrome/locale/zh-CN/torbutton.properties | 2 +- 7 files changed, 35 insertions(+), 24 deletions(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index a8b6b3a..a3e859e 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,14 @@ +1.8.1.3 + * Bug 13998: Handle changes in NoScript 2.6.9.8+ + * Bug 14100: Option to hide NetworkSettings menuitem + * Bug 13079: Option to skip control port verification + * Bug 13835: Option to change default Tor Browser homepage + * Bug 11449: Fix new identity error if NoScript is not enabled + * Bug 13881: Localize strings for tor circuit display + * Bug 9387: Incorporate user feedback + * Bug 13671: Fixup for circuit display if bridges are used + * Translation updates + 1.8.1.2 * Bug 13672: Make circuit display optional * Bug 13671: Make bridges visible on circuit display diff --git a/src/chrome/locale/ar/torbutton.dtd b/src/chrome/locale/ar/torbutton.dtd index e30348e..94ef3aa 100644 --- a/src/chrome/locale/ar/torbutton.dtd +++ b/src/chrome/locale/ar/torbutton.dtd @@ -44,7 +44,7 @@ <!ENTITY torbutton.context_menu.openTorWindow.key "d"> <!ENTITY torbutton.button.label "زر تور"> <!ENTITY torbutton.button.tooltip "انقر لبدء زر تور"> -<!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings"> +<!ENTITY torbutton.prefs.privacy_security_settings "إعدادات الأمان والخصوصية"> <!ENTITY torbutton.prefs.block_thread "امنع قراءة تاريخ التصفح أثناء عمل تور (حَرِج)"> <!ENTITY torbutton.prefs.block_thwrite "امنع كتابة تاريخ التصفح أثناء عمل تور (محبّذ)"> <!ENTITY torbutton.prefs.block_nthread "امنع قراءة تاريخ التصفح أثناء توقف تور (اختياري)"> @@ -149,9 +149,9 @@ <!ENTITY torbutton.prefs.restrict_thirdparty "تقييد الـCookies الخاصة بالطرف الثالث و بيانات التتبع الأخري."> <!ENTITY torbutton.prefs.block_plugins "تعطيل إضافات المتصفح (مثل فلاش)"> <!ENTITY torbutton.prefs.resist_fingerprinting "تغيير التفاصيل التي تميزك عن المستخدمين الآخرين لمتصفح تور"> -<!ENTITY torbutton.prefs.sec_caption "Security Level"> -<!ENTITY torbutton.prefs.sec_low "Low (default)"> -<!ENTITY torbutton.prefs.sec_med_low "Medium-Low"> -<!ENTITY torbutton.prefs.sec_med_high "Medium-High"> -<!ENTITY torbutton.prefs.sec_high "High"> -<!ENTITY torbutton.prefs.sec_custom "Custom Values"> +<!ENTITY torbutton.prefs.sec_caption "مستوى الأمان"> +<!ENTITY torbutton.prefs.sec_low "منخفض (افتراضي)"> +<!ENTITY torbutton.prefs.sec_med_low "شبه منخفض"> +<!ENTITY torbutton.prefs.sec_med_high "شبه عالٍ"> +<!ENTITY torbutton.prefs.sec_high "عالٍ"> +<!ENTITY torbutton.prefs.sec_custom "قيم مخصصة"> diff --git a/src/chrome/locale/ja/torbutton.dtd b/src/chrome/locale/ja/torbutton.dtd index 4add4d2..1f1d0a2 100644 --- a/src/chrome/locale/ja/torbutton.dtd +++ b/src/chrome/locale/ja/torbutton.dtd @@ -1,7 +1,7 @@ <!ENTITY torbutton.prefs.title "Torbutton設定"> <!ENTITY torbutton.prefs.tor_settings "プロクシ設定"> <!ENTITY torbutton.prefs.recommended_settings "Firefoxのプロクシ設定を使う"> -<!ENTITY torbutton.prefs.use_privoxy "プロクシを使う"> +<!ENTITY torbutton.prefs.use_privoxy "プロキシを使う"> <!ENTITY torbutton.prefs.use_polipo "Polipoを使う"> <!ENTITY torbutton.prefs.custom_settings "カスタム設定のプロキシを使う"> <!ENTITY torbutton.prefs.proxy.host.http "HTTPプロキシ"> diff --git a/src/chrome/locale/ko/torbutton.dtd b/src/chrome/locale/ko/torbutton.dtd index 0b96309..26023f7 100644 --- a/src/chrome/locale/ko/torbutton.dtd +++ b/src/chrome/locale/ko/torbutton.dtd @@ -44,7 +44,7 @@ <!ENTITY torbutton.context_menu.openTorWindow.key "d"> <!ENTITY torbutton.button.label "Torbutton"> <!ENTITY torbutton.button.tooltip "Torbutton 설정 초기화"> -<!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings"> +<!ENTITY torbutton.prefs.privacy_security_settings "개인 정보와 보안 설정"> <!ENTITY torbutton.prefs.block_thread "Tor 사용 시, 사용 기록을 외부에서 읽어가는 것을 차단 (중요)"> <!ENTITY torbutton.prefs.block_thwrite "Tor 사용 시, 사용 기록을 남기지 않기 (추천)"> <!ENTITY torbutton.prefs.block_nthread "Tor를 사용하지 않을 때, 사용 기록을 외부에서 읽어가는 것을 차단 (선택)"> @@ -149,9 +149,9 @@ <!ENTITY torbutton.prefs.restrict_thirdparty "제 3자 쿠키와 다른 추적 데이터 제한"> <!ENTITY torbutton.prefs.block_plugins "브라우저 플러그인 비활성화 (예 : 플래시)"> <!ENTITY torbutton.prefs.resist_fingerprinting "다른 Tor browser 사용자로부터 구별되는 세부 사항 변경"> -<!ENTITY torbutton.prefs.sec_caption "Security Level"> -<!ENTITY torbutton.prefs.sec_low "Low (default)"> -<!ENTITY torbutton.prefs.sec_med_low "Medium-Low"> -<!ENTITY torbutton.prefs.sec_med_high "Medium-High"> -<!ENTITY torbutton.prefs.sec_high "High"> -<!ENTITY torbutton.prefs.sec_custom "Custom Values"> +<!ENTITY torbutton.prefs.sec_caption "보안 등급"> +<!ENTITY torbutton.prefs.sec_low "낮음 (기본)"> +<!ENTITY torbutton.prefs.sec_med_low "중간 낮음"> +<!ENTITY torbutton.prefs.sec_med_high "중간 높음"> +<!ENTITY torbutton.prefs.sec_high "높음"> +<!ENTITY torbutton.prefs.sec_custom "맞춤 값"> diff --git a/src/chrome/locale/tr/torbutton.dtd b/src/chrome/locale/tr/torbutton.dtd index d911237..606928a 100644 --- a/src/chrome/locale/tr/torbutton.dtd +++ b/src/chrome/locale/tr/torbutton.dtd @@ -1,6 +1,6 @@ <!ENTITY torbutton.prefs.title "Ayarlar"> <!ENTITY torbutton.prefs.tor_settings "Vekil Sunucu Ayarları"> -<!ENTITY torbutton.prefs.recommended_settings "Firefox'umda önerilen vekil sunucu ayarlarını kullan"> +<!ENTITY torbutton.prefs.recommended_settings "Firefox sürümüm için önerilen vekil sunucu ayarlarını kullan"> <!ENTITY torbutton.prefs.use_privoxy "Privoxy'i kullan"> <!ENTITY torbutton.prefs.use_polipo "Polipo'yu kullan"> <!ENTITY torbutton.prefs.custom_settings "Özel vekil sunucu ayarlarını kullan"> diff --git a/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd index f0f31b5..39b07dc 100644 --- a/src/chrome/locale/zh-CN/torbutton.dtd +++ b/src/chrome/locale/zh-CN/torbutton.dtd @@ -44,7 +44,7 @@ <!ENTITY torbutton.context_menu.openTorWindow.key "d"> <!ENTITY torbutton.button.label "Torbutton"> <!ENTITY torbutton.button.tooltip "点此初始化 Torbutton"> -<!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings"> +<!ENTITY torbutton.prefs.privacy_security_settings "隐私与安全设置"> <!ENTITY torbutton.prefs.block_thread "使用 Tor 时禁止读取历史记录（重要）"> <!ENTITY torbutton.prefs.block_thwrite "使用 Tor 时禁止写入历史记录（推荐）"> <!ENTITY torbutton.prefs.block_nthread "使用 Tor 之外的代理时禁止读取历史记录（可选）"> @@ -149,9 +149,9 @@ <!ENTITY torbutton.prefs.restrict_thirdparty "限制第三方 cookie 和其他数据跟踪程序"> <!ENTITY torbutton.prefs.block_plugins "禁用浏览器插件（比如 Flash）"> <!ENTITY torbutton.prefs.resist_fingerprinting "请修改区别你与其他 Tor 浏览器用户的详细信息"> -<!ENTITY torbutton.prefs.sec_caption "Security Level"> -<!ENTITY torbutton.prefs.sec_low "Low (default)"> -<!ENTITY torbutton.prefs.sec_med_low "Medium-Low"> -<!ENTITY torbutton.prefs.sec_med_high "Medium-High"> -<!ENTITY torbutton.prefs.sec_high "High"> -<!ENTITY torbutton.prefs.sec_custom "Custom Values"> +<!ENTITY torbutton.prefs.sec_caption "安全等级"> +<!ENTITY torbutton.prefs.sec_low "低（默认）"> +<!ENTITY torbutton.prefs.sec_med_low "中低"> +<!ENTITY torbutton.prefs.sec_med_high "中高"> +<!ENTITY torbutton.prefs.sec_high "高"> +<!ENTITY torbutton.prefs.sec_custom "自定义"> diff --git a/src/chrome/locale/zh-CN/torbutton.properties b/src/chrome/locale/zh-CN/torbutton.properties index 6425d8c..49bb702 100644 --- a/src/chrome/locale/zh-CN/torbutton.properties +++ b/src/chrome/locale/zh-CN/torbutton.properties @@ -29,7 +29,7 @@ torbutton.popup.launch = 下载文件 torbutton.popup.cancel = 取消 torbutton.popup.dontask = 自动下载文件于 torbutton.popup.test.no_http_proxy = Tor 代理测试：本地 HTTP 代理不可达，您的 Polipo 正常启动了吗？ -torbutton.popup.captcha.title = 避免 Google Captchas？ +torbutton.popup.captcha.title = 避免 Google Captcha？ torbutton.popup.captcha.ask = Torbutton 检测到了一个 Google Captcha，您是否愿意把本次搜索重定向到使用其他搜索引擎？ torbutton.popup.captcha.always = 此后总是使用此操作 torbutton.popup.redirect = 重定向

1 0

[tor-launcher/master] Bump version to 0.2.7.1
by gk＠torproject.org 14 Jan '15

14 Jan '15

commit beddbd16ac481746284eb90df1830c4ec3d1f63a Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 14 09:04:52 2015 +0000 Bump version to 0.2.7.1 --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index b78c677..7eac647 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.7.0.2</em:version> + <em:version>0.2.7.1</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>https://127.0.0.1/</em:updateURL> <!--

1 0

[torbutton/master] Bug 13998: Adapt code to fixed globalHttpsWhitelist
by mikeperry＠torproject.org 13 Jan '15

13 Jan '15

commit 915ec73bb2b556aa937a827fbe746b21dacec1f3 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jan 12 13:03:34 2015 +0000 Bug 13998: Adapt code to fixed globalHttpsWhitelist --- src/chrome/content/torbutton.js | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 4715fb6..8adef28 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2166,6 +2166,7 @@ var torbutton_sec_ml_bool_prefs = { var torbutton_sec_mh_bool_prefs = { "javascript.options.baselinejit.content" : false, + "noscript.global" : false, "noscript.globalHttpsWhitelist" : true, // XXX: pref for disableing SVG is missing }; @@ -2198,7 +2199,10 @@ function torbutton_update_security_slider() { for (p in torbutton_sec_h_bool_prefs) { m_tb_prefs.setBoolPref(p, !torbutton_sec_h_bool_prefs[p]) } - // XXX: Adding and removing "https:" is needed due to a bug in Noscript. + // Removing "https:" is needed due to a bug in older Noscript versions. + // We leave that in for a while as there may be users that were affected + // by this bug. Removing it immediately and having the auto-updater might + // leave users exposed to the problem. if (capValue.indexOf(" https:") >= 0) { m_tb_prefs.setCharPref("capability.policy.maonoscript.sites", capValue.replace(" https:", "")); @@ -2224,7 +2228,10 @@ function torbutton_update_security_slider() { for (p in torbutton_sec_h_bool_prefs) { m_tb_prefs.setBoolPref(p, !torbutton_sec_h_bool_prefs[p]) } - // XXX: Adding and removing "https:" is needed due to a bug in Noscript. + // Removing "https:" is needed due to a bug in older Noscript versions. + // We leave that in for a while as there may be users that were affected + // by this bug. Removing it immediately and having the auto-updater might + // leave users exposed to the problem. if (capValue.indexOf(" https:") >= 0) { m_tb_prefs.setCharPref("capability.policy.maonoscript.sites", capValue.replace(" https:", "")); @@ -2244,17 +2251,14 @@ function torbutton_update_security_slider() { for (p in torbutton_sec_ml_bool_prefs) { m_tb_prefs.setBoolPref(p, torbutton_sec_ml_bool_prefs[p]) } - for (p in torbutton_sec_mh_bool_prefs) { - m_tb_prefs.setBoolPref(p, torbutton_sec_mh_bool_prefs[p]) - } + // Order matters here as both the high mode and the medium-high mode + // share some preferences/values. So, let's revert the high mode + // preferences first and set the medium-high mode ones afterwards. for (p in torbutton_sec_h_bool_prefs) { m_tb_prefs.setBoolPref(p, !torbutton_sec_h_bool_prefs[p]) } - // XXX: Adding and removing "https:" is needed due to a bug in Noscript. - // missing. - if (capValue.indexOf(" https:") < 0) { - m_tb_prefs.setCharPref("capability.policy.maonoscript.sites", capValue + - " https:"); + for (p in torbutton_sec_mh_bool_prefs) { + m_tb_prefs.setBoolPref(p, torbutton_sec_mh_bool_prefs[p]) } m_tb_prefs.setBoolPref("gfx.font_rendering.graphite.enabled", false); break; @@ -2276,7 +2280,10 @@ function torbutton_update_security_slider() { for (p in torbutton_sec_h_bool_prefs) { m_tb_prefs.setBoolPref(p, torbutton_sec_h_bool_prefs[p]) } - // XXX: Adding and removing "https:" is needed due to a bug in Noscript. + // Removing "https:" is needed due to a bug in older Noscript versions. + // We leave that in for a while as there may be users that were affected + // by this bug. Removing it immediately and having the auto-updater might + // leave users exposed to the problem. if (capValue.indexOf(" https:") >= 0) { m_tb_prefs.setCharPref("capability.policy.maonoscript.sites", capValue.replace(" https:", ""));

1 0

[torbutton/master] Bug 13998: Bind volatilePrivatePermissions to disk
by mikeperry＠torproject.org 13 Jan '15

13 Jan '15

commit eb343e2cdcbd35ae6140543f248969a7e3b9aa8d Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 13 10:57:00 2015 +0000 Bug 13998: Bind volatilePrivatePermissions to disk We set `noscript.volatilePrivatePermissions` to `true` if disk records are disabled and otherwise to `false`. All this in the assumption NoScript is enabled at all. --- src/chrome/content/preferences.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js index 75937eb..f67906c 100644 --- a/src/chrome/content/preferences.js +++ b/src/chrome/content/preferences.js @@ -286,6 +286,20 @@ function torbutton_prefs_save(doc) { // Privacy and Security Settings o_torprefs.setBoolPref('block_disk', doc.getElementById('torbutton_blockDisk').checked); + // If we have NoScript enabled we set `noscript.volatilePrivatePermissions` + // to `true` if we are blocking disk records and to `false` if we are + // enabling them. + try { + if ("@maone.net/noscript-service;1" in Components.classes) { + let o_noscriptprefs = torbutton_get_prefbranch('noscript.'); + if (o_torprefs.getBoolPref('block_disk')) { + o_noscriptprefs.setBoolPref('volatilePrivatePermissions', true); + } else { + o_noscriptprefs.setBoolPref('volatilePrivatePermissions', false); + } + } + } catch (e) {} + o_torprefs.setBoolPref('resist_fingerprinting', doc.getElementById('torbutton_resistFingerprinting').checked); o_torprefs.setBoolPref('no_tor_plugins', doc.getElementById('torbutton_blockPlugins').checked); o_torprefs.setBoolPref('restrict_thirdparty', doc.getElementById('torbutton_restrictThirdParty').checked);

1 0

[torbutton/master] Add changelog for 1.7.0.2 for historical archive.
by mikeperry＠torproject.org 13 Jan '15

13 Jan '15

commit 5848794c74c3dfa2421c0a2f413a12168cf802b8 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Nov 25 16:28:48 2014 -0800 Add changelog for 1.7.0.2 for historical archive. --- src/CHANGELOG | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/CHANGELOG b/src/CHANGELOG index 5bc86c6..a8b6b3a 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -26,6 +26,10 @@ * Bug 3455: Use SOCKS user+pass to isolate all requests from the same url domain * Bug 8641: Create browser UI to indicate current tab's Tor circuit IPs +1.7.0.2 + * Bug 13019: Synchronize locale spoofing pref with our Firefox patch + * Bug 13746: Properly link Torbutton UI to thirdparty pref. + 1.7.0.1 * Bug 13378: Prevent addon reordering in toolbars on first-run.

1 0

[torbutton/master] Try to make the security slider less eager to switch to "custom".
by mikeperry＠torproject.org 13 Jan '15

13 Jan '15

commit 7975b2023d5dc9bc0437cb5d5fbfe539448900e4 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jan 13 08:35:00 2015 -0800 Try to make the security slider less eager to switch to "custom". We actually need to rewrite the entire check for the custom settings here, but this quick hack will make it flap a bit less I think. --- src/chrome/content/torbutton.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 8adef28..9cdb792 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -124,8 +124,6 @@ var torbutton_unique_pref_observer = this._branch.addObserver("gfx", this, false); this._branch.addObserver("noscript", this, false); this._branch.addObserver("media", this, false); - this._branch.addObserver("capability.policy.maonoscript.sites", this, - false); // We observe xpcom-category-entry-added for plugins w/ Gecko-Content-Viewers var observerService = Cc["@mozilla.org/observer-service;1"]. @@ -144,7 +142,6 @@ var torbutton_unique_pref_observer = this._branch.removeObserver("gfx", this); this._branch.removeObserver("noscript", this); this._branch.removeObserver("media", this); - this._branch.removeObserver("capability.policy.maonoscript.sites", this); var observerService = Cc["@mozilla.org/observer-service;1"]. getService(Ci.nsIObserverService); @@ -246,7 +243,9 @@ var torbutton_unique_pref_observer = case "media.opus.enabled": case "media.wave.enabled": case "media.apple.mp3.enabled": - case "capability.policy.maonoscript.sites": + // XXX: This logic is bad.. Instead, we need a check here + // that only sets custom if the prefs differ from the current + // security slider level (and also can set it back if they are the same). if (!m_tb_sliderUpdate) { // Do we already have custom settings? let customSlider = m_tb_prefs.

1 0

[tor-browser-bundle/master] Bug #13015: use git tags to set tor-browser version
by gk＠torproject.org 13 Jan '15

13 Jan '15

commit 28e1585aff3e8dd8d15ef7a7add7f95508e9a50b Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Oct 27 18:00:01 2014 +0100 Bug #13015: use git tags to set tor-browser version This commit adds a get-tb-version script which uses the git tags to output the Tor Browser version and its build directory. The output should be used with 'eval' in shell scripts to define the variables. It takes as argument the type of version (release, alpha or beta). If the current commit is tagged with tag tbb-4.2-build15, get-tb-version will output this: TORBROWSER_VERSION=4.2 TORBROWSER_BUILDDIR=4.2-build15 TORBROWSER_SYMLINK_VERSION=1 If the current commit is not tagged, get-tb-version will use the version from the last tagged commit in history. The build directory will include the commit hash rather than a build number. The output will be something like this: TORBROWSER_VERSION=4.0 TORBROWSER_BUILDDIR=4.0-1a98e3efb368 TORBROWSER_SYMLINK_VERSION=0 The TORBROWSER_BUILDDIR variable is used as the build directory. The TORBROWSER_SYMLINK_VERSION variable indicates whether we should create a symlink TORBROWSER_VERSION -> TORBROWSER_BUILDDIR. The various files which source the versions files and use TORBROWSER_VERSION have been updated to eval the output of get-tb-version too, and use TORBROWSER_BUILDDIR as build directory. --- gitian/check-match.sh | 25 +++++++++++---------- gitian/get-tb-version | 53 ++++++++++++++++++++++++++++++++++++++++++++ gitian/hash-bundles.sh | 3 ++- gitian/mkbundle-linux.sh | 18 ++++++++++----- gitian/mkbundle-mac.sh | 12 ++++++++-- gitian/mkbundle-windows.sh | 16 +++++++++---- gitian/upload-signature.sh | 17 +++++++------- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- gitian/versions.nightly | 3 +++ 11 files changed, 118 insertions(+), 35 deletions(-) diff --git a/gitian/check-match.sh b/gitian/check-match.sh index 0622512..71a57f2 100755 --- a/gitian/check-match.sh +++ b/gitian/check-match.sh @@ -24,6 +24,7 @@ if ! [ -e $VERSIONS_FILE ]; then fi . $VERSIONS_FILE +eval $(./get-tb-version $TORBROWSER_VERSION_TYPE) VALID="" VALID_incrementals="" @@ -33,11 +34,11 @@ do cd $WRAPPER_DIR # XXX: Is there a better way to store these and rename them? - mkdir -p $TORBROWSER_VERSION/$u - cd $TORBROWSER_VERSION/$u + mkdir -p $TORBROWSER_BUILDDIR/$u + cd $TORBROWSER_BUILDDIR/$u - wget -U "" -N https://$HOST/~$u/builds/$TORBROWSER_VERSION/sha256sums.txt || continue - wget -U "" -N https://$HOST/~$u/builds/$TORBROWSER_VERSION/sha256sums.txt.asc || continue + wget -U "" -N https://$HOST/~$u/builds/$TORBROWSER_BUILDDIR/sha256sums.txt || continue + wget -U "" -N https://$HOST/~$u/builds/$TORBROWSER_BUILDDIR/sha256sums.txt.asc || continue keyring="../../gpg/$u.gpg" @@ -53,18 +54,18 @@ done cd ../.. # XXX: We should refactor this code into a shared function -if [ -f $TORBROWSER_VERSION/sha256sums.incrementals.txt ] +if [ -f $TORBROWSER_BUILDDIR/sha256sums.incrementals.txt ] then for u in $USERS do cd $WRAPPER_DIR # XXX: Is there a better way to store these and rename them? - mkdir -p $TORBROWSER_VERSION/$u - cd $TORBROWSER_VERSION/$u + mkdir -p $TORBROWSER_BUILDDIR/$u + cd $TORBROWSER_BUILDDIR/$u - wget -U "" -N https://$HOST/~$u/builds/$TORBROWSER_VERSION/sha256sums.incrementals.txt || continue - wget -U "" -N https://$HOST/~$u/builds/$TORBROWSER_VERSION/sha256sums.incrementals.txt.asc || continue + wget -U "" -N https://$HOST/~$u/builds/$TORBROWSER_BUILDDIR/sha256sums.incrementals.txt || continue + wget -U "" -N https://$HOST/~$u/builds/$TORBROWSER_BUILDDIR/sha256sums.incrementals.txt.asc || continue keyring="../../gpg/$u.gpg" @@ -83,18 +84,18 @@ cd ../.. exit_val=0 if [ -z "$VALID" ]; then - echo "No bundle hashes or sigs published for $TORBROWSER_VERSION." + echo "No bundle hashes or sigs published for $TORBROWSER_BUILDDIR." echo exit_val=1 else echo "Matching bundles exist from the following users: $VALID" fi -if [ -f $TORBROWSER_VERSION/sha256sums.incrementals.txt ] +if [ -f $TORBROWSER_BUILDDIR/sha256sums.incrementals.txt ] then if [ -z "$VALID_incrementals" ] then - echo "No incremental mars hashes or sigs published for $TORBROWSER_VERSION." + echo "No incremental mars hashes or sigs published for $TORBROWSER_BUILDDIR." exit_val=1 else echo "Matching incremental mars exist from the following users: $VALID_incrementals" diff --git a/gitian/get-tb-version b/gitian/get-tb-version new file mode 100755 index 0000000..9a4a102 --- /dev/null +++ b/gitian/get-tb-version @@ -0,0 +1,53 @@ +#!/usr/bin/perl -w +use strict; + +sub run_cmd { + my @cmd = @_; + my $pid = open(my $fh, '-|'); + if (!$pid) { + exec(@cmd); + } + my @res = <$fh>; + waitpid($pid, 0); + die "Error running " . join(' ', @cmd) if $?; + chomp @res; + return @res; +} + +my %types = ( + release => qr/tbb-([^ab]+)-build(.+)$/, + beta => qr/tbb-(.+b.+)-build(.+)$/, + alpha => qr/tbb-(.+a.+)-build(.+)$/, +); +my $type = $ARGV[0] ? $ARGV[0] : 'release'; +exit 0 if $type eq 'nightly'; +die "Unknown type $type" unless $types{$type}; +my %tags; +foreach my $tag (run_cmd('git', 'tag')) { + if ($tag =~ m/$types{$type}/) { + my ($commit) = run_cmd('git', 'show', '-s', '--format=%H', + "$tag^{commit}"); + $tags{$commit} = [ $1, $2 ]; + } +} + +my ($current_commit) = run_cmd('git', 'show', '-s', '--format=%H'); +if ($tags{$current_commit}) { + print "TORBROWSER_VERSION=$tags{$current_commit}->[0]\n"; + print 'TORBROWSER_BUILDDIR=', $tags{$current_commit}->[0], '-build', + $tags{$current_commit}->[1], "\n"; + print "TORBROWSER_SYMLINK_VERSION=1\n"; + exit 0; +} + +foreach my $commit (run_cmd('git', 'log', '-s', '--format=%H', '-200')) { + next unless $tags{$commit}; + print "TORBROWSER_VERSION=$tags{$commit}->[0]\n"; + print "TORBROWSER_BUILDDIR=$tags{$commit}->[0]-", + substr($commit, 0, 12), "\n"; + print "TORBROWSER_SYMLINK_VERSION=0\n"; + exit 0; +} + +print STDERR "Could not find TORBROWSER version from tags\n"; +exit 1; diff --git a/gitian/hash-bundles.sh b/gitian/hash-bundles.sh index 2684158..37efdb1 100755 --- a/gitian/hash-bundles.sh +++ b/gitian/hash-bundles.sh @@ -14,10 +14,11 @@ if ! [ -e $VERSIONS_FILE ]; then fi . $VERSIONS_FILE +eval $(./get-tb-version $TORBROWSER_VERSION_TYPE) export LC_ALL=C -cd $TORBROWSER_VERSION +cd $TORBROWSER_BUILDDIR rm -f sha256sums.txt sha256sums.incrementals.txt sha256sum `ls -1 | grep -v '\.incremental\.mar$' | sort` > sha256sums.txt if ls -1 | grep -q '\.incremental\.mar$' diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 45f4f9b..4a773b8 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -16,6 +16,7 @@ if ! [ -e $VERSIONS_FILE ]; then fi . $VERSIONS_FILE +eval $(./get-tb-version $TORBROWSER_VERSION_TYPE) WRAPPER_DIR=$PWD GITIAN_DIR=$PWD/../../gitian-builder @@ -44,6 +45,7 @@ export PATH=$PATH:$PWD/libexec echo "$TORBROWSER_VERSION" > $GITIAN_DIR/inputs/bare-version cp -a $WRAPPER_DIR/$VERSIONS_FILE $GITIAN_DIR/inputs/versions +echo "TORBROWSER_VERSION=$TORBROWSER_VERSION" >> $GITIAN_DIR/inputs/versions cp -r $WRAPPER_DIR/build-helpers/* $GITIAN_DIR/inputs/ cp $WRAPPER_DIR/patches/* $GITIAN_DIR/inputs/ @@ -252,11 +254,11 @@ then exit 1 fi - mkdir -p $WRAPPER_DIR/$TORBROWSER_VERSION/ - cp -a build/out/tor-browser-linux*xz* $WRAPPER_DIR/$TORBROWSER_VERSION/ || exit 1 - cp -a build/out/*.mar $WRAPPER_DIR/$TORBROWSER_VERSION/ || exit 1 - #cp -a inputs/mar-tools-linux*.zip $WRAPPER_DIR/$TORBROWSER_VERSION/ || exit 1 - cp -a inputs/*debug.zip $WRAPPER_DIR/$TORBROWSER_VERSION/ || exit 1 + mkdir -p $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ + cp -a build/out/tor-browser-linux*xz* $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1 + cp -a build/out/*.mar $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1 + #cp -a inputs/mar-tools-linux*.zip $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1 + cp -a inputs/*debug.zip $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1 touch inputs/bundle-linux.gbuilt else echo @@ -264,6 +266,12 @@ else echo fi +cd $WRAPPER_DIR +if [ "$TORBROWSER_SYMLINK_VERSION" == '1' ] +then + ln -sf $TORBROWSER_BUILDDIR $TORBROWSER_VERSION +fi + echo echo "****** Linux Bundle complete ******" echo diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 8a3aba6..ed54dc6 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -16,6 +16,7 @@ if ! [ -e $VERSIONS_FILE ]; then fi . $VERSIONS_FILE +eval $(./get-tb-version $TORBROWSER_VERSION_TYPE) WRAPPER_DIR=$PWD GITIAN_DIR=$PWD/../../gitian-builder @@ -44,6 +45,7 @@ export PATH=$PATH:$PWD/libexec echo "$TORBROWSER_VERSION" > $GITIAN_DIR/inputs/bare-version cp -a $WRAPPER_DIR/$VERSIONS_FILE $GITIAN_DIR/inputs/versions +echo "TORBROWSER_VERSION=$TORBROWSER_VERSION" >> $GITIAN_DIR/inputs/versions cp -r $WRAPPER_DIR/build-helpers/* $GITIAN_DIR/inputs/ cp $WRAPPER_DIR/patches/* $GITIAN_DIR/inputs/ @@ -219,8 +221,8 @@ then exit 1 fi - mkdir -p $WRAPPER_DIR/$TORBROWSER_VERSION/ - cp -a build/out/* $WRAPPER_DIR/$TORBROWSER_VERSION/ || exit 1 + mkdir -p $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ + cp -a build/out/* $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1 touch inputs/bundle-mac.gbuilt else echo @@ -228,6 +230,12 @@ else echo fi +cd $WRAPPER_DIR +if [ "$TORBROWSER_SYMLINK_VERSION" == '1' ] +then + ln -sf $TORBROWSER_BUILDDIR $TORBROWSER_VERSION +fi + echo echo "****** Mac Bundle complete ******" echo diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index e950884..945511b 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -16,6 +16,7 @@ if ! [ -e $VERSIONS_FILE ]; then fi . $VERSIONS_FILE +eval $(./get-tb-version $TORBROWSER_VERSION_TYPE) WRAPPER_DIR=$PWD GITIAN_DIR=$PWD/../../gitian-builder @@ -44,6 +45,7 @@ export PATH=$PATH:$PWD/libexec echo "$TORBROWSER_VERSION" > $GITIAN_DIR/inputs/bare-version cp -a $WRAPPER_DIR/$VERSIONS_FILE $GITIAN_DIR/inputs/versions +echo "TORBROWSER_VERSION=$TORBROWSER_VERSION" >> $GITIAN_DIR/inputs/versions cp -r $WRAPPER_DIR/build-helpers/* $GITIAN_DIR/inputs/ cp $WRAPPER_DIR/patches/* $GITIAN_DIR/inputs/ @@ -222,10 +224,10 @@ then exit 1 fi - mkdir -p $WRAPPER_DIR/$TORBROWSER_VERSION/ - cp -a build/out/*.exe $WRAPPER_DIR/$TORBROWSER_VERSION/ || exit 1 - cp -a build/out/*.mar $WRAPPER_DIR/$TORBROWSER_VERSION/ || exit 1 - cp -a inputs/tor-win32-gbuilt.zip $WRAPPER_DIR/$TORBROWSER_VERSION/tor-win32-${TOR_TAG_ORIG:4}.zip || exit 1 + mkdir -p $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ + cp -a build/out/*.exe $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1 + cp -a build/out/*.mar $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1 + cp -a inputs/tor-win32-gbuilt.zip $WRAPPER_DIR/$TORBROWSER_BUILDDIR/tor-win32-${TOR_TAG_ORIG:4}.zip || exit 1 touch inputs/bundle-windows.gbuilt else echo @@ -233,6 +235,12 @@ else echo fi +cd $WRAPPER_DIR +if [ "$TORBROWSER_SYMLINK_VERSION" == '1' ] +then + ln -sf $TORBROWSER_BUILDDIR $TORBROWSER_VERSION +fi + echo echo "****** Windows Bundle complete ******" echo diff --git a/gitian/upload-signature.sh b/gitian/upload-signature.sh index 58059aa..c403cd5 100755 --- a/gitian/upload-signature.sh +++ b/gitian/upload-signature.sh @@ -21,21 +21,22 @@ if ! [ -e $VERSIONS_FILE ]; then fi . $VERSIONS_FILE +eval $(./get-tb-version $TORBROWSER_VERSION_TYPE) -if [ ! -f $TORBROWSER_VERSION/sha256sums.txt.asc ]; +if [ ! -f $TORBROWSER_BUILDDIR/sha256sums.txt.asc ]; then - pushd $TORBROWSER_VERSION && gpg -abs sha256sums.txt + pushd $TORBROWSER_BUILDDIR && gpg -abs sha256sums.txt popd fi -if [ -f $TORBROWSER_VERSION/sha256sums.incrementals.txt ] \ - && [ ! -f $TORBROWSER_VERSION/sha256sums.incrementals.txt.asc ] +if [ -f $TORBROWSER_BUILDDIR/sha256sums.incrementals.txt ] \ + && [ ! -f $TORBROWSER_BUILDDIR/sha256sums.incrementals.txt.asc ] then - pushd $TORBROWSER_VERSION && gpg -abs sha256sums.incrementals.txt + pushd $TORBROWSER_BUILDDIR && gpg -abs sha256sums.incrementals.txt popd fi -ssh $HOST "mkdir -p $BASE_DIR/$TORBROWSER_VERSION" -scp $TORBROWSER_VERSION/sha256sums*.txt* $HOST:$BASE_DIR/$TORBROWSER_VERSION/ -ssh $HOST "chmod 755 $BASE_DIR/$TORBROWSER_VERSION && chmod 644 $BASE_DIR/$TORBROWSER_VERSION/*" +ssh $HOST "mkdir -p $BASE_DIR/$TORBROWSER_BUILDDIR" +scp $TORBROWSER_BUILDDIR/sha256sums*.txt* $HOST:$BASE_DIR/$TORBROWSER_BUILDDIR/ +ssh $HOST "chmod 755 $BASE_DIR/$TORBROWSER_BUILDDIR && chmod 644 $BASE_DIR/$TORBROWSER_BUILDDIR/*" diff --git a/gitian/versions b/gitian/versions index b6ec79f..36f315d 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,4 +1,4 @@ -TORBROWSER_VERSION=4.0.1 +TORBROWSER_VERSION_TYPE=release BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" BUILD_PT_BUNDLES=1 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index b84f92e..5306d6b 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -1,4 +1,4 @@ -TORBROWSER_VERSION=4.5-alpha-1 +TORBROWSER_VERSION_TYPE=alpha BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" BUILD_PT_BUNDLES=1 diff --git a/gitian/versions.beta b/gitian/versions.beta index 29ba9e9..3678b37 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -1,4 +1,4 @@ -TORBROWSER_VERSION=3.6.1 +TORBROWSER_VERSION_TYPE=beta BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" BUILD_PT_BUNDLES=1 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index e6ea2a1..d812187 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -1,4 +1,7 @@ +TORBROWSER_VERSION_TYPE=nightly TORBROWSER_VERSION=tbb-nightly +TORBROWSER_BUILDDIR=tbb-nightly +TORBROWSER_SYMLINK_VERSION=0 BUNDLE_LOCALES="ar ru zh-CN" BUILD_PT_BUNDLES=1

1 0

[tor-browser-bundle/master] Merge remote-tracking branch 'boklm/ticket_13015_v2'
by gk＠torproject.org 13 Jan '15

13 Jan '15

commit 0ca8d445690515e053e3dfbdaaf3b683b1021431 Merge: 5401e06 28e1585 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 13 15:09:56 2015 +0000 Merge remote-tracking branch 'boklm/ticket_13015_v2' gitian/check-match.sh | 25 +++++++++++---------- gitian/get-tb-version | 53 ++++++++++++++++++++++++++++++++++++++++++++ gitian/hash-bundles.sh | 3 ++- gitian/mkbundle-linux.sh | 18 ++++++++++----- gitian/mkbundle-mac.sh | 12 ++++++++-- gitian/mkbundle-windows.sh | 16 +++++++++---- gitian/upload-signature.sh | 17 +++++++------- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- gitian/versions.nightly | 3 +++ 11 files changed, 118 insertions(+), 35 deletions(-)

1 0

[tor-launcher/master] Remove superfluous whitespace.
by gk＠torproject.org 13 Jan '15

13 Jan '15

commit 0717ad71785545ec167c531d60b5410a19ebbc1a Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 13 10:03:50 2015 +0000 Remove superfluous whitespace. --- src/chrome/content/network-settings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index f100f90..aa07e1e 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -123,7 +123,7 @@ function initDialog() // Hide the Tor Browser logo and associated separator element if the // TOR_HIDE_BROWSER_LOGO environment variable is set. let env = Cc["@mozilla.org/process/environment;1"] - .getService(Ci.nsIEnvironment); + .getService(Ci.nsIEnvironment); if (env.exists("TOR_HIDE_BROWSER_LOGO")) wizardElem.setAttribute("tor_hide_browser_logo", true);

1 0

[tor-launcher/master] Bug 14122: Hide logo if TOR_HIDE_BROWSER_LOGO set.
by gk＠torproject.org 13 Jan '15

13 Jan '15

commit c1ee486489e33bb07164448b096afba5d899f661 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Jan 12 17:39:45 2015 -0500 Bug 14122: Hide logo if TOR_HIDE_BROWSER_LOGO set. If the TOR_HIDE_BROWSER_LOGO environment variable is set, hide Tor Browser logo within the network settings wizard. Based on contributions from linostar and proper. --- src/chrome/content/network-settings-wizard.xul | 12 ++++++------ src/chrome/content/network-settings.js | 9 ++++++++- src/chrome/skin/network-settings.css | 7 ++++++- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/chrome/content/network-settings-wizard.xul b/src/chrome/content/network-settings-wizard.xul index 04251f9..33ba6c5 100644 --- a/src/chrome/content/network-settings-wizard.xul +++ b/src/chrome/content/network-settings-wizard.xul @@ -1,6 +1,6 @@ <?xml version="1.0"?>  @@ -35,7 +35,7 @@ <vbox class="tbb-logo-box" align="start"> <image class="tbb-logo" /> </vbox> - <separator orient="vertical" /> + <separator class="tbb-logo-separator" orient="vertical" /> <groupbox flex="1"> <description>&torsettings.prompt;</description> </groupbox> @@ -60,7 +60,7 @@ <vbox class="tbb-logo-box" align="start"> <image class="tbb-logo" /> </vbox> - <separator /> + <separator class="tbb-logo-separator" /> <hbox> <vbox flex="1"> <label class="question">&torSettings.proxyQuestion;</label> @@ -79,7 +79,7 @@ <vbox class="tbb-logo-box" align="start"> <image class="tbb-logo" /> </vbox> - <separator /> + <separator class="tbb-logo-separator" /> <label class="instructions">&torSettings.enterProxy;</label> <groupbox id="proxySpecificSettings" /> </wizardpage> @@ -89,7 +89,7 @@ <vbox class="tbb-logo-box" align="start"> <image class="tbb-logo" /> </vbox> - <separator /> + <separator class="tbb-logo-separator" /> <hbox> <vbox flex="1"> <label class="question">&torSettings.bridgeQuestion;</label> @@ -109,7 +109,7 @@ <vbox class="tbb-logo-box" align="start"> <image class="tbb-logo" /> </vbox> - <separator /> + <separator class="tbb-logo-separator" /> <vbox> <label id="bridgeSettingsPrompt" class="question">&torSettings.bridgeSettingsPrompt;</label> diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 908e711..f100f90 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -1,4 +1,4 @@ -// Copyright (c) 2014, The Tor Project, Inc. +// Copyright (c) 2015, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -120,6 +120,13 @@ function initDialog() var haveWizard = (wizardElem != null); if (haveWizard) { + // Hide the Tor Browser logo and associated separator element if the + // TOR_HIDE_BROWSER_LOGO environment variable is set. + let env = Cc["@mozilla.org/process/environment;1"] + .getService(Ci.nsIEnvironment); + if (env.exists("TOR_HIDE_BROWSER_LOGO")) + wizardElem.setAttribute("tor_hide_browser_logo", true); + // Set "Copy Tor Log" label and move it after the Quit (cancel) button. var copyLogBtn = document.documentElement.getButton("extra2"); if (copyLogBtn) diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index e4142d4..331ae42 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, The Tor Project, Inc. + * Copyright (c) 2015, The Tor Project, Inc. * See LICENSE for licensing information. * * vim: set sw=2 sts=2 ts=8 et syntax=css: @@ -94,6 +94,11 @@ button.firstAnswer { margin-right: 20px; } +wizard[tor_hide_browser_logo="true"] .tbb-logo, +wizard[tor_hide_browser_logo="true"] .tbb-logo-separator { + display: none; +} + #bridgeCustomEntry { margin-left: 30px; }

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

tbb-commits January 2015