From bd7b86a5a1a8e35b9020095e3e590d017efffd0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20F=C3=B6rster?= <Dessa@gmake.de>
Date: Sat, 15 Aug 2020 11:58:13 +0200
Subject: [PATCH] [sys-auth/sssd] sync again

---
 sys-auth/sssd/files/sssd                      | 21 ------------
 ...-libsofthsm2.so-in-usr-libdir-sofths.patch | 32 +++++++++++++++++++
 sys-auth/sssd/files/sssd.service              | 15 ---------
 sys-auth/sssd/sssd-2.3.1-r1.ebuild            |  6 +++-
 4 files changed, 37 insertions(+), 37 deletions(-)
 delete mode 100644 sys-auth/sssd/files/sssd
 create mode 100644 sys-auth/sssd/files/sssd-2.3.1-test_ca-Look-for-libsofthsm2.so-in-usr-libdir-sofths.patch
 delete mode 100644 sys-auth/sssd/files/sssd.service

diff --git a/sys-auth/sssd/files/sssd b/sys-auth/sssd/files/sssd
deleted file mode 100644
index c79b79a..0000000
--- a/sys-auth/sssd/files/sssd
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-
-command="/usr/sbin/sssd"
-command_args="${SSSD_OPTIONS} -D"
-start_stop_daemon_args="--quiet"
-description="System Security Services Daemon"
-
-depend(){
-    need localmount clock
-    use syslog xdm
-}
-
-if [ "${RC_VERSION:-0}" = "0" ]; then
-        start() {
-                eerror "This script cannot be used for baselayout-1."
-                return 1
-        }
-fi
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 0000000..b84df9a
--- /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/files/sssd.service b/sys-auth/sssd/files/sssd.service
deleted file mode 100644
index 1821089..0000000
--- a/sys-auth/sssd/files/sssd.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=System Security Services Daemon
-# SSSD will not be started until syslog is
-After=syslog.target
-
-[Service]
-ExecStart=/usr/sbin/sssd -D -f
-# These two should be used with traditional UNIX forking daemons
-# consult systemd.service(5) for more details
-Type=forking
-PIDFile=/run/sssd.pid
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/sys-auth/sssd/sssd-2.3.1-r1.ebuild b/sys-auth/sssd/sssd-2.3.1-r1.ebuild
index 464c542..ba5fe4d 100644
--- a/sys-auth/sssd/sssd-2.3.1-r1.ebuild
+++ b/sys-auth/sssd/sssd-2.3.1-r1.ebuild
@@ -107,6 +107,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
 }
@@ -254,7 +258,7 @@ multilib_src_install_all() {
 }
 
 multilib_src_test() {
-	default
+	emake check
 }
 
 pkg_postinst() {