[gentoo-commits] repo/proj/libressl:master commit in: net-nds/openldap/

2023-09-28 Thread orbea 
commit: 587a0fb2a6aebf4e36e03f6062b33fa7a778b171
Author: orbea  riseup  net>
AuthorDate: Thu Sep 28 16:57:24 2023 +
Commit: orbea  riseup  net>
CommitDate: Thu Sep 28 16:57:24 2023 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=587a0fb2

net-nds/openldap: sync ::gentoo

Signed-off-by: orbea  riseup.net>

 net-nds/openldap/openldap-2.6.3-r7.ebuild | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/net-nds/openldap/openldap-2.6.3-r7.ebuild 
b/net-nds/openldap/openldap-2.6.3-r7.ebuild
index fe5d4e7..493fe72 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="

[gentoo-commits] repo/proj/libressl:master commit in: net-nds/openldap/

2023-07-06 Thread orbea 
commit: ef4ef9d5cebd5b9c121bf256eb846b5525d8dde5
Author: orbea  riseup  net>
AuthorDate: Thu Jul  6 13:36:19 2023 +
Commit: orbea  riseup  net>
CommitDate: Thu Jul  6 13:36:19 2023 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=ef4ef9d5

net-nds/openldap: sync ::gentoo

Signed-off-by: orbea  riseup.net>

 net-nds/openldap/openldap-2.6.3-r7.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-nds/openldap/openldap-2.6.3-r7.ebuild 
