- tor-commits - lists.torproject.org

[tor/release-0.2.2] fold in changes entries so far
by arma＠torproject.org 05 Aug '12

05 Aug '12

commit a379b03b3cb381d14ef85b1f73bee29e1ab49f5d Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Aug 5 01:18:15 2012 -0400 fold in changes entries so far --- ChangeLog | 21 +++++++++++++++++++++ ReleaseNotes | 21 +++++++++++++++++++++ changes/bug6530 | 5 ----- changes/geoip-june2012 | 3 --- changes/pathsel-BUGGY-a | 14 -------------- changes/revert-geoip-may2012 | 6 ------ 6 files changed, 42 insertions(+), 28 deletions(-) diff --git a/ChangeLog b/ChangeLog index fd9097a..70874ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,24 @@ +Changes in version 0.2.2.38 - 2012-08-?? + o Security fixes: + - Avoid read-from-freed-memory and double-free bugs that could occur + when a DNS request fails while launching it. Fixes bug 6480; + bugfix on 0.2.0.1-alpha. + - Avoid an uninitialized memory read when reading a vote or consensus + document that has an unrecognized flavor name. This read could + lead to a remote crash bug. Fixes bug 6530; bugfix on 0.2.2.6-alpha. + - Try to leak less information about what relays a client is + choosing to a side-channel attacker. Previously, a Tor client would + stop iterating through the list of available relays as soon as it + had chosen one, thus finishing a little earlier when it picked + a router earlier in the list. If an attacker can recover this + timing information (nontrivial but not proven to be impossible), + they could learn some coarse-grained information about which relays + a client was picking (middle nodes in particular are likelier to + be affected than exits). The timing attack might be mitigated by + other factors (see bug 6537 for some discussion), but it's best + not to take chances. Fixes bug 6537; bugfix on 0.0.8rc1. + + Changes in version 0.2.2.37 - 2012-06-06 Tor 0.2.2.37 introduces a workaround for a critical renegotiation bug in OpenSSL 1.0.1 (where 20% of the Tor network can't talk to itself diff --git a/ReleaseNotes b/ReleaseNotes index c4ff7f5..f265073 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -3,6 +3,27 @@ This document summarizes new features and bugfixes in each stable release of Tor. If you want to see more detailed descriptions of the changes in each development snapshot, see the ChangeLog file. +Changes in version 0.2.2.38 - 2012-08-?? + o Security fixes: + - Avoid read-from-freed-memory and double-free bugs that could occur + when a DNS request fails while launching it. Fixes bug 6480; + bugfix on 0.2.0.1-alpha. + - Avoid an uninitialized memory read when reading a vote or consensus + document that has an unrecognized flavor name. This read could + lead to a remote crash bug. Fixes bug 6530; bugfix on 0.2.2.6-alpha. + - Try to leak less information about what relays a client is + choosing to a side-channel attacker. Previously, a Tor client would + stop iterating through the list of available relays as soon as it + had chosen one, thus finishing a little earlier when it picked + a router earlier in the list. If an attacker can recover this + timing information (nontrivial but not proven to be impossible), + they could learn some coarse-grained information about which relays + a client was picking (middle nodes in particular are likelier to + be affected than exits). The timing attack might be mitigated by + other factors (see bug 6537 for some discussion), but it's best + not to take chances. Fixes bug 6537; bugfix on 0.0.8rc1. + + Changes in version 0.2.2.37 - 2012-06-06 Tor 0.2.2.37 introduces a workaround for a critical renegotiation bug in OpenSSL 1.0.1 (where 20% of the Tor network can't talk to itself diff --git a/changes/bug6530 b/changes/bug6530 deleted file mode 100644 index 825bbb7..0000000 --- a/changes/bug6530 +++ /dev/null @@ -1,5 +0,0 @@ - o Major security fixes: - - Avoid a read of uninitializd RAM when reading a vote or consensus - document with an unrecognized flavor name. This could lead to a - remote crash bug. Fixes bug 6530; bugfix on 0.2.2.6-alpha. - diff --git a/changes/geoip-june2012 b/changes/geoip-june2012 deleted file mode 100644 index f73bf35..0000000 --- a/changes/geoip-june2012 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features: - - Update to the June 6 2012 Maxmind GeoLite Country database. - diff --git a/changes/pathsel-BUGGY-a b/changes/pathsel-BUGGY-a deleted file mode 100644 index 2e642c7..0000000 --- a/changes/pathsel-BUGGY-a +++ /dev/null @@ -1,14 +0,0 @@ - o Security fixes: - - - Try to leak less information about what relays a client is - choosing to a side-channel attacker. Previously, a Tor client - would stop iterating through the list of available relays as - soon as it had chosen one, thus finishing a little earlier - when it picked a router earlier in the list. If an attacker - can recover this timing information (nontrivial but not - proven to be impossible), they could learn some coarse- - grained information about which relays a client was picking - (middle nodes in particular are likelier to be affected than - exits). The timing attack might be mitigated by other factors - (see bug #6537 for some discussion), but it's best not to - take chances. Fixes bug 6537; bugfix on 0.0.8rc1. diff --git a/changes/revert-geoip-may2012 b/changes/revert-geoip-may2012 deleted file mode 100644 index e420947..0000000 --- a/changes/revert-geoip-may2012 +++ /dev/null @@ -1,6 +0,0 @@ - o Major bugfixes: - - Revert to the May 1 2012 Maxmind GeoLite Country database. In the - June 2012 database, Maxmind marked many Tor relays as country "A1", - which will cause risky behavior for clients that set EntryNodes - or ExitNodes. Addresses bug 6334; bugfix on 0.2.3.17-beta. -

1 0

[tor/release-0.2.2] bump to 0.2.2.37-dev
by arma＠torproject.org 05 Aug '12

05 Aug '12

commit 421fe0c1c12f544fa9d02d2f10792c503db95f89 Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Aug 5 01:24:00 2012 -0400 bump to 0.2.2.37-dev --- configure.in | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index 4cf21b3..1b6827b 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2008, The Tor Project, Inc. dnl See LICENSE for licensing information AC_INIT -AM_INIT_AUTOMAKE(tor, 0.2.2.37) +AM_INIT_AUTOMAKE(tor, 0.2.2.37-dev) AM_CONFIG_HEADER(orconfig.h) AC_CANONICAL_HOST diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index 95cfab7..e859a38 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.2.37" +!define VERSION "0.2.2.37-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index d139eb9..7ed5171 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -233,5 +233,5 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.2.37" +#define VERSION "0.2.2.37-dev"

1 0

[stem/master] Parsing transport lines in non-bridge relays
by atagar＠torproject.org 05 Aug '12

05 Aug '12

commit 3f380f95876baffe48725828c23706dd9b46b760 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Aug 4 19:49:39 2012 -0700 Parsing transport lines in non-bridge relays Spotted a relay in the wild with a transport line and asn thinks that, though it's an oddity and doesn't make sense for non-bridges, this isn't a bug... extra-info toorvoid 0B37323298FF98CD86ED404895BB27B7426E8AE1 published 2012-08-04 12:19:13 transport obfs2 83.212.96.201:33570 Expanding the parser to allow for it in any extrainfo descriptor. --- stem/descriptor/extrainfo_descriptor.py | 29 ++++++++++++++----------- test/unit/descriptor/extrainfo_descriptor.py | 8 +++++- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/stem/descriptor/extrainfo_descriptor.py b/stem/descriptor/extrainfo_descriptor.py index be2a6dc..8d66df6 100644 --- a/stem/descriptor/extrainfo_descriptor.py +++ b/stem/descriptor/extrainfo_descriptor.py @@ -179,6 +179,7 @@ class ExtraInfoDescriptor(stem.descriptor.Descriptor): :var str fingerprint: **\*** identity key fingerprint :var datetime published: **\*** time in GMT when this descriptor was made :var str geoip_db_digest: sha1 of geoIP database file + :var list transport: transport method recognized by the bridge (ex. obfs3) **Bi-directional connection usage:** @@ -287,6 +288,7 @@ class ExtraInfoDescriptor(stem.descriptor.Descriptor): self.fingerprint = None self.published = None self.geoip_db_digest = None + self.transport = None self.conn_bi_direct_end = None self.conn_bi_direct_interval = None @@ -421,6 +423,19 @@ class ExtraInfoDescriptor(stem.descriptor.Descriptor): raise ValueError("Geoip digest line had an invalid sha1 digest: %s" % line) self.geoip_db_digest = value + elif keyword == "transport": + # "transport" transportname address:port [arglist] + # Everything after the transportname is scrubbed in published bridge + # descriptors, so we'll never see it in practice. + # + # These entries really only make sense for bridges, but have been seen + # on non-bridges in the wild when the relay operator configured it this + # way. + + if self.transport is None: + self.transport = [] + + self.transport.append(value) elif keyword == "cell-circuits-per-decile": # "cell-circuits-per-decile" num @@ -746,12 +761,10 @@ class BridgeExtraInfoDescriptor(ExtraInfoDescriptor): """ Bridge extra-info descriptor (`specification <https://metrics.torproject.org/formats.html#bridgedesc>`_) - :var list transport: transport method recognized by the bridge (ex. obfs3) """ def __init__(self, raw_contents, validate = True): self._digest = None - self.transport = None super(BridgeExtraInfoDescriptor, self).__init__(raw_contents, validate) @@ -766,17 +779,7 @@ class BridgeExtraInfoDescriptor(ExtraInfoDescriptor): value, _ = values[0] line = "%s %s" % (keyword, value) # original line - if keyword == "transport": - # "transport" transportname address:port [arglist] - # Everything after the transportname is scrubbed in published bridge - # descriptors, so we'll never see it in practice. - - if self.transport is None: - self.transport = [] - - self.transport.append(value) - del entries["transport"] - elif keyword == "router-digest": + if keyword == "router-digest": if validate and not stem.util.tor_tools.is_hex_digits(value, 40): raise ValueError("Router digest line had an invalid sha1 digest: %s" % line) diff --git a/test/unit/descriptor/extrainfo_descriptor.py b/test/unit/descriptor/extrainfo_descriptor.py index c40ac94..1008af7 100644 --- a/test/unit/descriptor/extrainfo_descriptor.py +++ b/test/unit/descriptor/extrainfo_descriptor.py @@ -522,14 +522,18 @@ class TestExtraInfoDescriptor(unittest.TestCase): def test_transport_line(self): """ - Basic exercise of the bridge descriptor's transport entry. - attributes. + Basic exercise for both a bridge and relay's transport entry. """ desc_text = _make_descriptor({"transport": "obfs3"}, is_bridge = True) desc = BridgeExtraInfoDescriptor(desc_text) self.assertEquals(["obfs3"], desc.transport) self.assertEquals([], desc.get_unrecognized_lines()) + + desc_text = _make_descriptor({"transport": "obfs2 83.212.96.201:33570"}) + desc = RelayExtraInfoDescriptor(desc_text) + self.assertEquals(["obfs2 83.212.96.201:33570"], desc.transport) + self.assertEquals([], desc.get_unrecognized_lines()) def _expect_invalid_attr(self, desc_text, attr = None, expected_value = None): """

1 0

[stem/master] GETINFO caching and logging
by atagar＠torproject.org 05 Aug '12

05 Aug '12

commit 73fcfaf8ccbc2c1cb714f35fcc8e2823daf39808 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Aug 4 18:52:33 2012 -0700 GETINFO caching and logging Caching static GETINFO results, short circuiting geoip lookups when the geoip db is unavailable, and logging the call runtimes. --- stem/control.py | 139 +++++++++++++++++++++++++++++++++++++++------- stem/response/getinfo.py | 18 ++++++ 2 files changed, 137 insertions(+), 20 deletions(-) diff --git a/stem/control.py b/stem/control.py index 16bcb10..673261c 100644 --- a/stem/control.py +++ b/stem/control.py @@ -9,10 +9,13 @@ interacting at a higher level. :: - from_port - Provides a Controller based on a port connection. - from_socket_file - Provides a Controller based on a socket file connection. - Controller - General controller class intended for direct use. + | |- from_port - Provides a Controller based on a port connection. + | +- from_socket_file - Provides a Controller based on a socket file connection. + | + |- is_caching_enabled - true if the controller has enabled caching + |- is_geoip_unavailable - true if we've discovered our geoip db to be unavailable + |- clear_cache - clears any cached results |- get_info - issues a GETINFO query for a parameter |- get_conf - gets the value of a configuration option |- get_conf_mapping - gets the values of multiple configuration options @@ -72,6 +75,24 @@ MAPPED_CONFIG_KEYS = { "hiddenserviceoptions": "HiddenServiceOptions" } +# unchangeable GETINFO parameters +CACHEABLE_GETINFO_PARAMS = ( + 'version', + 'config-file', + 'exit-policy/default', + 'fingerprint', + 'config/names', + 'config/defaults', + 'info/names', + 'events/names', + 'features/names', + 'process/descriptor-limit', +) + +# number of sequential attempts before we decide that the Tor geoip database +# is unavailable +GEOIP_FAILURE_THRESHOLD = 5 + # TODO: The Thread's isAlive() method and theading's currentThread() was # changed to the more conventional is_alive() and current_thread() in python # 2.6 and above. We should use that when dropping python 2.5 compatability. @@ -454,6 +475,19 @@ class Controller(BaseController): from_port = staticmethod(from_port) from_socket_file = staticmethod(from_socket_file) + def __init__(self, control_socket, enable_caching = True): + super(Controller, self).__init__(control_socket) + + self._is_caching_enabled = enable_caching + self._request_cache = {} + + # number of sequental 'GETINFO ip-to-country/*' lookups that have failed + self._geoip_failure_count = 0 + + def connect(self): + super(Controller, self).connect() + self.clear_cache() + def close(self): # making a best-effort attempt to quit before detaching the socket if self.is_alive(): @@ -462,7 +496,38 @@ class Controller(BaseController): super(Controller, self).close() - def get_info(self, param, default = UNDEFINED): + def is_caching_enabled(self): + """ + True if caching has been enabled, False otherwise. + + :returns: bool to indicate if caching is enabled + """ + + return self._is_caching_enabled + + def is_geoip_unavailable(self): + """ + Provides True if we've concluded hat our geoip database is unavailable, + False otherwise. This is determined by having our 'GETINFO ip-to-country/*' + lookups fail so this will default to False if we aren't making those + queries. + + Geoip failures will be untracked if caching is disabled. + + :returns: bool to indicate if we've concluded our geoip database to be unavailable or not + """ + + return self._geoip_failure_count >= GEOIP_FAILURE_THRESHOLD + + def clear_cache(self): + """ + Drops any cached results. + """ + + self._request_cache = {} + self._geoip_failure_count = 0 + + def get_info(self, params, default = UNDEFINED): """ Queries the control socket for the given GETINFO option. If provided a default then that's returned if the GETINFO option is undefined or the @@ -484,35 +549,69 @@ class Controller(BaseController): :class:`stem.socket.InvalidArguments` if the 'param' requested was invalid """ - # TODO: add caching? - # TODO: special geoip handling? - # TODO: add logging, including call runtime + start_time = time.time() + reply = {} - if isinstance(param, str): + if isinstance(params, str): is_multiple = False - param = [param] + params = set([params]) else: + if not params: return {} is_multiple = True + params = set(params) + + # check for cached results + for param in list(params): + cache_key = "getinfo.%s" % param.lower() + + if cache_key in self._request_cache: + reply[param] = self._request_cache[cache_key] + params.remove(param) + elif param.startswith('ip-to-country/') and self.is_geoip_unavailable(): + # the geoip database aleady looks to be unavailable - abort the request + raise stem.socket.ProtocolError("Tor geoip database is unavailable") + + # if everything was cached then short circuit making the query + if not params: + log.debug("GETINFO %s (cache fetch)" % " ".join(reply.keys())) + + if is_multiple: return reply + else: return reply.values()[0] try: - response = self.msg("GETINFO %s" % " ".join(param)) + response = self.msg("GETINFO %s" % " ".join(params)) stem.response.convert("GETINFO", response) + response.assert_matches(params) + reply.update(response.entries) - # error if we got back different parameters than we requested - requested_params = set(param) - reply_params = set(response.entries.keys()) + if self.is_caching_enabled(): + for key, value in response.entries.items(): + key = key.lower() # make case insensitive + + if key in CACHEABLE_GETINFO_PARAMS: + self._request_cache["getinfo.%s" % key] = value + elif key.startswith('ip-to-country/'): + # both cacheable and means that we should reset the geoip failure count + self._request_cache["getinfo.%s" % key] = value + self._geoip_failure_count = -1 - if requested_params != reply_params: - requested_label = ", ".join(requested_params) - reply_label = ", ".join(reply_params) - - raise stem.socket.ProtocolError("GETINFO reply doesn't match the parameters that we requested. Queried '%s' but got '%s'." % (requested_label, reply_label)) + log.debug("GETINFO %s (runtime: %0.4f)" % (" ".join(params), time.time() - start_time)) if is_multiple: - return response.entries + return reply else: - return response.entries[param[0]] + return reply.values()[0] except stem.socket.ControllerError, exc: + # bump geoip failure count if... + # * we're caching results + # * this was soley a geoip lookup + # * we've never had a successful geoip lookup (faiure count isn't -1) + + is_geoip_request = len(params) == 1 and list(params)[0].startswith('ip-to-country/') + + if is_geoip_request and self.is_caching_enabled() and self._geoip_failure_count != -1: + self._geoip_failure_count += 1 + if default == UNDEFINED: raise exc else: return default diff --git a/stem/response/getinfo.py b/stem/response/getinfo.py index a2cce57..24aeb84 100644 --- a/stem/response/getinfo.py +++ b/stem/response/getinfo.py @@ -52,4 +52,22 @@ class GetInfoResponse(stem.response.ControlMessage): value = value[1:] self.entries[key] = value + + def assert_matches(self, params): + """ + Checks if we match a given set of parameters, and raise a ProtocolError if not. + + :param set params: parameters to assert that we contain + + :raises: + * :class:`stem.socket.ProtocolError` if parameters don't match this response + """ + + reply_params = set(self.entries.keys()) + + if params != reply_params: + requested_label = ", ".join(params) + reply_label = ", ".join(reply_params) + + raise stem.socket.ProtocolError("GETINFO reply doesn't match the parameters that we requested. Queried '%s' but got '%s'." % (requested_label, reply_label))

1 0

[torbrowser/maint-2.3] Build openssl as shared again.
by erinn＠torproject.org 04 Aug '12

04 Aug '12

commit ab9c09755df62d003980ee359e7a6355c9b2320d Author: Shondoit Walker <shondoit(a)gmail.com> Date: Tue Jul 31 13:07:09 2012 +0200 Build openssl as shared again. Commit 78c122cefc948c255a7e20218085af2e8d1bc1f9 changed it to no-shared for no apparent reason and it broke the build. --- build-scripts/windows-alpha.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index 7bdb8cb..cb9e1ae 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -62,7 +62,7 @@ build-zlib: $(ZLIB_DIR) cd $(ZLIB_DIR) && $(ZLIB_OPTS) make -f win32/Makefile.gcc install touch $(STAMP_DIR)/build-zlib -OPENSSL_OPTS=-no-idea -no-rc5 -no-md2 no-shared zlib --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -L$(BUILT_DIR)/lib -Wl,--nxcompat -Wl,--dynamicbase -I$(BUILT_DIR)/include +OPENSSL_OPTS=-no-idea -no-rc5 -no-md2 shared zlib --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -L$(BUILT_DIR)/lib -Wl,--nxcompat -Wl,--dynamicbase -I$(BUILT_DIR)/include build-openssl: build-zlib $(OPENSSL_DIR) cd $(OPENSSL_DIR) && ./config $(OPENSSL_OPTS) cd $(OPENSSL_DIR) && make depend

1 0

[torbrowser/maint-2.3] Update libpng to 1.5.12.
by erinn＠torproject.org 04 Aug '12

04 Aug '12

commit 089be37104b665d003ca85cae94526e22e52e5ea Author: Shondoit Walker <shondoit(a)gmail.com> Date: Tue Jul 31 13:04:13 2012 +0200 Update libpng to 1.5.12. --- build-scripts/versions-alpha.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index c5c23d2..6226abe 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -4,7 +4,7 @@ RELEASE_VER=2.3.19-alpha ZLIB_VER=1.2.7 OPENSSL_VER=1.0.1c -LIBPNG_VER=1.5.11 +LIBPNG_VER=1.5.12 QT_VER=4.8.1 VIDALIA_VER=0.2.20 LIBEVENT_VER=2.0.19-stable

1 0

[torbrowser/master] Update libpng to 1.5.12.
by erinn＠torproject.org 04 Aug '12

04 Aug '12

commit 089be37104b665d003ca85cae94526e22e52e5ea Author: Shondoit Walker <shondoit(a)gmail.com> Date: Tue Jul 31 13:04:13 2012 +0200 Update libpng to 1.5.12. --- build-scripts/versions-alpha.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index c5c23d2..6226abe 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -4,7 +4,7 @@ RELEASE_VER=2.3.19-alpha ZLIB_VER=1.2.7 OPENSSL_VER=1.0.1c -LIBPNG_VER=1.5.11 +LIBPNG_VER=1.5.12 QT_VER=4.8.1 VIDALIA_VER=0.2.20 LIBEVENT_VER=2.0.19-stable

1 0

[torbrowser/maint-2.3] Use the predefined COMPRESSED_NAME
by erinn＠torproject.org 04 Aug '12

04 Aug '12

commit ba5724c720ccbf06b5e3db19018dbc91ecb28e45 Author: Shondoit Walker <shondoit(a)gmail.com> Date: Thu Aug 2 09:25:07 2012 +0200 Use the predefined COMPRESSED_NAME COMPRESSED_NAME is already defined according to the USE_OBFSPROXY flag as introduced in commit a08b546605d13d82e6f664bf8e2d8b3caf61327c. --- build-scripts/linux-alpha.mk | 5 +---- build-scripts/osx-alpha.mk | 7 ++----- build-scripts/windows-alpha.mk | 3 --- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index ceb2014..8427a10 100644 --- a/build-scripts/linux-alpha.mk +++ b/build-scripts/linux-alpha.mk @@ -377,10 +377,7 @@ bundle-localized: bundle-localized_$(LANGCODE).stamp compressed-bundle-localized: bundle-localized_$(LANGCODE).stamp -rm -f $(DISTDIR)/$(COMPRESSED_NAME)_$(LANGCODE).tar.gz -mkdir $(DISTDIR) -ifeq ($(USE_OBFSPROXY),1) - tar -cvf - $(NAME)_$(LANGCODE) |tardy -unu 0 -una root -gnu 0 -gna wheel |gzip -c9 >$(DISTDIR)/$(DEFAULT_COMPRESSED_BASENAME)obfsproxy-$(LANGCODE).tar.gz -endif - tar -cvf - $(NAME)_$(LANGCODE) |tardy -unu 0 -una root -gnu 0 -gna wheel |gzip -c9 >$(DISTDIR)/$(DEFAULT_COMPRESSED_BASENAME)$(LANGCODE).tar.gz + tar -cvf - $(NAME)_$(LANGCODE) |tardy -unu 0 -una root -gnu 0 -gna wheel |gzip -c9 >$(DISTDIR)/$(COMPRESSED_NAME)$(LANGCODE).tar.gz rm *.zip *.xpi copy-files_%: generic-bundle.stamp diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index 377fba9..ad75326 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -374,13 +374,10 @@ bundle-localized_%.stamp: bundle-localized: bundle-localized_$(LANGCODE).stamp compressed-bundle-localized: bundle-localized_$(LANGCODE).stamp - -rm -f $(DISTDIR)/$(COMPRESSED_NAME)_$(LANGCODE).zip + -rm -f $(DISTDIR)/$(COMPRESSED_NAME)$(LANGCODE).zip -mkdir $(DISTDIR) #hdiutil create -volname "Tor Browser Bundle for OS X" -format UDBZ -imagekey zlib-level=9 -srcfolder $(DISTDIR)/tmp/ $(DISTDIR)/$(DEFAULT_COMPRESSED_BASENAME)$(LANGCODE).dmg - zip -r $(DISTDIR)/$(DEFAULT_COMPRESSED_BASENAME)$(LANGCODE).zip $(NAME)_$(LANGCODE).app -ifeq ($(USE_OBFSPROXY),1) - zip -r $(DISTDIR)/$(DEFAULT_COMPRESSED_BASENAME)obfsproxy-$(LANGCODE).zip $(NAME)_$(LANGCODE).app -endif + zip -r $(DISTDIR)/$(COMPRESSED_NAME)$(LANGCODE).zip $(NAME)_$(LANGCODE).app -rm -f *.zip *.xpi copy-files_%: generic-bundle.stamp diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index cb9e1ae..5847a34 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -373,9 +373,6 @@ bundle-localized: bundle-localized_$(LANGCODE).stamp compressed-bundle-localized: $(SEVENZIP) bundle-localized_$(LANGCODE).stamp rm -f $(COMPRESSED_NAME)_$(LANGCODE).exe -ifeq ($(USE_OBFSPROXY),1) - cd $(NAME)_$(LANGCODE); $(SEVENZIP) a -mx9 -sfx7z.sfx ../$(COMPRESSED_NAME)-obfsproxy_$(LANGCODE).exe $(NAME) -endif cd $(NAME)_$(LANGCODE); $(SEVENZIP) a -mx9 -sfx7z.sfx ../$(COMPRESSED_NAME)_$(LANGCODE).exe $(NAME) copy-files_%: generic-bundle.stamp

1 0

[torbrowser/master] Build openssl as shared again.
by erinn＠torproject.org 04 Aug '12

04 Aug '12

commit ab9c09755df62d003980ee359e7a6355c9b2320d Author: Shondoit Walker <shondoit(a)gmail.com> Date: Tue Jul 31 13:07:09 2012 +0200 Build openssl as shared again. Commit 78c122cefc948c255a7e20218085af2e8d1bc1f9 changed it to no-shared for no apparent reason and it broke the build. --- build-scripts/windows-alpha.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index 7bdb8cb..cb9e1ae 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -62,7 +62,7 @@ build-zlib: $(ZLIB_DIR) cd $(ZLIB_DIR) && $(ZLIB_OPTS) make -f win32/Makefile.gcc install touch $(STAMP_DIR)/build-zlib -OPENSSL_OPTS=-no-idea -no-rc5 -no-md2 no-shared zlib --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -L$(BUILT_DIR)/lib -Wl,--nxcompat -Wl,--dynamicbase -I$(BUILT_DIR)/include +OPENSSL_OPTS=-no-idea -no-rc5 -no-md2 shared zlib --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -L$(BUILT_DIR)/lib -Wl,--nxcompat -Wl,--dynamicbase -I$(BUILT_DIR)/include build-openssl: build-zlib $(OPENSSL_DIR) cd $(OPENSSL_DIR) && ./config $(OPENSSL_OPTS) cd $(OPENSSL_DIR) && make depend

1 0

[torbrowser/master] Use the predefined COMPRESSED_NAME
by erinn＠torproject.org 04 Aug '12

04 Aug '12

commit ba5724c720ccbf06b5e3db19018dbc91ecb28e45 Author: Shondoit Walker <shondoit(a)gmail.com> Date: Thu Aug 2 09:25:07 2012 +0200 Use the predefined COMPRESSED_NAME COMPRESSED_NAME is already defined according to the USE_OBFSPROXY flag as introduced in commit a08b546605d13d82e6f664bf8e2d8b3caf61327c. --- build-scripts/linux-alpha.mk | 5 +---- build-scripts/osx-alpha.mk | 7 ++----- build-scripts/windows-alpha.mk | 3 --- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index ceb2014..8427a10 100644 --- a/build-scripts/linux-alpha.mk +++ b/build-scripts/linux-alpha.mk @@ -377,10 +377,7 @@ bundle-localized: bundle-localized_$(LANGCODE).stamp compressed-bundle-localized: bundle-localized_$(LANGCODE).stamp -rm -f $(DISTDIR)/$(COMPRESSED_NAME)_$(LANGCODE).tar.gz -mkdir $(DISTDIR) -ifeq ($(USE_OBFSPROXY),1) - tar -cvf - $(NAME)_$(LANGCODE) |tardy -unu 0 -una root -gnu 0 -gna wheel |gzip -c9 >$(DISTDIR)/$(DEFAULT_COMPRESSED_BASENAME)obfsproxy-$(LANGCODE).tar.gz -endif - tar -cvf - $(NAME)_$(LANGCODE) |tardy -unu 0 -una root -gnu 0 -gna wheel |gzip -c9 >$(DISTDIR)/$(DEFAULT_COMPRESSED_BASENAME)$(LANGCODE).tar.gz + tar -cvf - $(NAME)_$(LANGCODE) |tardy -unu 0 -una root -gnu 0 -gna wheel |gzip -c9 >$(DISTDIR)/$(COMPRESSED_NAME)$(LANGCODE).tar.gz rm *.zip *.xpi copy-files_%: generic-bundle.stamp diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index 377fba9..ad75326 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -374,13 +374,10 @@ bundle-localized_%.stamp: bundle-localized: bundle-localized_$(LANGCODE).stamp compressed-bundle-localized: bundle-localized_$(LANGCODE).stamp - -rm -f $(DISTDIR)/$(COMPRESSED_NAME)_$(LANGCODE).zip + -rm -f $(DISTDIR)/$(COMPRESSED_NAME)$(LANGCODE).zip -mkdir $(DISTDIR) #hdiutil create -volname "Tor Browser Bundle for OS X" -format UDBZ -imagekey zlib-level=9 -srcfolder $(DISTDIR)/tmp/ $(DISTDIR)/$(DEFAULT_COMPRESSED_BASENAME)$(LANGCODE).dmg - zip -r $(DISTDIR)/$(DEFAULT_COMPRESSED_BASENAME)$(LANGCODE).zip $(NAME)_$(LANGCODE).app -ifeq ($(USE_OBFSPROXY),1) - zip -r $(DISTDIR)/$(DEFAULT_COMPRESSED_BASENAME)obfsproxy-$(LANGCODE).zip $(NAME)_$(LANGCODE).app -endif + zip -r $(DISTDIR)/$(COMPRESSED_NAME)$(LANGCODE).zip $(NAME)_$(LANGCODE).app -rm -f *.zip *.xpi copy-files_%: generic-bundle.stamp diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index cb9e1ae..5847a34 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -373,9 +373,6 @@ bundle-localized: bundle-localized_$(LANGCODE).stamp compressed-bundle-localized: $(SEVENZIP) bundle-localized_$(LANGCODE).stamp rm -f $(COMPRESSED_NAME)_$(LANGCODE).exe -ifeq ($(USE_OBFSPROXY),1) - cd $(NAME)_$(LANGCODE); $(SEVENZIP) a -mx9 -sfx7z.sfx ../$(COMPRESSED_NAME)-obfsproxy_$(LANGCODE).exe $(NAME) -endif cd $(NAME)_$(LANGCODE); $(SEVENZIP) a -mx9 -sfx7z.sfx ../$(COMPRESSED_NAME)_$(LANGCODE).exe $(NAME) copy-files_%: generic-bundle.stamp

1 0