diff --git a/sdk_container/src/third_party/portage-stable/net-nds/openldap/Manifest b/sdk_container/src/third_party/portage-stable/net-nds/openldap/Manifest index 12dd61f09d..49fc44f187 100644 --- a/sdk_container/src/third_party/portage-stable/net-nds/openldap/Manifest +++ b/sdk_container/src/third_party/portage-stable/net-nds/openldap/Manifest @@ -1,2 +1,2 @@ -DIST openldap-2.4.50.tgz 5712635 BLAKE2B 6a7d864a44c411b82cf703585c4a81954a02497e8510c84e29070dd120da0181e8425fd2b8bb7616e42e6e26d0f06db5ffdf50fb1cd97943d23f9914eb4f1260 SHA512 f528043ff9de36f7b65d8816c9a9c24f0ac400041b2969965178ee6eae62c92a11af33a0a883e4954e5fff98a0738a9f9aa2faf5b385d21974754e045aab31ae +DIST openldap-2.4.57.tgz 5883912 BLAKE2B 439605e1bebcf34968f0a552aaade1b72b7671ae2a94a0b700a84f9f715acd162e7b8dadfdd3ffd5b0a785f9306b5f5033ab956cf0ffd26b66119a7110d0aa57 SHA512 b929bced0f5ba9a90e015a24b8037c8958fbb7282db272bd0cacf43b5f7540ab42159a3c4441148074340228bb5f07f93651c0dbb2affde961be156058f99ce5 DIST rfc2307bis.schema-20140524 12262 BLAKE2B 98031f49e9bde1e4821e637af3382364d8344ed7017649686a088070d96a632dffa6c661552352656b1b159c0fd962965580069a64c7f3d5bb6a3ed75f60fd99 SHA512 83b89a1deeefc8566b97e7e865b9b6d04541099cbdf719e24538a7d27d61b6209e87ab9003a9f140bd9afd018ec569e71721e3a24090e1902c8b6659d2ba103e diff --git a/sdk_container/src/third_party/portage-stable/net-nds/openldap/metadata.xml b/sdk_container/src/third_party/portage-stable/net-nds/openldap/metadata.xml index 6cea2f2e32..38186cd8f1 100644 --- a/sdk_container/src/third_party/portage-stable/net-nds/openldap/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/net-nds/openldap/metadata.xml @@ -1,6 +1,10 @@ + + zlogene@gentoo.org + Mikle Kolyada + ldap-bugs@gentoo.org diff --git a/sdk_container/src/third_party/portage-stable/net-nds/openldap/openldap-2.4.50.ebuild b/sdk_container/src/third_party/portage-stable/net-nds/openldap/openldap-2.4.57.ebuild similarity index 97% rename from sdk_container/src/third_party/portage-stable/net-nds/openldap/openldap-2.4.50.ebuild rename to sdk_container/src/third_party/portage-stable/net-nds/openldap/openldap-2.4.57.ebuild index 4fdf8de27c..0e8d47d384 100644 --- a/sdk_container/src/third_party/portage-stable/net-nds/openldap/openldap-2.4.50.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-nds/openldap/openldap-2.4.57.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools db-use flag-o-matic multilib-minimal ssl-cert toolchain-funcs user systemd +inherit autotools db-use flag-o-matic multilib-minimal preserve-libs ssl-cert toolchain-funcs systemd BIS_PN=rfc2307bis.schema BIS_PV=20140524 @@ -22,7 +22,7 @@ SRC_URI=" LICENSE="OPENLDAP GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" IUSE_DAEMON="crypt samba tcpd experimental minimal" IUSE_BACKEND="+berkdb" @@ -60,7 +60,7 @@ COMMON_DEPEND=" ) sasl? ( dev-libs/cyrus-sasl:= ) !minimal? ( - sys-devel/libtool + dev-libs/libltdl sys-libs/e2fsprogs-libs >=dev-db/lmdb-0.9.18:= tcpd? ( sys-apps/tcp-wrappers ) @@ -93,7 +93,17 @@ DEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND} selinux? ( sec-policy/selinux-ldap ) " + +# The user/group are only used for running daemons which are +# disabled in minimal builds, so elide the accounts too. # for tracking versions + +BDEPEND="!minimal? ( + acct-group/ldap + acct-user/ldap +) +" + OPENLDAP_VERSIONTAG=".version-tag" OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data" @@ -347,13 +357,6 @@ pkg_setup() { else openldap_find_versiontags fi - - # The user/group are only used for running daemons which are - # disabled in minimal builds, so elide the accounts too. - if ! use minimal ; then - enewgroup ldap 439 - enewuser ldap 439 -1 /usr/$(get_libdir)/openldap ldap - fi } src_prepare() { @@ -376,6 +379,8 @@ src_prepare() { -e 's|/bin/sh|/bin/bash|g' \ -i tests/scripts/* || die "sed failed" + # Required for autoconf-2.70 #765043 + sed 's@^AM_INIT_AUTOMAKE.*@AC_PROG_MAKE_SET@' -i configure.in || die AT_NOEAUTOMAKE=yes eautoreconf } @@ -514,7 +519,7 @@ multilib_src_configure() { done tc-export AR CC CXX - CONFIG_SHELL="/bin/bash" \ + CONFIG_SHELL="/bin/sh" \ ECONF_SOURCE="${S}" \ STRIP=/bin/true \ econf \ @@ -548,7 +553,7 @@ src_configure_cxx() { multilib_src_compile() { tc-export AR CC CXX - emake CC="${CC}" AR="${AR}" SHELL="${EPREFIX}"/bin/bash + emake CC="${CC}" AR="${AR}" SHELL="${EPREFIX}"/bin/sh local lt="${BUILD_DIR}/libtool" export echo="echo" @@ -730,7 +735,7 @@ multilib_src_test() { multilib_src_install() { local lt="${BUILD_DIR}/libtool" - emake DESTDIR="${D}" SHELL="${EPREFIX}"/bin/bash install + emake DESTDIR="${D}" SHELL="${EPREFIX}"/bin/sh install if ! use minimal && multilib_is_native_abi; then # openldap modules go here