diff options
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/libjingle/libjingle.gyp | 5 | ||||
| -rw-r--r-- | third_party/modp_b64/LICENSE.html | 296 | ||||
| -rw-r--r-- | third_party/modp_b64/README.chromium | 7 | ||||
| -rw-r--r-- | third_party/modp_b64/modp_b64.gyp | 2 |
4 files changed, 301 insertions, 9 deletions
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp index 0c68ec6..16b9d11 100644 --- a/third_party/libjingle/libjingle.gyp +++ b/third_party/libjingle/libjingle.gyp @@ -150,7 +150,6 @@ 'overrides/talk/xmllite/qname.cc', 'overrides/talk/xmllite/qname.h', - 'source/talk/base/DiskCacheStd.h', 'source/talk/base/Equifax_Secure_Global_eBusiness_CA-1.h', 'source/talk/base/asyncfile.cc', 'source/talk/base/asyncfile.h', @@ -182,7 +181,6 @@ 'source/talk/base/diskcache.h', 'source/talk/base/event.cc', 'source/talk/base/event.h', - 'source/talk/base/fakenetwork.h', 'source/talk/base/fileutils.cc', 'source/talk/base/fileutils.h', 'source/talk/base/fileutils_mock.h', @@ -190,7 +188,6 @@ 'source/talk/base/firewallsocketserver.h', 'source/talk/base/flags.cc', 'source/talk/base/flags.h', - 'source/talk/base/hash.h', 'source/talk/base/helpers.cc', 'source/talk/base/helpers.h', 'source/talk/base/host.cc', @@ -213,7 +210,6 @@ 'source/talk/base/messagehandler.h', 'source/talk/base/messagequeue.cc', 'source/talk/base/messagequeue.h', - 'source/talk/base/netfw.h', 'source/talk/base/nethelpers.cc', 'source/talk/base/nethelpers.h', 'source/talk/base/network.cc', @@ -312,7 +308,6 @@ ['OS=="win"', { 'sources': [ 'overrides/talk/base/win32socketinit.cc', - 'source/talk/base/convert.h', # win32 only 'source/talk/base/schanneladapter.cc', 'source/talk/base/schanneladapter.h', 'source/talk/base/win32.h', diff --git a/third_party/modp_b64/LICENSE.html b/third_party/modp_b64/LICENSE.html new file mode 100644 index 0000000..e156351 --- /dev/null +++ b/third_party/modp_b64/LICENSE.html @@ -0,0 +1,296 @@ + + + + +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" +"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<!-- ViewVC :: http://www.viewvc.org/ --> +<head> +<title>[chrome] Log of /trunk/src/third_party/modp_b64/LICENSE</title> +<meta name="generator" content="ViewVC 1.0.9" /> +<link rel="stylesheet" href="/viewvc/*docroot*/styles.css" type="text/css" /> + +</head> +<body> +<div class="vc_navheader"> + +<form method="get" action="/viewvc/"> + +<table style="padding:0.1em;"> +<tr> +<td> +<strong> + +<a href="/viewvc/chrome/?pathrev=74924"> + +[chrome]</a> +/ + +<a href="/viewvc/chrome/trunk/?pathrev=74924"> + +trunk</a> +/ + +<a href="/viewvc/chrome/trunk/src/?pathrev=74924"> + +src</a> +/ + +<a href="/viewvc/chrome/trunk/src/third_party/?pathrev=74924"> + +third_party</a> +/ + +<a href="/viewvc/chrome/trunk/src/third_party/modp_b64/?pathrev=74924"> + +modp_b64</a> +/ + + + +LICENSE + + +</strong> + +</td> +<td style="text-align:right;"> + + +<strong>Repository:</strong> +<select name="root" onchange="submit()"> + + +<option value="*viewroots*">Repository Listing</option> + + + + + + + + + + + + + + + + + + + + + + + +<optgroup label="Subversion Repositories"><option selected="selected">chrome</option><option>native_client</option></optgroup> + +</select> +<input type="submit" value="Go" /> + +</td> +</tr> +</table> + +</form> + +</div> +<div style="float: right; padding: 5px;"><a href="http://www.viewvc.org/"><img src="/viewvc/*docroot*/images/logo.png" alt="ViewVC logotype" width="128" height="48" /></a></div> +<h1>Log of /trunk/src/third_party/modp_b64/LICENSE</h1> + +<p style="margin:0;"> + +<a href="/viewvc/chrome/trunk/src/third_party/modp_b64/?pathrev=74924"><img src="/viewvc/*docroot*/images/back_small.png" width="16" height="16" alt="Parent Directory" /> Parent Directory</a> + + + + +</p> + +<hr /> +<table class="auto"> + + + +<tr> +<td>Links to HEAD:</td> +<td> +(<a href="/viewvc/chrome/trunk/src/third_party/modp_b64/LICENSE?view=markup">view</a>) +(<a href="/viewvc/chrome/trunk/src/third_party/modp_b64/LICENSE">download</a>) + +(<a href="/viewvc/chrome/trunk/src/third_party/modp_b64/LICENSE?view=annotate">annotate</a>) +</td> +</tr> + + + +<tr> +<td>Sticky Revision:</td> +<td><form method="get" action="/viewvc/chrome" style="display: inline"> +<div style="display: inline"> +<input type="hidden" name="orig_pathrev" value="74924" /><input type="hidden" name="orig_pathtype" value="FILE" /><input type="hidden" name="orig_view" value="log" /><input type="hidden" name="orig_path" value="trunk/src/third_party/modp_b64/LICENSE" /><input type="hidden" name="view" value="redirect_pathrev" /> + +<input type="text" name="pathrev" value="74924" size="6"/> + +<input type="submit" value="Set" /> +</div> +</form> + +<form method="get" action="/viewvc/chrome/trunk/src/third_party/modp_b64/LICENSE" style="display: inline"> +<div style="display: inline"> +<input type="hidden" name="view" value="log" /> + +<input type="submit" value="Clear" /> + +</div> +</form> + +</td> +</tr> +</table> + + + + + + + + + +<div> +<hr /> + +<a name="rev44656"></a> + + +Revision <a href="/viewvc/chrome?view=rev&revision=44656"><strong>44656</strong></a> - + +(<a href="/viewvc/chrome/trunk/src/third_party/modp_b64/LICENSE?revision=44656&view=markup&pathrev=74924">view</a>) + +(<a href="/viewvc/chrome/trunk/src/third_party/modp_b64/LICENSE?revision=44656&pathrev=74924">download</a>) + +(<a href="/viewvc/chrome/trunk/src/third_party/modp_b64/LICENSE?annotate=44656&pathrev=74924">annotate</a>) + + + +- <a href="/viewvc/chrome/trunk/src/third_party/modp_b64/LICENSE?view=log&r1=44656&pathrev=74924">[select for diffs]</a> + + + + +<br /> + +Added + +<em>Thu Apr 15 15:29:44 2010 UTC</em> (13 months, 2 weeks ago) by <em>evan@chromium.org</em> + + + + + + + +<br />File length: 1721 byte(s) + + + + + + + + + + +<pre class="vc_log">Pass tools/licenses.py for more directories. + +We're now down to only 4 dirs that don't pass the license checker. +They will require separate changes. + +Modify the license checker to only print failing dirs. + +BUG=39240 + +Review URL: <a href="http://codereview.chromium.org/1530040">http://codereview.chromium.org/1530040</a></pre> +</div> + + + + + + <hr /> +<p><a name="diff"></a> +This form allows you to request diffs between any two revisions of this file. +For each of the two "sides" of the diff, + +enter a numeric revision. + +</p> +<form method="get" action="/viewvc/chrome/trunk/src/third_party/modp_b64/LICENSE" id="diff_select"> +<table cellpadding="2" cellspacing="0" class="auto"> +<tr> +<td> </td> +<td> +<input type="hidden" name="pathrev" value="74924" /><input type="hidden" name="view" value="diff" /> +Diffs between + +<input type="text" size="12" name="r1" +value="44656" /> + +and + +<input type="text" size="12" name="r2" value="44656" /> + +</td> +</tr> +<tr> +<td> </td> +<td> +Type of Diff should be a +<select name="diff_format" onchange="submit()"> +<option value="h" selected="selected">Colored Diff</option> +<option value="l" >Long Colored Diff</option> +<option value="u" >Unidiff</option> +<option value="c" >Context Diff</option> +<option value="s" >Side by Side</option> +</select> +<input type="submit" value=" Get Diffs " /> +</td> +</tr> +</table> +</form> + + +<form method="get" action="/viewvc/chrome/trunk/src/third_party/modp_b64/LICENSE"> +<div> +<hr /> +<a name="logsort"></a> +<input type="hidden" name="view" value="log" /><input type="hidden" name="pathrev" value="74924" /> +Sort log by: +<select name="logsort" onchange="submit()"> +<option value="cvs" >Not sorted</option> +<option value="date" selected="selected">Commit date</option> +<option value="rev" >Revision</option> +</select> +<input type="submit" value=" Sort " /> +</div> +</form> + + +<hr /> +<table> +<tr> +<td><address><a href="mailto:cvs-admin@insert.your.domain.here">No admin address has been configured</a></address></td> +<td style="text-align: right;"><strong><a href="/viewvc/*docroot*/help_log.html">ViewVC Help</a></strong></td> +</tr> +<tr> +<td>Powered by <a href="http://viewvc.tigris.org/">ViewVC 1.0.9</a></td> +<td style="text-align: right;"> </td> +</tr> +</table> +</body> +</html> + + diff --git a/third_party/modp_b64/README.chromium b/third_party/modp_b64/README.chromium index fc30450..16588b5 100644 --- a/third_party/modp_b64/README.chromium +++ b/third_party/modp_b64/README.chromium @@ -1,8 +1,9 @@ Name: modp base64 decoder -URL: http://modp.com/release/base64/ - -See the header of modp_b64.cc for the license terms. +Short Name: stringencoders +URL: http://code.google.com/p/stringencoders/ +Version: unknown +Description: The modp_b64.c file was modified to remove the inclusion of modp's config.h and to fix compilation errors that occur under VC8. The file was renamed modp_b64.cc to force it to be compiled as C++ so that the inclusion of diff --git a/third_party/modp_b64/modp_b64.gyp b/third_party/modp_b64/modp_b64.gyp index 4ed34f4..1c346e0 100644 --- a/third_party/modp_b64/modp_b64.gyp +++ b/third_party/modp_b64/modp_b64.gyp @@ -6,7 +6,7 @@ 'targets': [ { 'target_name': 'modp_b64', - 'type': '<(library)', + 'type': 'static_library', 'msvs_guid': '7100F41F-868D-4E99-80A2-AF8E6574749D', 'sources': [ 'modp_b64.cc', |