diff options
| author |   Sam James <sam@gentoo.org> | 2022-03-20 20:26:48 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2022-03-20 21:04:29 +0000 |
| commit | 524491b7848c723edf7707f1a21bc80a3b7ab3c0 (patch) | |
| tree | 8d9d2eca6c84c06897a9f35c5e08abdd345ebf73 /net-nds | |
| parent | net-nds/openldap: fix bashism in configure in 2.6.1 (diff) | |
| download | gentoo-524491b7848c723edf7707f1a21bc80a3b7ab3c0.tar.gz gentoo-524491b7848c723edf7707f1a21bc80a3b7ab3c0.tar.bz2 gentoo-524491b7848c723edf7707f1a21bc80a3b7ab3c0.zip | |
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 <sam@gentoo.org>
Diffstat (limited to 'net-nds')
| -rw-r--r-- | net-nds/openldap/files/openldap-2.6.1-fix-bashism-configure.patch | 2 | ||||
| -rw-r--r-- | net-nds/openldap/openldap-2.6.1.ebuild | 12 |
2 files changed, 1 insertions, 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) |