From nobody Thu Jun 26 14:35:57 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bSh7d4kLCz60cvX; Thu, 26 Jun 2025 14:35:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bSh7d4DhLz44Zx; Thu, 26 Jun 2025 14:35:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750948557; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YXo0g1zQ8yGd5gn5sG+uh3tjplSYa/8S9dKoLoVY1Uk=; b=b9ffDUGbb/BNSnINzWQXrSM/c0uxPI76Gx8Jy3nId7tTyJMIy5cPRybOnXdw3jmMS2xxI/ hO2VRLRbFzafGcMFNm+vj2RdC70i8kS+FcvUwwP7arZQSaB2Ugnkbornrazaq31DyipjeN IlnV+zfxDajoRFqvCyFwJqdLCp0DKoI36cif1RbFZJrwsLINTANbCRzSgQIv/4BqBE2Ind ACWCxPoPNQF3kDpiDChh8lN8umfucCkDMJp/LNcWmdKLQeavB5RxrroYlWKhjL2JzWPSV4 ccfHAxPE15dQ04DM74wzD8WkhTzdRyUUYY2wL1pvkUv5W8E8HMcpZRNt/JEESQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750948557; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YXo0g1zQ8yGd5gn5sG+uh3tjplSYa/8S9dKoLoVY1Uk=; b=ojVsG/dcWqdch/0XEVZz0QkbjW29Ce2wffBvFopmB0fmAEc9OWHNwvGGu4/p/jhoV5ww0k tAeSwaBW2/8clc/PRS7UXZtqgTqnQ5afn+JEezY9tuPZOCU1eYOS1BqUHFmJx3bUEoRE1z lImNVuqeLy+EQW4oCoyHWF1czByC3KvRppsnLOUcwB6WWgP6P4CfS6YdQEkB/odd6hMirk HeON9YEpdVx2zr351z1LGrK2dZ8XQRJoHb/k4Kv7nmqGMRl3wNFYxjHrXcEbWkVm4VsooB hRr8yeenxRbeK+KCfcra/wxhSKVDGwOP1WQac9KvU1P5y1U4VJhaGwEJDZ+EOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750948557; a=rsa-sha256; cv=none; b=QuF90gtLLJ8naSIGK0vrsRtQFylqMPJtgBlwbyuoEaNalRl/LS/2bcfRrxSfEGRXDBMLgs 7492Y8PDhfPizQNQuJhM7rdT9jT2OR5BhN0h6cORkGHAXSRdbUeGIzQSW3+Z0Sz+rm8cES WwEoXHqnau9Unsp1ixQG9/B5xByJQfLxvmC1+pXopMjg/4WtgaOszU2C3S+ZqSWxSYFNgw gst85txmiiRwMakwNi6BhYT6s3TXQyxgnJ5+jDZq/7lM0kK8/LSsmiLumUC0pNWP2ehlp9 X4mr7Y40bmiiRY/fGqPosurwPqsLgf7BMFyZNWmjyK14A/uHnL4fR2ygw+0zKg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bSh7d3qJkz16PN; Thu, 26 Jun 2025 14:35:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55QEZvnB079456; Thu, 26 Jun 2025 14:35:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55QEZvDN079453; Thu, 26 Jun 2025 14:35:57 GMT (envelope-from git) Date: Thu, 26 Jun 2025 14:35:57 GMT Message-Id: <202506261435.55QEZvDN079453@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 2b43d77af340 - main - OptionalObsoleteFiles: Keep Heimdal files when switching back List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b43d77af340fd2675d4c9e6a2dfc3c7361d1860 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=2b43d77af340fd2675d4c9e6a2dfc3c7361d1860 commit 2b43d77af340fd2675d4c9e6a2dfc3c7361d1860 Author: Cy Schubert AuthorDate: 2025-06-26 14:32:22 +0000 Commit: Cy Schubert 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