May 2018 - tor-commits - lists.torproject.org

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 26 May '18

26 May '18

commit 3376fa32443a79d1553ac2e3bd0126da5ffbb477 Author: Translation commit bot <translation(a)torproject.org> Date: Sat May 26 16:17:13 2018 +0000 Update translations for torbutton-torbuttonproperties --- he/torbutton.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/he/torbutton.properties b/he/torbutton.properties index 0a266e202..cc5068aca 100644 --- a/he/torbutton.properties +++ b/he/torbutton.properties @@ -2,11 +2,11 @@ torbutton.circuit_display.internet = אינטרנט torbutton.circuit_display.ip_unknown = IP בלתי ידוע torbutton.circuit_display.onion_site = אתר בצל torbutton.circuit_display.this_browser = דפדפן זה -torbutton.circuit_display.relay = ממסור +torbutton.circuit_display.relay = ממסר torbutton.circuit_display.tor_bridge = גשר torbutton.circuit_display.unknown_country = מדינה לא ידועה -torbutton.circuit_display.guard = Guard -torbutton.circuit_display.guard_note = Your [Guard] node may not change. +torbutton.circuit_display.guard = מִשׁמָר +torbutton.circuit_display.guard_note = צומת [Guard] שלך עשוי לא להשתנות. torbutton.circuit_display.learn_more = למד עוד torbutton.content_sizer.margin_tooltip = דפדפן Tor מוסיף שול זה כדי להפוך את הגובה והרוחב של חלונך ליחודיים פחות, ובכך להפחית את היכולת של אנשים לעקוב אחריך באופן מקוון. torbutton.panel.tooltip.disabled = לחץ כדי לאפשר את Tor

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 26 May '18

26 May '18

commit 57b45f32ca0a7207ae54e8627cbcd9fff9b63ff6 Author: Translation commit bot <translation(a)torproject.org> Date: Sat May 26 16:15:40 2018 +0000 Update translations for https_everywhere_completed --- he/https-everywhere.dtd | 1 + 1 file changed, 1 insertion(+) diff --git a/he/https-everywhere.dtd b/he/https-everywhere.dtd index c226eb6ac..dc6a9975b 100644 --- a/he/https-everywhere.dtd +++ b/he/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "ייצא הגדרות"> <!ENTITY https-everywhere.prefs.reset_defaults "אפס לברירות מחדל"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "זה יאפס על מערכת כללים למצב ברירת המחדל שלה. להמשיך?"> <!ENTITY https-everywhere.chrome.stable_rules "כללים יציבים"> <!ENTITY https-everywhere.chrome.stable_rules_description ":אלץ חיבורים מוצפנים אל אתרים אלו">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 26 May '18

26 May '18

commit e211f95d379b6ecc9b8a7b08a013809c6f52b0fb Author: Translation commit bot <translation(a)torproject.org> Date: Sat May 26 16:15:30 2018 +0000 Update translations for https_everywhere --- he/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/he/https-everywhere.dtd b/he/https-everywhere.dtd index a468e57ac..dc6a9975b 100644 --- a/he/https-everywhere.dtd +++ b/he/https-everywhere.dtd @@ -23,7 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "ייצא הגדרות"> <!ENTITY https-everywhere.prefs.reset_defaults "אפס לברירות מחדל"> -<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "זה יאפס על מערכת כללים למצב ברירת המחדל שלה. להמשיך?"> <!ENTITY https-everywhere.chrome.stable_rules "כללים יציבים"> <!ENTITY https-everywhere.chrome.stable_rules_description ":אלץ חיבורים מוצפנים אל אתרים אלו">

1 0

[stem/master] Concatenate strings with bytearray rather than BytesIO
by atagar＠torproject.org 25 May '18

25 May '18

