June 2015 - tor-commits - lists.torproject.org

[tor-browser/tor-browser-31.7.0esr-4.5-2] fixup! Bug 12827: Create preference to disable SVG.
by mikeperry＠torproject.org 25 Jun '15

25 Jun '15

commit 612ae46e1344327c495cec13fd756807c22ff826 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Jun 18 13:38:35 2015 -0400 fixup! Bug 12827: Create preference to disable SVG. If an <object> is used to load an SVG from a .xml file, avoid dereferencing null pointers when script elements are created as generic elements (i.e., when svg.in-content.enabled=false). Fixes ticket #16397. --- content/xml/document/src/nsXMLContentSink.cpp | 12 +++++++++--- content/xml/document/src/nsXMLFragmentContentSink.cpp | 4 ++-- dom/xslt/xslt/txMozillaXMLOutput.cpp | 15 ++++++++------- parser/html/nsHtml5TreeOpExecutor.cpp | 2 ++ 4 files changed, 21 insertions(+), 12 deletions(-) diff --git a/content/xml/document/src/nsXMLContentSink.cpp b/content/xml/document/src/nsXMLContentSink.cpp index 104d80a..57ee45a 100644 --- a/content/xml/document/src/nsXMLContentSink.cpp +++ b/content/xml/document/src/nsXMLContentSink.cpp @@ -471,8 +471,10 @@ nsXMLContentSink::CreateElement(const char16_t** aAtts, uint32_t aAttsCount, || aNodeInfo->Equals(nsGkAtoms::script, kNameSpaceID_SVG) ) { nsCOMPtr<nsIScriptElement> sele = do_QueryInterface(content); - sele->SetScriptLineNumber(aLineNumber); - sele->SetCreatorParser(GetParser()); + if (sele) { + sele->SetScriptLineNumber(aLineNumber); + sele->SetCreatorParser(GetParser()); + } mConstrainSize = false; } @@ -554,13 +556,17 @@ nsXMLContentSink::CloseElement(nsIContent* aContent) nsCOMPtr<nsIScriptElement> sele = do_QueryInterface(aContent); if (mPreventScriptExecution) { - sele->PreventExecution(); + if (sele) + sele->PreventExecution(); return NS_OK; } // Always check the clock in nsContentSink right after a script StopDeflecting(); + if (!sele) + return NS_OK; + // Now tell the script that it's ready to go. This may execute the script // or return true, or neither if the script doesn't need executing. bool block = sele->AttemptToExecute(); diff --git a/content/xml/document/src/nsXMLFragmentContentSink.cpp b/content/xml/document/src/nsXMLFragmentContentSink.cpp index 738a769..29dd1a3 100644 --- a/content/xml/document/src/nsXMLFragmentContentSink.cpp +++ b/content/xml/document/src/nsXMLFragmentContentSink.cpp @@ -229,8 +229,8 @@ nsXMLFragmentContentSink::CloseElement(nsIContent* aContent) if (mPreventScriptExecution && aContent->Tag() == nsGkAtoms::script && (aContent->IsHTML() || aContent->IsSVG())) { nsCOMPtr<nsIScriptElement> sele = do_QueryInterface(aContent); - NS_ASSERTION(sele, "script did QI correctly!"); - sele->PreventExecution(); + if (sele) + sele->PreventExecution(); } return NS_OK; } diff --git a/dom/xslt/xslt/txMozillaXMLOutput.cpp b/dom/xslt/xslt/txMozillaXMLOutput.cpp index 6b95345..45b8579 100644 --- a/dom/xslt/xslt/txMozillaXMLOutput.cpp +++ b/dom/xslt/xslt/txMozillaXMLOutput.cpp @@ -299,13 +299,14 @@ txMozillaXMLOutput::endElement() } else if ((ns == kNameSpaceID_XHTML || ns == kNameSpaceID_SVG) && localName == nsGkAtoms::script) { nsCOMPtr<nsIScriptElement> sele = do_QueryInterface(element); - NS_ABORT_IF_FALSE(sele, "script elements need to implement nsIScriptElement"); - bool block = sele->AttemptToExecute(); - // If the act of insertion evaluated the script, we're fine. - // Else, add this script element to the array of loading scripts. - if (block) { - rv = mNotifier->AddScriptElement(sele); - NS_ENSURE_SUCCESS(rv, rv); + if (sele) { + bool block = sele->AttemptToExecute(); + // If the act of insertion evaluated the script, we're fine. + // Else, add this script element to the array of loading scripts. + if (block) { + rv = mNotifier->AddScriptElement(sele); + NS_ENSURE_SUCCESS(rv, rv); + } } } else if (ns == kNameSpaceID_XHTML && (localName == nsGkAtoms::input || diff --git a/parser/html/nsHtml5TreeOpExecutor.cpp b/parser/html/nsHtml5TreeOpExecutor.cpp index 6c52e5f..fb377bd 100644 --- a/parser/html/nsHtml5TreeOpExecutor.cpp +++ b/parser/html/nsHtml5TreeOpExecutor.cpp @@ -636,6 +636,8 @@ nsHtml5TreeOpExecutor::RunScript(nsIContent* aScriptElement) NS_ASSERTION(aScriptElement, "No script to run"); nsCOMPtr<nsIScriptElement> sele = do_QueryInterface(aScriptElement); + if (!sele) + return; if (!mParser) { NS_ASSERTION(sele->IsMalformed(), "Script wasn't marked as malformed.");

