19877233 ply should hookup its tests
authorYiteng Zhang <yiteng.zhang@oracle.com>
Thu, 19 Nov 2015 11:19:15 -0800
changeset 5109 5d341c4a6b80
parent 5108 0546c7178c66
child 5110 92c73cda9414
19877233 ply should hookup its tests 19931836 "gmake test" failures for python/jsonrpclib 20745110 jsonrpclib can now deliver a Python 3.x package 21911841 update pycurl and deliver a Python 3.x package 21912037 update ply to version 3.7 and deliver a Python 3.x package 21985306 update coverage to version 4.0.1 and deliver its Python 3.x package 22067764 update CherryPy to version 3.8.0 and deliver a Python 3.x package
components/python/cherrypy/Makefile
components/python/cherrypy/cherrypy-PYVER.p5m
components/python/cherrypy/cherrypy.copyright
components/python/cherrypy/patches/cp-ticket-1386.patch
components/python/cherrypy/patches/cp-ticket-847.patch
components/python/cov-core/Makefile
components/python/coverage/Makefile
components/python/coverage/coverage-PYVER.p5m
components/python/coverage/coverage.copyright
components/python/coverage/jquery.copyright
components/python/coverage/jquery.isonscreen.copyright
components/python/jsonrpclib/Makefile
components/python/jsonrpclib/jsonrpclib-PYVER.p5m
components/python/jsonrpclib/patches/python-issue-4978-workaround.patch
components/python/jsonrpclib/test/results-all.master
components/python/lesscpy/Makefile
components/python/nose-cover3/Makefile
components/python/ply/Makefile
components/python/ply/ply-PYVER.p5m
components/python/ply/ply.license
components/python/ply/test/results-all.master
components/python/pycurl/Makefile
components/python/pycurl/patches/pycurl-mondo.patch
components/python/pycurl/pycurl-GENFRAG.p5m
components/python/pycurl/pycurl.copyright
--- a/components/python/cherrypy/Makefile	Thu Nov 19 04:51:49 2015 -0800
+++ b/components/python/cherrypy/Makefile	Thu Nov 19 11:19:15 2015 -0800
@@ -25,22 +25,19 @@
 PATH=/usr/bin:/usr/gnu/bin:/usr/sbin
 
 COMPONENT_NAME=		CherryPy
-COMPONENT_VERSION=	3.1.2
+COMPONENT_VERSION=	3.8.0
 COMPONENT_PROJECT_URL=	http://www.cherrypy.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:0dfd65507b047d54c09849e7a4b8bdd3616fa8776a5dbff7697cbf6ea1559bf6
+    sha256:ffcdb43667d4098247efaf8c82dd36d3dd4f8e5dc768ef5e90b480899e523bea
 COMPONENT_ARCHIVE_URL=	$(call pypi_url)
 COMPONENT_BUGDB=	python-mod/cherrypy
 
-TPNO=			5881
+TPNO=			25174
 
 PATCH_LEVEL=0
 
-# This module is not Python 3 ready: syntax issues.
-PYTHON_VERSIONS = $(PYTHON2_VERSIONS)
-
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/setup.py.mk
 include $(WS_MAKE_RULES)/ips.mk
@@ -50,13 +47,24 @@
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
+COMPONENT_TEST_DIR = 	$(SOURCE_DIR)/cherrypy/test
+COMPONENT_TEST_CMD =	nosetests -s ./
+COMPONENT_TEST_ARGS = 
+
 # common targets
 build:		$(BUILD_NO_ARCH)
 
 install:	$(INSTALL_NO_ARCH)
 
-test:		$(NO_TESTS)
+# test are not clean, so not appropriate to run at top level
+$(SKIP_TEST_AT_TOP_LEVEL)
 
-system-test:    $(NO_TESTS)
+# The test requires some interactive selections from the users to continue,
+# otherwise it'll hang.
+# Ran 246 tests, 3 skipped, 3 failures 
+# FAIL: test_598, test_queue_full, test_2_File_Concurrency
+test:		$(TEST_NO_ARCH)
+
+system-test:    $(SYSTEM_TESTS_NOT_IMPLEMENTED)
 
 REQUIRED_PACKAGES += system/core-os
--- a/components/python/cherrypy/cherrypy-PYVER.p5m	Thu Nov 19 04:51:49 2015 -0800
+++ b/components/python/cherrypy/cherrypy-PYVER.p5m	Thu Nov 19 11:19:15 2015 -0800
@@ -41,16 +41,23 @@
 link path=usr/bin/cherryd target=cherryd$(PYVER) mediator=python \
     mediator-version=$(PYVER)
 file path=usr/bin/cherryd$(PYVER)
-file path=usr/lib/python$(PYVER)/vendor-packages/CherryPy-$(COMPONENT_VERSION)-py$(PYVER).egg-info
+file path=usr/lib/python$(PYVER)/vendor-packages/CherryPy-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
+file path=usr/lib/python$(PYVER)/vendor-packages/CherryPy-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/CherryPy-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/CherryPy-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/LICENSE.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/_cpcgifs.py
+file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/__main__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/_cpchecker.py
+file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/_cpcompat.py
+$(PYTHON_2.7_ONLY)file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/_cpcompat_subprocess.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/_cpconfig.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/_cpdispatch.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/_cperror.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/_cplogging.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/_cpmodpy.py
+file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/_cpnative_server.py
+file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/_cpreqbody.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/_cprequest.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/_cpserver.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/_cpthreadinglocal.py
@@ -59,28 +66,40 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/_cpwsgi.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/_cpwsgi_server.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/cherryd mode=0555
+file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/daemon.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/favicon.ico
 file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/lib/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/lib/auth.py
+file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/lib/auth_basic.py
+file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/lib/auth_digest.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/lib/caching.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/lib/covercp.py
+file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/lib/cpstats.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/lib/cptools.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/lib/encoding.py
+file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/lib/gctools.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/lib/http.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/lib/httpauth.py
+file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/lib/httputil.py
+file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/lib/jsontools.py
+file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/lib/lockfile.py
+file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/lib/locking.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/lib/profiler.py
-file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/lib/safemime.py
+file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/lib/reprconf.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/lib/sessions.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/lib/static.py
-file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/lib/tidy.py
-file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/lib/wsgiapp.py
-file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/lib/xmlrpc.py
+file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/lib/xmlrpcutil.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/process/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/process/plugins.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/process/servers.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/process/win32.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/process/wspbus.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/wsgiserver/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/wsgiserver/ssl_builtin.py
+$(PYTHON_2.7_ONLY)file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/wsgiserver/ssl_pyopenssl.py
+$(PYTHON_2.7_ONLY)file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/wsgiserver/wsgiserver2.py
+$(PYTHON_3.4_ONLY)file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/wsgiserver/wsgiserver3.py
+$(PYTHON_3.5_ONLY)file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/wsgiserver/wsgiserver3.py
 #
 license cherrypy.copyright license=BSD
 
