From nobody Sun Sep 18 12:08:43 2022 X-Original-To: dev-commits-ports-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 4MVmmr0HPKz4cBhh; Sun, 18 Sep 2022 12:08:44 +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 4MVmmq5nPfz473g; Sun, 18 Sep 2022 12:08:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663502923; 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=FknrRr6CJrivRk6T2J2u6yeJ1RztOGYZace85YXOjBA=; b=b5zVbaNO6mIufB/tQErOrIcrHdN8h+CowlOfF2wvG0cqVTpqU+m1W/0FyVBoVjaxdUbRL6 00Ku/eucoAi/fcoKPnJnXSBC2xwZjmbS89y0LP97QIOD4Um7OqieRcnC/raIhARfTPZI4v ha5aS4p29TvaNTEWFbwkTtkgaPknMaIo5W4+M3MYcuYxy6ai+nlSF+IL66pOxp/Oy2HpE0 GoLKndhL/GDaQ7upxKUDXUFHz0WL+o+P/x9PXWoH2J5z8ZlCnVBHiG7cVUC5NSp5W9m3f4 Rxf9rWFMNo+D6q5LxdrNxtNnwKaAaINxduAPvJ41BBLuUjiZ3tqodCQ1eHGvdQ== 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 4MVmmq4sFmz12XR; Sun, 18 Sep 2022 12:08:43 +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 28IC8hoE092462; Sun, 18 Sep 2022 12:08:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28IC8h3Z092461; Sun, 18 Sep 2022 12:08:43 GMT (envelope-from git) Date: Sun, 18 Sep 2022 12:08:43 GMT Message-Id: <202209181208.28IC8h3Z092461@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: 11605adf4600 - main - security/putty: Pick right Kerberos version List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 11605adf4600c1f01617bd98f38a1b30a1ac99fc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663502923; 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=FknrRr6CJrivRk6T2J2u6yeJ1RztOGYZace85YXOjBA=; b=rMrK+L9vuP3sRF1jbfGykFLU7twdKVovHlxWy3uuHQXtrV/kdQ90FZh7GuhZ2EiDxy9hJ0 l0rx4vFXSbB9s6+mKp30ZVjW6Gu1XjBFeoWaxhAM6vrie5ksJPX0mKBQte44KWtC4csstC 75EwN3CANQruw1Gs7gh9qXje1Mhsc8zz/UQm16TFcrLS0ngYld+M+Q/oMdtRLlbVYJRoAW 7Oj+/YJQXyrFNv7s5SdhnkJLEp+f0L2alERmzEeHIJlpgn5t0cMQ4eNiMtkjyTsxqynqol m4vORdvft3ifyp96niRmtgFh53G12TUXGjJXSFiNmwqR17La9J7+O0uPyZOQ+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663502923; a=rsa-sha256; cv=none; b=piBFYsReiYnHKyU6gupCQUwUoo3gVr86b43LzZnPCve7lxLLClxp90pSzGWhoBkZDFSjgV Nn9zrdFzd+LpHEq6BoypDjHn6gggOwBUJj32aTzsrI62Vm+Wokd/9s6Zp/f0JCA9nM8lFZ LQUGUcz7Fg3svTPK+Sv3muRzzU+rjNwUUMiPsEMtSwE8MEbzKkKo08D5vOmNIpOu51BCCG pHj3Tw4Z5N672C15Xqi/OC1djkuzL5iFs/kidWhLzQFi+R6WPbTL6djGWbeIDR8pRZOZmw ySfjrc0MDa41HE8ME5UDKv/1NHyU9O0kDkNjIiRdbEnnrxMpS1dGtibqRiU94w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=11605adf4600c1f01617bd98f38a1b30a1ac99fc commit 11605adf4600c1f01617bd98f38a1b30a1ac99fc Author: Matthias Andree AuthorDate: 2022-09-18 12:06:57 +0000 Commit: Matthias Andree CommitDate: 2022-09-18 12:08:42 +0000 security/putty: Pick right Kerberos version Make sure that putty only compiles and links against the configured static GSSAPI version, especially against base even if krb5 or heimdal are installed. To that end, hand down the right krb5-config executable, and punch out pkg-config from the shipped unix.cmake. --- security/putty/Makefile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/security/putty/Makefile b/security/putty/Makefile index d6c0e6b3cd44..5824fb9cb04f 100644 --- a/security/putty/Makefile +++ b/security/putty/Makefile @@ -1,6 +1,6 @@ PORTNAME= putty DISTVERSION= 0.78~pre20220916.e1b73f0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security #MASTER_SITES= http://the.earth.li/~sgtatham/putty/${PORTVERSION}/ \ # ftp://ftp.chiark.greenend.org.uk/users/sgtatham/putty-latest/ @@ -84,13 +84,13 @@ CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_X11:BOOL=TRUE .if ${PORT_OPTIONS:MGSSAPI_BASE} # Heimdal-like in base system USES+= gssapi:base,flags -CMAKE_ARGS+= -DPUTTY_GSSAPI:STRING=STATIC +CMAKE_ARGS+= -DPUTTY_GSSAPI:STRING=STATIC -DKRB5_CONFIG:PATH=${KRB5CONFIG} .elif ${PORT_OPTIONS:MGSSAPI_HEIMDAL} USES+= gssapi:heimdal,flags -CMAKE_ARGS+= -DPUTTY_GSSAPI:STRING=STATIC +CMAKE_ARGS+= -DPUTTY_GSSAPI:STRING=STATIC -DKRB5_CONFIG:PATH=${KRB5CONFIG} .elif ${PORT_OPTIONS:MGSSAPI_MIT} USES+= gssapi:mit,flags -CMAKE_ARGS+= -DPUTTY_GSSAPI:STRING=STATIC +CMAKE_ARGS+= -DPUTTY_GSSAPI:STRING=STATIC -DKRB5_CONFIG:PATH=${KRB5CONFIG} .elif ${PORT_OPTIONS:MGSSAPI_DYNAMIC} BROKEN= GSSAPI_DYNAMIC does not work as of putty 0.78~pre20220916.e1b73f0 CMAKE_ARGS+= -DPUTTY_GSSAPI:STRING=DYNAMIC @@ -106,6 +106,10 @@ post-patch: ${REINPLACE_CMD} '/FindGit/d' \ ${WRKSRC}/cmake/setup.cmake \ ${WRKSRC}/doc/CMakeLists.txt + # nuke pkg-config detection of GSSAPI/Kerberos libs, + # it interferes with FreeBSD's krb5-config approach + ${REINPLACE_CMD} '/pkg_check_modules(KRB5 krb5-gssapi)/d' \ + ${WRKSRC}/cmake/platforms/unix.cmake post-install: .if ${PORT_OPTIONS:MGTK3}