PSARC/2016/355 cachetools - Extensible memoizing collections and decorators
authorLaszlo Peter <laszlo.peter@oracle.com>
Wed, 13 Jul 2016 14:48:26 -0700
changeset 6410 3ae42b2b5dad
parent 6409 a57c61602ca6
child 6411 76a1152cb6f7
PSARC/2016/355 cachetools - Extensible memoizing collections and decorators PSARC/2016/356 funcsigs - Backport of the PEP 362 function signature features from Python 3.3's inspect module PSARC/2016/358 pika-pool - pika connection pooling library PSARC/2016/362 pika - Python AMQP client library PSARC/2016/402 appdirs - Platform-specific application directories Python module PSARC/2016/430 requestsexceptions - find the path to exceptions in the requests library PSARC/2016/431 python-editor - Programmatically open an editor, capture the result PSARC/2016/432 rJSmin - Javascript Minifier PSARC/2016/433 unicodecsv - CSV python module with unicode support 22996389 The appdirs module should be added to Userland 22960798 The Python module cachetools should be added to Userland 22961272 The Python module funcsigs should be added to Userland 23528657 The Python pika module should be added to Userland 23520215 The Python pika-pool module should be added to Userland 23757060 The python-editor module should be added to Userland 23757078 The rJSmin python modules should be added to Userland 23757069 The requestsexceptions python module should be added to Userland 23757082 The unicodecsv python module should be added to Userland 23747719 update Babel to 2.3.4 23206271 Upgrade cffi to 1.5.2 23206346 Upgrade enum to 1.1.6 23206525 Upgrade filechunkio 1.6 23206568 Upgrade formencode to 1.3.0 23206878 Upgrade librabbitmq to 1.6.1 23206931 Upgrade markdown to 2.6.6 23206993 Upgrade markupsafe to 0.23 23119312 Upgrade pygments to 2.1.3 23207180 Upgrade pyparsing to 2.1.4 23207199 Upgrade pyrabbit to 1.1.0 23207670 Upgrade pytz to 2016.4 23209215 Upgrade rfc3986 to 0.3.1 23210233 Upgrade waitress to 0.9.0 23210235 Upgrade webtest to 2.0.21 23760103 Incorrect version of pymemcache delivered
components/python/appdirs/Makefile
components/python/appdirs/appdirs-PYVER.p5m
components/python/appdirs/appdirs.license
components/python/babel/Makefile
components/python/cachetools/Makefile
components/python/cachetools/cachetools-PYVER.p5m
components/python/cffi/Makefile
components/python/cffi/cffi-PYVER.p5m
components/python/cffi/cffi.license
components/python/cffi/patches/barrier.patch
components/python/cryptography/cryptography-PYVER.p5m
components/python/enum/Makefile
components/python/enum/enum-PYVER.p5m
components/python/filechunkio/Makefile
components/python/filechunkio/patches/01-python3.patch
components/python/formencode/Makefile
components/python/formencode/formencode-PYVER.p5m
components/python/formencode/formencode.license
components/python/funcsigs/Makefile
components/python/funcsigs/funcsigs-PYVER.p5m
components/python/funcsigs/funcsigs.license
components/python/librabbitmq/Makefile
components/python/librabbitmq/librabbitmq-PYVER.p5m
components/python/librabbitmq/patches/studio.patch
components/python/markdown/Makefile
components/python/markdown/markdown-PYVER.p5m
components/python/markdown/markdown.license
components/python/markupsafe/Makefile
components/python/markupsafe/markupsafe.license
components/python/pika-pool/Makefile
components/python/pika-pool/pika-pool-PYVER.p5m
components/python/pika-pool/pika-pool.license
components/python/pika/Makefile
components/python/pika/pika-PYVER.p5m
components/python/pygments/Makefile
components/python/pygments/patches/CVE-2015-8557.patch
components/python/pygments/pygments-PYVER.p5m
components/python/pygments/pygments.license
components/python/pymemcache/Makefile
components/python/pymemcache/pymemcache-PYVER.p5m
components/python/pyparsing/Makefile
components/python/pyparsing/pyparsing-PYVER.p5m
components/python/pyrabbit/Makefile
components/python/python-editor/Makefile
components/python/python-editor/python-editor-PYVER.p5m
components/python/pytz/Makefile
components/python/pytz/patches/01-zoneinfopath.patch
components/python/pytz/patches/02-zones.patch
components/python/pytz/patches/zoneinfopath.patch
components/python/pytz/patches/zones.patch
components/python/requestsexceptions/Makefile
components/python/requestsexceptions/requestsexceptions-PYVER.p5m
components/python/requestsexceptions/requestsexceptions.license
components/python/rfc3986/Makefile
components/python/rfc3986/rfc3986-PYVER.p5m
components/python/rfc3986/rfc3986.license
components/python/rjsmin/Makefile
components/python/rjsmin/rjsmin-GENFRAG.p5m
components/python/rjsmin/rjsmin-PYVER.p5m
components/python/rjsmin/rjsmin.license
components/python/unicodecsv/Makefile
components/python/unicodecsv/unicodecsv-PYVER.p5m
components/python/unicodecsv/unicodecsv.license
components/python/waitress/Makefile
components/python/waitress/waitress-PYVER.p5m
components/python/webtest/Makefile
components/python/webtest/webtest-PYVER.p5m
components/python/xattr/xattr-PYVER.p5m
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/appdirs/Makefile	Wed Jul 13 14:48:26 2016 -0700
@@ -0,0 +1,56 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		appdirs
+COMPONENT_VERSION=	1.4.0
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH=	\
+    sha256:cb7dc301b950e9ed061c86aa23febcc9427ec53592085752be3cb560e5b8db17
+COMPONENT_PROJECT_URL=	http://github.com/ActiveState/appdirs
+COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)/archive/$(COMPONENT_VERSION).tar.gz
+COMPONENT_BUGDB=	python-mod/appdirs
+
+TPNO=			27489
+
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/setup.py.mk
+include $(WS_MAKE_RULES)/ips.mk
+
+ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+
+# common targets
+build:		$(BUILD_NO_ARCH)
+
+install:	$(INSTALL_NO_ARCH)
+
+COMPONENT_TEST_DIR =    $(SOURCE_DIR)
+COMPONENT_TEST_ARGS =   setup.py test
+
+test:		$(TEST_NO_ARCH)
+
+system-test:    $(NO_TESTS)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/appdirs/appdirs-PYVER.p5m	Wed Jul 13 14:48:26 2016 -0700
@@ -0,0 +1,58 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python/appdirs-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="Platform-specific application directories Python module"
+set name=pkg.description \
+    value="A small Python module for determining appropriate platform-specific directories, e.g. a 'user data dir'."
+set name=com.oracle.info.description \
+    value="Platform-specific application directories Python module"
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/Python \
+    value="org.opensolaris.category.2008:System/Administration and Configuration"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream \
+    value="Trent Mick <[email protected]> Sridhar Ratnakumar <[email protected]>"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2016/402
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=usr/lib/python$(PYVER)/vendor-packages/appdirs-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
+file path=usr/lib/python$(PYVER)/vendor-packages/appdirs-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/appdirs-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/appdirs-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/appdirs.py \
+    pkg.depend.bypass-generate=.*
+#
+license appdirs.license license=MIT
+
+# force a dependency on the appdirs package
+depend type=require \
+    fmri=library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+
+# force a dependency on the Python runtime
+depend type=require fmri=runtime/python-$(PYV)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/appdirs/appdirs.license	Wed Jul 13 14:48:26 2016 -0700
@@ -0,0 +1,23 @@
+# This is the MIT license
+
+Copyright (c) 2010 ActiveState Software Inc.
+Copyright (c) 2013 Eddy Petrișor
+
+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/babel/Makefile	Wed Jul 06 13:20:55 2016 -0700
+++ b/components/python/babel/Makefile	Wed Jul 13 14:48:26 2016 -0700
@@ -25,16 +25,16 @@
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		Babel
-COMPONENT_VERSION=	2.3.3
+COMPONENT_VERSION=	2.3.4
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:12dff9afa9c6cd6e2a39960d3cd4b46b2b98768cdc6646833c66b20799c1c58e
+    sha256:c535c4403802f6eb38173cd4863e419e2274921a01a8aad8a5b497c131c62875
 COMPONENT_ARCHIVE_URL=	$(call pypi_url)
 COMPONENT_PROJECT_URL=	http://babel.pocoo.org/
 COMPONENT_BUGDB=	python-mod/babel
 
-TPNO=			27860
+TPNO=			29231
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/setup.py.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cachetools/Makefile	Wed Jul 13 14:48:26 2016 -0700
@@ -0,0 +1,56 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		cachetools
+COMPONENT_VERSION=	1.1.5
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH=	\
+    sha256:9810dd6afaec9e9eaae5ec33f2aa7117214a7a3f8427e70ab23939fe4d1bf279
+COMPONENT_ARCHIVE_URL=	$(call pypi_url)
+COMPONENT_PROJECT_URL=	https://github.com/tkem/cachetools
+COMPONENT_BUGDB=	python-mod/cachetools
+
+TPNO=			27447
+
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/setup.py.mk
+include $(WS_MAKE_RULES)/ips.mk
+
+ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+
+COMPONENT_TEST_DIR =	$(SOURCE_DIR)
+COMPONENT_TEST_ARGS =	setup.py test
+
+# common targets
+build:		$(BUILD_NO_ARCH)
+
+install:	$(INSTALL_NO_ARCH)
+
+test:		$(TEST_NO_ARCH)
+
+system-test:    $(SYSTEM_TESTS_NOT_IMPLEMENTED)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cachetools/cachetools-PYVER.p5m	Wed Jul 13 14:48:26 2016 -0700
@@ -0,0 +1,62 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python/cachetools-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Extensible memoizing collections and decorators"
+set name=pkg.description \
+    value="This module provides various memoizing collections and decorators, including a variant of the Python 3 Standard Library @lru_cache function decorator."
+set name=com.oracle.info.description value="the Python cachetools module"
+set name=com.oracle.info.tpno value=$(TPNO)
+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="Thomas Kemmer <[email protected]>"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2016/355
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=usr/lib/python$(PYVER)/vendor-packages/cachetools-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
+file path=usr/lib/python$(PYVER)/vendor-packages/cachetools-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
+#
+file path=usr/lib/python$(PYVER)/vendor-packages/cachetools-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/cachetools-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/cachetools/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/cachetools/cache.py
+file path=usr/lib/python$(PYVER)/vendor-packages/cachetools/func.py
+file path=usr/lib/python$(PYVER)/vendor-packages/cachetools/keys.py
+file path=usr/lib/python$(PYVER)/vendor-packages/cachetools/lfu.py
+file path=usr/lib/python$(PYVER)/vendor-packages/cachetools/lru.py
+file path=usr/lib/python$(PYVER)/vendor-packages/cachetools/rr.py
+file path=usr/lib/python$(PYVER)/vendor-packages/cachetools/ttl.py
+#
+license LICENSE license=MIT
+
+# force a dependency on the Python runtime
+depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
+    pkg.debug.depend.path=usr/bin
+
+# force a dependency on the cachetools package
+depend type=require \
+    fmri=library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- a/components/python/cffi/Makefile	Wed Jul 06 13:20:55 2016 -0700
+++ b/components/python/cffi/Makefile	Wed Jul 13 14:48:26 2016 -0700
@@ -26,16 +26,16 @@
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		cffi
-COMPONENT_VERSION=	1.4.2
+COMPONENT_VERSION=	1.5.2
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:8f1d177d364ea35900415ae24ca3e471be3d5334ed0419294068c49f45913998
+    sha256:da9bde99872e46f7bb5cff40a9b1cc08406765efafb583c704de108b6cb821dd
 COMPONENT_ARCHIVE_URL=	$(call pypi_url)
 COMPONENT_PROJECT_URL=	http://cffi.readthedocs.org/
 COMPONENT_BUGDB=	python-mod/cffi
 
-TPNO=			26350
+TPNO=			29371
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/setup.py.mk
@@ -43,6 +43,9 @@
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
+LDSHARED=      $(CC) -G
+PYTHON_ENV +=  LDSHARED="$(LDSHARED)"
+
 COMPONENT_TEST_DIR =	$(@D)/tests
 COMPONENT_TEST_ENV =	$(PYTHON_ENV)
 COMPONENT_TEST_ENV +=	PYTHONPATH=$(PROTO_DIR)/$(PYTHON_LIB)