--- a/components/python/cherrypy/cherrypy.copyright	Thu Nov 19 04:51:49 2015 -0800
+++ b/components/python/cherrypy/cherrypy.copyright	Thu Nov 19 11:19:15 2015 -0800
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2007, CherryPy Team ([email protected])
+Copyright (c) 2004-2015, CherryPy Team ([email protected])
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cherrypy/patches/cp-ticket-1386.patch	Thu Nov 19 11:19:15 2015 -0800
@@ -0,0 +1,61 @@
+# This issue has been offered to upstream but not be accepted yet.
+# Please see https://bitbucket.org/cherrypy/cherrypy/issues/1386/parse_request_uri-incorrectly-parses-uri
+
+diff -r 252fccc270d4 cherrypy/wsgiserver/wsgiserver2.py
+--- cherrypy/wsgiserver/wsgiserver2.py	Tue Sep 01 12:23:22 2015 +0100
++++ cherrypy/wsgiserver/wsgiserver2.py	Thu Oct 22 23:16:55 2015 -0700
[email protected]@ -125,6 +125,7 @@
+ import operator
+ 
+ from urllib import unquote
++from urlparse import urlparse
+ import warnings
+ 
+ if sys.version_info >= (3, 0):
[email protected]@ -835,15 +836,12 @@
+         if uri == ASTERISK:
+             return None, None, uri
+ 
+-        i = uri.find('://')
+-        if i > 0 and QUESTION_MARK not in uri[:i]:
++        scheme, authority, path, params, query, fragment = urlparse(uri)
++        if scheme and QUESTION_MARK not in scheme:
+             # An absoluteURI.
+             # If there's a scheme (and it must be http or https), then:
+             # http_URL = "http:" "//" host [ ":" port ] [ abs_path [ "?" query
+             # ]]
+-            scheme, remainder = uri[:i].lower(), uri[i + 3:]
+-            authority, path = remainder.split(FORWARD_SLASH, 1)
+-            path = FORWARD_SLASH + path
+             return scheme, authority, path
+ 
+         if uri.startswith(FORWARD_SLASH):
+diff -r 252fccc270d4 cherrypy/wsgiserver/wsgiserver3.py
+--- cherrypy/wsgiserver/wsgiserver3.py	Tue Sep 01 12:23:22 2015 +0100
++++ cherrypy/wsgiserver/wsgiserver3.py	Thu Oct 22 23:16:55 2015 -0700
[email protected]@ -100,6 +100,7 @@
+ import threading
+ import time
+ from traceback import format_exc
++from urllib.parse import urlparse
+ 
+ if sys.version_info >= (3, 0):
+     bytestr = bytes
[email protected]@ -813,14 +814,13 @@
+         if uri == ASTERISK:
+             return None, None, uri
+ 
+-        scheme, sep, remainder = uri.partition(b'://')
+-        if sep and QUESTION_MARK not in scheme:
++        scheme, authority, path, params, query, fragment = urlparse(uri)
++        if scheme and QUESTION_MARK not in scheme:
+             # An absoluteURI.
+             # If there's a scheme (and it must be http or https), then:
+             # http_URL = "http:" "//" host [ ":" port ] [ abs_path [ "?" query
+             # ]]
+-            authority, path_a, path_b = remainder.partition(FORWARD_SLASH)
+-            return scheme.lower(), authority, path_a + path_b
++            return scheme, authority, path
+ 
+         if uri.startswith(FORWARD_SLASH):
+             # An abs_path.
--- a/components/python/cherrypy/patches/cp-ticket-847.patch	Thu Nov 19 04:51:49 2015 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-Index: cherrypy/wsgiserver/__init__.py
-===================================================================
---- cherrypy/wsgiserver/__init__.py	(revision 2459)
-+++ cherrypy/wsgiserver/__init__.py	(working copy)
[email protected]@ -291,6 +291,7 @@
-         self.wsgi_app = wsgi_app
-         
-         self.ready = False
-+        self.started_request = False
-         self.started_response = False
-         self.status = ""
-         self.outheaders = []
[email protected]@ -318,6 +319,9 @@
-         # (although your TCP stack might suffer for it: cf Apache's history
-         # with FIN_WAIT_2).
-         request_line = self.rfile.readline()
-+        # Set started_request to True so communicate() knows to send 408
-+        # from here on out.
-+        self.started_request = True
-         if not request_line:
-             # Force self.ready = False so the connection will close.
-             self.ready = False
[email protected]@ -1169,6 +1173,9 @@
-                 # This order of operations should guarantee correct pipelining.
-                 req.parse_request()
-                 if not req.ready:
-+                    # Something went wrong in the parsing (and the server has
-+                    # probably already made a simple response). Return and
-+                    # let the conn close.
-                     return
-                 
-                 req.respond()
[email protected]@ -1178,7 +1185,10 @@
-         except socket.error, e:
-             errnum = e.args[0]
-             if errnum == 'timed out':
--                if req and not req.sent_headers:
-+                # Don't send a 408 if there is no oustanding request; only
-+                # if we're in the middle of a request.
-+                # See http://www.cherrypy.org/ticket/853
-+                if req and req.started_request and not req.sent_headers:
-                     req.simple_response("408 Request Timeout")
-             elif errnum not in socket_errors_to_ignore:
-                 if req and not req.sent_headers:
--- a/components/python/cov-core/Makefile	Thu Nov 19 04:51:49 2015 -0800
+++ b/components/python/cov-core/Makefile	Thu Nov 19 11:19:15 2015 -0800
@@ -34,9 +34,6 @@
 
 TPNO=			14503
 
-# Depends on coverage, which is not Python 3 ready.
-PYTHON_VERSIONS=	$(PYTHON2_VERSIONS)
-
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/setup.py.mk
 include $(WS_MAKE_RULES)/ips.mk
