From nobody Thu Dec 02 10:29:34 2021 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 7F55E18CA3C8; Thu, 2 Dec 2021 10:29:34 +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 4J4XJG1rpHz540n; Thu, 2 Dec 2021 10:29:34 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 1C0E11BB35; Thu, 2 Dec 2021 10:29:34 +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 1B2ATYf5002319; Thu, 2 Dec 2021 10:29:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B2ATYTG002318; Thu, 2 Dec 2021 10:29:34 GMT (envelope-from git) Date: Thu, 2 Dec 2021 10:29:34 GMT Message-Id: <202112021029.1B2ATYTG002318@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ruslan Makhmatkhanov Subject: git: 7becd3b8b86d - main - net/py-ldap: do not imply openldap 2.4 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: rm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7becd3b8b86d998d5c1b4aa3125522d30b435d79 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638440974; 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=UiUVOAa//xxFXzDgvXXm/QAhq+axjTmvDvqWr814gdE=; b=o1OwVHhKoRXyHYFt7wQPpzgaFKmtcT7u8EBJiM6dNQGFk6XaP2NVK6YVGjWYXbuiczJcwy BrLZpO8n+22COTbM12Bvuwb5kVTe9X+mK8IJtWT2ipwLQYkGdDvdzaLPyXypD6Pwua6G/X 7cOMjwWcotNFNaEc9KCeWp4Y6IsTxI2RaLQQ7N1zHCkPo+TTsKVmBrNFVdmJ+tU8+5lggA rDK3LSRsEaq7Ld9SAQrJfIT8sbmp/B6/SuVauOz0khqs53/ABHojpPQVy/A5R+AQ+wU7Rp HbbtszZonxXrbzPBuyCPX3/y6iBQR+6yfgRSjV3VtrMYTGJ3OMnEc785SxXsyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638440974; a=rsa-sha256; cv=none; b=h+tM7NStb15YQTeLDf54Er109X43g5BVb7iSiUQE/YSIfXGKzYprMazVRtEjEihTVyFdNb XLjsOZ9nwL+D6RliSLTTCnFKsKSm+Je5hXpcIWfvP1MbZ/kgUD6mTdGzpSgNJy5UbXrjwG knYjdMHIXCuIMhrEnhl0y0J6mzOONNAgBZWDaD2Nrq5MNytiXGIJUsn1Szfa3KN0jrj3rr azdqOXAZMi+gy2i0s3nmiHScodMwirRPSToQND2Jx1ku7SXiIjY5JZGVnfNt79lSTEVHyK 7wJblX0ZEKSNcX+4aI7Z5blWidUoEGKGGrpkmnw/VZFe24Z/b2rZZpSCL+OoSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rm: URL: https://cgit.FreeBSD.org/ports/commit/?id=7becd3b8b86d998d5c1b4aa3125522d30b435d79 commit 7becd3b8b86d998d5c1b4aa3125522d30b435d79 Author: Ruslan Makhmatkhanov AuthorDate: 2021-12-02 10:27:12 +0000 Commit: Ruslan Makhmatkhanov CommitDate: 2021-12-02 10:27:12 +0000 net/py-ldap: do not imply openldap 2.4 - add patch to fix build OpenLDAP 2.5 - do not imply 2.4 version PR: 260054 Reported by: delphij --- net/py-ldap/Makefile | 1 - net/py-ldap/files/patch-setup.cfg | 11 +++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/net/py-ldap/Makefile b/net/py-ldap/Makefile index 45a8c076a985..4cfe974d2df4 100644 --- a/net/py-ldap/Makefile +++ b/net/py-ldap/Makefile @@ -18,7 +18,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1@${PY_FLAVOR} \ USES= python:3.6+ USE_PYTHON= autoplist distutils USE_OPENLDAP= yes -WANT_OPENLDAP_VER= 24 post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/setup.py diff --git a/net/py-ldap/files/patch-setup.cfg b/net/py-ldap/files/patch-setup.cfg new file mode 100644 index 000000000000..9f2d026245dc --- /dev/null +++ b/net/py-ldap/files/patch-setup.cfg @@ -0,0 +1,11 @@ +--- setup.cfg.orig 2020-06-29 14:13:36 UTC ++++ setup.cfg +@@ -5,7 +5,7 @@ license_file = LICENCE + defines = HAVE_SASL HAVE_TLS HAVE_LIBLDAP_R + extra_compile_args = + extra_objects = +-libs = ldap_r lber ++libs = ldap lber + + [install] + compile = 1