summaryrefslogtreecommitdiff
path: root/Makefile.inc1
diff options
context:
space:
mode:
authorCy Schubert <cy@FreeBSD.org>2025-07-31 09:51:20 -0700
committerCy Schubert <cy@FreeBSD.org>2025-08-07 10:17:00 -0700
commite26259f48afe98022d885f02fbb8abcd7878e41a (patch)
treea869efae69246fd58c6b3322fc909fdc9061715f /Makefile.inc1
parenta245dc5d68c74bca8d00cd50e21e9544af6b21c9 (diff)
gssapi,krb5: Replace libgssapi with the MIT version
lib/libgssapi is based on Heimdal. As on Linux systems, the MIT libgssapi_krb5 replaces it. With both gssapi libraries and header files installed results in broken buildworld (gssd) and ports that will not build without modifications to support the MIT gssapi in an alternate location. 73ed0c7992fd removed the MIT GSSAPI headers from /usr/include. Apps using MIT KRB5 gssapi functions and structures will fail to build without this patch. This patch includes a temporary patch to usr.sbin/gssd to allow it to build with this patch. rmacklem@ has a patch for this and for kgssapi that uses this patch to resolve kgssapi issues for NFS with Kerberos. This patch is an updated version of D51661 to allow it to build following additional patchs to the tree. This should have been implmented with 7e35117eb07f. Fixes: 7e35117eb07f, 73ed0c7992fd Differential Revision: https://reviews.freebsd.org/D51661
Diffstat (limited to 'Makefile.inc1')
-rw-r--r--Makefile.inc16
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index e6c9b49eefa3..9128d1d8ee77 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -3379,8 +3379,8 @@ secure/lib/libssh__L: lib/libldns__L
.if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no"
.if ${MK_MITKRB5} != "no"
-secure/lib/libssh__L: lib/libgssapi__L krb5/lib/krb5__L \
- krb5/util/et__L lib/libmd__L krb5/util/support__L
+secure/lib/libssh__L: krb5/lib/gssapi__L krb5/lib/krb5__L \
+ krb5/lib/crypto__L krb5/util/et__L lib/libmd__L krb5/util/support__L
.else
secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \
kerberos5/lib/libhx509__L kerberos5/lib/libasn1__L lib/libcom_err__L \
@@ -3437,8 +3437,10 @@ kerberos5/lib/libheimipcc__L: kerberos5/lib/libroken__L kerberos5/lib/libheimbas
lib/libsqlite3__L: lib/libthr__L
.if ${MK_GSSAPI} != "no"
+.if ${MK_MITKRB5} == "no"
_lib_libgssapi= lib/libgssapi
.endif
+.endif
.if ${MK_KERBEROS} != "no"
.if ${MK_MITKRB5} != "no"