From nobody Fri Oct 21 17:26:23 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 4MvBG81Zh5z4gGBP; Fri, 21 Oct 2022 17:26:24 +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 4MvBG818mTz46kV; Fri, 21 Oct 2022 17:26:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666373184; 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=GuuTcy4nGoziop3C1Ni14bkJRSBQByx4G++vsffrtQE=; b=I2JTL03wdg92N+sZ2yZrSfMcfmgSmTtj6oNY6y9IRV/uNTu6Xw1+RmkfrIip6ORIi7pts/ i0iD18l6OHKLK4i31vCZ7lMxNn0WNVYn4G5j8bi+74tX5VqwOV889rUHF891czBhW5azUX wIvu+SoXaUdWaAYjC4apbh8gxnCZlNedPdHrbbaL2QBAQgta+s1hVt+mN6DRg897c3t3z/ 6m8fDeDdOs48A9WI85ffSckRJRVrpzEP0mirmRapIbztV8CqTzyTO2pKfDv921cKtH5bSN WcXezAW4qBx2aciFj3Bg50yX319Wf00PjEAuG0aEhYjxVV8E2Kfo+tar+nj/RA== 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 4MvBG80FwyzHK1; Fri, 21 Oct 2022 17:26:24 +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 29LHQNTo055539; Fri, 21 Oct 2022 17:26:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29LHQNTO055538; Fri, 21 Oct 2022 17:26:23 GMT (envelope-from git) Date: Fri, 21 Oct 2022 17:26:23 GMT Message-Id: <202210211726.29LHQNTO055538@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: b0c892cf60d8 - 2022Q4 - net/openldap25-{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: b0c892cf60d8100033984cad7e3d97c43db2d917 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666373184; 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=GuuTcy4nGoziop3C1Ni14bkJRSBQByx4G++vsffrtQE=; b=Z4hFaxnIuJ22YFcik5iHqpQLbIEtRAF2VpYEVF8Z07r0VjzS2M43Qa0YvECLtOGWW7VQiN 5q/LaL7Elmk6taOPbbpyJoCB+BP1xPGaZaB9lAPN60uX3kf/G3t2+SIJ33SNNujE8+gq2j NfFUVf0uaVyM7VpNcd5E224KY+jAGNTQIDx7bW9p3eiQcIxPNFxp8L5JPdawO1zgIgKxSg Wzi3VBj5lRrF562fhVLCWlAuSyks7iDeuiinsrwb7s7Rxt1+NcUzd4h+8ndBG0AD7WicK2 mVbENEye1yiUXz64FBHsD0gJXMP+kC+ZsDRuqdfuIE6b1fZF1m8ABwcJMxhJhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666373184; a=rsa-sha256; cv=none; b=QeSP9rzv6dP0fNZrRnYPTp0U+uCNEFyHx1cig6Y1i0sTRZmjpM9+Gq1aGVjXGjfoQTK92F +QIvidiku4O8kU5sq/6kn321DOVpfAt9k/oscP039SrHjwESVQ1hWqjnoc4dFkelZ3DN70 1aPnJg2Pqj9Agqs+Tms5VoVicyExDejUtby9RJqo11i0ooJtLSrCLoG3Nb5E4/y1wlATOf YnsySqCZMOdnqrVIjHo54/hkYBYhGCRtrnh7wrGyU6zSZjhQmEM1e9R4ALpwUar/XYGFMz CagvLI9QQepPL+oVOP58u4NGaOWdugTVA5VZJtYnvyqJNu4i9Kenji1A2MNO7g== 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=b0c892cf60d8100033984cad7e3d97c43db2d917 commit b0c892cf60d8100033984cad7e3d97c43db2d917 Author: Michael Osipov AuthorDate: 2022-10-21 17:22:50 +0000 Commit: Xin LI CommitDate: 2022-10-21 17:25:59 +0000 net/openldap25-{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 b7db3e41f324cdbc95a33256dd4cdf7e38928fc0) --- net/openldap25-server/Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/net/openldap25-server/Makefile b/net/openldap25-server/Makefile index 90a09c1a36dd..f7d1b31c17ac 100644 --- a/net/openldap25-server/Makefile +++ b/net/openldap25-server/Makefile @@ -50,14 +50,18 @@ OPENLDAP_SHLIB_MAJOR= 0 OPENLDAP_SHLIB_MINOR= 1.8 OPENLDAP_MAJOR= ${DISTVERSION:R} -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 FETCH_BUILD_DEPENDS= autoconf>0:devel/autoconf FETCH_CONFIGURE_WITH= fetch + +GSSAPI_DESC= With GSSAPI support +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 @@ -103,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 @@ -120,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 @@ -194,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