--- a/components/python/cffi/cffi-PYVER.p5m	Wed Jul 06 13:20:55 2016 -0700
+++ b/components/python/cffi/cffi-PYVER.p5m	Wed Jul 13 14:48:26 2016 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -50,6 +50,7 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/cffi-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/cffi/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cffi/_cffi_include.h
+file path=usr/lib/python$(PYVER)/vendor-packages/cffi/_embedding.h
 file path=usr/lib/python$(PYVER)/vendor-packages/cffi/api.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cffi/backend_ctypes.py
 file path=usr/lib/python$(PYVER)/vendor-packages/cffi/cffi_opcode.py
--- a/components/python/cffi/cffi.license	Wed Jul 06 13:20:55 2016 -0700
+++ b/components/python/cffi/cffi.license	Wed Jul 13 14:48:26 2016 -0700
@@ -1,26 +1,33 @@
-The MIT License
+Except when otherwise stated (look for LICENSE files in directories or
+information at the beginning of each file) all software and
+documentation is licensed as follows: 
+
+    The MIT License
 
-Copyright (c) 1996-2003  Red Hat, Inc.
-Copyright (c) 2001  John Beniton
-Copyright (c) 2002  Bo Thorsen
-Copyright (c) 2002  Ranjit Mathew
-Copyright (c) 2002  Roger Sayle
+    Copyright (c) 1996-2003  Red Hat, Inc.
+    Copyright (c) 2001  John Beniton
+    Copyright (c) 2002  Bo Thorsen
+    Copyright (c) 2002  Ranjit Mathew
+    Copyright (c) 2002  Roger Sayle
 
-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:
+    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 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.
 
-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.
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cffi/patches/barrier.patch	Wed Jul 13 14:48:26 2016 -0700
@@ -0,0 +1,36 @@
+In-house (for now) patch to allow cffi 1.5.2 to compile with both
+Studio and on SPARC.
+
+--- cffi-1.5.2/c/call_python.c.~1~	2016-02-13 07:33:29.000000000 -0800
++++ cffi-1.5.2/c/call_python.c	2016-05-18 10:10:49.505449785 -0700
[email protected]@ -150,7 +150,8 @@ static int _update_cache_to_call_python(
+ #if (defined(WITH_THREAD) && !defined(_MSC_VER) &&   \
+      !defined(__amd64__) && !defined(__x86_64__) &&   \
+      !defined(__i386__) && !defined(__i386))
+-# define read_barrier()  __sync_synchronize()
++# include <mbarrier.h>
++# define read_barrier()  __compiler_barrier()
+ #else
+ # define read_barrier()  (void)0
+ #endif
+--- cffi-1.5.2/cffi/_embedding.h.~1~	2016-02-13 07:33:29.000000000 -0800
++++ cffi-1.5.2/cffi/_embedding.h	2016-05-18 10:15:53.285798295 -0700
[email protected]@ -32,12 +32,14 @@ static _cffi_call_python_fnptr _cffi_cal
+ 
+ 
+ #ifndef _MSC_VER
+-   /* --- Assuming a GCC not infinitely old --- */
+-# define cffi_compare_and_swap(l,o,n)  __sync_bool_compare_and_swap(l,o,n)
+-# define cffi_write_barrier()          __sync_synchronize()
++# include <atomic.h>
++# include <mbarrier.h>
++# define cffi_compare_and_swap(l,o,n) \
++                               (atomic_cas_ptr((l), (o), (n)), *(l) == (n))
++# define cffi_write_barrier()          __compiler_barrier()
+ # if !defined(__amd64__) && !defined(__x86_64__) &&   \
+      !defined(__i386__) && !defined(__i386)
+-#   define cffi_read_barrier()         __sync_synchronize()
++#   define cffi_read_barrier()         __compiler_barrier()
+ # else
+ #   define cffi_read_barrier()         (void)0
+ # endif
--- a/components/python/cryptography/cryptography-PYVER.p5m	Wed Jul 06 13:20:55 2016 -0700
+++ b/components/python/cryptography/cryptography-PYVER.p5m	Wed Jul 13 14:48:26 2016 -0700
@@ -123,7 +123,7 @@
 license LICENSE.BSD license=BSD-like
 
 # Dependencies on cffi must be incorporated.
-depend type=incorporate fmri=library/python/cffi-$(PYV)@1.4.2
+depend type=incorporate fmri=library/python/cffi-$(PYV)@1.5.2
 
 # force a dependency on the Python runtime
 depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
--- a/components/python/enum/Makefile	Wed Jul 06 13:20:55 2016 -0700
+++ b/components/python/enum/Makefile	Wed Jul 13 14:48:26 2016 -0700
@@ -20,22 +20,22 @@
 #
 
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		enum34
-COMPONENT_VERSION=	1.0.4
+COMPONENT_VERSION=	1.1.6
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:d3c19f26a6a34629c18c775f59dfc5dd595764c722b57a2da56ebfb69b94e447
+    sha256:8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1
 COMPONENT_ARCHIVE_URL=	$(call pypi_url)
 COMPONENT_PROJECT_URL=	https://pypi.python.org/pypi/enum34
 COMPONENT_BUGDB=	python-mod/enum34
 
-TPNO=			21360
+TPNO=			29059
 
 # enum34 is superfluous in Python 3.4
 PYTHON_VERSIONS =	$(PYTHON2_VERSIONS)
@@ -46,7 +46,7 @@
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
-COMPONENT_TEST_ARGS=	enum/test_enum.py
+COMPONENT_TEST_ARGS=	enum/test.py
 COMPONENT_TEST_DIR=	$(COMPONENT_SRC)
 
 # common targets
--- a/components/python/enum/enum-PYVER.p5m	Wed Jul 06 13:20:55 2016 -0700
+++ b/components/python/enum/enum-PYVER.p5m	Wed Jul 13 14:48:26 2016 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -39,8 +39,10 @@
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
 file path=usr/lib/python$(PYVER)/vendor-packages/enum/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/enum/enum.py
-file path=usr/lib/python$(PYVER)/vendor-packages/enum34-$(COMPONENT_VERSION)-py$(PYVER).egg-info
+file path=usr/lib/python$(PYVER)/vendor-packages/enum34-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
+file path=usr/lib/python$(PYVER)/vendor-packages/enum34-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/enum34-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/enum34-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
 #
 license enum/LICENSE license=BSD
 
--- a/components/python/filechunkio/Makefile	Wed Jul 06 13:20:55 2016 -0700
+++ b/components/python/filechunkio/Makefile	Wed Jul 13 14:48:26 2016 -0700
@@ -20,21 +20,21 @@
 #
 
 #
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		filechunkio
-COMPONENT_VERSION=	1.5
+COMPONENT_VERSION=	1.6
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:882ad497d2ed6dc2cc76e6c2a0ec71ea3df5f33ce69bd87f311d6f59d023b473
+    sha256:163948052cd274daddfcde9cec9cb5e04ac19d7bb91606cdc6a305b0428a0e70
 COMPONENT_ARCHIVE_URL=	$(call pypi_url)
 COMPONENT_PROJECT_URL=	https://bitbucket.org/fabian/filechunkio
 COMPONENT_BUGDB=	python-mod/filechunkio
 
-TPNO=			14503
+TPNO=			29376
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/setup.py.mk
@@ -53,4 +53,3 @@
 test:		$(TEST_NO_ARCH)
 
 system-test:    $(SYSTEM_TESTS_NOT_IMPLEMENTED)
-
--- a/components/python/filechunkio/patches/01-python3.patch	Wed Jul 06 13:20:55 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-This patch is for Python 3 compatibility.  It has not been submitted upstream,
-as the community appears to have gone dormant.
-
---- filechunkio-1.5/setup.py~	2011-04-27 06:12:34.000000000 -0700
-+++ filechunkio-1.5/setup.py	2014-04-16 11:32:41.158068141 -0700
[email protected]@ -1,12 +1,11 @@
- #!/usr/bin/env python
- from distutils.core import setup
- 
--from filechunkio import __version__
- 
- 
- setup(
-     name="filechunkio",
--    version=unicode(__version__),
-+    version="1.5",
-     description="FileChunkIO represents a chunk of an OS-level file "\
-         "containing bytes data",
-     long_description=open("README", 'r').read(),
--- a/components/python/formencode/Makefile	Wed Jul 06 13:20:55 2016 -0700
+++ b/components/python/formencode/Makefile	Wed Jul 13 14:48:26 2016 -0700
@@ -20,24 +20,21 @@
 #
 
 #
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		FormEncode
-COMPONENT_VERSION=	1.2.6
+COMPONENT_VERSION=	1.3.0
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).zip
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:70fc1d2cf8022b1cc7fcebb5d87cc984dde799e587f05c0a0fe509b374221b0c
+    sha256:e6757280244a0d04e9cef51beeeafb4124087c27b7944c7d41341d0a30f7af78
 COMPONENT_ARCHIVE_URL=	$(call pypi_url)
 COMPONENT_PROJECT_URL=	http://www.formencode.org/en/latest/
 COMPONENT_BUGDB=	python-mod/formencode
 
-TPNO=			14503
-
-# Code explicitly checks for sys.version < '3.0'
-PYTHON_VERSIONS=	$(PYTHON2_VERSIONS)
+TPNO=			29210
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/setup.py.mk
@@ -45,10 +42,6 @@
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
-# Remove the trailing Control-M's from msgfmt.py otherwise pkgdepend bitchs.
-COMPONENT_PRE_BUILD_ACTION = \
-	$(GSED) -i -e 's/
//g' $(SOURCE_DIR)/formencode/i18n/msgfmt.py
-
 # common targets
 build:		$(BUILD_NO_ARCH)
 
@@ -61,4 +54,3 @@
 test:		$(NO_TESTS)
 
 system-test:    $(NO_TESTS)
-
--- a/components/python/formencode/formencode-PYVER.p5m	Wed Jul 06 13:20:55 2016 -0700
+++ b/components/python/formencode/formencode-PYVER.p5m	Wed Jul 13 14:48:26 2016 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -42,6 +42,7 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/FormEncode-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/FormEncode-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/FormEncode-$(COMPONENT_VERSION)-py$(PYVER).egg-info/not-zip-safe
+file path=usr/lib/python$(PYVER)/vendor-packages/FormEncode-$(COMPONENT_VERSION)-py$(PYVER).egg-info/requires.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/FormEncode-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/formencode/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/formencode/api.py
@@ -56,8 +57,8 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/formencode/htmlfill_schemabuilder.py
 file path=usr/lib/python$(PYVER)/vendor-packages/formencode/htmlgen.py
 file path=usr/lib/python$(PYVER)/vendor-packages/formencode/htmlrename.py
-file path=usr/lib/python$(PYVER)/vendor-packages/formencode/i18n/FormEncode.pot
 file path=usr/lib/python$(PYVER)/vendor-packages/formencode/i18n/cs/LC_MESSAGES/FormEncode.mo
+file path=usr/lib/python$(PYVER)/vendor-packages/formencode/i18n/da/LC_MESSAGES/FormEncode.mo
 file path=usr/lib/python$(PYVER)/vendor-packages/formencode/i18n/de/LC_MESSAGES/FormEncode.mo
 file path=usr/lib/python$(PYVER)/vendor-packages/formencode/i18n/el/LC_MESSAGES/FormEncode.mo
 file path=usr/lib/python$(PYVER)/vendor-packages/formencode/i18n/es/LC_MESSAGES/FormEncode.mo
@@ -66,8 +67,8 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/formencode/i18n/fr/LC_MESSAGES/FormEncode.mo
 file path=usr/lib/python$(PYVER)/vendor-packages/formencode/i18n/it/LC_MESSAGES/FormEncode.mo
 file path=usr/lib/python$(PYVER)/vendor-packages/formencode/i18n/ja/LC_MESSAGES/FormEncode.mo
+file path=usr/lib/python$(PYVER)/vendor-packages/formencode/i18n/ko/LC_MESSAGES/FormEncode.mo
 file path=usr/lib/python$(PYVER)/vendor-packages/formencode/i18n/lt/LC_MESSAGES/FormEncode.mo
-file path=usr/lib/python$(PYVER)/vendor-packages/formencode/i18n/msgfmt.py
 file path=usr/lib/python$(PYVER)/vendor-packages/formencode/i18n/nb_NO/LC_MESSAGES/FormEncode.mo
 file path=usr/lib/python$(PYVER)/vendor-packages/formencode/i18n/nl/LC_MESSAGES/FormEncode.mo
 file path=usr/lib/python$(PYVER)/vendor-packages/formencode/i18n/pl/LC_MESSAGES/FormEncode.mo