commit c23cffc5cbe12b276fa18424a7bc85f91f901a60 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri May 25 14:19:22 2018 -0700 Concatenate strings with bytearray rather than BytesIO While skimming through the python docs I came across a note suggesting bytearray for string concatenation... https://docs.python.org/3/faq/programming.html#what-is-the-most-efficient-w… Gave this a whirl and it's not only more readable, but about 10% faster too... ============================================================ concat_with_bytesio.py ============================================================ import io import time start = time.time() full_bytes = io.BytesIO() for i in range(10000000): full_bytes.write(b'hiiiiiiiiiiiiiiiiiiiii') result = full_bytes.getvalue() print('total length: %i, took %0.2f seconds' % (len(result), time.time() - start)) ============================================================ concat_with_bytearray.py ============================================================ import time start = time.time() full_bytes = bytearray() for i in range(10000000): full_bytes += b'hiiiiiiiiiiiiiiiiiiiii' result = bytes(full_bytes) print('total length: %i, took %0.2f seconds' % (len(result), time.time() - start)) ============================================================ Results ============================================================ % python2 --version Python 2.7.12 % python3 --version Python 3.5.2 % for ((n=0;n<3;n++)); do python2 concat_with_bytearray.py; done total length: 220000000, took 1.18 seconds total length: 220000000, took 1.19 seconds total length: 220000000, took 1.17 seconds % for ((n=0;n<3;n++)); do python3 concat_with_bytearray.py; done total length: 220000000, took 1.02 seconds total length: 220000000, took 0.99 seconds total length: 220000000, took 1.03 seconds % for ((n=0;n<3;n++)); do python2 concat_with_bytesio.py; done total length: 220000000, took 1.40 seconds total length: 220000000, took 1.38 seconds total length: 220000000, took 1.38 seconds % for ((n=0;n<3;n++)); do python3 concat_with_bytesio.py; done total length: 220000000, took 1.18 seconds total length: 220000000, took 1.19 seconds total length: 220000000, took 1.20 seconds --- stem/client/cell.py | 58 ++++++++++++++++++++++++------------------------- stem/client/datatype.py | 21 +++++++++--------- stem/socket.py | 22 +++++++++---------- 3 files changed, 48 insertions(+), 53 deletions(-) diff --git a/stem/client/cell.py b/stem/client/cell.py index b40a737f..d0a98ada 100644 --- a/stem/client/cell.py +++ b/stem/client/cell.py @@ -39,7 +39,6 @@ Messages communicated over a Tor relay's ORPort. import datetime import inspect -import io import os import random import sys @@ -192,24 +191,23 @@ class Cell(object): if isinstance(cls, CircuitCell) and circ_id is None: raise ValueError('%s cells require a circ_id' % cls.NAME) - cell = io.BytesIO() - cell.write(Size.LONG.pack(circ_id) if link_protocol > 3 else Size.SHORT.pack(circ_id)) - cell.write(Size.CHAR.pack(cls.VALUE)) - cell.write(b'' if cls.IS_FIXED_SIZE else Size.SHORT.pack(len(payload))) - cell.write(payload) + cell = bytearray() + cell += Size.LONG.pack(circ_id) if link_protocol > 3 else Size.SHORT.pack(circ_id) + cell += Size.CHAR.pack(cls.VALUE) + cell += b'' if cls.IS_FIXED_SIZE else Size.SHORT.pack(len(payload)) + cell += payload # pad fixed sized cells to the required length if cls.IS_FIXED_SIZE: - cell_size = cell.seek(0, io.SEEK_END) fixed_cell_len = 514 if link_protocol > 3 else 512 - if cell_size > fixed_cell_len: - raise ValueError('Payload of %s is too large (%i bytes), must be less than %i' % (cls.NAME, cell_size, fixed_cell_len)) + if len(cell) > fixed_cell_len: + raise ValueError('Payload of %s is too large (%i bytes), must be less than %i' % (cls.NAME, len(cell), fixed_cell_len)) - cell.write(ZERO * (fixed_cell_len - cell_size)) + cell += ZERO * (fixed_cell_len - len(cell)) - return cell.getvalue() + return bytes(cell) @classmethod def _unpack(cls, content, circ_id, link_protocol): @@ -330,15 +328,15 @@ class RelayCell(CircuitCell): raise ValueError('%s relay cells concern the circuit itself and cannot have a stream id' % self.command) def pack(self, link_protocol): - payload = io.BytesIO() - payload.write(Size.CHAR.pack(self.command_int)) - payload.write(Size.SHORT.pack(self.recognized)) - payload.write(Size.SHORT.pack(self.stream_id)) - payload.write(Size.LONG.pack(self.digest)) - payload.write(Size.SHORT.pack(len(self.data))) - payload.write(self.data) + payload = bytearray() + payload += Size.CHAR.pack(self.command_int) + payload += Size.SHORT.pack(self.recognized) + payload += Size.SHORT.pack(self.stream_id) + payload += Size.LONG.pack(self.digest) + payload += Size.SHORT.pack(len(self.data)) + payload += self.data - return RelayCell._pack(link_protocol, payload.getvalue(), self.circ_id) + return RelayCell._pack(link_protocol, bytes(payload), self.circ_id) @classmethod def _unpack(cls, content, circ_id, link_protocol): @@ -521,15 +519,15 @@ class NetinfoCell(Cell): self.sender_addresses = sender_addresses def pack(self, link_protocol): - payload = io.BytesIO() - payload.write(Size.LONG.pack(int(datetime_to_unix(self.timestamp)))) - payload.write(self.receiver_address.pack()) - payload.write(Size.CHAR.pack(len(self.sender_addresses))) + payload = bytearray() + payload += Size.LONG.pack(int(datetime_to_unix(self.timestamp))) + payload += self.receiver_address.pack() + payload += Size.CHAR.pack(len(self.sender_addresses)) for addr in self.sender_addresses: - payload.write(addr.pack()) + payload += addr.pack() - return NetinfoCell._pack(link_protocol, payload.getvalue()) + return NetinfoCell._pack(link_protocol, bytes(payload)) @classmethod def _unpack(cls, content, circ_id, link_protocol): @@ -664,14 +662,14 @@ class AuthChallengeCell(Cell): self.methods = methods def pack(self, link_protocol): - payload = io.BytesIO() - payload.write(self.challenge) - payload.write(Size.SHORT.pack(len(self.methods))) + payload = bytearray() + payload += self.challenge + payload += Size.SHORT.pack(len(self.methods)) for method in self.methods: - payload.write(Size.SHORT.pack(method)) + payload += Size.SHORT.pack(method) - return AuthChallengeCell._pack(link_protocol, payload.getvalue()) + return AuthChallengeCell._pack(link_protocol, bytes(payload)) @classmethod def _unpack(cls, content, circ_id, link_protocol): diff --git a/stem/client/datatype.py b/stem/client/datatype.py index 038229d2..75fae662 100644 --- a/stem/client/datatype.py +++ b/stem/client/datatype.py @@ -112,7 +112,6 @@ users.** See our :class:`~stem.client.Relay` the API you probably want. import collections import hashlib -import io import struct import stem.prereq @@ -381,11 +380,11 @@ class Address(Field): self.value_bin = value def pack(self): - cell = io.BytesIO() - cell.write(Size.CHAR.pack(self.type_int)) - cell.write(Size.CHAR.pack(len(self.value_bin))) - cell.write(self.value_bin) - return cell.getvalue() + cell = bytearray() + cell += Size.CHAR.pack(self.type_int) + cell += Size.CHAR.pack(len(self.value_bin)) + cell += self.value_bin + return bytes(cell) @staticmethod def pop(content): @@ -422,11 +421,11 @@ class Certificate(Field): self.value = value def pack(self): - cell = io.BytesIO() - cell.write(Size.CHAR.pack(self.type_int)) - cell.write(Size.SHORT.pack(len(self.value))) - cell.write(self.value) - return cell.getvalue() + cell = bytearray() + cell += Size.CHAR.pack(self.type_int) + cell += Size.SHORT.pack(len(self.value)) + cell += self.value + return bytes(cell) @staticmethod def pop(content): diff --git a/stem/socket.py b/stem/socket.py index 710ab657..3da24c29 100644 --- a/stem/socket.py +++ b/stem/socket.py @@ -72,7 +72,6 @@ Tor... from __future__ import absolute_import -import io import re import socket import ssl @@ -713,9 +712,9 @@ def recv_message(control_file): _log_trace(line) return stem.response.ControlMessage([(status_code, divider, content)], line) else: - parsed_content, raw_content, first_line = [], io.BytesIO(), False + parsed_content, raw_content, first_line = [], bytearray(), False - raw_content.write(line) + raw_content += line if divider == '-': # mid-reply line, keep pulling for more content @@ -723,25 +722,24 @@ def recv_message(control_file): elif divider == ' ': # end of the message, return the message parsed_content.append((status_code, divider, content)) - _log_trace(raw_content.getvalue()) - return stem.response.ControlMessage(parsed_content, raw_content.getvalue()) + _log_trace(bytes(raw_content)) + return stem.response.ControlMessage(parsed_content, bytes(raw_content)) elif divider == '+': # data entry, all of the following lines belong to the content until we # get a line with just a period - content_block = io.BytesIO() - content_block.write(content) + content_block = bytearray(content) while True: try: line = control_file.readline() - raw_content.write(line) + raw_content += line except socket.error as exc: - log.info(ERROR_MSG % ('SocketClosed', 'received an exception while mid-way through a data reply (exception: "%s", read content: "%s")' % (exc, log.escape(raw_content.getvalue())))) + log.info(ERROR_MSG % ('SocketClosed', 'received an exception while mid-way through a data reply (exception: "%s", read content: "%s")' % (exc, log.escape(bytes(raw_content))))) raise stem.SocketClosed(exc) if not line.endswith(b'\r\n'): - log.info(ERROR_MSG % ('ProtocolError', 'CRLF linebreaks missing from a data reply, "%s"' % log.escape(raw_content.getvalue()))) + log.info(ERROR_MSG % ('ProtocolError', 'CRLF linebreaks missing from a data reply, "%s"' % log.escape(bytes(raw_content)))) raise stem.ProtocolError('All lines should end with CRLF') elif line == b'.\r\n': break # data block termination @@ -754,12 +752,12 @@ def recv_message(control_file): if line.startswith(b'..'): line = line[1:] - content_block.write(b'\n' + line) + content_block += b'\n' + line # joins the content using a newline rather than CRLF separator (more # conventional for multi-line string content outside the windows world) - parsed_content.append((status_code, divider, content_block.getvalue())) + parsed_content.append((status_code, divider, bytes(content_block))) else: # this should never be reached due to the prefix regex, but might as well # be safe...

