The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=2b43d77af340fd2675d4c9e6a2dfc3c7361d1860
commit 2b43d77af340fd2675d4c9e6a2dfc3c7361d1860 Author: Cy Schubert <c...@freebsd.org> AuthorDate: 2025-06-26 14:32:22 +0000 Commit: Cy Schubert <c...@freebsd.org> CommitDate: 2025-06-26 14:35:40 +0000 OptionalObsoleteFiles: Keep Heimdal files when switching back When switching back to Heimdal keep Heimdal's .a files. Fixes: af2593e3212c --- tools/build/mk/OptionalObsoleteFiles.inc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 24db68e5f288..14488a63b7da 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -5775,9 +5775,7 @@ OLD_FILES+=usr/lib/krb5/plugins/preauth/pkinit.so OLD_FILES+=usr/lib/krb5/plugins/preauth/spake.so OLD_FILES+=usr/lib/krb5/plugins/preauth/test.so OLD_FILES+=usr/lib/krb5/plugins/tls/k5tls.so -OLD_FILES+=usr/lib/libcom_err.a OLD_LIBS+=usr/lib/libcom_err.so.121 -OLD_FILES+=usr/lib/libgssapi_krb5.a OLD_LIBS+=usr/lib/libgssapi_krb5.so.121 OLD_FILES+=usr/lib/libgssrpc.a OLD_FILES+=usr/lib/libgssrpc.so @@ -5788,7 +5786,6 @@ OLD_LIBS+=usr/lib/libk5crypto.so.121 OLD_FILES+=usr/lib/libkadm5clnt_mit.a OLD_FILES+=usr/lib/libkadm5clnt_mit.so OLD_LIBS+=usr/lib/libkadm5clnt_mit.so.121 -OLD_FILES+=usr/lib/libkadm5srv.a OLD_FILES+=usr/lib/libkadm5srv.so OLD_FILES+=usr/lib/libkadm5srv_mit.a OLD_FILES+=usr/lib/libkadm5srv_mit.so @@ -5799,7 +5796,6 @@ OLD_LIBS+=usr/lib/libkdb5.so.121 OLD_FILES+=usr/lib/libkrad.so OLD_FILES+=usr/lib/libkrad.a OLD_LIBS+=usr/lib/libkrad.so.121 -OLD_FILES+=usr/lib/libkrb5.a OLD_LIBS+=usr/lib/libkrb5.so.121 OLD_FILES+=usr/lib/libkrb5profile.a OLD_FILES+=usr/lib/libkrb5profile.so