[sys-auth/sssd] sync with tree
parent
3f540d2894
commit
6c469a0388
@ -1 +1 @@
|
||||
DIST sssd-2.5.0.tar.gz 7474851 BLAKE2B 835ca53a7910f457666a92be62fe047dbcf52c56560dad60d6c6275dccca917b4349d053586c8c88da49f900d570c890faa7372783be35940ccd49d1fd4ec09d SHA512 80b5e81cedacdf0bbe724af20d69b918bb6cc353976c6c65421afcd5809d1723f523bc3c1be294b9e01cfda9617c2df5c6ceb007837f195eb1abc2abdab9858c
|
||||
DIST sssd-2.5.1.tar.gz 7492275 BLAKE2B 9f19d12cb0e071b15bd8fe2660ab9a2223d53267549602c4837f35ed852fa60022514a0bbd03c684c1f398d763120c5f706999d86432d9fe03c3715cb0d43000 SHA512 7441df3b5f1cc1eadb0c6853b048d780ecb36761876aaeb26b9a2d87729211d3ceeae01085dc3ec4fd1c5328f951c8abe854b1d01d91fae25466f930fe16e44a
|
||||
|
@ -1,32 +0,0 @@
|
||||
From fc79d035ccc4c1a5da26bbd780aeb7e0a0afebf5 Mon Sep 17 00:00:00 2001
|
||||
From: Matt Turner <mattst88@gmail.com>
|
||||
Date: Fri, 14 Aug 2020 13:36:30 -0700
|
||||
Subject: [PATCH] test_ca: Look for libsofthsm2.so in /usr/${libdir}/softhsm
|
||||
too
|
||||
|
||||
Signed-off-by: Matt Turner <mattst88@gmail.com>
|
||||
---
|
||||
src/external/test_ca.m4 | 7 ++++---
|
||||
1 file changed, 4 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/external/test_ca.m4 b/src/external/test_ca.m4
|
||||
index 4d45a5a16..d318789bc 100644
|
||||
--- a/src/external/test_ca.m4
|
||||
+++ b/src/external/test_ca.m4
|
||||
@@ -33,9 +33,10 @@ AC_DEFUN([AM_CHECK_TEST_CA],
|
||||
AM_CONDITIONAL([BUILD_TEST_CA], [test -x "$OPENSSL" -a -x "$SSH_KEYGEN" -a -x "$CERTUTIL" -a -x "$PK12UTIL"])
|
||||
else
|
||||
|
||||
- for p in /usr/lib64/pkcs11/libsofthsm2.so /usr/lib/pkcs11/libsofthsm2.so /usr/lib/x86_64-linux-gnu/softhsm/libsofthsm2.so; do
|
||||
- if test -f "${p}"; then
|
||||
- SOFTHSM2_PATH="${p}"
|
||||
+ for p in /usr/lib{64,}/{softhsm,pkcs11} /usr/lib/x86_64-linux-gnu/softhsm; do
|
||||
+ f="${p}/libsofthsm2.so"
|
||||
+ if test -f "${f}"; then
|
||||
+ SOFTHSM2_PATH="${f}"
|
||||
break;
|
||||
fi
|
||||
done
|
||||
--
|
||||
2.26.2
|
||||
|
Loading…
Reference in New Issue