1 0

[metrics-web/master] Don't terminate the hidserv module when parsing descriptors.
by karsten＠torproject.org 25 May '18

25 May '18

commit 4333d0666dbb8a252bd85d1cc79ebd18dc84d4bd Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri May 18 16:26:12 2018 +0200 Don't terminate the hidserv module when parsing descriptors. This issue came up when reprocessing descriptor archives for #26022: we'd terminate the hidserv module when running into an issue with parsing descriptors, where a possible issue is a consensus without a "bandwidth-weights" line. This seems wrong. It's okay to print out a warning in this case. But in general, we don't want to abort the entire module in this case. Related to #26022. --- .../org/torproject/metrics/stats/hidserv/Main.java | 6 +----- .../torproject/metrics/stats/hidserv/Parser.java | 23 +++++++++------------- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/src/main/java/org/torproject/metrics/stats/hidserv/Main.java b/src/main/java/org/torproject/metrics/stats/hidserv/Main.java index a23c17f..eafeeb1 100644 --- a/src/main/java/org/torproject/metrics/stats/hidserv/Main.java +++ b/src/main/java/org/torproject/metrics/stats/hidserv/Main.java @@ -38,11 +38,7 @@ public class Main { /* Parse new descriptors and store their contents using the document * stores. */ System.out.println("Parsing descriptors..."); - if (!parser.parseDescriptors()) { - System.err.println("Could not store parsed descriptors. " - + "Terminating."); - return; - } + parser.parseDescriptors(); /* Write the parse history to avoid parsing descriptor files again * next time. It's okay to do this now and not at the end of the diff --git a/src/main/java/org/torproject/metrics/stats/hidserv/Parser.java b/src/main/java/org/torproject/metrics/stats/hidserv/Parser.java index f2abc78..2423526 100644 --- a/src/main/java/org/torproject/metrics/stats/hidserv/Parser.java +++ b/src/main/java/org/torproject/metrics/stats/hidserv/Parser.java @@ -162,16 +162,14 @@ public class Parser { /** Instructs the descriptor reader to parse descriptor files, and * handles the resulting parsed descriptors if they are either * extra-info descriptors or consensuses. */ - public boolean parseDescriptors() { + public void parseDescriptors() { for (Descriptor descriptor : descriptorReader.readDescriptors( this.inDirectories)) { if (descriptor instanceof ExtraInfoDescriptor) { this.parseExtraInfoDescriptor((ExtraInfoDescriptor) descriptor); } else if (descriptor instanceof RelayNetworkStatusConsensus) { - if (!this.parseRelayNetworkStatusConsensus( - (RelayNetworkStatusConsensus) descriptor)) { - return false; - } + this.parseRelayNetworkStatusConsensus( + (RelayNetworkStatusConsensus) descriptor); } } @@ -180,7 +178,7 @@ public class Parser { * descriptors. In contrast, sets of computed network fractions are * stored immediately after processing the consensus they are based * on. */ - return this.reportedHidServStatsStore.store( + this.reportedHidServStatsStore.store( this.reportedHidServStatsFile, this.reportedHidServStats); } @@ -252,7 +250,7 @@ public class Parser { } /** Parses the given consensus. */ - public boolean parseRelayNetworkStatusConsensus( + public void parseRelayNetworkStatusConsensus( RelayNetworkStatusConsensus consensus) { /* Make sure that the consensus contains Wxx weights. */ @@ -262,7 +260,7 @@ public class Parser { System.err.printf("Consensus with valid-after time %s doesn't " + "contain any Wxx weights. Skipping.%n", DateTimeHelper.format(consensus.getValidAfterMillis())); - return false; + return; } /* More precisely, make sure that it contains Wmx weights, and then @@ -274,7 +272,7 @@ public class Parser { System.err.printf("Consensus with valid-after time %s doesn't " + "contain expected Wmx weights. Skipping.%n", DateTimeHelper.format(consensus.getValidAfterMillis())); - return false; + return; } double wmg = ((double) bandwidthWeights.get("Wmg")) / 10000.0; double wmm = ((double) bandwidthWeights.get("Wmm")) / 10000.0; @@ -421,11 +419,8 @@ public class Parser { DateTimeHelper.ISO_DATE_FORMAT); File documentFile = new File(this.computedNetworkFractionsDirectory, date); - if (!this.computedNetworkFractionsStore.store(documentFile, - computedNetworkFractions)) { - return false; - } - return true; + this.computedNetworkFractionsStore.store(documentFile, + computedNetworkFractions); } }

