diff options
| author |   Matt Turner <mattst88@gentoo.org> | 2020-08-14 13:38:18 -0700 |
|---|---|---|
| committer | Matt Turner <mattst88@gentoo.org> | 2020-08-14 13:42:10 -0700 |
| commit | dc86803f6dc983fbb0ca8737da804c49b3219360 (patch) | |
| tree | a8ab4808d992d2306f795056de3a9953512062c5 /sys-auth | |
| parent | dev-libs/softhsm: Version bump to 2.6.1 (diff) | |
| download | gentoo-dc86803f6dc983fbb0ca8737da804c49b3219360.tar.gz gentoo-dc86803f6dc983fbb0ca8737da804c49b3219360.tar.bz2 gentoo-dc86803f6dc983fbb0ca8737da804c49b3219360.zip | |
sys-auth/sssd: Look for softhsm in the right location
Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'sys-auth')
| -rw-r--r-- | sys-auth/sssd/files/sssd-2.3.1-test_ca-Look-for-libsofthsm2.so-in-usr-libdir-sofths.patch | 32 | ||||
| -rw-r--r-- | sys-auth/sssd/sssd-2.3.1.ebuild | 4 |
2 files changed, 36 insertions, 0 deletions
diff --git a/sys-auth/sssd/files/sssd-2.3.1-test_ca-Look-for-libsofthsm2.so-in-usr-libdir-sofths.patch b/sys-auth/sssd/files/sssd-2.3.1-test_ca-Look-for-libsofthsm2.so-in-usr-libdir-sofths.patch new file mode 100644 index 000000000000..b84df9a91cba --- /dev/null +++ b/sys-auth/sssd/files/sssd-2.3.1-test_ca-Look-for-libsofthsm2.so-in-usr-libdir-sofths.patch @@ -0,0 +1,32 @@ +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 + diff --git a/sys-auth/sssd/sssd-2.3.1.ebuild b/sys-auth/sssd/sssd-2.3.1.ebuild index b7891b21454b..dc2ccb3680be 100644 --- a/sys-auth/sssd/sssd-2.3.1.ebuild +++ b/sys-auth/sssd/sssd-2.3.1.ebuild @@ -89,6 +89,10 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/sss_certmap.h ) +PATCHES=( + "${FILESDIR}"/${P}-test_ca-Look-for-libsofthsm2.so-in-usr-libdir-sofths.patch +) + pkg_setup() { linux-info_pkg_setup } |