--- a/components/python/coverage/Makefile	Thu Nov 19 04:51:49 2015 -0800
+++ b/components/python/coverage/Makefile	Thu Nov 19 11:19:15 2015 -0800
@@ -26,21 +26,16 @@
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		coverage
-COMPONENT_VERSION=	3.5
+COMPONENT_VERSION=	4.0.1
 COMPONENT_PROJECT_URL=	http://nedbatchelder.com/code/coverage/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:b181d5ec72baf7478942fd600503d9f32bb525cfca413b1c73ebfa7ff1b95ae9
-COMPONENT_ARCHIVE_URL=	http://pypi.python.org/packages/source/c/coverage/$(COMPONENT_ARCHIVE)
+    sha256:bc10f57a83863e8ca8916f763f13b4b249e2f85b553df3958281cb7f4f402d5b
+COMPONENT_ARCHIVE_URL=	$(call pypi_url)
 COMPONENT_BUGDB=	python-mod/coverage
 
-TPNO=			10021
-
-# Not Python 3 ready: weird build issues (tries to download & install
-# "distribute").  But coverage version 3.7.1 has fixed these issues; it
-# builds and publishes fine with Python 3.
-PYTHON_VERSIONS = $(PYTHON2_VERSIONS)
+TPNO=			25051
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/setup.py.mk
@@ -56,10 +51,13 @@
 
 install:	$(INSTALL_32_and_64)
 
+# test requires PyContracts and gevent which haven't been integrated yet.
 test:		$(NO_TESTS)
 
 system-test:    $(NO_TESTS)
 
 
 REQUIRED_PACKAGES += library/python/setuptools-27
+REQUIRED_PACKAGES += library/python/setuptools-34
+REQUIRED_PACKAGES += library/python/setuptools-35
 REQUIRED_PACKAGES += system/library
--- a/components/python/coverage/coverage-PYVER.p5m	Thu Nov 19 04:51:49 2015 -0800
+++ b/components/python/coverage/coverage-PYVER.p5m	Thu Nov 19 11:19:15 2015 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -52,43 +52,50 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/coverage/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/coverage/__main__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/coverage/annotate.py
+file path=usr/lib/python$(PYVER)/vendor-packages/coverage/backunittest.py
 file path=usr/lib/python$(PYVER)/vendor-packages/coverage/backward.py
 file path=usr/lib/python$(PYVER)/vendor-packages/coverage/bytecode.py
 file path=usr/lib/python$(PYVER)/vendor-packages/coverage/cmdline.py
-file path=usr/lib/python$(PYVER)/vendor-packages/coverage/codeunit.py
 file path=usr/lib/python$(PYVER)/vendor-packages/coverage/collector.py
 file path=usr/lib/python$(PYVER)/vendor-packages/coverage/config.py
 file path=usr/lib/python$(PYVER)/vendor-packages/coverage/control.py
 file path=usr/lib/python$(PYVER)/vendor-packages/coverage/data.py
+file path=usr/lib/python$(PYVER)/vendor-packages/coverage/debug.py
+file path=usr/lib/python$(PYVER)/vendor-packages/coverage/env.py
 file path=usr/lib/python$(PYVER)/vendor-packages/coverage/execfile.py
 file path=usr/lib/python$(PYVER)/vendor-packages/coverage/files.py
 file path=usr/lib/python$(PYVER)/vendor-packages/coverage/html.py
 file path=usr/lib/python$(PYVER)/vendor-packages/coverage/htmlfiles/coverage_html.js
 file path=usr/lib/python$(PYVER)/vendor-packages/coverage/htmlfiles/index.html
-file path=usr/lib/python$(PYVER)/vendor-packages/coverage/htmlfiles/jquery-1.4.3.min.js
+file path=usr/lib/python$(PYVER)/vendor-packages/coverage/htmlfiles/jquery.debounce.min.js
 file path=usr/lib/python$(PYVER)/vendor-packages/coverage/htmlfiles/jquery.hotkeys.js
 file path=usr/lib/python$(PYVER)/vendor-packages/coverage/htmlfiles/jquery.isonscreen.js
+file path=usr/lib/python$(PYVER)/vendor-packages/coverage/htmlfiles/jquery.min.js
 file path=usr/lib/python$(PYVER)/vendor-packages/coverage/htmlfiles/jquery.tablesorter.min.js
 file path=usr/lib/python$(PYVER)/vendor-packages/coverage/htmlfiles/keybd_closed.png
 file path=usr/lib/python$(PYVER)/vendor-packages/coverage/htmlfiles/keybd_open.png
 file path=usr/lib/python$(PYVER)/vendor-packages/coverage/htmlfiles/pyfile.html
 file path=usr/lib/python$(PYVER)/vendor-packages/coverage/htmlfiles/style.css
 file path=usr/lib/python$(PYVER)/vendor-packages/coverage/misc.py
+file path=usr/lib/python$(PYVER)/vendor-packages/coverage/monkey.py
 file path=usr/lib/python$(PYVER)/vendor-packages/coverage/parser.py
 file path=usr/lib/python$(PYVER)/vendor-packages/coverage/phystokens.py
+file path=usr/lib/python$(PYVER)/vendor-packages/coverage/pickle2json.py
+file path=usr/lib/python$(PYVER)/vendor-packages/coverage/plugin.py
+file path=usr/lib/python$(PYVER)/vendor-packages/coverage/plugin_support.py
+file path=usr/lib/python$(PYVER)/vendor-packages/coverage/python.py
+file path=usr/lib/python$(PYVER)/vendor-packages/coverage/pytracer.py
 file path=usr/lib/python$(PYVER)/vendor-packages/coverage/report.py
 file path=usr/lib/python$(PYVER)/vendor-packages/coverage/results.py
 file path=usr/lib/python$(PYVER)/vendor-packages/coverage/summary.py
 file path=usr/lib/python$(PYVER)/vendor-packages/coverage/templite.py
+file path=usr/lib/python$(PYVER)/vendor-packages/coverage/test_helpers.py
 file path=usr/lib/python$(PYVER)/vendor-packages/coverage/tracer.so
+file path=usr/lib/python$(PYVER)/vendor-packages/coverage/version.py
 file path=usr/lib/python$(PYVER)/vendor-packages/coverage/xmlreport.py
 #
