From nobody Fri Oct 21 17:23:14 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 4MvBBV3hGWz4gFjx; Fri, 21 Oct 2022 17:23:14 +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 4MvBBV38rsz46M0; Fri, 21 Oct 2022 17:23:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666372994; 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=yZt1OeiGZAkFB2K8oThv+PweNJKSayfcYTf+xf71eeI=; b=tVvvq9q1Fc20D5/ih6TqFRIXLaLF0yPJKKzuLgHlefF5UEGI3xzOFio5cSWrdMebDDAZna 90bsSh/C4L620ygQlEocm7dtR7voG3JMxOS+iCq7kfIc2u9sMc027D3k6CKyN1E2zuinvl AzJK5ghCMKIKdCpf8nj/i4/3rZOypjn0mqomOgrdFwpa+RdafM6OCbvF06W1X8U+GNHj1H W0rOwohntWtZnDpEtfFkRFhh13GbwGK3DoF60rDJONeEtplvB5KFiL+d1k9PnL00c2pVLf hPCQC/fjSVV9o0I8StlTdUsMAlkG05DENyj09XNx4DZE8XyK8x8QpGc+LSIqLQ== 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 4MvBBV2DlLzHgf; Fri, 21 Oct 2022 17:23:14 +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 29LHNEVH054982; Fri, 21 Oct 2022 17:23:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29LHNEpQ054981; Fri, 21 Oct 2022 17:23:14 GMT (envelope-from git) Date: Fri, 21 Oct 2022 17:23:14 GMT Message-Id: <202210211723.29LHNEpQ054981@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Xin LI Subject: git: b7db3e41f324 - main - net/openldap25-{server,client}: fix proper usage of FETCH/GSSAPI options 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: delphij X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b7db3e41f324cdbc95a33256dd4cdf7e38928fc0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666372994; 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=yZt1OeiGZAkFB2K8oThv+PweNJKSayfcYTf+xf71eeI=; b=xGyXTlVk4PRYIWmrc3cf1QoLSqAmhaQcXQsoTtLT6r7Gaz3O9GF5fNTbWqF7dziijW3l4m mh2MO7LeKUdOGsO5x0YzRBgelq8smHZWDGDTej/NeWiRdYdDoyl0gkR1TB9PBwh9ynJ3tb yLL9pL+iNgZEGKl+xs4icPNYKTTJDskgjcQMtjgnNIG2GQtuZPRi8grJ9y4uVTqwWFDeIF 6xpJlxIwYgHIERPuwS/tIXDzVt7cp+dhgBLzzseuEnG3lZOJytIJxLFeQOtrs3gewEriq8 md38WnQOCVxHxwGl7H2ouP42WftfGjbsZZS2CAm8sWLo+9JzvoNyTszH7CWmsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666372994; a=rsa-sha256; cv=none; b=WMvRSDSifn2D94PUEfCHENMarSCFUc6I7awNpJ8yoRtK1GBPzlEA/uVI3BgPi82fiHKK2I FqXm62OlTEoc2fvCTptBx6fh530TehUzGpkJw6t23T+sNsARF+tiDOwfgr2fGXZoO7cDAJ QiADjY9JhKGLBNbdlX3SbfdTuO38YtlZJuQZ2wnti44JhOChIpsJqn9l40v/H6nx8uEW6j TFPLc/8PdiECNuJr2K8ELPUMF4DNgjTZuDpR7FwVy9OUH8XsPDDTKtoQ/a5o2v1uKDwg3G ccSKREraxMgliFVJL3FSGXhWeGDyh1Ln37Nw47AkqtdfOEtQENTyHjghtpyAbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/ports/commit/?id=b7db3e41f324cdbc95a33256dd4cdf7e38928fc0 commit b7db3e41f324cdbc95a33256dd4cdf7e38928fc0 Author: Michael Osipov AuthorDate: 2022-10-21 17:22:50 +0000 Commit: Xin LI CommitDate: 2022-10-21 17:23:06 +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 --- 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 8a3e86505e6b..7ca0a57e83c3 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