Mercurial Mercurial > upstream > oracle > userland-gate / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/python/python27/python-27.p5m
branchs11u2-sru
changeset 3379 e99da14b537a
parent 2551 0391c5c3b137
child 3611 e09fa6c4472b 
--- a/components/python/python27/python-27.p5m	Wed Oct 08 05:29:12 2014 -0700
+++ b/components/python/python27/python-27.p5m	Mon Oct 06 13:15:36 2014 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -26,92 +26,47 @@
     value=pkg:/runtime/python-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="The Python interpreter, libraries and utilities"
 set name=com.oracle.info.description value="Python 2.7"
-set name=com.oracle.info.tpno value=9104
+set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2008/514 \
-    value=PSARC/2009/529 \
-    value=PSARC/2011/XXX
+set name=org.opensolaris.arc-caseid value=PSARC/2008/514 value=PSARC/2009/529 \
+    value=PSARC/2014/183
 # PSARC 2008/514 Python interface to dlpi(7P)
 # PSARC 2009/529 Python interface to privileges(5) & rbac(5)
+# PSARC 2014/183 Python 2.7.6
 
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-# pkgdepend doesn't like python 2.7 yet
-<transform file path=.+\.py$ -> \
-    default pkg.depend.bypass-generate .* >
-
-license python27.license license=PSFv2
-
-dir path=usr
-dir path=usr/bin
-dir path=usr/bin/$(MACH32)
-dir path=usr/bin/$(MACH64)
-dir path=usr/include
-dir path=usr/include/python2.7
-dir path=usr/lib
-dir path=usr/lib/$(MACH64)
-dir path=usr/lib/$(MACH64)/pkgconfig
+#file path=usr/bin/smtpd.py
+#file path=usr/bin/$(MACH64)/smtpd.py
+#
+file usr/bin/python2.7 path=usr/bin/$(MACH32)/isapython2.7
+link path=usr/bin/$(MACH32)/python2.7 target=isapython2.7
+file usr/bin/$(MACH64)/python2.7 path=usr/bin/$(MACH64)/isapython2.7
+link path=usr/bin/$(MACH64)/python target=python2.7 mediator=python \
+    mediator-version=2.7
+link path=usr/bin/$(MACH64)/python-config target=python2.7-config \
+    mediator=python mediator-version=2.7
+link path=usr/bin/$(MACH64)/python2.7 target=isapython2.7
+#
+file path=usr/bin/$(MACH64)/python2.7-config
+link path=usr/bin/2to3 target=2to3-2.7 mediator=python mediator-version=2.7
+#
 #dir path=usr/lib/$(MACH64)/python2.7
 #dir path=usr/lib/$(MACH64)/python2.7/config