b/net-nds/openldap/openldap-2.6.3-r7.ebuild
index 7b4851a..fe5d4e7 100644
--- a/net-nds/openldap/openldap-2.6.3-r7.ebuild
+++ b/net-nds/openldap/openldap-2.6.3-r7.ebuild
@@ -239,7 +239,7 @@ openldap_find_versiontags() {
# This will not cover detection of cn=Config based 
configuration, but
# it's hopefully good enough.
if grep -sq '^backend.*shell' 
"${EROOT}"/etc/openldap/slapd.conf; then
-   eerror "OpenLDAP >= 2.6.x has dropped support for 
Shell backend."
+   eerror "OpenLDAP >= 2.5.x has dropped support for 
Shell backend."
eerror "You will need to migrate per upstream's 
migration notes"
eerror "at 
https://www.openldap.org/doc/admin25/appendix-upgrading.html.;
eerror "Your existing database will not be 
accessible until it is"
@@ -248,7 +248,7 @@ openldap_find_versiontags() {
fail=1
fi
if has_version "${CATEGORY}/${PN}[berkdb]" || grep -sq 
'^backend.*(bdb|hdb)' /etc/openldap/slapd.conf; then
-   eerror "OpenLDAP >= 2.6.x has dropped support 
for Berkeley DB."
+   eerror "OpenLDAP >= 2.5.x has dropped support 
for Berkeley DB."
eerror "You will need to migrate per upstream's 
migration notes"
eerror "at 
https://www.openldap.org/doc/admin25/appendix-upgrading.html.;
eerror "Your existing database will not be 
accessible until it is"

[gentoo-commits] repo/proj/libressl:master commit in: net-nds/openldap/

2023-07-03 Thread orbea 
commit: 294230eb4f7298e6ce1098ead70bce019cc5e62d
Author: orbea  riseup  net>
AuthorDate: Tue Jul  4 03:39:37 2023 +
Commit: orbea  riseup  net>
CommitDate: Tue Jul  4 03:39:37 2023 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=294230eb

net-nds/openldap: destabilize 2.6.3-r7 for ~hppa

Signed-off-by: orbea  riseup.net>

 net-nds/openldap/openldap-2.6.3-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-nds/openldap/openldap-2.6.3-r7.ebuild 
b/net-nds/openldap/openldap-2.6.3-r7.ebuild
index 7c5657c..7b4851a 100644
--- a/net-nds/openldap/openldap-2.6.3-r7.ebuild
+++ b/net-nds/openldap/openldap-2.6.3-r7.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}"/${PN}-OPENLDAP_REL_ENG_${MY_PV}
 LICENSE="OPENLDAP GPL-2"
 # Subslot added for bug #835654
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE_DAEMON="argon2 +cleartext crypt experimental minimal samba tcpd"
 IUSE_OVERLAY="overlays perl autoca"

[gentoo-commits] repo/proj/libressl:master commit in: net-nds/openldap/

2023-05-31 Thread orbea 
commit: 5618306d3a44865261cf929c5760669611c67502
Author: orbea  riseup  net>
AuthorDate: Wed May 31 13:06:35 2023 +
Commit: orbea  riseup  net>
CommitDate: Wed May 31 13:06:35 2023 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=5618306d

net-nds/openldap: drop 2.5.14, 2.6.4-r1

Bug: https://bugs.gentoo.org/903001
Upstream-PR: https://github.com/gentoo/gentoo/pull/31050
Signed-off-by: orbea  riseup.net>

 net-nds/openldap/Manifest |   2 -
 net-nds/openldap/openldap-2.5.14.ebuild   | 866 -
 net-nds/openldap/openldap-2.6.4-r1.ebuild | 867 --
 3 files changed, 1735 deletions(-)

diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index d5da25e..1e7927c 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -1,4 +1,2 @@
-DIST openldap-OPENLDAP_REL_ENG_2_5_14.tar.bz2 5024359 BLAKE2B 
ffdffbd47e76545c2dc2d433d290945ab6eebd910031a60249cd8f6eac24f67841098e61c7e57864428e20a183a46d36dac422bba8cf6f3596f97439875af96b
 SHA512 
abd1e8bda0762500db028f283fe2da9480a419072927295d6f3e1448cae130592511f385a87585843cf88217417c90ef57174ca919cfcf163eb41642a72bb4e3
 DIST openldap-OPENLDAP_REL_ENG_2_6_3.tar.gz 6244895 BLAKE2B 
97792a1b368de44867b0ce9eef38601c3e64b7d40e4ca206295bee110097697c919040d2220eea6f0581812e09a2cc3e6afb4a243a5072a8a0a95f24f9fb354b
 SHA512 
1c882a0cd0729b5d0f40b58588d0e36ae3b1cae6d569f0576e940c7c63d03c29ed2c9db87695a87594ba99a927ef4cba491bddba3ce049025fd5883463122ba7
-DIST openldap-OPENLDAP_REL_ENG_2_6_4.tar.bz2 5043227 BLAKE2B 
9bec77dbace0e52d1607d9ac13a77349e7d0b8876aa81fa635893638d00db58ec6bf8412f11fd266bba0440887be1aa21eb4a876122152f7f6de9fd8f75b6b4c
 SHA512 
bff11bf1ae125bcabbd307f6c4e1c102a8df6f1091f84f5e7053fdbaa89ccd6aa0c86cc8dcce4fb9b6ffd853b5f8d3c933733f5713aeb4d6a9d77ab145293b48
 DIST rfc2307bis.schema-20140524 12262 BLAKE2B 
98031f49e9bde1e4821e637af3382364d8344ed7017649686a088070d96a632dffa6c661552352656b1b159c0fd962965580069a64c7f3d5bb6a3ed75f60fd99
 SHA512 
83b89a1deeefc8566b97e7e865b9b6d04541099cbdf719e24538a7d27d61b6209e87ab9003a9f140bd9afd018ec569e71721e3a24090e1902c8b6659d2ba103e

diff --git a/net-nds/openldap/openldap-2.5.14.ebuild 
b/net-nds/openldap/openldap-2.5.14.ebuild
deleted file mode 100644
index df5520d..000
--- a/net-nds/openldap/openldap-2.5.14.ebuild
+++ /dev/null
@@ -1,866 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Re cleanups:
-# 2.5.x is an LTS release so we want to keep it for a while.
-
-inherit autotools flag-o-matic multilib multilib-minimal preserve-libs 
ssl-cert toolchain-funcs systemd tmpfiles
-
-MY_PV="$(ver_rs 1-2 _)"
-
-BIS_PN=rfc2307bis.schema
-BIS_PV=20140524
-BIS_P="${BIS_PN}-${BIS_PV}"
-
-DESCRIPTION="LDAP suite of application and development tools"
-HOMEPAGE="https://www.openldap.org/;
-SRC_URI="
-   
https://gitlab.com/openldap/${PN}/-/archive/OPENLDAP_REL_ENG_${MY_PV}/${PN}-OPENLDAP_REL_ENG_${MY_PV}.tar.bz2
-   mirror://gentoo/${BIS_P}
-"
-S="${WORKDIR}"/${PN}-OPENLDAP_REL_ENG_${MY_PV}
-
-LICENSE="OPENLDAP GPL-2"
-# Subslot added for bug #835654
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-IUSE_DAEMON="argon2 +cleartext crypt experimental minimal samba tcpd"
-IUSE_OVERLAY="overlays perl autoca"
-IUSE_OPTIONAL="debug gnutls iodbc ipv6 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 debug sasl )
-   autoca? ( !gnutls )
-   ?? ( test minimal )
-   kerberos? ( ?? ( kinit smbkrb5passwd ) )"
-
-SYSTEM_LMDB_VER=0.9.30
-# openssl is needed to generate lanman-passwords required by samba
-COMMON_DEPEND="
-   kernel_linux? ( sys-apps/util-linux )
-   ssl? (
-   !gnutls? (
-   >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
-   )
-   gnutls? (
-   >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}]
-   >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}]
-   )
-   )
-   sasl? ( dev-libs/cyrus-sasl:= )
-   !minimal? (
-   dev-libs/libltdl
-   sys-fs/e2fsprogs
-   >=dev-db/lmdb-${SYSTEM_LMDB_VER}:=
-   argon2? ( app-crypt/argon2:= )
-   crypt? ( virtual/libcrypt:= )
-   tcpd? ( sys-apps/tcp-wrappers )
-   odbc? ( !iodbc? ( dev-db/unixODBC )
-   iodbc? ( dev-db/libiodbc ) )
-   perl? ( dev-lang/perl:=[-build(-)] )
-   samba? (
-

[gentoo-commits] repo/proj/libressl:master commit in: net-nds/openldap/, net-nds/openldap/files/

2023-05-31 Thread orbea 
commit: 74cff2ebe3f99bcbf115c77cf564591918e9ab54
Author: orbea  riseup  net>
AuthorDate: Wed May 31 13:16:50 2023 +
Commit: orbea  riseup  net>
CommitDate: Wed May 31 13:16:50 2023 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=74cff2eb

net-nds/openldap: use upstream libressl patch

Signed-off-by: orbea  riseup.net>

 .../openldap/files/openldap-2.6.4-libressl.patch   | 38 ++
 net-nds/openldap/openldap-2.6.3-r7.ebuild  |  6 +---
 2 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/net-nds/openldap/files/openldap-2.6.4-libressl.patch 
b/net-nds/openldap/files/openldap-2.6.4-libressl.patch
new file mode 100644
index 000..48a8a43
--- /dev/null
+++ b/net-nds/openldap/files/openldap-2.6.4-libressl.patch
@@ -0,0 +1,38 @@
+https://bugs.gentoo.org/903001
+https://bugs.openldap.org/show_bug.cgi?id=10039
+https://git.openldap.org/openldap/openldap/-/merge_requests/613
+https://git.openldap.org/openldap/openldap/-/commit/cb73e60a49f85bf5207b2fd0f557013be29ac072
+
+From cb73e60a49f85bf5207b2fd0f557013be29ac072 Mon Sep 17 00:00:00 2001
+From: orbea 
+Date: Wed, 12 Apr 2023 12:55:46 -0700
+Subject: [PATCH] ITS#10039 Test for SSL_CTX_set_ciphersuites()
+
+When configuring OpenLDAP using --with-tls=openssl with LibreSSL the
+configure will fail to detect SSL_export_keyring_material_early() since
+LibreSSL doesn't support this function yet. However OpenLDAP doesn't
+actually use this function and only checks for it to ensure a modern
+OpenSSL API is used. This can be easily solved by checking for an
+equivalent modern OpenSSL function which both LibreSSL and OpenSSL both
+support such as SSL_CTX_set_ciphersuites(). Doing this allows the build
+and tests to succeed with modern LibreSSL versions. This was tested with
+LibreSSL >= 3.6.
+
+Bug: https://bugs.openldap.org/show_bug.cgi?id=10039
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2cf28ef346..c4e2a905e2 100644
+--- a/configure.ac
 b/configure.ac
+@@ -1243,7 +1243,7 @@ if test $ol_with_tls = openssl || test $ol_with_tls = 
auto ; then
+ [#endif]])],
+   , [AC_MSG_FAILURE([OpenSSL 1.1.1 or 
newer required])])
+ 
+-  AC_CHECK_LIB(ssl, SSL_export_keying_material_early,
++  AC_CHECK_LIB(ssl, SSL_CTX_set_ciphersuites,
+   [have_openssl=yes], [have_openssl=no],
+   [-lcrypto])
+ 

diff --git a/net-nds/openldap/openldap-2.6.3-r7.ebuild 
b/net-nds/openldap/openldap-2.6.3-r7.ebuild
index 1d206ef..7c5657c 100644
--- a/net-nds/openldap/openldap-2.6.3-r7.ebuild
+++ b/net-nds/openldap/openldap-2.6.3-r7.ebuild
@@ -144,6 +144,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.6.1-fix-missing-mapping.patch
"${FILESDIR}"/${PN}-2.6.1-fix-bashism-configure.patch
"${FILESDIR}"/${PN}-2.6.3-clang16.patch
+   "${FILESDIR}"/${PN}-2.6.4-libressl.patch
 )
 
 openldap_filecount() {
@@ -498,11 +499,6 @@ multilib_src_configure() {
 
tc-export AR CC CXX
 
-   # Fix for libressl from OpenBSD:
-   # bypass autoconf check for OpenSSL 1.1.1+ function which is not
-   # actually used in OpenLDAP code
-   export ac_cv_lib_ssl_SSL_export_keying_material_early=yes
-
ECONF_SOURCE="${S}" econf \
--libexecdir="${EPREFIX}"/usr/$(get_libdir)/openldap \
--localstatedir="${EPREFIX}"/var \

[gentoo-commits] repo/proj/libressl:master commit in: net-nds/openldap/

2023-05-31 Thread orbea 
commit: e66a37f667d8ded31b4db4df4fea5c5ff4c22ff3
Author: orbea  riseup  net>
AuthorDate: Wed May 31 13:08:08 2023 +
Commit: orbea  riseup  net>
CommitDate: Wed May 31 13:08:08 2023 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=e66a37f6

net-nds/openldap: unkeyword 2.6.3-r7 for ~x86-solaris

Signed-off-by: orbea  riseup.net>

 net-nds/openldap/openldap-2.6.3-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-nds/openldap/openldap-2.6.3-r7.ebuild 
b/net-nds/openldap/openldap-2.6.3-r7.ebuild
index 138d31c..1d206ef 100644
--- a/net-nds/openldap/openldap-2.6.3-r7.ebuild
+++ b/net-nds/openldap/openldap-2.6.3-r7.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}"/${PN}-OPENLDAP_REL_ENG_${MY_PV}
 LICENSE="OPENLDAP GPL-2"
 # Subslot added for bug #835654
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE_DAEMON="argon2 +cleartext crypt experimental minimal samba tcpd"
 IUSE_OVERLAY="overlays perl autoca"

[gentoo-commits] repo/proj/libressl:master commit in: net-nds/openldap/

2023-05-10 Thread orbea 
commit: d153a43a6fe9a952f81e399d3d12cc59d069d613
Author: orbea  riseup  net>
AuthorDate: Wed May 10 19:42:17 2023 +
Commit: orbea  riseup  net>
CommitDate: Wed May 10 19:55:24 2023 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=d153a43a

net-nds/openldap: stabilize 2.5.14

Signed-off-by: orbea  riseup.net>

 net-nds/openldap/openldap-2.5.14.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-nds/openldap/openldap-2.5.14.ebuild 
b/net-nds/openldap/openldap-2.5.14.ebuild
index 6cf81a4..df5520d 100644
--- a/net-nds/openldap/openldap-2.5.14.ebuild
+++ b/net-nds/openldap/openldap-2.5.14.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}"/${PN}-OPENLDAP_REL_ENG_${MY_PV}
 LICENSE="OPENLDAP GPL-2"
 # Subslot added for bug #835654
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 IUSE_DAEMON="argon2 +cleartext crypt experimental minimal samba tcpd"
 IUSE_OVERLAY="overlays perl autoca"

[gentoo-commits] repo/proj/libressl:master commit in: net-nds/openldap/files/, net-nds/openldap/

2023-04-11 Thread orbea 
commit: a536db7c392465301259b2a502dc06a7ef51e2d1
Author: orbea  riseup  net>
AuthorDate: Sat Apr  8 22:42:15 2023 +
Commit: orbea  riseup  net>
CommitDate: Wed Apr 12 01:59:56 2023 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=a536db7c

net-nds/openldap: Add 2.5.14, 2.6.3-r7, 2.6.4-r1

Also removes 2.6.1-r1 + 2.6.2

Upstream-issue: https://bugs.openldap.org/show_bug.cgi?id=10039
Upstream-PR: https://git.openldap.org/openldap/openldap/-/merge_requests/612
Closes: https://github.com/gentoo/libressl/pull/513
Signed-off-by: orbea  riseup.net>

 net-nds/openldap/Manifest  |   5 +-
 .../openldap/files/openldap-2.6.1-make-flags.patch |  59 --
 .../files/openldap-2.6.1-parallel-build.patch  |  46 
 .../openldap/files/openldap-2.6.3-clang16.patch| 185 
 net-nds/openldap/files/openldap-2.6.3-slapd-conf   |  64 ++
 .../openldap/files/openldap-2.6.4-clang16.patch| 234 +
 net-nds/openldap/files/slapd-2.6.1.service |   1 +
 net-nds/openldap/files/slapd-confd |  14 --
 net-nds/openldap/files/slapd-initd |  29 ---
 net-nds/openldap/metadata.xml  |   5 +-
 ...ldap-2.6.1-r1.ebuild => openldap-2.5.14.ebuild} | 148 +
 ...ap-2.6.1-r1.ebuild => openldap-2.6.3-r7.ebuild} |  74 +--
 ...nldap-2.6.2.ebuild => openldap-2.6.4-r1.ebuild} | 142 +
 13 files changed, 748 insertions(+), 258 deletions(-)

diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index dfa5c56..d5da25e 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -1,3 +1,4 @@
-DIST openldap-OPENLDAP_REL_ENG_2_6_1.tar.gz 6211863 BLAKE2B 
81f4591db483a214351c2e02631fef2875e17e0890fc621182d2ed61d927c3c029a4f290ee6c0788952495d6f7a76ed15e62557b8d8f2e241d867e19fdf223b7
 SHA512 
ca61c1dccf3194d8d149ca0c45a4834d6fadf67a3676cf348f5f62ab92c94bc7501216d7da681c3a6f87f646a18d0f3d116c3d3a24d2e5cbebc6c695c986e517
-DIST openldap-OPENLDAP_REL_ENG_2_6_2.tar.gz 6216063 BLAKE2B 
51c8d5ee712971c1aeeaedfc7bb89e65b2ccc2dc171bd0fb99e2b568d70ea5c66903194ab92a66de88fd9bc78511ffee0ab595b13a725933c7084943ac8c624a
 SHA512 
0668165e194a7b1a483f88bf6b0f6eab2707c404f6c3164948cb11896c5e5411972a0677a927c0e509e98bfebb75b79e514bb6346b23d35687d9234f973d7520
+DIST openldap-OPENLDAP_REL_ENG_2_5_14.tar.bz2 5024359 BLAKE2B 
ffdffbd47e76545c2dc2d433d290945ab6eebd910031a60249cd8f6eac24f67841098e61c7e57864428e20a183a46d36dac422bba8cf6f3596f97439875af96b
 SHA512 
