From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1615737-garchives=archives.gentoo.org@lists.gentoo.org>
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 E3683158041
for <garchives@archives.gentoo.org>; Fri, 29 Mar 2024 18:47:56 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 24E1FE2AB7;
Fri, 29 Mar 2024 18:47:55 +0000 (UTC)
Received: from smtp.gentoo.org (mail.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 095B5E2AB7
for <gentoo-commits@lists.gentoo.org>; Fri, 29 Mar 2024 18:47:55 +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 B9AB3343128
for <gentoo-commits@lists.gentoo.org>; Fri, 29 Mar 2024 18:47:53 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 12AA21615
for <gentoo-commits@lists.gentoo.org>; Fri, 29 Mar 2024 18:47:51 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
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" <sam@gentoo.org>
Message-ID: <1711737916.7a8bb8b9e767e18a6524fdbfca58025a33e4c7de.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.4-r3.ebuild net-nds/openldap/openldap-2.6.5-r1.ebuild net-nds/openldap/openldap-2.6.5.ebuild net-nds/openldap/openldap-2.6.6-r1.ebuild net-nds/openldap/openldap-2.6.6-r2.ebuild
X-VCS-Directories: net-nds/openldap/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 7a8bb8b9e767e18a6524fdbfca58025a33e4c7de
X-VCS-Branch: master
Date: Fri, 29 Mar 2024 18:47:51 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 1fe8ccef-da12-4407-a8e8-5844d4ccf961
X-Archives-Hash: 974c07aba9b7dda2b742a83ee9d24430
commit: 7a8bb8b9e767e18a6524fdbfca58025a33e4c7de
Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Fri Mar 29 18:07:39 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 29 18:45:16 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a8bb8b9
net-nds/openldap: fix automagic dependency on cyrus-sasl
The client programs can depend on sasl as well. But we never passed the
relevant options when building with USE=minimal, as is the default on
desktop profiles to avoid building the entire server infrastructure.
This was then detected on the official binhost, producing a totally
invalid package.
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
...ap-2.6.6-r1.ebuild => openldap-2.6.4-r3.ebuild} | 26 +++++++++-------------
...nldap-2.6.5.ebuild => openldap-2.6.5-r1.ebuild} | 4 ++--
...ap-2.6.6-r1.ebuild => openldap-2.6.6-r2.ebuild} | 2 +-
3 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/net-nds/openldap/openldap-2.6.6-r1.ebuild b/net-nds/openldap/openldap-2.6.4-r3.ebuild
similarity index 98%
copy from net-nds/openldap/openldap-2.6.6-r1.ebuild
copy to net-nds/openldap/openldap-2.6.4-r3.ebuild
index 84848052995b..9478f6d4a4ea 100644
--- a/net-nds/openldap/openldap-2.6.6-r1.ebuild
+++ b/net-nds/openldap/openldap-2.6.4-r3.ebuild
@@ -34,17 +34,15 @@ 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}"
-REQUIRED_USE="
- cxx? ( sasl )
+REQUIRED_USE="cxx? ( sasl )
pbkdf2? ( ssl )
test? ( cleartext sasl )
autoca? ( !gnutls )
?? ( test minimal )
- kerberos? ( ?? ( kinit smbkrb5passwd ) )
-"
+ kerberos? ( ?? ( kinit smbkrb5passwd ) )"
RESTRICT="!test? ( test )"
-SYSTEM_LMDB_VER=0.9.31
+SYSTEM_LMDB_VER=0.9.30
# openssl is needed to generate lanman-passwords required by samba
COMMON_DEPEND="
kernel_linux? ( sys-apps/util-linux )
@@ -82,22 +80,19 @@ COMMON_DEPEND="
)
)
"
-DEPEND="
- ${COMMON_DEPEND}
+DEPEND="${COMMON_DEPEND}
sys-apps/groff
"
-RDEPEND="
- ${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.
-BDEPEND="
- !minimal? (
+BDEPEND="!minimal? (
acct-group/ldap
acct-user/ldap
- )
+)
"
# for tracking versions
@@ -148,7 +143,8 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.6.1-cloak.patch
"${FILESDIR}"/${PN}-2.6.1-flags.patch
"${FILESDIR}"/${PN}-2.6.1-fix-missing-mapping.patch
- "${FILESDIR}"/${PN}-2.6.6-fix-type-mismatch-lloadd.patch
+ "${FILESDIR}"/${PN}-2.6.4-clang16.patch
+ "${FILESDIR}"/${PN}-2.6.4-libressl.patch #903001
)
openldap_filecount() {
@@ -412,6 +408,7 @@ multilib_src_configure() {
# Optional Packages
myconf+=(
--without-fetch
+ $(multilib_native_use_with sasl cyrus-sasl)
)
if use experimental ; then
@@ -486,7 +483,6 @@ multilib_src_configure() {
# Optional Packages
myconf+=(
$(use_with systemd)
- $(multilib_native_use_with sasl cyrus-sasl)
)
else
myconf+=(
@@ -684,7 +680,7 @@ multilib_src_test() {
#TESTS+=( pldif ) # not done by default, so also exclude here
#use odbc && TESTS+=( psql ) # not done by default, so also exclude here
- emake -Onone "${TESTS[@]}"
+ emake "${TESTS[@]}"
fi
}
diff --git a/net-nds/openldap/openldap-2.6.5.ebuild b/net-nds/openldap/openldap-2.6.5-r1.ebuild
similarity index 99%
rename from net-nds/openldap/openldap-2.6.5.ebuild
rename to net-nds/openldap/openldap-2.6.5-r1.ebuild
index e38e6c6522c5..66a264d48ad2 100644
--- a/net-nds/openldap/openldap-2.6.5.ebuild
+++ b/net-nds/openldap/openldap-2.6.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -411,6 +411,7 @@ multilib_src_configure() {
# Optional Packages
myconf+=(
--without-fetch
+ $(multilib_native_use_with sasl cyrus-sasl)
)
if use experimental ; then
@@ -485,7 +486,6 @@ multilib_src_configure() {
# Optional Packages
myconf+=(
$(use_with systemd)
- $(multilib_native_use_with sasl cyrus-sasl)
)
else
myconf+=(
diff --git a/net-nds/openldap/openldap-2.6.6-r1.ebuild b/net-nds/openldap/openldap-2.6.6-r2.ebuild
similarity index 99%
rename from net-nds/openldap/openldap-2.6.6-r1.ebuild
rename to net-nds/openldap/openldap-2.6.6-r2.ebuild
index 84848052995b..965cce327fb3 100644
--- a/net-nds/openldap/openldap-2.6.6-r1.ebuild
+++ b/net-nds/openldap/openldap-2.6.6-r2.ebuild
@@ -412,6 +412,7 @@ multilib_src_configure() {
# Optional Packages
myconf+=(
--without-fetch
+ $(multilib_native_use_with sasl cyrus-sasl)
)
if use experimental ; then
@@ -486,7 +487,6 @@ multilib_src_configure() {
# Optional Packages
myconf+=(
$(use_with systemd)
- $(multilib_native_use_with sasl cyrus-sasl)
)
else
myconf+=(