From nobody Mon Aug 11 12:09:20 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 4c0tjD2RbKz63SQK; Mon, 11 Aug 2025 12:09:20 +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 4c0tjD1gkwz3Gk0; Mon, 11 Aug 2025 12:09:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754914160; 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=9BPpgWDCAhR3do3gFTBhgNtUWm7MBBW16+Y93Aw8Bkk=; b=I0DFN2tr9JtaEyE/QZwAUElTJRQtQySh5hhtAij6ujcHlGFTVC2qsOxCq990Ul0LBWdUgg fxsJ9MsxkleDAhn9xR4yTbyeLBDFgPMo6Vi9aGOQ5+1AZlqhzSO2ax+LQ/1FzStxSqgKtu uu3eCZb50DRf6m9ZmXrW5K3HVgREez73us0GC7UoW5ok0bss9hw5gEzFfSrOuRD82syz9u WnX00W+dHfuyb5B1jUKNi7eOFPqPOTVPAudEmxRRkyM/+slImznro53/6yjI7+FAuMUgwA EwWrcn3eSG9Qmd3vWR1wEwOgkQcbfAZp/1USCZ7jSEpOLML0hBN5sYqJgMUsOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754914160; 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=9BPpgWDCAhR3do3gFTBhgNtUWm7MBBW16+Y93Aw8Bkk=; b=filVivypAPBuvVc1syRR0QvpmdW6EopnCtxHAnsRVngiuilM8Ye0JRSsaE/ZFaqB//DkfZ UVgBHTyuLW5wFxQs02q4nDDdCrtHtw5v3HW6yDFxjJFyU9/NJ9aJEebn7TA84pn7338jA+ JGwHcxZIEWZzvLkO1ETyODa8aLmQ+jfzTsUtUZSIkz8vzboSjwg15QcSLVCOIZa/dIciB2 Z73Z0685UY6ef4Z9vowk2N3Z+xL6JWl9+h2s/+0LFAQeJcmZIORQey8JaRncZN8sS+etkP KCzhgtJbmmix7tUqKtWHINnnjofZIHevdo0bhjZkpbVttOofMWJAvufOo55kgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754914160; a=rsa-sha256; cv=none; b=IaOzvoWqSRNZwO+PSup20HzzSTH7Rw0hr69Eo0z5FrUmfOcDKr59Lfm6PHTqt9g7SVxlPq c0zKX2HJ4H8dCVfsratHs6N99HpLWGVXYMrQ/bDwp08lvcQDpdcPa/h9aYpzPfuUDYDPcz JOOCZ4emDT4w2s7QauI+I28GvdWL8rIpa5RjP7GoDIDCkgy+qlfLWQduVuemn64+6leshz wcuWRXq9j2pIbNPgpjOJFz37SNc3vtF1a7GJq7rIOJhsbstLUmrNN60i5hvk+SE7Le7mdH ZCe5OKsNnKe7zLTZjx7nhzvNK77fwl202MqyJpvttCSn/kWM6cbC1/NePTXMYw== 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 4c0tjD1Gm4zrc5; Mon, 11 Aug 2025 12:09:20 +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 57BC9KIG084045; Mon, 11 Aug 2025 12:09:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57BC9K0s084042; Mon, 11 Aug 2025 12:09:20 GMT (envelope-from git) Date: Mon, 11 Aug 2025 12:09:20 GMT Message-Id: <202508111209.57BC9K0s084042@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: 0c13e9c3c464 - main - krb5: Install pkgconfig data 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0c13e9c3c4647d16d3490ff1a6d7c33b39c28260 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=0c13e9c3c4647d16d3490ff1a6d7c33b39c28260 commit 0c13e9c3c4647d16d3490ff1a6d7c33b39c28260 Author: Lexi Winter AuthorDate: 2025-08-11 12:00:48 +0000 Commit: Lexi Winter CommitDate: 2025-08-11 12:08:49 +0000 krb5: Install pkgconfig data Users of MIT Kerberos expect the MIT pkgconfig files to be installed, and won't work without them. For example, this breaks anything that links against libcurl (ftp/curl) when curl is built with base GSSAPI. Reviewed by: ngie, des, cy Differential Revision: https://reviews.freebsd.org/D51842 --- krb5/Makefile | 2 +- krb5/Makefile.inc | 2 ++ krb5/libdata/Makefile | 44 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 1 deletion(-) diff --git a/krb5/Makefile b/krb5/Makefile index c49601990c4a..e9bbcae106c1 100644 --- a/krb5/Makefile +++ b/krb5/Makefile @@ -1,7 +1,7 @@ SUBDIR= util .WAIT \ include .WAIT \ lib .WAIT\ - plugins libexec usr.bin usr.sbin + plugins libdata libexec usr.bin usr.sbin # SUBDIR_PARALLEL= .include diff --git a/krb5/Makefile.inc b/krb5/Makefile.inc index 8529ee90a2e0..5d302962208c 100644 --- a/krb5/Makefile.inc +++ b/krb5/Makefile.inc @@ -9,6 +9,8 @@ .include +KRB5_VERSION= 1.22-final + # MIT KRB5 uses KRB5_DIR. Heimdal uses KRB5DIR. KRB5_SRCTOP= ${SRCTOP}/krb5 KRB5_DIR= ${SRCTOP}/crypto/krb5/src diff --git a/krb5/libdata/Makefile b/krb5/libdata/Makefile new file mode 100644 index 000000000000..c9a2e8e9259f --- /dev/null +++ b/krb5/libdata/Makefile @@ -0,0 +1,44 @@ +# Copyright (c) 2025 Lexi Winter. +# +# SPDX-License-Identifier: BSD-2-Clause OR ISC + +.include "../Makefile.inc" + +.PATH: ${KRB5_DIR}/build-tools + +PACKAGE=kerberos-lib + +PCFILES=gssrpc.pc \ + kadm-client.pc \ + kadm-server.pc \ + kdb.pc \ + krb5.pc \ + krb5-gssapi.pc \ + mit-krb5.pc \ + mit-krb5-gssapi.pc + +CLEANFILES+= ${PCFILES} + +.SUFFIXES: .pc .pc.in + +.pc.in.pc: + sed -e 's,@prefix@,/usr,g ; \ + s,@exec_prefix@,$${prefix},g ; \ + s,@libdir@,${LIBDIR},g ; \ + s,@includedir@,${INCLUDEDIR},g ; \ + s,@KRB5_VERSION@,${KRB5_VERSION},g ; \ + s,@KDB5_DB_LIB@,,g ; \ + s,@DEFCCNAME@,FILE:/tmp/krb5cc_%{uid},g ; \ + s,@DEFKTNAME@,FILE:/etc/krb5.keytab,g ; \ + s,@DEFCKTNAME@,FILE:/var/krb5/user/%{euid}/client.keytab,g ; \ + s,@COM_ERR_LIB@,-lcom_err,g ;' \ + ${.IMPSRC} > ${.TARGET} + +all: ${PCFILES} + @if ! grep -q "^PACKAGE_VERSION='${KRB5_VERSION}'$$" ${KRB5_DIR}/configure; then \ + echo "KRB5_VERSION ${KRB5_VERSION} does not match the source:"; \ + grep "^PACKAGE_VERSION=" ${KRB5_DIR}/configure; \ + exit 1; \ + fi >&2 + +.include