From nobody Sun Aug 10 15:37:14 2025 X-Original-To: dev-commits-src-all@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 4c0MMb1jYtz649r6; Sun, 10 Aug 2025 15:37:15 +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 4c0MMb0YTQz3dwK; Sun, 10 Aug 2025 15:37:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754840235; 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=RJfNO41h4jglQCXkxb2PRcwegTVwz0QrJsu/e83RPrc=; b=T4JdH9lL9DJAe1pJpWL9a2mssbnpnT0jMfDwKPtaVYNRgcMHPy66HRT6G1A0H8T1Q3WGAn Z2rBJIm3hOvZiOeRooFT/rj2fdDR2TinaI6YMNk5wBfP5LZPYpDsbDZEfRSHZQeK+W1IRG Nz69TIkAmxS/Ue1Fb3ibZncjtmVpOlWTC+mLNBEMb+SV2ijO/f8ghNEWb00RyOX8fo7b/d 0sSkXwOdn7CeZTjmYlHMl6voE0m3vn6T6cFVsYrUEwKt9AM2VxUN/2gmp7XnzSRNXHmvUf vr7Yuk0hTWh8OufPvkhYE6i//J7Le5iO6iA+epKNAVlK6PsOhWxPnTFgTZk00Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754840235; 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=RJfNO41h4jglQCXkxb2PRcwegTVwz0QrJsu/e83RPrc=; b=EqjZ2PzPGrygS+sDwrhuJVSbD4GBNFPxXvRoWEuVDzbOtno4e6bTt6siUpViZ2iDc2scSv 346RgU5S+wGUPy8MF+y91nxeyZQhFxRlY1A6QYtNgKbJwPmPHMKCA+ow46WT28xOXgy/dp F1nkC2JjuT3m5J9HpA80StvkOELFJaWJqJqKtqQVg5dPWv61fkr8G9v95s3jk181oXaRYp 5ACgZ8RbEMDySB6ecPSQShmztYlmg8QEbF0mPZj02hLU/pZRSzv53mqr5zbjzKDG2rkFM+ kQl77eCDsDCsKN6iDUuY6vNpiTJpeC87fyKyKGm2O0hY+CV7KOkQwG5z6fUS+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754840235; a=rsa-sha256; cv=none; b=NVV15xKGpq6TOvMDmo/k/XOnFS2LySpHT6/aJaX2Ms5XTmhK2aEUkZqFPeJH6LUVYWgcJT feeGXZ0j0zJ/FRaw7oYAQS9WvLckA5mgKTYZ+32HnHcQ4Vqzjaxwu+BwRVKdclNaCDquVe dfIKF6uMH1wlWNp4OJdOG5utsjDZ2tNtL7vOTJNtkzn5GUFrEW4LBBZTZhuZZjVkS74cCU xRDO+iV6Y1nI1wU9WZwLJlpoY5o7F3lYFuDjWJlD7G4F79/oonQAK6if006VWJu+NnVhcc 8qIkcMc9cPvCgqcWZTM6XPjq9TyF78FKB6/zYqUIUDDRCmIazm8QleFPvRppyQ== 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 4c0MMZ70dJz1Btc; Sun, 10 Aug 2025 15:37:14 +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 57AFbElf067148; Sun, 10 Aug 2025 15:37:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57AFbErj067146; Sun, 10 Aug 2025 15:37:14 GMT (envelope-from git) Date: Sun, 10 Aug 2025 15:37:14 GMT Message-Id: <202508101537.57AFbErj067146@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 10eecc467f32 - main - krb5: Don't install gssapi.h twice List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 10eecc467f3214d709283fff05ed2c81abe8408b Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=10eecc467f3214d709283fff05ed2c81abe8408b commit 10eecc467f3214d709283fff05ed2c81abe8408b Author: Lexi Winter AuthorDate: 2025-08-10 12:25:24 +0000 Commit: Lexi Winter CommitDate: 2025-08-10 15:36:39 +0000 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 --- krb5/include/gssapi/Makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/krb5/include/gssapi/Makefile b/krb5/include/gssapi/Makefile index b181187e9d95..997cbc06c389 100644 --- a/krb5/include/gssapi/Makefile +++ b/krb5/include/gssapi/Makefile @@ -10,14 +10,11 @@ .include "../Makefile.inc" .PATH: ${KRB5_DIR}/lib/gssapi/krb5 \ - ${KRB5_DIR}/lib/gssapi/generic \ - ${KRB5_DIR}/include + ${KRB5_DIR}/lib/gssapi/generic -INCSGROUPS= INCS GSSAPI_KRB5 INCSDIR= ${INCLUDEDIR}/gssapi -INCS= gssapi.h \ - gssapi_alloc.h \ +INCS= gssapi_alloc.h \ gssapi_ext.h \ gssapi_generic.h \ gssapi_krb5.h