More yubihsm_pkcs11 path fixes

.github/workflows/build_and_test.yml

@@ -80,7 +80,7 @@ jobs:
         cmake --build build -- --jobs=2
         test -e ./build/src/yubihsm-shell
         test -e ./build/lib/libyubihsm.$LIBEXT
-        test -e ./build/pkcs11/yubihsm_pkcs11.$LIBEXT
+        test -e ./build/lib/yubihsm_pkcs11.$LIBEXT
         test -e ./build/yhwrap/yubihsm-wrap
     - name: Test
       if: ${{ matrix.test }}
@@ -109,7 +109,7 @@ jobs:
         LIBEXT: ${{ matrix.libext }}
         OS: ${{ matrix.os }}
       run: |
-        export YUBIHSM_PKCS11_MODULE="`pwd`/build/pkcs11/yubihsm_pkcs11.$LIBEXT"
+        export YUBIHSM_PKCS11_MODULE="`pwd`/build/lib/yubihsm_pkcs11.$LIBEXT"
         pushd /tmp/python-pkcs11tester
         echo "connector=$DEFAULT_CONNECTOR_URL" >yubihsm_pkcs11.conf
         if [ "$OS" = "macos-latest" ]; then
@@ -126,7 +126,7 @@ jobs:
         OS: ${{ matrix.os }}
       run: |
         if [ "$OS" != "ubuntu-18.04" ]; then
-          export YUBIHSM_PKCS11_MODULE="`pwd`/build/pkcs11/yubihsm_pkcs11.$LIBEXT"
+          export YUBIHSM_PKCS11_MODULE="`pwd`/build/lib/yubihsm_pkcs11.$LIBEXT"
           echo "connector=$DEFAULT_CONNECTOR_URL" >yubihsm_pkcs11.conf
           export YUBIHSM_PKCS11_CONF=`pwd`/yubihsm_pkcs11.conf
           pushd /tmp/yubihsm_sunpkcs11_tests

debian/rules

@@ -9,7 +9,6 @@ DEB_BUILD_OPTIONS=noddebs
 override_dh_install:
 	chrpath -d $(CURDIR)/debian/tmp/usr/bin/*
 	chrpath -d $(CURDIR)/debian/tmp/usr/lib/*.so*
-	chrpath -d $(CURDIR)/debian/tmp/usr/lib/pkcs11/*.so*
 	dh_install --fail-missing
 
 override_dh_auto_configure:

debian/yubihsm-pkcs11.install

@@ -1,3 +1,3 @@
 #! /usr/bin/dh-exec
 
-usr/lib/pkcs11/*.so /usr/lib/${DEB_HOST_MULTIARCH}/pkcs11
+usr/lib/yubihsm_pkcs11.so /usr/lib/${DEB_HOST_MULTIARCH}/pkcs11

resources/release/linux/yubihsm-shell.spec

@@ -40,7 +40,7 @@ make install
 chrpath -r %{_libdir} %{buildroot}/%{_bindir}/yubihsm-shell
 chrpath -r %{_libdir} %{buildroot}/%{_bindir}/yubihsm-wrap
 chrpath -r %{_libdir} %{buildroot}/%{_bindir}/yubihsm-auth
-chrpath -r %{_libdir} %{buildroot}/%{_libdir}/pkcs11/yubihsm_pkcs11.so
+chrpath -r %{_libdir} %{buildroot}/%{_libdir}/yubihsm_pkcs11.so
 mkdir -p %{buildroot}/%{_prefix}/share/licenses/%{name}
 install -m 0644 ../LICENSE %{buildroot}/%{_prefix}/share/licenses/%{name}
 
@@ -59,7 +59,7 @@ install -m 0644 ../LICENSE %{buildroot}/%{_prefix}/share/licenses/%{name}
 %{_libdir}/libykhsmauth.so.2
 %{_libdir}/libykhsmauth.so.2.*
 %dir %{_libdir}/pkcs11
-%{_libdir}/pkcs11/yubihsm_pkcs11.so
+%{_libdir}/yubihsm_pkcs11.so
 %files -n %{_yubihsm}-devel
 %{_libdir}/libyubihsm.so
 %{_libdir}/libyubihsm_http.so

resources/release/macos/make_release_binaries.sh

@@ -46,7 +46,7 @@ install_name_tool -change "$BREW_LIB/libusb/lib/libusb-1.0.0.dylib"  "@loader_pa
 install_name_tool -change "$BREW_LIB/libusb/lib/libusb-1.0.0.dylib"  "@loader_path/../lib/libusb-1.0.0.dylib" "$OUTPUT/lib/libyubihsm_usb.$VERSION.dylib"
 install_name_tool -change "$BREW_LIB/libusb/lib/libusb-1.0.0.dylib"  "@loader_path/../lib/libusb-1.0.0.dylib" "$OUTPUT/lib/libyubihsm_usb.$SO_VERSION.dylib"
 
-install_name_tool -change "$BREW_LIB/[email protected]/lib/libcrypto.1.1.dylib" "@loader_path/../lib/libcrypto.1.1.dylib" "$OUTPUT/lib/pkcs11/yubihsm_pkcs11.dylib"
+install_name_tool -change "$BREW_LIB/[email protected]/lib/libcrypto.1.1.dylib" "@loader_path/../lib/libcrypto.1.1.dylib" "$OUTPUT/lib/yubihsm_pkcs11.dylib"
 
 install_name_tool -change "$BREW_LIB/[email protected]/lib/libcrypto.1.1.dylib" "@loader_path/../lib/libcrypto.1.1.dylib" "$OUTPUT/bin/yubihsm-shell"
 install_name_tool -change "$BREW_LIB/[email protected]/lib/libcrypto.1.1.dylib" "@loader_path/../lib/libcrypto.1.1.dylib" "$OUTPUT/bin/yubihsm-wrap"