20334187 Upgrade GnuPG to 2.0.26
authorStefan Teleman <stefan.teleman@oracle.com>
Tue, 14 Apr 2015 14:29:32 -0700
changeset 4117 8388cfa6a859
parent 4110 ca3ed2768b98
child 4118 14c44fb1869d
20334187 Upgrade GnuPG to 2.0.26 20460406 GNUPG should have some master test results to compare against 19066086 problem in UTILITY/GNUPG
components/gnupg/Makefile
components/gnupg/gnupg.license
components/gnupg/gnupg.p5m
components/gnupg/patches/000-gnupg-2.0.26-upstream.patch
components/gnupg/patches/common-estream.c.patch
components/gnupg/test/results-64.master
components/libassuan/Makefile
components/libassuan/libassuan.license
components/libassuan/libassuan.p5m
components/libassuan/test/results-libassuan.master
components/libksba/Makefile
components/libksba/libksba.license
components/libksba/libksba.p5m
components/libksba/test/results-libksba.master
--- a/components/gnupg/Makefile	Thu Apr 09 22:09:36 2015 -0700
+++ b/components/gnupg/Makefile	Tue Apr 14 14:29:32 2015 -0700
@@ -23,16 +23,16 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		gnupg
-COMPONENT_VERSION=	2.0.22
+COMPONENT_VERSION=	2.0.26
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_PROJECT_URL=	http://www.gnupg.org/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:437d0ab259854359fc48aa8795af80cff4975e559c111c92c03d0bc91408e251
+    sha256:7758e30dc382ae7a7167ed41b7f936aa50af5ea2d6fccdef663b5b750b65b8e0
 COMPONENT_ARCHIVE_URL=	ftp://ftp.gnupg.org/gcrypt/gnupg/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/gnupg
 
-TPNO=			17706
+TPNO=			21142
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/configure.mk
@@ -59,10 +59,47 @@
 LDFLAGS += -lc -z defs
 LD_OPTIONS += -z defs
 
+COMPONENT_TEST_TRANSFORMS += \
+     '-e "/libtool/d"' \
+     '-e "/-m32/d"' \
+     '-e "/-m64/d"' \
+     '-e "/ld: warning/d"' \
+     '-e "/warning/d"' \
+     '-e "/Generat/d"' \
+     '-e "/Creat/d"' \
+     '-e "/Compos/d"' \
+     '-e "/Writ/d"' \
+     '-e "/Read/d"' \
+     '-e "/Home/d"' \
+     '-e "/from/d"' \
+     '-e "/--run/d"' \
+     '-e "/rm -f/d"' \
+     '-e "/Nothing/d"' \
+     '-e "/Leaving/d"' \
+     '-e "/Entering/d"' \
+     '-e "/Making/d"' \
+     '-e "/Known envvars/d"' \
+     '-e "/make/d"' \
+     '-e "s/[0-9]\{1,\}\.[0-9]\{1,\} s, //g"' \
+     '-e "s^[0-9]\{1,\} kB/s^^g"'  \
+     '-e "s^[0-9]\{1,\}  kB/s^^g"'  \
+     '-e "s^[0-9]\{1,\}\.[0-9]\{1,\}  MB/s^^g"' \
+     '-e "s^[0-9]\{1,\}\.[0-9]\{1,\} MB/s^^g"' \
+     '-e "s/([0-9]\{1,\} B)//g"' \
+     '-e "s/([0-9]\{1,\}  B)//g"' \
+     '-e "s/copied,/copied/g"'  \
+     '-e "s/ \{1,\}copied/ copied/g"'  \
+     '-e "s/copied $$/copied/g"'  \
+     '-e "s/copied [0-9]\{1,\}\./copied/g"'
+
 CONFIGURE_ENV +=	CFLAGS="$(CFLAGS)"
 CONFIGURE_ENV +=	LDFLAGS="$(LDFLAGS)"
 CONFIGURE_ENV +=	INSTALL="$(INSTALL)"
 
+# Without this GnuPG's ./configure will complain that we're not using
+# GNU make. But we are.
+CONFIGURE_ENV +=	MAKE="$(GMAKE)"
+
 CONFIGURE_OPTIONS  +=		--localstatedir=/var
 CONFIGURE_OPTIONS  +=		--libexecdir=$(USRBINDIR)
 CONFIGURE_OPTIONS  +=		--datadir=$(CONFIGURE_PREFIX)/share
@@ -124,6 +161,7 @@
 
 test: $(TEST_64)
 
+BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
 
 REQUIRED_PACKAGES += compress/bzip2
 REQUIRED_PACKAGES += library/desktop/gtk2
--- a/components/gnupg/gnupg.license	Thu Apr 09 22:09:36 2015 -0700
+++ b/components/gnupg/gnupg.license	Tue Apr 14 14:29:32 2015 -0700
@@ -1,3 +1,4 @@
+
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 3, 29 June 2007
 
@@ -673,7 +674,8 @@
 Public License instead of this License.  But first, please read
 <http://www.gnu.org/philosophy/why-not-lgpl.html>.
 
----------------------------------------------------------------------------
+-------------------------------------------------------------------------
+
 
 		   GNU LESSER GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
@@ -841,4 +843,3 @@
 permanent authorization for you to choose that version for the
 Library.
 