1 0

[metrics-web/master] Fix flaw in noise-removing code of hidserv module.
by karsten＠torproject.org 25 May '18

25 May '18

commit 52b1051fb14f4091d3e1e02b0497bad5b0d66ca6 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri May 18 16:29:42 2018 +0200 Fix flaw in noise-removing code of hidserv module. In the technical report that the hidserv module is based on we write: "When processing hidden-service statistics, we need to handle the fact that they have been obfuscated by relays. As first step, we're attempting to remove the additive Laplace-distributed noise by rounding up or down to the nearest multiple of bin_size. The idea is that it's most likely that noise was added to the closest right side of a bin than to the right side of another bin. In step two, we're subtracting half of bin_size, because the relay added between 0 and bin_size − 1 to the originally observed value." However, our code has a flaw: we use integer truncation rather which always rounds toward zero, whereas we really want to use the floor function which rounds towards negative infinity. The fix is to use Math.floorDiv() for the division rather than common integer division and truncation. Fixes #26022. --- src/main/java/org/torproject/metrics/stats/hidserv/Parser.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/metrics/stats/hidserv/Parser.java b/src/main/java/org/torproject/metrics/stats/hidserv/Parser.java index 2423526..9c95db5 100644 --- a/src/main/java/org/torproject/metrics/stats/hidserv/Parser.java +++ b/src/main/java/org/torproject/metrics/stats/hidserv/Parser.java @@ -243,7 +243,7 @@ public class Parser { * right side of a bin and subtracting half of the bin size. */ private long removeNoise(long reportedNumber, long binSize) { long roundedToNearestRightSideOfTheBin = - ((reportedNumber + binSize / 2) / binSize) * binSize; + Math.floorDiv((reportedNumber + binSize / 2), binSize) * binSize; long subtractedHalfOfBinSize = roundedToNearestRightSideOfTheBin - binSize / 2; return subtractedHalfOfBinSize;

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 25 May '18

