24300806 libpki needs added packages in s11u3 for pkgmerge issue with mediator s11u3-sru
authorJan Parcel <jan.parcel@oracle.com>
Wed, 20 Jul 2016 13:49:39 -0700
branchs11u3-sru
changeset 6440 cbff81e6409f
parent 6438 6e119d670a88
child 6443 54dc57734e1c
24300806 libpki needs added packages in s11u3 for pkgmerge issue with mediator
components/libpki/libpki-mozillaldap.p5m
components/libpki/libpki-openldap.p5m
components/libpki/libpki.p5m
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/libpki/libpki-mozillaldap.p5m	Wed Jul 20 13:49:39 2016 -0700
@@ -0,0 +1,44 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/security/ocsp/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="Provides libpki links mediated for Mozilla LDAP."
+set name=com.oracle.info.description value="the LibPKI Project"
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+    value=org.opensolaris.category.2008:System/Libraries \
+    value=org.opensolaris.category.2008:System/Security
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2016/220
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+license COPYING license=Apache
+
+# Mediator link for the library
+link path=usr/lib/$(MACH64)/libpki.so.89.89.9 \
+    target=../libpki/mozillaldap/$(MACH64)/libpki.so.89.89.9 mediator=libpki \
+    mediator-implementation=mozillaldap
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/libpki/libpki-openldap.p5m	Wed Jul 20 13:49:39 2016 -0700
@@ -0,0 +1,44 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/security/ocsp/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="Provides libpki links mediated for openldap."
+set name=com.oracle.info.description value="the LibPKI Project"
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+    value=org.opensolaris.category.2008:System/Libraries \
+    value=org.opensolaris.category.2008:System/Security
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2016/220
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+license COPYING license=Apache
+
+# Mediator link for the library.  
+link path=usr/lib/$(MACH64)/libpki.so.89.89.9 \
+    target=../libpki/openldap/$(MACH64)/libpki.so.89.89.9 mediator=libpki \
+    mediator-implementation=openldap mediator-priority=vendor
--- a/components/libpki/libpki.p5m	Mon Jul 11 07:21:49 2016 -0700
+++ b/components/libpki/libpki.p5m	Wed Jul 20 13:49:39 2016 -0700
@@ -195,10 +195,8 @@
 file path=usr/share/doc/libpki/pkginfo
 license COPYING license=Apache
 
-# Mediator links for the library.
-link path=usr/lib/$(MACH64)/libpki.so.89.89.9 \
-    target=../libpki/openldap/$(MACH64)/libpki.so.89.89.9 mediator=libpki \
-    mediator-implementation=openldap mediator-priority=vendor
-link path=usr/lib/$(MACH64)/libpki.so.89.89.9 \
-    target=../libpki/mozillaldap/$(MACH64)/libpki.so.89.89.9 mediator=libpki \
-    mediator-implementation=mozillaldap
+# Mediation cannot be done within a single package at this time because
+# of pkgmerge logic.
+# Guarantee the correct library cannot be missing at install-time.
+depend type=require fmri=library/security/ocsp/libpki-openldap
+depend type=require fmri=library/security/ocsp/libpki-mozillaldap