-
--- a/components/gnupg/gnupg.p5m	Thu Apr 09 22:09:36 2015 -0700
+++ b/components/gnupg/gnupg.p5m	Tue Apr 14 14:29:32 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 <transform file path=usr/share/gnupg/help\.([^/]+)(\..+){0,1}(/.+){0,1}\.txt$ -> default facet.locale.%<\1> true>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnupg/patches/000-gnupg-2.0.26-upstream.patch	Tue Apr 14 14:29:32 2015 -0700
@@ -0,0 +1,287 @@
+# Patch origin: GnuPG/GPGME Project (upstream).
+# URL: http://permalink.gmane.org/gmane.comp.encryption.gpg.cvs/10207
+- Log -----------------------------------------------------------------
+commit 1298b14f97efebdd88a9390af3848154dbe0d259
+Author: Joshua Rogers <[email protected]>
+Date:   Tue Dec 23 00:47:50 2014 +1100
+
+    tools: Free variable before return
+
+    * tools/gpgconf-comp.c: Free 'dest_filename' before it is returned
+    upon error.
+    --
+
+    Signed-off-by: Joshua Rogers <[email protected]>
+
+diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
+index c43e87a..83bc24e 100644
+--- a/tools/gpgconf-comp.c
++++ b/tools/gpgconf-comp.c
[email protected]@ -2390,7 +2390,10 @@ change_options_file (gc_component_t component, gc_backend_t backend,
+   res = link (dest_filename, orig_filename);
+ #endif
+   if (res < 0 && errno != ENOENT)
+-    return -1;
++    {
++      xfree (dest_filename);
++      return -1;
++    }
+   if (res < 0)
+     {
+       xfree (orig_filename);
+
+commit ced689e12a5037c6aeca62e9eaebdc098bd9c14e
+Author: Daniel Kahn Gillmor <[email protected]>
+Date:   Fri Dec 19 18:53:34 2014 -0500
+
+    sm: Avoid double-free on iconv failure
+
+    * sm/minip12.c: (p12_build) if jnlib_iconv_open fails, avoid
+    double-free of pwbuf.
+
+    --
+
+    Observed by Joshua Rogers <[email protected]>, who proposed a
+    slightly different fix.
+
+    Debian-Bug-Id: 773472
+
+    Added fix at a second place - wk.
+
+diff --git a/agent/minip12.c b/agent/minip12.c
+index 2471717..0bcab5f 100644
+--- a/agent/minip12.c
++++ b/agent/minip12.c
[email protected]@ -2182,6 +2182,7 @@ p12_build (gcry_mpi_t *kparms, unsigned char *cert, size_t certlen,
+                      " requested charset `%s': %s\n",
+                      charset, strerror (errno));
+           gcry_free (pwbuf);
++          pwbuf = NULL;
+           goto failure;
+         }
+
[email protected]@ -2196,6 +2197,7 @@ p12_build (gcry_mpi_t *kparms, unsigned char *cert, size_t certlen,
+                      " requested charset `%s': %s\n",
+                      charset, strerror (errno));
+           gcry_free (pwbuf);
++          pwbuf = NULL;
+           jnlib_iconv_close (cd);
+           goto failure;
+         }
+
+commit 0fd4cd8503dfe9c3e6a362003bd647b4cd882363
+Author: Daniel Kahn Gillmor <[email protected]>
+Date:   Fri Dec 19 18:07:55 2014 -0500
+
+    scd: Avoid double-free on error condition in scd
+
+    * scd/command.c (cmd_readkey): avoid double-free of cert
+
+    --
+
+    When ksba_cert_new() fails, cert will be double-freed.
+
+    Debian-Bug-Id: 773471
+
+    Original patch changed by wk to do the free only at leave.
+
+diff --git a/scd/command.c b/scd/command.c
+index fc1f5a2..b26bd68 100644
+--- a/scd/command.c
++++ b/scd/command.c
[email protected]@ -777,10 +777,8 @@ cmd_readkey (assuan_context_t ctx, char *line)
+
+   rc = ksba_cert_new (&kc);
+   if (rc)
+-    {
+-      xfree (cert);
+-      goto leave;
+-    }
++    goto leave;
++
+   rc = ksba_cert_init_from_mem (kc, cert, ncert);
+   if (rc)
+     {
+
+commit 1fc4dc541af7d4bf4dba6ef37d1d7841498a05c6
+Author: Daniel Kahn Gillmor <[email protected]>
+Date:   Fri Dec 19 17:53:36 2014 -0500
+
+    avoid future chance of using uninitialized memory
+
+    * common/iobuf.c: (iobuf_open): initialize len
+
+    --
+
+    In iobuf_open, IOBUFCTRL_DESC and IOBUFCTRL_INIT commands are invoked
+    (via file_filter()) on fcx, passing in a pointer to an uninitialized
+    len.
+
+    With these two commands, file_filter doesn't actually do anything with
+    the value of len, so there's no actual risk of use of uninitialized
+    memory in the code as it stands.
+
+    However, some static analysis tools might flag this situation with a
+    warning, and initializing the value doesn't hurt anything, so i think
+    this trivial cleanup is warranted.
+
+    Debian-Bug-Id: 773469
+
+diff --git a/common/iobuf.c b/common/iobuf.c
+index ae9bfa9..4c6d5b5 100644
+--- a/common/iobuf.c
++++ b/common/iobuf.c
[email protected]@ -1303,7 +1303,7 @@ iobuf_open (const char *fname)
+   iobuf_t a;
+   fp_or_fd_t fp;
+   file_filter_ctx_t *fcx;
+-  size_t len;
++  size_t len = 0;
+   int print_only = 0;
+   int fd;
+
+commit f542826b04e35f13a30116564daaf6456440b1d4
+Author: Daniel Kahn Gillmor <[email protected]>
+Date:   Fri Dec 19 17:12:05 2014 -0500
+
+    gpgkey2ssh: clean up varargs
+
+    * tools/gpgkey2ssh.c (key_to_blob) : ensure that va_end is called.
+
+    --
+
+    stdarg(3) says:
+           Each invocation of va_start() must be matched by a
+           corresponding invocation of va_end() in the same function.
+
+    Observed by Joshua Rogers <[email protected]>
+
+    Debian-Bug-Id: 773415
+
+diff --git a/tools/gpgkey2ssh.c b/tools/gpgkey2ssh.c
+index 903fb5b..d22c5ac 100644
+--- a/tools/gpgkey2ssh.c
++++ b/tools/gpgkey2ssh.c
[email protected]@ -224,6 +224,8 @@ key_to_blob (unsigned char **blob, size_t *blob_n, const char *identifier, ...)
+       assert (ret == 1);
+     }
+
++  va_end (ap);
++
+   blob_new_n = ftell (stream);
+   rewind (stream);
+
+commit 01b364b6da2fbb8850178674e1534d725cd760c8
+Author: Werner Koch <[email protected]>
+Date:   Mon Dec 22 12:44:13 2014 +0100
+
+    doc: Fix memory leak in yat2m.
+
+    * doc/yat2m.c (write_th): Free NAME.
+    --
+
+    Reported-by: Joshua Rogers <[email protected]>
+
+diff --git a/doc/yat2m.c b/doc/yat2m.c
+index 2ac4390..fc932d9 100644
+--- a/doc/yat2m.c
++++ b/doc/yat2m.c
[email protected]@ -609,6 +609,7 @@ write_th (FILE *fp)
+   *p++ = 0;
+   fprintf (fp, ".TH %s %s %s \"%s\" \"%s\"\n",
+            name, p, isodatestring (), opt_release, opt_source);
++  free (name);
+   return 0;
+ }
+
+commit 907a9a1e986b8c8266f4f01e8ed82acfc636a519
+Author: Werner Koch <[email protected]>
+Date:   Mon Dec 22 12:16:46 2014 +0100
+
+    gpgsm: Return NULL on fail
+
+    * sm/gpgsm.c (parse_keyserver_line): Set SERVER to NULL.
+
+    --
+
+    Cherry-pick of abd5f6752d693b7f313c19604f0723ecec4d39a6.
+
+    Reported-by: Joshua Rogers <[email protected]>
+
+      "If something inside the ldapserver_parse_one function failed,
+       'server' would be freed, then returned, leading to a
+       use-after-free.  This code is likely copied from sm/gpgsm.c, which
+       was also susceptible to this bug."
+
+    Signed-off-by: Werner Koch <[email protected]>
+
+diff --git a/sm/gpgsm.c b/sm/gpgsm.c
+index 97ec4bb..855de83 100644
+--- a/sm/gpgsm.c
++++ b/sm/gpgsm.c
[email protected]@ -840,6 +840,7 @@ parse_keyserver_line (char *line,
+     {
+       log_info (_("%s:%u: skipping this line\n"), filename, lineno);
+       keyserver_list_free (server);
++      server = NULL;
+     }
+
+   return server;
+
+-----------------------------------------------------------------------
+
+Summary of changes:
+ agent/minip12.c      |    2 ++
+ common/iobuf.c       |    2 +-
+ doc/yat2m.c          |    1 +
+ scd/command.c        |    6 ++----
+ sm/gpgsm.c           |    1 +
+ tools/gpgconf-comp.c |    5 ++++-
+ tools/gpgkey2ssh.c   |    2 ++
+ 7 files changed, 13 insertions(+), 6 deletions(-)
+
+hooks/post-receive
+-- <#>
+
+-- 
+The GNU Privacy Guard
+http://git.gnupg.org
+
+Permalink
+<http://permalink.gmane.org/gmane.comp.encryption.gpg.cvs/10207> | Reply
+<http://post.gmane.org/post.php?group=gmane.comp.encryption.gpg.cvs&followup=10207>
+|
+
+Navigate
+Go to gmane.comp.encryption.gpg.cvs
+<http://blog.gmane.org/gmane.comp.encryption.gpg.cvs>.
+Topic
+Go to the topic
+<http://news.gmane.org/find-root.php?group=gmane.comp.encryption.gpg.cvs&article=10207&type=blog>.
+
+Advertisement
+Search Archive
+
+Language
+Change language <http://gmane.org/language.php>
+Options
+Current view: Threads only / Showing whole messages / Not hiding cited text.
+Change to All messages,
+<http://permalink.gmane.org/gmane.comp.encryption.gpg.cvs?set_blog_all=yes>shortened
+messages
+<http://permalink.gmane.org/gmane.comp.encryption.gpg.cvs?set_lines=20>,
+or hide cited text
+<http://permalink.gmane.org/gmane.comp.encryption.gpg.cvs?set_cite=hide>.
+
+Post a message
+<http://post.gmane.org/post.php?group=gmane.comp.encryption.gpg.cvs>
+NNTP Newsgroup <nntp://news.gmane.org/gmane.comp.encryption.gpg.cvs>
+Classic Gmane web interface
+<http://news.gmane.org/find-root.php?message_id=E1YAqcu%2d00022P%2d1h%40lists.gnupg.org>
+XML RSS Feed <http://rss.gmane.org/gmane.comp.encryption.gpg.cvs>
+List Information <http://dir.gmane.org/gmane.comp.encryption.gpg.cvs>
+
+About Gmane <http://gmane.org/faq.php>
+
+Gmane <http://gmane.org/>
+
--- a/components/gnupg/patches/common-estream.c.patch	Thu Apr 09 22:09:36 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-Changes needed to get GnuPG estream.c to compile with the Studio C compiler.
-
-These were legitimate bugs in GnuPG version 2.0.22, but looking at the
-latest version of estream.c in the GnuPG git repository, the problems have
-been resolved by redefining ESTREAM_MUTEX_UNLOCK and ESTREAM_MUTEX_INITIALIZE
-to no longer test against estream_pth_killed and therefore no need for the
-bogusly defined dummy routines.
-
---- gnupg-2.0.22/common/estream.c.orig	2014-01-15 08:38:06.978672664 -0800
-+++ gnupg-2.0.22/common/estream.c	2014-01-15 09:02:39.386197974 -0800
[email protected]@ -181,13 +181,13 @@
-   (estream_pth_killed ? dummy_mutex_call_void ((mutex))         \
-    : (void)pth_mutex_acquire (&(mutex), 0, NULL))
- # define ESTREAM_MUTEX_UNLOCK(mutex)                            \
--  (estream_pth_killed ? dummy_mutex_call_void ((mutex))         \
-+  (estream_pth_killed ? dummy_mutex_call_int ((mutex))         \
-    : pth_mutex_release (&(mutex)))
- # define ESTREAM_MUTEX_TRYLOCK(mutex)                                   \
-   (estream_pth_killed ? dummy_mutex_call_int ((mutex))                  \
-    : ((pth_mutex_acquire (&(mutex), 1, NULL) == TRUE)? 0:-1))
- # define ESTREAM_MUTEX_INITIALIZE(mutex)                        \
--  (estream_pth_killed ? dummy_mutex_call_void ((mutex))         \
-+  (estream_pth_killed ? dummy_mutex_call_int ((mutex))         \
-    : pth_mutex_init (&(mutex)))
- 
- #else /*!HAVE_PTH*/
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnupg/test/results-64.master	Tue Apr 14 14:29:32 2015 -0700
@@ -0,0 +1,101 @@
+PASS: t-stringhelp
+=============
+1 test passed
+=============
+PASS: t-convert
+PASS: t-percent
+PASS: t-gettime
+PASS: t-sysutils
+PASS: t-sexputil
+max. file descriptors: 65536
+open file descriptors: 3
+PASS: t-exechelp
+PASS: t-session-env
+PASS: t-ssh-utils
+==================
+All 8 tests passed
+==================
+PASS: t-rmd160
+=============
+1 test passed
+=============
+PASS: t-protect
+=============
+1 test passed
+=============
+gpg (GnuPG) 2.0.26
+libgcrypt 1.5.3
+Copyright (C) 2013 Free Software Foundation, Inc.
+License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
+
+Supported algorithms:
+Pubkey: RSA, ELG, DSA
+Cipher: 3DES, CAST5, BLOWFISH, AES, AES192, AES256, TWOFISH, CAMELLIA128,
+        CAMELLIA192, CAMELLIA256
+Hash: MD5, SHA1, RIPEMD160, SHA256, SHA384, SHA512, SHA224
+Compression: Uncompressed, ZIP, ZLIB, BZIP2
+PASS: version.test
+PASS: mds.test
+PASS: decrypt.test
+PASS: decrypt-dsa.test
+    > MD5 SHA1 RIPEMD160 SHA256 SHA384 SHA512 SHA224 <
+PASS: sigs.test
+PASS: sigs-dsa.test
+    > 3DES CAST5 BLOWFISH AES AES192 AES256 TWOFISH CAMELLIA128 CAMELLIA192 CAMELLIA256 <
+PASS: encrypt.test
+    > 3DES CAST5 BLOWFISH AES AES192 AES256 TWOFISH CAMELLIA128 CAMELLIA192 CAMELLIA256 <
+PASS: encrypt-dsa.test
+PASS: seat.test
+PASS: clearsig.test
+PASS: encryptp.test
+PASS: detach.test
+PASS: armsigs.test
+PASS: armencrypt.test
+PASS: armencryptp.test
+PASS: signencrypt.test
+PASS: signencrypt-dsa.test
+PASS: armsignencrypt.test
+PASS: armdetach.test
+PASS: armdetachm.test
+PASS: detachm.test
+PASS: genkey1024.test
+    > 3DES CAST5 BLOWFISH AES AES192 AES256 TWOFISH CAMELLIA128 CAMELLIA192 CAMELLIA256 <
+PASS: conventional.test
+    > 3DES CAST5 BLOWFISH AES AES192 AES256 TWOFISH CAMELLIA128 CAMELLIA192 CAMELLIA256 <
+PASS: conventional-mdc.test
+PASS: multisig.test
+PASS: verify.test
+PASS: armor.test
+PASS: import.test
+===================
+All 28 tests passed
+===================
+==================
+All 0 tests passed
+==================
+Note: PKITS_data.tar.bz2 is not installed
+      All tests will be skipped (this is not an error)
+SKIP: import-all-certs
+SKIP: validate-all-certs
+SKIP: signature-verification
+SKIP: validity-periods
+SKIP: verifying-name-chaining
+SKIP: basic-certificate-revocation
+SKIP: verifying-paths-self-issued
+SKIP: verifying-basic-constraints
+SKIP: key-usage
+SKIP: certificate-policies
+SKIP: require-explicit-policy
+SKIP: policy-mappings
+SKIP: inhibit-policy-mapping
+SKIP: inhibit-any-policy
+SKIP: name-constraints
+SKIP: distribution-points
+SKIP: delta-crls
+SKIP: private-certificate-extensions
+=======================
+All 0 tests passed
+(18 tests were not run)
+=======================
--- a/components/libassuan/Makefile	Thu Apr 09 22:09:36 2015 -0700
+++ b/components/libassuan/Makefile	Tue Apr 14 14:29:32 2015 -0700
@@ -23,16 +23,16 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		libassuan
-COMPONENT_VERSION=	2.0.1
+COMPONENT_VERSION=	2.2.0
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_PROJECT_URL=	http://www.gnupg.org/related_software/libassuan/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:1117be532ac41b13790b4756df7fa747d3d04264f7b4544aa9d7ff468a24b457
+    sha256:7df58ed70be4b694f77efd1f3b3f103c6311b6b71e04a370382f9fe8204f6ec6
 COMPONENT_ARCHIVE_URL=	ftp://ftp.gnupg.org/gcrypt/libassuan/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/gnupg
 
-TPNO=			18558
+TPNO=			22290
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/configure.mk
@@ -53,6 +53,14 @@
 CFLAGS += $(CPP_C99_EXTENDED_MATH)
 CFLAGS += $(studio_PIC)
 
+COMPONENT_TEST_MASTER = \
+	$(COMPONENT_TEST_RESULTS_DIR)/results-libassuan.master
+
+COMPONENT_TEST_TRANSFORMS += \
+     '-e "s/fdpassing\[[0-9]\{1,9\}\]\: //g"' \
+     '-e "s/ Pleased to meet you, process [0-9]\{1,9\}//g"' \
+     '-e "s/chan_[0-9]\{1,9\}/chan/g"'
+
 CONFIGURE_ENV +=	CFLAGS="$(CFLAGS)"
 CONFIGURE_ENV +=	INSTALL="$(INSTALL)"
 
@@ -60,6 +68,7 @@
 CONFIGURE_OPTIONS  +=		--infodir=$(CONFIGURE_INFODIR)
 CONFIGURE_OPTIONS  +=		--enable-shared
 CONFIGURE_OPTIONS  +=		--disable-static
+CONFIGURE_OPTIONS  +=		--disable-silent-rules
 CONFIGURE_OPTIONS  +=		--with-gpg-error-prefix=$(CONFIGURE_PREFIX)
 CONFIGURE_OPTIONS  +=		--with-pic
 
@@ -73,7 +82,7 @@
 
 test: $(TEST_32_and_64)
 
-
+BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
 
 REQUIRED_PACKAGES += library/security/libgpg-error
 REQUIRED_PACKAGES += shell/ksh93
--- a/components/libassuan/libassuan.license	Thu Apr 09 22:09:36 2015 -0700
+++ b/components/libassuan/libassuan.license	Tue Apr 14 14:29:32 2015 -0700
@@ -1,512 +1,3 @@
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-	51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations
-below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it
-becomes a de-facto standard.  To achieve this, non-free programs must
-be allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control
-compilation and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at least
-    three years, to give the same user the materials specified in
-    Subsection 6a, above, for a charge no more than the cost of
-    performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply, and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License
-may add an explicit geographical distribution limitation excluding those
-countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms
-of the ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.
-It is safest to attach them to the start of each source file to most
-effectively convey the exclusion of warranty; and each file should
-have at least the "copyright" line and a pointer to where the full
-notice is found.
-
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or
-your school, if any, to sign a "copyright disclaimer" for the library,
-if necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James
-  Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-----------------------------------------------------------------------------
 
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 3, 29 June 2007
@@ -1183,3 +674,516 @@
 Public License instead of this License.  But first, please read
 <http://www.gnu.org/philosophy/why-not-lgpl.html>.
 
+---------------------------------------------------------------------------
+
+
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+	51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations
+below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it
+becomes a de-facto standard.  To achieve this, non-free programs must
+be allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control
+compilation and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at least
+    three years, to give the same user the materials specified in
+    Subsection 6a, above, for a charge no more than the cost of
+    performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply, and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License
+may add an explicit geographical distribution limitation excluding those
+countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms
+of the ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.
+It is safest to attach them to the start of each source file to most
+effectively convey the exclusion of warranty; and each file should
+have at least the "copyright" line and a pointer to where the full
+notice is found.
+
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or
+your school, if any, to sign a "copyright disclaimer" for the library,
+if necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James
+  Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+
--- a/components/libassuan/libassuan.p5m	Thu Apr 09 22:09:36 2015 -0700
+++ b/components/libassuan/libassuan.p5m	Tue Apr 14 14:29:32 2015 -0700
@@ -21,33 +21,31 @@
 # Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
-set name=pkg.fmri \
-    value=pkg:/library/security/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+
+set name=pkg.fmri value=pkg:/library/security/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GnuPG IPC implementation library"
-set name=pkg.description \
-    value="A small library implementing the so-called Assuan protocol, used for interprocess communication between most GnuPG components."
-set name=com.oracle.info.description \
-    value="the GnuPG IPC implementation library"
+set name=pkg.description value="A small library implementing the so-called Assuan protocol, used for interprocess communication between most GnuPG components."
+set name=com.oracle.info.description value="the GnuPG IPC implementation library"
 set name=com.oracle.info.tpno value=$(TPNO)
-set name=info.classification \
-    value=org.opensolaris.category.2008:System/Libraries
+set name=info.classification value="org.opensolaris.category.2008:System/Libraries"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 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.arc-caseid \
+    value=PSARC/2009/397
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
 #
 file path=usr/bin/libassuan-config
 file path=usr/include/assuan.h
-link path=usr/lib/$(MACH64)/libassuan.so target=libassuan.so.0.1.0
-link path=usr/lib/$(MACH64)/libassuan.so.0 target=libassuan.so.0.1.0
-file path=usr/lib/$(MACH64)/libassuan.so.0.1.0
-link path=usr/lib/libassuan.so target=libassuan.so.0.1.0
-#
-link path=usr/lib/libassuan.so.0 target=libassuan.so.0.1.0
-file path=usr/lib/libassuan.so.0.1.0
+file path=usr/lib/libassuan.so.0.5.0
+file path=usr/lib/$(MACH64)/libassuan.so.0.5.0
 file path=usr/share/aclocal/libassuan.m4
 file path=usr/share/info/assuan.info
 #
+link path=usr/lib/libassuan.so.0 target=libassuan.so.0.5.0
+link path=usr/lib/libassuan.so target=libassuan.so.0.5.0
+link path=usr/lib/$(MACH64)/libassuan.so.0 target=libassuan.so.0.5.0
+link path=usr/lib/$(MACH64)/libassuan.so target=libassuan.so.0.5.0
+#
 license libassuan.license license="GPLv3, LGPLv2"
-depend type=optional fmri=crypto/[email protected]
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/libassuan/test/results-libassuan.master	Tue Apr 14 14:29:32 2015 -0700
@@ -0,0 +1,68 @@
+make[1]: Entering directory `$(@D)'
+Making check in m4
+make[2]: Entering directory `$(@D)/m4'
+make[2]: Nothing to be done for `check'.
+make[2]: Leaving directory `$(@D)/m4'
+Making check in src
+make[2]: Entering directory `$(@D)/src'
+/usr/gnu/bin/make  check-am
+make[3]: Entering directory `$(@D)/src'
+make[3]: Nothing to be done for `check-am'.
+make[3]: Leaving directory `$(@D)/src'
+make[2]: Leaving directory `$(@D)/src'
+Making check in doc
+make[2]: Entering directory `$(@D)/doc'
+make[2]: Nothing to be done for `check'.
+make[2]: Leaving directory `$(@D)/doc'
+Making check in tests
+make[2]: Entering directory `$(@D)/tests'
+/usr/gnu/bin/make  check-am
+make[3]: Entering directory `$(@D)/tests'
+/usr/gnu/bin/make  check-TESTS
+make[4]: Entering directory `$(@D)/tests'
+PASS: version
+Received data `Your lucky number is 3552664958674928.  Watch for it everywhere.'
+PASS: pipeconnect
+chan -> OK
+chan <- # descriptor 3 is in flight
+chan <- INPUT FD
+chan -> OK
+chan <- ECHO
+chan -> OK
+chan <- # descriptor 3 is in flight
+chan <- INPUT FD
+chan -> OK
+chan <- ECHO
+chan -> OK
+chan <- # descriptor 3 is in flight
+chan <- INPUT FD
+chan -> OK
+chan <- ECHO
+chan -> OK
+chan <- # descriptor 3 is in flight
+chan <- INPUT FD
+chan -> OK
+chan <- ECHO
+chan -> OK
+chan <- # descriptor 3 is in flight
+chan <- INPUT FD
+chan -> OK
+chan <- ECHO
+chan -> OK
+chan <- # descriptor 3 is in flight
+chan <- INPUT FD
+chan -> OK
+chan <- ECHO
+chan -> OK
+chan <- BYE
+chan -> OK closing connection
+PASS: fdpassing
+==================
+All 3 tests passed
+==================
+make[4]: Leaving directory `$(@D)/tests'
+make[3]: Leaving directory `$(@D)/tests'
+make[2]: Leaving directory `$(@D)/tests'
+make[2]: Entering directory `$(@D)'
+make[2]: Leaving directory `$(@D)'
+make[1]: Leaving directory `$(@D)'
--- a/components/libksba/Makefile	Thu Apr 09 22:09:36 2015 -0700
+++ b/components/libksba/Makefile	Tue Apr 14 14:29:32 2015 -0700
@@ -23,16 +23,16 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		libksba
-COMPONENT_VERSION=	1.1.0
+COMPONENT_VERSION=	1.3.2
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_PROJECT_URL=	http://www.gnupg.org/related_software/libksba/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:d8eb845d7272d23a00d4da6dc65f108ded6a977f32abf4488a075335433769f7
+    sha256:eb95537955dfc2845690a4cc3836074fa6d0a2c2ca2cbf1759364d3bd9868406
 COMPONENT_ARCHIVE_URL=	ftp://ftp.gnupg.org/gcrypt/libksba/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/gnupg
 
-TPNO=			8768
+TPNO=			21897
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/configure.mk
@@ -53,6 +53,9 @@
 CFLAGS += $(CPP_C99_EXTENDED_MATH)
 CFLAGS += $(studio_PIC)
 
+COMPONENT_TEST_MASTER = \
+	$(COMPONENT_TEST_RESULTS_DIR)/results-libksba.master
+
 CONFIGURE_ENV +=	CFLAGS="$(CFLAGS)"
 CONFIGURE_ENV +=	INSTALL="$(INSTALL)"
 
@@ -60,6 +63,7 @@
 CONFIGURE_OPTIONS  +=		--infodir=$(CONFIGURE_INFODIR)
 CONFIGURE_OPTIONS  +=		--enable-shared
 CONFIGURE_OPTIONS  +=		--disable-static
+CONFIGURE_OPTIONS  +=		--disable-silent-rules
 CONFIGURE_OPTIONS  +=		--with-gpg-error-prefix=$(CONFIGURE_PREFIX)
 CONFIGURE_OPTIONS  +=		--with-pic
 
@@ -73,6 +77,7 @@
 
 test: $(TEST_32_and_64)
 
+BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
 
 REQUIRED_PACKAGES += library/security/libgpg-error
 REQUIRED_PACKAGES += shell/ksh93
--- a/components/libksba/libksba.license	Thu Apr 09 22:09:36 2015 -0700
+++ b/components/libksba/libksba.license	Tue Apr 14 14:29:32 2015 -0700
@@ -1,11 +1,431 @@
+Copyright
+=========
+
+ | Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011
+ |               2012 g10 Code GmbH
+ | Copyright (C) 2001, 2002, 2003, 2007 Free Software Foundation, Inc.
+ | Copyright (C) 2000, 2001 Fabio Fiorina
+
+The library and the header files are distributed under the following
+terms (LGPLv3+/GPLv2+):
+
+ | KSBA is free software; you can redistribute it and/or modify
+ | it under the terms of either
+ |
+ |   - the GNU Lesser General Public License as published by the Free
+ |     Software Foundation; either version 3 of the License, or (at
+ |     your option) any later version.
+ |
+ | or
+ |
+ |   - the GNU General Public License as published by the Free
+ |     Software Foundation; either version 2 of the License, or (at
+ |     your option) any later version.
+ |
+ | or both in parallel, as here.
+ |
+ | KSBA is distributed in the hope that it will be useful, but WITHOUT
+ | ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ | or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+ | License for more details.
+
+The other parts (e.g. manual, build system, tests) are distributed
+under the following terms (GPLv3):
+
+ | KSBA is free software; you can redistribute it and/or modify
+ | it under the terms of the GNU General Public License as published by
+ | the Free Software Foundation; either version 3 of the License, or
+ | (at your option) any later version.
+ |
+ | KSBA is distributed in the hope that it will be useful,
+ | but WITHOUT ANY WARRANTY; without even the implied warranty of
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ | GNU General Public License for more details.
+
+The ASN.1 definition for CMS is based on a specification published
+under the following terms (see src/cms.asn):
+
+ | Copyright (C) The Internet Society (1999).  All Rights Reserved.
+ |
+ | This document and translations of it may be copied and furnished to
+ | others, and derivative works that comment on or otherwise explain it
+ | or assist in its implementation may be prepared, copied, published
+ | and distributed, in whole or in part, without restriction of any
+ | kind, provided that the above copyright notice and this paragraph are
+ | included on all such copies and derivative works.  However, this
+ | document itself may not be modified in any way, such as by removing
+ | the copyright notice or references to the Internet Society or other
+ | Internet organizations, except as needed for the purpose of
+ | developing Internet standards in which case the procedures for
+ | copyrights defined in the Internet Standards process must be
+ | followed, or as required to translate it into languages other than
+ | English.
+ |
+ | The limited permissions granted above are perpetual and will not be
+ | revoked by the Internet Society or its successors or assigns.
+ |
+ | This document and the information contained herein is provided on an
+ | "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING
+ | TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING
+ | BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION
+ | HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF
+ | MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+
+------------------------------------------------------------------------
+
+
                     GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
+
+--------------------------------------------------------------------------
+
+
+
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 3, 29 June 2007
 
  Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-                            Preamble
+			    Preamble
 
   The GNU General Public License is a free, copyleft license for
 software and other kinds of works.
@@ -68,7 +488,7 @@
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-                       TERMS AND CONDITIONS
+		       TERMS AND CONDITIONS
 
   0. Definitions.
 
@@ -618,9 +1038,9 @@
 Program, unless a warranty or assumption of liability accompanies a
 copy of the Program in return for a fee.
 
-                     END OF TERMS AND CONDITIONS
+		     END OF TERMS AND CONDITIONS
 
-            How to Apply These Terms to Your New Programs
+	    How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -673,8 +1093,173 @@
 Public License instead of this License.  But first, please read
 <http://www.gnu.org/philosophy/why-not-lgpl.html>.
 
+-------------------------------------------------------------------------
 
 
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
 
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
 
 
--- a/components/libksba/libksba.p5m	Thu Apr 09 22:09:36 2015 -0700
+++ b/components/libksba/libksba.p5m	Tue Apr 14 14:29:32 2015 -0700
@@ -21,32 +21,31 @@
 # Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
-set name=pkg.fmri \
-    value=pkg:/library/security/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+
+set name=pkg.fmri value=pkg:/library/security/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GnuPG X.509 certificate library"
-set name=pkg.description \
-    value="A C library to make the tasks of working with X.509 certificates, CMS data and related objects easier, by encapsulating specific protocol details."
+set name=pkg.description value="A C library to make the tasks of working with X.509 certificates, CMS data and related objects easier, by encapsulating specific protocol details."
 set name=com.oracle.info.description value="the GnuPG X.509 certificate library"
 set name=com.oracle.info.tpno value=$(TPNO)
-set name=info.classification \
-    value=org.opensolaris.category.2008:System/Libraries
+set name=info.classification value="org.opensolaris.category.2008:System/Libraries"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 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.arc-caseid \
+    value=PSARC/2009/397
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
 #
 file path=usr/bin/ksba-config
 file path=usr/include/ksba.h
-link path=usr/lib/$(MACH64)/libksba.so target=libksba.so.8.10.0
-link path=usr/lib/$(MACH64)/libksba.so.8 target=libksba.so.8.10.0
-file path=usr/lib/$(MACH64)/libksba.so.8.10.0
-link path=usr/lib/libksba.so target=libksba.so.8.10.0
-#
-link path=usr/lib/libksba.so.8 target=libksba.so.8.10.0
-file path=usr/lib/libksba.so.8.10.0
+file path=usr/lib/libksba.so.8.11.3
+file path=usr/lib/$(MACH64)/libksba.so.8.11.3
 file path=usr/share/aclocal/ksba.m4
 file path=usr/share/info/ksba.info
 #
-license libksba.license license=GPLv3
-depend type=optional fmri=crypto/[email protected]
+link path=usr/lib/libksba.so.8 target=libksba.so.8.11.3
+link path=usr/lib/libksba.so target=libksba.so.8.11.3
+link path=usr/lib/$(MACH64)/libksba.so.8 target=libksba.so.8.11.3
+link path=usr/lib/$(MACH64)/libksba.so target=libksba.so.8.11.3
+#
+license libksba.license license="GPLv2 GPLv3 LGPLv3"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/libksba/test/results-libksba.master	Tue Apr 14 14:29:32 2015 -0700
@@ -0,0 +1,144 @@
+make[1]: Entering directory `$(@D)'
+Making check in m4
+make[2]: Entering directory `$(@D)/m4'
+make[2]: Nothing to be done for `check'.
+make[2]: Leaving directory `$(@D)/m4'
+Making check in gl
+make[2]: Entering directory `$(@D)/gl'
+/usr/gnu/bin/make  check-am
+make[3]: Entering directory `$(@D)/gl'
+make[3]: Nothing to be done for `check-am'.
+make[3]: Leaving directory `$(@D)/gl'
+make[2]: Leaving directory `$(@D)/gl'
+Making check in src
+make[2]: Entering directory `$(@D)/src'
+/usr/gnu/bin/make  check-am
+make[3]: Entering directory `$(@D)/src'
+make[3]: Nothing to be done for `check-am'.
+make[3]: Leaving directory `$(@D)/src'
+make[2]: Leaving directory `$(@D)/src'
+Making check in tests
+make[2]: Entering directory `$(@D)/tests'
+/usr/gnu/bin/make  check-am
+make[3]: Entering directory `$(@D)/tests'
+/usr/gnu/bin/make  check-TESTS
+make[4]: Entering directory `$(@D)/tests'
+Certificate in `$(SOURCE_DIR)/tests/cert_dfn_pca01.der':
+  serial....: (#01#)
+  issuer....: `1.2.840.113549.1.9.1=#63657274696679407063612E64666E2E6465,CN=DFN Top Level Certification Authority,OU=DFN-PCA,O=Deutsches Forschungsnetz,C=DE'
+  subject...: `1.2.840.113549.1.9.1=#63657274696679407063612E64666E2E6465,CN=DFN Top Level Certification Authority,OU=DFN-PCA,O=Deutsches Forschungsnetz,C=DE'
+  notBefore.: 1998-10-29 18:03:10
+  notAfter..: 2001-12-31 18:03:10
+  hash algo.: 1.2.840.113549.1.1.4
+Extn: 2.16.840.1.113730.1.1 at 684 with length 4 
+Extn: 2.16.840.1.113730.1.2 at 703 with length 28 
+Extn: 2.16.840.1.113730.1.8 at 746 with length 52 
+Extn: 2.16.840.1.113730.1.13 at 813 with length 43 
+Extn: 2.16.840.1.113730.1.3 at 871 with length 20 
+Extn: 2.16.840.1.113730.1.4 at 906 with length 12 
+Extn: 2.5.29.19 at 930 with length 5 (critical)
+Extn: 2.5.29.15 at 944 with length 4 
+SubjectKeyIdentifier: none
+AuthorityKeyIdentifier: none
+This is a CA certificate with a path length of -1
+KeyUsage: certSign crlSign
+ExtKeyUsages: none
+CertificatePolicies: none
+
+Certificate in `$(SOURCE_DIR)/tests/cert_dfn_pca15.der':
+  serial....: (#15#)
+  issuer....: `1.2.840.113549.1.9.1=#63657274696679407063612E64666E2E6465,CN=DFN Top Level Certification Authority,OU=DFN-PCA,O=Deutsches Forschungsnetz,C=DE'
+  subject...: `1.2.840.113549.1.9.1=#63657274696679407063612E64666E2E6465,CN=DFN Server Certification Authority,OU=DFN-PCA,O=Deutsches Forschungsnetz,C=DE'
+  notBefore.: 2000-11-02 16:47:24
+  notAfter..: 2001-12-30 18:00:00
+  hash algo.: 1.2.840.113549.1.1.4
+Extn: 2.5.29.19 at 678 with length 5 (critical)
+Extn: 2.5.29.15 at 692 with length 4 
+Extn: 2.5.29.14 at 705 with length 22 
+Extn: 2.5.29.31 at 736 with length 120 
+Extn: 2.16.840.1.113730.1.1 at 871 with length 4 
+Extn: 2.16.840.1.113730.1.2 at 890 with length 28 
+Extn: 2.16.840.1.113730.1.8 at 933 with length 52 
+Extn: 2.16.840.1.113730.1.13 at 1003 with length 246 
+Extn: 2.16.840.1.113730.1.3 at 1264 with length 20 
+SubjectKeyIdentifier: (#F77B75D0707AA42A44035C08D3AC99D11DD30976#)
+AuthorityKeyIdentifier: none
+This is a CA certificate with a path length of -1
+KeyUsage: certSign crlSign
+ExtKeyUsages: none
+CertificatePolicies: none
+CRLDistPoint: http://www.pca.dfn.de/dfnpca/certify/ssl/dfnpca.crx
+     reasons: none
+      issuer: none
+CRLDistPoint: http://www.pca.dfn.de/dfnpca/certify/ssl/dfnpca.crl
+     reasons: none
+      issuer: none
+
+Certificate in `$(SOURCE_DIR)/tests/cert_g10code_test1.der':
+  serial....: (#00#)
+  issuer....: `CN=test cert 1,OU=Aegypten Project,O=g10 Code GmbH,L=Düsseldorf,C=DE'
+  subject...: `CN=test cert 1,OU=Aegypten Project,O=g10 Code GmbH,L=Düsseldorf,C=DE'
+  notBefore.: 2001-12-03 09:36:38
+  notAfter..: 2002-12-03 09:36:38
+  hash algo.: 1.2.840.113549.1.1.4
+Extn: 2.5.29.14 at 458 with length 22 
+Extn: 2.5.29.35 at 491 with length 141 
+Extn: 2.5.29.19 at 641 with length 5 
+SubjectKeyIdentifier: (#33378D1291C0547183385F0865BFA94BF98E34F3#)
+AuthorityKeyIdentifier: CN=test cert 1,OU=Aegypten Project,O=g10 Code GmbH,L=Düsseldorf,C=DE
+                serial: (#00#)
+         keyIdentifier: (#33378D1291C0547183385F0865BFA94BF98E34F3#)
+This is a CA certificate with a path length of -1
+KeyUsage: Not specified
+ExtKeyUsages: none
+CertificatePolicies: none
+
+PASS: cert-basic
+*** checking `$(SOURCE_DIR)/tests/crl_testpki_testpca.der' ***
+digest algo: 1.2.840.113549.1.1.5
+issuer: `CN=TEST_PCA,O=TEST_PKI,C=DE'
+thisUpdate: 2002-01-14 07:00:28
+nextUpdate: 2002-02-14 07:00:28
+CRL entry 1: s=(#3A9CDB0B#), t=2001-02-28 14:55:19, r=8
+CRL entry 2: s=(#3AFBCFD4#), t=2001-05-14 11:16:43, r=8
+CRL entry 3: s=(#3B0A6AB9#), t=2001-05-29 13:15:53, r=8
+CRL entry 4: s=(#3B13A064#), t=2001-06-29 07:07:30, r=8
+CRL entry 5: s=(#3B3C287E#), t=2001-06-29 07:10:41, r=8
+CRL entry 6: s=(#3BC6BE08#), t=2001-10-30 08:20:07, r=1
+CRL entry 7: s=(#3BDE632A#), t=2001-11-07 12:17:16, r=1
+CRL entry 8: s=(#3BE92700#), t=2001-11-07 14:11:00, r=8
+CRL entry 9: s=(#3C187A6E#), t=2001-12-13 10:03:51, r=8
+CRL entry 10: s=(#3C187C8A#), t=2001-12-13 10:12:17, r=8
+AuthorityKeyIdentifier: CN=TEST_PCA,O=TEST_PKI,C=DE
+                serial: (#3A8D07C1#)
+crlNumber: (#0150#)
+Extn: 2.5.29.28   (2 octets)
+Extn: 2.5.29.35   (65 octets)
+Extn: 2.5.29.20   (4 octets)
+(sig-val(rsa(s#824C12A28BA3786D7EEC1FA7777EAEB215B9F65EBE710DB0E4A631D84AF1E10677C49C50103A33AC9FD6ABAA4F0D0D4093E23E00583FFF8BFF65E586EF63EDF6FC4477DAF6793C3B52CA167FA4720E698532D2169FDA9C034977FB11264A50CE5A3BC50E5419578678829676A464723ACFBAFB31DE71209E42D96F0968B52CC22C9CBF2320DFB78CE9AF9DF89F999455D064D3BFF5C7CD22D7120816918145A6E0B35D4C996535E67D1CC04E277A604BBCAD6B858D422DA636047309C249B959B9AA65E8FFDBFB84C2E62FEA5B6143E74087F28D89892B479AFBC2AC2AC8082AD894F31B5EA93C4F43754905B1FB0A170EE123143EAE722F7A2D199BB9CCEA10#))(hashsha1))
+PASS: t-crl-parser
+string ->C=de,O=foo,OU=,CN=joe<-  error at 14.10 (,CN=joe)
+string ->C=de,O=foo,OU= ,CN=joe<-  error at 15.11 (,CN=joe)
+string ->C=de,O=foo,OU="" ,CN=joe<-  error at 14.13 ("" ,CN=joe)
+string ->C=de,O=foo,OU=<-  error at 14.3 ()
+string ->C=de,O=foo,OU= <-  error at 15.4 ()
+string ->C=,O=foo,OU=bar <-  error at 2.16 (,O=foo,OU=bar )
+string ->C = ,O=foo,OU=bar <-  error at 4.18 (,O=foo,OU=bar )
+string ->C=<-  error at 2.2 ()
+string ->C=de,FOO=something,O=bar<-  error at 5.3 (FOO)
+string ->Y=foo, C=baz<-  error at 0.1 (Y)
+PASS: t-dnparser
+PASS: t-oid
+==================
+All 4 tests passed
+==================
+make[4]: Leaving directory `$(@D)/tests'
+make[3]: Leaving directory `$(@D)/tests'
+make[2]: Leaving directory `$(@D)/tests'
+Making check in doc
+make[2]: Entering directory `$(@D)/doc'
+make[2]: Nothing to be done for `check'.
+make[2]: Leaving directory `$(@D)/doc'
+make[2]: Entering directory `$(@D)'
+make[2]: Leaving directory `$(@D)'
+make[1]: Leaving directory `$(@D)'