From nobody Tue Feb 13 18:48:32 2024 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 4TZ9MN3gKfz59VQT; Tue, 13 Feb 2024 18:48:32 +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 4TZ9MN2q0sz4Cyt; Tue, 13 Feb 2024 18:48:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707850112; 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=WI2woSUeyDE1zMTl8KspDVFrrlQ7fwe4+JcDBfAXVkg=; b=HvxNlD8gViQQqEkHU9AYxOTEhoIYqRUYDaSKmEhpzmvIfFxUEgWft5ZcZIEQLNiZSj8v3k 1sqMJiHWZl9YoERLZB9tk7DEWJBgSL903jNSnvFMvm3n9sOhr0JT86Ywl4muTFOH/sw7V/ NJWtCIM837qdJmEtXU8Z2a4VkscS0XpDCGqycImbSc59rQ+TRR1Gy+g1e9p10+Z/FkG8d8 TZymHrMWwf+ct5WPHX1VuLz5oGR4hiuih63nM2zC68SqFL8S2apo7TWkkixNTemLxv15EI 1PrnT/bac5C/safWtnolUnWiSycy4GOZBzuZDGNRTaKQP9ZXXBCq2dS4Mk/6yg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707850112; a=rsa-sha256; cv=none; b=duLmYkLx58rWG4z6FlyH7uHxhof1MLH98Nj0hfMAYeKpCOE4yPolPY9FcEV+ZiPn7AMBVO FeDSP8rkSdgUjh6FT/6DvKmK38Bx1Bqmb7kLChj5wKLrPZZjLxbETfNbn2CN3GLWQy4MPr QixWSQ+9HLzw2UtzlOJTI4tA/9ZhgENi4HdY5Om8yGy2XLsnD0b53WzLn7MtO+NJTBwifK J3jc949U/hfU7d5xMOgFk8IjaDO9AjAAybTDibbQIi6JguPRE18nZWk9Gy1AfUvDFiEutW qHTp0fBhEbbakqsCVw6+k76ZURk+/5uSXAbitQLpgZM/AdW9KAmhWYSOLH/Fbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707850112; 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=WI2woSUeyDE1zMTl8KspDVFrrlQ7fwe4+JcDBfAXVkg=; b=CsgUTrxu70dobyqzkaRkGDrFjm/GtxaY2dfX6G3e0scTeua/72JKr9gGIO0faWS3z7VA3X PehVLuvqFah9pTcr5S5O55/w+888mtur3vU+TL5uuFRDTq19heoey+4nwCfEBwpauyYkS+ ffCbBiPRHQMeepJ2el+A/yKB1cvrWwxSWsTJ6Whdb/M2E/8xA4IwJLLTuzdnsiFVoMRrGl s/aPyGi3uLtSQIeANSPbunC8xrHgw7pzG9EGmGYs3+oSa504cP/607cqdfLcDuzxrbtPqw LkfixTUaPmxoLIbgpZQT0ltAnUUql9AKoUP5nAJn93VG0xrtCAi0vBh3C+RDBA== 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 4TZ9MN1tVzzQr9; Tue, 13 Feb 2024 18:48:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41DImWwd040008; Tue, 13 Feb 2024 18:48:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41DImWH3040005; Tue, 13 Feb 2024 18:48:32 GMT (envelope-from git) Date: Tue, 13 Feb 2024 18:48:32 GMT Message-Id: <202402131848.41DImWH3040005@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: 9926898a0c05 - main - security/krb5*: Flavorize with default and ldap flavors 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/main X-Git-Reftype: branch X-Git-Commit: 9926898a0c052d79aaa08708e3249fc39e633174 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=9926898a0c052d79aaa08708e3249fc39e633174 commit 9926898a0c052d79aaa08708e3249fc39e633174 Author: Cy Schubert AuthorDate: 2024-02-13 00:33:16 +0000 Commit: Cy Schubert CommitDate: 2024-02-13 18:47:53 +0000 security/krb5*: Flavorize with default and ldap flavors This provides a binary package to users who require MIT KRB5 with LDAP support. This patch does not change the current, now default, package name. PR: 277015 --- security/krb5-119/Makefile | 11 ++++++++++- security/krb5-120/Makefile | 11 ++++++++++- security/krb5-121/Makefile | 11 ++++++++++- security/krb5-devel/Makefile | 8 +++++++- security/krb5/Makefile | 2 ++ 5 files changed, 39 insertions(+), 4 deletions(-) diff --git a/security/krb5-119/Makefile b/security/krb5-119/Makefile index af529b667c19..6e2d91a8a348 100644 --- a/security/krb5-119/Makefile +++ b/security/krb5-119/Makefile @@ -4,8 +4,11 @@ PORTREVISION= 2 CATEGORIES= security MASTER_SITES= http://web.mit.edu/kerberos/dist/${PORTNAME}/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/ .if !defined(MASTERDIR) -PKGNAMESUFFIX= -119 +PKGNAME_X= -${FLAVOR:S/default//}-119 +.else +PKGNAME_X= -${FLAVOR:S/default//} .endif +PKGNAMESUFFIX= ${PKGNAME_X:S/--/-/:C/-$//} DEPRECATED= Desupported by MIT following 1.21 EXPIRATION_DATE= 2024-06-06 @@ -44,6 +47,8 @@ CPE_VENDOR= mit CPE_VERSION= 5-${PORTVERSION} CPE_PRODUCT= kerberos +FLAVORS= default ldap + OPTIONS_DEFINE= EXAMPLES NLS KRB5_PDF KRB5_HTML DNS_FOR_REALM LDAP LMDB OPTIONS_DEFAULT= KRB5_PDF KRB5_HTML READLINE OPTIONS_RADIO= CMD_LINE_EDITING @@ -69,6 +74,10 @@ LIBEDIT_CONFIGURE_WITH= libedit LIBEDIT_BASE_CONFIGURE_WITH= libedit LIBEDIT_BASE_DESC= Use libedit in FreeBSD base +.if ${FLAVOR:U} == ldap +OPTIONS_DEFAULT+= LDAP LMDB +.endif + .if defined(KRB5_HOME) PREFIX= ${KRB5_HOME} .endif diff --git a/security/krb5-120/Makefile b/security/krb5-120/Makefile index f76802d9aff1..d9dfaa94f83c 100644 --- a/security/krb5-120/Makefile +++ b/security/krb5-120/Makefile @@ -4,8 +4,11 @@ PORTREVISION= 3 CATEGORIES= security MASTER_SITES= http://web.mit.edu/kerberos/dist/${PORTNAME}/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/ .if !defined(MASTERDIR) -PKGNAMESUFFIX= -120 +PKGNAME_X= -${FLAVOR:S/default//}-120 +.else +PKGNAME_X= -${FLAVOR:S/default//} .endif +PKGNAMESUFFIX= ${PKGNAME_X:S/--/-/:C/-$//} PATCH_SITES= http://web.mit.edu/kerberos/advisories/ PATCH_DIST_STRIP= -p2 @@ -37,6 +40,8 @@ CPE_VENDOR= mit CPE_VERSION= 5-${PORTVERSION} CPE_PRODUCT= kerberos +FLAVORS= default ldap + OPTIONS_DEFINE= EXAMPLES NLS KRB5_PDF KRB5_HTML DNS_FOR_REALM LDAP LMDB OPTIONS_DEFAULT= KRB5_PDF KRB5_HTML READLINE OPTIONS_RADIO= CMD_LINE_EDITING @@ -62,6 +67,10 @@ LIBEDIT_CONFIGURE_WITH= libedit LIBEDIT_BASE_CONFIGURE_WITH= libedit LIBEDIT_BASE_DESC= Use libedit in FreeBSD base +.if ${FLAVOR:U} == ldap +OPTIONS_DEFAULT+= LDAP LMDB +.endif + .if defined(KRB5_HOME) PREFIX= ${KRB5_HOME} .endif diff --git a/security/krb5-121/Makefile b/security/krb5-121/Makefile index 159ff47c6055..b231563cd5a2 100644 --- a/security/krb5-121/Makefile +++ b/security/krb5-121/Makefile @@ -4,8 +4,11 @@ PORTREVISION= 3 CATEGORIES= security MASTER_SITES= http://web.mit.edu/kerberos/dist/${PORTNAME}/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/ .if !defined(MASTERDIR) -PKGNAMESUFFIX= -121 +PKGNAME_X= -${FLAVOR:S/default//}-121 +.else +PKGNAME_X= -${FLAVOR:S/default//} .endif +PKGNAMESUFFIX= ${PKGNAME_X:S/--/-/:C/-$//} PATCH_SITES= http://web.mit.edu/kerberos/advisories/ PATCH_DIST_STRIP= -p2 @@ -37,6 +40,8 @@ CPE_VENDOR= mit CPE_VERSION= 5-${PORTVERSION} CPE_PRODUCT= kerberos +FLAVORS= default ldap + OPTIONS_DEFINE= EXAMPLES NLS KRB5_PDF KRB5_HTML DNS_FOR_REALM LDAP LMDB OPTIONS_DEFAULT= KRB5_PDF KRB5_HTML READLINE OPTIONS_RADIO= CMD_LINE_EDITING @@ -62,6 +67,10 @@ LIBEDIT_CONFIGURE_WITH= libedit LIBEDIT_BASE_CONFIGURE_WITH= libedit LIBEDIT_BASE_DESC= Use libedit in FreeBSD base +.if ${FLAVOR:U} == ldap +OPTIONS_DEFAULT+= LDAP LMDB +.endif + .if defined(KRB5_HOME) PREFIX= ${KRB5_HOME} .endif diff --git a/security/krb5-devel/Makefile b/security/krb5-devel/Makefile index 8448da7d05fb..c5183994deff 100644 --- a/security/krb5-devel/Makefile +++ b/security/krb5-devel/Makefile @@ -2,7 +2,7 @@ PORTNAME= krb5 PORTVERSION= 1.22.${MIT_COMMIT_DATE} CATEGORIES= security .if !defined(MASTERDIR) -PKGNAMESUFFIX= -devel +PKGNAMESUFFIX= -${FLAVOR}-devel .endif HASH= f5ad07bd3 MIT_COMMIT_DATE= 2024.01.24 @@ -38,6 +38,8 @@ CPE_VENDOR= mit CPE_VERSION= 5-${PORTVERSION} CPE_PRODUCT= kerberos +FLAVORS= default ldap + OPTIONS_DEFINE= EXAMPLES NLS DNS_FOR_REALM LDAP LMDB OPTIONS_DEFAULT= KRB5_PDF KRB5_HTML READLINE OPTIONS_RADIO= CMD_LINE_EDITING @@ -61,6 +63,10 @@ LIBEDIT_CONFIGURE_WITH= libedit LIBEDIT_BASE_CONFIGURE_WITH= libedit LIBEDIT_BASE_DESC= Use libedit in FreeBSD base +.if ${FLAVOR:U} == ldap +OPTIONS_DEFAULT+= LDAP LMDB +.endif + .if defined(KRB5_HOME) PREFIX= ${KRB5_HOME} .endif diff --git a/security/krb5/Makefile b/security/krb5/Makefile index 1bd3bb3c2ac2..a65ea22d98d1 100644 --- a/security/krb5/Makefile +++ b/security/krb5/Makefile @@ -5,4 +5,6 @@ KRB5_VERSION?= 121 MASTERDIR= ${.CURDIR}/../krb5-${KRB5_VERSION} +FLAVORS= default ldap + .include "${MASTERDIR}/Makefile"