25 May '18

commit 946df6ef125fa59bb8216eee6c4acc90139159f2 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 25 14:15:38 2018 +0000 Update translations for https_everywhere_completed --- fr/https-everywhere.dtd | 1 + 1 file changed, 1 insertion(+) diff --git a/fr/https-everywhere.dtd b/fr/https-everywhere.dtd index 177c30a9c..f771ce503 100644 --- a/fr/https-everywhere.dtd +++ b/fr/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Exporter les paramètres"> <!ENTITY https-everywhere.prefs.reset_defaults "Réinitialiser aux paramètres par défaut"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "Chaque ensemble de règles sera réinitialisé à son état par défaut. Poursuivre ?"> <!ENTITY https-everywhere.chrome.stable_rules "Règles stables"> <!ENTITY https-everywhere.chrome.stable_rules_description "Forcer des connexions chiffrées vers ces sites Web :">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 25 May '18

25 May '18

commit 7bcc5c1b60b4c4c758b458cfe5eb42ff549965ad Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 25 14:15:30 2018 +0000 Update translations for https_everywhere --- fr/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/https-everywhere.dtd b/fr/https-everywhere.dtd index 541cb4ee6..f771ce503 100644 --- a/fr/https-everywhere.dtd +++ b/fr/https-everywhere.dtd @@ -23,7 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Exporter les paramètres"> <!ENTITY https-everywhere.prefs.reset_defaults "Réinitialiser aux paramètres par défaut"> -<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "Chaque ensemble de règles sera réinitialisé à son état par défaut. Poursuivre ?"> <!ENTITY https-everywhere.chrome.stable_rules "Règles stables"> <!ENTITY https-everywhere.chrome.stable_rules_description "Forcer des connexions chiffrées vers ces sites Web :">