-license coverage.copyright license=BSD
-# the packaging software treats the license= attribute as the key, so
-# we need to name them differently or the tools will fail to deal with
-# the fact that they are really different license files.
-license jquery.copyright license=MIT-1
-license jquery.isonscreen.copyright license=MIT-2
+license coverage.copyright license="Apache v2.0"
+license jquery.copyright license=MIT
 
 # force the rename with an optional dependency on the old name
 depend type=optional \
--- a/components/python/coverage/coverage.copyright	Thu Nov 19 04:51:49 2015 -0800
+++ b/components/python/coverage/coverage.copyright	Thu Nov 19 11:19:15 2015 -0800
@@ -1,29 +1,193 @@
 Copyright 2001 Gareth Rees.  All rights reserved.
-Copyright 2004-2011 Ned Batchelder.  All rights reserved.
+Copyright 2004-2015 Ned Batchelder.  All rights reserved.
+
+Except where noted otherwise, this software is licensed under the Apache
+License, Version 2.0 (the "License"); you may not use this work except in
+compliance with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+==========================================================================
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
 
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
 
-2. 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.
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
 
-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
-HOLDERS AND 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.
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
 
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
 
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
--- a/components/python/coverage/jquery.copyright	Thu Nov 19 04:51:49 2015 -0800
+++ b/components/python/coverage/jquery.copyright	Thu Nov 19 11:19:15 2015 -0800
@@ -1,4 +1,7 @@
-Copyright (c) 2011 John Resig, http://jquery.com/
+Copyright (c) 2005, 2014 jQuery Foundation, Inc.
+Copyright © 2010 "Cowboy" Ben Alman
+Copyright (c) 2010 John Resig
+Copyright (c) 2010 Laurence Wheway 
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -18,5 +21,3 @@
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
--- a/components/python/coverage/jquery.isonscreen.copyright	Thu Nov 19 04:51:49 2015 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-Copyright (c) 2010 Laurence Wheway 
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--- a/components/python/jsonrpclib/Makefile	Thu Nov 19 04:51:49 2015 -0800
+++ b/components/python/jsonrpclib/Makefile	Thu Nov 19 11:19:15 2015 -0800
@@ -26,21 +26,19 @@
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		jsonrpclib
-COMPONENT_VERSION=	0.1.3
-COMPONENT_HASH=		e3a3cde
-COMPONENT_PROJECT_URL=	https://github.com/joshmarshall/jsonrpclib
-COMPONENT_SRC=		joshmarshall-jsonrpclib-$(COMPONENT_HASH)
-COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_VERSION=	0.2.6
+COMPONENT_PROJECT_URL=	https://github.com/tcalmant/jsonrpclib
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	v$(COMPONENT_VERSION).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:1480f0f189250d46552e29d2a6f04f5b92788ffd9b8f51d06fdaeee03aa2d8bb
-COMPONENT_ARCHIVE_URL=https://github.com/joshmarshall/jsonrpclib/tarball/$(COMPONENT_HASH)
+    sha256:17acc9f89f74fd9f4a22b2fe4bd26a97a7fe68a5ea0a9bd506fb96685cb0fed2
+COMPONENT_ARCHIVE_URL=https://github.com/tcalmant/jsonrpclib/archive/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	python-mod/jsonrpclib
 
-TPNO=			8061
+TPNO=			24886
 
-# This module builds with Python 3, but depends on simplejson.  The following
-# line can be removed when simplejson supports Python 3.
-PYTHON_VERSIONS=	$(PYTHON2_VERSIONS)
+# upstream not Python 3.5 ready
+PYTHON_VERSIONS=	$(PYTHON2_VERSIONS) 3.4
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/setup.py.mk
@@ -49,13 +47,20 @@
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
 COMPONENT_TEST_DIR=	$(COMPONENT_SRC)
-COMPONENT_TEST_ARGS=	tests.py
+COMPONENT_TEST_CMD= /usr/bin/nosetests
+COMPONENT_TEST_ARGS = tests
+COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master
+
+COMPONENT_TEST_TRANSFORMS += \
+    '-e "s|\(127.0.0.1\).*|\1|" ' \
+    '-e "s|\(^Ran 51 tests in\).*|\1|" '
 
 # common targets
 build:		$(BUILD_NO_ARCH)
 
 install:	$(INSTALL_NO_ARCH)
 
+# Ran 51 tests, OK.
 test:		$(TEST_NO_ARCH)
 
 system-test:    $(SYSTEM_TESTS_NOT_IMPLEMENTED)
--- a/components/python/jsonrpclib/jsonrpclib-PYVER.p5m	Thu Nov 19 04:51:49 2015 -0800
+++ b/components/python/jsonrpclib/jsonrpclib-PYVER.p5m	Thu Nov 19 11:19:15 2015 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -34,17 +34,27 @@
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream value="Josh Marshall <[email protected]>"
+set name=info.upstream \
+    value="Josh Marshall <[email protected]>, Thomas Calmant<[email protected]>"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2012/198
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file path=usr/lib/python$(PYVER)/vendor-packages/jsonrpclib-$(COMPONENT_VERSION)-py$(PYVER).egg-info
-file path=usr/lib/python$(PYVER)/vendor-packages/jsonrpclib/SimpleJSONRPCServer.py
+file \
+    path=usr/lib/python$(PYVER)/vendor-packages/jsonrpclib/SimpleJSONRPCServer.py \
+    pkg.depend.bypass-generate=.*
 file path=usr/lib/python$(PYVER)/vendor-packages/jsonrpclib/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/jsonrpclib/config.py
 file path=usr/lib/python$(PYVER)/vendor-packages/jsonrpclib/history.py
 file path=usr/lib/python$(PYVER)/vendor-packages/jsonrpclib/jsonclass.py
-file path=usr/lib/python$(PYVER)/vendor-packages/jsonrpclib/jsonrpc.py
+file path=usr/lib/python$(PYVER)/vendor-packages/jsonrpclib/jsonrpc.py \
+    pkg.depend.bypass-generate=.*
+file path=usr/lib/python$(PYVER)/vendor-packages/jsonrpclib/threadpool.py \
+    pkg.depend.bypass-generate=.*Queue.* pkg.depend.bypass-generate=.*queue.*
+file path=usr/lib/python$(PYVER)/vendor-packages/jsonrpclib/utils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/jsonrpclib_pelix-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
+file path=usr/lib/python$(PYVER)/vendor-packages/jsonrpclib_pelix-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/jsonrpclib_pelix-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/jsonrpclib_pelix-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
 license jsonrpclib.license license="Apache v2.0"
 
 # force the rename with an optional dependency on the old name
