From nobody Thu Nov 17 04:27:47 2022 X-Original-To: dev-commits-ports-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 4NCRjJ1S1Mz4d8xr; Thu, 17 Nov 2022 04:27:48 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NCRjJ10J4z3kxf; Thu, 17 Nov 2022 04:27:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668659268; 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=/rp/Wa6T/LJMsB84q/gUrynbgHUr3SIZGTjjdCUcN3s=; b=Lc4NU3ary2buTJVzFr6DvRuxxbLd4aVAj4RXYpEWUemVq4vYP7ZO3z37xB6FpPDqwGFrlA spuw4SOVNhZ1z0QiSweBVyrH3YnD/VAvljb6HpAT505E5pii1kQfMUDQLKRvsAdBNMbtXL En2YnXaz7/ytAk3Jnu47mbYQMnbJwmpcDtcv0oVVRkRyiTEmJH2SM9EeSs2v3Ivr1SsWNp PzawRnqcqpLKLrvOXlF+a37CRm78TrVsjGnrJOKEuUBpZ+FLYM0OgeLSJHb7VTm/PQpERk hbyJfgaKBhbB01mD7FBGvlwOV+p0s94FlGG5hu3LVfcLdbMdyXcOp8+4LQppOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668659268; 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=/rp/Wa6T/LJMsB84q/gUrynbgHUr3SIZGTjjdCUcN3s=; b=oVJ4wqgCA2rWIKcWrvqnIvZjdUVshwCf1IUlhDo6Mq9gy3PEAkl0fn88zK7Reg/k4BP16A vwGf9DVVqMVDCKzaiMRrLHyD4egzp4LxxxbO/gZbSWco2FxmtnLnWmM3w5+ooWNa0GUnQv /ggknLtvrcqz1rK0P+1jId21lrZYNT52twmTaGNrYpOEtOlmw2o/TxAMgszqTkqQMZHs0i JTxT5vkQbQ0cQakpmT2Ik/R2s8xtL72Y9J4+CYqjv8jUcv1aNnWwjSACV10yjRwcJaDCkK 8GK+VniAWyRsyjZeInV4Tg1YYknFyoejkIGoUOXbod3aET2MuP2Ysx5iHObkvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668659268; a=rsa-sha256; cv=none; b=nYVUqz1lKPNTojyjLS9GzcJYO8dGIdPiaqhNoms7H4Vw8uS1ke3EwRj4KfhBqmKgS0c8e/ zXsw4i7OKTVkbo6ZzgN/YdUxA/SSFPB5S9IJ8rH+sFL2QVSjEa907/l+Hb24duGjyb4ilu 9mgz96rn/xLxFkHQ6F5h9wO6AfzfuudifYGJNXrbJnEyEvCRj0wtLoFzRYcnAyMsj1yJ98 P5tGC8/ku76zAcY/nx7EShE11GEhs9pB7SHmPqFjepbf4YlViMy5nCt1HrWTBG/sjq1uMh WXI1IRBcYO1uANAYLfjiqMyo+SUJjlIcFI3N3WrTyh39dJAAdfwonZOsi7/HeA== 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 4NCRjH6x0hzSr4; Thu, 17 Nov 2022 04:27:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AH4RlEs090036; Thu, 17 Nov 2022 04:27:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AH4Rl8b090035; Thu, 17 Nov 2022 04:27:47 GMT (envelope-from git) Date: Thu, 17 Nov 2022 04:27:47 GMT Message-Id: <202211170427.2AH4Rl8b090035@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Cy Schubert Subject: git: 9d4980893f8e - 2022Q4 - security/heimdal: Fix build List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q4 X-Git-Reftype: branch X-Git-Commit: 9d4980893f8e09acd8e8d828ac5d0db21493f6a8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q4 has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=9d4980893f8e09acd8e8d828ac5d0db21493f6a8 commit 9d4980893f8e09acd8e8d828ac5d0db21493f6a8 Author: Cy Schubert AuthorDate: 2022-11-17 01:34:53 +0000 Commit: Cy Schubert CommitDate: 2022-11-17 04:27:36 +0000 security/heimdal: Fix build Three problems were discovered when building under poudriere or in a clean jail. 1. Python is now a prerequisite. 2. liblockfile is now needed. 3. clang-format is needed for asn1_compile. Unfortunately the base llvm does not install clang-format so we need install $LLVM_DEFAULT to get this file. PR: 267814 Reported by: many Fixes: 83f79ba0e0ca (cherry picked from commit a5523d807d01b1ed31614f346db2b348d7046420) --- security/heimdal/Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile index f4d38c3ec0d4..14956859a0b2 100644 --- a/security/heimdal/Makefile +++ b/security/heimdal/Makefile @@ -13,10 +13,16 @@ LICENSE_FILE= ${WRKSRC}/LICENSE CONFLICTS= krb5 krb5-* USES= cpe gettext-runtime gssapi:bootstrap,heimdal libtool pathfix \ - pkgconfig readline makeinfo ssl + pkgconfig python readline makeinfo ssl CPE_VENDOR= ${PORTNAME}_project USE_LDCONFIG= ${GSSAPILIBDIR} +# Needs clang-format which is only provided by the port. +# Else asm1_fails resulting in a command not found error. +BUILD_DEPENDS= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} + +LIB_DEPENDS= liblockfile.so:devel/liblockfile + GNU_CONFIGURE= yes CONFIGURE_ENV= ac_cv_header_fnmatch_h=yes \ ac_cv_header_db_h=no \ @@ -39,7 +45,8 @@ CONFIGURE_ARGS= --with-berkeley-db \ --enable-pthread-support \ --with-readline="${LOCALBASE}" \ --with-hdbdir="/var/${PORTNAME}" \ - --sysconfdir="${PREFIX}/etc" + --sysconfdir="${PREFIX}/etc" \ + CLANG_FORMAT="${LOCALBASE}/bin/clang-format${LLVM_DEFAULT}" # XXX --with-readline picks up libreadline even if found in /usr/lib. MAKE_ENV= INSTALL_CATPAGES=no INSTALL_TARGET= install-strip