1 0

[tor-browser-build/master] Bug 25862: move mingw helper scripts to firefox
by gk＠torproject.org 25 May '18

25 May '18

commit 8fd3d1dc7f27a96129328af98b69e18d161cef97 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 20 18:41:15 2018 +0200 Bug 25862: move mingw helper scripts to firefox Stop using mingw helper scripts everywhere except for the firefox build. At the same time as we move them to firefox, we simplify the helper scripts by using var/CFLAGS and var/LDFLAGS from rbm.conf instead of redefining the flags. We are also now building firefox with -fstack-protector-strong instead of -fstack-protector. --- projects/firefox/build | 23 +++++++++++++++++++++++ projects/mingw-w64/build | 19 ------------------- projects/mingw-w64/config | 2 +- projects/nsis/build | 2 -- rbm.conf | 2 +- 5 files changed, 25 insertions(+), 23 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index a7441bd..c3536c6 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -17,6 +17,29 @@ distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/build +[% IF c("var/windows") -%] + mingwdir=/var/tmp/dist/mingw-w64 + mkdir -p $mingwdir/helpers + + cat > $mingwdir/helpers/[% c("arch") %]-w64-mingw32-g++ << 'EOF' +#!/bin/sh +/var/tmp/dist/mingw-w64/bin/[% c("arch") %]-w64-mingw32-g++ [% c("var/LDFLAGS") %] [% c("var/CFLAGS") %] "$@" +EOF + + cat > $mingwdir/helpers/[% c("arch") %]-w64-mingw32-gcc << 'EOF' +#!/bin/sh +/var/tmp/dist/mingw-w64/bin/[% c("arch") %]-w64-mingw32-gcc [% c("var/LDFLAGS") %] [% c("var/CFLAGS") %] "$@" +EOF + + cat > $mingwdir/helpers/[% c("arch") %]-w64-mingw32-ld << 'EOF' +#!/bin/sh +/var/tmp/dist/mingw-w64/bin/[% c("arch") %]-w64-mingw32-ld [% c("var/LDFLAGS") %] "$@" +EOF + + chmod +x $mingwdir/helpers/* + export PATH="$mingwdir/helpers:$PATH" +[% END -%] + [% IF c("var/linux") %] mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %] diff --git a/projects/mingw-w64/build b/projects/mingw-w64/build index 8ce5048..a142c38 100644 --- a/projects/mingw-w64/build +++ b/projects/mingw-w64/build @@ -55,25 +55,6 @@ mkdir -p $distdir/gcclibs cp [% c("arch") %]-w64-mingw32/libssp/.libs/libssp-0.dll $distdir/gcclibs cp [% c("arch") %]-w64-mingw32/libgcc/shlib/[% c("var/libgcc_dll") %] $distdir/gcclibs -mkdir -p $distdir/helpers - -cat > $distdir/helpers/[% c("arch") %]-w64-mingw32-g++ << 'EOF' -#!/bin/sh -/var/tmp/dist/mingw-w64/bin/[% c("arch") %]-w64-mingw32-g++ -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -fstack-protector --param ssp-buffer-size=4 -fno-strict-overflow "$@" -EOF - -cat > $distdir/helpers/[% c("arch") %]-w64-mingw32-gcc << 'EOF' -#!/bin/sh -/var/tmp/dist/mingw-w64/bin/[% c("arch") %]-w64-mingw32-gcc -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -fstack-protector --param ssp-buffer-size=4 -fno-strict-overflow "$@" -EOF - -cat > $distdir/helpers/[% c("arch") %]-w64-mingw32-ld << 'EOF' -#!/bin/sh -/var/tmp/dist/mingw-w64/bin/[% c("arch") %]-w64-mingw32-ld --dynamicbase --nxcompat --enable-reloc-section -lssp -L$gcclibs "$@" -EOF - -chmod +x $distdir/helpers/* - cd /var/tmp/dist [% c('tar', { tar_src => [ project ], diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config index 01d0c37..fb9ef21 100644 --- a/projects/mingw-w64/config +++ b/projects/mingw-w64/config @@ -15,7 +15,7 @@ var: [% c("var/setarch") -%] mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %] - export PATH="/var/tmp/dist/mingw-w64/helpers:/var/tmp/dist/mingw-w64/bin:$PATH" + export PATH="/var/tmp/dist/mingw-w64/bin:$PATH" export gcclibs=/var/tmp/dist/mingw-w64/gcclibs targets: windows-i686: diff --git a/projects/nsis/build b/projects/nsis/build index af19dd7..81ed4d4 100755 --- a/projects/nsis/build +++ b/projects/nsis/build @@ -1,8 +1,6 @@ #!/bin/bash [% c("var/set_default_env") -%] [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] -# remove hardening wrappers -rm -Rf /var/tmp/dist/mingw-w64/helpers mkdir -p /var/tmp/dist mkdir -p /var/tmp/build tar -C /var/tmp/build -xf nsis-[% c('version') %].tar.bz2 diff --git a/rbm.conf b/rbm.conf index bb53bcb..6adcd6f 100644 --- a/rbm.conf +++ b/rbm.conf @@ -216,7 +216,7 @@ targets: container: suite: jessie configure_opt: '--host=[% c("arch") %]-w64-mingw32 CFLAGS="[% c("var/CFLAGS") %]" LDFLAGS="[% c("var/LDFLAGS") %]"' - CFLAGS: '[% c("var/flag_mwindows") %] -fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security' + CFLAGS: '[% c("var/flag_mwindows") %] -fstack-protector-strong -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security' LDFLAGS: '[% c("var/flag_mwindows") %] -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$gcclibs' flag_mwindows: '-mwindows' compiler: mingw-w64

1 0

[collector/master] Bump version to 1.6.0-dev.
by karsten＠torproject.org 25 May '18

25 May '18

commit 55a9f76d10dcf2c3f1190fa8a87a108475601e39 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri May 25 15:03:49 2018 +0200 Bump version to 1.6.0-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 7240db6..e78c160 100644 --- a/build.xml +++ b/build.xml @@ -8,7 +8,7 @@ <property name="javadoc-title" value="CollecTor API Documentation"/> <property name="implementation-title" value="CollecTor" /> - <property name="release.version" value="1.6.0" /> + <property name="release.version" value="1.6.0-dev" /> <property name="project-main-class" value="org.torproject.collector.Main" /> <property name="name" value="collector"/> <property name="metricslibversion" value="2.4.0" />

1 0