# HG changeset patch
# User Ivo Raisr <ivo.raisr@oracle.com>
# Date 1473799440 25200
# Node ID 97ccfb23663a25dbbed929d80e9fa5cfbcf0d73a
# Parent  e83d1e7c501b48e2def186f37b35a76a64d66bef
PSARC/2016/232 CACkey Smartcard PKCS#11 provider
24657593 cackey needs to deliver 32-bit libraries

diff -r e83d1e7c501b -r 97ccfb23663a components/cackey/Makefile
--- a/components/cackey/Makefile	Tue Sep 13 00:20:23 2016 -0700
+++ b/components/cackey/Makefile	Tue Sep 13 13:44:00 2016 -0700
@@ -38,9 +38,9 @@
 #   Testing libcackey... DONE. Status = 0
 #   then you have a finished test and results.
 #   Search for CK_FAIL or "failed" in testoutput.log to see the actual failures,
-#   if no CK_FAIl or failed were reported, the test ran successfully.
+#   if no CK_FAIL or failed were reported, the test ran successfully.
 
-BUILD_BITS= 64
+BUILD_BITS=	64_and_32
 include ../../make-rules/shared-macros.mk
  
 COMPONENT_NAME=         CACKey
diff -r e83d1e7c501b -r 97ccfb23663a components/cackey/cackey.p5m
--- a/components/cackey/cackey.p5m	Tue Sep 13 00:20:23 2016 -0700
+++ b/components/cackey/cackey.p5m	Tue Sep 13 13:44:00 2016 -0700
@@ -40,5 +40,7 @@
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 file path=usr/lib/$(MACH64)/libcackey.so
 link path=usr/lib/$(MACH64)/libcackey.so.1 target=libcackey.so
+file path=usr/lib/libcackey.so
+link path=usr/lib/libcackey.so.1 target=libcackey.so
 license cackey.license \
     license="MIT, X11, GPLv2, LGPLv2.1, MPLv2, Lockheed, RSA, Internet Society"