PSARC/2015/194 libsasl ON to Userland migration and update
22667336 Rename package libsasl to libsasl2
22649369 Correct linking from -lsasl to -lsasl2 in Userland
22667257 Correct interface committment level for libsasl2 to "pass-through volatile"
22673460 Add a note with example to packaging.txt rename section
--- a/components/cyrus-sasl/Makefile Thu Feb 11 22:32:09 2016 -0800
+++ b/components/cyrus-sasl/Makefile Fri Feb 12 09:35:44 2016 -0800
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -33,11 +33,6 @@
COMPONENT_NAME= cyrus-sasl
-# Prepending $(PKG_SOLARIS_VERSION) to version in package manifest due to
-# historical versioning, which will also be needed in any possible backports.
-# This will be changed to $(COMPONENT_VERSION) if the pkg name changes.
-# openldap.p5m must also be changed if this version format changes.
-IPS_COMPONENT_VERSION= $(PKG_SOLARIS_VERSION).$(COMPONENT_VERSION)
#
# If you update the COMPONENT_VERSION, you should make a corresponding change
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/cyrus-sasl/history Fri Feb 12 09:35:44 2016 -0800
@@ -0,0 +1,1 @@
+system/library/security/[email protected],5.12-5.12.0.0.0.93.0 system/library/security/libsasl2
--- a/components/cyrus-sasl/libsasl.p5m Thu Feb 11 22:32:09 2016 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,210 +0,0 @@
-#
-# 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) 2015, Oracle and/or its affiliates. All rights reserved.
-#
-
-<transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
-<transform file path=(.+)/man/man3sasl/(.+).3sasl$ -> \
- set action.hash %<1>/man/man3/%<2>.3>
-
-# A package version that starts with 2.1.26 will refuse to replace a package
-# version that starts with 5.12, so this workaround is needed until the
-# name change to libsasl2 (see Phase II line above)
-
-# openldap.p5m is dependent on this package name, must be kept in sync
-set name=pkg.fmri \
- value=pkg:/system/library/security/libsasl@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-#
-set name=pkg.summary \
- value="Cyrus SASL - Simple Authentication and Security Layer"
-set name=com.oracle.info.description value="cyrus-sasl project"
-set name=com.oracle.info.tpno value=$(TPNO)
-set name=info.classification \
- value=org.opensolaris.category.2008:System/Libraries
-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/2015/194
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-dir path=etc/sasl owner=root group=sys mode=0755
-file README.Solaris path=etc/sasl/README.Solaris
-file path=usr/include/sasl/hmac-md5.h
-file path=usr/include/sasl/md5.h
-file path=usr/include/sasl/md5global.h
-file path=usr/include/sasl/prop.h
-file path=usr/include/sasl/sasl.h
-file path=usr/include/sasl/saslplug.h
-file path=usr/include/sasl/saslutil.h
-link path=usr/lib/$(MACH64)/libsasl.so target=libsasl2.so.3.0.0
-file path=usr/lib/$(MACH64)/libsasl.so.1
-link path=usr/lib/$(MACH64)/libsasl2.so target=libsasl2.so.3.0.0
-link path=usr/lib/$(MACH64)/libsasl2.so.3 target=libsasl2.so.3.0.0
-file path=usr/lib/$(MACH64)/libsasl2.so.3.0.0
-link path=usr/lib/$(MACH64)/llib-lsasl target=../llib-lsasl2 \
- pkg.linted.dupaction010.2=true
-link path=usr/lib/$(MACH64)/llib-lsasl.ln target=llib-lsasl2.ln \
- pkg.linted.dupaction010.2=true
-link path=usr/lib/$(MACH64)/llib-lsasl2 target=../llib-lsasl2
-file path=usr/lib/$(MACH64)/llib-lsasl2.ln
-link path=usr/lib/$(MACH64)/pkgconfig/libsasl.pc target=libsasl2.pc
-file path=usr/lib/$(MACH64)/pkgconfig/libsasl2.pc
-link path=usr/lib/libsasl.so target=libsasl2.so.3.0.0
-file path=usr/lib/libsasl.so.1
-link path=usr/lib/libsasl2.so target=libsasl2.so.3.0.0
-link path=usr/lib/libsasl2.so.3 target=libsasl2.so.3.0.0
-file path=usr/lib/libsasl2.so.3.0.0
-link path=usr/lib/llib-lsasl target=llib-lsasl2 pkg.linted.dupaction010.2=true
-link path=usr/lib/llib-lsasl.ln target=llib-lsasl2.ln \
- pkg.linted.dupaction010.2=true
-file path=usr/lib/llib-lsasl2
-file path=usr/lib/llib-lsasl2.ln
-link path=usr/lib/pkgconfig/libsasl.pc target=libsasl2.pc
-file path=usr/lib/pkgconfig/libsasl2.pc
-link path=usr/lib/sasl target=./sasl2 pkg.linted=true
-link path=usr/lib/sasl2/$(MACH64)/libanonymous.so target=libanonymous.so.3.0.0
-link path=usr/lib/sasl2/$(MACH64)/libanonymous.so.3 target=libanonymous.so.3.0.0
-file path=usr/lib/sasl2/$(MACH64)/libanonymous.so.3.0.0
-link path=usr/lib/sasl2/$(MACH64)/libcrammd5.so target=libcrammd5.so.3.0.0
-link path=usr/lib/sasl2/$(MACH64)/libcrammd5.so.3 target=libcrammd5.so.3.0.0
-file path=usr/lib/sasl2/$(MACH64)/libcrammd5.so.3.0.0
-link path=usr/lib/sasl2/$(MACH64)/libdigestmd5.so target=libdigestmd5.so.3.0.0
-link path=usr/lib/sasl2/$(MACH64)/libdigestmd5.so.3 target=libdigestmd5.so.3.0.0
-file path=usr/lib/sasl2/$(MACH64)/libdigestmd5.so.3.0.0
-link path=usr/lib/sasl2/$(MACH64)/libgssapiv2.so target=libgssapiv2.so.3.0.0
-link path=usr/lib/sasl2/$(MACH64)/libgssapiv2.so.3 target=libgssapiv2.so.3.0.0
-file path=usr/lib/sasl2/$(MACH64)/libgssapiv2.so.3.0.0
-link path=usr/lib/sasl2/$(MACH64)/libotp.so target=libotp.so.3.0.0
-link path=usr/lib/sasl2/$(MACH64)/libotp.so.3 target=libotp.so.3.0.0
-file path=usr/lib/sasl2/$(MACH64)/libotp.so.3.0.0
-link path=usr/lib/sasl2/$(MACH64)/libplain.so target=libplain.so.3.0.0
-link path=usr/lib/sasl2/$(MACH64)/libplain.so.3 target=libplain.so.3.0.0
-file path=usr/lib/sasl2/$(MACH64)/libplain.so.3.0.0
-link path=usr/lib/sasl2/$(MACH64)/libsasldb.so target=libsasldb.so.3.0.0
-link path=usr/lib/sasl2/$(MACH64)/libsasldb.so.3 target=libsasldb.so.3.0.0
-file path=usr/lib/sasl2/$(MACH64)/libsasldb.so.3.0.0
-link path=usr/lib/sasl2/$(MACH64)/libscram.so target=libscram.so.3.0.0
-link path=usr/lib/sasl2/$(MACH64)/libscram.so.3 target=libscram.so.3.0.0
-file path=usr/lib/sasl2/$(MACH64)/libscram.so.3.0.0
-link path=usr/lib/sasl2/64 target=./$(MACH64)
-link path=usr/lib/sasl2/libanonymous.so target=libanonymous.so.3.0.0
-link path=usr/lib/sasl2/libanonymous.so.3 target=libanonymous.so.3.0.0
-file path=usr/lib/sasl2/libanonymous.so.3.0.0
-link path=usr/lib/sasl2/libcrammd5.so target=libcrammd5.so.3.0.0
-link path=usr/lib/sasl2/libcrammd5.so.3 target=libcrammd5.so.3.0.0
-file path=usr/lib/sasl2/libcrammd5.so.3.0.0
-link path=usr/lib/sasl2/libdigestmd5.so target=libdigestmd5.so.3.0.0
-link path=usr/lib/sasl2/libdigestmd5.so.3 target=libdigestmd5.so.3.0.0
-file path=usr/lib/sasl2/libdigestmd5.so.3.0.0
-link path=usr/lib/sasl2/libgssapiv2.so target=libgssapiv2.so.3.0.0
-link path=usr/lib/sasl2/libgssapiv2.so.3 target=libgssapiv2.so.3.0.0
-file path=usr/lib/sasl2/libgssapiv2.so.3.0.0
-link path=usr/lib/sasl2/libotp.so target=libotp.so.3.0.0
-link path=usr/lib/sasl2/libotp.so.3 target=libotp.so.3.0.0
-file path=usr/lib/sasl2/libotp.so.3.0.0
-link path=usr/lib/sasl2/libplain.so target=libplain.so.3.0.0
-link path=usr/lib/sasl2/libplain.so.3 target=libplain.so.3.0.0
-file path=usr/lib/sasl2/libplain.so.3.0.0
-link path=usr/lib/sasl2/libsasldb.so target=libsasldb.so.3.0.0
-link path=usr/lib/sasl2/libsasldb.so.3 target=libsasldb.so.3.0.0
-file path=usr/lib/sasl2/libsasldb.so.3.0.0
-link path=usr/lib/sasl2/libscram.so target=libscram.so.3.0.0
-link path=usr/lib/sasl2/libscram.so.3 target=libscram.so.3.0.0
-file path=usr/lib/sasl2/libscram.so.3.0.0
-file path=usr/sbin/pluginviewer
-file path=usr/sbin/saslauthd
-file path=usr/sbin/sasldblistusers2
-file path=usr/sbin/saslpasswd2
-file path=usr/sbin/testsaslauthd
-link path=usr/share/man/man3sasl/prop_clear.3sasl target=sasl_auxprop.3sasl
-link path=usr/share/man/man3sasl/prop_dispose.3sasl target=sasl_auxprop.3sasl
-link path=usr/share/man/man3sasl/prop_dup.3sasl target=sasl_auxprop.3sasl
-link path=usr/share/man/man3sasl/prop_erase.3sasl target=sasl_auxprop.3sasl
-link path=usr/share/man/man3sasl/prop_format.3sasl target=sasl_auxprop.3sasl
-link path=usr/share/man/man3sasl/prop_get.3sasl target=sasl_auxprop.3sasl
-link path=usr/share/man/man3sasl/prop_getnames.3sasl target=sasl_auxprop.3sasl
-link path=usr/share/man/man3sasl/prop_new.3sasl target=sasl_auxprop.3sasl
-link path=usr/share/man/man3sasl/prop_request.3sasl target=sasl_auxprop.3sasl
-link path=usr/share/man/man3sasl/prop_set.3sasl target=sasl_auxprop.3sasl
-link path=usr/share/man/man3sasl/prop_setvals.3sasl target=sasl_auxprop.3sasl
-file path=usr/share/man/man3sasl/sasl.3sasl
-file path=usr/share/man/man3sasl/sasl_authorize_t.3sasl
-file path=usr/share/man/man3sasl/sasl_auxprop.3sasl
-file sasl_auxprop_add_plugin.3sasl \
- path=usr/share/man/man3sasl/sasl_auxprop_add_plugin.3sasl
-file path=usr/share/man/man3sasl/sasl_auxprop_getctx.3sasl
-file path=usr/share/man/man3sasl/sasl_auxprop_request.3sasl
-file path=usr/share/man/man3sasl/sasl_callbacks.3sasl
-file path=usr/share/man/man3sasl/sasl_canon_user_t.3sasl
-file sasl_canonuser_add_plugin.3sasl \
- path=usr/share/man/man3sasl/sasl_canonuser_add_plugin.3sasl
-file path=usr/share/man/man3sasl/sasl_chalprompt_t.3sasl
-file path=usr/share/man/man3sasl/sasl_checkapop.3sasl
-file path=usr/share/man/man3sasl/sasl_checkpass.3sasl
-file sasl_client_add_plugin.3sasl \
- path=usr/share/man/man3sasl/sasl_client_add_plugin.3sasl
-file path=usr/share/man/man3sasl/sasl_client_init.3sasl
-file path=usr/share/man/man3sasl/sasl_client_new.3sasl
-file path=usr/share/man/man3sasl/sasl_client_start.3sasl
-file path=usr/share/man/man3sasl/sasl_client_step.3sasl
-file path=usr/share/man/man3sasl/sasl_decode.3sasl
-file sasl_decode64.3sasl path=usr/share/man/man3sasl/sasl_decode64.3sasl
-file path=usr/share/man/man3sasl/sasl_dispose.3sasl
-file path=usr/share/man/man3sasl/sasl_done.3sasl
-file path=usr/share/man/man3sasl/sasl_encode.3sasl
-file sasl_encode64.3sasl path=usr/share/man/man3sasl/sasl_encode64.3sasl
-link path=usr/share/man/man3sasl/sasl_encodev.3sasl target=sasl_encode.3sasl
-file sasl_erasebuffer.3sasl path=usr/share/man/man3sasl/sasl_erasebuffer.3sasl
-file path=usr/share/man/man3sasl/sasl_errdetail.3sasl
-file path=usr/share/man/man3sasl/sasl_errors.3sasl
-file path=usr/share/man/man3sasl/sasl_errstring.3sasl
-file path=usr/share/man/man3sasl/sasl_getconfpath_t.3sasl
-file path=usr/share/man/man3sasl/sasl_getopt_t.3sasl
-file path=usr/share/man/man3sasl/sasl_getpath_t.3sasl
-file path=usr/share/man/man3sasl/sasl_getprop.3sasl
-file path=usr/share/man/man3sasl/sasl_getrealm_t.3sasl
-file path=usr/share/man/man3sasl/sasl_getsecret_t.3sasl
-file path=usr/share/man/man3sasl/sasl_getsimple_t.3sasl
-file path=usr/share/man/man3sasl/sasl_global_listmech.3sasl
-file path=usr/share/man/man3sasl/sasl_idle.3sasl
-file path=usr/share/man/man3sasl/sasl_listmech.3sasl
-file path=usr/share/man/man3sasl/sasl_log_t.3sasl
-file sasl_server_add_plugin.3sasl \
- path=usr/share/man/man3sasl/sasl_server_add_plugin.3sasl
-file path=usr/share/man/man3sasl/sasl_server_init.3sasl
-file path=usr/share/man/man3sasl/sasl_server_new.3sasl
-file path=usr/share/man/man3sasl/sasl_server_start.3sasl
-file path=usr/share/man/man3sasl/sasl_server_step.3sasl
-file path=usr/share/man/man3sasl/sasl_server_userdb_checkpass_t.3sasl
-file path=usr/share/man/man3sasl/sasl_server_userdb_setpass_t.3sasl
-file sasl_set_alloc.3sasl path=usr/share/man/man3sasl/sasl_set_alloc.3sasl
-file sasl_set_mutex.3sasl path=usr/share/man/man3sasl/sasl_set_mutex.3sasl
-file sasl_seterror.3sasl path=usr/share/man/man3sasl/sasl_seterror.3sasl
-file path=usr/share/man/man3sasl/sasl_setpass.3sasl
-file path=usr/share/man/man3sasl/sasl_setprop.3sasl
-file path=usr/share/man/man3sasl/sasl_user_exists.3sasl
-file sasl_utf8verify.3sasl path=usr/share/man/man3sasl/sasl_utf8verify.3sasl
-file path=usr/share/man/man3sasl/sasl_verifyfile_t.3sasl
-file path=usr/share/man/man8/pluginviewer.8
-file path=usr/share/man/man8/saslauthd.8
-file path=usr/share/man/man8/sasldblistusers2.8
-file path=usr/share/man/man8/saslpasswd2.8
-license libsasl2.license license="BSD with attribution to CMU, MIT, others"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/cyrus-sasl/libsasl2.p5m Fri Feb 12 09:35:44 2016 -0800
@@ -0,0 +1,206 @@
+#
+# 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.
+#
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability "pass-through volatile">
+<transform file path=(.+)/man/man3sasl/(.+).3sasl$ -> \
+ set action.hash %<1>/man/man3/%<2>.3>
+
+# openldap.p5m is dependent on this package inside the workspace, must
+# be kept in sync
+set name=pkg.fmri \
+ value=pkg:/system/library/security/libsasl2@$(COMPONENT_VERSION),$(BUILD_VERSION)
+#
+set name=pkg.summary \
+ value="Cyrus SASL - Simple Authentication and Security Layer"
+set name=com.oracle.info.description value="cyrus-sasl libsasl2 project"
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+ value=org.opensolaris.category.2008:System/Libraries
+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/2015/194
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+dir path=etc/sasl owner=root group=sys mode=0755
+file README.Solaris path=etc/sasl/README.Solaris
+file path=usr/include/sasl/hmac-md5.h
+file path=usr/include/sasl/md5.h
+file path=usr/include/sasl/md5global.h
+file path=usr/include/sasl/prop.h
+file path=usr/include/sasl/sasl.h
+file path=usr/include/sasl/saslplug.h
+file path=usr/include/sasl/saslutil.h
+link path=usr/lib/$(MACH64)/libsasl.so target=libsasl2.so.3.0.0
+file path=usr/lib/$(MACH64)/libsasl.so.1
+link path=usr/lib/$(MACH64)/libsasl2.so target=libsasl2.so.3.0.0
+link path=usr/lib/$(MACH64)/libsasl2.so.3 target=libsasl2.so.3.0.0
+file path=usr/lib/$(MACH64)/libsasl2.so.3.0.0
+link path=usr/lib/$(MACH64)/llib-lsasl target=../llib-lsasl2
+link path=usr/lib/$(MACH64)/llib-lsasl.ln target=llib-lsasl2.ln
+link path=usr/lib/$(MACH64)/llib-lsasl2 target=../llib-lsasl2
+file path=usr/lib/$(MACH64)/llib-lsasl2.ln
+link path=usr/lib/$(MACH64)/pkgconfig/libsasl.pc target=libsasl2.pc
+file path=usr/lib/$(MACH64)/pkgconfig/libsasl2.pc
+link path=usr/lib/libsasl.so target=libsasl2.so.3.0.0
+file path=usr/lib/libsasl.so.1
+link path=usr/lib/libsasl2.so target=libsasl2.so.3.0.0
+link path=usr/lib/libsasl2.so.3 target=libsasl2.so.3.0.0
+file path=usr/lib/libsasl2.so.3.0.0
+link path=usr/lib/llib-lsasl target=llib-lsasl2
+link path=usr/lib/llib-lsasl.ln target=llib-lsasl2.ln
+file path=usr/lib/llib-lsasl2
+file path=usr/lib/llib-lsasl2.ln
+link path=usr/lib/pkgconfig/libsasl.pc target=libsasl2.pc
+file path=usr/lib/pkgconfig/libsasl2.pc
+link path=usr/lib/sasl target=./sasl2
+link path=usr/lib/sasl2/$(MACH64)/libanonymous.so target=libanonymous.so.3.0.0
+link path=usr/lib/sasl2/$(MACH64)/libanonymous.so.3 target=libanonymous.so.3.0.0
+file path=usr/lib/sasl2/$(MACH64)/libanonymous.so.3.0.0
+link path=usr/lib/sasl2/$(MACH64)/libcrammd5.so target=libcrammd5.so.3.0.0
+link path=usr/lib/sasl2/$(MACH64)/libcrammd5.so.3 target=libcrammd5.so.3.0.0
+file path=usr/lib/sasl2/$(MACH64)/libcrammd5.so.3.0.0
+link path=usr/lib/sasl2/$(MACH64)/libdigestmd5.so target=libdigestmd5.so.3.0.0
+link path=usr/lib/sasl2/$(MACH64)/libdigestmd5.so.3 target=libdigestmd5.so.3.0.0
+file path=usr/lib/sasl2/$(MACH64)/libdigestmd5.so.3.0.0
+link path=usr/lib/sasl2/$(MACH64)/libgssapiv2.so target=libgssapiv2.so.3.0.0
+link path=usr/lib/sasl2/$(MACH64)/libgssapiv2.so.3 target=libgssapiv2.so.3.0.0
+file path=usr/lib/sasl2/$(MACH64)/libgssapiv2.so.3.0.0
+link path=usr/lib/sasl2/$(MACH64)/libotp.so target=libotp.so.3.0.0
+link path=usr/lib/sasl2/$(MACH64)/libotp.so.3 target=libotp.so.3.0.0
+file path=usr/lib/sasl2/$(MACH64)/libotp.so.3.0.0
+link path=usr/lib/sasl2/$(MACH64)/libplain.so target=libplain.so.3.0.0
+link path=usr/lib/sasl2/$(MACH64)/libplain.so.3 target=libplain.so.3.0.0
+file path=usr/lib/sasl2/$(MACH64)/libplain.so.3.0.0
+link path=usr/lib/sasl2/$(MACH64)/libsasldb.so target=libsasldb.so.3.0.0
+link path=usr/lib/sasl2/$(MACH64)/libsasldb.so.3 target=libsasldb.so.3.0.0
+file path=usr/lib/sasl2/$(MACH64)/libsasldb.so.3.0.0
+link path=usr/lib/sasl2/$(MACH64)/libscram.so target=libscram.so.3.0.0
+link path=usr/lib/sasl2/$(MACH64)/libscram.so.3 target=libscram.so.3.0.0
+file path=usr/lib/sasl2/$(MACH64)/libscram.so.3.0.0
+link path=usr/lib/sasl2/64 target=./$(MACH64)
+link path=usr/lib/sasl2/libanonymous.so target=libanonymous.so.3.0.0
+link path=usr/lib/sasl2/libanonymous.so.3 target=libanonymous.so.3.0.0
+file path=usr/lib/sasl2/libanonymous.so.3.0.0
+link path=usr/lib/sasl2/libcrammd5.so target=libcrammd5.so.3.0.0
+link path=usr/lib/sasl2/libcrammd5.so.3 target=libcrammd5.so.3.0.0
+file path=usr/lib/sasl2/libcrammd5.so.3.0.0
+link path=usr/lib/sasl2/libdigestmd5.so target=libdigestmd5.so.3.0.0
+link path=usr/lib/sasl2/libdigestmd5.so.3 target=libdigestmd5.so.3.0.0
+file path=usr/lib/sasl2/libdigestmd5.so.3.0.0
+link path=usr/lib/sasl2/libgssapiv2.so target=libgssapiv2.so.3.0.0
+link path=usr/lib/sasl2/libgssapiv2.so.3 target=libgssapiv2.so.3.0.0
+file path=usr/lib/sasl2/libgssapiv2.so.3.0.0
+link path=usr/lib/sasl2/libotp.so target=libotp.so.3.0.0
+link path=usr/lib/sasl2/libotp.so.3 target=libotp.so.3.0.0
+file path=usr/lib/sasl2/libotp.so.3.0.0
+link path=usr/lib/sasl2/libplain.so target=libplain.so.3.0.0
+link path=usr/lib/sasl2/libplain.so.3 target=libplain.so.3.0.0
+file path=usr/lib/sasl2/libplain.so.3.0.0
+link path=usr/lib/sasl2/libsasldb.so target=libsasldb.so.3.0.0
+link path=usr/lib/sasl2/libsasldb.so.3 target=libsasldb.so.3.0.0
+file path=usr/lib/sasl2/libsasldb.so.3.0.0
+link path=usr/lib/sasl2/libscram.so target=libscram.so.3.0.0
+link path=usr/lib/sasl2/libscram.so.3 target=libscram.so.3.0.0
+file path=usr/lib/sasl2/libscram.so.3.0.0
+file path=usr/sbin/pluginviewer
+file path=usr/sbin/saslauthd
+file path=usr/sbin/sasldblistusers2
+file path=usr/sbin/saslpasswd2
+file path=usr/sbin/testsaslauthd
+link path=usr/share/man/man3sasl/prop_clear.3sasl target=sasl_auxprop.3sasl
+link path=usr/share/man/man3sasl/prop_dispose.3sasl target=sasl_auxprop.3sasl
+link path=usr/share/man/man3sasl/prop_dup.3sasl target=sasl_auxprop.3sasl
+link path=usr/share/man/man3sasl/prop_erase.3sasl target=sasl_auxprop.3sasl
+link path=usr/share/man/man3sasl/prop_format.3sasl target=sasl_auxprop.3sasl
+link path=usr/share/man/man3sasl/prop_get.3sasl target=sasl_auxprop.3sasl
+link path=usr/share/man/man3sasl/prop_getnames.3sasl target=sasl_auxprop.3sasl
+link path=usr/share/man/man3sasl/prop_new.3sasl target=sasl_auxprop.3sasl
+link path=usr/share/man/man3sasl/prop_request.3sasl target=sasl_auxprop.3sasl
+link path=usr/share/man/man3sasl/prop_set.3sasl target=sasl_auxprop.3sasl
+link path=usr/share/man/man3sasl/prop_setvals.3sasl target=sasl_auxprop.3sasl
+file path=usr/share/man/man3sasl/sasl.3sasl
+file path=usr/share/man/man3sasl/sasl_authorize_t.3sasl
+file path=usr/share/man/man3sasl/sasl_auxprop.3sasl
+file sasl_auxprop_add_plugin.3sasl \
+ path=usr/share/man/man3sasl/sasl_auxprop_add_plugin.3sasl
+file path=usr/share/man/man3sasl/sasl_auxprop_getctx.3sasl
+file path=usr/share/man/man3sasl/sasl_auxprop_request.3sasl
+file path=usr/share/man/man3sasl/sasl_callbacks.3sasl
+file path=usr/share/man/man3sasl/sasl_canon_user_t.3sasl
+file sasl_canonuser_add_plugin.3sasl \
+ path=usr/share/man/man3sasl/sasl_canonuser_add_plugin.3sasl
+file path=usr/share/man/man3sasl/sasl_chalprompt_t.3sasl
+file path=usr/share/man/man3sasl/sasl_checkapop.3sasl
+file path=usr/share/man/man3sasl/sasl_checkpass.3sasl
+file sasl_client_add_plugin.3sasl \
+ path=usr/share/man/man3sasl/sasl_client_add_plugin.3sasl
+file path=usr/share/man/man3sasl/sasl_client_init.3sasl
+file path=usr/share/man/man3sasl/sasl_client_new.3sasl
+file path=usr/share/man/man3sasl/sasl_client_start.3sasl
+file path=usr/share/man/man3sasl/sasl_client_step.3sasl
+file path=usr/share/man/man3sasl/sasl_decode.3sasl
+file sasl_decode64.3sasl path=usr/share/man/man3sasl/sasl_decode64.3sasl
+file path=usr/share/man/man3sasl/sasl_dispose.3sasl
+file path=usr/share/man/man3sasl/sasl_done.3sasl
+file path=usr/share/man/man3sasl/sasl_encode.3sasl
+file sasl_encode64.3sasl path=usr/share/man/man3sasl/sasl_encode64.3sasl
+link path=usr/share/man/man3sasl/sasl_encodev.3sasl target=sasl_encode.3sasl
+file sasl_erasebuffer.3sasl path=usr/share/man/man3sasl/sasl_erasebuffer.3sasl
+file path=usr/share/man/man3sasl/sasl_errdetail.3sasl
+file path=usr/share/man/man3sasl/sasl_errors.3sasl
+file path=usr/share/man/man3sasl/sasl_errstring.3sasl
+file path=usr/share/man/man3sasl/sasl_getconfpath_t.3sasl
+file path=usr/share/man/man3sasl/sasl_getopt_t.3sasl
+file path=usr/share/man/man3sasl/sasl_getpath_t.3sasl
+file path=usr/share/man/man3sasl/sasl_getprop.3sasl
+file path=usr/share/man/man3sasl/sasl_getrealm_t.3sasl
+file path=usr/share/man/man3sasl/sasl_getsecret_t.3sasl
+file path=usr/share/man/man3sasl/sasl_getsimple_t.3sasl
+file path=usr/share/man/man3sasl/sasl_global_listmech.3sasl
+file path=usr/share/man/man3sasl/sasl_idle.3sasl
+file path=usr/share/man/man3sasl/sasl_listmech.3sasl
+file path=usr/share/man/man3sasl/sasl_log_t.3sasl
+file sasl_server_add_plugin.3sasl \
+ path=usr/share/man/man3sasl/sasl_server_add_plugin.3sasl
+file path=usr/share/man/man3sasl/sasl_server_init.3sasl
+file path=usr/share/man/man3sasl/sasl_server_new.3sasl
+file path=usr/share/man/man3sasl/sasl_server_start.3sasl
+file path=usr/share/man/man3sasl/sasl_server_step.3sasl
+file path=usr/share/man/man3sasl/sasl_server_userdb_checkpass_t.3sasl
+file path=usr/share/man/man3sasl/sasl_server_userdb_setpass_t.3sasl
+file sasl_set_alloc.3sasl path=usr/share/man/man3sasl/sasl_set_alloc.3sasl
+file sasl_set_mutex.3sasl path=usr/share/man/man3sasl/sasl_set_mutex.3sasl
+file sasl_seterror.3sasl path=usr/share/man/man3sasl/sasl_seterror.3sasl
+file path=usr/share/man/man3sasl/sasl_setpass.3sasl
+file path=usr/share/man/man3sasl/sasl_setprop.3sasl
+file path=usr/share/man/man3sasl/sasl_user_exists.3sasl
+file sasl_utf8verify.3sasl path=usr/share/man/man3sasl/sasl_utf8verify.3sasl
+file path=usr/share/man/man3sasl/sasl_verifyfile_t.3sasl
+file path=usr/share/man/man8/pluginviewer.8
+file path=usr/share/man/man8/saslauthd.8
+file path=usr/share/man/man8/sasldblistusers2.8
+file path=usr/share/man/man8/saslpasswd2.8
+license libsasl2.license license="BSD with attribution to CMU, MIT, others"
+depend type=optional \
+ fmri=system/library/security/[email protected],5.12-5.12.0.0.0.93.0
--- a/components/desktop/pidgin/Makefile Thu Feb 11 22:32:09 2016 -0800
+++ b/components/desktop/pidgin/Makefile Fri Feb 12 09:35:44 2016 -0800
@@ -126,6 +126,7 @@
REQUIRED_PACKAGES += system/library/libdbus-glib
REQUIRED_PACKAGES += system/library/math
REQUIRED_PACKAGES += system/library/security/libsasl
+REQUIRED_PACKAGES += system/library/security/libsasl2
REQUIRED_PACKAGES += system/network/avahi
REQUIRED_PACKAGES += x11/library/libice
REQUIRED_PACKAGES += x11/library/libsm
--- a/components/mutt/Makefile Thu Feb 11 22:32:09 2016 -0800
+++ b/components/mutt/Makefile Fri Feb 12 09:35:44 2016 -0800
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -88,3 +88,4 @@
REQUIRED_PACKAGES += system/library
REQUIRED_PACKAGES += system/library/math
REQUIRED_PACKAGES += system/library/security/libsasl
+REQUIRED_PACKAGES += system/library/security/libsasl2
--- a/components/openldap/Makefile Thu Feb 11 22:32:09 2016 -0800
+++ b/components/openldap/Makefile Fri Feb 12 09:35:44 2016 -0800
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -150,5 +150,6 @@
REQUIRED_PACKAGES += system/core-os
REQUIRED_PACKAGES += system/library
REQUIRED_PACKAGES += system/library/security/libsasl
+REQUIRED_PACKAGES += system/library/security/libsasl2
REQUIRED_PACKAGES += system/network
REQUIRED_PACKAGES += text/groff/groff-core
--- a/components/samba/Makefile Thu Feb 11 22:32:09 2016 -0800
+++ b/components/samba/Makefile Fri Feb 12 09:35:44 2016 -0800
@@ -305,6 +305,7 @@
REQUIRED_PACKAGES += system/library/security/crypto
REQUIRED_PACKAGES += system/library/security/gss
REQUIRED_PACKAGES += system/library/security/libsasl
+REQUIRED_PACKAGES += system/library/security/libsasl2
REQUIRED_PACKAGES += system/linker
REQUIRED_PACKAGES += system/network
REQUIRED_PACKAGES += system/network/avahi
--- a/components/squid/Makefile Thu Feb 11 22:32:09 2016 -0800
+++ b/components/squid/Makefile Fri Feb 12 09:35:44 2016 -0800
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
#
COMPILER = gcc
@@ -163,5 +163,6 @@
REQUIRED_PACKAGES += system/library/security/crypto
REQUIRED_PACKAGES += system/library/security/gss
REQUIRED_PACKAGES += system/library/security/libsasl
+REQUIRED_PACKAGES += system/library/security/libsasl2
REQUIRED_PACKAGES += system/network
REQUIRED_PACKAGES += service/security/kerberos-5
--- a/components/squid/patches/Makefile.in.patch Thu Feb 11 22:32:09 2016 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-Solaris-specific patch; not suitable for upstream.
-
-diff -rupN squid-3.5.5-orig/helpers/basic_auth/SASL/Makefile.in squid-3.5.5/helpers/basic_auth/SASL/Makefile.in
---- squid-3.5.5-orig/helpers/basic_auth/SASL/Makefile.in 2015-06-16 11:02:41.242508702 -0700
-+++ squid-3.5.5/helpers/basic_auth/SASL/Makefile.in 2015-06-16 11:03:18.755629692 -0700
-@@ -673,7 +673,7 @@ basic_sasl_auth_SOURCES = basic_sasl_aut
- basic_sasl_auth_LDADD = \
- $(top_builddir)/lib/libmiscencoding.la \
- $(COMPAT_LIB) \
-- $(LIBSASL) \
-+ -lsasl \
- $(XTRA_LIBS)
-
- EXTRA_DIST = \
--- a/components/subversion/Makefile Thu Feb 11 22:32:09 2016 -0800
+++ b/components/subversion/Makefile Fri Feb 12 09:35:44 2016 -0800
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -193,3 +193,4 @@
REQUIRED_PACKAGES += system/library/c++-runtime
REQUIRED_PACKAGES += system/library/security/gss
REQUIRED_PACKAGES += system/library/security/libsasl
+REQUIRED_PACKAGES += system/library/security/libsasl2
--- a/doc/packaging.txt Thu Feb 11 22:32:09 2016 -0800
+++ b/doc/packaging.txt Fri Feb 12 09:35:44 2016 -0800
@@ -191,26 +191,37 @@
All of the library/python-2/FOO modules that we had in Userland at the
time were renamed to library/python/FOO in s12_41. This involved:
+
* changing the FMRI to drop the "-2"
+
* adding an optional dependency on the old name at the version and build
- in which the rename occurred; this forces the rename
- * depend type=optional fmri=library/python-2/FOO-$(PYV)@VERSION,BUILD
+ in which the rename occurred; this forces the rename.
+
+ * depend type=optional fmri=library/python-2/FOO-$(PYV)@VERSION,BUILD
where FOO is the component name (e.g., "alembic", "amqp", etc.),
"$(PYV)" is that literal string, VERSION was the expanded value of
- COMPONENT_VERSION from each component's Makefile (e.g., "0.6.0"
- for alembic, "1.0.12" for amqp, etc.), and BUILD was set to
- "5.12-5.12.0.0.0.41.0". Note that BUILD needs to be set to
- the value of the build you are integrating into.
+ COMPONENT_VERSION from each component's Makefile (e.g., "0.6.0" for
+ alembic, "1.0.12" for amqp, etc.), and BUILD was set to
+ "5.12-5.12.0.0.0.41.0". Note that BUILD needs to be set to the value of
+ the build you are integrating into.
+
* creation of the file "history" (or adding to it if it already exists)
- in each affected component directory; one or more new lines should be
- added (typically one for the versionless package, plus one for each
- versioned instance of the package) with syntax:
- OLD-NAME@VERSION,BUILD NEW-NAME
- for renames and:
- OLD-NAME@VERSION,BUILD
- for obsoletions, where FOO, VERSION and BUILD are all as above. Most
- Python modules, including the two mentioned above, have such files
- which can serve as examples.
+ in each affected component directory (see NOTE 2 below); one or more
+ new lines should be added (in the case of python or other language
+ component, one for the versionless package plus one for each versioned
+ instance of the package; for an example of a less complicated
+ component that does not have a 'versionless' package like python, see
+ components/subversion)
+
+ with syntax:
+
+ renames: OLD-NAME@VERSION,BUILD NEW-NAME
+ obsoletions: OLD-NAME@VERSION,BUILD
+
+ where e.g. OLD-NAME was library/python-2/FOO, NEW-NAME was
+ library/python/FOO, VERSION and BUILD are all as above. Most Python
+ modules, including the two mentioned above, have such files which can
+ serve as examples.
So far, not too bad. This gets slightly more complicated when back-
porting in that BUILD needs to be set to the back-port build (e.g.,
@@ -226,7 +237,49 @@
branch. Otherwise the audits from Release Engineering will complain and
our gatekeeper will make you do a follow-up push to fix this.
-# vi:set fdm=marker expandtab ts=4:
+ In addition, during the transition period before all CBE machines have
+ the new package, the REQUIRED_PACKAGES in the Makefiles of any components
+ that depend on your package must include both your old and new package
+ names. This is because those names are actually the limit set, to speed
+ up processing, rather than a true required list.
+
+ If you tell pkgdepend it can look for the the component dependencies in
+ either the old package name or the new name, then it will find them and
+ be happy. If only one of your package names is listed and it doesn't
+ happen to be the one installed on the build system, the dependencies will
+ be unsatisifed and the build will break.
+
+ Until the new package name is available for installation, "gmake
+ system-check" will fail because it attempts to install all the packages
+ listed in REQUIRED_PACKAGES. This can be ignored, but should be noted
+ in a flag-day so that people are aware they can ignore it. Once the new
+ package name can be installed (even simply after running "gmake publish"
+ for the missing component and having your workspace publisher enabled on
+ the test system), this is no longer an issue, so there is no urgency in
+ removing the old name from the list.
+
+ NOTE: The package version for the old name must be in the format shown
+ on in pkg contents -m output (before the colon) and not in the format
+ seen in the output of pkg list or pkg info, e.g.:
+
+ So, if contents -m library/python-2/subversion showed this:
+
+ set name=pkg.fmri value=pkg://solaris/library/python-2/[email protected],5.12-5.12.0.0.0.41.0:20140130T085214Z
+
+ they used this:
+ library/python-2/[email protected],5.12-5.12.0.0.0.41.0
+
+ not this:
+ library/python-2/[email protected]
+
+ NOTE 2: The generic package renaming directions in Solaris documentation,
+ which call for preserving a 'rename' package (containing only metadata and
+ dependencies on the new package names) is not applicable when using the
+ Userland history file method. The 'rename' package is created by
+ the Userland consolidation build, using the data in the history file.
+ So simply rename and edit the manifest (p5m file) to the new name instead
+ of creating an additional file.
+
=============================
Component EOF (End Of Feature)
@@ -304,3 +357,5 @@
For languages and anything else that has modules or is otherwise part of the
Userland build environment you will need to do a full build, of both ISAs, on
the test machines you just updated.
+
+# vi:set fdm=marker expandtab ts=4: