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 9A85B15808B for ; Sun, 20 Mar 2022 21:04:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 74BCBE077C; Sun, 20 Mar 2022 21:04:57 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 572A4E0769 for ; Sun, 20 Mar 2022 21:04:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 44E3A3430AD for ; Sun, 20 Mar 2022 21:04:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D67A9330 for ; Sun, 20 Mar 2022 21:04:54 +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: <1647810269.524491b7848c723edf7707f1a21bc80a3b7ab3c0.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-nds/openldap/files/, net-nds/openldap/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-nds/openldap/files/openldap-2.6.1-fix-bashism-configure.patch net-nds/openldap/openldap-2.6.1.ebuild X-VCS-Directories: net-nds/openldap/files/ net-nds/openldap/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 524491b7848c723edf7707f1a21bc80a3b7ab3c0 X-VCS-Branch: master Date: Sun, 20 Mar 2022 21:04:54 +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: 63d1da5c-133c-405d-8a4e-b7ef8b66cf02 X-Archives-Hash: 1fde999891f81a85bc04518b308c92b3 commit: 524491b7848c723edf7707f1a21bc80a3b7ab3c0 Author: Sam James gentoo org> AuthorDate: Sun Mar 20 20:26:48 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sun Mar 20 21:04:29 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=524491b7 net-nds/openldap: drop sys-libs/db (BDB) remnants from 2.6.1 We already dropped the dependency in 2.6.1 so let's clean up some remnants. Signed-off-by: Sam James gentoo.org> .../files/openldap-2.6.1-fix-bashism-configure.patch | 2 -- net-nds/openldap/openldap-2.6.1.ebuild | 12 +----------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/net-nds/openldap/files/openldap-2.6.1-fix-bashism-configure.patch b/net-nds/openldap/files/openldap-2.6.1-fix-bashism-configure.patch index 93b104198ba6..c2acb679e3ba 100644 --- a/net-nds/openldap/files/openldap-2.6.1-fix-bashism-configure.patch +++ b/net-nds/openldap/files/openldap-2.6.1-fix-bashism-configure.patch @@ -1,5 +1,3 @@ -diff --git a/configure.ac b/configure.ac -index a5075be..b78f2ad 100644 --- a/configure.ac +++ b/configure.ac @@ -2055,7 +2055,7 @@ dnl diff --git a/net-nds/openldap/openldap-2.6.1.ebuild b/net-nds/openldap/openldap-2.6.1.ebuild index 252fe1d5b198..0edc6a14276a 100644 --- a/net-nds/openldap/openldap-2.6.1.ebuild +++ b/net-nds/openldap/openldap-2.6.1.ebuild @@ -38,14 +38,6 @@ REQUIRED_USE="cxx? ( sasl ) S=${WORKDIR}/${PN}-OPENLDAP_REL_ENG_${MY_PV} -# always list newer first -# Do not add any AGPL-3 BDB here! -# See bug 525110, comment 15. -# Advanced usage: OPENLDAP_BDB_SLOTS in the environment can be used to force a slot during build. -BDB_SLOTS="${OPENLDAP_BDB_SLOTS:=5.3 4.8}" -BDB_PKGS='' -for _slot in $BDB_SLOTS; do BDB_PKGS="${BDB_PKGS} sys-libs/db:${_slot}" ; done - # openssl is needed to generate lanman-passwords required by samba COMMON_DEPEND=" ssl? ( @@ -230,6 +222,7 @@ openldap_find_versiontags() { [[ "${have_files}" == "1" ]] && einfo "DB files present" || einfo "No DB files present" # Now we must check for the major version of sys-libs/db linked against. + # TODO: remove this as we dropped bdb support (gone upstream) in 2.6.1? SLAPD_PATH="${EROOT}/usr/$(get_libdir)/openldap/slapd" if [[ "${have_files}" == "1" ]] && [[ -f "${SLAPD_PATH}" ]]; then OLDVER="$(/usr/bin/ldd ${SLAPD_PATH} \ @@ -787,9 +780,6 @@ pkg_postinst() { elog "Getting started using OpenLDAP? There is some documentation available:" elog "Gentoo Guide to OpenLDAP Authentication" elog "(https://wiki.gentoo.org/wiki/Centralized_authentication_using_OpenLDAP)" - elog "---" - elog "An example file for tuning BDB backends with openldap is" - elog "DB_CONFIG.fast.example in /usr/share/doc/${PF}/" fi preserve_old_lib_notify /usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.4$(get_libname 0)