-dir path=usr/lib/pkgconfig
-dir path=usr/lib/python2.7
-dir path=usr/lib/python2.7/bsddb
-dir path=usr/lib/python2.7/compiler
-dir path=usr/lib/python2.7/config
-dir path=usr/lib/python2.7/ctypes
-dir path=usr/lib/python2.7/ctypes/macholib
-dir path=usr/lib/python2.7/curses
-dir path=usr/lib/python2.7/distutils
-dir path=usr/lib/python2.7/distutils/command
-dir path=usr/lib/python2.7/email
-dir path=usr/lib/python2.7/email/mime
-dir path=usr/lib/python2.7/encodings
-dir path=usr/lib/python2.7/hotshot
-dir path=usr/lib/python2.7/idlelib
-dir path=usr/lib/python2.7/idlelib/Icons
-dir path=usr/lib/python2.7/importlib
-dir path=usr/lib/python2.7/json
-dir path=usr/lib/python2.7/lib-dynload
-dir path=usr/lib/python2.7/lib-dynload/64
-dir path=usr/lib/python2.7/lib2to3
-dir path=usr/lib/python2.7/lib2to3/fixes
-dir path=usr/lib/python2.7/lib2to3/pgen2
-dir path=usr/lib/python2.7/logging
-dir path=usr/lib/python2.7/multiprocessing
-dir path=usr/lib/python2.7/multiprocessing/dummy
-dir path=usr/lib/python2.7/plat-sunos5
-dir path=usr/lib/python2.7/pydoc_data
-dir path=usr/lib/python2.7/site-packages
-dir path=usr/lib/python2.7/sqlite3
-dir path=usr/lib/python2.7/unittest
-dir path=usr/lib/python2.7/unittest/test
-dir path=usr/lib/python2.7/vendor-packages
-dir path=usr/lib/python2.7/vendor-packages/64
-dir path=usr/lib/python2.7/wsgiref
-dir path=usr/lib/python2.7/xml
-dir path=usr/lib/python2.7/xml/dom
-dir path=usr/lib/python2.7/xml/etree
-dir path=usr/lib/python2.7/xml/parsers
-dir path=usr/lib/python2.7/xml/sax
-dir path=usr/share
-dir path=usr/share/man
-dir path=usr/share/man/man1
-
-file usr/bin/2to3 path=usr/bin/2to3-2.7 pkg.depend.bypass-generate=.*
-file usr/bin/idle path=usr/bin/idle-2.7 pkg.depend.bypass-generate=.*
-file usr/bin/pydoc path=usr/bin/pydoc-2.7 pkg.depend.bypass-generate=.*
-#file path=usr/bin/smtpd.py pkg.depend.bypass-generate=.* pkg.tmp.autopyc=false
-#file path=usr/bin/$(MACH64)/smtpd.py pkg.depend.bypass-generate=.* pkg.tmp.autopyc=false
-
-file usr/bin/python2.7           path=usr/bin/$(MACH32)/isapython2.7
-file usr/bin/$(MACH64)/python2.7 path=usr/bin/$(MACH64)/isapython2.7
-
-file path=usr/bin/$(MACH64)/python2.7-config pkg.depend.bypass-generate=.*
-file path=usr/bin/python2.7-config pkg.depend.bypass-generate=.*
+#
+file usr/bin/2to3 path=usr/bin/2to3-2.7
+link path=usr/bin/idle target=idle-2.7 mediator=python mediator-version=2.7
+file usr/bin/idle path=usr/bin/idle-2.7
+hardlink path=usr/bin/isapython2.7 target=../lib/isaexec
+link path=usr/bin/pydoc target=pydoc-2.7 mediator=python mediator-version=2.7
+file usr/bin/pydoc path=usr/bin/pydoc-2.7
+link path=usr/bin/python target=python2.7 mediator=python mediator-version=2.7
+link path=usr/bin/python-config target=python2.7-config mediator=python \
+    mediator-version=2.7
+link path=usr/bin/python2.7 target=$(MACH32)/isapython2.7
+file path=usr/bin/python2.7-config
 file path=usr/include/python2.7/Python-ast.h
 file path=usr/include/python2.7/Python.h
 file path=usr/include/python2.7/abstract.h
@@ -171,7 +126,9 @@
 file path=usr/include/python2.7/py_curses.h
 file path=usr/include/python2.7/pyarena.h
 file path=usr/include/python2.7/pycapsule.h
-file path=usr/include/python2.7/pyconfig.h
+file path=usr/include/python2.7/pyconfig-32.h
+file path=usr/include/python2.7/pyconfig-64.h
+file files/pyconfig.h path=usr/include/python2.7/pyconfig.h
 file path=usr/include/python2.7/pyctype.h
 file path=usr/include/python2.7/pydebug.h
 file path=usr/include/python2.7/pyerrors.h
@@ -204,10 +161,15 @@
 file path=usr/include/python2.7/unicodeobject.h
 file path=usr/include/python2.7/warnings.h
 file path=usr/include/python2.7/weakrefobject.h
+link path=usr/lib/$(MACH64)/libpython2.7.so target=libpython2.7.so.1.0
 file path=usr/lib/$(MACH64)/libpython2.7.so.1.0
+link path=usr/lib/$(MACH64)/libpython2.7_db.so target=libpython2.7_db.so.1.0
 file path=usr/lib/$(MACH64)/libpython2.7_db.so.1.0
 file $(MACH64)/llib-lpython27.ln path=usr/lib/$(MACH64)/llib-lpython2.7.ln
 file path=usr/lib/$(MACH64)/pkgconfig/python-2.7.pc
+link path=usr/lib/$(MACH64)/pkgconfig/python.pc target=python-2.7.pc \
+    mediator=python mediator-version=2.7
+link path=usr/lib/libpython2.7.so target=libpython2.7.so.1.0
 #file path=usr/lib/$(MACH64)/python2.7/config/Makefile
 #file path=usr/lib/$(MACH64)/python2.7/config/Setup
 #file path=usr/lib/$(MACH64)/python2.7/config/Setup.config
