--- a/components/openstack/swift/swift.p5m Mon May 16 14:46:20 2016 +0200
+++ b/components/openstack/swift/swift.p5m Fri May 20 17:42:29 2016 -0400
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -42,7 +42,6 @@
<transform file path=usr/lib/swift/(.*) -> default mode 0555>
<transform file path=usr/share/man/man1/(.+) -> set action.hash doc/manpages/%<1>>
<transform file path=usr/share/man/man4/(.+)\.4 -> set action.hash doc/manpages/%<1>.5>
-<transform file path=lib/svc/method/.* -> add pkg.depend.bypass-generate .*/smf_include.*>
set name=pkg.fmri \
value=pkg:/cloud/openstack/swift@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="OpenStack Swift (Object Storage Service)"
@@ -61,7 +60,7 @@
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=openstack.upgrade-id reboot-needed=true value=$(COMPONENT_BE_VERSION)
set name=org.opensolaris.arc-caseid value=PSARC/2013/350 value=PSARC/2014/050 \
- value=PSARC/2015/110
+ value=PSARC/2015/110 value=PSARC/2015/535
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
file path=etc/security/auth_attr.d/cloud:openstack:swift
file path=etc/security/exec_attr.d/cloud:openstack:swift
@@ -115,8 +114,7 @@
hardlink path=lib/svc/method/swift-object-updater
file path=lib/svc/method/swift-proxy-server
file path=lib/svc/method/swift-replicator-rsync
-file path=lib/svc/method/swift-upgrade \
- pkg.depend.bypass-generate=.*/openstack_common.*
+file path=lib/svc/method/swift-upgrade
file path=usr/bin/swift-account-audit
file path=usr/bin/swift-account-info
file path=usr/bin/swift-config
@@ -219,6 +217,7 @@
file path=usr/lib/python$(PYVER)/vendor-packages/swift/obj/expirer.py
file path=usr/lib/python$(PYVER)/vendor-packages/swift/obj/mem_diskfile.py
file path=usr/lib/python$(PYVER)/vendor-packages/swift/obj/mem_server.py
+file path=usr/lib/python$(PYVER)/vendor-packages/swift/obj/reconstructor.py
file path=usr/lib/python$(PYVER)/vendor-packages/swift/obj/replicator.py
file path=usr/lib/python$(PYVER)/vendor-packages/swift/obj/server.py
file path=usr/lib/python$(PYVER)/vendor-packages/swift/obj/ssync_receiver.py
@@ -288,15 +287,20 @@
user username=swift ftpuser=false gcos-field="Openstack Swift" group=swift \
home-dir=/var/lib/swift uid=86
#
-license LICENSE license="Apache v2.0"
+license swift.license license="Apache v2.0"
-# force a dependency on cloud/openstack/openstack-common until it is
-# available in the WOS
-depend type=require fmri=cloud/openstack/openstack-common
+# To upgrade to Kilo version, Juno version of the package must be on the system
+depend type=origin fmri=cloud/openstack/[email protected] root-image=true
+
+# force a dependency on package delivering rsync(1)
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/rsync
# force a dependency on dnspython; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/dnspython-$(PYV)
+# force a dependency on greenlet; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/greenlet-$(PYV)
+
# force a dependency on keystonemiddleware; used via a paste.deploy filter
depend type=require fmri=library/python/keystonemiddleware-$(PYV)
@@ -307,11 +311,11 @@
# out.
depend type=require fmri=library/python/paste.deploy-$(PYV)
+# force a dependency on pbr; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/pbr-$(PYV)
+
# force a dependency on setuptools; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/setuptools-$(PYV)
# force a dependency on xattr; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/xattr-$(PYV)
-
-# force a dependency on rsync; required for replicator service.
-depend type=require fmri=network/rsync