7051374 3rd party libraries in IPS gate should move to userland
authorErik Trauschke <Erik.Trauschke@oracle.com>
Wed, 13 Jul 2011 12:43:29 -0700
changeset 394 dffc35307ef2
parent 393 b6a26174ccce
child 395 9f5975c39490
7051374 3rd party libraries in IPS gate should move to userland 7008441 Problem with utility/python 7066296 Bump LDTP to v2.1.1
components/meta-packages/history/SUNWldtp.p5m
components/meta-packages/history/SUNWpython-cherrypy.p5m
components/meta-packages/history/SUNWpython-mako.p5m
components/meta-packages/history/SUNWpython-ply.p5m
components/meta-packages/history/SUNWpython-pycurl.p5m
components/python/cherrypy/Makefile
components/python/cherrypy/cherrypy-26.p5m
components/python/cherrypy/cherrypy.copyright
components/python/cherrypy/cherrypy.p5m
components/python/cherrypy/patches/cp-ticket-847.patch
components/python/cherrypy/patches/setup.cfg.patch
components/python/coverage/Makefile
components/python/coverage/coverage-26.p5m
components/python/coverage/coverage.copyright
components/python/coverage/coverage.p5m
components/python/coverage/jquery.copyright
components/python/ldtp/Makefile
components/python/ldtp/ldtp-26.p5m
components/python/ldtp/ldtp.copyright
components/python/ldtp/ldtp.p5m
components/python/m2crypto/Makefile
components/python/m2crypto/m2crypto-26.p5m
components/python/m2crypto/m2crypto.copyright
components/python/m2crypto/m2crypto.p5m
components/python/m2crypto/patches/crl.patch
components/python/mako/Makefile
components/python/mako/mako-26.p5m
components/python/mako/mako.copyright
components/python/mako/mako.p5m
components/python/ply/Makefile
components/python/ply/ply-26.p5m
components/python/ply/ply.copyright
components/python/ply/ply.p5m
components/python/pybonjour/Makefile
components/python/pybonjour/pybonjour-26.p5m
components/python/pybonjour/pybonjour.copyright
components/python/pybonjour/pybonjour.p5m
components/python/pycurl/Makefile
components/python/pycurl/patches/pycurl-mondo.patch
components/python/pycurl/pycurl-26.p5m
components/python/pycurl/pycurl.copyright
components/python/pycurl/pycurl.p5m
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/history/SUNWldtp.p5m	Wed Jul 13 12:43:29 2011 -0700
@@ -0,0 +1,27 @@
+#
+# 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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=system/desktop/[email protected] type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/history/SUNWpython-cherrypy.p5m	Wed Jul 13 12:43:29 2011 -0700
@@ -0,0 +1,27 @@
+#
+# 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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python-2/[email protected] type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/history/SUNWpython-mako.p5m	Wed Jul 13 12:43:29 2011 -0700
@@ -0,0 +1,27 @@
+#
+# 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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python-2/[email protected] type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/history/SUNWpython-ply.p5m	Wed Jul 13 12:43:29 2011 -0700
@@ -0,0 +1,27 @@
+#
+# 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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python-2/[email protected] type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/history/SUNWpython-pycurl.p5m	Wed Jul 13 12:43:29 2011 -0700
@@ -0,0 +1,27 @@
+#
+# 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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python-2/[email protected] type=require
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cherrypy/Makefile	Wed Jul 13 12:43:29 2011 -0700
@@ -0,0 +1,49 @@
+#
+# 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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+include ../../../make-rules/shared-macros.mk
+
+PATH=/usr/bin:/usr/gnu/bin:/usr/sbin
+
+COMPONENT_NAME=		CherryPy
+COMPONENT_VERSION=	3.1.2
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH=	sha1:a94aedfd0e675858dbcc32dd250c23d285ee9b88
+COMPONENT_ARCHIVE_URL=	http://download.cherrypy.org/cherrypy/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
+
+PATCH_LEVEL=0
+
+include $(WS_TOP)/make-rules/prep.mk
+include $(WS_TOP)/make-rules/setup.py.mk
+include $(WS_TOP)/make-rules/ips.mk
+
+# common targets
+build:		$(BUILD_32)
+
+install:	$(INSTALL_32)
+
+test:		$(NO_TESTS)
+
+BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
+
+include $(WS_TOP)/make-rules/depend.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cherrypy/cherrypy-26.p5m	Wed Jul 13 12:43:29 2011 -0700
@@ -0,0 +1,88 @@
+#
+# 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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Pythonic, object-oriented HTTP framework"
+set name=pkg.description value="CherryPy is a Pythonic, object-oriented HTTP framework"
+set name=info.classification value="org.opensolaris.category.2008:Development/Python"
+set name=info.upstream_url value="http://www.cherrypy.org/"
+set name=info.upstream value="CherryPy Team <[email protected]>"
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2011/259
+
+license cherrypy.copyright license=BSD
+
+dir path=usr
+dir path=usr/bin
+dir path=usr/lib
+dir path=usr/lib/python2.6
+dir path=usr/lib/python2.6/vendor-packages
+dir path=usr/lib/python2.6/vendor-packages/cherrypy
+dir path=usr/lib/python2.6/vendor-packages/cherrypy/lib
+dir path=usr/lib/python2.6/vendor-packages/cherrypy/process
+dir path=usr/lib/python2.6/vendor-packages/cherrypy/wsgiserver
+file path=usr/lib/python2.6/vendor-packages/cherrypy/LICENSE.txt
+file path=usr/lib/python2.6/vendor-packages/cherrypy/cherryd mode=555
+file path=usr/lib/python2.6/vendor-packages/cherrypy/favicon.ico
+file \
+    path=usr/lib/python2.6/vendor-packages/CherryPy-$(COMPONENT_VERSION)-py2.6.egg-info
+file path=usr/lib/python2.6/vendor-packages/cherrypy/__init__.py
+file path=usr/lib/python2.6/vendor-packages/cherrypy/_cpcgifs.py
+file path=usr/lib/python2.6/vendor-packages/cherrypy/_cpchecker.py
+file path=usr/lib/python2.6/vendor-packages/cherrypy/_cpconfig.py
+file path=usr/lib/python2.6/vendor-packages/cherrypy/_cpdispatch.py
+file path=usr/lib/python2.6/vendor-packages/cherrypy/_cperror.py
+file path=usr/lib/python2.6/vendor-packages/cherrypy/_cplogging.py
+file path=usr/lib/python2.6/vendor-packages/cherrypy/_cpmodpy.py
+file path=usr/lib/python2.6/vendor-packages/cherrypy/_cprequest.py
+file path=usr/lib/python2.6/vendor-packages/cherrypy/_cpserver.py
+file path=usr/lib/python2.6/vendor-packages/cherrypy/_cpthreadinglocal.py
+file path=usr/lib/python2.6/vendor-packages/cherrypy/_cptools.py
+file path=usr/lib/python2.6/vendor-packages/cherrypy/_cptree.py
+file path=usr/lib/python2.6/vendor-packages/cherrypy/_cpwsgi.py
+file path=usr/lib/python2.6/vendor-packages/cherrypy/_cpwsgi_server.py
+file path=usr/lib/python2.6/vendor-packages/cherrypy/lib/__init__.py
+file path=usr/lib/python2.6/vendor-packages/cherrypy/lib/auth.py
+file path=usr/lib/python2.6/vendor-packages/cherrypy/lib/caching.py
+file path=usr/lib/python2.6/vendor-packages/cherrypy/lib/covercp.py
+file path=usr/lib/python2.6/vendor-packages/cherrypy/lib/cptools.py
+file path=usr/lib/python2.6/vendor-packages/cherrypy/lib/encoding.py
+file path=usr/lib/python2.6/vendor-packages/cherrypy/lib/http.py
+file path=usr/lib/python2.6/vendor-packages/cherrypy/lib/httpauth.py
+file path=usr/lib/python2.6/vendor-packages/cherrypy/lib/profiler.py
+file path=usr/lib/python2.6/vendor-packages/cherrypy/lib/safemime.py
+file path=usr/lib/python2.6/vendor-packages/cherrypy/lib/sessions.py
+file path=usr/lib/python2.6/vendor-packages/cherrypy/lib/static.py
+file path=usr/lib/python2.6/vendor-packages/cherrypy/lib/tidy.py
+file path=usr/lib/python2.6/vendor-packages/cherrypy/lib/wsgiapp.py
+file path=usr/lib/python2.6/vendor-packages/cherrypy/lib/xmlrpc.py
+file path=usr/lib/python2.6/vendor-packages/cherrypy/process/__init__.py
+file path=usr/lib/python2.6/vendor-packages/cherrypy/process/plugins.py
+file path=usr/lib/python2.6/vendor-packages/cherrypy/process/servers.py
+file path=usr/lib/python2.6/vendor-packages/cherrypy/process/win32.py
+file path=usr/lib/python2.6/vendor-packages/cherrypy/process/wspbus.py
+file path=usr/lib/python2.6/vendor-packages/cherrypy/wsgiserver/__init__.py
+link path=usr/bin/cherryd \
+    target=../lib/python2.6/vendor-packages/cherrypy/cherryd
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cherrypy/cherrypy.copyright	Wed Jul 13 12:43:29 2011 -0700
@@ -0,0 +1,26 @@
+Copyright (c) 2004-2007, CherryPy Team ([email protected])
+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 CherryPy Team 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.
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cherrypy/cherrypy.p5m	Wed Jul 13 12:43:29 2011 -0700
@@ -0,0 +1,38 @@
+#
+# 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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Pythonic, object-oriented HTTP framework"
+set name=pkg.description value="CherryPy is a Pythonic, object-oriented HTTP framework"
+set name=info.classification value="org.opensolaris.category.2008:Development/Python"
+set name=info.upstream_url value="http://www.cherrypy.org/"
+set name=info.upstream value="CherryPy Team <[email protected]>"
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+depend fmri=library/python-2/cherrypy-26 predicate=runtime/python-26 \
+    type=conditional
+
+legacy pkg=SUNWpython-cherrypy \
+    desc="CherryPy is a Pythonic, object-oriented HTTP framework" \
+    name="Pythonic, object-oriented HTTP framework"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cherrypy/patches/cp-ticket-847.patch	Wed Jul 13 12:43:29 2011 -0700
@@ -0,0 +1,44 @@
+Index: cherrypy/wsgiserver/__init__.py
+===================================================================
+--- cherrypy/wsgiserver/__init__.py	(revision 2459)
++++ cherrypy/wsgiserver/__init__.py	(working copy)
[email protected]@ -291,6 +291,7 @@
+         self.wsgi_app = wsgi_app
+         
+         self.ready = False
++        self.started_request = False
+         self.started_response = False
+         self.status = ""
+         self.outheaders = []
[email protected]@ -318,6 +319,9 @@
+         # (although your TCP stack might suffer for it: cf Apache's history
+         # with FIN_WAIT_2).
+         request_line = self.rfile.readline()
++        # Set started_request to True so communicate() knows to send 408
++        # from here on out.
++        self.started_request = True
+         if not request_line:
+             # Force self.ready = False so the connection will close.
+             self.ready = False
[email protected]@ -1169,6 +1173,9 @@
+                 # This order of operations should guarantee correct pipelining.
+                 req.parse_request()
+                 if not req.ready:
++                    # Something went wrong in the parsing (and the server has
++                    # probably already made a simple response). Return and
++                    # let the conn close.
+                     return
+                 
+                 req.respond()
[email protected]@ -1178,7 +1185,10 @@
+         except socket.error, e:
+             errnum = e.args[0]
+             if errnum == 'timed out':
+-                if req and not req.sent_headers:
++                # Don't send a 408 if there is no oustanding request; only
++                # if we're in the middle of a request.
++                # See http://www.cherrypy.org/ticket/853
++                if req and req.started_request and not req.sent_headers:
+                     req.simple_response("408 Request Timeout")
+             elif errnum not in socket_errors_to_ignore:
+                 if req and not req.sent_headers:
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cherrypy/patches/setup.cfg.patch	Wed Jul 13 12:43:29 2011 -0700
@@ -0,0 +1,7 @@
+diff -Nur setup.cfg 
+--- setup.cfg	1969-12-31 16:00:00.000000000 -0800
++++ setup.cfg	2011-06-07 04:19:50.112162699 -0700
[email protected]@ -0,0 +1,3 @@
++[install]
++install-data=/usr/lib/python2.6/vendor-packages
++
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/coverage/Makefile	Wed Jul 13 12:43:29 2011 -0700
@@ -0,0 +1,49 @@
+#
+# 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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+include ../../../make-rules/shared-macros.mk
+
+PATH=/usr/bin:/usr/gnu/bin:/usr/sbin
+
+COMPONENT_NAME=		coverage
+COMPONENT_VERSION=	3.2b2
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH=	sha1:4710d033b8c6de1efaa562243e5b29e0a31fb8b9
+COMPONENT_ARCHIVE_URL=	http://pypi.python.org/packages/source/c/coverage/$(COMPONENT_ARCHIVE)
+
+IPS_COMPONENT_VERSION=  3.2
+
+include $(WS_TOP)/make-rules/prep.mk
+include $(WS_TOP)/make-rules/setup.py.mk
+include $(WS_TOP)/make-rules/ips.mk
+
+# common targets
+build:		$(BUILD_32)
+
+install:	$(INSTALL_32)
+
+test:		$(NO_TESTS)
+
+BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
+
+include $(WS_TOP)/make-rules/depend.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/coverage/coverage-26.p5m	Wed Jul 13 12:43:29 2011 -0700
@@ -0,0 +1,84 @@
+#
+# 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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="The coverage.py Python code coverage tool"
+set name=pkg.description value="Coverage measures Python code coverage, typically during test execution."
+set name=info.classification value="org.opensolaris.category.2008:Development/Python"
+set name=info.upstream_url value="http://nedbatchelder.com/code/coverage/"
+set name=info.upstream value="Ned Batchelder <[email protected]>"
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2011/260
+
+license coverage.copyright license=BSD
+license jquery.copyright license=MIT
+
+dir path=usr
+dir path=usr/lib
+dir path=usr/lib/python2.6
+dir path=usr/lib/python2.6/vendor-packages
+dir path=usr/lib/python2.6/vendor-packages/coverage
+dir \
+    path=usr/lib/python2.6/vendor-packages/coverage-$(COMPONENT_VERSION)-py2.6.egg-info
+dir path=usr/lib/python2.6/vendor-packages/coverage/htmlfiles
+file path=usr/bin/coverage
+file \
+    path=usr/lib/python2.6/vendor-packages/coverage-$(COMPONENT_VERSION)-py2.6.egg-info/PKG-INFO
+file \
+    path=usr/lib/python2.6/vendor-packages/coverage-$(COMPONENT_VERSION)-py2.6.egg-info/SOURCES.txt
+file \
+    path=usr/lib/python2.6/vendor-packages/coverage-$(COMPONENT_VERSION)-py2.6.egg-info/dependency_links.txt
+file \
+    path=usr/lib/python2.6/vendor-packages/coverage-$(COMPONENT_VERSION)-py2.6.egg-info/entry_points.txt
+file \
+    path=usr/lib/python2.6/vendor-packages/coverage-$(COMPONENT_VERSION)-py2.6.egg-info/not-zip-safe
+file \
+    path=usr/lib/python2.6/vendor-packages/coverage-$(COMPONENT_VERSION)-py2.6.egg-info/top_level.txt
+file path=usr/lib/python2.6/vendor-packages/coverage/__init__.py
+file path=usr/lib/python2.6/vendor-packages/coverage/annotate.py
+file path=usr/lib/python2.6/vendor-packages/coverage/backward.py
+file path=usr/lib/python2.6/vendor-packages/coverage/bytecode.py
+file path=usr/lib/python2.6/vendor-packages/coverage/cmdline.py
+file path=usr/lib/python2.6/vendor-packages/coverage/codeunit.py
+file path=usr/lib/python2.6/vendor-packages/coverage/collector.py
+file path=usr/lib/python2.6/vendor-packages/coverage/control.py
+file path=usr/lib/python2.6/vendor-packages/coverage/data.py
+file path=usr/lib/python2.6/vendor-packages/coverage/execfile.py
+file path=usr/lib/python2.6/vendor-packages/coverage/files.py
+file path=usr/lib/python2.6/vendor-packages/coverage/html.py
+file path=usr/lib/python2.6/vendor-packages/coverage/htmlfiles/index.html
+file \
+    path=usr/lib/python2.6/vendor-packages/coverage/htmlfiles/jquery-1.3.2.min.js
+file path=usr/lib/python2.6/vendor-packages/coverage/htmlfiles/pyfile.html
+file path=usr/lib/python2.6/vendor-packages/coverage/htmlfiles/style.css
+file path=usr/lib/python2.6/vendor-packages/coverage/misc.py
+file path=usr/lib/python2.6/vendor-packages/coverage/parser.py
+file path=usr/lib/python2.6/vendor-packages/coverage/phystokens.py
+file path=usr/lib/python2.6/vendor-packages/coverage/report.py
+file path=usr/lib/python2.6/vendor-packages/coverage/results.py
+file path=usr/lib/python2.6/vendor-packages/coverage/summary.py
+file path=usr/lib/python2.6/vendor-packages/coverage/templite.py
+file path=usr/lib/python2.6/vendor-packages/coverage/tracer.so
+file path=usr/lib/python2.6/vendor-packages/coverage/xmlreport.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/coverage/coverage.copyright	Wed Jul 13 12:43:29 2011 -0700
@@ -0,0 +1,29 @@
+Copyright 2001 Gareth Rees.  All rights reserved.
+Copyright 2004-2009 Ned Batchelder.  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 THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDERS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/coverage/coverage.p5m	Wed Jul 13 12:43:29 2011 -0700
@@ -0,0 +1,35 @@
+#
+# 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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="The coverage.py Python code coverage tool"
+set name=pkg.description value="Coverage measures Python code coverage, typically during test execution."
+set name=info.classification value="org.opensolaris.category.2008:Development/Python"
+set name=info.upstream_url value="http://nedbatchelder.com/code/coverage/"
+set name=info.upstream value="Ned Batchelder <[email protected]>"
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+depend fmri=library/python-2/coverage-26 predicate=runtime/python-26 \
+    type=conditional
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/coverage/jquery.copyright	Wed Jul 13 12:43:29 2011 -0700
@@ -0,0 +1,22 @@
+Copyright (c) 2011 John Resig, http://jquery.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 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/ldtp/Makefile	Wed Jul 13 12:43:29 2011 -0700
@@ -0,0 +1,49 @@
+#
+# 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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+include ../../../make-rules/shared-macros.mk
+
+PATH=/usr/bin:/usr/gnu/bin:/usr/sbin
+
+COMPONENT_NAME=         ldtp
+COMPONENT_VERSION=      2.1.1
+COMPONENT_MAJOR_VERSION=2.x
+COMPONENT_MINOR_VERSION=2.1.x
+COMPONENT_SRC=          $(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=      $(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH= sha1:5439809806a8dd7e33c95617fb0cbed35d111974
+COMPONENT_ARCHIVE_URL=  http://download.freedesktop.org/ldtp/$(COMPONENT_MAJOR_VERSION)/$(COMPONENT_MINOR_VERSION)/$(COMPONENT_ARCHIVE)
+
+include $(WS_TOP)/make-rules/prep.mk
+include $(WS_TOP)/make-rules/setup.py.mk
+include $(WS_TOP)/make-rules/ips.mk
+
+# common targets
+build:		$(BUILD_32)
+
+install:	$(INSTALL_32)
+
+test:		$(NO_TESTS)
+
+BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
+
+include $(WS_TOP)/make-rules/depend.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/ldtp/ldtp-26.p5m	Wed Jul 13 12:43:29 2011 -0700
@@ -0,0 +1,73 @@
+#
+# 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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/system/desktop/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Linux Desktop Testing Project"
+set name=pkg.description value="LDTP is a test automation framework that can be used to test and improve desktops and desktop applications."
+set name=info.classification value="org.opensolaris.category.2008:Development/Distribution Tools"
+set name=info.upstream_url value="http://ldtp.freedesktop.org/"
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2011/261
+
+license ldtp.copyright license=LGPLv2.1
+
+dir path=usr
+dir path=usr/bin
+dir path=usr/lib
+dir path=usr/lib/python2.6
+dir path=usr/lib/python2.6/vendor-packages
+dir path=usr/lib/python2.6/vendor-packages/ldtp
+dir path=usr/lib/python2.6/vendor-packages/ldtpd
+dir path=usr/lib/python2.6/vendor-packages/ldtputils
+dir path=usr/lib/python2.6/vendor-packages/ooldtp
+file path=usr/bin/ldtp
+file \
+    path=usr/lib/python2.6/vendor-packages/ldtp-$(COMPONENT_VERSION)-py2.6.egg-info
+file path=usr/lib/python2.6/vendor-packages/ldtp/__init__.py
+file path=usr/lib/python2.6/vendor-packages/ldtp/client.py
+file path=usr/lib/python2.6/vendor-packages/ldtp/client_exception.py
+file path=usr/lib/python2.6/vendor-packages/ldtp/log.py
+file path=usr/lib/python2.6/vendor-packages/ldtp/state.py
+file path=usr/lib/python2.6/vendor-packages/ldtpd/__init__.py
+file path=usr/lib/python2.6/vendor-packages/ldtpd/combo_box.py
+file path=usr/lib/python2.6/vendor-packages/ldtpd/constants.py
+file path=usr/lib/python2.6/vendor-packages/ldtpd/core.py
+file path=usr/lib/python2.6/vendor-packages/ldtpd/generic.py
+file path=usr/lib/python2.6/vendor-packages/ldtpd/keypress_actions.py
+file path=usr/lib/python2.6/vendor-packages/ldtpd/log.py
+file path=usr/lib/python2.6/vendor-packages/ldtpd/menu.py
+file path=usr/lib/python2.6/vendor-packages/ldtpd/mouse.py
+file path=usr/lib/python2.6/vendor-packages/ldtpd/page_tab_list.py
+file path=usr/lib/python2.6/vendor-packages/ldtpd/sequence_step.py
+file path=usr/lib/python2.6/vendor-packages/ldtpd/server_exception.py
+file path=usr/lib/python2.6/vendor-packages/ldtpd/table.py
+file path=usr/lib/python2.6/vendor-packages/ldtpd/text.py
+file path=usr/lib/python2.6/vendor-packages/ldtpd/utils.py
+file path=usr/lib/python2.6/vendor-packages/ldtpd/value.py
+file path=usr/lib/python2.6/vendor-packages/ldtpd/waiters.py
+file path=usr/lib/python2.6/vendor-packages/ldtpd/xmlrpc_daemon.py
+file path=usr/lib/python2.6/vendor-packages/ldtputils/__init__.py
+file path=usr/lib/python2.6/vendor-packages/ooldtp/__init__.py
+file path=usr/lib/python2.6/vendor-packages/ooldtp/_context.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/ldtp/ldtp.copyright	Wed Jul 13 12:43:29 2011 -0700
@@ -0,0 +1,515 @@
+Oracle elects to use only the GNU Lesser General Public License version
+2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
+where a choice of LGPL/GPL license versions are made available with the
+language indicating that LGPLv2.1/GPLv2 or any later version may be
+used, or where a choice of which version of the LGPL/GPL is applied is
+unspecified.  Unless specifically stated otherwise, where a choice
+exists between another license and either the GPL or the LGPL, Oracle
+chooses the other license.
+
+--------------------------------------------------------------------
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/ldtp/ldtp.p5m	Wed Jul 13 12:43:29 2011 -0700
@@ -0,0 +1,37 @@
+#
+# 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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/system/desktop/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Linux Desktop Testing Project"
+set name=pkg.description value="LDTP is a test automation framework that can be used to test and improve desktops and desktop applications."
+set name=info.classification value="org.opensolaris.category.2008:Development/Distribution Tools"
+set name=info.upstream_url value="http://ldtp.freedesktop.org/"
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+depend fmri=system/desktop/ldtp-26 predicate=runtime/python-26 \
+    type=conditional
+
+legacy pkg=SUNWldtp \
+    desc="LDTP is a test automation framework that can be used to test and improve desktops and desktop applications." \
+    name="Linux Desktop Testing Project"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/m2crypto/Makefile	Wed Jul 13 12:43:29 2011 -0700
@@ -0,0 +1,47 @@
+#
+# 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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+include ../../../make-rules/shared-macros.mk
+
+PATH=/usr/bin:/usr/gnu/bin:/usr/sbin
+
+COMPONENT_NAME=		M2Crypto
+COMPONENT_VERSION=	0.21.1
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH=	sha1:3c7135b952092e4f2eee7a94c5153319cccba94e
+COMPONENT_ARCHIVE_URL=	http://pypi.python.org/packages/source/M/M2Crypto/$(COMPONENT_ARCHIVE)
+
+include $(WS_TOP)/make-rules/prep.mk
+include $(WS_TOP)/make-rules/setup.py.mk
+include $(WS_TOP)/make-rules/ips.mk
+
+# common targets
+build:		$(BUILD_32_and_64)
+
+install:	$(INSTALL_32_and_64)
+
+test:		$(NO_TESTS)
+
+BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
+
+include $(WS_TOP)/make-rules/depend.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/m2crypto/m2crypto-26.p5m	Wed Jul 13 12:43:29 2011 -0700
@@ -0,0 +1,98 @@
+#
+# 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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Python interface for openssl"
+set name=info.classification value="org.opensolaris.category.2008:Development/Python"
+set name=info.upstream_url value="http://chandlerproject.org/Projects/MeTooCrypto"
+set name=info.upstream value="Heikki Toivonen <[email protected]>"
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2011/262
+
+license m2crypto.copyright license=BSD
+
+dir path=usr
+dir path=usr/lib
+dir path=usr/lib/python2.6
+dir path=usr/lib/python2.6/vendor-packages
+dir path=usr/lib/python2.6/vendor-packages/M2Crypto
+dir \
+    path=usr/lib/python2.6/vendor-packages/M2Crypto-$(COMPONENT_VERSION)-py2.6.egg-info
+dir path=usr/lib/python2.6/vendor-packages/M2Crypto/64
+dir path=usr/lib/python2.6/vendor-packages/M2Crypto/PGP
+dir path=usr/lib/python2.6/vendor-packages/M2Crypto/SSL
+file \
+    path=usr/lib/python2.6/vendor-packages/M2Crypto-$(COMPONENT_VERSION)-py2.6.egg-info/PKG-INFO
+file \
+    path=usr/lib/python2.6/vendor-packages/M2Crypto-$(COMPONENT_VERSION)-py2.6.egg-info/SOURCES.txt
+file \
+    path=usr/lib/python2.6/vendor-packages/M2Crypto-$(COMPONENT_VERSION)-py2.6.egg-info/dependency_links.txt
+file \
+    path=usr/lib/python2.6/vendor-packages/M2Crypto-$(COMPONENT_VERSION)-py2.6.egg-info/top_level.txt
+file path=usr/lib/python2.6/vendor-packages/M2Crypto/64/__m2crypto.so
+file path=usr/lib/python2.6/vendor-packages/M2Crypto/ASN1.py
+file path=usr/lib/python2.6/vendor-packages/M2Crypto/AuthCookie.py
+file path=usr/lib/python2.6/vendor-packages/M2Crypto/BIO.py
+file path=usr/lib/python2.6/vendor-packages/M2Crypto/BN.py
+file path=usr/lib/python2.6/vendor-packages/M2Crypto/DH.py
+file path=usr/lib/python2.6/vendor-packages/M2Crypto/DSA.py
+file path=usr/lib/python2.6/vendor-packages/M2Crypto/EC.py
+file path=usr/lib/python2.6/vendor-packages/M2Crypto/EVP.py
+file path=usr/lib/python2.6/vendor-packages/M2Crypto/Engine.py
+file path=usr/lib/python2.6/vendor-packages/M2Crypto/Err.py
+file path=usr/lib/python2.6/vendor-packages/M2Crypto/PGP/PublicKey.py
+file path=usr/lib/python2.6/vendor-packages/M2Crypto/PGP/PublicKeyRing.py
+file path=usr/lib/python2.6/vendor-packages/M2Crypto/PGP/RSA.py
+file path=usr/lib/python2.6/vendor-packages/M2Crypto/PGP/__init__.py
+file path=usr/lib/python2.6/vendor-packages/M2Crypto/PGP/constants.py
+file path=usr/lib/python2.6/vendor-packages/M2Crypto/PGP/packet.py
+file path=usr/lib/python2.6/vendor-packages/M2Crypto/RC4.py
+file path=usr/lib/python2.6/vendor-packages/M2Crypto/RSA.py
+file path=usr/lib/python2.6/vendor-packages/M2Crypto/Rand.py
+file path=usr/lib/python2.6/vendor-packages/M2Crypto/SMIME.py
+file path=usr/lib/python2.6/vendor-packages/M2Crypto/SSL/Checker.py
+file path=usr/lib/python2.6/vendor-packages/M2Crypto/SSL/Cipher.py
+file path=usr/lib/python2.6/vendor-packages/M2Crypto/SSL/Connection.py
+file path=usr/lib/python2.6/vendor-packages/M2Crypto/SSL/Context.py
+file path=usr/lib/python2.6/vendor-packages/M2Crypto/SSL/SSLServer.py
+file path=usr/lib/python2.6/vendor-packages/M2Crypto/SSL/Session.py
+file \
+    path=usr/lib/python2.6/vendor-packages/M2Crypto/SSL/TwistedProtocolWrapper.py
+file path=usr/lib/python2.6/vendor-packages/M2Crypto/SSL/__init__.py
+file path=usr/lib/python2.6/vendor-packages/M2Crypto/SSL/cb.py
+file path=usr/lib/python2.6/vendor-packages/M2Crypto/SSL/ssl_dispatcher.py
+file path=usr/lib/python2.6/vendor-packages/M2Crypto/SSL/timeout.py
+file path=usr/lib/python2.6/vendor-packages/M2Crypto/X509.py
+file path=usr/lib/python2.6/vendor-packages/M2Crypto/__init__.py
+file path=usr/lib/python2.6/vendor-packages/M2Crypto/__m2crypto.so
+file path=usr/lib/python2.6/vendor-packages/M2Crypto/callback.py
+file path=usr/lib/python2.6/vendor-packages/M2Crypto/ftpslib.py
+file path=usr/lib/python2.6/vendor-packages/M2Crypto/httpslib.py
+file path=usr/lib/python2.6/vendor-packages/M2Crypto/m2.py
+file path=usr/lib/python2.6/vendor-packages/M2Crypto/m2urllib.py
+file path=usr/lib/python2.6/vendor-packages/M2Crypto/m2urllib2.py
+file path=usr/lib/python2.6/vendor-packages/M2Crypto/m2xmlrpclib.py
+file path=usr/lib/python2.6/vendor-packages/M2Crypto/threading.py
+file path=usr/lib/python2.6/vendor-packages/M2Crypto/util.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/m2crypto/m2crypto.copyright	Wed Jul 13 12:43:29 2011 -0700
@@ -0,0 +1,26 @@
+Copyright (c) 1999-2004 Ng Pheng Siong. All rights reserved.
+
+Portions copyright (c) 2004-2006 Open Source Applications Foundation. 
+All rights reserved.
+
+Portions copyright (c) 2005-2006 Vrije Universiteit Amsterdam. 
+All rights reserved.
+
+Copyright (c) 2008-2010 Heikki Toivonen. All rights reserved.
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation.
+
+THE AUTHOR PROVIDES THIS SOFTWARE ``AS IS'' AND ANY EXPRESSED 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/m2crypto/m2crypto.p5m	Wed Jul 13 12:43:29 2011 -0700
@@ -0,0 +1,33 @@
+#
+# 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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Python interface for openssl"
+set name=info.classification value="org.opensolaris.category.2008:Development/Python"
+set name=info.upstream_url value="http://chandlerproject.org/Projects/MeTooCrypto"
+set name=info.upstream value="Heikki Toivonen <[email protected]>"
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+depend fmri=library/python-2/m2crypto-26 predicate=runtime/python-26 \
+    type=conditional
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/m2crypto/patches/crl.patch	Wed Jul 13 12:43:29 2011 -0700
@@ -0,0 +1,205 @@
+diff -r 886cd7fb12ed M2Crypto-0.21.1/M2Crypto/X509.py
+--- M2Crypto-0.21.1/M2Crypto/X509.py	Thu Mar 10 14:07:58 2011 -0800
++++ M2Crypto-0.21.1/M2Crypto/X509.py	Fri Mar 11 09:03:37 2011 -0800
[email protected]@ -446,9 +446,9 @@
+         assert m2.x509_type_check(self.x509), "'x509' type error"
+         return ASN1.ASN1_UTCTIME(m2.x509_get_not_after(self.x509))
+ 
+-    def get_pubkey(self):
++    def get_pubkey(self, md="sha1"):
+         assert m2.x509_type_check(self.x509), "'x509' type error"
+-        return EVP.PKey(m2.x509_get_pubkey(self.x509), _pyfree=1)
++        return EVP.PKey(m2.x509_get_pubkey(self.x509), _pyfree=1, md=md)
+ 
+     def set_pubkey(self, pkey):
+         """
[email protected]@ -1067,7 +1067,8 @@
+         else:
+             self.crl = m2.x509_crl_new()
+             self._pyfree = 1
+-            
++        self.revocations = None
++
+     def __del__(self):
+         if getattr(self, '_pyfree', 0):
+             self.m2_x509_crl_free(self.crl)
[email protected]@ -1084,21 +1085,67 @@
+         return buf.read_all()
+ 
+ 
+-def load_crl(file):
++    def get_last_update(self):
++        assert m2.x509_CRL_type_check(self.crl), "'x509_CRL' type error"
++        return ASN1.ASN1_UTCTIME(m2.x509_CRL_get_last_update(self.crl))
++
++    def get_next_update(self):
++        assert m2.x509_CRL_type_check(self.crl), "'x509_CRL' type error"
++        return ASN1.ASN1_UTCTIME(m2.x509_CRL_get_next_update(self.crl))
++
++    def verify(self, pkey):
++        assert m2.x509_CRL_type_check(self.crl), "'x509_CRL' type error"
++        return m2.x509_CRL_verify(self.crl, pkey.pkey)
++
++    def get_issuer(self):
++        assert m2.x509_CRL_type_check(self.crl), "'x509_CRL' type error"
++        return X509_Name(m2.x509_CRL_get_issuer(self.crl))
++
++    def is_revoked(self, cert):
++        if self.revocations is None:
++            self.revocations = {}
++            revo_stk_ptr = m2.x509_CRL_get_revoked(self.crl)
++            for i in range(m2.sk_x509_REVOKED_num(revo_stk_ptr)):
++                revo_ptr = m2.sk_x509_REVOKED_get(revo_stk_ptr, i)
++                revo_sn = m2.asn1_integer_get(
++                    m2.x509_REVOKED_get_serial_number(revo_ptr))
++                cnt = m2.x509_REVOKED_get_ext_count(revo_ptr)
++                reason = None
++                for i in range(m2.x509_REVOKED_get_ext_count(revo_ptr)):
++                    ext_ptr = m2.x509_REVOKED_get_ext(revo_ptr, i)
++                    name = m2.x509_extension_get_name(ext_ptr)
++                    if name == "CRLReason":
++                        ext = X509_Extension(ext_ptr, _pyfree=0)
++                        reason = ext.get_value()
++                self.revocations[revo_sn] = (True, reason)
++        return self.revocations.get(cert.get_serial_number(), None)
++
++
++def load_crl(file, format=FORMAT_PEM):
+     """
+     Load CRL from file.
+ 
+     @type file: string
+     @param file: Name of file containing CRL in PEM format.
+ 
++    @type format: int, either FORMAT_PEM or FORMAT_DER
++    @param format: Describes the format of the file to be loaded, either PEM or DER.
++
+     @rtype: M2Crypto.X509.CRL
+     @return: M2Crypto.X509.CRL object.
+     """
+     f=BIO.openfile(file)
+-    cptr=m2.x509_crl_read_pem(f.bio_ptr())
+-    f.close()
+-    if cptr is None:
+-        raise X509Error(Err.get_error())
+-    return CRL(cptr, 1)
+-
+-
++    if format == FORMAT_PEM:
++        cptr=m2.x509_crl_read_pem(f.bio_ptr())
++        f.close()
++        if cptr is None:
++            raise X509Error(Err.get_error())
++        return CRL(cptr, 1)
++    elif format == FORMAT_DER:
++        cptr=m2.d2i_x509_crl(f._ptr())
++        f.close()
++        if cptr is None:
++            raise X509Error(Err.get_error())
++        return CRL(cptr, 1)
++    else:
++        raise ValueError("Unknown format. Must be either FORMAT_DER or FORMAT_PEM")
+diff -r 886cd7fb12ed M2Crypto-0.21.1/SWIG/_x509.i
+--- M2Crypto-0.21.1/SWIG/_x509.i	Thu Mar 10 14:07:58 2011 -0800
++++ M2Crypto-0.21.1/SWIG/_x509.i	Fri Mar 11 09:03:37 2011 -0800
[email protected]@ -64,6 +64,9 @@
+ %rename(x509_cmp_current_time) X509_cmp_current_time;
+ extern int X509_cmp_current_time(ASN1_UTCTIME *);
+ 
++%rename(x509_CRL_get_issuer) X509_CRL_get_issuer;
++extern X509_NAME *X509_CRL_get_issuer(X509_CRL *);
++
+                             
+ /* From x509.h */
+ /* standard trust ids */
[email protected]@ -111,6 +114,9 @@
+ %rename(x509_get_verify_error) X509_verify_cert_error_string;
+ extern const char *X509_verify_cert_error_string(long);
+ 
++%rename(x509_CRL_verify) X509_CRL_verify;
++extern int X509_CRL_verify(X509_CRL *a, EVP_PKEY *r);
++
+ %constant long X509V3_EXT_UNKNOWN_MASK         = (0xfL << 16);
+ %constant long X509V3_EXT_DEFAULT              = 0;
+ %constant long X509V3_EXT_ERROR_UNKNOWN        = (1L << 16);
[email protected]@ -127,6 +133,13 @@
+ %threadallow X509V3_EXT_print;
+ extern int X509V3_EXT_print(BIO *, X509_EXTENSION *, unsigned long, int);
+ 
++%rename(x509_REVOKED_get_ext_count) X509_REVOKED_get_ext_count;
++extern int X509_REVOKED_get_ext_count(X509_REVOKED *);
++%rename(x509_REVOKED_get_ext) X509_REVOKED_get_ext;
++extern X509_EXTENSION *X509_REVOKED_get_ext(X509_REVOKED *, int);
++%rename(x509_REVOKED_get_ext_by_NID) X509_REVOKED_get_ext_by_NID;
++extern X509_EXTENSION *X509_REVOKED_get_ext_by_NID(X509_REVOKED *, int, int);
++
+ %rename(x509_name_new) X509_NAME_new;
+ extern X509_NAME *X509_NAME_new( void );
+ %rename(x509_name_free) X509_NAME_free;
[email protected]@ -335,6 +348,7 @@
+ }
+ %}
+ 
++
+ %threadallow d2i_x509;
+ %inline %{
+ X509 *d2i_x509(BIO *bio) {
[email protected]@ -342,6 +356,13 @@
+ }
+ %}
+ 
++%threadallow d2i_x509_crl;
++%inline %{
++X509_CRL *d2i_x509_crl(BIO *bio) {
++    return d2i_X509_CRL_bio(bio, NULL);
++}
++%}
++
+ %threadallow d2i_x509_req;
+ %inline %{
+ X509_REQ *d2i_x509_req(BIO *bio) {
[email protected]@ -415,6 +436,33 @@
+     return X509_get_notAfter(x);
+ }
+ 
++/* X509_CRL_get_lastUpdate() is a macro. */
++ASN1_UTCTIME *x509_CRL_get_last_update(X509_CRL *x) {
++    return X509_CRL_get_lastUpdate(x);
++}
++
++/* X509_CRL_get_nextUpdate() is a macro. */
++ASN1_UTCTIME *x509_CRL_get_next_update(X509_CRL *x) {
++    return X509_CRL_get_nextUpdate(x);
++}
++
++/* X509_CRL_get_REVOKED() is a macro. */
++STACK_OF(X509_REVOKED) *x509_CRL_get_revoked(X509_CRL *x) {
++    return X509_CRL_get_REVOKED(x);
++}
++
++int sk_x509_REVOKED_num(STACK_OF(X509_REVOKED) *stack) {
++    return sk_X509_REVOKED_num(stack);
++}
++
++X509_REVOKED *sk_x509_REVOKED_get(STACK_OF(X509_REVOKED) *stack, int x) {
++    return sk_X509_REVOKED_value(stack, x);
++}
++
++ASN1_INTEGER *x509_REVOKED_get_serial_number(X509_REVOKED *x) {
++    return x->serialNumber;
++}
++
+ int x509_sign(X509 *x, EVP_PKEY *pkey, EVP_MD *md) {
+     return X509_sign(x, pkey, md);
+ }
[email protected]@ -487,6 +535,10 @@
+     return 1;
+ }
+ 
++int x509_CRL_type_check(X509_CRL *x509_CRL) {
++    return 1;
++}
++
+ int x509_name_type_check(X509_NAME *name) {
+     return 1;
+ }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/mako/Makefile	Wed Jul 13 12:43:29 2011 -0700
@@ -0,0 +1,47 @@
+#
+# 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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+include ../../../make-rules/shared-macros.mk
+
+PATH=/usr/bin:/usr/gnu/bin:/usr/sbin
+
+COMPONENT_NAME=		Mako
+COMPONENT_VERSION=	0.4.1
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH=	sha1:a4e30660794aab5224e0c776d03c45f3c8b5fa7e
+COMPONENT_ARCHIVE_URL=	http://www.makotemplates.org/downloads/$(COMPONENT_ARCHIVE)
+
+include $(WS_TOP)/make-rules/prep.mk
+include $(WS_TOP)/make-rules/setup.py.mk
+include $(WS_TOP)/make-rules/ips.mk
+
+# common targets
+build:		$(BUILD_32)
+
+install:	$(INSTALL_32)
+
+test:		$(NO_TESTS)
+
+BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
+
+include $(WS_TOP)/make-rules/depend.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/mako/mako-26.p5m	Wed Jul 13 12:43:29 2011 -0700
@@ -0,0 +1,82 @@
+#
+# 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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Template library written in Python"
+set name=pkg.description value="Mako is an embedded Python (i.e., Python Server Page) templating language."
+set name=info.classification value="org.opensolaris.category.2008:Development/Python"
+set name=info.upstream_url value="http://www.makotemplates.org/"
+set name=info.upstream value="Mike Bayer <[email protected]>"
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2011/263
+
+license mako.copyright license=MIT
+
+depend fmri=runtime/python-26 type=require
+
+dir path=mangled
+dir path=usr
+dir path=usr/lib
+dir path=usr/lib/python2.6
+dir path=usr/lib/python2.6/vendor-packages
+dir \
+    path=usr/lib/python2.6/vendor-packages/Mako-$(COMPONENT_VERSION)-py2.6.egg-info
+dir path=usr/lib/python2.6/vendor-packages/mako
+dir path=usr/lib/python2.6/vendor-packages/mako/ext
+file \
+    path=usr/lib/python2.6/vendor-packages/Mako-$(COMPONENT_VERSION)-py2.6.egg-info/PKG-INFO
+file \
+    path=usr/lib/python2.6/vendor-packages/Mako-$(COMPONENT_VERSION)-py2.6.egg-info/SOURCES.txt
+file \
+    path=usr/lib/python2.6/vendor-packages/Mako-$(COMPONENT_VERSION)-py2.6.egg-info/dependency_links.txt
+file \
+    path=usr/lib/python2.6/vendor-packages/Mako-$(COMPONENT_VERSION)-py2.6.egg-info/entry_points.txt
+file \
+    path=usr/lib/python2.6/vendor-packages/Mako-$(COMPONENT_VERSION)-py2.6.egg-info/not-zip-safe
+file \
+    path=usr/lib/python2.6/vendor-packages/Mako-$(COMPONENT_VERSION)-py2.6.egg-info/requires.txt
+file \
+    path=usr/lib/python2.6/vendor-packages/Mako-$(COMPONENT_VERSION)-py2.6.egg-info/top_level.txt
+file path=usr/lib/python2.6/vendor-packages/mako/__init__.py
+file path=usr/lib/python2.6/vendor-packages/mako/_ast_util.py
+file path=usr/lib/python2.6/vendor-packages/mako/ast.py
+file path=usr/lib/python2.6/vendor-packages/mako/cache.py
+file path=usr/lib/python2.6/vendor-packages/mako/codegen.py
+file path=usr/lib/python2.6/vendor-packages/mako/exceptions.py
+file path=usr/lib/python2.6/vendor-packages/mako/ext/__init__.py
+file path=usr/lib/python2.6/vendor-packages/mako/ext/autohandler.py
+file path=usr/lib/python2.6/vendor-packages/mako/ext/babelplugin.py
+file path=usr/lib/python2.6/vendor-packages/mako/ext/preprocessors.py
+file path=usr/lib/python2.6/vendor-packages/mako/ext/pygmentplugin.py
+file path=usr/lib/python2.6/vendor-packages/mako/ext/turbogears.py
+file path=usr/lib/python2.6/vendor-packages/mako/filters.py
+file path=usr/lib/python2.6/vendor-packages/mako/lexer.py
+file path=usr/lib/python2.6/vendor-packages/mako/lookup.py
+file path=usr/lib/python2.6/vendor-packages/mako/parsetree.py
+file path=usr/lib/python2.6/vendor-packages/mako/pygen.py
+file path=usr/lib/python2.6/vendor-packages/mako/pyparser.py
+file path=usr/lib/python2.6/vendor-packages/mako/runtime.py
+file path=usr/lib/python2.6/vendor-packages/mako/template.py
+file path=usr/lib/python2.6/vendor-packages/mako/util.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/mako/mako.copyright	Wed Jul 13 12:43:29 2011 -0700
@@ -0,0 +1,20 @@
+This is the MIT license: http://www.opensource.org/licenses/mit-license.php
+
+Copyright (C) 2006-2011 the Mako authors and contributors <see AUTHORS file>.
+Mako is a trademark of Michael Bayer.
+
+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/mako/mako.p5m	Wed Jul 13 12:43:29 2011 -0700
@@ -0,0 +1,39 @@
+#
+# 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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Template library written in Python"
+set name=pkg.description value="Mako is an embedded Python (i.e., Python Server Page) templating language."
+set name=info.classification value="org.opensolaris.category.2008:Development/Python"
+set name=info.upstream_url value="http://www.makotemplates.org/"
+set name=info.upstream value="Mike Bayer <[email protected]>"
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+depend fmri=library/python-2/mako-26 predicate=runtime/python-26 \
+    type=conditional
+
+legacy pkg=SUNWpython-mako \
+    desc="Mako is an embedded Python (i.e., Python Server Page) templating language." \
+    name="Template library written in Python"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/ply/Makefile	Wed Jul 13 12:43:29 2011 -0700
@@ -0,0 +1,48 @@
+#
+# 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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+include ../../../make-rules/shared-macros.mk
+
+PATH=/usr/bin:/usr/gnu/bin:/usr/sbin
+
+COMPONENT_NAME=		ply
+COMPONENT_VERSION=	3.1
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH=	sha1:38efe9e03bc39d40ee73fa566eb9c1975f1a8003
+COMPONENT_ARCHIVE_URL=	http://www.dabeaz.com/ply/$(COMPONENT_ARCHIVE)
+COMPONENT_PROJECT_URL=  http://www.dabeaz.com/ply/
+
+include $(WS_TOP)/make-rules/prep.mk
+include $(WS_TOP)/make-rules/setup.py.mk
+include $(WS_TOP)/make-rules/ips.mk
+
+# common targets
+build:		$(BUILD_32)
+
+install:	$(INSTALL_32)
+
+test:		$(NO_TESTS)
+
+BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
+
+include $(WS_TOP)/make-rules/depend.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/ply/ply-26.p5m	Wed Jul 13 12:43:29 2011 -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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Lex and yacc parsing tools for Python"
+set name=pkg.description value="PLY is an implementation of lex and yacc parsing tools for Python"
+set name=info.classification value="org.opensolaris.category.2008:Development/Python"
+set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
+set name=info.upstream value="David Beazley <[email protected]>"
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2011/264
+
+license ply.copyright license=LGPLv2.1
+
+depend fmri=runtime/python-26 type=require
+
+dir path=usr
+dir path=usr/lib
+dir path=usr/lib/python2.6
+dir path=usr/lib/python2.6/vendor-packages
+dir path=usr/lib/python2.6/vendor-packages/ply
+dir \
+    path=usr/lib/python2.6/vendor-packages/ply-$(COMPONENT_VERSION)-py2.6.egg-info
+file \
+    path=usr/lib/python2.6/vendor-packages/ply-$(COMPONENT_VERSION)-py2.6.egg-info/PKG-INFO
+file \
+    path=usr/lib/python2.6/vendor-packages/ply-$(COMPONENT_VERSION)-py2.6.egg-info/SOURCES.txt
+file \
+    path=usr/lib/python2.6/vendor-packages/ply-$(COMPONENT_VERSION)-py2.6.egg-info/dependency_links.txt
+file \
+    path=usr/lib/python2.6/vendor-packages/ply-$(COMPONENT_VERSION)-py2.6.egg-info/top_level.txt
+file path=usr/lib/python2.6/vendor-packages/ply/__init__.py
+file path=usr/lib/python2.6/vendor-packages/ply/cpp.py
+file path=usr/lib/python2.6/vendor-packages/ply/ctokens.py
+file path=usr/lib/python2.6/vendor-packages/ply/lex.py
+file path=usr/lib/python2.6/vendor-packages/ply/yacc.py
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/ply/ply.copyright	Wed Jul 13 12:43:29 2011 -0700
@@ -0,0 +1,515 @@
+Oracle elects to use only the GNU Lesser General Public License version
+2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
+where a choice of LGPL/GPL license versions are made available with the
+language indicating that LGPLv2.1/GPLv2 or any later version may be
+used, or where a choice of which version of the LGPL/GPL is applied is
+unspecified.  Unless specifically stated otherwise, where a choice
+exists between another license and either the GPL or the LGPL, Oracle
+chooses the other license.
+
+--------------------------------------------------------------------
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/ply/ply.p5m	Wed Jul 13 12:43:29 2011 -0700
@@ -0,0 +1,40 @@
+#
+# 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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Lex and yacc parsing tools for Python"
+set name=pkg.description value="PLY is an implementation of lex and yacc parsing tools for Python"
+set name=info.classification value="org.opensolaris.category.2008:Development/Python"
+set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
+set name=info.upstream value="David Beazley <[email protected]>"
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+depend fmri=library/python-2/ply-26 predicate=runtime/python-26 \
+    type=conditional
+
+legacy pkg=SUNWpython-ply \
+    desc="PLY is an implementation of lex and yacc parsing tools for Python" \
+    name="Lex and yacc parsing tools for Python"
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pybonjour/Makefile	Wed Jul 13 12:43:29 2011 -0700
@@ -0,0 +1,47 @@
+#
+# 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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+include ../../../make-rules/shared-macros.mk
+
+PATH=/usr/bin:/usr/gnu/bin:/usr/sbin
+
+COMPONENT_NAME=		pybonjour
+COMPONENT_VERSION=	1.1.1
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH=	sha1:92cabd14e04c5f62ce067c47c2057ee3d424d29b
+COMPONENT_ARCHIVE_URL=	http://pybonjour.googlecode.com/files/$(COMPONENT_ARCHIVE)
+
+include $(WS_TOP)/make-rules/prep.mk
+include $(WS_TOP)/make-rules/setup.py.mk
+include $(WS_TOP)/make-rules/ips.mk
+
+# common targets
+build:		$(BUILD_32)
+
+install:	$(INSTALL_32)
+
+test:		$(NO_TESTS)
+
+BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
+
+include $(WS_TOP)/make-rules/depend.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pybonjour/pybonjour-26.p5m	Wed Jul 13 12:43:29 2011 -0700
@@ -0,0 +1,46 @@
+#
+# 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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Python bindings for bonjour / dns-sd"
+set name=pkg.description value="Pybonjour provides a thin layer of Python bindings on top of bonjour."
+set name=info.classification value="org.opensolaris.category.2008:Development/Python"
+set name=info.upstream_url value="http://code.google.com/p/pybonjour/"
+set name=info.upstream value="Christopher Stawarz <[email protected]>"
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2011/265
+
+license pybonjour.copyright license=BSD
+
+depend fmri=runtime/python-26 type=require
+depend fmri=service/network/dns/mdns type=require
+
+dir path=usr
+dir path=usr/lib
+dir path=usr/lib/python2.6
+dir path=usr/lib/python2.6/vendor-packages
+file \
+    path=usr/lib/python2.6/vendor-packages/pybonjour-$(COMPONENT_VERSION)-py2.6.egg-info
+file path=usr/lib/python2.6/vendor-packages/pybonjour.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pybonjour/pybonjour.copyright	Wed Jul 13 12:43:29 2011 -0700
@@ -0,0 +1,21 @@
+Copyright (c) 2007-2008 Christopher J. Stawarz
+
+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/pybonjour/pybonjour.p5m	Wed Jul 13 12:43:29 2011 -0700
@@ -0,0 +1,35 @@
+#
+# 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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Python bindings for bonjour / dns-sd"
+set name=pkg.description value="Pybonjour provides a thin layer of Python bindings on top of bonjour."
+set name=info.classification value="org.opensolaris.category.2008:Development/Python"
+set name=info.upstream_url value="http://code.google.com/p/pybonjour/"
+set name=info.upstream value="Christopher Stawarz <[email protected]>"
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+depend fmri=library/python-2/pybonjour-26 predicate=runtime/python-26 \
+    type=conditional
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pycurl/Makefile	Wed Jul 13 12:43:29 2011 -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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+include ../../../make-rules/shared-macros.mk
+
+PATH=/usr/bin:/usr/gnu/bin:/usr/sbin
+
+COMPONENT_NAME=		pycurl
+COMPONENT_VERSION=	7.19.0
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH=	sha1:3fb59eca1461331bb9e9e8d6fe3b23eda961a416
+COMPONENT_ARCHIVE_URL=	http://pycurl.sourceforge.net/download/$(COMPONENT_ARCHIVE)
+
+IPS_COMPONENT_VERSION=  7.19.0.1
+
+PATCH_LEVEL = 0
+
+include $(WS_TOP)/make-rules/prep.mk
+include $(WS_TOP)/make-rules/setup.py.mk
+include $(WS_TOP)/make-rules/ips.mk
+
+# common targets
+build:		$(BUILD_32_and_64)
+
+install:	$(INSTALL_32_and_64)
+
+test:		$(NO_TESTS)
+
+BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
+
+include $(WS_TOP)/make-rules/depend.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pycurl/patches/pycurl-mondo.patch	Wed Jul 13 12:43:29 2011 -0700
@@ -0,0 +1,196 @@
+--- setup.py.orig	Fri Aug 07 15:00:51 2009 -0700
++++ setup.py	Tue Sep 21 10:59:03 2010 -0700
[email protected]@ -97,8 +97,7 @@
+         else:
+             extra_compile_args.append(e)
+     libs = split_quoted(
+-        os.popen("'%s' --libs" % CURL_CONFIG).read()+\
+-        os.popen("'%s' --static-libs" % CURL_CONFIG).read())
++        os.popen("'%s' --libs" % CURL_CONFIG).read())
+     for e in libs:
+         if e[:2] == "-l":
+             libraries.append(e[2:])
+
+--- src/pycurl.c.orig	Fri Aug 07 15:00:51 2009 -0700
++++ src/pycurl.c	Tue Sep 21 10:59:03 2010 -0700
[email protected]@ -747,6 +747,59 @@
+     return self;
+ }
+ 
++/* initializer - used to intialize curl easy handles for use with pycurl */
++static int
++util_curl_init(CurlObject *self)
++{
++    int res;
++    char *s = NULL;
++
++    /* Set curl error buffer and zero it */
++    res = curl_easy_setopt(self->handle, CURLOPT_ERRORBUFFER, self->error);
++    if (res != CURLE_OK) {
++        return (-1);
++    }
++    memset(self->error, 0, sizeof(self->error));
++
++    /* Set backreference */
++    res = curl_easy_setopt(self->handle, CURLOPT_PRIVATE, (char *) self);
++    if (res != CURLE_OK) {
++        return (-1);
++    }
++
++    /* Enable NOPROGRESS by default, i.e. no progress output */
++    res = curl_easy_setopt(self->handle, CURLOPT_NOPROGRESS, (long)1);
++    if (res != CURLE_OK) {
++        return (-1);
++    }
++
++    /* Disable VERBOSE by default, i.e. no verbose output */
++    res = curl_easy_setopt(self->handle, CURLOPT_VERBOSE, (long)0);
++    if (res != CURLE_OK) {
++        return (-1);
++    }
++
++    /* Set FTP_ACCOUNT to NULL by default */
++    res = curl_easy_setopt(self->handle, CURLOPT_FTP_ACCOUNT, NULL);
++    if (res != CURLE_OK) {
++        return (-1);
++    }
++
++    /* Set default USERAGENT */
++    s = (char *) malloc(7 + strlen(LIBCURL_VERSION) + 1);
++    if (s == NULL) {
++        return (-1);
++    }
++    strcpy(s, "PycURL/"); strcpy(s+7, LIBCURL_VERSION);
++    res = curl_easy_setopt(self->handle, CURLOPT_USERAGENT, (char *) s);
++    if (res != CURLE_OK) {
++        free(s);
++        return (-1);
++    }
++    self->options[ OPT_INDEX(CURLOPT_USERAGENT) ] = s; s = NULL;
++
++    return (0);
++}
+ 
+ /* constructor - this is a module-level function returning a new instance */
+ static CurlObject *
[email protected]@ -754,7 +807,6 @@
+ {
+     CurlObject *self = NULL;
+     int res;
+-    char *s = NULL;
+ 
+     UNUSED(dummy);
+ 
[email protected]@ -768,44 +820,9 @@
+     if (self->handle == NULL)
+         goto error;
+ 
+-    /* Set curl error buffer and zero it */
+-    res = curl_easy_setopt(self->handle, CURLOPT_ERRORBUFFER, self->error);
+-    if (res != CURLE_OK)
+-        goto error;
+-    memset(self->error, 0, sizeof(self->error));
+-
+-    /* Set backreference */
+-    res = curl_easy_setopt(self->handle, CURLOPT_PRIVATE, (char *) self);
+-    if (res != CURLE_OK)
+-        goto error;
+-
+-    /* Enable NOPROGRESS by default, i.e. no progress output */
+-    res = curl_easy_setopt(self->handle, CURLOPT_NOPROGRESS, (long)1);
+-    if (res != CURLE_OK)
+-        goto error;
+-
+-    /* Disable VERBOSE by default, i.e. no verbose output */
+-    res = curl_easy_setopt(self->handle, CURLOPT_VERBOSE, (long)0);
+-    if (res != CURLE_OK)
+-        goto error;
+-
+-    /* Set FTP_ACCOUNT to NULL by default */
+-    res = curl_easy_setopt(self->handle, CURLOPT_FTP_ACCOUNT, NULL);
+-    if (res != CURLE_OK)
+-        goto error;
+-
+-    /* Set default USERAGENT */
+-    s = (char *) malloc(7 + strlen(LIBCURL_VERSION) + 1);
+-    if (s == NULL)
+-        goto error;
+-    strcpy(s, "PycURL/"); strcpy(s+7, LIBCURL_VERSION);
+-    res = curl_easy_setopt(self->handle, CURLOPT_USERAGENT, (char *) s);
+-    if (res != CURLE_OK) {
+-        free(s);
+-        goto error;
+-    }
+-    self->options[ OPT_INDEX(CURLOPT_USERAGENT) ] = s; s = NULL;
+-
++    res = util_curl_init(self);
++    if (res < 0)
++            goto error;
+     /* Success - return new object */
+     return self;
+ 
[email protected]@ -1425,6 +1442,7 @@
+ do_curl_reset(CurlObject *self)
+ {
+     unsigned int i;
++    int res;
+ 
+     curl_easy_reset(self->handle);
+ 
[email protected]@ -1452,7 +1470,17 @@
+         }
+     }
+ 
++    res = util_curl_init(self);
++    if (res < 0)
++            goto error;
++
++    Py_INCREF(Py_None);
+     return Py_None;
++
++error:
++    Py_DECREF(self);    /* this also closes self->handle */
++    PyErr_SetString(ErrorObject, "resetting curl failed");
++    return NULL;
+ }
+ 
+ /* --------------- unsetopt/setopt/getinfo --------------- */
[email protected]@ -1501,6 +1529,8 @@
+     case CURLOPT_RANDOM_FILE:
+     case CURLOPT_SSL_CIPHER_LIST:
+     case CURLOPT_USERPWD:
++    case CURLOPT_PROXYUSERNAME:
++    case CURLOPT_PROXYPASSWORD:
+         SETOPT((char *) 0);
+         opt_index = OPT_INDEX(option);
+         break;
[email protected]@ -1627,6 +1657,9 @@
+         case CURLOPT_SSH_HOST_PUBLIC_KEY_MD5:
+         case CURLOPT_CRLFILE:
+         case CURLOPT_ISSUERCERT:
++        case CURLOPT_NOPROXY:
++        case CURLOPT_PROXYUSERNAME:
++        case CURLOPT_PROXYPASSWORD:
+ /* FIXME: check if more of these options allow binary data */
+             str = PyString_AsString_NoNUL(obj);
+             if (str == NULL)
[email protected]@ -3561,6 +3594,9 @@
+     insint_c(d, "PROXYTYPE_HTTP", CURLPROXY_HTTP);
+     insint_c(d, "PROXYTYPE_SOCKS4", CURLPROXY_SOCKS4);
+     insint_c(d, "PROXYTYPE_SOCKS5", CURLPROXY_SOCKS5);
++    insint_c(d, "PROXYTYPE_HTTP_1_0", CURLPROXY_HTTP_1_0);
++    insint_c(d, "PROXYTYPE_SOCKS4A", CURLPROXY_SOCKS4A);
++    insint_c(d, "PROXYTYPE_SOCKS5_HOSTNAME", CURLPROXY_SOCKS5_HOSTNAME);
+ 
+     /* curl_httpauth: constants for setopt(HTTPAUTH, x) */
+     insint_c(d, "HTTPAUTH_NONE", CURLAUTH_NONE);
[email protected]@ -3735,6 +3771,9 @@
+     insint_c(d, "CRLFILE", CURLOPT_CRLFILE);
+     insint_c(d, "ISSUERCERT", CURLOPT_ISSUERCERT);
+     insint_c(d, "ADDRESS_SCOPE", CURLOPT_ADDRESS_SCOPE);
++    insint_c(d, "NOPROXY", CURLOPT_NOPROXY);
++    insint_c(d, "PROXYUSERNAME", CURLOPT_PROXYUSERNAME);
++    insint_c(d, "PROXYPASSWORD", CURLOPT_PROXYPASSWORD);
+ 
+     insint_c(d, "M_TIMERFUNCTION", CURLMOPT_TIMERFUNCTION);
+     insint_c(d, "M_SOCKETFUNCTION", CURLMOPT_SOCKETFUNCTION);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pycurl/pycurl-26.p5m	Wed Jul 13 12:43:29 2011 -0700
@@ -0,0 +1,100 @@
+#
+# 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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Python bindings for libcurl"
+set name=pkg.description value="PycURL provides a thin layer of Python bindings on top of libcurl."
+set name=info.classification value="org.opensolaris.category.2008:Development/Python"
+set name=info.upstream_url value="http://pycurl.sourceforge.net/"
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2011/266
+
+license pycurl.copyright license=MIT
+
+dir path=usr
+dir path=usr/lib
+dir path=usr/lib/python2.6
+dir path=usr/lib/python2.6/vendor-packages
+dir path=usr/lib/python2.6/vendor-packages/64
+dir path=usr/lib/python2.6/vendor-packages/curl
+dir path=usr/share
+dir path=usr/share/doc
+dir path=usr/share/doc/pycurl
+dir path=usr/share/doc/pycurl/examples
+dir path=usr/share/doc/pycurl/html
+dir path=usr/share/doc/pycurl/tests
+file path=usr/lib/python2.6/vendor-packages/64/pycurl.so
+file path=usr/lib/python2.6/vendor-packages/curl/__init__.py
+file \
+    path=usr/lib/python2.6/vendor-packages/pycurl-$(COMPONENT_VERSION)-py2.6.egg-info
+file path=usr/lib/python2.6/vendor-packages/pycurl.so
+file path=usr/share/doc/pycurl/COPYING
+file path=usr/share/doc/pycurl/COPYING2
+file path=usr/share/doc/pycurl/ChangeLog
+file path=usr/share/doc/pycurl/INSTALL
+file path=usr/share/doc/pycurl/README
+file path=usr/share/doc/pycurl/TODO
+file path=usr/share/doc/pycurl/examples/basicfirst.py
+file path=usr/share/doc/pycurl/examples/file_upload.py
+file path=usr/share/doc/pycurl/examples/linksys.py
+file path=usr/share/doc/pycurl/examples/retriever-multi.py
+file path=usr/share/doc/pycurl/examples/retriever.py
+file path=usr/share/doc/pycurl/examples/sfquery.py
+file path=usr/share/doc/pycurl/examples/xmlrpc_curl.py
+file path=usr/share/doc/pycurl/html/callbacks.html
+file path=usr/share/doc/pycurl/html/curlmultiobject.html
+file path=usr/share/doc/pycurl/html/curlobject.html
+file path=usr/share/doc/pycurl/html/curlshareobject.html
+file path=usr/share/doc/pycurl/html/pycurl.html
+file path=usr/share/doc/pycurl/tests/test.py
+file path=usr/share/doc/pycurl/tests/test_cb.py
+file path=usr/share/doc/pycurl/tests/test_debug.py
+file path=usr/share/doc/pycurl/tests/test_ftp.py
+file path=usr/share/doc/pycurl/tests/test_getinfo.py
+file path=usr/share/doc/pycurl/tests/test_gtk.py
+file path=usr/share/doc/pycurl/tests/test_internals.py
+file path=usr/share/doc/pycurl/tests/test_memleak.py
+file path=usr/share/doc/pycurl/tests/test_multi.py
+file path=usr/share/doc/pycurl/tests/test_multi2.py
+file path=usr/share/doc/pycurl/tests/test_multi3.py
+file path=usr/share/doc/pycurl/tests/test_multi4.py
+file path=usr/share/doc/pycurl/tests/test_multi5.py
+file path=usr/share/doc/pycurl/tests/test_multi6.py
+file path=usr/share/doc/pycurl/tests/test_multi_socket.py
+file path=usr/share/doc/pycurl/tests/test_multi_socket_select.py
+file path=usr/share/doc/pycurl/tests/test_multi_timer.py
+file path=usr/share/doc/pycurl/tests/test_multi_vs_thread.py
+file path=usr/share/doc/pycurl/tests/test_post.py
+file path=usr/share/doc/pycurl/tests/test_post2.py
+file path=usr/share/doc/pycurl/tests/test_post3.py
+file path=usr/share/doc/pycurl/tests/test_share.py
+file path=usr/share/doc/pycurl/tests/test_socketopen.py
+file path=usr/share/doc/pycurl/tests/test_stringio.py
+file path=usr/share/doc/pycurl/tests/test_xmlrpc.py
+file path=usr/share/doc/pycurl/tests/util.py
+
+# we have to reverse the autopyc transform for stuff in /usr/share/doc
+# since there are only py files there
+<transform file path=usr/share/doc/.+\.pyc$ -> drop>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pycurl/pycurl.copyright	Wed Jul 13 12:43:29 2011 -0700
@@ -0,0 +1,26 @@
+Oracle elects to have this file available under and governed by the Curl MIT
+derivative license (see below for full license text). However the following
+notice accompanied the original version of the file:
+
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright (C) 2001-2008 by Kjetil Jacobsen <kjetilja at gmail.com>
+Copyright (C) 2001-2008 by Markus F.X.J. Oberhumer <markus at oberhumer.com>
+
+All rights reserved.
+
+Permission to use, copy, modify, and distribute this software for any purpose
+with or without fee is hereby granted, provided that the above copyright
+notice and this permission notice appear in all copies.
+
+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 OF THIRD PARTY RIGHTS. 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.
+
+Except as contained in this notice, the name of a copyright holder shall not
+be used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization of the copyright holder.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pycurl/pycurl.p5m	Wed Jul 13 12:43:29 2011 -0700
@@ -0,0 +1,38 @@
+#
+# 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) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Python bindings for libcurl"
+set name=pkg.description value="PycURL provides a thin layer of Python bindings on top of libcurl."
+set name=info.classification value="org.opensolaris.category.2008:Development/Python"
+set name=info.upstream_url value="http://pycurl.sourceforge.net/"
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+depend fmri=library/python-2/pycurl-26 predicate=runtime/python-26 \
+    type=conditional
+
+legacy pkg=SUNWpython-pycurl \
+    desc="PycURL provides a thin layer of Python bindings on top of libcurl." \
+    name="Python bindings for libcurl"
+