@@ -218,10 +180,13 @@
 #file path=usr/lib/$(MACH64)/python2.7/config/makesetup mode=0555
 #file path=usr/lib/$(MACH64)/python2.7/config/python.o
 file path=usr/lib/libpython2.7.so.1.0
+link path=usr/lib/libpython2.7_db.so target=libpython2.7_db.so.1.0
 file path=usr/lib/libpython2.7_db.so.1.0
 file llib-lpython27 path=usr/lib/llib-lpython2.7
 file $(MACH32)/llib-lpython27.ln path=usr/lib/llib-lpython2.7.ln
 file path=usr/lib/pkgconfig/python-2.7.pc
+link path=usr/lib/pkgconfig/python.pc target=python-2.7.pc mediator=python \
+    mediator-version=2.7
 file path=usr/lib/python2.7/BaseHTTPServer.py
 file path=usr/lib/python2.7/Bastion.py
 file path=usr/lib/python2.7/CGIHTTPServer.py
@@ -244,8 +209,10 @@
 file path=usr/lib/python2.7/__future__.py
 file path=usr/lib/python2.7/__phello__.foo.py
 file path=usr/lib/python2.7/_abcoll.py
+file path=usr/lib/python2.7/_osx_support.py
 file path=usr/lib/python2.7/_pyio.py
 file path=usr/lib/python2.7/_strptime.py
+file path=usr/lib/python2.7/_sysconfigdata.py
 file path=usr/lib/python2.7/_threading_local.py
 file path=usr/lib/python2.7/_weakrefset.py
 file path=usr/lib/python2.7/abc.py
@@ -262,14 +229,7 @@
 file path=usr/lib/python2.7/bdb.py
 file path=usr/lib/python2.7/binhex.py
 file path=usr/lib/python2.7/bisect.py
-file path=usr/lib/python2.7/bsddb/__init__.py
-file path=usr/lib/python2.7/bsddb/db.py
-file path=usr/lib/python2.7/bsddb/dbobj.py
-file path=usr/lib/python2.7/bsddb/dbrecio.py
-file path=usr/lib/python2.7/bsddb/dbshelve.py
-file path=usr/lib/python2.7/bsddb/dbtables.py
-file path=usr/lib/python2.7/bsddb/dbutils.py
-file path=usr/lib/python2.7/cProfile.py
+file path=usr/lib/python2.7/cProfile.py pkg.depend.bypass-generate=.*
 file path=usr/lib/python2.7/calendar.py
 file path=usr/lib/python2.7/cgi.py
 file path=usr/lib/python2.7/cgitb.py
@@ -580,6 +540,13 @@
 file path=usr/lib/python2.7/idlelib/IOBinding.py
 file path=usr/lib/python2.7/idlelib/Icons/folder.gif
 file path=usr/lib/python2.7/idlelib/Icons/idle.icns
+file path=usr/lib/python2.7/idlelib/Icons/idle.ico
+file path=usr/lib/python2.7/idlelib/Icons/idle_16.gif
+file path=usr/lib/python2.7/idlelib/Icons/idle_16.png
+file path=usr/lib/python2.7/idlelib/Icons/idle_32.gif
+file path=usr/lib/python2.7/idlelib/Icons/idle_32.png
+file path=usr/lib/python2.7/idlelib/Icons/idle_48.gif
+file path=usr/lib/python2.7/idlelib/Icons/idle_48.png
 file path=usr/lib/python2.7/idlelib/Icons/minusnode.gif
 file path=usr/lib/python2.7/idlelib/Icons/openfolder.gif
 file path=usr/lib/python2.7/idlelib/Icons/plusnode.gif
@@ -650,7 +617,6 @@
 file path=usr/lib/python2.7/json/scanner.py
 file path=usr/lib/python2.7/json/tool.py
 file path=usr/lib/python2.7/keyword.py
-file path=usr/lib/python2.7/lib-dynload/Python-$(COMPONENT_VERSION)-py2.7.egg-info
 file path=usr/lib/python2.7/lib-dynload/64/_bisect.so
 file path=usr/lib/python2.7/lib-dynload/64/_codecs_cn.so
 file path=usr/lib/python2.7/lib-dynload/64/_codecs_hk.so