@@ -76,6 +77,8 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/formencode/i18n/ru/LC_MESSAGES/FormEncode.mo
 file path=usr/lib/python$(PYVER)/vendor-packages/formencode/i18n/sk/LC_MESSAGES/FormEncode.mo
 file path=usr/lib/python$(PYVER)/vendor-packages/formencode/i18n/sl/LC_MESSAGES/FormEncode.mo
+file path=usr/lib/python$(PYVER)/vendor-packages/formencode/i18n/sr/LC_MESSAGES/FormEncode.mo
+file path=usr/lib/python$(PYVER)/vendor-packages/formencode/i18n/sv/LC_MESSAGES/FormEncode.mo
 file path=usr/lib/python$(PYVER)/vendor-packages/formencode/i18n/tr/LC_MESSAGES/FormEncode.mo
 file path=usr/lib/python$(PYVER)/vendor-packages/formencode/i18n/zh_CN/LC_MESSAGES/FormEncode.mo
 file path=usr/lib/python$(PYVER)/vendor-packages/formencode/i18n/zh_TW/LC_MESSAGES/FormEncode.mo
@@ -84,12 +87,9 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/formencode/national.py
 file path=usr/lib/python$(PYVER)/vendor-packages/formencode/rewritingparser.py
 file path=usr/lib/python$(PYVER)/vendor-packages/formencode/schema.py
-file path=usr/lib/python$(PYVER)/vendor-packages/formencode/util/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/formencode/util/doctest24.py
-file path=usr/lib/python$(PYVER)/vendor-packages/formencode/util/threadinglocal.py
 file path=usr/lib/python$(PYVER)/vendor-packages/formencode/validators.py
 file path=usr/lib/python$(PYVER)/vendor-packages/formencode/variabledecode.py
-license formencode.license license="PSF, LGPLv2, MIT"
+license formencode.license license=MIT
 
 # force a group dependency on the optional nose; pkgdepend work is needed to
 # flush this out.
--- a/components/python/formencode/formencode.license	Wed Jul 06 13:20:55 2016 -0700
+++ b/components/python/formencode/formencode.license	Wed Jul 13 14:48:26 2016 -0700
@@ -1,82 +1,25 @@
-Python Software Foundation License
-
-PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
---------------------------------------------
-
-1. This LICENSE AGREEMENT is between the Python Software Foundation
-("PSF"), and the Individual or Organization ("Licensee") accessing and
-otherwise using this software ("Python") in source or binary form and
-its associated documentation.
+Copyright (c) 2015 Ian Bicking and FormEncode Contributors
 
-2. Subject to the terms and conditions of this License Agreement, PSF
-hereby grants Licensee a nonexclusive, royalty-free, world-wide
-license to reproduce, analyze, test, perform and/or display publicly,
-prepare derivative works, distribute, and otherwise use Python
-alone or in any derivative version, provided, however, that PSF's
-License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
-2001, 2002, 2003, 2004, 2005, 2006 Python Software Foundation; All Rights
-Reserved" are retained in Python alone or in any derivative version
-prepared by Licensee.
+
 
-3. In the event Licensee prepares a derivative work that is based on
-or incorporates Python or any part thereof, and wants to make
-the derivative work available to others as provided herein, then
-Licensee hereby agrees to include in any such work a brief summary of
-the changes made to Python.
+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:
 
-4. PSF is making Python available to Licensee on an "AS IS"
-basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
-IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
-DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
-FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
-INFRINGE ANY THIRD PARTY RIGHTS.
 
-5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
-FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
-A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
-OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
-
-6. This License Agreement will automatically terminate upon a material
-breach of its terms and conditions.
 
-7. Nothing in this License Agreement shall be deemed to create any
-relationship of agency, partnership, or joint venture between PSF and
-Licensee. This License Agreement does not grant permission to use PSF
-trademarks or trade name in a trademark sense to endorse or promote
-products or services of Licensee, or any third party.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
-8. By copying, installing or otherwise using Python, Licensee
-agrees to be bound by the terms and conditions of this License
-Agreement.
 
---------------------------------------------------------------------------
-
-(c) 2005 Ian Bicking and contributors; written for Paste (http://pythonpaste.org)
-Licensed under the MIT license: http://www.opensource.org/licenses/mit-license.php
 
-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.
-
---------------------------------------------------------------------------
-
-Released to the public domain 16-Jan-2001, by Tim Peters ([email protected]).
-Major enhancements and refactoring by:
-    Jim Fulton
-    Edward Loper
-
-Provided as-is; use at your own risk; no warranty; no promises; enjoy!
+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.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/funcsigs/Makefile	Wed Jul 13 14:48:26 2016 -0700
@@ -0,0 +1,56 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		funcsigs
+COMPONENT_VERSION=	0.4
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH=	\
+    sha256:d83ce6df0b0ea6618700fe1db353526391a8a3ada1b7aba52fed7a61da772033
+COMPONENT_ARCHIVE_URL=	$(call pypi_url)
+COMPONENT_PROJECT_URL=	http://funcsigs.readthedocs.org/
+COMPONENT_BUGDB=	python-mod/funcsigs
+
+TPNO=			27448
+
+PYTHON_VERSIONS=    $(PYTHON2_VERSIONS)
+
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/setup.py.mk
+include $(WS_MAKE_RULES)/ips.mk
+
+ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+
+COMPONENT_TEST_DIR =    $(SOURCE_DIR)
+COMPONENT_TEST_ARGS =   setup.py test
+
+# common targets
+build:		$(BUILD_NO_ARCH)
+
+install:	$(INSTALL_NO_ARCH)
+
+test:		$(TEST_NO_ARCH)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/funcsigs/funcsigs-PYVER.p5m	Wed Jul 13 14:48:26 2016 -0700
@@ -0,0 +1,59 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python/funcsigs-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="Python function signatures from PEP362 for Python 2.6, 2.7 and 3.2+"
+set name=pkg.description \
+    value="funcsigs is a backport of the PEP 362 function signature features from Python 3.3’s inspect module. The backport is compatible with Python 2.6, 2.7 as well as 3.2 and up."
+set name=com.oracle.info.description value="the Python funcsigs package"
+set name=com.oracle.info.tpno value=$(TPNO)
+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="Aaron Iles <[email protected]>"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2016/356
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=usr/lib/python$(PYVER)/vendor-packages/funcsigs-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
+file path=usr/lib/python$(PYVER)/vendor-packages/funcsigs-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
+#
+file path=usr/lib/python$(PYVER)/vendor-packages/funcsigs-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/funcsigs-$(COMPONENT_VERSION)-py$(PYVER).egg-info/not-zip-safe
+file path=usr/lib/python$(PYVER)/vendor-packages/funcsigs-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/funcsigs/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/funcsigs/odict.py
+file path=usr/lib/python$(PYVER)/vendor-packages/funcsigs/version.py
+#
+license funcsigs.license license="Apache v2.0"
+
+# force a dependency on the Python runtime
+depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
+    pkg.debug.depend.path=usr/bin
+
+# force a dependency on the funcsigs package
+depend type=require \
+    fmri=library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/funcsigs/funcsigs.license	Wed Jul 13 14:48:26 2016 -0700
@@ -0,0 +1,163 @@
+The following applies to all products licensed under the Apache 2.0 License:
+
+You may not use the identified files except in compliance with the Apache License, Version 2.0 (the "License.")
+ 
+You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0.  A copy of the license is also reproduced below.
+
+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.
+
+LICENSE:
+
+This is a derived work of CPython under the terms of the `PSF License
+Agreement`_. The original CPython inspect module, its unit tests and
+documentation are the copyright of the Python Software Foundation. The derived
+work is distributed under the `Apache License Version 2.0`_.
+
+The PSF license is as follows:
+1. This LICENSE AGREEMENT is between the Python Software Foundation ("PSF"), and
+   the Individual or Organization ("Licensee") accessing and otherwise using Python
+   3.5.1 software in source or binary form and its associated documentation.
+
+2. Subject to the terms and conditions of this License Agreement, PSF hereby
+   grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
+   analyze, test, perform and/or display publicly, prepare derivative works,
+   distribute, and otherwise use Python 3.5.1 alone or in any derivative
+   version, provided, however, that PSF's License Agreement and PSF's notice of
+   copyright, i.e., "Copyright © 2001-2016 Python Software Foundation; All Righh
+ts
+   Reserved" are retained in Python 3.5.1 alone or in any derivative version
+   prepared by Licensee.
+
+3. In the event Licensee prepares a derivative work that is based on or
+   incorporates Python 3.5.1 or any part thereof, and wants to make the
+   derivative work available to others as provided herein, then Licensee hereby
+   agrees to include in any such work a brief summary of the changes made to Python
+   3.5.1.
+
+4. PSF is making Python 3.5.1 available to Licensee on an "AS IS" basis.
+   PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED.  BY WAY OF
+   EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND DISCLAIMS ANY REPRESENTATION OR
+   WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE
+   USE OF PYTHON 3.5.1 WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
+
+5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON 3.5.1
+   FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF
+   MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 3.5.1, OR ANY DERIVATIVE
+   THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+
+6. This License Agreement will automatically terminate upon a material breach of
+   its terms and conditions.
+
+7. Nothing in this License Agreement shall be deemed to create any relationship
+   of agency, partnership, or joint venture between PSF and Licensee.  This License
+   Agreement does not grant permission to use PSF trademarks or trade name in a
+   trademark sense to endorse or promote products or services of Licensee, or any
+   third party.
+
+8. By copying, installing or otherwise using Python 3.5.1, Licensee agrees
+   to be bound by the terms and conditions of this License Agreement.
+
+===============================================================================
+Copyright 2013 Aaron Iles
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file 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.
+
+The Apache license is as follows:
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+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.
+
+"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.
+
+"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.
+
+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:
+You must give any other recipients of the Work or Derivative Works a copy of this License; and
+You must cause any modified files to carry prominent notices stating that You changed the files; and
+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
+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
+
+APPENDIX: How to apply the Apache License to your work
+
+To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file 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.
+
--- a/components/python/librabbitmq/Makefile	Wed Jul 06 13:20:55 2016 -0700
+++ b/components/python/librabbitmq/Makefile	Wed Jul 13 14:48:26 2016 -0700
@@ -20,21 +20,26 @@
 #
 
 #
-# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../../make-rules/shared-macros.mk
 
+# librabbitmq will not configure with Studio compilers.  Despite
+# passing LDFLAGS explicitly, the configure script in $SRC/clib is not
+# able to find getaddrinfo in libsocket.  GCC builds with no issue.
+COMPILER=		gcc
+
 COMPONENT_NAME=		librabbitmq
-COMPONENT_VERSION=	1.0.1
+COMPONENT_VERSION=	1.6.1
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:645763262ad61df3feec618c3cbe1226710a364fca57256f61c53b0101abd880
+    sha256:604a226b9fe3f9e439353702a731f2a39cf771882e68bca020cb224d9b990c49
 COMPONENT_ARCHIVE_URL=	$(call pypi_url)
 COMPONENT_PROJECT_URL=	http://github.com/celery/librabbitmq
 COMPONENT_BUGDB=	python-mod/librabbitmq
 
-TPNO=			14503
+TPNO=			28721
 
 # This module is not Python 3 ready: syntax work needed.
 PYTHON_VERSIONS=	$(PYTHON2_VERSIONS)
@@ -45,6 +50,8 @@
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
+PYTHON_ENV +=	LDSHARED="gcc -shared"
+
 # common targets
 build:		$(BUILD_32_and_64)
 
--- a/components/python/librabbitmq/librabbitmq-PYVER.p5m	Wed Jul 06 13:20:55 2016 -0700
+++ b/components/python/librabbitmq/librabbitmq-PYVER.p5m	Wed Jul 13 14:48:26 2016 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -43,6 +43,7 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/librabbitmq-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/librabbitmq-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/librabbitmq-$(COMPONENT_VERSION)-py$(PYVER).egg-info/not-zip-safe
+file path=usr/lib/python$(PYVER)/vendor-packages/librabbitmq-$(COMPONENT_VERSION)-py$(PYVER).egg-info/requires.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/librabbitmq-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/librabbitmq/__init__.py
 #
--- a/components/python/librabbitmq/patches/studio.patch	Wed Jul 06 13:20:55 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +0,0 @@
-Remove the use of gcc-specific flags.
-And don't regenerate amqp_framing.[ch] if the source hasn't changed.
-
-Without the patch to connection.c, we get
-
-    "Modules/_librabbitmq/connection.c", line 465: reference to static identifier "AMQTable_toPyDict" in extern inline function
-    "Modules/_librabbitmq/connection.c", line 685: reference to static identifier "PyDict_ToAMQTable" in extern inline function
-
-from Studio.  These are new since 0.9.9, where we didn't have this problem.
-Not sure what the right fix is.
-
-Finally, we inherit CFLAGS and LDFLAGS from the environment rather than
-using what Python was compiled with. In particular, Python 2.7 in
-Userland currently has some undesired settings such as including
-/usr/gnu/lib in the RUNPATH.
-
---- librabbitmq-1.0.1/setup.py	Mon Jan 14 06:05:35 2013
-+++ librabbitmq-1.0.1/setup.py	Mon Sep  2 14:25:44 2013
[email protected]@ -3,6 +3,7 @@
- import sys
- from glob import glob
- from setuptools import setup, find_packages
-+from distutils.dep_util import newer
- 
- # --with-librabbitmq=<dir>: path to librabbitmq package if needed
- 
[email protected]@ -26,9 +27,15 @@
-     codegen = LRMQSRC('codegen.py')
-     spec = SPECPATH('amqp-rabbitmq-0.9.1.json')
-     sys.path.insert(0, SPECPATH())
-+    hfile = LRMQSRC('amqp_framing.h')
-+    cfile = LRMQSRC('amqp_framing.c')
-+    # Don't regenerate the files if the spec file hasn't changed.  This prevents
-+    # a separate install phase from unnecessarily rebuilding the extension.
-+    if not (newer(spec, hfile) or newer(spec, cfile)):
-+            return
-     commands = [
--        (sys.executable, codegen, 'header', spec, LRMQSRC('amqp_framing.h')),
--        (sys.executable, codegen, 'body', spec, LRMQSRC('amqp_framing.c')),
-+        (sys.executable, codegen, 'header', spec, hfile),
-+        (sys.executable, codegen, 'body', spec, cfile),
-     ]
-     restore = senv(('PYTHONPATH', SPECPATH()), sep=':')
-     try:
[email protected]@ -112,7 +119,7 @@
- 
-     class build(_build):
-         stdcflags = [
--            '-W -Wall -DHAVE_CONFIG_H',
-+            '-DHAVE_CONFIG_H',
-         ]
-         if os.environ.get('PEDANTIC'):
-             # Python.h breaks -pedantic, so can only use it while developing.
[email protected]@ -124,8 +131,7 @@
-             from distutils import sysconfig
-             config = sysconfig.get_config_vars()
-             try:
--                restore = senv(('CFLAGS', config['CFLAGS']),
--                    ('LDFLAGS', config['LDFLAGS']))
-+                restore = senv()
-                 try:
-                     os.chdir(LRMQDIST())
-                     if not os.path.isfile('config.h'):
---- librabbitmq-1.0.1/Modules/_librabbitmq/connection.c	Mon Jan 14 04:48:57 2013
-+++ librabbitmq-1.0.1/Modules/_librabbitmq/connection.c	Mon Apr  8 16:01:05 2013
[email protected]@ -62,10 +62,10 @@
- _PYRMQ_INLINE int RabbitMQ_wait_nb(int);
- _PYRMQ_INLINE int RabbitMQ_wait_timeout(int, double);
- 
--_PYRMQ_INLINE void
-+void
- basic_properties_to_PyDict(amqp_basic_properties_t*, PyObject*);
- 
--_PYRMQ_INLINE int
-+int
- PyDict_to_basic_properties(PyObject *,
-                            amqp_basic_properties_t *,
-                            amqp_connection_state_t );
[email protected]@ -408,7 +408,7 @@
- }
- 
- 
--_PYRMQ_INLINE void
-+void
- basic_properties_to_PyDict(amqp_basic_properties_t *props, PyObject *p)
- {
-     register PyObject *value = NULL;
[email protected]@ -614,7 +614,7 @@
- }
- 
- 
--_PYRMQ_INLINE int
-+int
- PyDict_to_basic_properties(PyObject *p,
-                            amqp_basic_properties_t *props,
-                            amqp_connection_state_t conn)
--- a/components/python/markdown/Makefile	Wed Jul 06 13:20:55 2016 -0700
+++ b/components/python/markdown/Makefile	Wed Jul 13 14:48:26 2016 -0700
@@ -20,21 +20,21 @@
 #
 
 #
-# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		Markdown
-COMPONENT_VERSION=	2.3.1
+COMPONENT_VERSION=	2.6.6
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:ffebd9385717aba00ff4e95b705b7693ddf12a7d483483d441218b6d3f4cf290
+    sha256:9a292bb40d6d29abac8024887bcfc1159d7a32dc1d6f1f6e8d6d8e293666c504
 COMPONENT_ARCHIVE_URL=	$(call pypi_url)
 COMPONENT_PROJECT_URL=	http://packages.python.org/Markdown/
 COMPONENT_BUGDB=	python-mod/markdown
 
-TPNO=			15143
+TPNO=			29065
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/setup.py.mk
@@ -57,4 +57,3 @@
 test:		$(TEST_NO_ARCH)
 
 system-test:    $(SYSTEM_TESTS_NOT_IMPLEMENTED)
-
--- a/components/python/markdown/markdown-PYVER.p5m	Wed Jul 06 13:20:55 2016 -0700
+++ b/components/python/markdown/markdown-PYVER.p5m	Wed Jul 13 14:48:26 2016 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -61,6 +61,7 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/markdown/extensions/nl2br.py
 file path=usr/lib/python$(PYVER)/vendor-packages/markdown/extensions/sane_lists.py
 file path=usr/lib/python$(PYVER)/vendor-packages/markdown/extensions/smart_strong.py
+file path=usr/lib/python$(PYVER)/vendor-packages/markdown/extensions/smarty.py
 file path=usr/lib/python$(PYVER)/vendor-packages/markdown/extensions/tables.py
 file path=usr/lib/python$(PYVER)/vendor-packages/markdown/extensions/toc.py
 file path=usr/lib/python$(PYVER)/vendor-packages/markdown/extensions/wikilinks.py
@@ -71,6 +72,7 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/markdown/serializers.py
 file path=usr/lib/python$(PYVER)/vendor-packages/markdown/treeprocessors.py
 file path=usr/lib/python$(PYVER)/vendor-packages/markdown/util.py
+#
 license markdown.license license="BSD, MIT"
 
 # force a group dependency on the optional pygments; pkgdepend work is needed to
--- a/components/python/markdown/markdown.license	Wed Jul 06 13:20:55 2016 -0700
+++ b/components/python/markdown/markdown.license	Wed Jul 13 14:48:26 2016 -0700
@@ -1,303 +1,68 @@
-Copyright 2007, 2008 The Python Markdown Project (v. 1.7 and later)
-Copyright 200? Django Software Foundation (OrderedDict implementation)
-Copyright 2004, 2005, 2006 Yuri Takhteyev (v. 0.2-1.6b)
-Copyright 2004 Manfred Stienstra (the original version)
+DETAILS
+Markdown-2.2.0/bin/markdown_py:
+    Copyright 2007, 2008 The Python Markdown Project (v. 1.7 and later)
+    Copyright 200? Django Software Foundation (OrderedDict implementation)
+    Copyright 2004, 2005, 2006 Yuri Takhteyev (v. 0.2-1.6b)
+    Copyright 2004 Manfred Stienstra (the original version)
+    
+    License: BSD (see docs/LICENSE for details).
 
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+Markdown-2.2.0/docs/default.css:
+     * :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
+     * :license: BSD, see LICENSE for details.
 
-*   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 <organization> nor the
-names of its contributors may be used to endorse or promote products
-derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE PYTHON MARKDOWN PROJECT ''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 ANY CONTRIBUTORS TO THE PYTHON MARKDOWN PROJECT
-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.
+Markdown-2.2.0/LICENSE.md:
+    Copyright 2007, 2008 The Python Markdown Project (v. 1.7 and later)  
+    Copyright 2004, 2005, 2006 Yuri Takhteyev (v. 0.2-1.6b)  
+    Copyright 2004 Manfred Stienstra (the original version)  
+    
+    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 <organization> nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+    
+    THIS SOFTWARE IS PROVIDED BY THE PYTHON MARKDOWN PROJECT ''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 ANY CONTRIBUTORS TO THE PYTHON MARKDOWN PROJECT
+    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.
 
 --------------------------------------------------------------------------