abd1e8bda0762500db028f283fe2da9480a419072927295d6f3e1448cae130592511f385a87585843cf88217417c90ef57174ca919cfcf163eb41642a72bb4e3
+DIST openldap-OPENLDAP_REL_ENG_2_6_3.tar.gz 6244895 BLAKE2B 
97792a1b368de44867b0ce9eef38601c3e64b7d40e4ca206295bee110097697c919040d2220eea6f0581812e09a2cc3e6afb4a243a5072a8a0a95f24f9fb354b
 SHA512 
1c882a0cd0729b5d0f40b58588d0e36ae3b1cae6d569f0576e940c7c63d03c29ed2c9db87695a87594ba99a927ef4cba491bddba3ce049025fd5883463122ba7
+DIST openldap-OPENLDAP_REL_ENG_2_6_4.tar.bz2 5043227 BLAKE2B 
9bec77dbace0e52d1607d9ac13a77349e7d0b8876aa81fa635893638d00db58ec6bf8412f11fd266bba0440887be1aa21eb4a876122152f7f6de9fd8f75b6b4c
 SHA512 
bff11bf1ae125bcabbd307f6c4e1c102a8df6f1091f84f5e7053fdbaa89ccd6aa0c86cc8dcce4fb9b6ffd853b5f8d3c933733f5713aeb4d6a9d77ab145293b48
 DIST rfc2307bis.schema-20140524 12262 BLAKE2B 
