From b6417c2c0ba0b44cb41240908b5e5c0e1e8155ae Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 25 Sep 2023 07:15:08 +0000 Subject: [PATCH] net-nds/openldap: Sync with Gentoo It's from Gentoo commit 882f65b95b2861417792352abeeb6721402bfcfe. --- .../portage-stable/net-nds/openldap/openldap-2.4.59-r2.ebuild | 3 +-- .../portage-stable/net-nds/openldap/openldap-2.5.14.ebuild | 4 +--- .../portage-stable/net-nds/openldap/openldap-2.5.16.ebuild | 4 +--- .../portage-stable/net-nds/openldap/openldap-2.6.3-r7.ebuild | 4 +--- .../portage-stable/net-nds/openldap/openldap-2.6.4-r1.ebuild | 4 +--- .../portage-stable/net-nds/openldap/openldap-2.6.4-r2.ebuild | 4 +--- .../portage-stable/net-nds/openldap/openldap-2.6.5.ebuild | 2 +- .../portage-stable/net-nds/openldap/openldap-2.6.6.ebuild | 2 +- 8 files changed, 8 insertions(+), 19 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/net-nds/openldap/openldap-2.4.59-r2.ebuild b/sdk_container/src/third_party/portage-stable/net-nds/openldap/openldap-2.4.59-r2.ebuild index ace8b20258..c40329c153 100644 --- a/sdk_container/src/third_party/portage-stable/net-nds/openldap/openldap-2.4.59-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-nds/openldap/openldap-2.4.59-r2.ebuild @@ -34,13 +34,12 @@ IUSE_OPTIONAL="gnutls iodbc sasl ssl odbc debug ipv6 +syslog selinux static-libs IUSE_CONTRIB="smbkrb5passwd kerberos kinit pbkdf2 sha2" IUSE_CONTRIB="${IUSE_CONTRIB} cxx" IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}" - -RESTRICT="!test? ( test )" REQUIRED_USE="cxx? ( sasl ) pbkdf2? ( ssl ) test? ( berkdb ) ?? ( test minimal ) kerberos? ( ?? ( kinit smbkrb5passwd ) )" +RESTRICT="!test? ( test )" # always list newer first # Do not add any AGPL-3 BDB here! diff --git a/sdk_container/src/third_party/portage-stable/net-nds/openldap/openldap-2.5.14.ebuild b/sdk_container/src/third_party/portage-stable/net-nds/openldap/openldap-2.5.14.ebuild index 042d0617e5..0abdc8dcb9 100644 --- a/sdk_container/src/third_party/portage-stable/net-nds/openldap/openldap-2.5.14.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-nds/openldap/openldap-2.5.14.ebuild @@ -33,15 +33,13 @@ IUSE_OPTIONAL="debug gnutls iodbc ipv6 odbc sasl ssl selinux static-libs +syslog IUSE_CONTRIB="kerberos kinit pbkdf2 sha2 smbkrb5passwd" IUSE_CONTRIB="${IUSE_CONTRIB} cxx" IUSE="systemd ${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}" -RESTRICT="!test? ( test )" - -RESTRICT="!test? ( test )" REQUIRED_USE="cxx? ( sasl ) pbkdf2? ( ssl ) test? ( cleartext debug sasl ) autoca? ( !gnutls ) ?? ( test minimal ) kerberos? ( ?? ( kinit smbkrb5passwd ) )" +RESTRICT="!test? ( test )" SYSTEM_LMDB_VER=0.9.30 # openssl is needed to generate lanman-passwords required by samba diff --git a/sdk_container/src/third_party/portage-stable/net-nds/openldap/openldap-2.5.16.ebuild b/sdk_container/src/third_party/portage-stable/net-nds/openldap/openldap-2.5.16.ebuild index b55c20f3ef..6d3babe45f 100644 --- a/sdk_container/src/third_party/portage-stable/net-nds/openldap/openldap-2.5.16.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-nds/openldap/openldap-2.5.16.ebuild @@ -33,15 +33,13 @@ IUSE_OPTIONAL="debug gnutls iodbc ipv6 odbc sasl ssl selinux static-libs +syslog IUSE_CONTRIB="kerberos kinit pbkdf2 sha2 smbkrb5passwd" IUSE_CONTRIB="${IUSE_CONTRIB} cxx" IUSE="systemd ${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}" -RESTRICT="!test? ( test )" - -RESTRICT="!test? ( test )" REQUIRED_USE="cxx? ( sasl ) pbkdf2? ( ssl ) test? ( cleartext debug sasl ) autoca? ( !gnutls ) ?? ( test minimal ) kerberos? ( ?? ( kinit smbkrb5passwd ) )" +RESTRICT="!test? ( test )" SYSTEM_LMDB_VER=0.9.31 # openssl is needed to generate lanman-passwords required by samba diff --git a/sdk_container/src/third_party/portage-stable/net-nds/openldap/openldap-2.6.3-r7.ebuild b/sdk_container/src/third_party/portage-stable/net-nds/openldap/openldap-2.6.3-r7.ebuild index 807dbe901d..b60d581438 100644 --- a/sdk_container/src/third_party/portage-stable/net-nds/openldap/openldap-2.6.3-r7.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-nds/openldap/openldap-2.6.3-r7.ebuild @@ -33,15 +33,13 @@ IUSE_OPTIONAL="debug gnutls iodbc ipv6 odbc sasl ssl selinux static-libs +syslog IUSE_CONTRIB="kerberos kinit pbkdf2 sha2 smbkrb5passwd" IUSE_CONTRIB="${IUSE_CONTRIB} cxx" IUSE="systemd ${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}" -RESTRICT="!test? ( test )" - -RESTRICT="!test? ( test )" REQUIRED_USE="cxx? ( sasl ) pbkdf2? ( ssl ) test? ( cleartext sasl ) autoca? ( !gnutls ) ?? ( test minimal ) kerberos? ( ?? ( kinit smbkrb5passwd ) )" +RESTRICT="!test? ( test )" # openssl is needed to generate lanman-passwords required by samba COMMON_DEPEND=" diff --git a/sdk_container/src/third_party/portage-stable/net-nds/openldap/openldap-2.6.4-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-nds/openldap/openldap-2.6.4-r1.ebuild index 59c0f019ab..eb26dad73b 100644 --- a/sdk_container/src/third_party/portage-stable/net-nds/openldap/openldap-2.6.4-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-nds/openldap/openldap-2.6.4-r1.ebuild @@ -33,15 +33,13 @@ IUSE_OPTIONAL="debug gnutls iodbc ipv6 odbc sasl ssl selinux static-libs +syslog IUSE_CONTRIB="kerberos kinit pbkdf2 sha2 smbkrb5passwd" IUSE_CONTRIB="${IUSE_CONTRIB} cxx" IUSE="systemd ${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}" -RESTRICT="!test? ( test )" - -RESTRICT="!test? ( test )" REQUIRED_USE="cxx? ( sasl ) pbkdf2? ( ssl ) test? ( cleartext sasl ) autoca? ( !gnutls ) ?? ( test minimal ) kerberos? ( ?? ( kinit smbkrb5passwd ) )" +RESTRICT="!test? ( test )" SYSTEM_LMDB_VER=0.9.30 # openssl is needed to generate lanman-passwords required by samba diff --git a/sdk_container/src/third_party/portage-stable/net-nds/openldap/openldap-2.6.4-r2.ebuild b/sdk_container/src/third_party/portage-stable/net-nds/openldap/openldap-2.6.4-r2.ebuild index b144468124..4ff4b2c3d6 100644 --- a/sdk_container/src/third_party/portage-stable/net-nds/openldap/openldap-2.6.4-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-nds/openldap/openldap-2.6.4-r2.ebuild @@ -34,15 +34,13 @@ IUSE_OPTIONAL="debug gnutls iodbc odbc sasl ssl selinux static-libs +syslog test IUSE_CONTRIB="kerberos kinit pbkdf2 sha2 smbkrb5passwd" IUSE_CONTRIB="${IUSE_CONTRIB} cxx" IUSE="systemd ${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}" -RESTRICT="!test? ( test )" - -RESTRICT="!test? ( test )" REQUIRED_USE="cxx? ( sasl ) pbkdf2? ( ssl ) test? ( cleartext sasl ) autoca? ( !gnutls ) ?? ( test minimal ) kerberos? ( ?? ( kinit smbkrb5passwd ) )" +RESTRICT="!test? ( test )" SYSTEM_LMDB_VER=0.9.30 # openssl is needed to generate lanman-passwords required by samba diff --git a/sdk_container/src/third_party/portage-stable/net-nds/openldap/openldap-2.6.5.ebuild b/sdk_container/src/third_party/portage-stable/net-nds/openldap/openldap-2.6.5.ebuild index b8aa589bf0..e38e6c6522 100644 --- a/sdk_container/src/third_party/portage-stable/net-nds/openldap/openldap-2.6.5.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-nds/openldap/openldap-2.6.5.ebuild @@ -34,7 +34,6 @@ IUSE_OPTIONAL="debug gnutls iodbc odbc sasl ssl selinux static-libs +syslog test IUSE_CONTRIB="kerberos kinit pbkdf2 sha2 smbkrb5passwd" IUSE_CONTRIB="${IUSE_CONTRIB} cxx" IUSE="systemd ${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}" -RESTRICT="!test? ( test )" REQUIRED_USE=" cxx? ( sasl ) pbkdf2? ( ssl ) @@ -43,6 +42,7 @@ REQUIRED_USE=" ?? ( test minimal ) kerberos? ( ?? ( kinit smbkrb5passwd ) ) " +RESTRICT="!test? ( test )" SYSTEM_LMDB_VER=0.9.31 # openssl is needed to generate lanman-passwords required by samba diff --git a/sdk_container/src/third_party/portage-stable/net-nds/openldap/openldap-2.6.6.ebuild b/sdk_container/src/third_party/portage-stable/net-nds/openldap/openldap-2.6.6.ebuild index b8aa589bf0..e38e6c6522 100644 --- a/sdk_container/src/third_party/portage-stable/net-nds/openldap/openldap-2.6.6.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-nds/openldap/openldap-2.6.6.ebuild @@ -34,7 +34,6 @@ IUSE_OPTIONAL="debug gnutls iodbc odbc sasl ssl selinux static-libs +syslog test IUSE_CONTRIB="kerberos kinit pbkdf2 sha2 smbkrb5passwd" IUSE_CONTRIB="${IUSE_CONTRIB} cxx" IUSE="systemd ${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}" -RESTRICT="!test? ( test )" REQUIRED_USE=" cxx? ( sasl ) pbkdf2? ( ssl ) @@ -43,6 +42,7 @@ REQUIRED_USE=" ?? ( test minimal ) kerberos? ( ?? ( kinit smbkrb5passwd ) ) " +RESTRICT="!test? ( test )" SYSTEM_LMDB_VER=0.9.31 # openssl is needed to generate lanman-passwords required by samba