--- a/components/python/jsonrpclib/patches/python-issue-4978-workaround.patch	Thu Nov 19 04:51:49 2015 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-*** joshmarshall-jsonrpclib-e3a3cde/jsonrpclib/jsonrpc.py.orig	Thu Dec 15 09:46:35 2011
---- joshmarshall-jsonrpclib-e3a3cde/jsonrpclib/jsonrpc.py	Thu Dec 15 09:48:42 2011
-***************
-*** 69,81 ****
-  except ImportError:
-      try:
-!         import json
-      except ImportError:
-!         try:
-!             import simplejson as json
-!         except ImportError:
-!             raise ImportError(
-!                 'You must have the cjson, json, or simplejson ' +
-!                 'module(s) available.'
-!             )
-  
-  IDCHARS = string.ascii_lowercase+string.digits
---- 69,81 ----
-  except ImportError:
-      try:
-!         # use simplejson since it doesn't encode strings as unicode, which
-!         # allows us to avoid python issue 4978.  (4978 causes json rpc calls
-!         # using keword parameters to fail.)
-!         import simplejson as json
-      except ImportError:
-!         raise ImportError(
-!             'You must have the cjson or simplejson ' +
-!             'module(s) available.'
-!         )
-  
-  IDCHARS = string.ascii_lowercase+string.digits
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/jsonrpclib/test/results-all.master	Thu Nov 19 11:19:15 2015 -0800
@@ -0,0 +1,49 @@
+....................................127.0.0.1
+127.0.0.1
+127.0.0.1
+127.0.0.1
+127.0.0.1
+127.0.0.1
+127.0.0.1
+127.0.0.1
+127.0.0.1
+127.0.0.1
+Exception in thread Thread-31:
+Traceback (most recent call last):
+  File "/usr/lib/python2.7/threading.py", line 810, in __bootstrap_inner
+    self.run()
+  File "/usr/lib/python2.7/threading.py", line 763, in run
+    self.__target(*self.__args, **self.__kwargs)
+  File "/usr/lib/python2.7/SocketServer.py", line 236, in serve_forever
+    poll_interval)
+  File "/usr/lib/python2.7/SocketServer.py", line 155, in _eintr_retry
+    return func(*args)
+error: (9, 'Bad file number')
+
+.127.0.0.1
+127.0.0.1
+127.0.0.1
+127.0.0.1
+127.0.0.1
+127.0.0.1
+127.0.0.1
+127.0.0.1
+127.0.0.1
+127.0.0.1
+Exception in thread Thread-32:
+Traceback (most recent call last):
+  File "/usr/lib/python2.7/threading.py", line 810, in __bootstrap_inner
+    self.run()
+  File "/usr/lib/python2.7/threading.py", line 763, in run
+    self.__target(*self.__args, **self.__kwargs)
+  File "/usr/lib/python2.7/SocketServer.py", line 236, in serve_forever
+    poll_interval)
+  File "/usr/lib/python2.7/SocketServer.py", line 155, in _eintr_retry
+    return func(*args)
+error: (9, 'Bad file number')
+
+..............
+----------------------------------------------------------------------
+Ran 51 tests in
+
+OK
--- a/components/python/lesscpy/Makefile	Thu Nov 19 04:51:49 2015 -0800
+++ b/components/python/lesscpy/Makefile	Thu Nov 19 11:19:15 2015 -0800
@@ -34,7 +34,8 @@
 
 TPNO=			16108
 
-# Depends on ply which is not Python 3 ready.
+# Depends on ply, which is now Python 3 ready, but further testing is needed
+# to determine if lesscpy can deliver 3.x package.
 PYTHON_VERSIONS=	$(PYTHON2_VERSIONS)
 
 # convert the 'j' in COMPONENT_VERSION to 10
--- a/components/python/nose-cover3/Makefile	Thu Nov 19 04:51:49 2015 -0800
+++ b/components/python/nose-cover3/Makefile	Thu Nov 19 11:19:15 2015 -0800
@@ -34,9 +34,6 @@
 
 TPNO=			14503
 
-# Depends on coverage, which is not Python 3 ready.
-PYTHON_VERSIONS=	$(PYTHON2_VERSIONS)
-
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/setup.py.mk
 include $(WS_MAKE_RULES)/ips.mk
--- a/components/python/ply/Makefile	Thu Nov 19 04:51:49 2015 -0800
+++ b/components/python/ply/Makefile	Thu Nov 19 11:19:15 2015 -0800
@@ -25,19 +25,19 @@
 PATH=/usr/bin:/usr/gnu/bin:/usr/sbin
 
 COMPONENT_NAME=		ply
-COMPONENT_VERSION=	3.1
+COMPONENT_VERSION=	3.7
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:436461f455d83292bb9c2cd89ce02414de1421a2023628b94666bc5f71b0128b
+    sha256:f85fb7b44c1c9a04873e6d76fa2c2eef43f2cfd81468aa714a9c63af7ae0af80
 COMPONENT_ARCHIVE_URL=	http://www.dabeaz.com/ply/$(COMPONENT_ARCHIVE)
 COMPONENT_PROJECT_URL=  http://www.dabeaz.com/ply/
 COMPONENT_BUGDB=	python-mod/ply
 
-TPNO=			10013
+TPNO=			24766
 
-# Syntax issues: not Python 3 ready.
-PYTHON_VERSIONS=	$(PYTHON2_VERSIONS)
+# not Python 3.5 ready; test fail
+PYTHON_VERSIONS=	$(PYTHON2_VERSIONS) 3.4
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/setup.py.mk
@@ -45,12 +45,22 @@
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
+COMPONENT_TEST_ENV = PYTHONPATH=$(PROTO_DIR)/$(PYTHON_LIB)
+COMPONENT_TEST_CMD = $(PYTHON) testlex.py; \
+                     $(PYTHON) testyacc.py
+COMPONENT_TEST_ARGS=
+COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master
+
+COMPONENT_TEST_TRANSFORMS += \
+    '-e "s|\(^Ran 42 tests\).*|\1|" '
+
 # common targets
 build:		$(BUILD_NO_ARCH)
 
 install:	$(INSTALL_NO_ARCH)
 
