security/sssd2: Assorted port cleanups

- Simplify depending on Kerberos
- - Do not use gssapi:bootstrap
- - Do not redefine variables already defined by USES
- - Instead of patching, pass the KRB5_CONFIG env var
- Trim unused dependencies
- Remove hunks from the configure.ac patch that aren't needed anymore
- Simplify SHEBANG_FILES
- No need to define LIB_DIRS, DEBUG_FLAGS and STRIP
- Bump PORTREVISION to catch possible regressions

Tested by:	arrowd
Approved by:	0mp, jhixson
Pull Request:	https://github.com/freebsd/freebsd-ports/pull/272
Sponsored by:	Future Crew, LLC

5 files changed, 107 insertions, 232 deletions

diff --git a/security/sssd2/Makefile b/security/sssd2/Makefile
index ac67c0fbfd7c..9ecb31bb0e01 100644
--- a/security/sssd2/Makefile
+++ b/security/sssd2/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	sssd
 PORTVERSION=	2.9.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 PKGNAMESUFFIX=	2
 
@@ -16,35 +16,27 @@ CONFLICTS_INSTALL?=	sssd*
 BUILD_DEPENDS=	${PY_SETUPTOOLS} \
 		bash:shells/bash \
 		docbook-xsl>=1:textproc/docbook-xsl \
-		krb5>=1.20:security/krb5 \
 		p11-kit:security/p11-kit \
 		nsupdate:dns/bind-tools \
 		xmlcatalog:textproc/libxml2 \
 		xmlcatmgr:textproc/xmlcatmgr \
 		xsltproc:textproc/libxslt
 
-LIB_DIRS+=	${LOCALBASE}/lib ${LOCALBASE}/lib/sasl2
 LIB_DEPENDS=	libcares.so:dns/c-ares \
-		libcom_err.so:security/krb5 \
 		libcurl.so:ftp/curl \
 		libdbus-1.so:devel/dbus \
 		libdhash.so:devel/ding-libs \
 		libfido2.so:security/libfido2 \
-		libgssapi_krb5.so:security/krb5 \
 		libinotify.so:devel/libinotify \
 		libjansson.so:devel/jansson \
 		libjose.so:net/jose \
-		libkrb5.so:security/krb5 \
 		libldb.so:${SAMBA_LDB_PORT} \
 		libndr-krb5pac.so:${SAMBA_PORT} \
 		libndr-nbt.so:${SAMBA_PORT} \
 		libndr-standard.so:${SAMBA_PORT} \
 		libndr.so:${SAMBA_PORT} \
-		libnfs.so:net/libnfs \
-		libnss3.so:security/nss \
 		libp11-kit.so:security/p11-kit \
-		libpcre2-posix.so:devel/pcre2 \
-		libplds4.so:devel/nspr \
+		libpcre2-8.so:devel/pcre2 \
 		libpopt.so:devel/popt \
 		libsamba-util.so:${SAMBA_PORT} \
 		libsasl2.so:security/cyrus-sasl2 \
@@ -58,7 +50,7 @@ LIB_DEPENDS=	libcares.so:dns/c-ares \
 RUN_DEPENDS=	adcli:net-mgmt/adcli \
 		cyrus-sasl-gssapi>0:security/cyrus-sasl2-gssapi
 
-USES=	autoreconf cpe gettext gmake gssapi:bootstrap,flags,mit iconv ldap \
+USES=	autoreconf cpe gettext gmake gssapi:flags,mit iconv ldap \
 	libtool localbase:ldflags pathfix pkgconfig python:3.9+ samba:env \
 	shebangfix ssl
 
@@ -68,14 +60,9 @@ GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 CPE_VENDOR=	fedoraproject
 
-DEBUG_FLAGS=	-g
-STRIP=
-
 CONFIGURE_ARGS=	--disable-dependency-tracking \
 		--datadir=${DATADIR} \
-		--docdir=${DOCSDIR} \
 		--localstatedir=/var \
-		--disable-silent-rules \
 		--disable-nls \
 		--disable-cifs-idmap-plugin \
 		--disable-valgrind \
@@ -106,12 +93,8 @@ CONFIGURE_ARGS=	--disable-dependency-tracking \
 		--without-autofs \
 		--with-files-provider \
 		--with-passkey \
-		--with-libsifp \
-		--without-libsifp \
-		--with-syslog=syslog \
 		--with-samba \
 		--without-nfsv4-idmapd-plugin \
-		--with-nfs-lib-path=${LOCALBASE}/lib \
 		--with-secrets-db-path=/var/lib/sss/secrets \
 		--with-kcm \
 		--with-oidc-child \
@@ -119,36 +102,15 @@ CONFIGURE_ARGS=	--disable-dependency-tracking \
 		--with-smb-idmap-interface-version=6 \
 		--without-libnl \
 		--with-nscd-conf=/etc/nscd.conf \
-		--with-python_prefix=${PREFIX} \
-		--with-unicode-lib=libunistring
+		--with-python_prefix=${PREFIX}
+CONFIGURE_ENV=	KRB5_CONFIG="${KRB5CONFIG}"
 
 CPPFLAGS+=	-DRENEWAL_PROG_PATH='\"${LOCALBASE}/sbin/adcli\"'
 CFLAGS+=	-fstack-protector-all
-CFLAGS+=	-I${LOCALBASE}/include/samba4
-
-LIBS+=	-L${LOCALBASE}/lib \
-	-L${LOCALBASE}/lib/samba4/private \
-	-L${LOCALBASE}/lib/sasl2  \
-	-linotify -lintl
-
-KRB5_HOME=	${LOCALBASE}
-KRB5_CONFIG=	${LOCALBASE}/bin/krb5-config
-KRB5_CFLAGS=	-I${LOCALBASE}/include
-KRB5_LIBS=	-L${LOCALBAse}/lib -lkrb5 -lk5crypto -lcom_err
-
-GSSAPI_KRB5_CFLAGS=	-I${LOCALBASE}/include
-GSSAPI_KRB5_LIBS=	-L${LOCALBASE}/lib -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err
-
-LDFLAGS+=	-lgssapi
-LDFLAGS_SL+=	-lgssapi
-
-INCLUDES+=	-I${LOCALBASE}/include
-CONFIGURE_ENV+=	INCLUDES="${INCLUDES}" \
-		LDFLAGS_SL="${LDFLAGS_SL}"
-MAKE_ENV=	MAKELEVEL=0
+LIBS+=		-linotify -lintl
 
 PLIST_SUB=	PYTHON_VER=${PYTHON_VER}
-MAKE_ENV+=	LINGUAS="bg de eu es fr hu id it ja nb nl pl pt ru sv tg tr uk zh_CN zh_TW"
+MAKE_ENV=	MAKELEVEL=0 LINGUAS="bg de eu es fr hu id it ja nb nl pl pt ru sv tg tr uk zh_CN zh_TW"
 SUB_FILES=	pkg-message
 
 BINARY_ALIAS=	python3=python${PYTHON_VER}
@@ -156,14 +118,11 @@ SHEBANG_FILES=	sbus_generate.sh.in \
 		src/tools/analyzer/sss_analyze \
 		src/tools/sss_obfuscate \
 		src/config/SSSDConfigTest.py \
