From nobody Tue Jun 24 15:06:13 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 4bRSvT2glJz5yv3t; Tue, 24 Jun 2025 15:06:13 +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 4bRSvT1yqgz3S1X; Tue, 24 Jun 2025 15:06:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750777573; 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=47wNrZwBFx5qd1/K/jfXYzG0ZoN+pQgfgcloqSzbg4k=; b=pHexJxg2BxIjoX31BKSTWKH5sH6zXODAgv751eD+GthQOInddTO9d31F5yErkpfGt9/yo1 PirgNES97x5WPEjmwneah9joA4GrT9Fl5jXV7nZB7krLh3VUWgpyDsFRv7zFeIlAkEfeZ/ 6QPOQGAWzIdqhCYpH3DYfCFsk+lrImZvX4j8thcjDDrq+Wz5WSkY+9tBaGFRfrVeXCVhij OVGgFXNamFYPeOIOW11sPV71RM+mJivyurpn1fO9Cwy4nQBaZGNv/5j+G894xLGNPUYH2c jhoncoyd153y/Bnbd7s0NWMwO0AO2VTNlH77+s95+J/rNOE2Xz0TkIpeY6FEyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750777573; 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=47wNrZwBFx5qd1/K/jfXYzG0ZoN+pQgfgcloqSzbg4k=; b=JgysIpJg+6n+eqpy2HH8MQIXZwmiDzdcqTQIqyGGgtL5WnigbIgUkh05AyiqK9CjZj4QqO cmYkbObGKdsVGckILcVsX9xFAYLitwAQVU3Oph2PHSBzn90kH6GfaaQJLurw/dcg9/MHti vOYW2s8RBs7Zjjd7LsxoDcxUE9TjCr8hukazwy+CNGPbOolzqeVjN3oE+ONpIKDJaFFCLQ kIws2vvGgo/fbV4VD3n4sfwFmqBmA8DO0d2S37QQiV+wBwE5WRySpLgdlozfsdLjBlsnwP 04NmeQNI237nTKTReVKNPBVOa3wMu6t3bNHpvO3QbatfUhAc1lmYFis1I+H7Vg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750777573; a=rsa-sha256; cv=none; b=glQfruzfGCUMBVymBeKthUFxnLkIBqYcq1Emt+eqTh/FOP5alFdaDSNaKMvKrJ5zHQ2mvN N5vScl7Wp2pY0EQGFA7jFn5mStCsPWuyjX7IzxRoJGErmcyfFqX/6MJRvuso406kAzom+v UfN4+28lubNMGyVd7wNSMte0RyXdyF92oQfUtrOjwMY3oWfMZT5h4D3ksAltN2WugPZjAu 7lZVSqsTqEiEPlOvHEEmrYzbEDhF97ifkxGbvMaa2tCF5KKyimCyLy5lDfRORw2GsXrWz1 2mMSm9PVvLejyl1ybgFBLmNdXK2m9vXaan1c59BKpn+LytwnqB+NrOLIfKqlfQ== 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 4bRSvT1Lp5zsmk; Tue, 24 Jun 2025 15:06:13 +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 55OF6Dl5009980; Tue, 24 Jun 2025 15:06:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55OF6DSj009977; Tue, 24 Jun 2025 15:06:13 GMT (envelope-from git) Date: Tue, 24 Jun 2025 15:06:13 GMT Message-Id: <202506241506.55OF6DSj009977@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: cbb6e747af98 - main - krb5/include: com_err.h and verto.h installed by krb5/util 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: cbb6e747af982206e4646fc1b1685c4f3b29f378 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=cbb6e747af982206e4646fc1b1685c4f3b29f378 commit cbb6e747af982206e4646fc1b1685c4f3b29f378 Author: Cy Schubert AuthorDate: 2025-06-24 14:47:52 +0000 Commit: Cy Schubert CommitDate: 2025-06-24 15:06:00 +0000 krb5/include: com_err.h and verto.h installed by krb5/util krb5/util/et and krb5/util/verto install com_err.h and verto.h respectively. Do not install them again. This causes pkgbase conflicts. Reported by: fluffy Fixes: ee3960cba106 --- krb5/include/Makefile | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/krb5/include/Makefile b/krb5/include/Makefile index fb919434bf93..0a2ceaebb689 100644 --- a/krb5/include/Makefile +++ b/krb5/include/Makefile @@ -17,7 +17,7 @@ SUBDIR= krb5_private krb5 gssrpc gssapi SUBDIR_PARALLEL= -INCSGROUPS= INCS COM_ERR VERTO GSSAPI_KRB5 +INCSGROUPS= INCS GSSAPI_KRB5 INCSDIR= ${INCLUDEDIR} @@ -47,25 +47,11 @@ SDESTDIR?= ${SYSROOT:U${DESTDIR}} .PHONY: force rebuild-error-tables osconf.h -.PATH: ${KRB5_DIR}/util/et -COM_ERRDIR= ${INCLUDEDIR} -COM_ERR= com_err.h - -.PATH: ${KRB5_DIR}/util/verto -VERTODIR= ${INCLUDEDIR} -VERTO= verto-module.h \ - verto.h - .PATH: ${KRB5_DIR}/include/krb5 copies: .PHONY .META cd ${KRB5_DIR}/include; \ ${INSTALL} -C ${TAG_ARGS:D${TAG_ARGS},dev} -o ${BINOWN} -g ${BINGRP} -m444 ${INCS} ${SDESTDIR}${INCLUDEDIR} - cd ${KRB5_DIR}/util/et; \ - ${INSTALL} -C ${TAG_ARGS:D${TAG_ARGS},dev} -o ${BINOWN} -g ${BINGRP} -m444 ${COM_ERR} ${SDESTDIR}${INCLUDEDIR} - cd ${KRB5_DIR}/util/verto; \ - ${INSTALL} -C ${TAG_ARGS:D${TAG_ARGS},dev} -o ${BINOWN} -g ${BINGRP} -m444 ${VERTO} ${SDESTDIR}${INCLUDEDIR} - .include