-test:		$(NO_TESTS)
+# Run 42 tests, OK.
+test:		$(TEST_NO_ARCH)
 
-system-test:    $(NO_TESTS)
+system-test:    $(SYSTEM_TESTS_NOT_IMPLEMENTED)
 
--- a/components/python/ply/ply-PYVER.p5m	Thu Nov 19 04:51:49 2015 -0800
+++ b/components/python/ply/ply-PYVER.p5m	Thu Nov 19 11:19:15 2015 -0800
@@ -47,7 +47,7 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/ply/lex.py
 file path=usr/lib/python$(PYVER)/vendor-packages/ply/yacc.py
 #
-license COPYING license=LGPLv2.1
+license ply.license license=BSD
 
 # force the rename with an optional dependency on the old name
 depend type=optional fmri=library/python-2/ply-$(PYV)@3.1,5.12-5.12.0.0.0.41.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/ply/ply.license	Thu Nov 19 11:19:15 2015 -0800
@@ -0,0 +1,29 @@
+Copyright (C) 2001-2015,
+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.
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/ply/test/results-all.master	Thu Nov 19 11:19:15 2015 -0800
@@ -0,0 +1,10 @@
+..........................................
+----------------------------------------------------------------------
+Ran 42 tests
+
+OK
+..........................................
+----------------------------------------------------------------------
+Ran 42 tests
+
+OK
--- a/components/python/pycurl/Makefile	Thu Nov 19 04:51:49 2015 -0800
+++ b/components/python/pycurl/Makefile	Thu Nov 19 11:19:15 2015 -0800
@@ -26,23 +26,21 @@
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		pycurl
-COMPONENT_VERSION=	7.19.0
+COMPONENT_VERSION=	7.19.5.1
 COMPONENT_PROJECT_URL=	http://pycurl.sourceforge.net/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:8ef0bf1c0e48f0d193ef8ac4ae4b3596a1e91b6cbf1ff1b25de769fe3782aeb6
+    sha256:6e9770f80459757f73bd71af82fbb29cd398b38388cdf1beab31ea91a331bc6c
 COMPONENT_ARCHIVE_URL=	$(call pypi_url)
 COMPONENT_BUGDB=	python-mod/pycurl
 
-IPS_COMPONENT_VERSION=  7.19.0.1
-
-PATCH_LEVEL = 0
+IPS_COMPONENT_VERSION=  7.19.5.1
 
-TPNO=			5912
+TPNO=			24764
 
-# Syntax issues: not Python 3 ready.
-PYTHON_VERSIONS=	$(PYTHON2_VERSIONS)
+# upstream not Python 3.5 ready
+PYTHON_VERSIONS=        $(PYTHON2_VERSIONS) 3.4
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/setup.py.mk
@@ -58,9 +56,10 @@
 
 install:	$(INSTALL_32_and_64)
 
+# test requires bottle and vsftpd which haven't been integrated yet.
 test:		$(NO_TESTS)
 
-system-test:    $(NO_TESTS)
+system-test:    $(SYSTEM_TESTS_NOT_IMPLEMENTED)
 
 
 REQUIRED_PACKAGES += library/security/openssl
