December 2016 - tor-commits - lists.torproject.org

[tor/release-0.2.9] Downgrade a harmless bug warning to info.
by nickm＠torproject.org 12 Dec '16

12 Dec '16

commit a40d2123834cd55e77ed76684a6d0f536a7c2f4e Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 9 08:43:09 2016 -0500 Downgrade a harmless bug warning to info. Makes 19926 less annoying in 0.2.9. In 0.3.0, we should actually fix this. --- changes/bug19926_029_info | 3 +++ src/or/connection_edge.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug19926_029_info b/changes/bug19926_029_info new file mode 100644 index 0000000..93fd81b --- /dev/null +++ b/changes/bug19926_029_info @@ -0,0 +1,3 @@ + o Minor bugfixes (logging): + - Downgrade a harmless log message about the pending_entry_connections + list from "warn" to "info". Mitigates bug 19926. diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 7b9c315..3550d0e 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -865,7 +865,9 @@ connection_ap_attach_pending(int retry) continue; } if (conn->state != AP_CONN_STATE_CIRCUIT_WAIT) { - log_warn(LD_BUG, "%p is no longer in circuit_wait. Its current state " + // XXXX 030 -- this is downgraded in 0.2.9, since we apparently + // XXXX are running into it in practice. It's harmless. + log_info(LD_BUG, "%p is no longer in circuit_wait. Its current state " "is %s. Why is it on pending_entry_connections?", entry_conn, conn_state_to_string(conn->type, conn->state));

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by nickm＠torproject.org 12 Dec '16

12 Dec '16

commit d3874e4cbca233cf83ae0da55e68fb27deafdd82 Merge: 6402144 a40d212 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Dec 11 20:37:02 2016 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug19926_029_info | 3 +++ src/or/connection_edge.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/master] Downgrade a harmless bug warning to info.
by nickm＠torproject.org 12 Dec '16

12 Dec '16

commit a40d2123834cd55e77ed76684a6d0f536a7c2f4e Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 9 08:43:09 2016 -0500 Downgrade a harmless bug warning to info. Makes 19926 less annoying in 0.2.9. In 0.3.0, we should actually fix this. --- changes/bug19926_029_info | 3 +++ src/or/connection_edge.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug19926_029_info b/changes/bug19926_029_info new file mode 100644 index 0000000..93fd81b --- /dev/null +++ b/changes/bug19926_029_info @@ -0,0 +1,3 @@ + o Minor bugfixes (logging): + - Downgrade a harmless log message about the pending_entry_connections + list from "warn" to "info". Mitigates bug 19926. diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 7b9c315..3550d0e 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -865,7 +865,9 @@ connection_ap_attach_pending(int retry) continue; } if (conn->state != AP_CONN_STATE_CIRCUIT_WAIT) { - log_warn(LD_BUG, "%p is no longer in circuit_wait. Its current state " + // XXXX 030 -- this is downgraded in 0.2.9, since we apparently + // XXXX are running into it in practice. It's harmless. + log_info(LD_BUG, "%p is no longer in circuit_wait. Its current state " "is %s. Why is it on pending_entry_connections?", entry_conn, conn_state_to_string(conn->type, conn->state));

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 11 Dec '16

11 Dec '16

commit 948087594c13cf3685c836dc8bf042b31e45ed7e Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 11 22:18:19 2016 +0000 Update translations for tor-browser-manual --- pt_BR/pt_BR.po | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index 0178c9b..cf1cc40 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -875,6 +875,13 @@ msgid "" "following the site’s recommended procedure for account recovery, or " "contacting the operators and explaining the situation." msgstr "" +"O Navegador Tor faz com que a sua conexão apareça como se estivesse vindo de" +" uma parte do mundo totalmente diferente. Alguns sites, como bancos e " +"provedores de e-mail, podem interpretar essa informação como um sinal de que" +" a sua conta foi hackeada ou comprometida, e não permitem que você a acesse." +" A única maneira de resolver esse problema é seguir o procedimento de " +"recuperação de conta recomendado pelo site, ou contactar os operadores e " +"explicar a situação. " #: managing-identities.page:101 msgid "Changing identities and circuits"

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 11 Dec '16

11 Dec '16

commit 88c49d262db7d10462e96e1f08fb3d26b74d2c1c Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 11 20:48:22 2016 +0000 Update translations for tor-browser-manual --- zh_TW/zh_TW.po | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po index eb0740d..6ba8c97 100644 --- a/zh_TW/zh_TW.po +++ b/zh_TW/zh_TW.po @@ -6,12 +6,13 @@ # cges30901 <cges30901(a)gmail.com>, 2016 # Chinrur Yang <chinrur(a)gmail.com>, 2016 # LNDDYL <lnddyl(a)outlook.com>, 2016 +# Kai Moffit <mytransifex(a)riseup.net>, 2016 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2016-12-06 16:36-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: LNDDYL <lnddyl(a)outlook.com>, 2016\n" +"Last-Translator: Kai Moffit <mytransifex(a)riseup.net>, 2016\n" "Language-Team: Chinese (Taiwan) (https://www.transifex.com/otf/teams/1519/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -26,24 +27,24 @@ msgstr "翻譯人員-製作群" #: about-tor-browser.page:7 msgid "Learn what Tor Browser can do to protect your privacy and anonymity" -msgstr "" +msgstr "認識 Tor瀏覽器的功能，它如何保護我們的隱私和匿名" #: about-tor-browser.page:10 msgid "About Tor Browser" -msgstr "" +msgstr "關於 Tor 瀏覽器" #: about-tor-browser.page:12 msgid "" "Tor Browser uses the Tor network to protect your privacy and anonymity. " "Using the Tor network has two main properties:" -msgstr "" +msgstr "Tor 瀏覽器使用 Tor 網路來保護您的隱私和匿名。使用 Tor 網路有兩個主要的功能：" #: about-tor-browser.page:18 msgid "" "Your internet service provider, and anyone watching your connection locally," " will not be able to track your internet activity, including the names and " "addresses of the websites you visit." -msgstr "" +msgstr "您的網路服務提供者，以及在您本地網路上監看網路流量的任何人，都不再能夠追蹤您的網路活動，包括您所拜訪網站的名稱和位址。" #: about-tor-browser.page:25 msgid "" @@ -100,11 +101,11 @@ msgstr "" #: bridges.page:6 msgid "Learn what bridges are and how to get them" -msgstr "" +msgstr "認識網橋是什麼，以及如何使用它" #: bridges.page:10 msgid "Bridges" -msgstr "" +msgstr "網橋（Bridges）" #: bridges.page:12 msgid "" @@ -125,13 +126,13 @@ msgstr "" #: bridges.page:28 msgid "Getting bridge addresses" -msgstr "" +msgstr "取得網橋位址" #: bridges.page:29 msgid "" "Because bridge addresses are not public, you will need to request them " "yourself. You have two options:" -msgstr "" +msgstr "因為網橋位址是不公開的，您要先設法取得位址。有兩個方法：" #: bridges.page:36 msgid "" @@ -139,22 +140,26 @@ msgid "" "href=\"https://bridges.torproject.org/\">https://bridges.torproject.org/</link>" " and follow the instructions, or" msgstr "" +"拜訪 <link " +"href=\"https://bridges.torproject.org/\">https://bridges.torproject.org/</link>" +" 並按照上面的指示操作，或者" #: bridges.page:42 msgid "" "Email bridges(a)torproject.org from a Gmail, Yahoo, or Riseup email address, " "or" msgstr "" +"使用 Gmail、Yahoo 或 Riseup 的 email 帳號寄封 email 給 bridges(a)torproject.xn--org,-875hs64m" #: bridges.page:51 msgid "Entering bridge addresses" -msgstr "" +msgstr "輸入網橋位址" #: bridges.page:52 msgid "" "Once you have obtained some bridge addresses, you will need to enter them " "into Tor Launcher." -msgstr "" +msgstr "在您取得網橋位址後，還需要將它輸入 Tor 啟動器裡面。" #: bridges.page:57 msgid ""

1 0

[translation/tails-greeter-2_completed] Update translations for tails-greeter-2_completed
by translation＠torproject.org 11 Dec '16

11 Dec '16

commit 82bc1439620401ecfe8b29142776aac24cbf22b0 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 11 20:48:13 2016 +0000 Update translations for tails-greeter-2_completed --- zh_TW/zh_TW.po | 128 ++++++++++++++++++++++++--------------------------------- 1 file changed, 54 insertions(+), 74 deletions(-) diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po index 25a3fd1..b8c3c38 100644 --- a/zh_TW/zh_TW.po +++ b/zh_TW/zh_TW.po @@ -1,16 +1,16 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# Tails GDM Greeter +# Copyright (C) 2016 Tails devlopers +# This file is distributed under the same license as the tails-greeter package. +# Tails devloppers <tails(a)boum.org>, 2016. # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-11-18 00:07+0000\n" +"POT-Creation-Date: 2016-12-03 13:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Agustín Wu <losangwuyts(a)gmail.com>, 2016\n" +"Last-Translator: Kai Moffit <mytransifex(a)riseup.net>, 2016\n" "Language-Team: Chinese (Taiwan) (https://www.transifex.com/otf/teams/1519/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -45,25 +45,28 @@ msgstr "確認您的系統管理員密碼" msgid "Disable" msgstr "關閉" -#: ../data/greeter.ui.h:7 +#. This string will never be displayed in the 1st version of the greeter. +#: ../data/greeter.ui.h:8 msgid "Windows Camouflage" msgstr "偽裝成Windows" -#: ../data/greeter.ui.h:8 +#. This string will never be displayed in the 1st version of the greeter. +#: ../data/greeter.ui.h:10 msgid "" "This option makes Tails look like Microsoft Windows 10. This can be useful " -"to avoid attracting suspiction in public places." -msgstr "此功能可以將 Tails 的外觀偽裝成微軟的 Windows 10，以便當您在公眾場所使用電腦時，可以避免引起旁人的注意。" +"to avoid attracting suspicion in public places." +msgstr "這選項讓 Tails 看起來像 Microsoft Windows 10。這可以讓您在公共場所時不受矚目。" -#: ../data/greeter.ui.h:9 +#. This string will never be displayed in the 1st version of the greeter. +#: ../data/greeter.ui.h:12 msgid "Microsoft Windows 10 camouflage" msgstr "微軟 Windows 10 偽裝" -#: ../data/greeter.ui.h:10 +#: ../data/greeter.ui.h:13 msgid "MAC Address Spoofing" msgstr "網路卡實體位址偽裝" -#: ../data/greeter.ui.h:11 +#: ../data/greeter.ui.h:14 msgid "" "MAC address spoofing hides the serial number of your network interface (Wi-" "Fi or wired) to the local network. Spoofing MAC addresses is generally safer" @@ -72,67 +75,53 @@ msgid "" msgstr "" "每張網路卡都有一個獨一無二的實體位址，偽裝此位址可以避免本地端的網路(無論是有線或無線)得知您真實的網路卡實體位址，進而掩飾您實際的地理位置。但是在某些情況中，可能會造成網路連線的問題，或是增加可疑性。" -#: ../data/greeter.ui.h:12 +#: ../data/greeter.ui.h:15 msgid "Spoof all MAC addresses (default)" msgstr "偽裝所有的網路卡實體位址(預設)" -#: ../data/greeter.ui.h:13 +#: ../data/greeter.ui.h:16 msgid "Don't spoof MAC addresses" msgstr "不要偽裝網路卡實體位址" -#: ../data/greeter.ui.h:14 +#: ../data/greeter.ui.h:17 msgid "Welcome to Tails!" msgstr "歡迎使用 Tails！" -#: ../data/greeter.ui.h:15 +#. This string will never be displayed in the 1st version of the greeter. +#: ../data/greeter.ui.h:19 +msgctxt "" msgid "" "To get guided through Tails' settings, click on <b>Take a Tour</b> above" msgstr "若要針對 Tails 的設定進行導覽，請點選<b>功能導覽</b>" -#: ../data/greeter.ui.h:16 +#: ../data/greeter.ui.h:20 msgid "Language & Region" msgstr "語言和區域" -#: ../data/greeter.ui.h:17 +#: ../data/greeter.ui.h:21 msgid "Default Settings" msgstr "預設值" -#: ../data/greeter.ui.h:18 +#: ../data/greeter.ui.h:22 msgid "Save Language & Region Settings" msgstr "儲存語言與區域的設定值" -#: ../data/greeter.ui.h:19 +#: ../data/greeter.ui.h:23 msgid "Language" msgstr "語言" -#: ../data/greeter.ui.h:20 -msgid "English" -msgstr "英文" - -#: ../data/greeter.ui.h:21 +#: ../data/greeter.ui.h:24 msgid "Keyboard Layout" msgstr "鍵盤佈局" -#: ../data/greeter.ui.h:22 -msgid "English (US)" -msgstr "美式英文" - -#: ../data/greeter.ui.h:23 +#: ../data/greeter.ui.h:25 msgid "Formats" msgstr "格式" -#: ../data/greeter.ui.h:24 -msgid "United States" -msgstr "美國" - -#: ../data/greeter.ui.h:25 +#: ../data/greeter.ui.h:26 msgid "Time Zone" msgstr "時區" -#: ../data/greeter.ui.h:26 -msgid "UTC" -msgstr "UTC" - #: ../data/greeter.ui.h:27 msgid "Encrypted Persistent Storage" msgstr "加密之永久性儲存裝置" @@ -149,8 +138,8 @@ msgstr "設定永久性儲存裝置" msgid "Enter your passphrase to unlock the persistent storage" msgstr "請輸入密碼以便解鎖永久性儲存裝置" -#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781 -#: ../tailsgreeter/gui.py:942 +#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798 +#: ../tailsgreeter/gui.py:962 msgid "Unlock" msgstr "解鎖" @@ -158,7 +147,7 @@ msgstr "解鎖" msgid "Relock Persistent Storage" msgstr "重新鎖定永久性儲存裝置" -#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:492 +#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514 msgid "Additional Settings" msgstr "額外的設定" @@ -167,8 +156,8 @@ msgid "Save Additional Settings" msgstr "儲存額外的設定" #: ../data/greeter.ui.h:35 -msgid "toolbutton" -msgstr "工具按鈕" +msgid "Add an additional setting" +msgstr "添加一個額外設定" #: ../data/greeter.ui.h:36 msgid "Network Configuration" @@ -199,11 +188,11 @@ msgid "" "press the \"+\" button below." msgstr "在大多數的情況下，預設的設定值是很安全的。若您想要增加個人化的設定，請按下方的「+」按鈕。" -#: ../data/greeter.ui.h:42 +#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:717 msgid "Off (default)" msgstr "關閉(預設)" -#: ../data/greeter.ui.h:43 +#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715 msgid "On (default)" msgstr "啟用(預設)" @@ -211,74 +200,65 @@ msgstr "啟用(預設)" msgid "Network Connection" msgstr "網路連線" -#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894 +#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914 msgid "Direct (default)" msgstr "直接(預設)" -#: ../tailsgreeter/gui.py:436 +#: ../tailsgreeter/gui.py:456 msgid "Shutdown" msgstr "關閉" -#: ../tailsgreeter/gui.py:442 +#: ../tailsgreeter/gui.py:462 msgid "Start Tails" msgstr "啟動 Tails" -#: ../tailsgreeter/gui.py:501 +#: ../tailsgreeter/gui.py:523 msgid "Cancel" msgstr "取消" -#: ../tailsgreeter/gui.py:505 +#: ../tailsgreeter/gui.py:527 msgid "Add" msgstr "新增" -#: ../tailsgreeter/gui.py:511 +#: ../tailsgreeter/gui.py:534 msgid "Back" msgstr "返回" -#: ../tailsgreeter/gui.py:627 +#: ../tailsgreeter/gui.py:652 msgid "Unlocking…" msgstr "解鎖中...." -#: ../tailsgreeter/gui.py:653 +#: ../tailsgreeter/gui.py:680 msgid "" "You will configure the Tor bridge and local proxy later on after connecting " "to a network." msgstr "當您連接上網路之後，將會需要設定洋蔥路由橋接器與本地端代理伺服器。" -#: ../tailsgreeter/gui.py:698 +#: ../tailsgreeter/gui.py:720 msgid "On" msgstr "啟動" -#: ../tailsgreeter/gui.py:700 +#: ../tailsgreeter/gui.py:722 msgid "Off" msgstr "關閉" -#: ../tailsgreeter/gui.py:702 -#, python-brace-format -msgid "{on_or_off} (default)" -msgstr "{on_or_off} (預設)" - -#: ../tailsgreeter/gui.py:759 -msgid "You would be able to set up an encrypted storage." -msgstr "您可以設定一個加密的儲存裝置。" - -#: ../tailsgreeter/gui.py:783 +#: ../tailsgreeter/gui.py:801 msgid "Failed to relock persistent storage." msgstr "永久性儲存裝置重新鎖定失敗。" -#: ../tailsgreeter/gui.py:900 +#: ../tailsgreeter/gui.py:920 msgid "Bridge & Proxy" msgstr "橋接器與代理伺服器" -#: ../tailsgreeter/gui.py:906 +#: ../tailsgreeter/gui.py:926 msgid "Offline" msgstr "離線" -#: ../tailsgreeter/gui.py:945 +#: ../tailsgreeter/gui.py:965 msgid "Cannot unlock encrypted storage with this passphrase." msgstr "此通關密語無法解鎖加密的儲存裝置。" -#: ../tailsgreeter/persistence.py:94 +#: ../tailsgreeter/persistence.py:96 #, python-brace-format msgid "" "live-persist failed with return code {returncode}:\n" @@ -287,8 +267,8 @@ msgstr "" "live-persist failed with return code {returncode}:\n" "{stderr}" -#: ../tailsgreeter/persistence.py:136 ../tailsgreeter/persistence.py:161 -#: ../tailsgreeter/persistence.py:185 +#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163 +#: ../tailsgreeter/persistence.py:186 #, python-brace-format msgid "" "cryptsetup failed with return code {returncode}:\n" @@ -299,7 +279,7 @@ msgstr "" "{stdout}\n" "{stderr}" -#: ../tailsgreeter/persistence.py:205 +#: ../tailsgreeter/persistence.py:206 #, python-brace-format msgid "" "umount failed with return code {returncode}:\n"

1 0

[translation/tails-greeter-2] Update translations for tails-greeter-2
by translation＠torproject.org 11 Dec '16

11 Dec '16

commit 316baed1bb39318875958eee6643fbe226941b39 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 11 20:48:08 2016 +0000 Update translations for tails-greeter-2 --- zh_TW/zh_TW.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po index c9025ac..b8c3c38 100644 --- a/zh_TW/zh_TW.po +++ b/zh_TW/zh_TW.po @@ -10,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-12-03 13:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Agustín Wu <losangwuyts(a)gmail.com>, 2016\n" +"Last-Translator: Kai Moffit <mytransifex(a)riseup.net>, 2016\n" "Language-Team: Chinese (Taiwan) (https://www.transifex.com/otf/teams/1519/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -55,7 +55,7 @@ msgstr "偽裝成Windows" msgid "" "This option makes Tails look like Microsoft Windows 10. This can be useful " "to avoid attracting suspicion in public places." -msgstr "" +msgstr "這選項讓 Tails 看起來像 Microsoft Windows 10。這可以讓您在公共場所時不受矚目。" #. This string will never be displayed in the 1st version of the greeter. #: ../data/greeter.ui.h:12 @@ -157,7 +157,7 @@ msgstr "儲存額外的設定" #: ../data/greeter.ui.h:35 msgid "Add an additional setting" -msgstr "" +msgstr "添加一個額外設定" #: ../data/greeter.ui.h:36 msgid "Network Configuration"

1 0

[tor-browser-bundle/master] Just take the version number for sandbox tag
by gk＠torproject.org 11 Dec '16

11 Dec '16

commit 732e8df18b1d883b48573b84c9e121ad72772159 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Dec 11 15:48:54 2016 +0000 Just take the version number for sandbox tag --- gitian/mkbundle-linux.sh | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 9273b32..27cccd0 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -232,8 +232,15 @@ else echo fi -if [ ! -f inputs/sandbox-$SANDBOX_TAG-linux32.zip -o \ - ! -f inputs/sandbox-$SANDBOX_TAG-linux64.zip ]; +if [ "$SANDBOX_TAG" = "master" ] +then + SB_TAG="master" +else + SB_TAG=${SANDBOX_TAG#sandboxed-tor-browser-} +fi + +if [ ! -f inputs/sandbox-$SB_TAG-linux32.zip -o \ + ! -f inputs/sandbox-$SB_TAG-linux64.zip ]; then echo echo "****** Starting Sandbox Component of Linux Bundle (5/6 for Linux) ******" @@ -245,7 +252,7 @@ then exit 1 fi - cp -a build/out/sandbox-$SANDBOX_TAG-linux*.zip inputs/ + cp -a build/out/sandbox-$SB_TAG-linux*.zip inputs/ #cp -a result/sandbox-linux-res.yml inputs/ else echo @@ -273,7 +280,7 @@ then 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 - cp -a inputs/sandbox-$SANDBOX_TAG-linux*.zip $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1 + cp -a inputs/sandbox-$SB_TAG-linux*.zip $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1 touch inputs/bundle-linux.gbuilt else echo

1 0

[tor-browser-bundle/master] Fix sandbox tag build bustage
by gk＠torproject.org 11 Dec '16

11 Dec '16

commit 36c35a75afd2a9a564913a08e3015ee0959d05c9 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Dec 11 15:17:04 2016 +0000 Fix sandbox tag build bustage --- gitian/mkbundle-linux.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 156d2ba..9273b32 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -78,7 +78,6 @@ die_msg() { # the utils both if we verify tags and if we don't. LIBEVENT_TAG_ORIG=$LIBEVENT_TAG -SANDBOX_ORIG_TAG=$SANDBOX_TAG if [ "z$VERIFY_TAGS" = "z1" ]; then @@ -233,8 +232,8 @@ else echo fi -if [ ! -f inputs/sandbox-linux32.zip -o \ - ! -f inputs/sandbox-linux64.zip ]; +if [ ! -f inputs/sandbox-$SANDBOX_TAG-linux32.zip -o \ + ! -f inputs/sandbox-$SANDBOX_TAG-linux64.zip ]; then echo echo "****** Starting Sandbox Component of Linux Bundle (5/6 for Linux) ******" @@ -246,7 +245,7 @@ then exit 1 fi - cp -a build/out/sandbox-linux*.zip inputs/ + cp -a build/out/sandbox-$SANDBOX_TAG-linux*.zip inputs/ #cp -a result/sandbox-linux-res.yml inputs/ else echo @@ -274,8 +273,7 @@ then 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 - cp -a inputs/sandbox-linux32.zip $WRAPPER_DIR/$TORBROWSER_BUILDDIR/sandbox-linux32-${SANDBOX_ORIG_TAG}.zip || exit 1 - cp -a inputs/sandbox-linux64.zip $WRAPPER_DIR/$TORBROWSER_BUILDDIR/sandbox-linux64-${SANDBOX_ORIG_TAG}.zip || exit 1 + cp -a inputs/sandbox-$SANDBOX_TAG-linux*.zip $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1 touch inputs/bundle-linux.gbuilt else echo

1 0

[tor-browser-bundle/master] Sourcing the sandboxed-tor-browser tag
by gk＠torproject.org 11 Dec '16

11 Dec '16

commit 735537ef81d4ad09e5fd52e48ba49470ff60039e Author: Georg Koppen <gk(a)torproject.org> Date: Sun Dec 11 13:39:10 2016 +0000 Sourcing the sandboxed-tor-browser tag --- gitian/descriptors/linux/gitian-sandbox.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/gitian/descriptors/linux/gitian-sandbox.yml b/gitian/descriptors/linux/gitian-sandbox.yml index c506833..9e13c17 100644 --- a/gitian/descriptors/linux/gitian-sandbox.yml +++ b/gitian/descriptors/linux/gitian-sandbox.yml @@ -33,6 +33,7 @@ files: - "gb-build-dir.patch" script: | INSTDIR="$HOME/install" + source versions mkdir $INSTDIR/sandbox export REFERENCE_DATETIME export TZ=UTC

1 0