1 0

[tor-browser/tor-browser-38.1.0esr-5.x-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 25 Jun '15

25 Jun '15

commit acccb97ea445f9209e7dce3ba4fae0569a646e12 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jun 24 17:59:36 2015 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. Disable resource and user timing APIs as per bugs 13024 and 16340. --- browser/app/profile/000-tor-browser.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index d357f64..f148f4d 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -91,6 +91,8 @@ pref("javascript.use_us_english_locale", true); pref("media.video_stats.enabled", false); // Disable device sensors as possible fingerprinting vector (bug 15758) pref("device.sensors.enabled", false); +pref("dom.enable_resource_timing", false); // Bug 13024: To hell with this API +pref("dom.enable_user_timing", false); // Bug 16336: To hell with this API // Third party stuff pref("network.cookie.cookieBehavior", 1);

1 0

[tor-browser/tor-browser-38.1.0esr-5.x-1] fixup! Bug 1517: Reduce precision of time for Javascript.
by mikeperry＠torproject.org 25 Jun '15

25 Jun '15

commit 1dd1d5c72cecfdfbee6b8526553407d84724dbdd Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jun 24 17:50:31 2015 -0700 fixup! Bug 1517: Reduce precision of time for Javascript. Address worker thread performance.now() and also clip dom highres timestamps at 1ms in other cases (such as requestAnimationFrame()). --- dom/base/nsDOMNavigationTiming.h | 2 +- dom/workers/Performance.cpp | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dom/base/nsDOMNavigationTiming.h b/dom/base/nsDOMNavigationTiming.h index 7ae592c..e610891 100644 --- a/dom/base/nsDOMNavigationTiming.h +++ b/dom/base/nsDOMNavigationTiming.h @@ -91,7 +91,7 @@ public: inline DOMHighResTimeStamp TimeStampToDOMHighRes(mozilla::TimeStamp aStamp) { mozilla::TimeDuration duration = aStamp - mNavigationStartTimeStamp; - return duration.ToMilliseconds(); + return floor(duration.ToMilliseconds()); // Clamp to milliseconds at least } private: diff --git a/dom/workers/Performance.cpp b/dom/workers/Performance.cpp index 366e3ab..8dea08b 100644 --- a/dom/workers/Performance.cpp +++ b/dom/workers/Performance.cpp @@ -34,9 +34,8 @@ Performance::WrapObject(JSContext* aCx) double Performance::Now() const { - TimeDuration duration = - TimeStamp::Now() - mWorkerPrivate->NowBaseTimeStamp(); - return duration.ToMilliseconds(); + TimeDuration duration = TimeStamp::Now() - mWorkerPrivate->NowBaseTimeStamp(); + return floor(duration.ToMilliseconds()/100.0)*100.0; } END_WORKERS_NAMESPACE

1 0

[goptlib/master] Actually relays need DirPort if you treat them as a bridge.
by dcf＠torproject.org 24 Jun '15

24 Jun '15

commit 5d61d1664bbe0d5710c3fd1f032748ee63686a88 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Jun 24 13:54:28 2015 -0700 Actually relays need DirPort if you treat them as a bridge. At least until #12538 is done. --- examples/dummy-client/dummy-client.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/dummy-client/dummy-client.go b/examples/dummy-client/dummy-client.go index 64f1ec1..cbb2d38 100644 --- a/examples/dummy-client/dummy-client.go +++ b/examples/dummy-client/dummy-client.go @@ -5,9 +5,9 @@ // Bridge dummy X.X.X.X:YYYY // ClientTransportPlugin dummy exec dummy-client // -// Because this transport doesn't do anything to the traffic, you can use any -// ordinary relay's ORPort in the Bridge line; it doesn't have to declare -// support for the dummy transport. +// Because this transport doesn't do anything to the traffic, you can use the +// ORPort of any ordinary bridge (or relay that has DirPort set) in the bridge +// line; it doesn't have to declare support for the dummy transport. package main import (

1 0

[goptlib/master] Don't need to export this variable.
by dcf＠torproject.org 24 Jun '15

24 Jun '15

commit ef26759deddd98480f521fd3069d5758e22eaeca Author: David Fifield <david(a)bamsoftware.com> Date: Wed Jun 24 12:58:34 2015 -0700 Don't need to export this variable. --- pt_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pt_test.go b/pt_test.go index 8cdf6da..c0540b5 100644 --- a/pt_test.go +++ b/pt_test.go @@ -704,19 +704,19 @@ func TestExtOrPortRecvCommand(t *testing.T) { } // set up so that extOrPortSetup can write to one buffer and read from another. -type MockSetupBuf struct { +type mockSetupBuf struct { bytes.Buffer ReadBuf bytes.Buffer } -func (buf *MockSetupBuf) Read(p []byte) (int, error) { +func (buf *mockSetupBuf) Read(p []byte) (int, error) { n, err := buf.ReadBuf.Read(p) return n, err } func testExtOrPortSetupIndividual(t *testing.T, addr, methodName string) { var err error - var buf MockSetupBuf + var buf mockSetupBuf // fake an OKAY response. err = extOrPortSendCommand(&buf.ReadBuf, extOrCmdOkay, []byte{}) if err != nil {

1 0

[goptlib/master] Add tests for net.Error temporary error handling in AcceptSocks.
by dcf＠torproject.org 24 Jun '15

24 Jun '15

commit 2a2a9b7cbff0dc9ff452a39a4199cec264e76dfe Author: David Fifield <david(a)bamsoftware.com> Date: Wed Jun 24 01:38:04 2015 -0700 Add tests for net.Error temporary error handling in AcceptSocks. See https://trac.torproject.org/projects/tor/ticket/14135. We're going to make the recommended way to check for an error from AcceptSocks match the way in the golang standard library: if e, ok := err.(net.Error); ok && e.Temporary() { continue } else { break } The new tests check that 1) AcceptSocks faithfully represents an underlying Accept error with respect to its net.Error-ness and its Temporary-ness, and 2) errors that happen post-Accept in AcceptSocks are either silently swallowed or else reported as a Temporary net.Error. The test fails at the moment: "socks_test.go:267: AcceptSocks returned non-net.Error: unexpected EOF". --- socks_test.go | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/socks_test.go b/socks_test.go index 18d141a..7fee46a 100644 --- a/socks_test.go +++ b/socks_test.go @@ -2,8 +2,11 @@ package pt import ( "bytes" + "errors" + "io" "net" "testing" + "time" ) func TestReadSocks4aConnect(t *testing.T) { @@ -160,3 +163,107 @@ func TestSendSocks4aResponse(t *testing.T) { } } } + +var fakeListenerDistinguishedError = errors.New("distinguished error") + +// fakeListener is a fake dummy net.Listener that returns the given net.Conn and +// error the first time Accept is called. After the first call, it returns +// (nil, fakeListenerDistinguishedError). +type fakeListener struct { + c net.Conn + err error +} + +func (ln *fakeListener) Accept() (net.Conn, error) { + c := ln.c + err := ln.err + ln.c = nil + ln.err = fakeListenerDistinguishedError + return c, err +} + +func (ln *fakeListener) Close() error { + return nil +} + +func (ln *fakeListener) Addr() net.Addr { + return &net.TCPAddr{IP: net.ParseIP("127.0.0.1"), Port: 0, Zone: ""} +} + +// A trivial net.Error that lets you control whether it is considered Temporary. +type netError struct { + errString string + temporary bool +} + +func (e *netError) Error() string { + return e.errString +} + +func (e *netError) Temporary() bool { + return e.temporary +} + +func (e *netError) Timeout() bool { + return false +} + +// The purpose of ignoreDeadlineConn is to wrap net.Pipe so that the deadline +// functions don't return an error ("net.Pipe does not support deadlines"). +type ignoreDeadlineConn struct { + net.Conn +} + +func (c *ignoreDeadlineConn) SetDeadline(t time.Time) error { + return nil +} + +func (c *ignoreDeadlineConn) SetReadDeadline(t time.Time) error { + return nil +} + +func (c *ignoreDeadlineConn) SetWriteDeadline(t time.Time) error { + return nil +} + +func TestAcceptErrors(t *testing.T) { + // Check that AcceptSocks accurately reflects net.Errors returned by the + // underlying call to Accept. This is important for the handling of + // Temporary and non-Temporary errors. The loop iterates over + // non-net.Error, non-Temporary net.Error, and Temporary net.Error. + for _, expectedErr := range []error{io.EOF, &netError{"non-temp", false}, &netError{"temp", true}} { + ln := NewSocksListener(&fakeListener{nil, expectedErr}) + _, err := ln.AcceptSocks() + if expectedNerr, ok := expectedErr.(net.Error); ok { + nerr, ok := err.(net.Error) + if !ok { + t.Errorf("AcceptSocks returned non-net.Error %v", nerr) + } else { + if expectedNerr.Temporary() != expectedNerr.Temporary() { + t.Errorf("AcceptSocks did not keep Temporary status of net.Error: %v", nerr) + } + } + } + } + + c1, c2 := net.Pipe() + go func() { + // Bogus request: SOCKS 5 then EOF. + c2.Write([]byte("\x05\x01\x00")) + c2.Close() + }() + ln := NewSocksListener(&fakeListener{c: &ignoreDeadlineConn{c1}, err: nil}) + _, err := ln.AcceptSocks() + // The error in parsing the SOCKS request must be either silently + // ignored, or else must be a Temporary net.Error. I.e., it must not be + // the io.ErrUnexpectedEOF caused by the short request. + if err == fakeListenerDistinguishedError { + // Was silently ignored. + } else if nerr, ok := err.(net.Error); ok { + if !nerr.Temporary() { + t.Errorf("AcceptSocks returned non-Temporary net.Error: %v", nerr) + } + } else { + t.Errorf("AcceptSocks returned non-net.Error: %v", err) + } +}

1 0

[tor/master] Work around nytimes.com's broken hostnames in our SOCKS checks.
by nickm＠torproject.org 24 Jun '15

24 Jun '15

commit 3f336966a264d7cd7c6dab08fb85d85273f06d68 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Wed Jun 24 13:52:29 2015 +0000 Work around nytimes.com's broken hostnames in our SOCKS checks. RFC 952 is approximately 30 years old, and people are failing to comply, by serving A records with '_' as part of the hostname. Since relaxing the check is a QOL improvement for our userbase, relax the check to allow such abominations as destinations, especially since there are likely to be other similarly misconfigured domains out there. --- changes/bug16430 | 4 ++++ src/common/util.c | 7 +++++-- src/test/test_util.c | 9 +++++++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/changes/bug16430 b/changes/bug16430 new file mode 100644 index 0000000..ca7b874 --- /dev/null +++ b/changes/bug16430 @@ -0,0 +1,4 @@ + o Minor features (client): + - Relax the validation done to hostnames in SOCKS5 requests, and allow + '_' to cope with domains observed in the wild that are serving non-RFC + compliant records. Resolves ticket 16430. diff --git a/src/common/util.c b/src/common/util.c index 942d0c2..4490150 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1036,6 +1036,9 @@ string_is_valid_ipv6_address(const char *string) /** Return true iff <b>string</b> matches a pattern of DNS names * that we allow Tor clients to connect to. + * + * Note: This allows certain technically invalid characters ('_') to cope + * with misconfigured zones that have been encountered in the wild. */ int string_is_valid_hostname(const char *string) @@ -1048,7 +1051,7 @@ string_is_valid_hostname(const char *string) smartlist_split_string(components,string,".",0,0); SMARTLIST_FOREACH_BEGIN(components, char *, c) { - if (c[0] == '-') { + if ((c[0] == '-') || (*c == '_')) { result = 0; break; } @@ -1057,7 +1060,7 @@ string_is_valid_hostname(const char *string) if ((*c >= 'a' && *c <= 'z') || (*c >= 'A' && *c <= 'Z') || (*c >= '0' && *c <= '9') || - (*c == '-')) + (*c == '-') || (*c == '_')) c++; else result = 0; diff --git a/src/test/test_util.c b/src/test/test_util.c index b0366db..0f64c26 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -4268,18 +4268,23 @@ test_util_hostname_validation(void *arg) tt_assert(string_is_valid_hostname("stanford.edu")); tt_assert(string_is_valid_hostname("multiple-words-with-hypens.jp")); - // Subdomain name cannot start with '-'. + // Subdomain name cannot start with '-' or '_'. tt_assert(!string_is_valid_hostname("-torproject.org")); tt_assert(!string_is_valid_hostname("subdomain.-domain.org")); tt_assert(!string_is_valid_hostname("-subdomain.domain.org")); + tt_assert(!string_is_valid_hostname("___abc.org")); // Hostnames cannot contain non-alphanumeric characters. tt_assert(!string_is_valid_hostname("%%domain.\\org.")); tt_assert(!string_is_valid_hostname("***x.net")); - tt_assert(!string_is_valid_hostname("___abc.org")); tt_assert(!string_is_valid_hostname("\xff\xffxyz.org")); tt_assert(!string_is_valid_hostname("word1 word2.net")); + // Test workaround for nytimes.com stupidity, technically invalid, + // but we allow it since they are big, even though they are failing to + // comply with a ~30 year old standard. + tt_assert(string_is_valid_hostname("core3_euw1.fabrik.nytimes.com")); + // XXX: do we allow single-label DNS names? done:

1 0

[tor-messenger-build/master] Update Mac OS X SDK
by boklm＠torproject.org 24 Jun '15

24 Jun '15

commit cdccd9f3968029d140f5d59ce70840c4200d0be5 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jun 24 14:40:18 2015 +0200 Update Mac OS X SDK Same as Tor Browser: https://gitweb.torproject.org/builders/tor-browser-bundle.git/commit/?id=ff… --- projects/macosx-toolchain/build | 5 ++--- projects/macosx-toolchain/config | 11 ++++++----- rbm.conf | 3 +-- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/projects/macosx-toolchain/build b/projects/macosx-toolchain/build index 44e51ec..c22d8f8 100644 --- a/projects/macosx-toolchain/build +++ b/projects/macosx-toolchain/build @@ -3,9 +3,8 @@ set -e rootdir=$(pwd) distdir="$rootdir/dist/[% project %]" mkdir -p "$distdir" -ar vx [% c('input_files_by_name/SDK') %] -tar xzf data.tar.gz -mv usr/lib/apple/SDKs "$distdir/SDK" +tar xzf [% c('input_files_by_name/SDK') %] +mv MacOSX10.7.sdk "$distdir/SDK" tar xf [% c('input_files_by_name/clang') %] mv x-tools "$distdir" cd "$rootdir/dist" diff --git a/projects/macosx-toolchain/config b/projects/macosx-toolchain/config index 5e9dcb2..19e2c5c 100644 --- a/projects/macosx-toolchain/config +++ b/projects/macosx-toolchain/config @@ -1,14 +1,15 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %].tar.gz' -version: 1 +version: 10.7-1 var: setup: | mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf [% c("compiler_tarfile") %] - sysrootdir=/var/tmp/dist/[% project %]/SDK/MacOSX10.6.sdk/ + sysrootdir=/var/tmp/dist/[% project %]/SDK/ ccbindir=/var/tmp/dist/[% project %]/x-tools/x86_64-apple-darwin10/bin export PATH="$ccbindir:$PATH" - FLAGS="-arch x86_64 -isysroot $sysrootdir" + CFLAGS="-arch x86_64 -isysroot $sysrootdir" + CXXFLAGS="-arch x86_64 -isysroot $sysrootdir" CC="$ccbindir/x86_64-apple-darwin10-clang $FLAGS" CXX="$ccbindir/x86_64-apple-darwin10-clang++ $FLAGS" RANLIB=$ccbindir/x86_64-apple-darwin10-ranlib @@ -27,5 +28,5 @@ input_files: URL: https://people.torproject.org/~mikeperry/mirrors/sources/x86_64-apple-darwi… sha256sum: 7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 - name: SDK - URL: https://launchpad.net/~flosoft/+archive/cross-apple/+files/apple-uni-sdk-10… - sha256sum: 6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc + URL: https://people.torproject.org/~mikeperry/mirrors/sources/MacOSX10.7.sdk.tar… + sha256sum: da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf diff --git a/rbm.conf b/rbm.conf index 4e81508..91d46ac 100644 --- a/rbm.conf +++ b/rbm.conf @@ -69,8 +69,7 @@ targets: osx: 1 osname: osx-x86_64 compiler: 'macosx-toolchain' - configure_opt: '--host=x86_64-apple-darwin10 CC="x86_64-apple-darwin10-clang [% c("var/CLANG_FLAGS") %]" CXX="x86_64-apple-darwin10-clang++ [% c("var/CLANG_FLAGS") %]"' - CLANG_FLAGS: '-arch x86_64 -isysroot /var/tmp/dist/macosx-toolchain/SDK/MacOSX10.6.sdk' + configure_opt: '--host=x86_64-apple-darwin10 CC="x86_64-apple-darwin10-clang $CFLAGS" CXX="x86_64-apple-darwin10-clang++ $CXXFLAGS"' tor-messenger: var:

1 0

[tor-messenger-build/master] Fix libotr OSX build
by boklm＠torproject.org 24 Jun '15

24 Jun '15

commit 45dea74d7de0991d2e6b96349d98669b118dc72b Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Jun 23 21:44:12 2015 +0200 Fix libotr OSX build --- projects/libotr/config | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/projects/libotr/config b/projects/libotr/config index ddc3726..5bc9225 100644 --- a/projects/libotr/config +++ b/projects/libotr/config @@ -27,6 +27,11 @@ targets: var: arch_deps: - libc6-dev-i386 + osx-x86_64: + lsb_release: + id: Ubuntu + release: 12.04 + codename: precise input_files: - filename: 'libotr-[% c("version") %].tar.gz' URL: 'https://otr.cypherpunks.ca/libotr-[% c("version") %].tar.gz'

1 0

[tor-messenger-build/master] tor-browser: add OSX URL
by boklm＠torproject.org 24 Jun '15

24 Jun '15

commit 203f48b836c26f22af5fb33e61d7f9234c66c11b Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Jun 23 21:55:00 2015 +0200 tor-browser: add OSX URL --- projects/tor-browser/config | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index c3e6124..c318209 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -13,6 +13,8 @@ input_files: targets: windows-i686: URL: "[% c('var/base_url') %]/torbrowser-install-[% c('version') %]_en-US.exe" + osx-x86_64: + URL: "[% c('var/base_url') %]/TorBrowser-[% c('version') %]-osx64_en-US.dmg" var: extension: 'tar.xz' @@ -27,3 +29,6 @@ targets: windows-i686: var: extension: 'exe' + osx-x86_64: + var: + extension: 'dmg'

1 0