98031f49e9bde1e4821e637af3382364d8344ed7017649686a088070d96a632dffa6c661552352656b1b159c0fd962965580069a64c7f3d5bb6a3ed75f60fd99
 SHA512 
83b89a1deeefc8566b97e7e865b9b6d04541099cbdf719e24538a7d27d61b6209e87ab9003a9f140bd9afd018ec569e71721e3a24090e1902c8b6659d2ba103e

diff --git a/net-nds/openldap/files/openldap-2.6.1-make-flags.patch 
b/net-nds/openldap/files/openldap-2.6.1-make-flags.patch
deleted file mode 100644
index bf94f99..000
--- a/net-nds/openldap/files/openldap-2.6.1-make-flags.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-https://github.com/openldap/openldap/commit/8e3f87f86a51e78bffefb85968e5684213422cb7
-
-From: Orgad Shaneh 
-Date: Tue, 25 Jan 2022 17:38:46 +0200
-Subject: [PATCH] ITS#9788 Fix make jobserver warnings
-
-Running make -j8 issues the following warning for each directory with
-make 4.3:
-make[2]: warning: -j8 forced in submake: resetting jobserver mode.
-
-There is no need to pass MFLAGS. Make picks it up from the
-environment anyway.
 a/build/dir.mk
-+++ b/build/dir.mk
-@@ -21,7 +21,7 @@ all-common: FORCE
-   @echo "Making all in `$(PWD)`"
-   @for i in $(SUBDIRS) $(ALLDIRS); do \
-   echo "  Entering subdirectory $$i"; \
--  ( cd $$i && $(MAKE) $(MFLAGS) all );\
-+  ( cd $$i && $(MAKE) all );  \
-   if test $$? != 0 ; then exit 1; fi ;\
-   echo " ";   
\
-   done
-@@ -30,7 +30,7 @@ install-common: FORCE
-   @echo "Making install in `$(PWD)`"
-   @for i in $(SUBDIRS)

[gentoo-commits] repo/proj/libressl:master commit in: net-nds/openldap/, net-nds/openldap/files/

2022-07-10 Thread Quentin Retornaz 
commit: 22d7398c75ccff4bcf6a7029e2fe5227e2d9f28f
Author: orbea  riseup  net>
AuthorDate: Fri Jul  8 15:42:32 2022 +
Commit: Quentin Retornaz  retornaz  com>
CommitDate: Sun Jul 10 22:51:15 2022 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=22d7398c

net-nds/openldap: Add 2.6.1-r1 + 2.6.2

Fix copied from OpenBSD:

  bypass autoconf check for OpenSSL 1.1.1+ function which is not
  actually used in OpenLDAP code

  export ac_cv_lib_ssl_SSL_export_keying_material_early=yes

Earlier 2.4.x versions now work with libressl-3.5.x using the ebuilds from
the ::gentoo repo while 2.5.4-r1 lacks keywords and is broken for unrelated
reasons.

