From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C005D138359 for ; Fri, 14 Aug 2020 20:42:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EE405E084A; Fri, 14 Aug 2020 20:42:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D3432E084A for ; Fri, 14 Aug 2020 20:42:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5381834F33E for ; Fri, 14 Aug 2020 20:42:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D22AE310 for ; Fri, 14 Aug 2020 20:42:49 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1597437730.dc86803f6dc983fbb0ca8737da804c49b3219360.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-auth/sssd/files/, sys-auth/sssd/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-auth/sssd/files/sssd-2.3.1-test_ca-Look-for-libsofthsm2.so-in-usr-libdir-sofths.patch sys-auth/sssd/sssd-2.3.1.ebuild X-VCS-Directories: sys-auth/sssd/files/ sys-auth/sssd/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: dc86803f6dc983fbb0ca8737da804c49b3219360 X-VCS-Branch: master Date: Fri, 14 Aug 2020 20:42:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 06193345-9926-45f2-a91f-e8a1b1f10de6 X-Archives-Hash: 874238d8a8e1e89317f8e6324b76ae97 commit: dc86803f6dc983fbb0ca8737da804c49b3219360 Author: Matt Turner gentoo org> AuthorDate: Fri Aug 14 20:38:18 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Fri Aug 14 20:42:10 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc86803f sys-auth/sssd: Look for softhsm in the right location Signed-off-by: Matt Turner gentoo.org> ...k-for-libsofthsm2.so-in-usr-libdir-sofths.patch | 32 ++++++++++++++++++++++ sys-auth/sssd/sssd-2.3.1.ebuild | 4 +++ 2 files changed, 36 insertions(+) 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 00000000000..b84df9a91cb --- /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 +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 +--- + 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 b7891b21454..dc2ccb3680b 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 }