diff options
| -rw-r--r-- | mojo/public/third_party/ply/README.chromium | 2 | ||||
| -rw-r--r-- | mojo/public/third_party/ply/__init__.py | 32 | ||||
| -rw-r--r-- | mojo/public/third_party/ply/license.patch | 41 | ||||
| -rw-r--r-- | third_party/ply/README.chromium | 2 | ||||
| -rw-r--r-- | third_party/ply/__init__.py | 32 | ||||
| -rw-r--r-- | third_party/ply/license.patch | 41 | ||||
| -rwxr-xr-x | tools/checklicenses/checklicenses.py | 6 |
7 files changed, 148 insertions, 8 deletions
diff --git a/mojo/public/third_party/ply/README.chromium b/mojo/public/third_party/ply/README.chromium index 4b5b094..6466e54 100644 --- a/mojo/public/third_party/ply/README.chromium +++ b/mojo/public/third_party/ply/README.chromium @@ -18,4 +18,4 @@ The license is in LICENSE. Modifications made with initial commit: - Added the file README.chromium (this file) - +- Applies license.patch diff --git a/mojo/public/third_party/ply/__init__.py b/mojo/public/third_party/ply/__init__.py index 853a985..f3da03e 100644 --- a/mojo/public/third_party/ply/__init__.py +++ b/mojo/public/third_party/ply/__init__.py @@ -1,4 +1,36 @@ # PLY package # Author: David Beazley (dave@dabeaz.com) +# ----------------------------------------------------------------------------- +# ply: yacc.py +# +# Copyright (C) 2001-2011, +# David M. Beazley (Dabeaz LLC) +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright notice, +# this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the following disclaimer in the documentation +# and/or other materials provided with the distribution. +# * Neither the name of the David Beazley or Dabeaz LLC may be used to +# endorse or promote products derived from this software without +# specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# ----------------------------------------------------------------------------- __all__ = ['lex','yacc'] diff --git a/mojo/public/third_party/ply/license.patch b/mojo/public/third_party/ply/license.patch new file mode 100644 index 0000000..a83f642 --- /dev/null +++ b/mojo/public/third_party/ply/license.patch @@ -0,0 +1,41 @@ +diff --git a/mojo/public/third_party/ply/__init__.py b/mojo/public/third_party/ply/__init__.py +index 853a985..f3da03e 100644 +--- a/mojo/public/third_party/ply/__init__.py ++++ b/mojo/public/third_party/ply/__init__.py +@@ -1,4 +1,36 @@ + # PLY package + # Author: David Beazley (dave@dabeaz.com) ++# ----------------------------------------------------------------------------- ++# ply: yacc.py ++# ++# Copyright (C) 2001-2011, ++# David M. Beazley (Dabeaz LLC) ++# All rights reserved. ++# ++# Redistribution and use in source and binary forms, with or without ++# modification, are permitted provided that the following conditions are ++# met: ++# ++# * Redistributions of source code must retain the above copyright notice, ++# this list of conditions and the following disclaimer. ++# * Redistributions in binary form must reproduce the above copyright notice, ++# this list of conditions and the following disclaimer in the documentation ++# and/or other materials provided with the distribution. ++# * Neither the name of the David Beazley or Dabeaz LLC may be used to ++# endorse or promote products derived from this software without ++# specific prior written permission. ++# ++# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ++# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ++# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR ++# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT ++# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, ++# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT ++# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, ++# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ++# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ++# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++# ----------------------------------------------------------------------------- + + __all__ = ['lex','yacc'] diff --git a/third_party/ply/README.chromium b/third_party/ply/README.chromium index 4b5b094..6466e54 100644 --- a/third_party/ply/README.chromium +++ b/third_party/ply/README.chromium @@ -18,4 +18,4 @@ The license is in LICENSE. Modifications made with initial commit: - Added the file README.chromium (this file) - +- Applies license.patch diff --git a/third_party/ply/__init__.py b/third_party/ply/__init__.py index 853a985..f3da03e 100644 --- a/third_party/ply/__init__.py +++ b/third_party/ply/__init__.py @@ -1,4 +1,36 @@ # PLY package # Author: David Beazley (dave@dabeaz.com) +# ----------------------------------------------------------------------------- +# ply: yacc.py +# +# Copyright (C) 2001-2011, +# David M. Beazley (Dabeaz LLC) +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright notice, +# this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the following disclaimer in the documentation +# and/or other materials provided with the distribution. +# * Neither the name of the David Beazley or Dabeaz LLC may be used to +# endorse or promote products derived from this software without +# specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# ----------------------------------------------------------------------------- __all__ = ['lex','yacc'] diff --git a/third_party/ply/license.patch b/third_party/ply/license.patch new file mode 100644 index 0000000..7b2621f --- /dev/null +++ b/third_party/ply/license.patch @@ -0,0 +1,41 @@ +diff --git a/third_party/ply/__init__.py b/third_party/ply/__init__.py +index 853a985..f3da03e 100644 +--- a/third_party/ply/__init__.py ++++ b/third_party/ply/__init__.py +@@ -1,4 +1,36 @@ + # PLY package + # Author: David Beazley (dave@dabeaz.com) ++# ----------------------------------------------------------------------------- ++# ply: yacc.py ++# ++# Copyright (C) 2001-2011, ++# David M. Beazley (Dabeaz LLC) ++# All rights reserved. ++# ++# Redistribution and use in source and binary forms, with or without ++# modification, are permitted provided that the following conditions are ++# met: ++# ++# * Redistributions of source code must retain the above copyright notice, ++# this list of conditions and the following disclaimer. ++# * Redistributions in binary form must reproduce the above copyright notice, ++# this list of conditions and the following disclaimer in the documentation ++# and/or other materials provided with the distribution. ++# * Neither the name of the David Beazley or Dabeaz LLC may be used to ++# endorse or promote products derived from this software without ++# specific prior written permission. ++# ++# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ++# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ++# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR ++# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT ++# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, ++# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT ++# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, ++# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ++# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ++# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++# ----------------------------------------------------------------------------- + + __all__ = ['lex','yacc'] diff --git a/tools/checklicenses/checklicenses.py b/tools/checklicenses/checklicenses.py index 691d009..77db75b 100755 --- a/tools/checklicenses/checklicenses.py +++ b/tools/checklicenses/checklicenses.py @@ -124,9 +124,6 @@ PATH_SPECIFIC_WHITELISTED_LICENSES = { 'courgette/third_party/bsdiff_create.cc': [ # http://crbug.com/98095 'UNKNOWN', ], - 'mojo/public/third_party/ply/__init__.py': [ - 'UNKNOWN', - ], 'native_client': [ # http://crbug.com/98099 'UNKNOWN', ], @@ -288,9 +285,6 @@ PATH_SPECIFIC_WHITELISTED_LICENSES = { 'third_party/ocmock/OCMock': [ # http://crbug.com/98454 'UNKNOWN', ], - 'third_party/ply/__init__.py': [ - 'UNKNOWN', - ], 'third_party/protobuf': [ # http://crbug.com/98455 'UNKNOWN', ], |