Signed-off-by: orbea  riseup.net>
Signed-off-by: Quentin Retornaz  retornaz.com>

 net-nds/openldap/Manifest  |   2 +
 .../files/openldap-2.2.14-perlthreadsfix.patch |   5 +-
 .../openldap/files/openldap-2.4.11-libldap_r.patch |   5 +-
 .../openldap/files/openldap-2.4.15-ppolicy.patch   |   4 +-
 net-nds/openldap/files/openldap-2.4.17-gcc44.patch |   5 +-
 .../openldap/files/openldap-2.4.28-fix-dash.patch  |   2 -
 .../files/openldap-2.4.28-gnutls-gcrypt.patch  |   4 +-
 .../files/openldap-2.4.35-contrib-samba4.patch |   5 +-
 .../files/openldap-2.4.35-contrib-smbk5pwd.patch   |   5 +-
 .../files/openldap-2.4.42-mdb-unbundle.patch   |  16 +-
 ...enldap-2.4.45-fix-lmpasswd-gnutls-symbols.patch |   4 +-
 .../openldap/files/openldap-2.4.47-warnings.patch  |   6 -
 .../files/openldap-2.4.6-evolution-ntlm.patch  |  15 +-
 net-nds/openldap/files/openldap-2.6.1-cloak.patch  |  21 +
 .../openldap-2.6.1-fix-bashism-configure.patch |  11 +
 .../files/openldap-2.6.1-fix-missing-mapping.patch |  15 +
 net-nds/openldap/files/openldap-2.6.1-flags.patch  | 352 +
 .../openldap/files/openldap-2.6.1-make-flags.patch |  59 ++
 .../files/openldap-2.6.1-parallel-build.patch  |  46 ++
 ...undle.patch => openldap-2.6.1-system-mdb.patch} | 140 ++--
 net-nds/openldap/files/slapd-2.6.1.service |  12 +
 net-nds/openldap/files/slapd-confd-2.6.1   |  26 +
 net-nds/openldap/files/slapd-initd |  10 +-
 net-nds/openldap/files/slapd-initd-2.4.40-r2   |   4 +-
 net-nds/openldap/metadata.xml  |   7 +-
 net-nds/openldap/openldap-2.6.1-r1.ebuild  | 804 +
 net-nds/openldap/openldap-2.6.2.ebuild | 803 
 27 files changed, 2266 insertions(+), 122 deletions(-)

diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index cefb5ba..449821d 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -1,2 +1,4 @@
 DIST openldap-2.4.56.tgz 5885444 BLAKE2B 
cebb189346f9114ed6e2dbb11a836c0b802e28f42d49351d6e807cba9c0f49e85ab3dbb34260b7c5eb3849c181eb51046ef48f555083647e3ce83209d6224bbb
 SHA512 
cf371db5595d5b6643db3e6788ce56e34fe271c244dd39d781cadd2a7f85cec421a51c11a4857a7e286ba94a27c1f0dab0ff27e8de20208587471f4a589588e6
+DIST openldap-OPENLDAP_REL_ENG_2_6_1.tar.gz 6211863 BLAKE2B 
81f4591db483a214351c2e02631fef2875e17e0890fc621182d2ed61d927c3c029a4f290ee6c0788952495d6f7a76ed15e62557b8d8f2e241d867e19fdf223b7
 SHA512 
ca61c1dccf3194d8d149ca0c45a4834d6fadf67a3676cf348f5f62ab92c94bc7501216d7da681c3a6f87f646a18d0f3d116c3d3a24d2e5cbebc6c695c986e517
+DIST openldap-OPENLDAP_REL_ENG_2_6_2.tar.gz 6216063 BLAKE2B 
51c8d5ee712971c1aeeaedfc7bb89e65b2ccc2dc171bd0fb99e2b568d70ea5c66903194ab92a66de88fd9bc78511ffee0ab595b13a725933c7084943ac8c624a
 SHA512 
0668165e194a7b1a483f88bf6b0f6eab2707c404f6c3164948cb11896c5e5411972a0677a927c0e509e98bfebb75b79e514bb6346b23d35687d9234f973d7520
 DIST rfc2307bis.schema-20140524 12262 BLAKE2B 
98031f49e9bde1e4821e637af3382364d8344ed7017649686a088070d96a632dffa6c661552352656b1b159c0fd962965580069a64c7f3d5bb6a3ed75f60fd99
 SHA512 
83b89a1deeefc8566b97e7e865b9b6d04541099cbdf719e24538a7d27d61b6209e87ab9003a9f140bd9afd018ec569e71721e3a24090e1902c8b6659d2ba103e

diff --git a/net-nds/openldap/files/openldap-2.2.14-perlthreadsfix.patch 
b/net-nds/openldap/files/openldap-2.2.14-perlthreadsfix.patch
index ddb6672..2a8c4bc 100644
--- a/net-nds/openldap/files/openldap-2.2.14-perlthreadsfix.patch
+++ b/net-nds/openldap/files/openldap-2.2.14-perlthreadsfix.patch
@@ -1,6 +1,5 @@
-diff -ur openldap-2.2.14.orig/servers/slapd/back-perl/Makefile.in 
openldap-2.2.14/servers/slapd/back-perl/Makefile.in
 openldap-2.2.14.orig/servers/slapd/back-perl/Makefile.in   2004-04-12 
11:20:14.0 -0700
-+++ openldap-2.2.14/servers/slapd/back-perl/Makefile.in2004-06-20 
18:43:41.0 -0700
+--- a/servers/slapd/back-perl/Makefile.in
 b/servers/slapd/back-perl/Makefile.in
 @@ -31,7 +31,7 @@
  
  shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)

diff --git a/net-nds/openldap/files/openldap-2.4.11-libldap_r.patch 
b/net-nds/openldap/files/openldap-2.4.11-libldap_r.patch
index 448249a..f63ad3c 100644
--- a/net-nds/openldap/files/openldap-2.4.11-libldap_r.patch
+++

[gentoo-commits] repo/proj/libressl:master commit in: net-nds/openldap/, net-nds/openldap/files/

2022-07-10 Thread Quentin Retornaz 
commit: c56dc77a5eb29dc6ecdeacb6b74c153bcf1a86c0
Author: orbea  riseup  net>
AuthorDate: Fri Jul  8 15:46:11 2022 +
Commit: Quentin Retornaz  retornaz  com>
CommitDate: Sun Jul 10 22:51:15 2022 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=c56dc77a

net-nds/openldap: Remove old version

Signed-off-by: orbea  riseup.net>
Closes: https://github.com/gentoo/libressl/pull/446
Signed-off-by: Quentin Retornaz  retornaz.com>

 net-nds/openldap/Manifest  |   1 -
 .../openldap/files/openldap-2.4.47-libressl.patch  |  58 --
 net-nds/openldap/openldap-2.4.56.ebuild| 905 -
 3 files changed, 964 deletions(-)

diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 449821d..dfa5c56 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -1,4 +1,3 @@
-DIST openldap-2.4.56.tgz 5885444 BLAKE2B 
cebb189346f9114ed6e2dbb11a836c0b802e28f42d49351d6e807cba9c0f49e85ab3dbb34260b7c5eb3849c181eb51046ef48f555083647e3ce83209d6224bbb
 SHA512 
cf371db5595d5b6643db3e6788ce56e34fe271c244dd39d781cadd2a7f85cec421a51c11a4857a7e286ba94a27c1f0dab0ff27e8de20208587471f4a589588e6
 DIST openldap-OPENLDAP_REL_ENG_2_6_1.tar.gz 6211863 BLAKE2B 
81f4591db483a214351c2e02631fef2875e17e0890fc621182d2ed61d927c3c029a4f290ee6c0788952495d6f7a76ed15e62557b8d8f2e241d867e19fdf223b7
 SHA512 
ca61c1dccf3194d8d149ca0c45a4834d6fadf67a3676cf348f5f62ab92c94bc7501216d7da681c3a6f87f646a18d0f3d116c3d3a24d2e5cbebc6c695c986e517
 DIST openldap-OPENLDAP_REL_ENG_2_6_2.tar.gz 6216063 BLAKE2B 
51c8d5ee712971c1aeeaedfc7bb89e65b2ccc2dc171bd0fb99e2b568d70ea5c66903194ab92a66de88fd9bc78511ffee0ab595b13a725933c7084943ac8c624a
 SHA512 
0668165e194a7b1a483f88bf6b0f6eab2707c404f6c3164948cb11896c5e5411972a0677a927c0e509e98bfebb75b79e514bb6346b23d35687d9234f973d7520
 DIST rfc2307bis.schema-20140524 12262 BLAKE2B 
98031f49e9bde1e4821e637af3382364d8344ed7017649686a088070d96a632dffa6c661552352656b1b159c0fd962965580069a64c7f3d5bb6a3ed75f60fd99
 SHA512 
83b89a1deeefc8566b97e7e865b9b6d04541099cbdf719e24538a7d27d61b6209e87ab9003a9f140bd9afd018ec569e71721e3a24090e1902c8b6659d2ba103e

diff --git a/net-nds/openldap/files/openldap-2.4.47-libressl.patch 
b/net-nds/openldap/files/openldap-2.4.47-libressl.patch
deleted file mode 100644
index 5e5b3e3..000
--- a/net-nds/openldap/files/openldap-2.4.47-libressl.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git a/libraries/libldap/tls_o.c b/libraries/libldap/tls_o.c
-index b0277dfe9..8a3f47a74 100644
 a/libraries/libldap/tls_o.c