--- a/components/python/pycurl/patches/pycurl-mondo.patch	Thu Nov 19 04:51:49 2015 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,196 +0,0 @@
---- setup.py.orig	Fri Aug 07 15:00:51 2009 -0700
-+++ setup.py	Tue Sep 21 10:59:03 2010 -0700
[email protected]@ -97,8 +97,7 @@
-         else:
-             extra_compile_args.append(e)
-     libs = split_quoted(
--        os.popen("'%s' --libs" % CURL_CONFIG).read()+\
--        os.popen("'%s' --static-libs" % CURL_CONFIG).read())
-+        os.popen("'%s' --libs" % CURL_CONFIG).read())
-     for e in libs:
-         if e[:2] == "-l":
-             libraries.append(e[2:])
-
---- src/pycurl.c.orig	Fri Aug 07 15:00:51 2009 -0700
-+++ src/pycurl.c	Tue Sep 21 10:59:03 2010 -0700
[email protected]@ -747,6 +747,59 @@
-     return self;
- }
- 
-+/* initializer - used to intialize curl easy handles for use with pycurl */
-+static int
-+util_curl_init(CurlObject *self)
-+{
-+    int res;
-+    char *s = NULL;
-+
-+    /* Set curl error buffer and zero it */
-+    res = curl_easy_setopt(self->handle, CURLOPT_ERRORBUFFER, self->error);
-+    if (res != CURLE_OK) {
-+        return (-1);
-+    }
-+    memset(self->error, 0, sizeof(self->error));
-+
-+    /* Set backreference */
-+    res = curl_easy_setopt(self->handle, CURLOPT_PRIVATE, (char *) self);
-+    if (res != CURLE_OK) {
-+        return (-1);
-+    }
-+
-+    /* Enable NOPROGRESS by default, i.e. no progress output */
-+    res = curl_easy_setopt(self->handle, CURLOPT_NOPROGRESS, (long)1);
-+    if (res != CURLE_OK) {
-+        return (-1);
-+    }
-+
-+    /* Disable VERBOSE by default, i.e. no verbose output */
-+    res = curl_easy_setopt(self->handle, CURLOPT_VERBOSE, (long)0);
-+    if (res != CURLE_OK) {
-+        return (-1);
-+    }
-+
-+    /* Set FTP_ACCOUNT to NULL by default */
-+    res = curl_easy_setopt(self->handle, CURLOPT_FTP_ACCOUNT, NULL);
-+    if (res != CURLE_OK) {
-+        return (-1);
-+    }
-+
-+    /* Set default USERAGENT */
-+    s = (char *) malloc(7 + strlen(LIBCURL_VERSION) + 1);
-+    if (s == NULL) {
-+        return (-1);
-+    }
-+    strcpy(s, "PycURL/"); strcpy(s+7, LIBCURL_VERSION);
-+    res = curl_easy_setopt(self->handle, CURLOPT_USERAGENT, (char *) s);
-+    if (res != CURLE_OK) {
-+        free(s);
-+        return (-1);
-+    }
-+    self->options[ OPT_INDEX(CURLOPT_USERAGENT) ] = s; s = NULL;
-+
-+    return (0);
-+}
- 
- /* constructor - this is a module-level function returning a new instance */
- static CurlObject *
[email protected]@ -754,7 +807,6 @@
- {
-     CurlObject *self = NULL;
-     int res;
--    char *s = NULL;
- 
-     UNUSED(dummy);
- 
[email protected]@ -768,44 +820,9 @@
-     if (self->handle == NULL)
-         goto error;
- 
--    /* Set curl error buffer and zero it */
--    res = curl_easy_setopt(self->handle, CURLOPT_ERRORBUFFER, self->error);
--    if (res != CURLE_OK)
--        goto error;
--    memset(self->error, 0, sizeof(self->error));
--
--    /* Set backreference */
--    res = curl_easy_setopt(self->handle, CURLOPT_PRIVATE, (char *) self);
--    if (res != CURLE_OK)
--        goto error;
--
--    /* Enable NOPROGRESS by default, i.e. no progress output */
--    res = curl_easy_setopt(self->handle, CURLOPT_NOPROGRESS, (long)1);
--    if (res != CURLE_OK)
--        goto error;
--
--    /* Disable VERBOSE by default, i.e. no verbose output */
--    res = curl_easy_setopt(self->handle, CURLOPT_VERBOSE, (long)0);
--    if (res != CURLE_OK)
--        goto error;
--
--    /* Set FTP_ACCOUNT to NULL by default */
--    res = curl_easy_setopt(self->handle, CURLOPT_FTP_ACCOUNT, NULL);
--    if (res != CURLE_OK)
--        goto error;
--
--    /* Set default USERAGENT */
--    s = (char *) malloc(7 + strlen(LIBCURL_VERSION) + 1);
--    if (s == NULL)
--        goto error;
--    strcpy(s, "PycURL/"); strcpy(s+7, LIBCURL_VERSION);
--    res = curl_easy_setopt(self->handle, CURLOPT_USERAGENT, (char *) s);
--    if (res != CURLE_OK) {
--        free(s);
--        goto error;
--    }
--    self->options[ OPT_INDEX(CURLOPT_USERAGENT) ] = s; s = NULL;
--
-+    res = util_curl_init(self);
-+    if (res < 0)
-+            goto error;
-     /* Success - return new object */
-     return self;
- 
[email protected]@ -1425,6 +1442,7 @@
- do_curl_reset(CurlObject *self)
- {
-     unsigned int i;
-+    int res;
- 
-     curl_easy_reset(self->handle);
- 
[email protected]@ -1452,7 +1470,17 @@
-         }
-     }
- 
-+    res = util_curl_init(self);
-+    if (res < 0)
-+            goto error;
-+
-+    Py_INCREF(Py_None);
-     return Py_None;
-+
-+error:
-+    Py_DECREF(self);    /* this also closes self->handle */
-+    PyErr_SetString(ErrorObject, "resetting curl failed");
-+    return NULL;
- }
- 
- /* --------------- unsetopt/setopt/getinfo --------------- */
[email protected]@ -1501,6 +1529,8 @@
-     case CURLOPT_RANDOM_FILE:
-     case CURLOPT_SSL_CIPHER_LIST:
-     case CURLOPT_USERPWD:
-+    case CURLOPT_PROXYUSERNAME:
-+    case CURLOPT_PROXYPASSWORD:
-         SETOPT((char *) 0);
-         opt_index = OPT_INDEX(option);
-         break;
[email protected]@ -1627,6 +1657,9 @@
-         case CURLOPT_SSH_HOST_PUBLIC_KEY_MD5:
-         case CURLOPT_CRLFILE:
-         case CURLOPT_ISSUERCERT:
-+        case CURLOPT_NOPROXY:
-+        case CURLOPT_PROXYUSERNAME:
-+        case CURLOPT_PROXYPASSWORD:
- /* FIXME: check if more of these options allow binary data */
-             str = PyString_AsString_NoNUL(obj);
-             if (str == NULL)
[email protected]@ -3561,6 +3594,9 @@
-     insint_c(d, "PROXYTYPE_HTTP", CURLPROXY_HTTP);
-     insint_c(d, "PROXYTYPE_SOCKS4", CURLPROXY_SOCKS4);
-     insint_c(d, "PROXYTYPE_SOCKS5", CURLPROXY_SOCKS5);
-+    insint_c(d, "PROXYTYPE_HTTP_1_0", CURLPROXY_HTTP_1_0);
-+    insint_c(d, "PROXYTYPE_SOCKS4A", CURLPROXY_SOCKS4A);
-+    insint_c(d, "PROXYTYPE_SOCKS5_HOSTNAME", CURLPROXY_SOCKS5_HOSTNAME);
- 
-     /* curl_httpauth: constants for setopt(HTTPAUTH, x) */
-     insint_c(d, "HTTPAUTH_NONE", CURLAUTH_NONE);
[email protected]@ -3735,6 +3771,9 @@
-     insint_c(d, "CRLFILE", CURLOPT_CRLFILE);
-     insint_c(d, "ISSUERCERT", CURLOPT_ISSUERCERT);
-     insint_c(d, "ADDRESS_SCOPE", CURLOPT_ADDRESS_SCOPE);
-+    insint_c(d, "NOPROXY", CURLOPT_NOPROXY);
-+    insint_c(d, "PROXYUSERNAME", CURLOPT_PROXYUSERNAME);
-+    insint_c(d, "PROXYPASSWORD", CURLOPT_PROXYPASSWORD);
- 
-     insint_c(d, "M_TIMERFUNCTION", CURLMOPT_TIMERFUNCTION);
-     insint_c(d, "M_SOCKETFUNCTION", CURLMOPT_SOCKETFUNCTION);
--- a/components/python/pycurl/pycurl-GENFRAG.p5m	Thu Nov 19 04:51:49 2015 -0800
+++ b/components/python/pycurl/pycurl-GENFRAG.p5m	Thu Nov 19 11:19:15 2015 -0800
@@ -18,57 +18,35 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 # we have to reverse the autopyc transform for stuff in /usr/share/doc
 # since there are only py files there
 <transform file path=usr/share/doc/.+\.pyc$ -> drop>
 #
-file path=usr/share/doc/pycurl/COPYING
-file path=usr/share/doc/pycurl/COPYING2
+file path=usr/share/doc/pycurl/COPYING-LGPL
+file path=usr/share/doc/pycurl/COPYING-MIT
 file path=usr/share/doc/pycurl/ChangeLog
