summaryrefslogtreecommitdiffstats
path: root/third_party
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-09 17:24:51 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-09 17:24:51 +0000
commit145ecbde35f4fb20cf384fdae4453234407c7243 (patch)
treedf3d61de8716cb44f4f14597b861313edd348d7e /third_party
parent56e8725fb4649e5dbca1c040d755af24bd45e97a (diff)
downloadchromium_src-145ecbde35f4fb20cf384fdae4453234407c7243.zip
chromium_src-145ecbde35f4fb20cf384fdae4453234407c7243.tar.gz
chromium_src-145ecbde35f4fb20cf384fdae4453234407c7243.tar.bz2
Pass tools/licenses.py for a few more directories.
Getting very close to done. BUG=39240 Review URL: http://codereview.chromium.org/1559022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44099 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
-rw-r--r--third_party/scons/README.chromium11
-rw-r--r--third_party/swig/README.chromium33
-rw-r--r--third_party/tlslite/LICENSE1
-rw-r--r--third_party/tlslite/README.chromium7
-rw-r--r--third_party/tlslite/chromium.patch (renamed from third_party/tlslite/google.patch)0
-rw-r--r--third_party/yasm/README.chromium4
-rw-r--r--third_party/zlib/LICENSE25
-rw-r--r--third_party/zlib/README.chromium1
8 files changed, 53 insertions, 29 deletions
diff --git a/third_party/scons/README.chromium b/third_party/scons/README.chromium
index 2d2fbc2..3bb9ed0 100644
--- a/third_party/scons/README.chromium
+++ b/third_party/scons/README.chromium
@@ -1,15 +1,12 @@
+Name: SCons
+URL: http://www.scons.org
+License File: scons-LICENSE
+
This is a copy of SCons, a Python-based software build tool (that is,
replacement for Make) that we use for cross-platform builds.
Current version: 1.2.0.d20090113
-Originally obtained from:
-
- http://www.scons.org/downloads.php
-
-SCons ships under an MIT license. See the scons-LICENSE file in
-this directory for specifics.
-
We check in the contents of the scons-local-* package(s) provided
by the SCons Project.
diff --git a/third_party/swig/README.chromium b/third_party/swig/README.chromium
index 874229a..ac42927 100644
--- a/third_party/swig/README.chromium
+++ b/third_party/swig/README.chromium
@@ -1,17 +1,16 @@
-URL: http://www.swig.org/download.html
-Version: 1.3.40
-License: BSD
-License File: LICENSE
-
-Description:
-Simplified Wrapper and Interface Generator (SWIG) is an interface compiler
-that connects programs written in C and C++ with scripting languages such as
-Perl, Python, Ruby, and Tcl. It works by taking the declarations found in
-C/C++ header files and using them to generate the wrapper code that scripting
-languages need to access the underlying C/C++ code.
-
-Local Modifications:
-- Removed all non-python bindings from Lib/.
-- Edit Lib/python/pyruntime.swg to include Python.h without the _DEBUG macro to
-avoid requiring python<ver>_d.lib since we do not intend to debug python.
-
+Name: swig
+URL: http://www.swig.org/download.html
+Version: 1.3.40
+
+Description:
+Simplified Wrapper and Interface Generator (SWIG) is an interface compiler
+that connects programs written in C and C++ with scripting languages such as
+Perl, Python, Ruby, and Tcl. It works by taking the declarations found in
+C/C++ header files and using them to generate the wrapper code that scripting
+languages need to access the underlying C/C++ code.
+
+Local Modifications:
+- Removed all non-python bindings from Lib/.
+- Edit Lib/python/pyruntime.swg to include Python.h without the _DEBUG macro to
+avoid requiring python<ver>_d.lib since we do not intend to debug python.
+
diff --git a/third_party/tlslite/LICENSE b/third_party/tlslite/LICENSE
new file mode 100644
index 0000000..3c952fc
--- /dev/null
+++ b/third_party/tlslite/LICENSE
@@ -0,0 +1 @@
+All code here is public domain.
diff --git a/third_party/tlslite/README.chromium b/third_party/tlslite/README.chromium
index 945aacf..ca6ba54 100644
--- a/third_party/tlslite/README.chromium
+++ b/third_party/tlslite/README.chromium
@@ -1,10 +1,9 @@
-This library was downloaded from http://trevp.net/tlslite/.
-
-The code is public domain.
+Name: tlslite
+URL: http://trevp.net/tlslite/
tlslite/TLSRecordLayer.py was changed to force the socket to be closed when the
SSL connection is closed. This is is necessary at this point since WinHTTP does
not seem to react to the SSL close notify. It's also needed to prevent a hang
on Linux. See also
http://sourceforge.net/mailarchive/forum.php?thread_name=41C9B18B.2010201%40ag.com&forum_name=tlslite-users
-The change is in google.patch.
+The change is in chromium.patch.
diff --git a/third_party/tlslite/google.patch b/third_party/tlslite/chromium.patch
index 94afa20..94afa20 100644
--- a/third_party/tlslite/google.patch
+++ b/third_party/tlslite/chromium.patch
diff --git a/third_party/yasm/README.chromium b/third_party/yasm/README.chromium
index e662061..fe0113c 100644
--- a/third_party/yasm/README.chromium
+++ b/third_party/yasm/README.chromium
@@ -1,3 +1,7 @@
+Name: yasm
+URL: http://www.tortall.net/projects/yasm/
+License File: source/patched-yasm/COPYING
+
See also the yasm.gyp file for a description of the yasm build process.
Instructions for recreating the yasm.gyp file.
diff --git a/third_party/zlib/LICENSE b/third_party/zlib/LICENSE
new file mode 100644
index 0000000..23e5e69
--- /dev/null
+++ b/third_party/zlib/LICENSE
@@ -0,0 +1,25 @@
+/* zlib.h -- interface of the 'zlib' general purpose compression library
+ version 1.2.4, March 14th, 2010
+
+ Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Jean-loup Gailly
+ Mark Adler
+
+*/
diff --git a/third_party/zlib/README.chromium b/third_party/zlib/README.chromium
index aa35c1f..d174a4c 100644
--- a/third_party/zlib/README.chromium
+++ b/third_party/zlib/README.chromium
@@ -1,7 +1,6 @@
Name: zlib
URL: http://zlib.net/
Version: 1.2.3
-License: zlib
Description:
General purpose compression library