--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/libgpg-error/Makefile	Wed Oct 05 05:48:14 2016 -0700
@@ -0,0 +1,64 @@
+#
+# 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) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+#
+include ../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		libgpg-error
+COMPONENT_VERSION=	1.12
+COMPONENT_PROJECT_URL=  ftp://ftp.gnupg.org/gcrypt/$(COMPONENT_NAME)
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
+COMPONENT_ARCHIVE_HASH= \
+    sha256:cafc9ed6a87c53a35175d5a1220a96ca386696eef2fa059cc0306211f246e55f
+COMPONENT_ARCHIVE_URL=  ftp://ftp.gnupg.org/gcrypt/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
+COMPONENT_BUGDB=	library/libgpg-error
+
+TPNO=			7588
+
+COMPONENT_BUILD_TARGETS = all info
+
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
+include $(WS_MAKE_RULES)/lint-libraries.mk
+
+CONFIGURE_OPTIONS += --sysconfdir=$(ETCDIR)
+CONFIGURE_OPTIONS += --infodir=$(CONFIGURE_INFODIR)
+CONFIGURE_OPTIONS.64 += CC="$(CC) -m64"
+
+ASLR_MODE = $(ASLR_ENABLE)
+
+include ../../make-rules/shared-targets.mk
+
+configure:      $(CONFIGURE_32_and_64)
+
+build:          $(BUILD_32_and_64)
+
+install:        $(INSTALL_32_and_64)
+
+test:           $(TEST_32_and_64)
+
+system-test:    $(SYSTEM_TESTS_NOT_IMPLEMENTED)
+
+REQUIRED_PACKAGES += system/library

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/libgpg-error/Solaris/gpg-error-config.1	Wed Oct 05 05:48:14 2016 -0700
@@ -0,0 +1,135 @@
+'\" te
+.\" Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+.TH gpg-error-config 1 "10 Jan 2008" "SunOS 5.11" "User Commands"
+.SH "NAME"
+gpg-error-config \- helper script for building with \fBlibgpg-error\fR
+.SH "SYNOPSIS"
+.PP
+\fBgpg-error-config\fR [-\fB-version\fR] [-\fB-prefix=\fIdir\fR\fR] [-\fB-cflags\fR] [-\fB-libs\fR] [-\fB-exec-prefix=\fIdir\fR\fR]
+.SH "DESCRIPTION"
+.PP
+The \fBgpg-error-config\fR tool is used to determine the compiler
+and linker flags that should be used to compile and link programs that use
+the \fBlibgpg-error\fR library\&.
+.SH "OPTIONS"
+.PP
+The following options are supported:
+.sp
+.ne 2
+.mk
+\fB-\fB-cflags\fR\fR
+.in +24n
+.rt
+Print the compiler flags that are necessary to compile a program
+using the specified library\&.
+.sp
+.sp 1
+.in -24n
+.sp
+.ne 2
+.mk
+\fB-\fB-exec-prefix=\fIdir\fR\fR\fR
+.in +24n
+.rt
+If specified, use \fIdir\fR instead of
+the \fBexec\fR installation prefix that the library was built
+with, when computing the output for the -\fB-cflags\fR and -\fB-libs\fR options\&. This option must be specified before any -\fB-libs\fR or -\fB-cflags\fR options\&.
+.sp
+.sp 1
+.in -24n
+.sp
+.ne 2
+.mk
+\fB-\fB-libs\fR\fR
+.in +24n
+.rt
+Print the
+linker flags that are necessary to link with the specified library\&.
+.sp
+.sp 1
+.in -24n
+.sp
+.ne 2
+.mk
+\fB-\fB-prefix=\fIdir\fR\fR\fR
+.in +24n
+.rt
+If specified, use \fIdir\fR instead of
+the installation prefix that the library was built with, when computing the
+output for the -\fB-cflags\fR and -\fB-libs\fR options\&.
+This option must be specified before any -\fB-libs\fR or -\fB-cflags\fR options\&. This option is also used for the \fBexec\fR
+prefix if the -\fB-exec-prefix\fR option is not specified\&.
+.sp
+.sp 1
+.in -24n
+.sp
+.ne 2
+.mk
+\fB-\fB-version\fR\fR
+.in +24n
+.rt
+Print
+the currently installed version of the library on the standard output\&.
+.sp
+.sp 1
+.in -24n
+.SH "EXAMPLES"
+.PP
+\fBExample 1: Getting the libgpg-error library version\fR
+.PP
+.PP
+.nf
+example% \fBgpg-error-config --version\fR
+.fi
+.PP
+\fBExample 2: Determining the libraries required to link
+with the libgpg-error library\fR
+.PP
+.PP
+.nf
+example% \fBgpg-error-config --libs\fR
+.fi
+.SH "EXIT STATUS"
+.PP
+The following exit values are returned:
+.sp
+.ne 2
+.mk
+\fB\fB0\fR\fR
+.in +9n
+.rt
+Application exited successfully
+.sp
+.sp 1
+.in -9n
+.sp
+.ne 2
+.mk
+\fB\fB>0\fR\fR
+.in +9n
+.rt
+Application
+exited with failure
+.sp
+.sp 1
+.in -9n
+.SH "FILES"
+.PP
+The following files are used by this application:
+.sp
+.ne 2
+.mk
+\fB\fB/usr/bin/gpg-error-config\fR \fR
+.in +32n
+.rt
+Executable for \fBlibgpg-error\fR helper
+script
+.sp
+.SH "SEE ALSO"
+.PP
+\fBgpg-error\fR(1),
+\fBlibgpg-error\fR(3),
+\fBpkg-config\fR(1),
+\fBattributes\fR(5)
+.SH ""
+.PP

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/libgpg-error/Solaris/gpg-error.1	Wed Oct 05 05:48:14 2016 -0700
@@ -0,0 +1,66 @@
+'\" te
+.\" Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+.TH gpg-error 1 "31 Jul 2008" "SunOS 5.11" "User Commands"
+.SH "NAME"
+gpg-error \- Get the description for specified error numbers\&.
+.SH "SYNOPSIS"
+.PP
+\fBgpg-error\fR \fB\fIerrorno\fR\fR [\fB\fI\&.\&.\&.\fR\fR]
+.SH "DESCRIPTION"
+.PP
+gpg-error is a tool that returns the description of specified error numbers\&.
+.SH "OPERANDS"
+.PP
+The following operands are supported:
+.sp
+.ne 2
+.mk
+\fB\fB\fIerrorno\fR\fR\fR
+.in +9n
+.rt
+Error numbers for which you want to get the description\&.
+.sp
+.sp 1
+.in -9n
+.SH "EXIT STATUS"
+.PP
+The following exit values are returned:
+.sp
+.ne 2
+.mk
+\fB\fB0\fR\fR
+.in +9n
+.rt
+Application
+exited successfully
+.sp
+.sp 1
+.in -9n
+.sp
+.ne 2
+.mk
+\fB\fB1\fR\fR
+.in +9n
+.rt
+Application
+exited with failure
+.sp
+.sp 1
+.in -9n
+.SH "FILES"
+.PP
+The following files are used by this application:
+.sp
+.ne 2
+.mk
+\fB\fB/usr/bin/gpg-error\fR \fR
+.in +24n
+.rt
+Executable for gpg-error
+.sp
+.SH "SEE ALSO"
+.PP
+\fBgpg-error-config\fR(1),
+\fBlibgpg-error\fR(3),
+\fBattributes\fR(5)
+.PP

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/libgpg-error/Solaris/libgpg-error.3	Wed Oct 05 05:48:14 2016 -0700
@@ -0,0 +1,28 @@
+'\" te
+.\" Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+.TH libgpg-error 3 "31 Jul 2008" "SunOS 5.11" "Interface Libraries"
+.SH "NAME"
+libgpg-error \- is a library with error codes and descriptions shared by most GnuPG related software\&.
+.SH "DESCRIPTION"
+.PP
+\fBlibgpg-error\fR is a library with error codes and descriptions shared
+by most GnuPG related software\&.
+.SH "FILES"
+.PP
+The following files are used by this application:
+.sp
+.ne 2
+.mk
+\fB\fB/usr/lib/libgpg-error\&.so\fR\fR
+.in +32n
+.rt
+libgpg-error shared library
+.sp
+.SH "SEE ALSO"
+.PP
+\fBgpg-error\fR(1),
+\fBgpg-error-config\fR(1),
+\fBattributes\fR(5)
+.SH ""
+.SH "NOTES"
+.PP

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/libgpg-error/libgpg-error.p5m	Wed Oct 05 05:48:14 2016 -0700
@@ -0,0 +1,73 @@
+#
+# 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, 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability "Pass-Through Volatile">
+set name=pkg.fmri \
+    value=pkg:/library/security/libgpg-error@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Common error codes for GnuPG, libgcrypt"
+set name=pkg.description \
+    value="This is a library that defines common error values for all GnuPG components.  Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt, pinentry, SmartCard Daemon and possibly more in the future."
+set name=com.oracle.info.description value="the GnuPG error library"
+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/2009/397
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=usr/bin/$(MACH64)/gpg-error-config
+file usr/bin/$(MACH64)/gpg-error path=usr/bin/gpg-error
+file path=usr/bin/gpg-error-config
+file path=usr/include/gpg-error.h
+link path=usr/lib/$(MACH64)/libgpg-error.so target=libgpg-error.so.0.10.0
+link path=usr/lib/$(MACH64)/libgpg-error.so.0 target=libgpg-error.so.0.10.0
+file path=usr/lib/$(MACH64)/libgpg-error.so.0.10.0
+link path=usr/lib/libgpg-error.so target=libgpg-error.so.0.10.0
+link path=usr/lib/libgpg-error.so.0 target=libgpg-error.so.0.10.0
+file path=usr/lib/libgpg-error.so.0.10.0
+file path=usr/share/aclocal/gpg-error.m4
+file path=usr/share/common-lisp/source/gpg-error/gpg-error-codes.lisp
+file path=usr/share/common-lisp/source/gpg-error/gpg-error-package.lisp
+file path=usr/share/common-lisp/source/gpg-error/gpg-error.asd
+file path=usr/share/common-lisp/source/gpg-error/gpg-error.lisp
+file path=usr/share/locale/cs/LC_MESSAGES/libgpg-error.mo
+file path=usr/share/locale/da/LC_MESSAGES/libgpg-error.mo
+file path=usr/share/locale/de/LC_MESSAGES/libgpg-error.mo
+file path=usr/share/locale/eo/LC_MESSAGES/libgpg-error.mo
+file path=usr/share/locale/fr/LC_MESSAGES/libgpg-error.mo
+file path=usr/share/locale/it/LC_MESSAGES/libgpg-error.mo
+file path=usr/share/locale/ja/LC_MESSAGES/libgpg-error.mo
+file path=usr/share/locale/nl/LC_MESSAGES/libgpg-error.mo
+file path=usr/share/locale/pl/LC_MESSAGES/libgpg-error.mo
+file path=usr/share/locale/ro/LC_MESSAGES/libgpg-error.mo
+file path=usr/share/locale/sv/LC_MESSAGES/libgpg-error.mo
+file path=usr/share/locale/uk/LC_MESSAGES/libgpg-error.mo
+file path=usr/share/locale/vi/LC_MESSAGES/libgpg-error.mo
+file path=usr/share/locale/zh_CN/LC_MESSAGES/libgpg-error.mo
+file Solaris/gpg-error.1 path=usr/share/man/man1/gpg-error.1
+file Solaris/gpg-error-config.1 path=usr/share/man/man1/gpg-error-config.1
+file Solaris/libgpg-error.3 path=usr/share/man/man3/libgpg-error.3
+license COPYING license=GPLv2
+license COPYING.LIB license=LGPLv2.1

--- a/components/meta-packages/incorporation-cache	Wed Oct 12 00:33:37 2016 -0700
+++ b/components/meta-packages/incorporation-cache	Wed Oct 05 05:48:14 2016 -0700
@@ -234,7 +234,6 @@
 consolidation/desktop/desktop-incorporation:library/python/[email protected],5.11-0.175.3.8.0.2.0
 consolidation/desktop/desktop-incorporation:library/[email protected]
 consolidation/desktop/desktop-incorporation:library/[email protected]
-consolidation/desktop/desktop-incorporation:library/security/[email protected]
 consolidation/desktop/desktop-incorporation:library/security/pam/module/[email protected]
 consolidation/desktop/desktop-incorporation:library/speech/[email protected]
 consolidation/desktop/desktop-incorporation:library/spell-checking/[email protected]