From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B485E15800F for ; Fri, 10 Feb 2023 01:05:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 82254E069C; Fri, 10 Feb 2023 01:05:39 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6660CE069C for ; Fri, 10 Feb 2023 01:05:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C10B5335D9D for ; Fri, 10 Feb 2023 01:05:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 062F48A7 for ; Fri, 10 Feb 2023 01:05:36 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1675991103.c035192e22ba5714ccc15672f335e9b97aaeb568.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-nds/openldap/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-nds/openldap/openldap-2.6.4-r1.ebuild net-nds/openldap/openldap-2.6.4.ebuild X-VCS-Directories: net-nds/openldap/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: c035192e22ba5714ccc15672f335e9b97aaeb568 X-VCS-Branch: master Date: Fri, 10 Feb 2023 01:05:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 62dc5cfa-b136-42f7-ae68-f63e2b43d536 X-Archives-Hash: 5ae20f667455c4e8d545b4206720f617 commit: c035192e22ba5714ccc15672f335e9b97aaeb568 Author: Sam James gentoo org> AuthorDate: Fri Feb 10 01:02:06 2023 +0000 Commit: Sam James gentoo org> CommitDate: Fri Feb 10 01:05:03 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c035192e net-nds/openldap: fix lmdb version, add version check We must use at least the version of lmdb bundled with OpenLDAP. Bug: https://bugs.gentoo.org/588792 Signed-off-by: Sam James gentoo.org> .../{openldap-2.6.4.ebuild => openldap-2.6.4-r1.ebuild} | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/net-nds/openldap/openldap-2.6.4.ebuild b/net-nds/openldap/openldap-2.6.4-r1.ebuild similarity index 97% rename from net-nds/openldap/openldap-2.6.4.ebuild rename to net-nds/openldap/openldap-2.6.4-r1.ebuild index 3cd2bdeb87d7..56617abc986c 100644 --- a/net-nds/openldap/openldap-2.6.4.ebuild +++ b/net-nds/openldap/openldap-2.6.4-r1.ebuild @@ -40,6 +40,7 @@ REQUIRED_USE="cxx? ( sasl ) ?? ( test minimal ) kerberos? ( ?? ( kinit smbkrb5passwd ) )" +SYSTEM_LMDB_VER=0.9.30 # openssl is needed to generate lanman-passwords required by samba COMMON_DEPEND=" kernel_linux? ( sys-apps/util-linux ) @@ -56,7 +57,7 @@ COMMON_DEPEND=" !minimal? ( dev-libs/libltdl sys-fs/e2fsprogs - >=dev-db/lmdb-0.9.18:= + >=dev-db/lmdb-${SYSTEM_LMDB_VER}:= argon2? ( app-crypt/argon2:= ) crypt? ( virtual/libcrypt:= ) tcpd? ( sys-apps/tcp-wrappers ) @@ -332,6 +333,20 @@ pkg_setup() { } src_prepare() { + # The system copy of dev-db/lmdb must match the version that this copy + # of OpenLDAP shipped with! See bug #588792. + # + # Fish out MDB_VERSION_MAJOR/MDB_VERSION_MINOR/MDB_VERSION_PATCH from + # the bundled lmdb's header to find out the version. + local bundled_lmdb_version=$(sed -En '/^#define MDB_VERSION_(MAJOR|MINOR|PATCH)(\s+)?/{s/[^0-9.]//gp}' libraries/liblmdb/lmdb.h || die) + bundled_lmdb_version=$(printf "%s." ${bundled_lmdb_version}) + + if [[ ${SYSTEM_LMDB_VER}. != ${bundled_lmdb_version} ]] ; then + eerror "Source lmdb version: ${bundled_lmdb_version}" + eerror "Ebuild lmdb version: ${SYSTEM_LMDB_VER}" + die "Ebuild needs to update SYSTEM_LMDB_VER!" + fi + rm -r libraries/liblmdb || die 'could not removed bundled lmdb directory' local filename