--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/cackey/patches/README	Fri Jun 24 11:30:54 2016 -0700
@@ -0,0 +1,43 @@
+CDDL HEADER START
+
+ The contents of this file are subject to the terms of the
+ Common Development and Distribution License (the "License").
+ You may not use this file except in compliance with the License.
+
+ You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ or http://www.opensolaris.org/os/licensing.
+ See the License for the specific language governing permissions
+ and limitations under the License.
+
+ When distributing Covered Code, include this CDDL HEADER in each
+ file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ If applicable, add the following below this CDDL HEADER, with the
+ fields enclosed by brackets "[]" replaced with your own identifying
+ information: Portions Copyright [yyyy] [name of copyright owner]
+ 
+CDDL HEADER END
+
+Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+
+
+The patches found here were created to solve some issues in the PKCS#11
+middleware for CAC/PIV smartcards source code from:
+"The Code Conservatory" http://conservatory.github.io/ 
+
+The issue with this source code used from github
+https://github.com/Conservatory/CACKey
+appears to have come from merge conflict markers that resulted from the
+merge which originally created the repository.
+
+For example, the Makefile ends up with lots of git merge lines such as:
+<<<<<< HEAD
+>>>>>>> trunk
+
+it seems as though the various merge conflicts arose from the merge and
+pull request when the github source repository was attempted to be updated
+to latest version of CACKey.
+
+There were a lot of conflict markers resulting from that merge that now
+have been resolved with these patches and when applied to the source code,
+it will now compile and build on Solaris.
+