@@ -699,6 +665,7 @@
 file path=usr/lib/python2.7/lib-dynload/64/mmap.so
 file path=usr/lib/python2.7/lib-dynload/64/nis.so
 file path=usr/lib/python2.7/lib-dynload/64/operator.so
+file path=usr/lib/python2.7/lib-dynload/64/ossaudiodev.so
 file path=usr/lib/python2.7/lib-dynload/64/parser.so
 file path=usr/lib/python2.7/lib-dynload/64/privileges.so
 file path=usr/lib/python2.7/lib-dynload/64/pyexpat.so
@@ -715,6 +682,7 @@
 file path=usr/lib/python2.7/lib-dynload/64/ucred.so
 file path=usr/lib/python2.7/lib-dynload/64/unicodedata.so
 file path=usr/lib/python2.7/lib-dynload/64/zlib.so
+file path=usr/lib/python2.7/lib-dynload/Python-$(COMPONENT_VERSION)-py2.7.egg-info
 file path=usr/lib/python2.7/lib-dynload/_bisect.so
 file path=usr/lib/python2.7/lib-dynload/_codecs_cn.so
 file path=usr/lib/python2.7/lib-dynload/_codecs_hk.so
@@ -765,6 +733,7 @@
 file path=usr/lib/python2.7/lib-dynload/mmap.so
 file path=usr/lib/python2.7/lib-dynload/nis.so
 file path=usr/lib/python2.7/lib-dynload/operator.so
+file path=usr/lib/python2.7/lib-dynload/ossaudiodev.so
 file path=usr/lib/python2.7/lib-dynload/parser.so
 file path=usr/lib/python2.7/lib-dynload/privileges.so
 file path=usr/lib/python2.7/lib-dynload/pyexpat.so
@@ -781,10 +750,10 @@
 file path=usr/lib/python2.7/lib-dynload/ucred.so
 file path=usr/lib/python2.7/lib-dynload/unicodedata.so
 file path=usr/lib/python2.7/lib-dynload/zlib.so
+file path=usr/lib/python2.7/lib2to3/Grammar$(COMPONENT_VERSION).final.0.pickle
 file path=usr/lib/python2.7/lib2to3/Grammar.txt
-file path=usr/lib/python2.7/lib2to3/Grammar$(COMPONENT_VERSION).final.0.pickle
+file path=usr/lib/python2.7/lib2to3/PatternGrammar$(COMPONENT_VERSION).final.0.pickle
 file path=usr/lib/python2.7/lib2to3/PatternGrammar.txt
-file path=usr/lib/python2.7/lib2to3/PatternGrammar$(COMPONENT_VERSION).final.0.pickle
 file path=usr/lib/python2.7/lib2to3/__init__.py
 file path=usr/lib/python2.7/lib2to3/__main__.py
 file path=usr/lib/python2.7/lib2to3/btm_matcher.py
@@ -900,7 +869,7 @@
 file path=usr/lib/python2.7/os.py
 file path=usr/lib/python2.7/os2emxpath.py
 file path=usr/lib/python2.7/pdb.doc
-file path=usr/lib/python2.7/pdb.py
+file path=usr/lib/python2.7/pdb.py pkg.depend.bypass-generate=.*
 file path=usr/lib/python2.7/pickle.py
 file path=usr/lib/python2.7/pickletools.py
 file path=usr/lib/python2.7/pipes.py
@@ -912,14 +881,14 @@
 file path=usr/lib/python2.7/plat-sunos5/SUNAUDIODEV.py
 file path=usr/lib/python2.7/plat-sunos5/TYPES.py
 file path=usr/lib/python2.7/plat-sunos5/regen mode=0555
-file path=usr/lib/python2.7/platform.py
+file path=usr/lib/python2.7/platform.py pkg.depend.bypass-generate=.*
 file path=usr/lib/python2.7/plistlib.py
 file path=usr/lib/python2.7/popen2.py
 file path=usr/lib/python2.7/poplib.py
 file path=usr/lib/python2.7/posixfile.py
 file path=usr/lib/python2.7/posixpath.py
 file path=usr/lib/python2.7/pprint.py
