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 9C3A8158089 for ; Tue, 19 Sep 2023 17:48:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D44262BC082; Tue, 19 Sep 2023 17:48:48 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BCE782BC07D for ; Tue, 19 Sep 2023 17:48:48 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0F42A335CE3 for ; Tue, 19 Sep 2023 17:48:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8B88911F4 for ; Tue, 19 Sep 2023 17:48:44 +0000 (UTC) From: "Arthur Zamarin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arthur Zamarin" Message-ID: <1695145695.882f65b95b2861417792352abeeb6721402bfcfe.arthurzam@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.4.59-r2.ebuild net-nds/openldap/openldap-2.5.14.ebuild net-nds/openldap/openldap-2.5.16.ebuild net-nds/openldap/openldap-2.6.3-r7.ebuild net-nds/openldap/openldap-2.6.4-r1.ebuild net-nds/openldap/openldap-2.6.4-r2.ebuild net-nds/openldap/openldap-2.6.5.ebuild net-nds/openldap/openldap-2.6.6.ebuild X-VCS-Directories: net-nds/openldap/ X-VCS-Committer: arthurzam X-VCS-Committer-Name: Arthur Zamarin X-VCS-Revision: 882f65b95b2861417792352abeeb6721402bfcfe X-VCS-Branch: master Date: Tue, 19 Sep 2023 17:48:44 +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: c21eae50-6114-4888-88f3-265070dd6076 X-Archives-Hash: c27e6a71a2e225bc092db44ac22f4b7f commit: 882f65b95b2861417792352abeeb6721402bfcfe Author: Arthur Zamarin gentoo org> AuthorDate: Fri Sep 15 09:59:05 2023 +0000 Commit: Arthur Zamarin gentoo org> CommitDate: Tue Sep 19 17:48:15 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=882f65b9 net-nds/openldap: fix VariableShadowed Signed-off-by: Arthur Zamarin gentoo.org> net-nds/openldap/openldap-2.4.59-r2.ebuild | 3 +-- net-nds/openldap/openldap-2.5.14.ebuild | 4 +--- net-nds/openldap/openldap-2.5.16.ebuild | 4 +--- net-nds/openldap/openldap-2.6.3-r7.ebuild | 4 +--- net-nds/openldap/openldap-2.6.4-r1.ebuild | 4 +--- net-nds/openldap/openldap-2.6.4-r2.ebuild | 4 +--- net-nds/openldap/openldap-2.6.5.ebuild | 2 +- net-nds/openldap/openldap-2.6.6.ebuild | 2 +- 8 files changed, 8 insertions(+), 19 deletions(-) diff --git a/net-nds/openldap/openldap-2.4.59-r2.ebuild b/net-nds/openldap/openldap-2.4.59-r2.ebuild index ace8b2025805..c40329c153ec 100644 --- a/net-nds/openldap/openldap-2.4.59-r2.ebuild +++ b/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/net-nds/openldap/openldap-2.5.14.ebuild b/net-nds/openldap/openldap-2.5.14.ebuild index 042d0617e57b..0abdc8dcb986 100644 --- a/net-nds/openldap/openldap-2.5.14.ebuild +++ b/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/net-nds/openldap/openldap-2.5.16.ebuild b/net-nds/openldap/openldap-2.5.16.ebuild index b55c20f3ef2f..6d3babe45f1b 100644 --- a/net-nds/openldap/openldap-2.5.16.ebuild +++ b/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/net-nds/openldap/openldap-2.6.3-r7.ebuild b/net-nds/openldap/openldap-2.6.3-r7.ebuild index 807dbe901d7a..b60d581438f2 100644 --- a/net-nds/openldap/openldap-2.6.3-r7.ebuild +++ b/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/net-nds/openldap/openldap-2.6.4-r1.ebuild b/net-nds/openldap/openldap-2.6.4-r1.ebuild index 59c0f019ab63..eb26dad73bff 100644 --- a/net-nds/openldap/openldap-2.6.4-r1.ebuild +++ b/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/net-nds/openldap/openldap-2.6.4-r2.ebuild b/net-nds/openldap/openldap-2.6.4-r2.ebuild index b144468124f7..4ff4b2c3d6d0 100644 --- a/net-nds/openldap/openldap-2.6.4-r2.ebuild +++ b/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/net-nds/openldap/openldap-2.6.5.ebuild b/net-nds/openldap/openldap-2.6.5.ebuild index b8aa589bf011..e38e6c6522c5 100644 --- a/net-nds/openldap/openldap-2.6.5.ebuild +++ b/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/net-nds/openldap/openldap-2.6.6.ebuild b/net-nds/openldap/openldap-2.6.6.ebuild index b8aa589bf011..e38e6c6522c5 100644 --- a/net-nds/openldap/openldap-2.6.6.ebuild +++ b/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