Attachment 248412 Details for Bug 277015 – patch

[patch] patch

0001-security-krb5-120-121-add-slave-ports-with-LDAP-enab.patch (text/plain), 3.57 KB, created by Lexi Winter on 2024-02-12 23:56:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lexi Winter

Created: 2024-02-12 23:56:17 UTC

Size: 3.57 KB

patch

obsolete

>From 2ee0aaaf9a05e72e7293da2d619d896cddf988ad Mon Sep 17 00:00:00 2001
>From: Lexi Winter <lexi@le-Fay.ORG>
>Date: Mon, 12 Feb 2024 23:50:48 +0000
>Subject: [PATCH] security/krb5-{120,121}: add slave ports with LDAP enabled
>
>---
> security/krb5-120/Makefile      | 4 +++-
> security/krb5-121/Makefile      | 4 +++-
> security/krb5-ldap-120/Makefile | 8 ++++++++
> security/krb5-ldap-121/Makefile | 8 ++++++++
> security/krb5-ldap/Makefile     | 8 ++++++++
> 5 files changed, 30 insertions(+), 2 deletions(-)
> create mode 100644 security/krb5-ldap-120/Makefile
> create mode 100644 security/krb5-ldap-121/Makefile
> create mode 100644 security/krb5-ldap/Makefile
>
>diff --git a/security/krb5-120/Makefile b/security/krb5-120/Makefile
>index f76802d9aff1..150c4df37f35 100644
>--- a/security/krb5-120/Makefile
>+++ b/security/krb5-120/Makefile
>@@ -38,7 +38,7 @@ CPE_VERSION=		5-${PORTVERSION}
> CPE_PRODUCT=		kerberos
> 
> OPTIONS_DEFINE=		EXAMPLES NLS KRB5_PDF KRB5_HTML DNS_FOR_REALM LDAP LMDB
>-OPTIONS_DEFAULT=	KRB5_PDF KRB5_HTML READLINE
>+OPTIONS_DEFAULT=	KRB5_PDF KRB5_HTML READLINE ${OPTIONS_SLAVE}
> OPTIONS_RADIO=		CMD_LINE_EDITING
> OPTIONS_RADIO_CMD_LINE_EDITING=	READLINE LIBEDIT LIBEDIT_BASE
> CMD_LINE_EDITING_DESC=	Command line editing for kadmin and ktutil
>@@ -52,7 +52,9 @@ LDAP_CONFIGURE_WITH=	ldap
> LMDB_DESC=		OpenLDAP Lightning Memory-Mapped Database support
> LMDB_CONFIGURE_WITH=	lmdb
> LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
>+.if ${SLAVE_PORT:U} != ldap
> LMDB_IMPLIES=		LDAP
>+.endif
> NLS_USES=		gettext
> NLS_CONFIGURE_OFF=	--disable-nls
> READLINE_USES=		readline
>diff --git a/security/krb5-121/Makefile b/security/krb5-121/Makefile
>index 159ff47c6055..2f572f5745ce 100644
>--- a/security/krb5-121/Makefile
>+++ b/security/krb5-121/Makefile
>@@ -38,7 +38,7 @@ CPE_VERSION=		5-${PORTVERSION}
> CPE_PRODUCT=		kerberos
> 
> OPTIONS_DEFINE=		EXAMPLES NLS KRB5_PDF KRB5_HTML DNS_FOR_REALM LDAP LMDB
>-OPTIONS_DEFAULT=	KRB5_PDF KRB5_HTML READLINE
>+OPTIONS_DEFAULT=	KRB5_PDF KRB5_HTML READLINE ${OPTIONS_SLAVE}
> OPTIONS_RADIO=		CMD_LINE_EDITING
> OPTIONS_RADIO_CMD_LINE_EDITING=	READLINE LIBEDIT LIBEDIT_BASE
> CMD_LINE_EDITING_DESC=	Command line editing for kadmin and ktutil
>@@ -52,7 +52,9 @@ LDAP_CONFIGURE_WITH=	ldap
> LMDB_DESC=		OpenLDAP Lightning Memory-Mapped Database support
> LMDB_CONFIGURE_WITH=	lmdb
> LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
>+.if ${SLAVE_PORT:U} != ldap
> LMDB_IMPLIES=		LDAP
>+.endif
> NLS_USES=		gettext
> NLS_CONFIGURE_OFF=	--disable-nls
> READLINE_USES=		readline
>diff --git a/security/krb5-ldap-120/Makefile b/security/krb5-ldap-120/Makefile
>new file mode 100644
>index 000000000000..d8488d865c26
>--- /dev/null
>+++ b/security/krb5-ldap-120/Makefile
>@@ -0,0 +1,8 @@
>+PORTNAME=	krb5
>+PKGNAMESUFFIX=	-ldap
>+
>+OPTIONS_SLAVE+=	LDAP
>+SLAVE_PORT=	ldap
>+MASTERDIR=	${.CURDIR}/../krb5-120
>+
>+.include "${MASTERDIR}/Makefile"
>diff --git a/security/krb5-ldap-121/Makefile b/security/krb5-ldap-121/Makefile
>new file mode 100644
>index 000000000000..2bfdd64e6257
>--- /dev/null
>+++ b/security/krb5-ldap-121/Makefile
>@@ -0,0 +1,8 @@
>+PORTNAME=	krb5
>+PKGNAMESUFFIX=	-ldap
>+
>+OPTIONS_SLAVE+=	LDAP
>+SLAVE_PORT=	ldap
>+MASTERDIR=	${.CURDIR}/../krb5-121
>+
>+.include "${MASTERDIR}/Makefile"
>diff --git a/security/krb5-ldap/Makefile b/security/krb5-ldap/Makefile
>new file mode 100644
>index 000000000000..c0d261623a46
>--- /dev/null
>+++ b/security/krb5-ldap/Makefile
>@@ -0,0 +1,8 @@
>+VERSIONS=		120 121
>+# When changing this, remember to build test security/sssd with SMB=on
>+# Reference: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=244778
>+KRB5_VERSION?=		121
>+
>+MASTERDIR=		${.CURDIR}/../krb5-ldap-${KRB5_VERSION}
>+
>+.include "${MASTERDIR}/Makefile"
>-- 
>2.43.0
>

Actions: View | Diff

Attachments on bug 277015: 248412 | 248414 | 248415 | 248416 | 248417