-file path=usr/lib/python2.7/profile.py
+file path=usr/lib/python2.7/profile.py pkg.depend.bypass-generate=.*
 file path=usr/lib/python2.7/pstats.py
 file path=usr/lib/python2.7/pty.py
 file path=usr/lib/python2.7/py_compile.py
@@ -946,7 +915,7 @@
 file path=usr/lib/python2.7/site-packages/README
 file path=usr/lib/python2.7/site-packages/vendor-packages.pth
 file path=usr/lib/python2.7/site.py
-file path=usr/lib/python2.7/smtpd.py
+file path=usr/lib/python2.7/smtpd.py pkg.depend.bypass-generate=.*
 file path=usr/lib/python2.7/smtplib.py
 file path=usr/lib/python2.7/sndhdr.py
 file path=usr/lib/python2.7/socket.py
@@ -981,7 +950,7 @@
 file path=usr/lib/python2.7/toaiff.py
 file path=usr/lib/python2.7/token.py
 file path=usr/lib/python2.7/tokenize.py
-file path=usr/lib/python2.7/trace.py
+file path=usr/lib/python2.7/trace.py pkg.depend.bypass-generate=.*
 file path=usr/lib/python2.7/traceback.py
 file path=usr/lib/python2.7/tty.py
 file path=usr/lib/python2.7/types.py
@@ -1054,38 +1023,14 @@
 file path=usr/lib/python2.7/xmllib.py
 file path=usr/lib/python2.7/xmlrpclib.py
 file path=usr/lib/python2.7/zipfile.py
+link path=usr/share/man/man1/python.1 target=python2.7.1 mediator=python \
+    mediator-version=2.7
 file path=usr/share/man/man1/python2.7.1
-
-hardlink path=usr/bin/isapython2.7 target=../lib/isaexec
-
-link path=usr/bin/$(MACH32)/python2.7 target=isapython2.7
-link path=usr/bin/$(MACH64)/python2.7 target=isapython2.7
-link path=usr/bin/python2.7 target=$(MACH32)/isapython2.7
-link path=usr/lib/$(MACH64)/libpython2.7.so target=libpython2.7.so.1.0
-link path=usr/lib/$(MACH64)/libpython2.7_db.so target=libpython2.7_db.so.1.0
-link path=usr/lib/libpython2.7.so target=libpython2.7.so.1.0
-link path=usr/lib/libpython2.7_db.so target=libpython2.7_db.so.1.0
-
-link path=usr/bin/2to3 target=2to3-2.7 mediator=python mediator-version=2.7 \
-    pkg.linted.pkglint.dupaction010.1=true
-link path=usr/bin/idle target=idle-2.7 mediator=python mediator-version=2.7 \
-    pkg.linted.pkglint.dupaction010.1=true
-link path=usr/bin/pydoc target=pydoc-2.7 mediator=python mediator-version=2.7 \
-    pkg.linted.pkglint.dupaction010.1=true
-link path=usr/bin/python target=python2.7 mediator=python mediator-version=2.7 \
-    pkg.linted.pkglint.dupaction010.2=true
-link path=usr/bin/python-config target=python2.7-config mediator=python mediator-version=2.7 \
-    pkg.linted.pkglint.dupaction010.2=true
-link path=usr/bin/$(MACH64)/python target=python2.7 mediator=python mediator-version=2.7 \
-    pkg.linted.pkglint.dupaction010.2=true
-link path=usr/bin/$(MACH64)/python-config target=python2.7-config mediator=python mediator-version=2.7 \
-    pkg.linted.pkglint.dupaction010.2=true
-link path=usr/lib/pkgconfig/python.pc target=python-2.7.pc mediator=python mediator-version=2.7
-link path=usr/lib/$(MACH64)/pkgconfig/python.pc target=python-2.7.pc mediator=python mediator-version=2.7
-link path=usr/share/man/man1/python.1 target=python2.7.1 mediator=python mediator-version=2.7
+#
+license python27.license license=PSFv2
 
 # This optionally brings in the python tk support if tk is installed
-depend type=conditional fmri=library/python-2/tkinter-27 predicate=runtime/tk-8
+depend type=conditional fmri=library/python/tkinter-27 predicate=runtime/tk-8
 
 # If 2.6 is installed, bump it up to the current version to avoid conflicts.
 depend type=optional fmri=runtime/[email protected],$(BUILD_VERSION)
upstream/oracle/userland-gate