# HG changeset patch
# User Erik Trauschke <Erik.Trauschke@oracle.com>
# Date 1381943257 25200
# Node ID d054d400ccf413330f70e6fdb1a6dda26cec3aaa
# Parent  bb5739f8126c1a3e725f591fbe344ac7cf8d2501
16758004 The Python pyasn1-modules module should be added to Userland
PSARC/2013/182 pyasn1-modules version 0.0.5

diff -r bb5739f8126c -r d054d400ccf4 components/python/pyasn1-modules/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pyasn1-modules/Makefile	Wed Oct 16 10:07:37 2013 -0700
@@ -0,0 +1,54 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+#
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		pyasn1-modules
+COMPONENT_VERSION=	0.0.5
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH=	\
+    sha256:be65f00ed28e30756f1ef39377cb382480a2368699179d646a84d79fe9349941
+COMPONENT_ARCHIVE_URL=	$(call pypi_url)
+COMPONENT_PROJECT_URL=	http://pyasn1.sourceforge.net/
+COMPONENT_BUGDB=	python-mod/pyasn1
+
+include $(WS_TOP)/make-rules/prep.mk
+include $(WS_TOP)/make-rules/setup.py.mk
+include $(WS_TOP)/make-rules/ips.mk
+
+COMPONENT_TEST_ENV +=	PATH=/usr/bin:$(SOURCE_DIR)/tools
+COMPONENT_TEST_CMD =	$(SHELL)
+COMPONENT_TEST_ARGS =	$(COMPONENT_DIR)/files/runtests
+
+ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+
+# common targets
+build:		$(BUILD_NO_ARCH)
+
+install:	$(INSTALL_NO_ARCH)
+
+test:		$(TEST_NO_ARCH)
+
+BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
+
+include $(WS_TOP)/make-rules/depend.mk
diff -r bb5739f8126c -r d054d400ccf4 components/python/pyasn1-modules/files/runtests
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pyasn1-modules/files/runtests	Wed Oct 16 10:07:37 2013 -0700
@@ -0,0 +1,6 @@
+#!/bin/sh
+# Script to run all the pyasn1-modules test scripts.
+for f in *.sh; do
+	echo Running $f
+	/bin/sh $f
+done
diff -r bb5739f8126c -r d054d400ccf4 components/python/pyasn1-modules/patches/crl_dist.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pyasn1-modules/patches/crl_dist.patch	Wed Oct 16 10:07:37 2013 -0700
@@ -0,0 +1,15 @@
+#
+# Fix typo in rfc2459.py
+# Typo has been fixed in upstream but was not released yet.
+#
+--- pyasn1-modules-0.0.4/pyasn1_modules/rfc2459.py	2012-04-11 02:34:52.000000000 -0700
++++ pyasn1-modules-0.0.4/pyasn1_modules/rfc2459.py	2013-07-03 12:20:17.801945873 -0700
+@@ -761,7 +761,7 @@
+ id_ce_cRLDistributionPoints = univ.ObjectIdentifier('2.5.29.31')
+ 
+ class CRLDistPointsSyntax(univ.SequenceOf):
+-    componentType = DistributionPoint
++    componentType = DistributionPoint()
+     subtypeSpec = univ.SequenceOf.subtypeSpec + constraint.ValueSizeConstraint(1, MAX)
+ id_ce_issuingDistributionPoint = univ.ObjectIdentifier('2.5.29.28')
+ 
diff -r bb5739f8126c -r d054d400ccf4 components/python/pyasn1-modules/pyasn1-modules-PYVER.p5m
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pyasn1-modules/pyasn1-modules-PYVER.p5m	Wed Oct 16 10:07:37 2013 -0700
@@ -0,0 +1,75 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python-2/pyasn1-modules-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="A collection of ASN.1-based protocols modules"
+set name=pkg.description \
+    value="pyasn1-modules is a collection of ASN.1 modules expressed in the form of pyasn1 classes. It includes protocols PDUs definition (SNMP, LDAP etc.) and various data structures (X.509, PKCS etc.)."
+set name=com.oracle.info.description value="the Python pyasn1-modules module"
+set name=com.oracle.info.tpno value=14413
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/Python
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream value="Ilya Etingof <ilya@glas.net>"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2013/182
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=usr/lib/python$(PYVER)/vendor-packages/pyasn1_modules-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
+file path=usr/lib/python$(PYVER)/vendor-packages/pyasn1_modules-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/pyasn1_modules-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/pyasn1_modules-$(COMPONENT_VERSION)-py$(PYVER).egg-info/requires.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/pyasn1_modules-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/pyasn1_modules-$(COMPONENT_VERSION)-py$(PYVER).egg-info/zip-safe
+file path=usr/lib/python$(PYVER)/vendor-packages/pyasn1_modules/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pyasn1_modules/pem.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pyasn1_modules/pkcs12.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pyasn1_modules/rfc1155.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pyasn1_modules/rfc1157.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pyasn1_modules/rfc1901.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pyasn1_modules/rfc1902.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pyasn1_modules/rfc1905.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pyasn1_modules/rfc2251.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pyasn1_modules/rfc2314.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pyasn1_modules/rfc2315.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pyasn1_modules/rfc2437.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pyasn1_modules/rfc2459.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pyasn1_modules/rfc2511.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pyasn1_modules/rfc2560.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pyasn1_modules/rfc3412.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pyasn1_modules/rfc3414.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pyasn1_modules/rfc3447.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pyasn1_modules/rfc4210.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pyasn1_modules/rfc5208.py
+license LICENSE license=BSD-like
+
+# force a dependency on the Python runtime
+depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
+    pkg.debug.depend.path=usr/bin
+
+# force dependency on pyasn1; pkgdepend work is needed to flush these out
+depend type=require fmri=library/python-2/pyasn1-$(PYV)
+
+# force a dependency on the pyasn1-modules package
+depend type=require \
+    fmri=library/python-2/pyasn1-modules@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
diff -r bb5739f8126c -r d054d400ccf4 components/python/pyasn1-modules/resolve.deps
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pyasn1-modules/resolve.deps	Wed Oct 16 10:07:37 2013 -0700
@@ -0,0 +1,2 @@
+runtime/python-26
+runtime/python-27