-		src/tests/python-test.py \
-		src/tests/pysss-test.py \
+		src/tests/*.py \
 		src/tests/cwrap/cwrap_test_setup.sh \
 		src/tests/whitespace_test \
-		src/tests/pyhbac-test.py \
 		src/tests/multihost/data/memcachesize.py \
 		src/tests/double_semicolon_test \
-		src/tests/pysss_murmur-test.py \
 		scripts/release.sh \
 		contrib/git/pre-push \
 		contrib/ci/rpm-spec-builddeps \
diff --git a/security/sssd2/files/patch-Makefile.am b/security/sssd2/files/patch-Makefile.am
index 635c195e729c..d24159e25d97 100644
--- a/security/sssd2/files/patch-Makefile.am
+++ b/security/sssd2/files/patch-Makefile.am
@@ -1,4 +1,4 @@
---- Makefile.am.orig	2024-02-12 00:15:58 UTC
+--- Makefile.am.orig	2024-06-07 19:27:57 UTC
 +++ Makefile.am
 @@ -59,7 +59,7 @@ dbusservicedir = $(datadir)/dbus-1/system-services
  krb5snippetsdir = $(sssddatadir)/krb5-snippets
@@ -49,18 +49,15 @@
      $(SELINUX_LIBS) \
      $(PAM_LIBS) \
      $(SYSTEMD_DAEMON_LIBS) \
-@@ -1593,8 +1598,10 @@ sssd_sudo_LDADD = \
-     src/responder/sudo/sudosrv_dp.c \
-     $(SSSD_RESPONDER_OBJ)
+@@ -1595,6 +1600,7 @@ sssd_sudo_LDADD = \
  sssd_sudo_LDADD = \
-+    $(GSSAPI_KRB5_LIBS) \
      $(LIBADD_DL) \
      $(SSSD_LIBS) \
 +    $(LTLIBINTL) \
      $(SYSTEMD_DAEMON_LIBS) \
      $(SSSD_INTERNAL_LTLIBS) \
      libsss_iface.la \
-@@ -1610,6 +1617,7 @@ sssd_autofs_LDADD = \
+@@ -1610,6 +1616,7 @@ sssd_autofs_LDADD = \
  sssd_autofs_LDADD = \
      $(LIBADD_DL) \
      $(SSSD_LIBS) \
@@ -68,7 +65,7 @@
      $(SYSTEMD_DAEMON_LIBS) \
      $(SSSD_INTERNAL_LTLIBS) \
      libsss_iface.la \
-@@ -1630,6 +1638,7 @@ sssd_ssh_LDADD = \
+@@ -1630,6 +1637,7 @@ sssd_ssh_LDADD = \
  sssd_ssh_LDADD = \
      $(LIBADD_DL) \
      $(SSSD_LIBS) \
@@ -76,7 +73,7 @@
      $(SSSD_INTERNAL_LTLIBS) \
      $(SYSTEMD_DAEMON_LIBS) \
      libsss_cert.la \
-@@ -1653,6 +1662,7 @@ sssd_pac_LDADD = \
+@@ -1653,6 +1661,7 @@ sssd_pac_LDADD = \
      $(NDR_KRB5PAC_LIBS) \
      $(TDB_LIBS) \
      $(SSSD_LIBS) \
@@ -84,7 +81,7 @@
      $(SYSTEMD_DAEMON_LIBS) \
      libsss_idmap.la \
      $(SSSD_INTERNAL_LTLIBS) \
-@@ -1731,6 +1741,7 @@ sssd_ifp_LDADD = \
+@@ -1731,6 +1740,7 @@ sssd_ifp_LDADD = \
  sssd_ifp_LDADD = \
      $(LIBADD_DL) \
      $(SSSD_LIBS) \
@@ -92,7 +89,7 @@
      $(SYSTEMD_DAEMON_LIBS) \
      $(SSSD_INTERNAL_LTLIBS) \
      libsss_cert.la \
-@@ -1794,6 +1805,7 @@ sssd_kcm_LDADD = \
+@@ -1794,6 +1804,7 @@ sssd_kcm_LDADD = \
      $(LIBADD_DL) \
      $(KRB5_LIBS) \
      $(SSSD_LIBS) \
@@ -100,7 +97,7 @@
      $(UUID_LIBS) \
      $(SYSTEMD_DAEMON_LIBS) \
      $(SSSD_INTERNAL_LTLIBS) \
-@@ -1844,6 +1856,7 @@ sssd_be_LDADD = \
+@@ -1844,6 +1855,7 @@ sssd_be_LDADD = \
  sssd_be_LDADD = \
      $(LIBADD_DL) \
      $(SSSD_LIBS) \
@@ -108,7 +105,7 @@
      $(CARES_LIBS) \
      $(PAM_LIBS) \
      $(SSSD_INTERNAL_LTLIBS) \
-@@ -1905,6 +1918,7 @@ sss_signal_LDADD = \
+@@ -1905,6 +1917,7 @@ sss_signal_LDADD = \
      src/tools/common/sss_process.c
      $(NULL)
  sss_signal_LDADD = \
@@ -116,16 +113,7 @@
      libsss_debug.la \
      $(NULL)
  
-@@ -1961,7 +1975,7 @@ sss_sudo_cli_CFLAGS = $(AM_CFLAGS)
-     src/sss_client/sudo/sss_sudo_response.c \
-     src/sss_client/sudo_testcli/sudo_testcli.c
- sss_sudo_cli_CFLAGS = $(AM_CFLAGS)
--sss_sudo_cli_LDADD = $(CLIENT_LIBS)
-+sss_sudo_cli_LDADD = $(GSSAPI_KRB5_LIBS) $(CLIENT_LIBS)
- endif
- 
- if BUILD_SSH
-@@ -2142,6 +2156,7 @@ sysdb_tests_LDADD = \
+@@ -2142,6 +2155,7 @@ sysdb_tests_LDADD = \
      $(CHECK_CFLAGS)
  sysdb_tests_LDADD = \
      $(SSSD_LIBS) \
@@ -133,7 +121,7 @@
      $(CHECK_LIBS) \
      $(SSSD_INTERNAL_LTLIBS) \
      libsss_test_common.la
-@@ -2155,6 +2170,7 @@ sysdb_ssh_tests_LDADD = \
+@@ -2155,6 +2169,7 @@ sysdb_ssh_tests_LDADD = \
      $(CHECK_CFLAGS)
  sysdb_ssh_tests_LDADD = \
      $(SSSD_LIBS) \
@@ -141,7 +129,7 @@
      $(CHECK_LIBS) \
      $(SSSD_INTERNAL_LTLIBS) \
      libsss_test_common.la
-@@ -2167,6 +2183,7 @@ strtonum_tests_LDADD = \
+@@ -2167,6 +2182,7 @@ strtonum_tests_LDADD = \
      $(CHECK_CFLAGS)
  strtonum_tests_LDADD = \
      $(SSSD_LIBS) \
@@ -149,7 +137,7 @@
      $(CHECK_LIBS) \
      libsss_debug.la \
      libsss_test_common.la
-@@ -2191,6 +2208,7 @@ krb5_utils_tests_LDADD = \
+@@ -2191,6 +2207,7 @@ krb5_utils_tests_LDADD = \
      $(CHECK_CFLAGS)
  krb5_utils_tests_LDADD = \
      $(SSSD_LIBS)\
@@ -157,7 +145,7 @@
      $(CARES_LIBS) \
      $(KRB5_LIBS) \
      $(CHECK_LIBS) \
-@@ -2251,6 +2269,7 @@ resolv_tests_LDADD = \
+@@ -2251,6 +2268,7 @@ resolv_tests_LDADD = \
      -DBUILD_TXT
  resolv_tests_LDADD = \
      $(SSSD_LIBS) \
@@ -165,7 +153,7 @@
      $(CHECK_LIBS) \
      $(CARES_LIBS) \
      libsss_debug.la \
-@@ -2264,6 +2283,7 @@ file_watch_tests_LDADD = \
+@@ -2264,6 +2282,7 @@ file_watch_tests_LDADD = \
      $(CHECK_CFLAGS)
  file_watch_tests_LDADD = \
      $(SSSD_LIBS) \
@@ -173,7 +161,7 @@
      $(CHECK_LIBS) \
      $(INOTIFY_LIBS) \
      $(SSSD_INTERNAL_LTLIBS) \
-@@ -2277,6 +2297,7 @@ refcount_tests_LDADD = \
+@@ -2277,6 +2296,7 @@ refcount_tests_LDADD = \
      $(CHECK_CFLAGS)
  refcount_tests_LDADD = \
      $(SSSD_LIBS) \
@@ -181,7 +169,7 @@
      $(CHECK_LIBS) \
      $(SSSD_INTERNAL_LTLIBS) \
      libsss_test_common.la
-@@ -2290,6 +2311,7 @@ fail_over_tests_LDADD = \
+@@ -2290,6 +2310,7 @@ fail_over_tests_LDADD = \
      $(CHECK_CFLAGS)
  fail_over_tests_LDADD = \
      $(SSSD_LIBS) \
@@ -189,7 +177,7 @@
      $(CHECK_LIBS) \
      $(CARES_LIBS) \
      $(SSSD_INTERNAL_LTLIBS) \
-@@ -2321,6 +2343,7 @@ auth_tests_LDADD = \
+@@ -2321,6 +2342,7 @@ auth_tests_LDADD = \
      $(CHECK_CFLAGS)
  auth_tests_LDADD = \
      $(SSSD_LIBS) \
@@ -197,7 +185,7 @@
      $(CHECK_LIBS) \
      $(SSSD_INTERNAL_LTLIBS) \
      libsss_test_common.la
-@@ -2373,6 +2396,7 @@ util_tests_LDADD = \
+@@ -2373,6 +2395,7 @@ util_tests_LDADD = \
      $(NULL)
  util_tests_LDADD = \
      $(SSSD_LIBS) \
@@ -205,7 +193,7 @@
      $(CHECK_LIBS) \
      $(SSSD_INTERNAL_LTLIBS) \
      libsss_test_common.la \
-@@ -2385,6 +2409,7 @@ safe_format_tests_LDADD = \
+@@ -2385,6 +2408,7 @@ safe_format_tests_LDADD = \
      $(CHECK_CFLAGS)
  safe_format_tests_LDADD = \
      $(SSSD_LIBS) \
@@ -213,7 +201,7 @@
      $(CHECK_LIBS) \
      $(SSSD_INTERNAL_LTLIBS) \
      libsss_test_common.la
-@@ -2397,6 +2422,7 @@ debug_tests_LDADD = \
+@@ -2397,6 +2421,7 @@ debug_tests_LDADD = \
      $(CHECK_CFLAGS)
  debug_tests_LDADD = \
      $(SSSD_LIBS) \
@@ -221,7 +209,7 @@
      $(CHECK_LIBS) \
      libsss_debug.la
  
-@@ -2420,6 +2446,7 @@ ipa_hbac_tests_LDADD = \
+@@ -2420,6 +2445,7 @@ ipa_hbac_tests_LDADD = \
      $(CHECK_CFLAGS)
  ipa_hbac_tests_LDADD = \
      $(SSSD_LIBS) \
@@ -229,7 +217,7 @@
      $(CHECK_LIBS) \
      libsss_test_common.la \
      libipa_hbac.la
-@@ -2454,6 +2481,7 @@ responder_socket_access_tests_LDADD = \
+@@ -2454,6 +2480,7 @@ responder_socket_access_tests_LDADD = \
      $(LIBADD_DL) \
      $(CHECK_LIBS) \
      $(SSSD_LIBS) \
@@ -237,7 +225,7 @@
      $(SSSD_INTERNAL_LTLIBS) \
      $(SYSTEMD_DAEMON_LIBS) \
      libsss_test_common.la \
-@@ -2466,6 +2494,7 @@ stress_tests_LDADD = \
+@@ -2466,6 +2493,7 @@ stress_tests_LDADD = \
      src/tests/stress-tests.c
  stress_tests_LDADD = \
      $(SSSD_LIBS) \
@@ -245,7 +233,7 @@
      libsss_test_common.la
  
  krb5_child_test_SOURCES = \
-@@ -2490,6 +2519,7 @@ krb5_child_test_LDADD = \
+@@ -2490,6 +2518,7 @@ krb5_child_test_LDADD = \
      $(CHECK_CFLAGS)
  krb5_child_test_LDADD = \
      $(SSSD_LIBS) \
@@ -253,7 +241,7 @@
      $(CARES_LIBS) \
      $(KRB5_LIBS) \
      $(CHECK_LIBS) \
-@@ -2507,6 +2537,7 @@ test_ssh_client_LDADD = \
+@@ -2507,6 +2536,7 @@ test_ssh_client_LDADD = \
  test_ssh_client_LDADD = \
      $(SSSD_INTERNAL_LTLIBS) \
      $(SSSD_LIBS) \
@@ -261,7 +249,7 @@
      $(NULL)
  
  test_sbus_message_SOURCES = \
-@@ -2602,6 +2633,7 @@ nss_srv_tests_LDADD = \
+@@ -2602,6 +2632,7 @@ nss_srv_tests_LDADD = \
      $(LIBADD_DL) \
      $(CMOCKA_LIBS) \
      $(SSSD_LIBS) \
@@ -269,7 +257,7 @@
      $(SSSD_INTERNAL_LTLIBS) \
      $(SYSTEMD_DAEMON_LIBS) \
      libsss_test_common.la \
-@@ -2650,6 +2682,7 @@ pam_srv_tests_LDADD = \
+@@ -2650,6 +2681,7 @@ pam_srv_tests_LDADD = \
      $(CMOCKA_LIBS) \
      $(PAM_LIBS) \
      $(SSSD_LIBS) \
@@ -277,7 +265,7 @@
      $(SSSD_INTERNAL_LTLIBS) \
      $(SYSTEMD_DAEMON_LIBS) \
      $(GSSAPI_KRB5_LIBS) \
-@@ -2693,6 +2726,7 @@ ssh_srv_tests_LDADD = \
+@@ -2693,6 +2725,7 @@ ssh_srv_tests_LDADD = \
      $(LIBADD_DL) \
      $(CMOCKA_LIBS) \
      $(SSSD_LIBS) \
@@ -285,7 +273,7 @@
      $(SSSD_INTERNAL_LTLIBS) \
      $(SYSTEMD_DAEMON_LIBS) \
      libsss_test_common.la \
-@@ -2717,6 +2751,7 @@ responder_get_domains_tests_LDADD = \
+@@ -2717,6 +2750,7 @@ responder_get_domains_tests_LDADD = \
      $(LIBADD_DL) \
      $(CMOCKA_LIBS) \
      $(SSSD_LIBS) \
@@ -293,7 +281,7 @@
      $(SSSD_INTERNAL_LTLIBS) \
      $(SYSTEMD_DAEMON_LIBS) \
      libsss_test_common.la \
-@@ -2780,6 +2815,7 @@ test_negcache_LDADD = \
+@@ -2780,6 +2814,7 @@ test_negcache_LDADD = \
      $(LIBADD_DL) \
      $(CMOCKA_LIBS) \
      $(SSSD_LIBS) \
@@ -301,7 +289,7 @@
      $(SYSTEMD_DAEMON_LIBS) \
      $(SSSD_INTERNAL_LTLIBS) \
      libsss_test_common.la \
-@@ -2806,6 +2842,7 @@ test_authtok_LDADD = \
+@@ -2806,6 +2841,7 @@ test_authtok_LDADD = \
      $(CMOCKA_LIBS) \
      $(DHASH_LIBS) \
      $(POPT_LIBS) \
@@ -309,7 +297,7 @@
      libsss_test_common.la \
      libsss_debug.la \
      $(NULL)
-@@ -2821,6 +2858,7 @@ test_prompt_config_LDADD = \
+@@ -2821,6 +2857,7 @@ test_prompt_config_LDADD = \
  test_prompt_config_LDADD = \
      $(CMOCKA_LIBS) \
      $(POPT_LIBS) \
@@ -317,7 +305,7 @@
      libsss_debug.la \
      $(TALLOC_LIBS) \
      $(NULL)
-@@ -2845,6 +2883,7 @@ deskprofile_utils_tests_LDADD = \
+@@ -2845,6 +2882,7 @@ deskprofile_utils_tests_LDADD = \
  deskprofile_utils_tests_CFLAGS = \
      $(AM_CFLAGS)
  deskprofile_utils_tests_LDADD = \
@@ -325,7 +313,7 @@
      $(CMOCKA_LIBS) \
      $(SSSD_INTERNAL_LTLIBS) \
      libsss_test_common.la
-@@ -2868,6 +2907,7 @@ dyndns_tests_LDADD = \
+@@ -2868,6 +2906,7 @@ dyndns_tests_LDADD = \
      $(CARES_LIBS) \
      $(CMOCKA_LIBS) \
      $(SSSD_LIBS) \
@@ -333,7 +321,7 @@
      $(SSSD_INTERNAL_LTLIBS) \
      libsss_test_common.la
  
-@@ -2878,6 +2918,7 @@ domain_resolution_order_tests_LDADD = \
+@@ -2878,6 +2917,7 @@ domain_resolution_order_tests_LDADD = \
  	$(AM_CFLAGS)
  domain_resolution_order_tests_LDADD = \
  	$(CMOCKA_LIBS) \
@@ -341,7 +329,7 @@
  	$(SSSD_INTERNAL_LTLIBS) \
  	libsss_test_common.la
  
-@@ -2888,6 +2929,7 @@ fqnames_tests_LDADD = \
+@@ -2888,6 +2928,7 @@ fqnames_tests_LDADD = \
  fqnames_tests_LDADD = \
      $(CMOCKA_LIBS) \
      $(SSSD_LIBS) \
@@ -349,7 +337,7 @@
      $(SSSD_INTERNAL_LTLIBS) \
      libsss_test_common.la
  
-@@ -2907,6 +2949,7 @@ nestedgroups_tests_LDADD = \
+@@ -2907,6 +2948,7 @@ nestedgroups_tests_LDADD = \
  nestedgroups_tests_LDADD = \
      $(CMOCKA_LIBS) \
      $(OPENLDAP_LIBS) \
@@ -357,7 +345,7 @@
      $(SSSD_LIBS) \
      $(SSSD_INTERNAL_LTLIBS) \
      libsss_idmap.la \
-@@ -2940,6 +2983,7 @@ test_ipa_idmap_LDADD = \
+@@ -2940,6 +2982,7 @@ test_ipa_idmap_LDADD = \
  test_ipa_idmap_LDADD = \
      $(CMOCKA_LIBS) \
      $(POPT_LIBS) \
@@ -365,7 +353,7 @@
      libsss_idmap.la \
      $(SSSD_INTERNAL_LTLIBS) \
      libsss_test_common.la
-@@ -2962,6 +3006,7 @@ test_utils_LDADD = \
+@@ -2962,6 +3005,7 @@ test_utils_LDADD = \
      $(CMOCKA_LIBS) \
      $(POPT_LIBS) \
      $(SSSD_INTERNAL_LTLIBS) \
@@ -373,7 +361,7 @@
      libsss_test_common.la
  
  test_search_bases_SOURCES = \
-@@ -2970,6 +3015,7 @@ test_search_bases_LDADD = \
+@@ -2970,6 +3014,7 @@ test_search_bases_LDADD = \
      $(CMOCKA_LIBS) \
      $(TALLOC_LIBS) \
      $(SSSD_INTERNAL_LTLIBS) \
@@ -381,7 +369,7 @@
      libsss_ldap_common.la \
      libsss_test_common.la \
      libdlopen_test_providers.la \
-@@ -2984,6 +3030,7 @@ test_ldap_auth_LDADD = \
+@@ -2984,6 +3029,7 @@ test_ldap_auth_LDADD = \
  test_ldap_auth_LDADD = \
      $(CMOCKA_LIBS) \
      $(TALLOC_LIBS) \
@@ -389,7 +377,7 @@
      libsss_ldap_common.la \
      libsss_test_common.la \
      libdlopen_test_providers.la \
-@@ -2997,6 +3044,7 @@ test_ldap_id_cleanup_LDADD = \
+@@ -2997,6 +3043,7 @@ test_ldap_id_cleanup_LDADD = \
  test_ldap_id_cleanup_LDADD = \
      $(CMOCKA_LIBS) \
      $(POPT_LIBS) \
@@ -397,7 +385,7 @@
      $(TALLOC_LIBS) \
      $(TEVENT_LIBS) \
      $(SSSD_INTERNAL_LTLIBS) \
-@@ -3014,6 +3062,7 @@ test_sdap_access_LDADD = \
+@@ -3014,6 +3061,7 @@ test_sdap_access_LDADD = \
  test_sdap_access_LDADD = \
      $(CMOCKA_LIBS) \
      $(TALLOC_LIBS) \
@@ -405,7 +393,7 @@
      libsss_ldap_common.la \
      libsss_test_common.la \
      libdlopen_test_providers.la \
-@@ -3033,6 +3082,7 @@ test_sdap_certmap_LDADD = \
+@@ -3033,6 +3081,7 @@ test_sdap_certmap_LDADD = \
  test_sdap_certmap_LDADD = \
      $(CMOCKA_LIBS) \
      $(TALLOC_LIBS) \
@@ -413,7 +401,7 @@
      $(POPT_LIBS) \
      $(SSSD_INTERNAL_LTLIBS) \
      libsss_test_common.la \
-@@ -3044,6 +3094,7 @@ ad_access_filter_tests_LDADD = \
+@@ -3044,6 +3093,7 @@ ad_access_filter_tests_LDADD = \
  ad_access_filter_tests_LDADD = \
      $(CMOCKA_LIBS) \
      $(POPT_LIBS) \
@@ -421,7 +409,7 @@
      $(TALLOC_LIBS) \
      $(TEVENT_LIBS) \
      $(SSSD_INTERNAL_LTLIBS) \
-@@ -3065,6 +3116,7 @@ ad_gpo_tests_LDADD = \
+@@ -3065,6 +3115,7 @@ ad_gpo_tests_LDADD = \
      $(CMOCKA_LIBS) \
      $(OPENLDAP_LIBS) \
      $(SSSD_LIBS) \
@@ -429,7 +417,7 @@
      $(SSSD_INTERNAL_LTLIBS) \
      $(NDR_NBT_LIBS) \
      libsss_ldap_common.la \
-@@ -3102,6 +3154,7 @@ ad_common_tests_LDADD = \
+@@ -3102,6 +3153,7 @@ ad_common_tests_LDADD = \
  ad_common_tests_LDADD = \
      $(CMOCKA_LIBS) \
      $(SSSD_LIBS) \
@@ -437,7 +425,7 @@
      $(KEYUTILS_LIBS) \
      $(NDR_NBT_LIBS) \
      $(NDR_KRB5PAC_LIBS) \
-@@ -3124,6 +3177,7 @@ dp_opt_tests_LDADD = \
+@@ -3124,6 +3176,7 @@ dp_opt_tests_LDADD = \
      $(CMOCKA_LIBS) \
      $(TALLOC_LIBS) \
      $(POPT_LIBS) \
@@ -445,7 +433,7 @@
      $(SSSD_INTERNAL_LTLIBS) \
      libsss_test_common.la
  
-@@ -3156,6 +3210,7 @@ sdap_tests_LDADD = \
+@@ -3156,6 +3209,7 @@ sdap_tests_LDADD = \
      $(TALLOC_LIBS) \
      $(LDB_LIBS) \
      $(POPT_LIBS) \
@@ -453,7 +441,7 @@
      $(SSSD_INTERNAL_LTLIBS) \
      $(OPENLDAP_LIBS) \
      libsss_test_common.la \
-@@ -3176,6 +3231,7 @@ ifp_tests_LDADD = \
+@@ -3176,6 +3230,7 @@ ifp_tests_LDADD = \
      $(LIBADD_DL) \
      $(CMOCKA_LIBS) \
      $(SSSD_LIBS) \
@@ -461,7 +449,7 @@
      $(SSSD_INTERNAL_LTLIBS) \
      $(SYSTEMD_DAEMON_LIBS) \
      libsss_test_common.la \
-@@ -3205,6 +3261,7 @@ sss_sifp_tests_LDADD = \
+@@ -3205,6 +3260,7 @@ sss_sifp_tests_LDADD = \
      $(TALLOC_LIBS) \
      $(DHASH_LIBS) \
      $(POPT_LIBS) \
@@ -469,7 +457,7 @@
      $(SSSD_INTERNAL_LTLIBS)
  endif # BUILD_LIBSIFP
  endif # BUILD_IFP
-@@ -3221,6 +3278,7 @@ test_sysdb_views_LDADD = \
+@@ -3221,6 +3277,7 @@ test_sysdb_views_LDADD = \
      $(LDB_LIBS) \
      $(POPT_LIBS) \
      $(TALLOC_LIBS) \
@@ -477,7 +465,7 @@
      $(SSSD_INTERNAL_LTLIBS) \
      libsss_test_common.la \
      $(NULL)
-@@ -3237,6 +3295,7 @@ test_sysdb_ts_cache_LDADD = \
+@@ -3237,6 +3294,7 @@ test_sysdb_ts_cache_LDADD = \
      $(LDB_LIBS) \
      $(POPT_LIBS) \
      $(TALLOC_LIBS) \
@@ -485,7 +473,7 @@
      $(SSSD_INTERNAL_LTLIBS) \
      libsss_test_common.la \
      $(NULL)
-@@ -3251,6 +3310,7 @@ test_sysdb_subdomains_LDADD = \
+@@ -3251,6 +3309,7 @@ test_sysdb_subdomains_LDADD = \
      $(CMOCKA_LIBS) \
      $(LDB_LIBS) \
      $(POPT_LIBS) \
@@ -493,7 +481,7 @@
      $(TALLOC_LIBS) \
      $(SSSD_INTERNAL_LTLIBS) \
      libsss_test_common.la \
-@@ -3267,6 +3327,8 @@ test_sysdb_certmap_LDADD = \
+@@ -3267,6 +3326,8 @@ test_sysdb_certmap_LDADD = \
      $(LDB_LIBS) \
      $(POPT_LIBS) \
      $(TALLOC_LIBS) \
@@ -502,7 +490,7 @@
      $(SSSD_INTERNAL_LTLIBS) \
      libsss_test_common.la \
      $(NULL)
-@@ -3282,6 +3344,7 @@ test_sysdb_sudo_LDADD = \
+@@ -3282,6 +3343,7 @@ test_sysdb_sudo_LDADD = \
      $(LDB_LIBS) \
      $(POPT_LIBS) \
      $(TALLOC_LIBS) \
@@ -510,7 +498,7 @@
      $(SSSD_INTERNAL_LTLIBS) \
      libsss_test_common.la \
      $(NULL)
-@@ -3297,6 +3360,7 @@ test_sysdb_utils_LDADD = \
+@@ -3297,6 +3359,7 @@ test_sysdb_utils_LDADD = \
      $(LDB_LIBS) \
      $(POPT_LIBS) \
      $(TALLOC_LIBS) \
@@ -518,7 +506,7 @@
      $(SSSD_INTERNAL_LTLIBS) \
      libsss_test_common.la \
      $(NULL)
-@@ -3328,6 +3392,7 @@ test_be_ptask_LDADD = \
+@@ -3328,6 +3391,7 @@ test_be_ptask_LDADD = \
      $(CMOCKA_LIBS) \
      $(POPT_LIBS) \
      $(TALLOC_LIBS) \
@@ -526,7 +514,7 @@
      $(SSSD_INTERNAL_LTLIBS) \
      libsss_test_common.la \
      $(NULL)
-@@ -3346,6 +3411,8 @@ test_copy_ccache_LDADD = \
+@@ -3346,6 +3410,8 @@ test_copy_ccache_LDADD = \
      $(POPT_LIBS) \
      $(TALLOC_LIBS) \
      $(KRB5_LIBS) \
@@ -535,7 +523,7 @@
      $(SSSD_INTERNAL_LTLIBS) \
      libsss_test_common.la \
      $(NULL)
-@@ -3400,6 +3467,7 @@ test_child_common_LDADD = \
+@@ -3400,6 +3466,7 @@ test_child_common_LDADD = \
      $(POPT_LIBS) \
      $(TALLOC_LIBS) \
      $(DHASH_LIBS) \
@@ -543,7 +531,7 @@
      libsss_debug.la \
      libsss_test_common.la \
      $(NULL)
-@@ -3419,6 +3487,7 @@ responder_cache_req_tests_LDADD = \
+@@ -3419,6 +3486,7 @@ responder_cache_req_tests_LDADD = \
      $(LIBADD_DL) \
      $(CMOCKA_LIBS) \
      $(SSSD_LIBS) \
@@ -551,7 +539,7 @@
      $(SSSD_INTERNAL_LTLIBS) \
      $(SYSTEMD_DAEMON_LIBS) \
      libsss_test_common.la \
-@@ -3441,6 +3510,7 @@ test_resolv_fake_LDADD = \
+@@ -3441,6 +3509,7 @@ test_resolv_fake_LDADD = \
  test_resolv_fake_LDADD = \
      $(CMOCKA_LIBS) \
      $(POPT_LIBS) \
@@ -559,7 +547,7 @@
      $(TALLOC_LIBS) \
      $(CARES_LIBS) \
      $(DHASH_LIBS) \
-@@ -3464,6 +3534,7 @@ test_fo_srv_LDADD = \
+@@ -3464,6 +3533,7 @@ test_fo_srv_LDADD = \
      $(TALLOC_LIBS) \
      $(CARES_LIBS) \
      $(DHASH_LIBS) \
@@ -567,7 +555,7 @@
      $(SSSD_INTERNAL_LTLIBS) \
      libsss_test_common.la \
      $(NULL)
-@@ -3485,6 +3556,7 @@ test_sdap_initgr_LDADD = \
+@@ -3485,6 +3555,7 @@ test_sdap_initgr_LDADD = \
      $(TEVENT_LIBS) \
      $(LDB_LIBS) \
      $(SSSD_INTERNAL_LTLIBS) \
@@ -575,7 +563,7 @@
      libsss_ldap_common.la \
      libsss_test_common.la \
      libdlopen_test_providers.la \
-@@ -3504,6 +3576,7 @@ test_ad_subdom_LDADD = \
+@@ -3504,6 +3575,7 @@ test_ad_subdom_LDADD = \
      $(POPT_LIBS) \
      $(TALLOC_LIBS) \
      $(SSSD_INTERNAL_LTLIBS) \
@@ -583,7 +571,7 @@
      libsss_ldap_common.la \
      libsss_ad_tests.la \
      libsss_idmap.la \
-@@ -3527,6 +3600,7 @@ test_ipa_subdom_util_LDADD = \
+@@ -3527,6 +3599,7 @@ test_ipa_subdom_util_LDADD = \
      $(TALLOC_LIBS) \
      $(LDB_LIBS) \
      $(SSSD_INTERNAL_LTLIBS) \
@@ -591,7 +579,7 @@
      libsss_test_common.la \
      $(NULL)
  
-@@ -3558,6 +3632,7 @@ test_ipa_subdom_server_LDADD = \
+@@ -3558,6 +3631,7 @@ test_ipa_subdom_server_LDADD = \
      $(KEYUTILS_LIBS) \
      $(KRB5_LIBS) \
      $(SSSD_INTERNAL_LTLIBS) \
@@ -599,7 +587,7 @@
      libsss_ldap_common.la \
      libsss_ad_tests.la \
      libsss_test_common.la \
-@@ -3579,6 +3654,7 @@ test_tools_colondb_LDADD = \
+@@ -3579,6 +3653,7 @@ test_tools_colondb_LDADD = \
      $(CMOCKA_LIBS) \
      $(SSSD_INTERNAL_LTLIBS) \
      $(POPT_LIBS) \
@@ -607,7 +595,7 @@
      libsss_test_common.la \
      $(NULL)
  
-@@ -3595,6 +3671,7 @@ test_krb5_wait_queue_LDADD = \
+@@ -3595,6 +3670,7 @@ test_krb5_wait_queue_LDADD = \
      $(POPT_LIBS) \
      $(DHASH_LIBS) \
      $(SSSD_INTERNAL_LTLIBS) \
@@ -615,7 +603,7 @@
      libsss_test_common.la \
      $(NULL)
  
-@@ -3615,6 +3692,7 @@ test_cert_utils_LDADD = \
+@@ -3615,6 +3691,7 @@ test_cert_utils_LDADD = \
      $(POPT_LIBS) \
      $(TALLOC_LIBS) \
      $(CRYPTO_LIBS) \
@@ -623,7 +611,7 @@
      libsss_debug.la \
      libsss_test_common.la \
      libsss_cert.la \
-@@ -3641,6 +3719,7 @@ test_data_provider_be_LDADD = \
+@@ -3641,6 +3718,7 @@ test_data_provider_be_LDADD = \
      $(SSSD_LIBS) \
      $(SSSD_INTERNAL_LTLIBS) \
      $(LIBADD_DL) \
@@ -631,7 +619,7 @@
      libsss_test_common.la \
      libdlopen_test_providers.la \
      libsss_iface.la \
-@@ -3670,6 +3749,7 @@ test_dp_request_LDADD = \
+@@ -3670,6 +3748,7 @@ test_dp_request_LDADD = \
      $(SSSD_LIBS) \
      $(SSSD_INTERNAL_LTLIBS) \
      $(LIBADD_DL) \
@@ -639,7 +627,7 @@
      libsss_test_common.la \
      $(NULL)
  if BUILD_SYSTEMTAP
-@@ -3696,6 +3776,7 @@ test_dp_builtin_LDADD = \
+@@ -3696,6 +3775,7 @@ test_dp_builtin_LDADD = \
      $(SSSD_LIBS) \
      $(SSSD_INTERNAL_LTLIBS) \
      $(LIBADD_DL) \
@@ -647,7 +635,7 @@
      libsss_test_common.la \
      $(NULL)
  
-@@ -3710,6 +3791,7 @@ test_ipa_dn_LDADD = \
+@@ -3710,6 +3790,7 @@ test_ipa_dn_LDADD = \
      $(TEVENT_LIBS) \
      $(TALLOC_LIBS) \
      $(SSSD_INTERNAL_LTLIBS) \
@@ -655,7 +643,7 @@
      libsss_test_common.la \
      $(NULL)
  
-@@ -3723,6 +3805,7 @@ test_iobuf_LDADD = \
+@@ -3723,6 +3804,7 @@ test_iobuf_LDADD = \
  test_iobuf_LDADD = \
      $(CMOCKA_LIBS) \
      $(SSSD_LIBS) \
@@ -663,7 +651,7 @@
      $(NULL)
  
  test_confdb_SOURCES = \
-@@ -3737,6 +3820,7 @@ test_confdb_LDADD = \
+@@ -3737,6 +3819,7 @@ test_confdb_LDADD = \
      $(POPT_LIBS) \
      $(TALLOC_LIBS) \
      $(SSSD_INTERNAL_LTLIBS) \
@@ -671,7 +659,7 @@
      libsss_test_common.la \
      $(NULL)
  
-@@ -3757,6 +3841,7 @@ simple_access_tests_LDADD = \
+@@ -3757,6 +3840,7 @@ simple_access_tests_LDADD = \
      $(CMOCKA_LIBS) \
      $(SSSD_LIBS) \
      $(SSSD_INTERNAL_LTLIBS) \
@@ -679,7 +667,7 @@
      libsss_test_common.la \
      libdlopen_test_providers.la \
      libsss_iface.la \
-@@ -3774,6 +3859,7 @@ krb5_common_test_LDADD = \
+@@ -3774,6 +3858,7 @@ krb5_common_test_LDADD = \
      $(CMOCKA_LIBS) \
      $(POPT_LIBS) \
      $(TALLOC_LIBS) \
@@ -687,7 +675,7 @@
      libsss_krb5_common.la \
      $(SSSD_INTERNAL_LTLIBS) \
      libsss_test_common.la \
-@@ -3794,6 +3880,7 @@ test_inotify_LDADD = \
+@@ -3794,6 +3879,7 @@ test_inotify_LDADD = \
      $(SSSD_LIBS) \
      $(SSSD_INTERNAL_LTLIBS) \
      $(LIBADD_DL) \
@@ -695,7 +683,7 @@
      libsss_test_common.la \
      $(NULL)
  
-@@ -3812,6 +3899,7 @@ sss_certmap_test_LDADD = \
+@@ -3812,6 +3898,7 @@ sss_certmap_test_LDADD = \
      $(TALLOC_LIBS) \
      $(SSS_CERT_LIBS) \
      $(SSSD_INTERNAL_LTLIBS) \
@@ -703,7 +691,7 @@
      libsss_test_common.la \
      libsss_certmap.la \
      $(NULL)
-@@ -3832,6 +3920,7 @@ test_sssd_krb5_locator_plugin_LDADD = \
+@@ -3832,6 +3919,7 @@ test_sssd_krb5_locator_plugin_LDADD = \
      $(POPT_LIBS) \
      $(TALLOC_LIBS) \
      $(KRB5_LIBS) \
@@ -711,7 +699,7 @@
      libsss_test_common.la \
      $(NULL)
  
-@@ -3883,6 +3972,7 @@ test_passkey_LDADD = \
+@@ -3883,6 +3971,7 @@ test_passkey_LDADD = \
  test_passkey_LDADD = \
      $(CMOCKA_LIBS) \
      $(SSSD_LIBS) \
@@ -719,7 +707,7 @@
      $(SSSD_INTERNAL_LTLIBS) \
      $(LIBADD_DL) \
      $(PASSKEY_LIBS) \
-@@ -3910,6 +4000,7 @@ test_kcm_marshalling_LDADD = \
+@@ -3910,6 +3999,7 @@ test_kcm_marshalling_LDADD = \
      $(CMOCKA_LIBS) \
      $(SSSD_LIBS) \
      $(SSSD_INTERNAL_LTLIBS) \
@@ -727,7 +715,7 @@
      libsss_test_common.la \
      $(NULL)
  
-@@ -3925,6 +4016,7 @@ test_kcm_queue_LDADD = \
+@@ -3925,6 +4015,7 @@ test_kcm_queue_LDADD = \
      $(LIBADD_DL) \
      $(CMOCKA_LIBS) \
      $(SSSD_LIBS) \
@@ -735,7 +723,7 @@
      $(SSSD_INTERNAL_LTLIBS) \
      libsss_test_common.la \
      libsss_iface.la \
-@@ -3942,6 +4034,7 @@ test_krb5_idp_plugin_LDADD = \
+@@ -3942,6 +4033,7 @@ test_krb5_idp_plugin_LDADD = \
  test_krb5_idp_plugin_LDADD = \
      $(CMOCKA_LIBS) \
      $(JANSSON_LIBS) \
@@ -743,7 +731,7 @@
      $(NULL)
  
  if BUILD_PASSKEY
-@@ -3956,6 +4049,7 @@ test_krb5_passkey_plugin_LDADD = \
+@@ -3956,6 +4048,7 @@ test_krb5_passkey_plugin_LDADD = \
  test_krb5_passkey_plugin_LDADD = \
      $(CMOCKA_LIBS) \
      $(JANSSON_LIBS) \
@@ -751,7 +739,7 @@
      $(NULL)
  endif # BUILD_PASSKEY
  
-@@ -3988,6 +4082,7 @@ test_kcm_renewals_LDADD = \
+@@ -3988,6 +4081,7 @@ test_kcm_renewals_LDADD = \
  	$(CMOCKA_LIBS) \
  	$(SSSD_LIBS) \
  	$(SSSD_INTERNAL_LTLIBS) \
@@ -759,7 +747,7 @@
  	libsss_test_common.la \
  	libsss_iface.la \
  	libsss_sbus.la \
-@@ -4029,6 +4124,7 @@ test_sssd_krb5_localauth_plugin_LDADD = \
+@@ -4029,6 +4123,7 @@ test_sssd_krb5_localauth_plugin_LDADD = \
  test_sssd_krb5_localauth_plugin_LDADD = \
      $(CMOCKA_LIBS) \
      $(KRB5_LIBS) \
@@ -767,7 +755,7 @@
      $(NULL)
  endif
  
-@@ -4085,6 +4181,7 @@ libnss_sss_la_SOURCES = \
+@@ -4085,6 +4180,7 @@ libnss_sss_la_SOURCES = \
  nsslib_LTLIBRARIES = libnss_sss.la
  libnss_sss_la_SOURCES = \
      src/sss_client/common.c \
@@ -775,15 +763,7 @@
      src/sss_client/nss_passwd.c \
      src/sss_client/nss_group.c \
      src/sss_client/nss_netgroup.c \
-@@ -4183,6 +4280,7 @@ libsss_sudo_la_LIBADD = \
-     src/sss_client/sudo/sss_sudo.h \
-     src/sss_client/sudo/sss_sudo_private.h
- libsss_sudo_la_LIBADD = \
-+    $(GSSAPI_KRB5_LIBS) \
-     $(CLIENT_LIBS)
- libsss_sudo_la_LDFLAGS = \
-     -Wl,--version-script,$(srcdir)/src/sss_client/sss_sudo.exports \
-@@ -4314,6 +4412,7 @@ libsss_ldap_common_la_LIBADD = \
+@@ -4314,6 +4411,7 @@ libsss_ldap_common_la_LIBADD = \
      $(OPENLDAP_LIBS) \
      $(DHASH_LIBS) \
      $(KRB5_LIBS) \
@@ -791,7 +771,7 @@
      libsss_krb5_common.la \
      libsss_idmap.la \
      libsss_certmap.la \
-@@ -4718,6 +4817,7 @@ ldap_child_LDADD = \
+@@ -4718,6 +4816,7 @@ ldap_child_LDADD = \
      $(KRB5_CFLAGS)
  ldap_child_LDADD = \
      libsss_debug.la \
@@ -799,7 +779,7 @@
      $(TALLOC_LIBS) \
      $(POPT_LIBS) \
      $(DHASH_LIBS) \
-@@ -4764,6 +4864,7 @@ gpo_child_LDADD = \
+@@ -4764,6 +4863,7 @@ gpo_child_LDADD = \
      $(SMBCLIENT_CFLAGS)
  gpo_child_LDADD = \
      libsss_debug.la \
@@ -807,7 +787,7 @@
      $(TALLOC_LIBS) \
      $(POPT_LIBS) \
      $(DHASH_LIBS) \
-@@ -4780,6 +4881,7 @@ proxy_child_LDADD = \
+@@ -4780,6 +4880,7 @@ proxy_child_LDADD = \
  proxy_child_LDADD = \
      $(PAM_LIBS) \
      $(SSSD_LIBS) \
@@ -815,7 +795,7 @@
      $(SSSD_INTERNAL_LTLIBS) \
      libsss_iface.la \
      libsss_sbus.la \
-@@ -4807,6 +4909,7 @@ p11_child_LDADD = \
+@@ -4807,6 +4908,7 @@ p11_child_LDADD = \
  
  p11_child_LDADD = \
      libsss_debug.la \
@@ -823,7 +803,7 @@
      $(TALLOC_LIBS) \
      $(DHASH_LIBS) \
      $(POPT_LIBS) \
-@@ -4834,6 +4937,7 @@ passkey_child_LDADD = \
+@@ -4834,6 +4936,7 @@ passkey_child_LDADD = \
  passkey_child_LDADD = \
      libsss_crypt.la \
      libsss_debug.la \
@@ -831,7 +811,7 @@
      $(TALLOC_LIBS) \
      $(DHASH_LIBS) \
      $(POPT_LIBS) \
-@@ -4862,6 +4966,7 @@ oidc_child_LDADD = \
+@@ -4862,6 +4965,7 @@ oidc_child_LDADD = \
      $(NULL)
  oidc_child_LDADD = \
      libsss_debug.la \
@@ -839,7 +819,7 @@
      $(TALLOC_LIBS) \
      $(POPT_LIBS) \
      $(JANSSON_LIBS) \
-@@ -4880,6 +4985,7 @@ memberof_la_LIBADD = \
+@@ -4880,6 +4984,7 @@ memberof_la_LIBADD = \
      $(NULL)
  memberof_la_LIBADD = \
      libsss_debug.la \
@@ -847,7 +827,7 @@
      $(TALLOC_LIBS) \
      $(LDB_LIBS) \
      $(DHASH_LIBS) \
-@@ -4943,6 +5049,7 @@ sssd_krb5_idp_plugin_la_LIBADD = \
+@@ -4943,6 +5048,7 @@ sssd_krb5_idp_plugin_la_LIBADD = \
      $(KRB5_LIBS) \
      $(KRAD_LIBS) \
      $(JANSSON_LIBS) \
diff --git a/security/sssd2/files/patch-configure.ac b/security/sssd2/files/patch-configure.ac
index e0f0edfceff9..d31c643970dd 100644
--- a/security/sssd2/files/patch-configure.ac
+++ b/security/sssd2/files/patch-configure.ac
@@ -9,43 +9,3 @@
  m4_include([src/build_macros.m4])
  BUILD_WITH_SHARED_BUILD_DIR
  
-@@ -67,7 +65,20 @@ AM_CONDITIONAL([HAVE_PTHREAD], [test x"$HAVE_PTHREAD" 
- LIBS=$SAVE_LIBS
- AM_CONDITIONAL([HAVE_PTHREAD], [test x"$HAVE_PTHREAD" != "x"])
- 
-+saved_CFLAGS="$CFLAGS"
-+CFLAGS="-Werror"
-+AC_COMPILE_IFELSE(
-+    [AC_LANG_PROGRAM([[#include <string.h>]],
-+        [[(void)mempcpy(NULL, NULL, 0);]])],
-+    [AC_DEFINE([HAVE_MEMPCPY], [1], [mempcpy() available])
-+     HAVE_MEMPCPY=1
-+    ],
-+    [AC_MSG_WARN([mempcpy() not found, will use private implementation])])
- 
-+CFLAGS="$saved_CFLAGS"
-+
-+AM_CONDITIONAL([HAVE_MEMPCPY], [test x"$HAVE_MEMPCPY" != "x"])
-+
- SAVE_LIBS=$LIBS
- LIBS=
- AC_LINK_IFELSE(
-@@ -223,7 +234,6 @@ m4_include([src/external/libkeyutils.m4])
- m4_include([src/external/crypto.m4])
- m4_include([src/external/nsupdate.m4])
- m4_include([src/external/libkeyutils.m4])
--m4_include([src/external/libkrad.m4])
- m4_include([src/external/libnl.m4])
- m4_include([src/external/systemd.m4])
- m4_include([src/external/pac_responder.m4])
-@@ -390,8 +400,8 @@ them please use argument --without-python3-bindings wh
-     AM_CHECK_PYTHON_HEADERS([],
-                             AC_MSG_ERROR([Could not find python3 headers]))
- 
--    AC_SUBST([py3execdir], [$pyexecdir])
--    AC_SUBST([python3dir], [$pythondir])
-+    AC_SUBST([py3execdir], [$(eval echo $pyexecdir)])
-+    AC_SUBST([python3dir], [$(eval echo $pythondir)])
-     AC_SUBST([PYTHON3_CFLAGS], [$PYTHON_CFLAGS])
-     AC_SUBST([PYTHON3_LIBS], [$PYTHON_LIBS])
-     AC_SUBST([PYTHON3_INCLUDES], [$PYTHON_INCLUDES])
diff --git a/security/sssd2/files/patch-src__external__krb5.m4 b/security/sssd2/files/patch-src__external__krb5.m4
deleted file mode 100644
index 691efaa0dc98..000000000000
--- a/security/sssd2/files/patch-src__external__krb5.m4
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/external/krb5.m4.orig	2023-05-05 08:11:07 UTC
-+++ src/external/krb5.m4
-@@ -1,5 +1,10 @@
-+KRB5_CFLAGS="-I/usr/local/include"
-+KRB5_LIBS="-L/usr/local/lib -lkrb5"
-+KRB5_CONFIG="/usr/local/bin/krb5-config"
-+
- AC_SUBST(KRB5_CFLAGS)
- AC_SUBST(KRB5_LIBS)
-+AC_SUBST(KRB5_CONFIG)
- 
- if test x$KRB5_LIBS != x; then
-     KRB5_PASSED_LIBS=$KRB5_LIBS
diff --git a/security/sssd2/files/patch-src__external__pac_responder.m4 b/security/sssd2/files/patch-src__external__pac_responder.m4
deleted file mode 100644
index a6403e3c512e..000000000000
--- a/security/sssd2/files/patch-src__external__pac_responder.m4
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/external/pac_responder.m4.orig	2023-05-05 08:11:07 UTC
-+++ src/external/pac_responder.m4
-@@ -7,7 +7,7 @@ then
- krb5_version_ok=no
- if test x$build_pac_responder = xyes
- then
--    AC_PATH_PROG(KRB5_CONFIG, krb5-config)
-+    AC_PATH_PROG(KRB5_CONFIG, /usr/local/bin/krb5-config)
-     AC_MSG_CHECKING(for supported MIT krb5 version)
-     KRB5_VERSION="`$KRB5_CONFIG --version`"
-     case $KRB5_VERSION in