-+++ b/libraries/libldap/tls_o.c
-@@ -50,7 +50,7 @@
- #include 
- #endif
- 
--#if OPENSSL_VERSION_NUMBER >= 0x1010
-+#if OPENSSL_VERSION_NUMBER >= 0x1010 && !defined(LIBRESSL_VERSION_NUMBER)
- #define ASN1_STRING_data(x)   ASN1_STRING_get0_data(x)
- #endif
- 
-@@ -200,7 +200,7 @@ tlso_init( void )
-   (void) tlso_seed_PRNG( lo->ldo_tls_randfile );
- #endif
- 
--#if OPENSSL_VERSION_NUMBER < 0x1010
-+#if OPENSSL_VERSION_NUMBER < 0x1010 || defined(LIBRESSL_VERSION_NUMBER)
-   SSL_load_error_strings();
-   SSL_library_init();
-   OpenSSL_add_all_digests();
-@@ -252,7 +252,7 @@ static void
- tlso_ctx_ref( tls_ctx *ctx )
- {
-   tlso_ctx *c = (tlso_ctx *)ctx;
--#if OPENSSL_VERSION_NUMBER < 0x1010
-+#if OPENSSL_VERSION_NUMBER < 0x1010 || defined(LIBRESSL_VERSION_NUMBER)
- #define   SSL_CTX_up_ref(ctx) CRYPTO_add( &(ctx->references), 1, 
CRYPTO_LOCK_SSL_CTX )
- #endif
-   SSL_CTX_up_ref( c );
-@@ -511,7 +511,7 @@ tlso_session_my_dn( tls_session *sess, struct berval 
*der_dn )
-   if (!x) return LDAP_INVALID_CREDENTIALS;
-   
-   xn = X509_get_subject_name(x);
--#if OPENSSL_VERSION_NUMBER < 0x1010
-+#if OPENSSL_VERSION_NUMBER < 0x1010 || defined(LIBRESSL_VERSION_NUMBER)
-   der_dn->bv_len = i2d_X509_NAME( xn, NULL );
-   der_dn->bv_val = xn->bytes->data;
- #else
-@@ -547,7 +547,7 @@ tlso_session_peer_dn( tls_session *sess, struct berval 
*der_dn )
-   return LDAP_INVALID_CREDENTIALS;
- 
-   xn = X509_get_subject_name(x);
--#if OPENSSL_VERSION_NUMBER < 0x1010
-+#if OPENSSL_VERSION_NUMBER < 0x1010 || defined(LIBRESSL_VERSION_NUMBER)
-   der_dn->bv_len = i2d_X509_NAME( xn, NULL );
-   der_dn->bv_val = xn->bytes->data;
- #else
-@@ -768,7 +768,7 @@ struct tls_data {
-   Sockbuf_IO_Desc *sbiod;
- };
- 
--#if OPENSSL_VERSION_NUMBER < 0x1010
-+#if OPENSSL_VERSION_NUMBER < 0x1010 || defined(LIBRESSL_VERSION_NUMBER)
- #define BIO_set_init(b, x)b->init = x
- #define BIO_set_data(b, x)b->ptr = x
- #define BIO_clear_flags(b, x) b->flags &= ~(x)

diff --git a/net-nds/openldap/openldap-2.4.56.ebuild 
b/net-nds/openldap/openldap-2.4.56.ebuild
deleted file mode 100644
index 074195f..000
--- a/net-nds/openldap/openldap-2.4.56.ebuild
+++ /dev/null
@@ -1,905 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-

[gentoo-commits] repo/proj/libressl:master commit in: net-nds/openldap/

2021-05-02 Thread Quentin Retornaz 
commit: ed2331be20ff843aa68226ca7d59b845146d82c2
Author: Quentin Retornaz  retornaz  com>
AuthorDate: Sun May  2 23:50:34 2021 +
Commit: Quentin Retornaz  retornaz  com>
CommitDate: Sun May  2 23:50:34 2021 +
URL:https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=ed2331be

net-nds/openldap: remove libressl USE flag

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Quentin Retornaz  retornaz.com>

 net-nds/openldap/openldap-2.4.56.ebuild | 15 ---
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/net-nds/openldap/openldap-2.4.56.ebuild 
b/net-nds/openldap/openldap-2.4.56.ebuild
index 9aad8b8..074195f 100644
--- a/net-nds/openldap/openldap-2.4.56.ebuild
+++ b/net-nds/openldap/openldap-2.4.56.ebuild
@@ -27,7 +27,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 
~riscv s390 sparc x8
 IUSE_DAEMON="crypt samba tcpd experimental minimal"
 IUSE_BACKEND="+berkdb"
 IUSE_OVERLAY="overlays perl"
-IUSE_OPTIONAL="gnutls iodbc sasl ssl odbc debug ipv6 libressl +syslog selinux 
static-libs test"
+IUSE_OPTIONAL="gnutls iodbc sasl ssl odbc debug ipv6 +syslog selinux 
static-libs test"
 IUSE_CONTRIB="smbkrb5passwd kerberos kinit pbkdf2 sha2"
 IUSE_CONTRIB="${IUSE_CONTRIB} -cxx"
 IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} 
${IUSE_CONTRIB}"
@@ -49,10 +49,7 @@ 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? (
-   !gnutls? (
-   !libressl? ( 
>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-   libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-   )
+   !gnutls? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
gnutls? (
>=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}]
>=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}]
@@ -67,17 +64,13 @@ COMMON_DEPEND="
odbc? ( !iodbc? ( dev-db/unixODBC )
iodbc? ( dev-db/libiodbc ) )
perl? ( dev-lang/perl:=[-build(-)] )
-   samba? (
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   )
+   samba? ( dev-libs/openssl:0= )
berkdb? (