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 4926515800F for ; Wed, 8 Feb 2023 01:55:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3E2BFE077C; Wed, 8 Feb 2023 01:55:29 +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 11134E077C for ; Wed, 8 Feb 2023 01:55:29 +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 C5ADD335DB8 for ; Wed, 8 Feb 2023 01:55:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E923B89C for ; Wed, 8 Feb 2023 01:55:25 +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: <1675821275.c7a2be13f19326cf632100f8ad8f325c340d5384.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.3-r6.ebuild net-nds/openldap/openldap-2.6.3-r7.ebuild X-VCS-Directories: net-nds/openldap/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: c7a2be13f19326cf632100f8ad8f325c340d5384 X-VCS-Branch: master Date: Wed, 8 Feb 2023 01:55:25 +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: 60e38f15-0ac0-4887-a4fa-60a07932634d X-Archives-Hash: 04c240f709cdd232971dec0e03e6317f commit: c7a2be13f19326cf632100f8ad8f325c340d5384 Author: Sam James gentoo org> AuthorDate: Wed Feb 8 01:54:30 2023 +0000 Commit: Sam James gentoo org> CommitDate: Wed Feb 8 01:54:35 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7a2be13 net-nds/openldap: adapt safety check for 2.4->2.6 upgrade Drops berkdb. See https://forums.gentoo.org/viewtopic-p-8775222.html. Signed-off-by: Sam James gentoo.org> ...{openldap-2.6.3-r6.ebuild => openldap-2.6.3-r7.ebuild} | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/net-nds/openldap/openldap-2.6.3-r6.ebuild b/net-nds/openldap/openldap-2.6.3-r7.ebuild similarity index 97% rename from net-nds/openldap/openldap-2.6.3-r6.ebuild rename to net-nds/openldap/openldap-2.6.3-r7.ebuild index 2645e95da094..0c699006bb9c 100644 --- a/net-nds/openldap/openldap-2.6.3-r6.ebuild +++ b/net-nds/openldap/openldap-2.6.3-r7.ebuild @@ -231,7 +231,16 @@ openldap_find_versiontags() { OLDVER="$(/usr/bin/ldd ${SLAPD_PATH} \ | awk '/libdb-/{gsub("^libdb-","",$1);gsub(".so$","",$1);print $1}')" local fail=0 - if [[ -z "${OLDVER}" ]] && [[ -z "${NEWVER}" ]]; then + + if has_version "${CATEGORY}/${PN}[berkdb]" ; then + eerror " OpenLDAP >= 2.6.x has dropped support for Berkeley DB." + eerror " You will need to migrate per upstream's migration notes" + eerror " at https://www.openldap.org/doc/admin25/appendix-upgrading.html." + eerror " Your existing database will not be accessible until it is" + eerror " converted to mdb!" + echo + fail=1 + elif [[ -z "${OLDVER}" ]] && [[ -z "${NEWVER}" ]]; then : # Nothing wrong here. elif [[ -z "${OLDVER}" ]] && [[ -n "${NEWVER}" ]]; then @@ -287,8 +296,8 @@ openldap_upgrade_howto() { eerror " 7. slapadd -l ${l}" eerror " 8. chown ldap:ldap /var/lib/openldap-data/*" eerror " 9. /etc/init.d/slapd start" - eerror "10. check that your data is intact." - eerror "11. set up the new replication system." + eerror "10. Check that your data is intact." + eerror "11. Set up the new replication system." eerror if [[ "${FORCE_UPGRADE}" != "1" ]]; then die "You need to upgrade your database first"