-file path=usr/share/doc/pycurl/INSTALL
-file path=usr/share/doc/pycurl/README
-file path=usr/share/doc/pycurl/TODO
+file path=usr/share/doc/pycurl/INSTALL.rst
+file path=usr/share/doc/pycurl/README.rst
+file path=usr/share/doc/pycurl/RELEASE-NOTES.rst
 file path=usr/share/doc/pycurl/examples/basicfirst.py
 file path=usr/share/doc/pycurl/examples/file_upload.py
 file path=usr/share/doc/pycurl/examples/linksys.py
+file path=usr/share/doc/pycurl/examples/quickstart/follow_redirect.py
+file path=usr/share/doc/pycurl/examples/quickstart/form_post.py
+file path=usr/share/doc/pycurl/examples/quickstart/get.py
+file path=usr/share/doc/pycurl/examples/quickstart/get_python2.py
+file path=usr/share/doc/pycurl/examples/quickstart/get_python3.py
+file path=usr/share/doc/pycurl/examples/quickstart/response_headers.py
+file path=usr/share/doc/pycurl/examples/quickstart/response_info.py
+file path=usr/share/doc/pycurl/examples/quickstart/write_file.py
 file path=usr/share/doc/pycurl/examples/retriever-multi.py
 file path=usr/share/doc/pycurl/examples/retriever.py
 file path=usr/share/doc/pycurl/examples/sfquery.py
+file path=usr/share/doc/pycurl/examples/smtp.py
 file path=usr/share/doc/pycurl/examples/xmlrpc_curl.py
-file path=usr/share/doc/pycurl/html/callbacks.html
-file path=usr/share/doc/pycurl/html/curlmultiobject.html
-file path=usr/share/doc/pycurl/html/curlobject.html
-file path=usr/share/doc/pycurl/html/curlshareobject.html
-file path=usr/share/doc/pycurl/html/pycurl.html
-file path=usr/share/doc/pycurl/tests/test.py
-file path=usr/share/doc/pycurl/tests/test_cb.py
-file path=usr/share/doc/pycurl/tests/test_debug.py
-file path=usr/share/doc/pycurl/tests/test_ftp.py
-file path=usr/share/doc/pycurl/tests/test_getinfo.py
-file path=usr/share/doc/pycurl/tests/test_gtk.py
-file path=usr/share/doc/pycurl/tests/test_internals.py
-file path=usr/share/doc/pycurl/tests/test_memleak.py
-file path=usr/share/doc/pycurl/tests/test_multi.py
-file path=usr/share/doc/pycurl/tests/test_multi2.py
-file path=usr/share/doc/pycurl/tests/test_multi3.py
-file path=usr/share/doc/pycurl/tests/test_multi4.py
-file path=usr/share/doc/pycurl/tests/test_multi5.py
-file path=usr/share/doc/pycurl/tests/test_multi6.py
-file path=usr/share/doc/pycurl/tests/test_multi_socket.py
-file path=usr/share/doc/pycurl/tests/test_multi_socket_select.py
-file path=usr/share/doc/pycurl/tests/test_multi_timer.py
-file path=usr/share/doc/pycurl/tests/test_multi_vs_thread.py
-file path=usr/share/doc/pycurl/tests/test_post.py
-file path=usr/share/doc/pycurl/tests/test_post2.py
-file path=usr/share/doc/pycurl/tests/test_post3.py
-file path=usr/share/doc/pycurl/tests/test_share.py
-file path=usr/share/doc/pycurl/tests/test_socketopen.py
-file path=usr/share/doc/pycurl/tests/test_stringio.py
-file path=usr/share/doc/pycurl/tests/test_xmlrpc.py
-file path=usr/share/doc/pycurl/tests/util.py
 #
 license pycurl.copyright license=MIT
 
--- a/components/python/pycurl/pycurl.copyright	Thu Nov 19 04:51:49 2015 -0800
+++ b/components/python/pycurl/pycurl.copyright	Thu Nov 19 11:19:15 2015 -0800
@@ -1,11 +1,36 @@
-Oracle elects to have this file available under and governed by the Curl MIT
-derivative license (see below for full license text). However the following
-notice accompanied the original version of the file:
+The following attribution text was taken from pycurl 7.19.5.1.
+
+Pycurl is dual-licensed under the LGPL and an MIT/X derivative license based on the curl license.  Sun chose the MIT-style license, and the OSR review stipulated that the following notice be prepended to the license:
+
+Oracle elects to have this file available under and governed by the MIT-like license (see below for full icense text). However, the following notice accompanied the original version of the file:
 
-COPYRIGHT AND PERMISSION NOTICE
+PycURL is dual licensed under the LGPL and an MIT/X derivative license based on the cURL license.  A full copy of the LGPL license is included in the file COPYING-LGPL.  A full copy of the MIT/X derivative license is included in the file COPYING-MIT.  You can redistribute and/or modify PycURL according to the terms of either license.
+
+ There is a README file in the source tarball with the following text:
+
+License
+-------
 
 Copyright (C) 2001-2008 by Kjetil Jacobsen <kjetilja at gmail.com>
 Copyright (C) 2001-2008 by Markus F.X.J. Oberhumer <markus at oberhumer.com>
+Copyright (C) 2013-2014 by Oleg Pudeyev <oleg at bsdpower.com>
+
+All rights reserved.
+
+PycURL is dual licensed under the LGPL and an MIT/X derivative license
+based on the cURL license.  A full copy of the LGPL license is included
+in the file COPYING-LGPL.  A full copy of the MIT/X derivative license is
+included in the file COPYING-MIT.  You can redistribute and/or modify PycURL
+according to the terms of either license.
+
+The COPYING-MIT file has the following contents:
+
+
+ COPYRIGHT AND PERMISSION NOTICE
+
+Copyright (C) 2001-2008 by Kjetil Jacobsen <kjetilja at gmail.com>
+Copyright (C) 2001-2008 by Markus F.X.J. Oberhumer <markus at oberhumer.com>
+Copyright (C) 2013-2014 by Oleg Pudeyev <oleg at bsdpower.com>
 
 All rights reserved.
 
@@ -24,3 +49,518 @@
 Except as contained in this notice, the name of a copyright holder shall not
 be used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization of the copyright holder.
+
+
+The COPYING-LGPL file has the usual LGPL 2.1:
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!