5105e1eb | 19-Aug-2025 |
Mark Johnston <markj@FreeBSD.org> |
krb5: Fix the installed compile_et
We now build compile_et from krb5/util/compile_et. The compile_et make target runs compile_et.sh through a preprocessor that does some substitution on the script,
krb5: Fix the installed compile_et
We now build compile_et from krb5/util/compile_et. The compile_et make target runs compile_et.sh through a preprocessor that does some substitution on the script, in particular it defines the directory where compile_et can find et_h.awk and et_c.awk.
We build compile_et as a bootstrap tool since it's used to build krb5. It also gets installed by installworld, presumably because we did that with Heimdal Kerberos too and there's some chance that third-party projects are using it.
There are two problems, both fixed by this patch:
First, we don't actually install those awk scripts anywhere, so /usr/sbin/compile_et isn't usable on an installed system. Let's simply install them to /usr/share/et, which is where upstream puts them.
Second, compile_et is a bootstrap tool and gets installed into WORLDTMP during the bootstrap phase of the build. At that point we preprocess it to set the directory where it can find those awk scripts. That directory is currently set with `KRB5_ETDIR?= ${DESTDIR}/usr/share/et`, but DESTDIR points into the object directory, so this value is bogus.
Since all build-time invocations of compile_et explicitly specify the script directory with the -d option, let's just update the path to point to the installed script directory. In particular, avoid fixing DESTDIR in the script, since we don't do that generally.
PR: 288929 Reviewed by: ivy, cy Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D52004
show more ...
|
10eecc46 | 10-Aug-2025 |
Lexi Winter <ivy@FreeBSD.org> |
krb5: Don't install gssapi.h twice
Currently we install /usr/include/gssapi/gssapi.h twice, once in krb5/include/gssapi and once in krb5/lib/gssapi.
The version in krb5/include/gssapi is wrong: mak
krb5: Don't install gssapi.h twice
Currently we install /usr/include/gssapi/gssapi.h twice, once in krb5/include/gssapi and once in krb5/lib/gssapi.
The version in krb5/include/gssapi is wrong: make searches ${.PATH} and picks crypto/krb5/src/include/gssapi.h to install, but this is the file which is supposed to be installed in /usr/include/gssapi.h.
The problem was masked by the fact that we install the correct gssapi/gssapi.h later in krb5/lib/gssapi.
Remove gssapi.h and the unneeded ${.PATH} entry from krb/include/gssapi and while here, remove the unused GSSAPI_KRB5 include group.
This change does not affect the ultimate result of installworld, it just avoids installing the same file twice with different content.
PR: 288594 Reviewed by: brooks, des Differential Revision: https://reviews.freebsd.org/D51840
show more ...
|
e26259f4 | 31-Jul-2025 |
Cy Schubert <cy@FreeBSD.org> |
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
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
show more ...
|
c791ea80 | 04-Aug-2025 |
Brooks Davis <brooks@FreeBSD.org> |
kadm5srv: get common headers from kadm5clnt
Both were installing admin.h, chpass_util_strings.h, and kadm_err.h. kadm5clnt is ordered first in krb5/lib/Makefile so pick it.
PR: 288594 Pull Request
kadm5srv: get common headers from kadm5clnt
Both were installing admin.h, chpass_util_strings.h, and kadm_err.h. kadm5clnt is ordered first in krb5/lib/Makefile so pick it.
PR: 288594 Pull Request: https://github.com/freebsd/freebsd-src/pull/1801
show more ...
|
40a5abfc | 04-Aug-2025 |
Brooks Davis <brooks@FreeBSD.org> |
krb5/include/Makefile: don't override *include targets
This was causing kdb.h, krad.h, and krb5.h to be installed twice.
PR: 288594 Pull Request: https://github.com/freebsd/freebsd-src/pull/1801 |