-
-Copyright 2007, 2008 The Python Markdown Project (v. 1.7 and later) 
-Copyright 2004, 2005, 2006 Yuri Takhteyev (v. 0.2-1.6b) 
-Copyright 2004 Manfred Stienstra (the original version) 
-
-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 <organization> nor the
-    names of its contributors may be used to endorse or promote products
-    derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE PYTHON MARKDOWN PROJECT ''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 ANY CONTRIBUTORS TO THE PYTHON MARKDOWN PROJECT
-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.
-
---------------------------------------------------------------------------
-
-Copyright 2007-2013 The Python Markdown Project (v. 1.7 and later)
-Copyright 200? Django Software Foundation (OrderedDict implementation)
-Copyright 2004, 2005, 2006 Yuri Takhteyev (v. 0.2-1.6b)
-Copyright 2004 Manfred Stienstra (the original version)
-
-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 <organization> nor the
-names of its contributors may be used to endorse or promote products
-derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE PYTHON MARKDOWN PROJECT ''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 ANY CONTRIBUTORS TO THE PYTHON MARKDOWN PROJECT
-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.
-
---------------------------------------------------------------------------
-
-Copyright 2011 [Waylan Limberg](http://achinghead.com/).
-
-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 <organization> nor the
-names of its contributors may be used to endorse or promote products
-derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE PYTHON MARKDOWN PROJECT ''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 ANY CONTRIBUTORS TO THE PYTHON MARKDOWN PROJECT
-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.
+    
+    Copyright 200? Django Software Foundation (OrderedDict implementation)
+    Copyright 2004 Manfred Stienstra (the original version)
+    Copyright 2004, 2005, 2006 Yuri Takhteyev (v. 0.2-1.6b)
+    Copyright 2006-2008 [Waylan Limberg](http://achinghead.com/).
+    Copyright 2007-2008 [Waylan Limberg](http://achinghead.com/).
+    Copyright 2007-2011 [Waylan Limberg](http://achinghead.com/).
+    Copyright 2007-2012 The Python Markdown Project (v. 1.7 and later)
+    Copyright 2008 - [Waylan Limberg](http://achinghead.com)
+    Copyright 2009 - [Waylan Limberg](http://achinghead.com)
+    Copyright 2011 - [Waylan Limberg](http://achinghead.com)
+    Copyright 2011 [Brian Neal](http://deathofagremmie.com/)
+    Copyright 2011 [Waylan Limberg](http://achinghead.com)
 
 --------------------------------------------------------------------------
 
-Copyright 2006-2008 [Waylan Limberg](http://achinghead.com/).
-
-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 <organization> nor the
-names of its contributors may be used to endorse or promote products
-derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE PYTHON MARKDOWN PROJECT ''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 ANY CONTRIBUTORS TO THE PYTHON MARKDOWN PROJECT
-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.
-
---------------------------------------------------------------------------
-
-Copyright 2008 - [Waylan Limberg](http://achinghead.com)
-
-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 <organization> nor the
-names of its contributors may be used to endorse or promote products
-derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE PYTHON MARKDOWN PROJECT ''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 ANY CONTRIBUTORS TO THE PYTHON MARKDOWN PROJECT
-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.
-
---------------------------------------------------------------------------
-
-Copyright 2007-2008 [Waylan Limberg](http://achinghead.com/).
-
-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 <organization> nor the
-names of its contributors may be used to endorse or promote products
-derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE PYTHON MARKDOWN PROJECT ''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 ANY CONTRIBUTORS TO THE PYTHON MARKDOWN PROJECT
-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.
+ Copyright (c) 1999-2007 by Fredrik Lundh.  All rights reserved.
 
---------------------------------------------------------------------------
-
-Copyright 2007-2011 [Waylan Limberg](http://achinghead.com/).
-
-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 <organization> nor the
-names of its contributors may be used to endorse or promote products
-derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE PYTHON MARKDOWN PROJECT ''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 ANY CONTRIBUTORS TO THE PYTHON MARKDOWN PROJECT
-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.
-
---------------------------------------------------------------------------
-
-Copyright 2007-2008 [Waylan Limberg](http://achinghead.com).
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+ [email protected]
+ http://www.pythonware.com
 
-*   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 <organization> nor the
-names of its contributors may be used to endorse or promote products
-derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE PYTHON MARKDOWN PROJECT ''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 ANY CONTRIBUTORS TO THE PYTHON MARKDOWN PROJECT
-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.
- 
---------------------------------------------------------------------------
+ --------------------------------------------------------------------
 
-The ElementTree toolkit is
-
-Copyright (c) 1999-2007 by Fredrik Lundh
-
-By obtaining, using, and/or copying this software and/or its
-associated documentation, you agree that you have read, understood,
-and will comply with the following terms and conditions:
-
-Permission to use, copy, modify, and distribute this software and
-its associated documentation for any purpose and without fee is
-hereby granted, provided that the above copyright notice appears in
-all copies, and that both that copyright notice and this permission
-notice appear in supporting documentation, and that the name of
-Secret Labs AB or the author not be used in advertising or publicity
-pertaining to distribution of the software without specific, written
-prior permission.
-
-SECRET LABS AB AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANT-
-ABILITY AND FITNESS.  IN NO EVENT SHALL SECRET LABS AB OR THE AUTHOR
-BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
-DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
-ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
-OF THIS SOFTWARE.
--- a/components/python/markupsafe/Makefile	Wed Jul 06 13:20:55 2016 -0700
+++ b/components/python/markupsafe/Makefile	Wed Jul 13 14:48:26 2016 -0700
@@ -20,21 +20,21 @@
 #
 
 #
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		MarkupSafe
-COMPONENT_VERSION=	0.18
+COMPONENT_VERSION=	0.23
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:b7d5d688bdd345bfa897777d297756688cf02e1b3742c56885e2e5c2b996ff82
+    sha256:a4ec1aff59b95a14b45eb2e23761a0179e98319da5a7eb76b56ea8cdc7b871c3
 COMPONENT_ARCHIVE_URL=	$(call pypi_url)
 COMPONENT_PROJECT_URL=	https://pypi.python.org/pypi/markupsafe/
 COMPONENT_BUGDB=	python-mod/markupsafe
 
-TPNO=			14503
+TPNO=			29382
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/setup.py.mk
--- a/components/python/markupsafe/markupsafe.license	Wed Jul 06 13:20:55 2016 -0700
+++ b/components/python/markupsafe/markupsafe.license	Wed Jul 13 14:48:26 2016 -0700
@@ -1,4 +1,4 @@
-pyright (c) 2010 by Armin Ronacher and contributors.  See AUTHORS
+Copyright (c) 2010 by Armin Ronacher and contributors.  See AUTHORS
 for more details.
 
 Some rights reserved.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pika-pool/Makefile	Wed Jul 13 14:48:26 2016 -0700
@@ -0,0 +1,51 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		pika-pool
+COMPONENT_VERSION=	0.1.3
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH=	\
+	sha256:f3985888cc2788cdbd293a68a8b5702a9c955db6f7b8b551aeac91e7f32da397
+COMPONENT_ARCHIVE_URL=	$(call pypi_url)
+COMPONENT_PROJECT_URL=	https://github.com/bninja/pika-pool
+COMPONENT_BUGDB=	python-mod/pika-pool
+
+TPNO=			29180
+
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/setup.py.mk
+include $(WS_MAKE_RULES)/ips.mk
+
+ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+
+# common targets
+build:		$(BUILD_NO_ARCH)
+
+install:	$(INSTALL_NO_ARCH)
+
+test:		$(TEST_NO_ARCH)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pika-pool/pika-pool-PYVER.p5m	Wed Jul 13 14:48:26 2016 -0700
@@ -0,0 +1,56 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python/pika-pool-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Pika connection pooling library"
+set name=pkg.description \
+    value="Pika-pool is a Pika connection pool inspired by flask-pika and SQLAlchemy pool.Pool."
+set name=com.oracle.info.description value="the Python pika-pool module"
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/Python
+set name=info.source [email protected]
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2016/358
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=usr/lib/python$(PYVER)/vendor-packages/pika_pool-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
+file path=usr/lib/python$(PYVER)/vendor-packages/pika_pool-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
+#
+file path=usr/lib/python$(PYVER)/vendor-packages/pika_pool-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/pika_pool-$(COMPONENT_VERSION)-py$(PYVER).egg-info/requires.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/pika_pool-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/pika_pool.py
+#
+license pika-pool.license license=BSD
+
+# force a dependency on the Python runtime
+depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
+    pkg.debug.depend.path=usr/bin
+
+# force a dependency on the pika-pool package
+depend type=require \
+    fmri=library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pika-pool/pika-pool.license	Wed Jul 13 14:48:26 2016 -0700
@@ -0,0 +1,27 @@
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    (1) Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer. 
+
+    (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.  
+    
+    (3)The name of the author may not be used to
+    endorse or promote products derived from this software without
+    specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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/pika/Makefile	Wed Jul 13 14:48:26 2016 -0700
@@ -0,0 +1,51 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		pika
+COMPONENT_VERSION=	0.10.0
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH=	\
+	sha256:7277b4d12a99efa4058782614d84138983f9f89d690bdfcea66290d810806459
+COMPONENT_ARCHIVE_URL=	$(call pypi_url)
+COMPONENT_PROJECT_URL=	https://pika.readthedocs.org/
+COMPONENT_BUGDB=	python-mod/pika
+
+TPNO=			29127
+
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/setup.py.mk
+include $(WS_MAKE_RULES)/ips.mk
+
+ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+
+# common targets
+build:		$(BUILD_NO_ARCH)
+
+install:	$(INSTALL_NO_ARCH)
+
+test:		$(TEST_NO_ARCH)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pika/pika-PYVER.p5m	Wed Jul 13 14:48:26 2016 -0700
@@ -0,0 +1,75 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python/pika-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Pika Python AMQP Client Library"
+set name=pkg.description \
+    value="Pika is a pure-Python implementation of the AMQP 0-9-1 protocol that tries to stay fairly independent of the underlying network support library."
+set name=com.oracle.info.description value="the Python pika module"
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/Python
+set name=info.source value="Gavin M. Roy <[email protected]>"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2016/362
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+#
+file path=usr/lib/python$(PYVER)/vendor-packages/pika-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
+file path=usr/lib/python$(PYVER)/vendor-packages/pika-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/pika-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/pika-$(COMPONENT_VERSION)-py$(PYVER).egg-info/requires.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/pika-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/pika-$(COMPONENT_VERSION)-py$(PYVER).egg-info/zip-safe
+file path=usr/lib/python$(PYVER)/vendor-packages/pika/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pika/adapters/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pika/adapters/base_connection.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pika/adapters/blocking_connection.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pika/adapters/libev_connection.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pika/adapters/select_connection.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pika/adapters/tornado_connection.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pika/adapters/twisted_connection.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pika/amqp_object.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pika/callback.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pika/channel.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pika/compat.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pika/connection.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pika/credentials.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pika/data.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pika/exceptions.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pika/frame.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pika/heartbeat.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pika/spec.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pika/utils.py
+#
+license LICENSE license=BSD
+# force a dependency on the Python runtime
+depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
+    pkg.debug.depend.path=usr/bin
+
+# force a dependency on the pika package
+depend type=require \
+    fmri=library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- a/components/python/pygments/Makefile	Wed Jul 06 13:20:55 2016 -0700
+++ b/components/python/pygments/Makefile	Wed Jul 13 14:48:26 2016 -0700
@@ -20,21 +20,21 @@
 #
 
 #
-# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		Pygments
-COMPONENT_VERSION=	1.6
+COMPONENT_VERSION=	2.1.3
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:799ed4caf77516e54440806d8d9cd82a7607dfdf4e4fb643815171a4b5c921c0
+    sha256:88e4c8a91b2af5962bfa5ea2447ec6dd357018e86e94c7d14bd8cacbc5b55d81
 COMPONENT_ARCHIVE_URL=	$(call pypi_url)
 COMPONENT_PROJECT_URL=	http://pygments.org/
 COMPONENT_BUGDB=	python-mod/pygments
 
-TPNO=			15206
+TPNO=			28720
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/setup.py.mk
--- a/components/python/pygments/patches/CVE-2015-8557.patch	Wed Jul 06 13:20:55 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-This patch is pulled from upstream; once we pull in 2.1 or newer, it will
-no longer be necessary.
-
---- Pygments-1.6/pygments/formatters/img.py	Sun Feb  3 01:26:49 2013
-+++ Pygments-1.6/pygments/formatters/img.py	Wed Jan 20 13:33:20 2016
[email protected]@ -15,6 +15,8 @@
- from pygments.util import get_bool_opt, get_int_opt, \
-      get_list_opt, get_choice_opt
- 
-+import subprocess
-+
- # Import this carefully
- try:
-     from PIL import Image, ImageDraw, ImageFont
[email protected]@ -72,11 +74,11 @@
-             self._create_nix()
- 
-     def _get_nix_font_path(self, name, style):
--        from commands import getstatusoutput
--        exit, out = getstatusoutput('fc-list "%s:style=%s" file' %
--                                    (name, style))
--        if not exit:
--            lines = out.splitlines()
-+        proc = subprocess.Popen(['fc-list', "%s:style=%s" % (name, style), 'file'],
-+                                stdout=subprocess.PIPE, stderr=None)
-+        stdout, _ = proc.communicate()
-+        if proc.returncode == 0:
-+            lines = stdout.splitlines()
-             if lines:
-                 path = lines[0].strip().strip(':')
-                 return path
--- a/components/python/pygments/pygments-PYVER.p5m	Wed Jul 06 13:20:55 2016 -0700
+++ b/components/python/pygments/pygments-PYVER.p5m	Wed Jul 13 14:48:26 2016 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -58,6 +58,7 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/formatters/bbcode.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/formatters/html.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/formatters/img.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/formatters/irc.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/formatters/latex.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/formatters/other.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/formatters/rtf.py
@@ -66,41 +67,139 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/formatters/terminal256.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexer.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/_asybuiltins.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/_clbuiltins.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/_lassobuiltins.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/_luabuiltins.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/_asy_builtins.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/_cl_builtins.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/_cocoa_builtins.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/_csound_builtins.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/_lasso_builtins.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/_lua_builtins.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/_mapping.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/_openedgebuiltins.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/_phpbuiltins.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/_mql_builtins.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/_openedge_builtins.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/_php_builtins.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/_postgres_builtins.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/_robotframeworklexer.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/_scilab_builtins.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/_sourcemodbuiltins.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/_sourcemod_builtins.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/_stan_builtins.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/_vimbuiltins.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/_vim_builtins.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/actionscript.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/agile.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/algebra.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/ambient.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/apl.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/archetype.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/asm.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/automation.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/basic.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/business.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/c_cpp.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/c_like.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/chapel.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/compiled.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/configs.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/console.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/csound.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/css.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/d.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/dalvik.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/data.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/diff.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/dotnet.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/dsls.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/dylan.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/ecl.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/eiffel.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/elm.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/erlang.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/esoteric.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/ezhil.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/factor.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/fantom.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/felix.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/fortran.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/foxpro.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/functional.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/go.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/grammar_notation.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/graph.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/graphics.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/haskell.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/haxe.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/hdl.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/hexdump.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/html.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/idl.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/igor.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/inferno.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/installers.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/int_fiction.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/iolang.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/j.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/javascript.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/julia.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/jvm.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/lisp.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/make.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/markup.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/math.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/matlab.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/ml.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/modeling.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/modula2.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/nimrod.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/nit.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/nix.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/oberon.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/objective.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/ooc.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/other.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/parasail.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/parsers.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/pascal.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/pawn.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/perl.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/php.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/praat.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/prolog.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/python.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/qvt.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/r.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/rdf.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/rebol.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/resource.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/roboconf.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/robotframework.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/ruby.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/rust.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/scripting.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/shell.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/smalltalk.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/snobol.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/special.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/sql.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/supercollider.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/tcl.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/templates.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/testing.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/text.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/textedit.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/textfmts.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/theorem.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/trafficscript.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/urbi.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/web.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/webmisc.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/lexers/x10.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/modeline.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/plugin.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/regexopt.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/scanner.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/sphinxext.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/style.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/styles/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/styles/algol.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/styles/algol_nu.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/styles/arduino.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/styles/autumn.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/styles/borland.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/styles/bw.py
@@ -109,10 +208,14 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/styles/emacs.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/styles/friendly.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/styles/fruity.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/styles/igor.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/styles/lovelace.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/styles/manni.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/styles/monokai.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/styles/murphy.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/styles/native.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/styles/paraiso_dark.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/styles/paraiso_light.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/styles/pastie.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/styles/perldoc.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/styles/rrt.py
@@ -120,6 +223,7 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/styles/trac.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/styles/vim.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/styles/vs.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pygments/styles/xcode.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/token.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/unistring.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pygments/util.py
--- a/components/python/pygments/pygments.license	Wed Jul 06 13:20:55 2016 -0700
+++ b/components/python/pygments/pygments.license	Wed Jul 13 14:48:26 2016 -0700
@@ -1,6 +1,3 @@
-========== BEGIN ATTRIBUTION FOR pygments v1.5 =================================
-
-
 Copyright 2006-2012 by the Pygments team, see AUTHORS.
 All rights reserved.
 
@@ -2301,5 +2298,3 @@
  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.
-
-
--- a/components/python/pymemcache/Makefile	Wed Jul 06 13:20:55 2016 -0700
+++ b/components/python/pymemcache/Makefile	Wed Jul 13 14:48:26 2016 -0700
@@ -26,11 +26,11 @@
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		pymemcache
-COMPONENT_VERSION=	1.3.2
+COMPONENT_VERSION=	1.3.5
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-	sha256:b5eeecb5deeed099318f8e92520051ea7ed0f4f61eb6b3eba6b999836cc3bddb
+	sha256:549aba771cdfdf44f320beeaf605cddd6adf32ba6e54f48d569a81b6c63a970e
 COMPONENT_ARCHIVE_URL=	$(call pypi_url)
 COMPONENT_PROJECT_URL=	https://github.com/pinterest/pymemcache
 COMPONENT_BUGDB=	python-mod/pymemcache
--- a/components/python/pymemcache/pymemcache-PYVER.p5m	Wed Jul 06 13:20:55 2016 -0700
+++ b/components/python/pymemcache/pymemcache-PYVER.p5m	Wed Jul 13 14:48:26 2016 -0700
@@ -41,7 +41,6 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/pymemcache-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
 file path=usr/lib/python$(PYVER)/vendor-packages/pymemcache-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/pymemcache-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/pymemcache-$(COMPONENT_VERSION)-py$(PYVER).egg-info/pbr.json
 file path=usr/lib/python$(PYVER)/vendor-packages/pymemcache-$(COMPONENT_VERSION)-py$(PYVER).egg-info/requires.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/pymemcache-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/pymemcache/__init__.py
--- a/components/python/pyparsing/Makefile	Wed Jul 06 13:20:55 2016 -0700
+++ b/components/python/pyparsing/Makefile	Wed Jul 13 14:48:26 2016 -0700
@@ -20,21 +20,21 @@
 #
 
 #
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		pyparsing
-COMPONENT_VERSION=	2.0.1
+COMPONENT_VERSION=	2.1.4
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:0007cd3f008eba4a203f1f6b4b133ddc352552c8808b694c88c23db56416e4e4
+    sha256:a9234dea79b50d49b92a994132cd1c84e873f3936db94977a66f0a4159b1797c
 COMPONENT_ARCHIVE_URL=	$(call pypi_url)
 COMPONENT_PROJECT_URL=	https://pypi.python.org/pypi/pyparsing/
 COMPONENT_BUGDB=	python-mod/pyparsing
 
-TPNO=			15999
+TPNO=			29066
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/setup.py.mk
@@ -50,4 +50,3 @@
 test:		$(NO_TESTS)
 
 system-test:    $(NO_TESTS)
-
--- a/components/python/pyparsing/pyparsing-PYVER.p5m	Wed Jul 06 13:20:55 2016 -0700
+++ b/components/python/pyparsing/pyparsing-PYVER.p5m	Wed Jul 13 14:48:26 2016 -0700
@@ -18,7 +18,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+
+#
+# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -35,8 +37,13 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2013/250
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file path=usr/lib/python$(PYVER)/vendor-packages/pyparsing-$(COMPONENT_VERSION)-py$(PYVER).egg-info
+#
+file path=usr/lib/python$(PYVER)/vendor-packages/pyparsing-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
+file path=usr/lib/python$(PYVER)/vendor-packages/pyparsing-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/pyparsing-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/pyparsing-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/pyparsing.py
+#
 license pyparsing.license license="MIT, GPLv3, BSD"
 
 # force the rename with an optional dependency on the old name
--- a/components/python/pyrabbit/Makefile	Wed Jul 06 13:20:55 2016 -0700
+++ b/components/python/pyrabbit/Makefile	Wed Jul 13 14:48:26 2016 -0700
@@ -20,21 +20,21 @@
 #
 
 #
-# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		pyrabbit
-COMPONENT_VERSION=	1.0.1
+COMPONENT_VERSION=	1.1.0
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:7bc2b89fb332f62f4aaa891b1a4c8bfa38b32d154d44403afc83f00755528bdc
+    sha256:50b8995fbfde14820ddc97292312c8f0c77054748c2b018138d03d94e400c39c
 COMPONENT_ARCHIVE_URL=	$(call pypi_url)
 COMPONENT_PROJECT_URL=	https://github.com/bkjones/pyrabbit
 COMPONENT_BUGDB=	python-mod/pyrabbit
 
-TPNO=			14503
+TPNO=			29383
 
 # pyrabbit itself is Python 3 ready: builds & publishes cleanly.  But it
 # depends on httplib2 which has its own dependency issues (see its Makefile
@@ -56,4 +56,3 @@
 test:		$(NO_TESTS)
 
 system-test:    $(NO_TESTS)
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/python-editor/Makefile	Wed Jul 13 14:48:26 2016 -0700
@@ -0,0 +1,51 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		python-editor
+COMPONENT_VERSION=	1.0
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH=	\
+    sha256:4a2b6a945d06e347a8fafe2475f533d05887b193b2e162aff961f63642c8a60e
+COMPONENT_ARCHIVE_URL=	$(call pypi_url)
+COMPONENT_PROJECT_URL=	https://github.com/fmoo/python-editor
+COMPONENT_BUGDB=	python-mod/python-editor
+
+TPNO=			28827
+
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/setup.py.mk
+include $(WS_MAKE_RULES)/ips.mk
+
+ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+
+# common targets
+build:		$(BUILD_NO_ARCH)
+
+install:	$(INSTALL_NO_ARCH)
+
+test:		$(NO_TESTS)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/python-editor/python-editor-PYVER.p5m	Wed Jul 13 14:48:26 2016 -0700
@@ -0,0 +1,56 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python/python-editor-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="Programmatically open an editor, capture the result."
+set name=pkg.description \
+    value="Python-editor is a library that provides the editor module for programmatically interfacing with your system's $EDITOR."
+set name=com.oracle.info.description value="the python-editor module"
+set name=com.oracle.info.tpno value=$(TPNO)
+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="Peter Ruibal <[email protected]>"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2016/431
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+#
+file path=usr/lib/python$(PYVER)/vendor-packages/editor.py
+file path=usr/lib/python$(PYVER)/vendor-packages/python_editor-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
+file path=usr/lib/python$(PYVER)/vendor-packages/python_editor-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/python_editor-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/python_editor-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
+#
+license LICENSE license="Apache v2.0"
+
+# force a dependency on the Python runtime
+depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
+    pkg.debug.depend.path=usr/bin
+
+# force a dependency on the python-editor package
+depend type=require \
+    fmri=library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- a/components/python/pytz/Makefile	Wed Jul 06 13:20:55 2016 -0700
+++ b/components/python/pytz/Makefile	Wed Jul 13 14:48:26 2016 -0700
@@ -20,22 +20,22 @@
 #
 
 #
-# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		pytz
-COMPONENT_VERSION=	2014.10
+COMPONENT_VERSION=	2016.4
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:a94138b638907491f473c875e8c95203a6a02efef52b6562be302e435016f4f3
+    sha256:c823de61ff40d1996fe087cec343e0503881ca641b897e0f9b86c7683a0bfee1
 COMPONENT_ARCHIVE_URL=	$(call pypi_url)
 COMPONENT_PROJECT_URL=	http://pytz.sourceforge.net/
 COMPONENT_BUGDB=	python-mod/pytz
 
-TPNO=			21748
+TPNO=			28956
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/setup.py.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pytz/patches/01-zoneinfopath.patch	Wed Jul 13 14:48:26 2016 -0700
@@ -0,0 +1,51 @@
+pytz by default ships a private copy of the Olson timezone database, for
+operating systems that don't ship their own.  Since Solaris does, we should
+point at that copy.  The extra table files are in different places between
+the two, so we adjust those paths as well.
+
+--- pytz-2016.4/pytz/__init__.py.~1~	2016-05-19 12:19:35.788693592 -0700
++++ pytz-2016.4/pytz/__init__.py	2016-05-19 12:42:59.605991654 -0700
[email protected]@ -86,8 +86,7 @@
+     for part in name_parts:
+         if part == os.path.pardir or os.path.sep in part:
+             raise ValueError('Bad path segment: %r' % part)
+-    filename = os.path.join(os.path.dirname(__file__),
+-                            'zoneinfo', *name_parts)
++    filename = os.path.join('/usr/share/lib/zoneinfo', *name_parts)
+     if not os.path.exists(filename) and resource_stream is not None:
+         # http://bugs.launchpad.net/bugs/383171 - we avoid using this
+         # unless absolutely necessary to help when a broken version of
[email protected]@ -326,13 +325,15 @@
+ 
+     def _fill(self):
+         data = {}
+-        zone_tab = open_resource('zone.tab')
++        zone_tab = open_resource('tab/zone_sun.tab')
+         try:
+             for line in zone_tab:
+                 line = line.decode('UTF-8')
+                 if line.startswith('#'):
+                     continue
+                 code, coordinates, zone = line.split(None, 4)[:3]
++                if not code.isupper():
++                    continue
+                 if zone not in all_timezones_set:
+                     continue
+                 try:
[email protected]@ -354,13 +355,15 @@
+     '''
+     def _fill(self):
+         data = {}
+-        zone_tab = open_resource('iso3166.tab')
++        zone_tab = open_resource('tab/country.tab')
+         try:
+             for line in zone_tab.readlines():
+                 line = line.decode('UTF-8')
+                 if line.startswith('#'):
+                     continue
+                 code, name = line.split(None, 1)
++                if not code.isupper():
++                    continue
+                 data[code] = name.strip()
+             self.data = data
+         finally:
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pytz/patches/02-zones.patch	Wed Jul 13 14:48:26 2016 -0700
@@ -0,0 +1,13 @@
+Remove 'ROC' from all_timezones.  See
+https://mm.icann.org/pipermail/tz/2001-March/011492.html for details
+
+--- pytz-2016.4/pytz/__init__.py.~2~	2016-05-19 13:00:36.852619160 -0700
++++ pytz-2016.4/pytz/__init__.py	2016-05-19 13:00:52.244751240 -0700
[email protected]@ -1056,7 +1056,6 @@
+  'Pacific/Yap',
+  'Poland',
+  'Portugal',
+- 'ROC',
+  'ROK',
+  'Singapore',
+  'Turkey',
--- a/components/python/pytz/patches/zoneinfopath.patch	Wed Jul 06 13:20:55 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-pytz by default ships a private copy of the Olson timezone database, for
-operating systems that don't ship their own.  Since Solaris does, we should
-point at that copy.  The extra table files are in different places between
-the two, so we adjust those paths as well.
-
---- pytz-2014.10/pytz/__init__.py.~1~	2014-11-27 01:00:22.000000000 -0800
-+++ pytz-2014.10/pytz/__init__.py	2015-02-25 11:05:04.867482331 -0800
[email protected]@ -86,8 +86,7 @@ def open_resource(name):
-     for part in name_parts:
-         if part == os.path.pardir or os.path.sep in part:
-             raise ValueError('Bad path segment: %r' % part)
--    filename = os.path.join(os.path.dirname(__file__),
--                            'zoneinfo', *name_parts)
-+    filename = os.path.join('/usr/share/lib/zoneinfo', *name_parts)
-     if not os.path.exists(filename) and resource_stream is not None:
-         # http://bugs.launchpad.net/bugs/383171 - we avoid using this
-         # unless absolutely necessary to help when a broken version of
[email protected]@ -326,13 +325,15 @@ class _CountryTimezoneDict(LazyDict):
- 
-     def _fill(self):
-         data = {}
--        zone_tab = open_resource('zone.tab')
-+        zone_tab = open_resource('tab/zone_sun.tab')
-         try:
-             for line in zone_tab:
-                 line = line.decode('US-ASCII')
-                 if line.startswith('#'):
-                     continue
-                 code, coordinates, zone = line.split(None, 4)[:3]
-+                if not code.isupper():
-+                    continue
-                 if zone not in all_timezones_set:
-                     continue
-                 try:
[email protected]@ -354,13 +355,15 @@ class _CountryNameDict(LazyDict):
-     '''
-     def _fill(self):
-         data = {}
--        zone_tab = open_resource('iso3166.tab')
-+        zone_tab = open_resource('tab/country.tab')
-         try:
-             for line in zone_tab.readlines():
-                 line = line.decode('US-ASCII')
-                 if line.startswith('#'):
-                     continue
-                 code, name = line.split(None, 1)
-+                if not code.isupper():
-+                    continue
-                 data[code] = name.strip()
-             self.data = data
-         finally:
--- a/components/python/pytz/patches/zones.patch	Wed Jul 06 13:20:55 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-Remove 'ROC' from all_timezones.  See
-https://mm.icann.org/pipermail/tz/2001-March/011492.html for details
-
---- pytz-2014.10/pytz/__init__.py.~2~	2015-02-25 11:06:24.380394269 -0800
-+++ pytz-2014.10/pytz/__init__.py	2015-02-25 11:06:24.386963566 -0800
[email protected]@ -1050,7 +1050,6 @@ all_timezones = \
-  'Pacific/Yap',
-  'Poland',
-  'Portugal',
-- 'ROC',
-  'ROK',
-  'Singapore',
-  'Turkey',
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/requestsexceptions/Makefile	Wed Jul 13 14:48:26 2016 -0700
@@ -0,0 +1,54 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		requestsexceptions
+COMPONENT_VERSION=	1.1.3
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH=	\
+    sha256:d678b872f51f76d875e00e6667f4ddbf013b3a99490ae5fe07cf3e4f846e283e
+COMPONENT_ARCHIVE_URL=	$(call pypi_url)
+COMPONENT_PROJECT_URL=	https://github.com/openstack-infra/requestsexceptions
+COMPONENT_BUGDB=	python-mod/requests
+
+TPNO=			27542
+
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/setup.py.mk
+include $(WS_MAKE_RULES)/ips.mk
+
+ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+
+# common targets
+build:		$(BUILD_NO_ARCH)
+
+install:	$(INSTALL_NO_ARCH)
+
+# Tests require access to AWS services & the Internet
+test:		$(NO_TESTS)
+
+system-test:	$(SYSTEM_TESTS_NOT_IMPLEMENTED)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/requestsexceptions/requestsexceptions-PYVER.p5m	Wed Jul 13 14:48:26 2016 -0700
@@ -0,0 +1,64 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python/requestsexceptions-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="find the correct path to exceptions in the requests library"
+set name=pkg.description \
+    value='The python requests library bundles the urllib3 library, however, some software distributions modify requests to remove the bundled library. This makes some operations, such as supressing the "insecure platform warning" messages that urllib emits difficult. This is a simple library to find the correct path to exceptions in the requests library regardless of whether they are bundled.'
+set name=com.oracle.info.description \
+    value="the requestsexceptions Python module"
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/Python \
+    value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream value="Monty Taylor <[email protected]>"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2016/430
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+#
+file path=usr/lib/python$(PYVER)/vendor-packages/requestsexceptions-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
+file path=usr/lib/python$(PYVER)/vendor-packages/requestsexceptions-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/requestsexceptions-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/requestsexceptions-$(COMPONENT_VERSION)-py$(PYVER).egg-info/not-zip-safe
+file path=usr/lib/python$(PYVER)/vendor-packages/requestsexceptions-$(COMPONENT_VERSION)-py$(PYVER).egg-info/pbr.json
+file path=usr/lib/python$(PYVER)/vendor-packages/requestsexceptions-$(COMPONENT_VERSION)-py$(PYVER).egg-info/requires.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/requestsexceptions-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/requestsexceptions/__init__.py
+#
+license requestsexceptions.license license="Apache v2.0"
+
+# force a dependency on the Python runtime
+depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
+    pkg.debug.depend.path=usr/bin
+
+# force a dependency on requests; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/requests-$(PYV)
+
+# force a dependency on the requestsexceptions package
+depend type=require \
+    fmri=library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/requestsexceptions/requestsexceptions.license	Wed Jul 13 14:48:26 2016 -0700
@@ -0,0 +1,217 @@
+# Copyright 2015 Hewlett-Packard Development Company, L.P.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file 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/
+
+   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.
+
+      "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.
+
+      "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.
+
+   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
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file 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.
+
--- a/components/python/rfc3986/Makefile	Wed Jul 06 13:20:55 2016 -0700
+++ b/components/python/rfc3986/Makefile	Wed Jul 13 14:48:26 2016 -0700
@@ -20,22 +20,22 @@
 #
 
 #
-# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		rfc3986
-COMPONENT_VERSION=	0.2.0
+COMPONENT_VERSION=	0.3.1
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:8a7b3f6cfdfb969c2e876513e87c30ebe1e4bdc9fae4a63c701eee88bbec9b22
+    sha256:b94638db542896ccf89dc62785ec26dbcbd6a97d337f64e02615b164b974f2e5
 COMPONENT_ARCHIVE_URL=	$(call pypi_url)
 COMPONENT_PROJECT_URL=	https://github.com/sigmavirus24/rfc3986
 COMPONENT_BUGDB=	python-mod/rfc3986
 
-TPNO=			20390
+TPNO=			29486
 
 # UnicodeDecodeError issues; not Python 3 ready.
 PYTHON_VERSIONS=	$(PYTHON2_VERSIONS)
--- a/components/python/rfc3986/rfc3986-PYVER.p5m	Wed Jul 06 13:20:55 2016 -0700
+++ b/components/python/rfc3986/rfc3986-PYVER.p5m	Wed Jul 13 14:48:26 2016 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -41,7 +41,6 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/rfc3986-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
 file path=usr/lib/python$(PYVER)/vendor-packages/rfc3986-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/rfc3986-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/rfc3986-$(COMPONENT_VERSION)-py$(PYVER).egg-info/not-zip-safe
 file path=usr/lib/python$(PYVER)/vendor-packages/rfc3986-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/rfc3986/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/rfc3986/api.py
@@ -49,9 +48,10 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/rfc3986/exceptions.py
 file path=usr/lib/python$(PYVER)/vendor-packages/rfc3986/misc.py
 file path=usr/lib/python$(PYVER)/vendor-packages/rfc3986/normalizers.py
+file path=usr/lib/python$(PYVER)/vendor-packages/rfc3986/parseresult.py
 file path=usr/lib/python$(PYVER)/vendor-packages/rfc3986/uri.py
 #
-license LICENSE license="Apache v2.0"
+license rfc3986.license license="Apache v2.0"
 
 # force a dependency on the Python runtime
 depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/rfc3986/rfc3986.license	Wed Jul 13 14:48:26 2016 -0700
@@ -0,0 +1,201 @@
+The following applies to all products licensed under the Apache 2.0 License:
+
+You may not use the identified files except in compliance with the Apache License, Version 2.0 (the "License.")
+ 
+You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0.  A copy of the license is also reproduced below.
+
+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.
+
+Copyright 2014 Ian Cordasco, Rackspace
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file 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.
+
+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/
+
+   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.
+
+      "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.
+
+      "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.
+
+   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
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/rjsmin/Makefile	Wed Jul 13 14:48:26 2016 -0700
@@ -0,0 +1,53 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		rjsmin
+COMPONENT_VERSION=	1.0.12
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
+COMPONENT_ARCHIVE_HASH=	\
+    sha256:9511f280ae35c53d6b42a8e35663f08c39664bd472caf9a59cdec099bd59a2c1
+COMPONENT_ARCHIVE_URL=	http://storage.perlig.de/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
+COMPONENT_PROJECT_URL=	http://opensource.perlig.de/rjsmin/
+COMPONENT_BUGDB=	python-mod/rjsmin
+
+TPNO=			27708
+
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/setup.py.mk
+include $(WS_MAKE_RULES)/ips.mk
+
+ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+
+# common targets
+build:		$(BUILD_32_and_64)
+
+install:	$(INSTALL_32_and_64)
+
+test:           $(NO_TESTS)
+
+system-test:    $(NO_TESTS)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/rjsmin/rjsmin-GENFRAG.p5m	Wed Jul 13 14:48:26 2016 -0700
@@ -0,0 +1,44 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+# change the delivery of the docs to /usr/share/doc.  We only need one
+# copy of them so just use the python 2.7 path
+<transform file path=usr/(share/doc/rjsmin/.*) -> set action.hash usr/lib/python2.7/vendor-packages/%<1>>
+file path=usr/share/doc/rjsmin/BENCHMARKS
+file path=usr/share/doc/rjsmin/CHANGES
+file path=usr/share/doc/rjsmin/README.rst
+file path=usr/share/doc/rjsmin/apidoc/api-objects.txt
+file path=usr/share/doc/rjsmin/apidoc/crarr.png
+file path=usr/share/doc/rjsmin/apidoc/epydoc.css
+file path=usr/share/doc/rjsmin/apidoc/epydoc.js
+file path=usr/share/doc/rjsmin/apidoc/help.html
+file path=usr/share/doc/rjsmin/apidoc/identifier-index.html
+file path=usr/share/doc/rjsmin/apidoc/index.html
+file path=usr/share/doc/rjsmin/apidoc/module-tree.html
+file path=usr/share/doc/rjsmin/apidoc/redirect.html
+file path=usr/share/doc/rjsmin/apidoc/rjsmin-module.html
+file path=usr/share/doc/rjsmin/apidoc/rjsmin-pysrc.html
+#
+license rjsmin.license license="Apache 2.0"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/rjsmin/rjsmin-PYVER.p5m	Wed Jul 13 14:48:26 2016 -0700
@@ -0,0 +1,54 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python/rjsmin-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="rJSmin - Javascript Minifier"
+set name=pkg.description \
+    value="rJSmin is a javascript minifier written in python.  The minifier is based on the semantics of jsmin.c by Douglas Crockford.  The module is a re-implementation aiming for speed, so it can be used at runtime (rather than during a preprocessing step)."
+set name=com.oracle.info.description value="the rjsmin Python module"
+set name=com.oracle.info.tpno value=$(TPNO)
+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="André Malo"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2016/432
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+#
+file path=usr/lib/python$(PYVER)/vendor-packages/64/_rjsmin.so
+file path=usr/lib/python$(PYVER)/vendor-packages/_rjsmin.so
+file path=usr/lib/python$(PYVER)/vendor-packages/rjsmin-$(COMPONENT_VERSION)-py$(PYVER).egg-info
+file path=usr/lib/python$(PYVER)/vendor-packages/rjsmin.py
+#
+license rjsmin.license license="Apache 2.0"
+
+# force a dependency on the Python runtime
+depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
+    pkg.debug.depend.path=usr/bin
+
+# force a dependency on the rjsmin package
+depend type=require \
+    fmri=library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/rjsmin/rjsmin.license	Wed Jul 13 14:48:26 2016 -0700
@@ -0,0 +1,686 @@
+The following applies to all products licensed under the Apache 2.0 License:
+
+You may not use the identified files except in compliance with the Apache License, Version 2.0 (the "License.")
+ 
+You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0.  A copy of the license is also reproduced below.
+
+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/
+
+   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.
+
+      "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.
+
+      "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.
+
+   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
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file 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.
+
+PKG-INFO file:
+
+Metadata-Version: 1.1
+Name: rjsmin
+Version: 1.0.12
+Summary: Javascript Minifier
+Home-page: http://opensource.perlig.de/rjsmin/
+Author: André Malo
+Author-email: [email protected]
+License:                                  Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   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.
+
+      "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.
+
+      "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.
+
+   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
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file 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.
+Download-URL: http://storage.perlig.de/rjsmin/
+Description: =====================
+         Javascript Minifier
+        =====================
+        
+        rJSmin is a javascript minifier written in python.
+        
+        The minifier is based on the semantics of `jsmin.c by Douglas Crockford`_\.
+        
+        The module is a re-implementation aiming for speed, so it can be used at
+        runtime (rather than during a preprocessing step). Usually it produces the
+        same results as the original ``jsmin.c``. It differs in the following ways:
+        
+        - there is no error detection: unterminated string, regex and comment
+          literals are treated as regular javascript code and minified as such.
+        - Control characters inside string and regex literals are left untouched; they
+          are not converted to spaces (nor to \n)
+        - Newline characters are not allowed inside string and regex literals, except
+          for line continuations in string literals (ECMA-5).
+        - "return /regex/" is recognized correctly.
+        - Line terminators after regex literals are handled more sensibly
+        - "+ +" and "- -" sequences are not collapsed to '++' or '--'
+        - Newlines before ! operators are removed more sensibly
+        - Comments starting with an exclamation mark (``!``) can be kept optionally
+        - rJSmin does not handle streams, but only complete strings. (However, the
+          module provides a "streamy" interface).
+        
+        Since most parts of the logic are handled by the regex engine it's way faster
+        than the original python port of ``jsmin.c`` by Baruch Even. The speed factor
+        varies between about 6 and 55 depending on input and python version (it gets
+        faster the more compressed the input already is).  Compared to the
+        speed-refactored python port by Dave St.Germain the performance gain is less
+        dramatic but still between 3 and 50 (for huge inputs)). See the
+        docs/BENCHMARKS file for details.
+        
+        rjsmin.c is a reimplementation of rjsmin.py in C and speeds it up even more.
+        
+        Both python 2 (>=2.4) and python 3 are supported.
+        
+        .. _jsmin.c by Douglas Crockford: http://www.crockford.com/javascript/jsmin.c
+        
+        
+        Copyright and License
+        ~~~~~~~~~~~~~~~~~~~~~
+        
+        Copyright 2011 - 2015
+        André Malo or his licensors, as applicable.
+        
+        The whole package (except for the files in the bench/ directory) is
+        distributed under the Apache License Version 2.0. You'll find a copy in the
+        root directory of the distribution or online at:
+        <http://www.apache.org/licenses/LICENSE-2.0>.
+        
+        
+        Bugs
+        ~~~~
+        
+        No bugs, of course. ;-)
+        But if you've found one or have an idea how to improve rjsmin, feel free
+        to send a pull request on `github <https://github.com/ndparker/rjsmin>`_
+        or send a mail to <[email protected]>.
+        
+        
+        Author Information
+        ~~~~~~~~~~~~~~~~~~
+        
+        André "nd" Malo <nd perlig.de>
+        GPG: 0x8103A37E
+        
+        
+            If God intended people to be naked, they would be born that way.
+            -- Oscar Wilde
+        
+        .. vim:tw=72 syntax=rest
+Keywords: Javascript,Minimization
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Web Environment
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved
+Classifier: License :: OSI Approved :: Apache License, Version 2.0
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: C
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: Jython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
+Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
+Classifier: Topic :: Software Development :: Libraries
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Classifier: Topic :: Text Processing
+Classifier: Topic :: Text Processing :: Filters
+Classifier: Topic :: Utilities
+Provides: rjsmin (1.0)
+
+
+docs/DESCRIPTION file:
+
+Copyright and License
+~~~~~~~~~~~~~~~~~~~~
+
+Copyright 2011 - 2015
+André Malo or his licensors, as applicable.
+
+The whole package (except for the files in the bench/ directory) is
+distributed under the Apache License Version 2.0. You'll find a copy in the
+root directory of the distribution or online at:
+<http://www.apache.org/licenses/LICENSE-2.0>.
+
+
+bench/jsmin.c: (Note: this file is used for comparison and benchmarking purposes only, not included in the binary distribution)
+
+/* jsmin.c
+   2011-01-22
+
+Copyright (c) 2002 Douglas Crockford  (www.crockford.com)
+
+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 shall be used for Good, not Evil.
+
+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.
+
+
+bench/bootstrap.js: (used for benchmarking only, not included in the binary distribution)
+
+/* ===================================================
+ * bootstrap-transition.js v2.0.4
+ * http://twitter.github.com/bootstrap/javascript.html#transitions
+ * ===================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file 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.
+ * ========================================================== */
+
+
+bench/DateTimeShortcuts.js file: (used for benchmarking purposes only, not included in the binary distribution)
+
+/*! Taken from django release 1.8.5
+
+Copyright (c) Django Software Foundation and individual contributors.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    1. Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+
+    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.
+
+    3. Neither the name of Django nor the names of its contributors 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.
+*/
+
+
+bench/jquery-1.7.1.js file (used for benchmarking purposes only, not included in the binary distribution)
+
+/*!
+ * jQuery JavaScript Library v1.7.1
+ * http://jquery.com/
+ *
+ * Copyright 2011, John Resig
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * Includes Sizzle.js
+ * http://sizzlejs.com/
+ * Copyright 2011, The Dojo Foundation
+ * Released under the MIT, BSD, and GPL Licenses.
+ *
+ * Date: Mon Nov 21 21:11:03 2011 -0500
+ */
+
+
+bench/markermanager.js file (used for benchmarking purposes only, not included in the binary distribution)
+
+ * @name MarkerManager v3
+ * @version 1.0
+ * @copyright (c) 2007 Google Inc.
+ * @author Doug Ricket, Bjorn Brala (port to v3), others,
+
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file 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.
+ */
+
+bench/jsmin_2_0_9.py (used for benchmarking purposes only, not included in the binary distribution)
+
+# This code is original from jsmin by Douglas Crockford, it was translated to
+# Python by Baruch Even. It was rewritten by Dave St.Germain for speed.
+#
+# The MIT License (MIT)
+# 
+# Copyright (c) 2013 Dave St.Germain
+# 
+# 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.
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/unicodecsv/Makefile	Wed Jul 13 14:48:26 2016 -0700
@@ -0,0 +1,56 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		unicodecsv
+COMPONENT_VERSION=	0.14.1
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH=	\
+    sha256:018c08037d48649a0412063ff4eda26eaa81eff1546dbffa51fa5293276ff7fc
+COMPONENT_ARCHIVE_URL=	$(call pypi_url)
+COMPONENT_PROJECT_URL=	https://github.com/jdunck/python-unicodecsv
+COMPONENT_BUGDB=	python-mod/unicodecsv
+
+TPNO=			27636
+
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/setup.py.mk
+include $(WS_MAKE_RULES)/ips.mk
+
+ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+
+COMPONENT_TEST_DIR =	$(SOURCE_DIR)
+COMPONENT_TEST_ARGS =	setup.py test
+
+# common targets
+build:		$(BUILD_NO_ARCH)
+
+install:	$(INSTALL_NO_ARCH)
+
+test:		$(TEST_NO_ARCH)
+
+system-test:    $(SYSTEM_TESTS_NOT_IMPLEMENTED)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/unicodecsv/unicodecsv-PYVER.p5m	Wed Jul 13 14:48:26 2016 -0700
@@ -0,0 +1,58 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python/unicodecsv-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="CSV python module with unicode support"
+set name=pkg.description \
+    value="Unicodecsv is a drop-in replacement for Python 2's csv module which supports unicode strings without a hassle."
+set name=com.oracle.info.description value="the Python unicodecsv module"
+set name=com.oracle.info.tpno value=$(TPNO)
+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="Jeremy Dunck <[email protected]>"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2016/433
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+#
+file path=usr/lib/python$(PYVER)/vendor-packages/unicodecsv-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
+file path=usr/lib/python$(PYVER)/vendor-packages/unicodecsv-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/unicodecsv-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/unicodecsv-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/unicodecsv/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/unicodecsv/py2.py
+file path=usr/lib/python$(PYVER)/vendor-packages/unicodecsv/py3.py
+file path=usr/lib/python$(PYVER)/vendor-packages/unicodecsv/test.py
+#
+license unicodecsv.license license=BSD
+
+# force a dependency on the Python runtime
+depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
+    pkg.debug.depend.path=usr/bin
+
+# force a dependency on the unicodecsv package
+depend type=require \
+    fmri=library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/unicodecsv/unicodecsv.license	Wed Jul 13 14:48:26 2016 -0700
@@ -0,0 +1,20 @@
+Copyright 2010 Jeremy Dunck. All rights reserved.
+Redistribution and use in source and binary forms, with or without modification, are
+permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this list of
+conditions and the following disclaimer.
+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.
+THIS SOFTWARE IS PROVIDED BY JEREMY DUNCK ``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 JEREMY DUNCK 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.
+The views and conclusions contained in the software and documentation are those of the
+authors and should not be interpreted as representing official policies, either expressed
+or implied, of Jeremy Dunck.
--- a/components/python/waitress/Makefile	Wed Jul 06 13:20:55 2016 -0700
+++ b/components/python/waitress/Makefile	Wed Jul 13 14:48:26 2016 -0700
@@ -20,21 +20,21 @@
 #
 
 #
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		waitress
-COMPONENT_VERSION=	0.8.5
+COMPONENT_VERSION=	0.9.0
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:302efc3e8b0f7e43da58fdbb67f13c088d09dc378e55ad19078cfbf02ef44228
+    sha256:5368b6f2c51823b60e01cd762610385cc2951b25cbf0e930445215d2527acbb4
 COMPONENT_ARCHIVE_URL=	$(call pypi_url)
 COMPONENT_PROJECT_URL=	https://pypi.python.org/pypi/waitress
 COMPONENT_BUGDB=	python-mod/waitress
 
-TPNO=			14503
+TPNO=			29067
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/setup.py.mk
@@ -56,7 +56,7 @@
 
 install:	$(INSTALL_NO_ARCH)
 
-# Tests requires the coverage, nose and unittest2 packages.
+# SleepyThreadTests will fail due to the need for elevated privileges.
 test:		$(TEST_NO_ARCH)
 
 system-test:    $(SYSTEM_TESTS_NOT_IMPLEMENTED)
--- a/components/python/waitress/waitress-PYVER.p5m	Wed Jul 06 13:20:55 2016 -0700
+++ b/components/python/waitress/waitress-PYVER.p5m	Wed Jul 13 14:48:26 2016 -0700
@@ -18,7 +18,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+
+#
+# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -34,6 +36,7 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2013/379
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+#
 link path=usr/bin/waitress-serve target=waitress-serve-$(PYVER) \
     mediator=python mediator-version=$(PYVER)
 file path=usr/bin/waitress-serve-$(PYVER)
@@ -56,6 +59,7 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/waitress/task.py
 file path=usr/lib/python$(PYVER)/vendor-packages/waitress/trigger.py
 file path=usr/lib/python$(PYVER)/vendor-packages/waitress/utilities.py
+#
 license waitress.license license=ZPL
 
 # force the rename with an optional dependency on the old name
--- a/components/python/webtest/Makefile	Wed Jul 06 13:20:55 2016 -0700
+++ b/components/python/webtest/Makefile	Wed Jul 13 14:48:26 2016 -0700
@@ -20,21 +20,21 @@
 #
 
 #
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		WebTest
-COMPONENT_VERSION=	2.0.6
+COMPONENT_VERSION=	2.0.21
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
-COMPONENT_ARCHIVE=	$(COMPONENT_SRC).zip
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:cf74621cf8694fc89b7ac61e1aace02a649080f03ab6e43e256f32ca3a09d452
+    sha256:3dc92ecd7604e21fc7c97578e4c43aff2a67cebdd4884a2aa804d85e85b34b55
 COMPONENT_ARCHIVE_URL=	$(call pypi_url)
 COMPONENT_PROJECT_URL=	https://pypi.python.org/pypi/WebTest
 COMPONENT_BUGDB=	python-mod/webtest
 
-TPNO=			14503
+TPNO=			28712
 
 # Depends on paste.deploy, which depends on paste, which is not Python 3 ready.
 PYTHON_VERSIONS=	$(PYTHON2_VERSIONS)
--- a/components/python/webtest/webtest-PYVER.p5m	Wed Jul 06 13:20:55 2016 -0700
+++ b/components/python/webtest/webtest-PYVER.p5m	Wed Jul 13 14:48:26 2016 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -55,7 +55,8 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/webtest/response.py
 file path=usr/lib/python$(PYVER)/vendor-packages/webtest/sel.py
 file path=usr/lib/python$(PYVER)/vendor-packages/webtest/utils.py
-license docs/license.txt license=MIT
+#
+license docs/license.rst license=MIT
 
 # force a group dependency on the optional lxml; pkgdepend work is needed to
 # flush this out.
--- a/components/python/xattr/xattr-PYVER.p5m	Wed Jul 06 13:20:55 2016 -0700
+++ b/components/python/xattr/xattr-PYVER.p5m	Wed Jul 13 14:48:26 2016 -0700
@@ -60,7 +60,7 @@
 license LICENSE.txt license=MIT
 
 # Dependencies on cffi must be incorporated.
-depend type=incorporate fmri=library/python/cffi-$(PYV)@1.4.2
+depend type=incorporate fmri=library/python/cffi-$(PYV)@1.5.2
 
 # force a dependency on cffi; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/cffi-$(PYV)