From nobody Tue Dec 06 22:02:20 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 4NRZCJ5JHZz4k3DR; Tue, 6 Dec 2022 22:02: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NRZCJ4svfz3HLP; Tue, 6 Dec 2022 22:02:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670364140; 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=Cr+yWKupw7PfZKgd+AmZ04IGwRbeAb755S2YojNhBd4=; b=YwzgKN4svG+1/gpkXwaZ9Pic1QJ7kURjdJSOrgDcQSB1+b/Qvr2exXOPszH60/xulyYLOf l1U8lTwdaT2bSqSfrQkCWbQPuFbR3c8Yo3oF3YQxPTgLB7IkqCVLQ4L01L1w/GcqeR20ai DU6JzL3lTruXEEH42qZ3WOhfYdGiHNlfh+VdpP/WLuwwY/jRpg1f3gdt9gkjMvcXwbpLNm Y1mGbTU2NVBm+2s4EDxw4xUZzeWWkjzkta4koGkXeRRIud/DIFYQo1pulBq4GvSgCgCxrB jGOGRUOsydlkUs2TIj+wx0tvOHQQobCXlLFc7ZsgE6c3+ZNNlC9A7jQ+3taf6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670364140; 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=Cr+yWKupw7PfZKgd+AmZ04IGwRbeAb755S2YojNhBd4=; b=aYkemfrkcR4UWqiMt7r7YnnfHnb4MDK99XNSsMkjsfvuT1dw4VDzmZrcGzAtLypeOzn3Jf M0RJs+YSx9TFWohooSKuAAxJEHa5tqGDHFGjowSqXlObhA3UHQ7qsYBe9qUqyYryXMPTKN IXf4E67QIWFF86ra9V3IPFas9UDIJSAYgcCAgEHeyl1DehkNdXuO1vDh0BaUfCwbqV5KJF u65u79QieKX1YOE4TA+CS9eUOvZpz9EtlyFbi7hzYM3r0G77YcBwPA+S//YvPeFkwCZEIb oiZAjin6QqRi4/lyZDBJEl80fHFYxXoFvFAc0zY3UVPa7PLV4UsmtV75Lhtf/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670364140; a=rsa-sha256; cv=none; b=ckDt7jdYWNQgKRGxsXsJdBc/zaC/MnDpbf2rKVkQsxWHit8cOUaO0PokUKPEYVATWVNppn 0pwLMViD3a4i581C7Ikvh070oDhMBuKrG7LtdL1eIQFqyXL6hadzLXKV8DJ038da085XxX VmnFF65T9uWIOrMBzpXnspw4+8Dt8AGBGqqWgJLb83OTN3f3IMdscViXkDGAGTqA0+8Crf lB/N/IoJgfb25BB72MT2fo7RLam2FDicNqdwijN2XwwctL4/rp78RWAvWNvzwrWS6CbCJe PHpK8vUcaNX6Evw3Op/+jypR3Gs/mYo/tnJL57KQOpOOuz137eJnS9pnqK5oNQ== 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 4NRZCJ3f2zzsdR; Tue, 6 Dec 2022 22:02:20 +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 2B6M2KA1058410; Tue, 6 Dec 2022 22:02:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B6M2KAh058409; Tue, 6 Dec 2022 22:02:20 GMT (envelope-from git) Date: Tue, 6 Dec 2022 22:02:20 GMT Message-Id: <202212062202.2B6M2KAh058409@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 8d12f4457d5e - main - security/krb5: Flavorize 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: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8d12f4457d5e81a4b573351e120a6369df38873b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=8d12f4457d5e81a4b573351e120a6369df38873b commit 8d12f4457d5e81a4b573351e120a6369df38873b Author: Cy Schubert AuthorDate: 2022-12-06 19:58:39 +0000 Commit: Cy Schubert CommitDate: 2022-12-06 22:00:55 +0000 security/krb5: Flavorize Replace gssapi options (MIT, HEIMDAL_PORT, HEIMDAL_BASE) with flavors. --- MOVED | 1 + security/pam_krb5/Makefile | 27 ++++++++++++++++----------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/MOVED b/MOVED index 282219db96dd..d2cc387e8177 100644 --- a/MOVED +++ b/MOVED @@ -17630,3 +17630,4 @@ net-mgmt/zabbix4-frontend||2022-12-05|Requires php74 which was EOL on 2022-11-28 math/pecl-stats2||2022-12-05|Requires php74 which was EOL on 2022-11-28 devel/pecl-jsmin||2022-12-05|Requires php74 which was EOL on 2022-11-28 security/py-certbot-dns-cloudxns||2022-12-06|The CloudXNS DNS service is defunct and upstream removed plugin for it +security/pam_krb5|security/pam_krb5@mit|2022-12-06|The pam_krb5 package is now the (default) mit flavor diff --git a/security/pam_krb5/Makefile b/security/pam_krb5/Makefile index 3423b6e20785..d442d44666a6 100644 --- a/security/pam_krb5/Makefile +++ b/security/pam_krb5/Makefile @@ -6,7 +6,7 @@ MASTER_SITES= http://archives.eyrie.org/software/kerberos/ \ DISTNAME= pam-krb5-${PORTVERSION:S/.r/-rc/} MAINTAINER= cy@FreeBSD.org -COMMENT= Pluggable Authentication Module for Kerberos 5 +COMMENT= Pluggable Authentication Module for ${FLAVOR:U} Kerberos 5 WWW= https://www.eyrie.org/~eagle/software/pam-krb5/ LICENSE= BSD3CLAUSE GPLv1+ @@ -24,19 +24,24 @@ CONFIGURE_ARGS+= --with-krb5="${GSSAPIBASEDIR}" \ CONFIGURE_ENV= PATH_KRB5_CONFIG="${KRB5CONFIG}" INSTALL_TARGET= install-strip -OPTIONS_SINGLE= LINK -OPTIONS_SINGLE_LINK= MIT HEIMDAL_BASE HEIMDAL_PORT -OPTIONS_DEFAULT= MIT +FLAVORS= mit heimdal_base heimdal_port +FLAVOR?= ${FLAVORS:[1]} -MIT_DESC= Link against MIT Kerberos -HEIMDAL_PORT_DESC= Link against Heimdal in ports Kerberos -HEIMDAL_BASE_DESC= Link against Heimdal in base Kerberos +.for f in ${FLAVORS:Nmit} +${f}_PKGNAMESUFFIX= -${f} +.endfor -MIT_USES= gssapi:mit -HEIMDAL_PORT_USES= gssapi:heimdal -HEIMDAL_BASE_USES= gssapi:base +.if ${FLAVOR:U} == mit +USES= gssapi:mit +.elif ${FLAVOR:U} == heimdal_port +USES= gssapi:heimdal +.elif ${FLAVOR:U} == heimdal_base +USES= gssapi:base +.endif + +.include post-install: cd ${WRKSRC} && ${MAKE_CMD} install-man DESTDIR=${STAGEDIR} -.include +.include