[pkg-opensc-commit] [opensc] 251/295: Fixed ssh's pkcs11 usage on macOS

[Eric Dorland]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository opensc.

commit e23960f7937b7eee71b1d230b5766912b2eb4973
Author: Frank Morgner <frankmorgner at gmail.com>
Date:   Wed May 3 14:48:06 2017 +0200

    Fixed ssh's pkcs11 usage on macOS
    
    copy (instead of link) our pkcs11 libraries to the default location, which is whitelisted for ssh usage
    
    fixes https://github.com/OpenSC/OpenSC/issues/1008
---
 MacOSX/opensc-uninstall    | 5 +++--
 MacOSX/scripts/postinstall | 6 ++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/MacOSX/opensc-uninstall b/MacOSX/opensc-uninstall
index 9dbc005..2dcfcec 100755
--- a/MacOSX/opensc-uninstall
+++ b/MacOSX/opensc-uninstall
@@ -11,8 +11,9 @@ for file in /Library/OpenSC/bin/*; do
 	test -L "/usr/local/bin/$(basename $file)" && rm -f "/usr/local/bin/$(basename $file)"
 done
 
-# Remove symlink for pkcs11
-test -L /usr/lib/opensc-pkcs11.so && rm -f /usr/lib/opensc-pkcs11.so
+# Remove pkcs11 libraries
+rm -f /usr/local/lib/opensc-pkcs11.so
+rm -f /usr/local/lib/onepin-opensc-pkcs11.so
 
 # Remove installed files
 rm -rf /Library/OpenSC
diff --git a/MacOSX/scripts/postinstall b/MacOSX/scripts/postinstall
index 2ae745c..fed5aa8 100755
--- a/MacOSX/scripts/postinstall
+++ b/MacOSX/scripts/postinstall
@@ -1,9 +1,7 @@
 #!/bin/bash
 
-if !([ -e "/usr/local/lib/opensc-pkcs11.so" ])
-then
-	ln -s /Library/OpenSC/lib/opensc-pkcs11.so /usr/local/lib/opensc-pkcs11.so
-fi
+cp /Library/OpenSC/lib/opensc-pkcs11.so /usr/local/lib/opensc-pkcs11.so
+cp /Library/OpenSC/lib/onepin-opensc-pkcs11.so /usr/local/lib/onepin-opensc-pkcs11.so
 if [ -e "/Library/OpenSC/etc/opensc.conf.md5" ]
 then
 	read cs_fromfile file < "/Library/OpenSC/etc/opensc.conf.md5"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/opensc.git