From nobody Fri Oct 21 17:26:21 2022 X-Original-To: dev-commits-ports-branches@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 4MvBG61ZVLz4gGLl; Fri, 21 Oct 2022 17:26:22 +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 4MvBG56wp0z46ry; Fri, 21 Oct 2022 17:26:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666373182; 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=c3rFOTOMrnpwVBbd94js4TQC2BrMOOFybD3nhC4uKKA=; b=bwpLcy02BD85bHdaxNkbNOjjP71a+Ag4apZKKGot4YODk90V5WqwJK4XJSbbUQ6sNVolQB C5B3kZ+og8jH8kNjpxfkj9gdEmQYWlXY/b9sl5ayQ+bIvb/juFL5vp4LEc5of4XQRba9YX Z85hXQor1K+39yOYAogWL09pEece/0jh3aL/Vd87oWSfqDHLILG5q7tUXnoskv7HoDYc1R 9AYdvxCREp01Tfh/vXx1eOtNxHOSUsbD7ZEokZDyi5ph2ULyhmYXxcxBPOVp86lsgF/cDg bSf6/xVIEfLTvWsyocYVJgLbIACfewHpBL+bbdsMGpOcDxhZovM6FTkQBbuUIw== 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 4MvBG55bBYzHXy; Fri, 21 Oct 2022 17:26:21 +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 29LHQLDf055489; Fri, 21 Oct 2022 17:26:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29LHQLen055488; Fri, 21 Oct 2022 17:26:21 GMT (envelope-from git) Date: Fri, 21 Oct 2022 17:26:21 GMT Message-Id: <202210211726.29LHQLen055488@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Xin LI Subject: git: e1ea7c7eeda2 - 2022Q4 - net/openldap26-{server,client}: fix proper usage of FETCH/GSSAPI options List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q4 X-Git-Reftype: branch X-Git-Commit: e1ea7c7eeda200ffdf04846fe2dd35104d900a63 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666373182; 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=c3rFOTOMrnpwVBbd94js4TQC2BrMOOFybD3nhC4uKKA=; b=NszkbI+U6HqBzWib0h8CoPu26F9WgI/wgww37X6PfxbXBs+jk5+Ooo3gZNBoKp5aOmcRO7 2k3TnqscdDUBmcGgVIe646F4dKg8s0C2vW/SiUShZQbIAo4yfrNtM/aPIlsQpcmIpxTxKS MnTczh9Ea6rKrFwMMBS/DqP2fb6zoLBaNzhvwNiSX2FYYZYQrnN37TzKOWmCc2HFKl0eZK Go391RsBoMzEjl+yMa8YHMB0Uf7IN4eDKUSCZtvosHDTsLRemJO2zG0CTPMBO/TWQP4GU/ lFR0eXpGlBIqiHyG0vc/c+IJmU21DaNYBrSqLEscV2ifYRl2Vzu22QdyHz9fSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666373182; a=rsa-sha256; cv=none; b=e1M/ReF9PM4z6sMmJ2CIUddFJ27woyRrQW62yxAPFlKGaXDv0jCOm+5ItWmTuG7dX40A0w i73W856Vk2Tw5+x01OeRxRuZrwkGTc0qGhhOLQQEmhbMeGvwGCWzIhIj+jAx3LmQXuH/aM Q8Vn6FPBGw9UChSC6hRo+SOtGYmjlI5agvFG8YA1h34/2UT9HGD9yRDOF2UqaoTJRIRbs6 PZxxTb6UYbpDUAgoeXU4pDRgp19LMwZHll3UddRsntK7R1LvqBupCzLlR3xh8ssv0GerGZ kZOwo7vtsj3ew20FZgUCvNi5FpOP9th/7ieD4VQWSRLHa9xPSAYLrni4T7uW0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q4 has been updated by delphij: URL: https://cgit.FreeBSD.org/ports/commit/?id=e1ea7c7eeda200ffdf04846fe2dd35104d900a63 commit e1ea7c7eeda200ffdf04846fe2dd35104d900a63 Author: Michael Osipov AuthorDate: 2022-10-14 16:54:06 +0000 Commit: Xin LI CommitDate: 2022-10-21 17:25:57 +0000 net/openldap26-{server,client}: fix proper usage of FETCH/GSSAPI options * FETCH_DESC is not present with client * FETCH applies to *both* client and server since both slapd and client tools use ldif_parse_line2() via libldap which can use libfetch * GSSAPI is also required for the client as well since ldap*(1) commands can be used to connect and authenticate to directory servers like Active Directory and OpenLDAP with Kerberos via SASL GSSAPI mechanism PR: ports/267056 (cherry picked from commit de29d5bd2acda093fe3a5472df80c7cbd5a7b794) --- net/openldap26-server/Makefile | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/net/openldap26-server/Makefile b/net/openldap26-server/Makefile index 471db2373595..c9f459b996e7 100644 --- a/net/openldap26-server/Makefile +++ b/net/openldap26-server/Makefile @@ -50,13 +50,18 @@ PORTREVISION_SERVER= 0 OPENLDAP_SHLIB_MAJOR= 2 OPENLDAP_SHLIB_MINOR= 0.200 -OPTIONS_DEFINE= DEBUG +OPTIONS_DEFINE= DEBUG FETCH GSSAPI OPTIONS_DEFAULT+= DEBUG -.if defined(CLIENT_ONLY) -OPTIONS_DEFINE+= DOCS FETCH +FETCH_DESC= Enable fetch(3) support +GSSAPI_DESC= With GSSAPI support FETCH_CONFIGURE_WITH= fetch + +GSSAPI_RUN_DEPENDS= cyrus-sasl-gssapi>0:security/cyrus-sasl2-gssapi + +.if defined(CLIENT_ONLY) +OPTIONS_DEFINE+= DOCS .else OPTIONS_GROUP= BKNDS OVLYS BKNDS_DESC= OpenLDAP backends @@ -102,7 +107,6 @@ OPTIONS_GROUP_OVLYS+= TRANSLUCENT OPTIONS_GROUP_OVLYS+= UNIQUE OPTIONS_GROUP_OVLYS+= VALSORT -OPTIONS_DEFINE+= GSSAPI OPTIONS_DEFINE+= DYNACL ACI OPTIONS_DEFINE+= RLOOKUPS SLP SLAPI OPTIONS_DEFINE+= PBKDF2 @@ -119,8 +123,6 @@ OPTIONS_SUB= yes ACI_DESC= Per-object ACI (experimental) ARGON2_DESC= Argon2 password hashing module DYNACL_DESC= Run-time loadable ACL (experimental) -FETCH_DESC= Enable fetch(3) support -GSSAPI_DESC= With GSSAPI support LLOADD_DESC= Enable load balancer OUTLOOK_DESC= Force caseIgnoreOrderingMatch on name attribute (experimental) RLOOKUPS_DESC= With reverse lookups of client hostnames @@ -193,7 +195,6 @@ DNSSRV_CONFIGURE_ENABLE= dnssrv=mod DYNACL_CONFIGURE_ENABLE= dynacl DYNGROUP_CONFIGURE_ENABLE= dyngroup=mod DYNLIST_CONFIGURE_ENABLE= dynlist=mod -GSSAPI_RUN_DEPENDS= cyrus-sasl-gssapi>0:security/cyrus-sasl2-gssapi HOMEDIR_CONFIGURE_ENABLE= homedir=mod LLOADD_CONFIGURE_ENABLE= balancer=mod LLOADD_LIB_DEPENDS= libevent.so:devel/libevent