January 2017 - tor-commits - lists.torproject.org

[depictor/master] Handle some error conditions in Shared Random parsing
by tom＠torproject.org 09 Jan '17

09 Jan '17

commit eb685c30e23230e6de5767efdc4b7bb6d1c93231 Author: Tom Ritter <tom(a)ritter.vg> Date: Mon Jan 9 07:03:35 2017 -0600 Handle some error conditions in Shared Random parsing --- website.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/website.py b/website.py index 6b8e28d..fa508ac 100755 --- a/website.py +++ b/website.py @@ -607,8 +607,8 @@ class WebsiteWriter: s = "[" s += "V:" + str(sr.version) + " " s += "A:" + str(sr.algorithm) + " " - s += "C:" + sr.commit + " " - s += "R:" + sr.reveal + s += "C:" + sr.commit if sr.commit else "<span class=\"oiv\">(Empty)</span>" + s += "R:" + sr.reveal if sr.reveal else "<span class=\"oiv\">(Empty)</span>" return s + "]" def _write_shared_random(self): """ @@ -638,10 +638,10 @@ class WebsiteWriter: cur_error = "" if vote.directory_authorities[0].shared_randomness_previous_reveal_count != self.consensus.shared_randomness_previous_reveal_count or \ vote.directory_authorities[0].shared_randomness_previous_value != self.consensus.shared_randomness_previous_value: - prev_error = "oiv" + prev_error = " class=\"oiv\"" if vote.directory_authorities[0].shared_randomness_current_reveal_count != self.consensus.shared_randomness_current_reveal_count or \ vote.directory_authorities[0].shared_randomness_current_value != self.consensus.shared_randomness_current_value: - cur_error = "oiv" + cur_error = " class=\"oiv\"" self.site.write(" <tr>\n" + " <td>" + dirauth_nickname + "</td>\n" + " <td>Previous</td>\n"

1 0

[onionoo/master] Fix invalid first_seen timestamps on bridges.
by karsten＠torproject.org 09 Jan '17

09 Jan '17

commit f737faa109ab527a5bfa2ded72bffd1d3063f2fc Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Jan 6 15:37:24 2017 +0100 Fix invalid first_seen timestamps on bridges. Fix a bug where we'd believe that we have first seen a bridge on January 1, 1970 when in fact we have never seen it in a bridge network status and only learned about it from its self-published bridge server descriptor. Fixes #20994. --- CHANGELOG.md | 6 ++++ .../onionoo/updater/NodeDetailsStatusUpdater.java | 33 ++-------------------- 2 files changed, 9 insertions(+), 30 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8eba2fa..c8ab3e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changes in version x.x.x - 2017-xx-xx + * Major changes + - Fix a bug where we'd believe that we have first seen a bridge on + January 1, 1970 when in fact we have never seen it in a bridge + network status and only learned about it from its self-published + bridge server descriptor. + * Medium changes - Unify the build process by adding git-submodule metrics-base in src/build and removing all centralized parts of the build diff --git a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java index a66aba8..d0e4529 100644 --- a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java +++ b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java @@ -126,8 +126,6 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, /* Step 1: parse descriptors. */ - private SortedSet<String> updatedNodes = new TreeSet<String>(); - @Override public void processDescriptor(Descriptor descriptor, boolean relay) { if (descriptor instanceof ServerDescriptor && relay) { @@ -335,7 +333,6 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, detailsStatus.setAdvertisedBandwidth(advertisedBandwidth); detailsStatus.setPlatform(descriptor.getPlatform()); this.documentStore.store(detailsStatus, fingerprint); - this.updatedNodes.add(fingerprint); } private void processBridgeExtraInfoDescriptor( @@ -352,7 +349,6 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, descriptor.getPublishedMillis()); detailsStatus.setTransports(descriptor.getTransports()); this.documentStore.store(detailsStatus, fingerprint); - this.updatedNodes.add(fingerprint); } } @@ -446,7 +442,6 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, for (Map.Entry<String, NodeStatus> e : this.knownNodes.entrySet()) { String fingerprint = e.getKey(); NodeStatus nodeStatus = e.getValue(); - this.updatedNodes.add(fingerprint); if (nodeStatus.isRelay() && nodeStatus.getLastSeenMillis() >= cutoff) { this.currentRelays.add(fingerprint); @@ -510,15 +505,6 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, } else { updatedNodeStatus = nodeStatus; this.knownNodes.put(fingerprint, nodeStatus); - if (nodeStatus.getLastSeenMillis() == (nodeStatus.isRelay() - ? previousRelaysLastValidAfterMillis - : previousBridgesLastValidAfterMillis)) { - /* This relay or bridge was previously running, but we didn't - * parse any descriptors with its fingerprint. Make sure to - * update its details status file later on, so it has the - * correct running bit. */ - this.updatedNodes.add(fingerprint); - } } if (updatedNodeStatus.isRelay() && updatedNodeStatus.getLastSeenMillis() >= cutoff) { @@ -581,7 +567,6 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, nodeStatus.getAddress()); if (lookupResult != null) { this.geoIpLookupResults.put(fingerprint, lookupResult); - this.updatedNodes.add(fingerprint); } } } @@ -683,22 +668,18 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, if (consensusWeights.containsKey(fingerprint)) { this.consensusWeightFractions.put(fingerprint, (float) (consensusWeights.get(fingerprint) / totalConsensusWeight)); - this.updatedNodes.add(fingerprint); } if (guardWeights.containsKey(fingerprint)) { this.guardProbabilities.put(fingerprint, (float) (guardWeights.get(fingerprint) / totalGuardWeight)); - this.updatedNodes.add(fingerprint); } if (middleWeights.containsKey(fingerprint)) { this.middleProbabilities.put(fingerprint, (float) (middleWeights.get(fingerprint) / totalMiddleWeight)); - this.updatedNodes.add(fingerprint); } if (exitWeights.containsKey(fingerprint)) { this.exitProbabilities.put(fingerprint, (float) (exitWeights.get(fingerprint) / totalExitWeight)); - this.updatedNodes.add(fingerprint); } } } @@ -766,21 +747,16 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, } for (String fingerprint : this.currentRelays) { NodeStatus nodeStatus = this.knownNodes.get(fingerprint); - if (nodeStatus == null) { - continue; - } if (effectiveFamilies.containsKey(fingerprint) || extendedFamilies.containsKey(fingerprint)) { nodeStatus.setEffectiveFamily(effectiveFamilies.get(fingerprint)); nodeStatus.setExtendedFamily(extendedFamilies.get(fingerprint)); - this.updatedNodes.add(fingerprint); } else if ((nodeStatus.getEffectiveFamily() != null && !nodeStatus.getEffectiveFamily().isEmpty()) || (nodeStatus.getIndirectFamily() != null && !nodeStatus.getIndirectFamily().isEmpty())) { nodeStatus.setEffectiveFamily(null); nodeStatus.setExtendedFamily(null); - this.updatedNodes.add(fingerprint); } } } @@ -801,7 +777,6 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, String hostName = lookupResults.get(nodeStatus.getAddress()); if (hostName != null) { this.rdnsLookupResults.put(fingerprint, hostName); - this.updatedNodes.add(fingerprint); } } } @@ -809,11 +784,9 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, /* Step 4: update details statuses and then node statuses. */ private void updateNodeDetailsStatuses() { - for (String fingerprint : this.updatedNodes) { - NodeStatus nodeStatus = this.knownNodes.get(fingerprint); - if (nodeStatus == null) { - nodeStatus = new NodeStatus(fingerprint); - } + for (Map.Entry<String, NodeStatus> entry : this.knownNodes.entrySet()) { + String fingerprint = entry.getKey(); + NodeStatus nodeStatus = entry.getValue(); DetailsStatus detailsStatus = this.documentStore.retrieve( DetailsStatus.class, true, fingerprint); if (detailsStatus == null) {

1 0

[translation/tails-onioncircuits_completed] Update translations for tails-onioncircuits_completed
by translation＠torproject.org 09 Jan '17

09 Jan '17

commit 48d5b4f0c90fd99deb9ef6ff17bd218745ff3d45 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 9 11:47:29 2017 +0000 Update translations for tails-onioncircuits_completed --- ru/onioncircuits.pot | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/ru/onioncircuits.pot b/ru/onioncircuits.pot index 55ede50..0056f5f 100644 --- a/ru/onioncircuits.pot +++ b/ru/onioncircuits.pot @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Misha Dyachuk <Wikia(a)scryptmail.com>, 2017 # Victor Bychek, 2016 # Андрей Костриков <yavinav(a)gmail.com>, 2016 # Антон Толмачев <a.tolmachev(a)richart-consalt.ru>, 2016 @@ -11,8 +12,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-31 14:42+0200\n" -"PO-Revision-Date: 2016-06-03 15:35+0000\n" -"Last-Translator: Victor Bychek\n" +"PO-Revision-Date: 2017-01-09 11:31+0000\n" +"Last-Translator: Misha Dyachuk <Wikia(a)scryptmail.com>\n" "Language-Team: Russian (http://www.transifex.com/otf/torproject/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,15 +23,15 @@ msgstr "" #: ../onioncircuits:81 msgid "You are not connected to Tor yet..." -msgstr "Вы пока не подключены к Tor..." +msgstr "Вы не подключены к сети Tor..." #: ../onioncircuits:95 msgid "Onion Circuits" -msgstr "Onion Circuits" +msgstr "Цепочка Onion" #: ../onioncircuits:125 msgid "Circuit" -msgstr "Схема" +msgstr "Цепочка" #: ../onioncircuits:126 msgid "Status" @@ -38,11 +39,11 @@ msgstr "Статус" #: ../onioncircuits:142 msgid "Click on a circuit for more detail about its Tor relays." -msgstr "Кликните на схему, чтобы узнать больше о Tor relays." +msgstr "Узнать больше о цепочке подключений Tor сети." #: ../onioncircuits:221 msgid "The connection to Tor was lost..." -msgstr "Соединение с Tor потеряно..." +msgstr "Пропало соединение с Tor сетью ..." #: ../onioncircuits:317 msgid "..." @@ -55,7 +56,7 @@ msgstr "%s: %s" #: ../onioncircuits:554 msgid "GeoIP database unavailable. No country information will be displayed." -msgstr "GeoIP база данных недоступна. Информации о странах показано не будет." +msgstr "База данных GeoIP недоступна. Информации о странах отключена." #: ../onioncircuits:585 #, c-format @@ -73,7 +74,7 @@ msgstr "Неизвестно" #: ../onioncircuits:607 msgid "Fingerprint:" -msgstr "Отпечаток:" +msgstr "Отпечаток ключа:" #: ../onioncircuits:608 msgid "Published:"

1 0

[translation/tails-onioncircuits] Update translations for tails-onioncircuits
by translation＠torproject.org 09 Jan '17

09 Jan '17

commit a817aa9f0b40fd5970631a0eda4f91aa4fe45c61 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 9 11:47:25 2017 +0000 Update translations for tails-onioncircuits --- ru/onioncircuits.pot | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/ru/onioncircuits.pot b/ru/onioncircuits.pot index 55ede50..0056f5f 100644 --- a/ru/onioncircuits.pot +++ b/ru/onioncircuits.pot @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Misha Dyachuk <Wikia(a)scryptmail.com>, 2017 # Victor Bychek, 2016 # Андрей Костриков <yavinav(a)gmail.com>, 2016 # Антон Толмачев <a.tolmachev(a)richart-consalt.ru>, 2016 @@ -11,8 +12,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-31 14:42+0200\n" -"PO-Revision-Date: 2016-06-03 15:35+0000\n" -"Last-Translator: Victor Bychek\n" +"PO-Revision-Date: 2017-01-09 11:31+0000\n" +"Last-Translator: Misha Dyachuk <Wikia(a)scryptmail.com>\n" "Language-Team: Russian (http://www.transifex.com/otf/torproject/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,15 +23,15 @@ msgstr "" #: ../onioncircuits:81 msgid "You are not connected to Tor yet..." -msgstr "Вы пока не подключены к Tor..." +msgstr "Вы не подключены к сети Tor..." #: ../onioncircuits:95 msgid "Onion Circuits" -msgstr "Onion Circuits" +msgstr "Цепочка Onion" #: ../onioncircuits:125 msgid "Circuit" -msgstr "Схема" +msgstr "Цепочка" #: ../onioncircuits:126 msgid "Status" @@ -38,11 +39,11 @@ msgstr "Статус" #: ../onioncircuits:142 msgid "Click on a circuit for more detail about its Tor relays." -msgstr "Кликните на схему, чтобы узнать больше о Tor relays." +msgstr "Узнать больше о цепочке подключений Tor сети." #: ../onioncircuits:221 msgid "The connection to Tor was lost..." -msgstr "Соединение с Tor потеряно..." +msgstr "Пропало соединение с Tor сетью ..." #: ../onioncircuits:317 msgid "..." @@ -55,7 +56,7 @@ msgstr "%s: %s" #: ../onioncircuits:554 msgid "GeoIP database unavailable. No country information will be displayed." -msgstr "GeoIP база данных недоступна. Информации о странах показано не будет." +msgstr "База данных GeoIP недоступна. Информации о странах отключена." #: ../onioncircuits:585 #, c-format @@ -73,7 +74,7 @@ msgstr "Неизвестно" #: ../onioncircuits:607 msgid "Fingerprint:" -msgstr "Отпечаток:" +msgstr "Отпечаток ключа:" #: ../onioncircuits:608 msgid "Published:"

1 0

[translation/tails-openpgp-applet_completed] Update translations for tails-openpgp-applet_completed
by translation＠torproject.org 09 Jan '17

09 Jan '17

commit 96bc4c4708e7a3ab86463c6858ff36041776b6f8 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 9 11:47:16 2017 +0000 Update translations for tails-openpgp-applet_completed --- ru/openpgp-applet.pot | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ru/openpgp-applet.pot b/ru/openpgp-applet.pot index 7afbdaf..485b296 100644 --- a/ru/openpgp-applet.pot +++ b/ru/openpgp-applet.pot @@ -4,14 +4,14 @@ # # Translators: # Антон Толмачев <a.tolmachev(a)richart-consalt.ru>, 2015 -# Misha Dyachuk <Wikia(a)scryptmail.com>, 2016 +# Misha Dyachuk <Wikia(a)scryptmail.com>, 2016-2017 # Андрей Костриков <yavinav(a)gmail.com>, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: tails(a)boum.org\n" "POT-Creation-Date: 2015-08-10 15:55+0200\n" -"PO-Revision-Date: 2016-12-30 00:11+0000\n" +"PO-Revision-Date: 2017-01-09 11:40+0000\n" "Last-Translator: Misha Dyachuk <Wikia(a)scryptmail.com>\n" "Language-Team: Russian (http://www.transifex.com/otf/torproject/language/ru/)\n" "MIME-Version: 1.0\n" @@ -22,11 +22,11 @@ msgstr "" #: bin/openpgp-applet:163 msgid "You are about to exit OpenPGP Applet. Are you sure?" -msgstr "Вы собираетесь выйти из апплета OpenPGP. Вы уверены?" +msgstr "Вы уверены что хотите выйти из плагина OpenPGP. " #: bin/openpgp-applet:175 msgid "OpenPGP encryption applet" -msgstr "Апплет шифрования OpenPGP" +msgstr "Плагин шифрования сообщений OpenPGP." #: bin/openpgp-applet:178 msgid "Exit" @@ -38,11 +38,11 @@ msgstr "О программе…" #: bin/openpgp-applet:235 msgid "Encrypt Clipboard with _Passphrase" -msgstr "Зашифровать буфер обмена с помощью ключевой фразы (_Passphrase)" +msgstr "Шифровать буфер обмена публичным ключом." #: bin/openpgp-applet:238 msgid "Sign/Encrypt Clipboard with Public _Keys" -msgstr "Подписать/зашифровать буфер обмена с помощью открытых ключей (Public _Keys)" +msgstr "Подписать/зашифровать буфер обмена публичным ключом." #: bin/openpgp-applet:243 msgid "_Decrypt/Verify Clipboard" @@ -54,7 +54,7 @@ msgstr "_Управление ключами" #: bin/openpgp-applet:251 msgid "_Open Text Editor" -msgstr "Открыть текстовый _редактор" +msgstr "Открыть текстовый редактор" #: bin/openpgp-applet:295 msgid "The clipboard does not contain valid input data."

1 0

[translation/tails-openpgp-applet] Update translations for tails-openpgp-applet
by translation＠torproject.org 09 Jan '17

09 Jan '17

commit afd872d44808a1e4fc6a55538d424f29960af32d Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 9 11:47:12 2017 +0000 Update translations for tails-openpgp-applet --- ru/openpgp-applet.pot | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ru/openpgp-applet.pot b/ru/openpgp-applet.pot index 7afbdaf..485b296 100644 --- a/ru/openpgp-applet.pot +++ b/ru/openpgp-applet.pot @@ -4,14 +4,14 @@ # # Translators: # Антон Толмачев <a.tolmachev(a)richart-consalt.ru>, 2015 -# Misha Dyachuk <Wikia(a)scryptmail.com>, 2016 +# Misha Dyachuk <Wikia(a)scryptmail.com>, 2016-2017 # Андрей Костриков <yavinav(a)gmail.com>, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: tails(a)boum.org\n" "POT-Creation-Date: 2015-08-10 15:55+0200\n" -"PO-Revision-Date: 2016-12-30 00:11+0000\n" +"PO-Revision-Date: 2017-01-09 11:40+0000\n" "Last-Translator: Misha Dyachuk <Wikia(a)scryptmail.com>\n" "Language-Team: Russian (http://www.transifex.com/otf/torproject/language/ru/)\n" "MIME-Version: 1.0\n" @@ -22,11 +22,11 @@ msgstr "" #: bin/openpgp-applet:163 msgid "You are about to exit OpenPGP Applet. Are you sure?" -msgstr "Вы собираетесь выйти из апплета OpenPGP. Вы уверены?" +msgstr "Вы уверены что хотите выйти из плагина OpenPGP. " #: bin/openpgp-applet:175 msgid "OpenPGP encryption applet" -msgstr "Апплет шифрования OpenPGP" +msgstr "Плагин шифрования сообщений OpenPGP." #: bin/openpgp-applet:178 msgid "Exit" @@ -38,11 +38,11 @@ msgstr "О программе…" #: bin/openpgp-applet:235 msgid "Encrypt Clipboard with _Passphrase" -msgstr "Зашифровать буфер обмена с помощью ключевой фразы (_Passphrase)" +msgstr "Шифровать буфер обмена публичным ключом." #: bin/openpgp-applet:238 msgid "Sign/Encrypt Clipboard with Public _Keys" -msgstr "Подписать/зашифровать буфер обмена с помощью открытых ключей (Public _Keys)" +msgstr "Подписать/зашифровать буфер обмена публичным ключом." #: bin/openpgp-applet:243 msgid "_Decrypt/Verify Clipboard" @@ -54,7 +54,7 @@ msgstr "_Управление ключами" #: bin/openpgp-applet:251 msgid "_Open Text Editor" -msgstr "Открыть текстовый _редактор" +msgstr "Открыть текстовый редактор" #: bin/openpgp-applet:295 msgid "The clipboard does not contain valid input data."

1 0

[translation/tor-browser-manual_completed] Update translations for tor-browser-manual_completed
by translation＠torproject.org 09 Jan '17

09 Jan '17

commit 5d04ca48e0c140562ae7f50b2d2092803b99389d Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 9 09:21:31 2017 +0000 Update translations for tor-browser-manual_completed --- pt_BR/pt_BR.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index f8e35dc..9ce1425 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -1,13 +1,13 @@ # Translators: # Communia <ameaneantie(a)riseup.net>, 2016 # wasabicake <russel(a)protonmail.ch>, 2016 -# César Silva <cesarsilvabx(a)gmail.com>, 2016 +# Cesar Silva <cesarsilvabx(a)gmail.com>, 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: César Silva <cesarsilvabx(a)gmail.com>, 2016\n" +"Last-Translator: Cesar Silva <cesarsilvabx(a)gmail.com>, 2016\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/otf/teams/1519/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 09 Jan '17

09 Jan '17

commit ee1aec8535be9ed1385fcdd6715a2b272933af4a Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 9 09:21:20 2017 +0000 Update translations for tor-browser-manual --- pt_BR/pt_BR.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index f8e35dc..9ce1425 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -1,13 +1,13 @@ # Translators: # Communia <ameaneantie(a)riseup.net>, 2016 # wasabicake <russel(a)protonmail.ch>, 2016 -# César Silva <cesarsilvabx(a)gmail.com>, 2016 +# Cesar Silva <cesarsilvabx(a)gmail.com>, 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: César Silva <cesarsilvabx(a)gmail.com>, 2016\n" +"Last-Translator: Cesar Silva <cesarsilvabx(a)gmail.com>, 2016\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/otf/teams/1519/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[tor-browser-bundle/hardened-builds] Bug 20735: Inline fetch --dry-run to pass a revision to gclient sync
by gk＠torproject.org 09 Jan '17

09 Jan '17

commit 96836418e9686ea775759bbe15c39cbc3855969d Author: Arlo Breault <arlolra(a)gmail.com> Date: Sat Jan 7 09:35:07 2017 -0800 Bug 20735: Inline fetch --dry-run to pass a revision to gclient sync * Recent upstream changes require manual intervention when doing the initial fetch, which we'd like to avoid. For now, just sync as far as we need. --- gitian/fetch-inputs.sh | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 01ec802..9059336 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -313,17 +313,38 @@ PATH="$PATH:$PWD/depot_tools" # Use --no-history because the whole checkout with history is about 12 GB. export GYP_CROSSCOMPILE=1 export GYP_DEFINES="use_x11=0" +# JAVA_HOME is needed in a hook for libjingle. The readlink line tries to find the current JRE. +# default-java comes from the package default-jdk-headless. +export JAVA_HOME=/usr/lib/jvm/default-java mkdir -p "$dir" cd "$dir" if [ ! -d "src" ]; then # "fetch" is part of depot_tools. - fetch --nohooks --no-history webrtc + #fetch --nohooks --no-history webrtc + # FIXME: To avoid the unconditional `gclient sync` in the call to fetch, + # we inline the result of a `fetch --dry-run` + gclient root + gclient config --spec 'solutions = [ + { + "managed": False, + "name": "src", + "url": "https://chromium.googlesource.com/external/webrtc.git", + "custom_deps": {}, + "deps_file": "DEPS", + "safesync_url": "", + }, +] +' + gclient sync --nohooks --no-history --with_branch_heads -r $WEBRTC_TAG + cd src + git submodule foreach 'git config -f $toplevel/.git/config submodule.$name.ignore all' + git config --add remote.origin.fetch '+refs/tags/*:refs/tags/*' + git config diff.ignoreSubmodules all + cd .. fi # "gclient" is part of depot_tools. This download takes a long time the first time. -# JAVA_HOME is needed in a hook for libjingle. The readlink line tries to find the current JRE. -# default-java comes from the package default-jdk-headless. -JAVA_HOME=/usr/lib/jvm/default-java gclient sync --with_branch_heads --no-history -r $WEBRTC_TAG +gclient sync --no-history --with_branch_heads -r $WEBRTC_TAG cd .. tar --exclude .git -czf webrtc.tar.gz webrtc

1 0

[tor-browser-bundle/master] Bug 20735: Inline fetch --dry-run to pass a revision to gclient sync
by gk＠torproject.org 09 Jan '17

09 Jan '17

commit 3cf7b5af18a4fa0ad0813c0e16148dc1e578c04a Author: Arlo Breault <arlolra(a)gmail.com> Date: Sat Jan 7 09:35:07 2017 -0800 Bug 20735: Inline fetch --dry-run to pass a revision to gclient sync * Recent upstream changes require manual intervention when doing the initial fetch, which we'd like to avoid. For now, just sync as far as we need. --- gitian/fetch-inputs.sh | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 729e492..8c543d8 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -319,17 +319,38 @@ PATH="$PATH:$PWD/depot_tools" # Use --no-history because the whole checkout with history is about 12 GB. export GYP_CROSSCOMPILE=1 export GYP_DEFINES="use_x11=0" +# JAVA_HOME is needed in a hook for libjingle. The readlink line tries to find the current JRE. +# default-java comes from the package default-jdk-headless. +export JAVA_HOME=/usr/lib/jvm/default-java mkdir -p "$dir" cd "$dir" if [ ! -d "src" ]; then # "fetch" is part of depot_tools. - fetch --nohooks --no-history webrtc + #fetch --nohooks --no-history webrtc + # FIXME: To avoid the unconditional `gclient sync` in the call to fetch, + # we inline the result of a `fetch --dry-run` + gclient root + gclient config --spec 'solutions = [ + { + "managed": False, + "name": "src", + "url": "https://chromium.googlesource.com/external/webrtc.git", + "custom_deps": {}, + "deps_file": "DEPS", + "safesync_url": "", + }, +] +' + gclient sync --nohooks --no-history --with_branch_heads -r $WEBRTC_TAG + cd src + git submodule foreach 'git config -f $toplevel/.git/config submodule.$name.ignore all' + git config --add remote.origin.fetch '+refs/tags/*:refs/tags/*' + git config diff.ignoreSubmodules all + cd .. fi # "gclient" is part of depot_tools. This download takes a long time the first time. -# JAVA_HOME is needed in a hook for libjingle. The readlink line tries to find the current JRE. -# default-java comes from the package default-jdk-headless. -JAVA_HOME=/usr/lib/jvm/default-java gclient sync --with_branch_heads --no-history -r $WEBRTC_TAG +gclient sync --no-history --with_branch_heads -r $WEBRTC_TAG cd .. tar --exclude .git -czf webrtc.tar.gz webrtc

1 0