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

[Joonas Niilola]

commit: 7ea4601a769ef519b1e78c05ebd6e2fd31bf81f4
Author: Brahmajit Das  gmail  com>
AuthorDate: Sun Jan 21 17:46:23 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Feb  9 14:57:04 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ea4601a

net-nds/openldap: Fix type mismatches in lloadd

Closes: https://bugs.gentoo.org/920379
Signed-off-by: Brahmajit Das  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/34944
Signed-off-by: Joonas Niilola  gentoo.org>

 .../openldap-2.6.6-fix-type-mismatch-lloadd.patch  |  42 +
 net-nds/openldap/openldap-2.6.6-r1.ebuild  | 871 +
 2 files changed, 913 insertions(+)

diff --git 
a/net-nds/openldap/files/openldap-2.6.6-fix-type-mismatch-lloadd.patch 
b/net-nds/openldap/files/openldap-2.6.6-fix-type-mismatch-lloadd.patch
new file mode 100644
index ..d2335bce9bfd
--- /dev/null
+++ b/net-nds/openldap/files/openldap-2.6.6-fix-type-mismatch-lloadd.patch
@@ -0,0 +1,42 @@
+https://git.openldap.org/openldap/openldap/-/commit/de89b06b031537fb2d14a532d79f7b0772fc1700
+From: =?UTF-8?q?Ond=C5=99ej=20Kuzn=C3=ADk?= 
+Date: Thu, 27 Jul 2023 11:19:20 +0100
+Subject: [PATCH] ITS#10074 Fix type mismatches in lloadd
+
+--- a/servers/lloadd/libevent_support.c
 b/servers/lloadd/libevent_support.c
+@@ -131,6 +131,12 @@ lload_libevent_cond_timedwait(
+ return ldap_pvt_thread_cond_wait( cond, mutex );
+ }
+ 
++unsigned long
++lload_libevent_thread_self( void )
++{
++return (unsigned long)ldap_pvt_thread_self();
++}
++
+ int
+ lload_libevent_init( void )
+ {
+@@ -152,7 +158,7 @@ lload_libevent_init( void )
+ 
+ evthread_set_lock_callbacks(  );
+ evthread_set_condition_callbacks( _cbs );
+-evthread_set_id_callback( ldap_pvt_thread_self );
++evthread_set_id_callback( lload_libevent_thread_self );
+ return 0;
+ }
+ 
+--- a/servers/lloadd/module_init.c
 b/servers/lloadd/module_init.c
+@@ -151,7 +151,6 @@ lload_back_initialize( BackendInfo *bi )
+ {
+ bi->bi_flags = SLAP_BFLAG_STANDALONE;
+ bi->bi_open = lload_back_open;
+-bi->bi_config = config_generic_wrapper;
+ bi->bi_pause = lload_pause_cb;
+ bi->bi_unpause = lload_unpause_cb;
+ bi->bi_close = lload_back_close;
+-- 
+GitLab
+

diff --git a/net-nds/openldap/openldap-2.6.6-r1.ebuild 
b/net-nds/openldap/openldap-2.6.6-r1.ebuild
new file mode 100644
index ..84848052995b
--- /dev/null
+++ b/net-nds/openldap/openldap-2.6.6-r1.ebuild
@@ -0,0 +1,871 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Re cleanups:
+# 2.5.x is an LTS release so we want to keep it for a while.
+
+inherit autotools flag-o-matic multibuild multilib multilib-minimal 
preserve-libs
+inherit 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"
+
+IUSE_DAEMON="argon2 +cleartext crypt experimental minimal samba tcpd"
+IUSE_OVERLAY="overlays perl autoca"
+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 )
+   pbkdf2? ( ssl )
+   test? ( cleartext 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
+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/libevent:=
+   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 )
+

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

[Sam James]

commit: b6788868d80c10a3a37bb3cd6f24cbe3f45284e6
Author: orbea  riseup  net>
AuthorDate: Tue May 16 00:43:47 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 30 21:55:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6788868

net-nds/openldap: add upstream libressl patch

This patch was merged upstream and fixes the configure with LibreSSL.
The configure script checks for SSL_export_keying_material_early() which
LibreSSL doesn't support, but OpenLDAP doesn't actually use this
function and only does this to ensure modern OpenSSL APIs are available.

As a compromise the configure script now checks for the
SSL_CTX_set_ciohersuites() function which both OpenSSL and LibreSSL
support and where currently the rest of the OpenLDAP build and tests
otherwise work with LibreSSL 3.7.2.

Bug: https://bugs.gentoo.org/903001
Upstream-Issue: https://bugs.openldap.org/show_bug.cgi?id=10039
Upstream-PR: https://git.openldap.org/openldap/openldap/-/merge_requests/613
Upstream-Commit: 
https://git.openldap.org/openldap/openldap/-/commit/cb73e60a49f85bf5207b2fd0f557013be29ac072
Signed-off-by: orbea  riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/31050
Signed-off-by: Sam James  gentoo.org>

 .../openldap/files/openldap-2.6.4-libressl.patch   | 38 ++
 net-nds/openldap/openldap-2.5.14.ebuild|  1 +
 net-nds/openldap/openldap-2.6.4-r1.ebuild  |  1 +
 3 files changed, 40 insertions(+)

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 ..48a8a43e731a
--- /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.5.14.ebuild 
b/net-nds/openldap/openldap-2.5.14.ebuild
index b4b51dae0731..8b5c4628b810 100644
--- a/net-nds/openldap/openldap-2.5.14.ebuild
+++ b/net-nds/openldap/openldap-2.5.14.ebuild
@@ -143,6 +143,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.6.1-cloak.patch
"${FILESDIR}"/${PN}-2.6.1-flags.patch
"${FILESDIR}"/${PN}-2.6.4-clang16.patch
+   "${FILESDIR}"/${PN}-2.6.4-libressl.patch #903001
 )
 
 openldap_filecount() {

diff --git a/net-nds/openldap/openldap-2.6.4-r1.ebuild 
b/net-nds/openldap/openldap-2.6.4-r1.ebuild
index 463f6d0f7130..2747bc015832 100644
--- a/net-nds/openldap/openldap-2.6.4-r1.ebuild
+++ b/net-nds/openldap/openldap-2.6.4-r1.ebuild
@@ -144,6 +144,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.6.1-flags.patch
"${FILESDIR}"/${PN}-2.6.1-fix-missing-mapping.patch
"${FILESDIR}"/${PN}-2.6.4-clang16.patch
+   "${FILESDIR}"/${PN}-2.6.4-libressl.patch #903001
 )
 
 openldap_filecount() {

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

[Sam James]

commit: d8ba54d25287641b64419afb1a51f2182ae7490f
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb 10 00:24:43 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 10 00:29:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8ba54d2

net-nds/openldap: add 2.6.4

Bug: https://bugs.gentoo.org/867931
Closes: https://bugs.gentoo.org/848894
Closes: https://bugs.gentoo.org/892009
Signed-off-by: Sam James  gentoo.org>

 net-nds/openldap/Manifest  |   1 +
 .../openldap/files/openldap-2.6.4-clang16.patch| 234 ++
 net-nds/openldap/openldap-2.6.4.ebuild | 834 +
 3 files changed, 1069 insertions(+)

diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 6ae8e93ddfc6..576ad995662b 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -1,4 +1,5 @@
 DIST openldap-2.4.58.tgz 5885225 BLAKE2B 
effb618dba03497796a497cd7f53ec52e389133769321dd242433bed5ec4b1f66cf7353f08a49d5f3465880f6bcfc9afc9c7d2a28e075b66f5fd926b02213541
 SHA512 
2fa2aa36117692eca44e9f162c8c796f78469e6c2aee91b06d46f2b755d416979c913a3d89bbf9db14cc84881ecffee69af75b48e1d16b7aa9d2e3873baa
 DIST openldap-2.4.59.tgz 5886272 BLAKE2B 
a2a8bed1d2af97fd41d651668152fd4740871bc5a8abf4b50390839228af82ac103346b3500ae0f8dd31b708acabb30435b90cd48dfafe510e648df5150d96b8
 SHA512 
233459ab446da6e107a7fc4ecd5668d6b08c11a11359ee76449550393e8f586a29b59d7ae09a050a1fca4fcf388ea61438ef60831b3ae802d92c048365ae3968
 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.4-clang16.patch 
b/net-nds/openldap/files/openldap-2.6.4-clang16.patch
new file mode 100644
index ..bcbdf0b5819e
--- /dev/null
+++ b/net-nds/openldap/files/openldap-2.6.4-clang16.patch
@@ -0,0 +1,234 @@
+https://git.openldap.org/openldap/openldap/-/merge_requests/605
+
+From 83e2db9bf9fc2530a0ea6ca538a7732f6ad9de0e Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Thu, 9 Feb 2023 23:17:53 +
+Subject: [PATCH 1/3] build: fix compatibility with stricter C99 compilers
+
+Fix the following warnings:
+- -Wimplicit-int (fatal with Clang 16)
+- -Wimplicit-function-declaration (fatal with Clang 16)
+- -Wincompatible-function-pointer-types (fatal with Clang 16)
+- -Wint-conversion (fatal with Clang 15)
+- Old style prototypes (K, removed from C23)
+
+These warnings-now-error led to misconfigurations and failure to build
+OpenLDAP, as the tests used during configure caused the wrong results
+to be emitted.
+
+For more information, see LWN.net [0] or LLVM's Discourse [1], the Gentoo wiki 
[2],
+or the (new) c-std-porting mailing list [3].
+
+[0] https://lwn.net/Articles/913505/
+[1] 
https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213
+[2] https://wiki.gentoo.org/wiki/Modern_C_porting
+[3] hosted at lists.linux.dev.
+
+Bug: https://bugs.gentoo.org/871288
+Signed-off-by: Sam James 
+--- a/build/openldap.m4
 b/build/openldap.m4
+@@ -154,6 +154,7 @@ fi
+ if test $ol_cv_header_stdc = yes; then
+   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[#include 
++#include 
+ #ifndef HAVE_EBCDIC
+ # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+ # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+@@ -360,9 +361,7 @@ AC_DEFUN([OL_PTHREAD_TEST_FUNCTION],[[
+ AC_DEFUN([OL_PTHREAD_TEST_PROGRAM],
+ [AC_LANG_SOURCE([OL_PTHREAD_TEST_INCLUDES
+ 
+-int main(argc, argv)
+-  int argc;
+-  char **argv;
++int main(int argc, char **argv)
+ {
+ OL_PTHREAD_TEST_FUNCTION
+ }
+@@ -484,7 +483,7 @@ AC_CACHE_CHECK([for compatible POSIX 
regex],ol_cv_c_posix_regex,[
+ #include 
+ #include 
+ static char *pattern, *string;
+-main()
++int main(void)
+ {
+   int rc;
+   regex_t re;
+@@ -511,7 +510,8 @@ AC_DEFUN([OL_C_UPPER_LOWER],
+ [AC_CACHE_CHECK([if toupper() requires islower()],ol_cv_c_upper_lower,[
+   AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include 
+-main()
++#include 
++int main(void)
+ {

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

[Sam James]

commit: e276465660720433c8261e3fcbdcb974547de341
Author: Sam James  gentoo  org>
AuthorDate: Thu Jan 19 18:01:13 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan 19 18:02:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2764656

net-nds/openldap: fix systemd unit

Closes: https://bugs.gentoo.org/843029
Signed-off-by: Sam James  gentoo.org>

 net-nds/openldap/files/slapd.service| 1 +
 net-nds/openldap/{openldap-2.6.3-r4.ebuild => openldap-2.6.3-r5.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/net-nds/openldap/files/slapd.service 
b/net-nds/openldap/files/slapd.service
index 3427b87e936e..028dc879f46a 100644
--- a/net-nds/openldap/files/slapd.service
+++ b/net-nds/openldap/files/slapd.service
@@ -7,6 +7,7 @@ Type=forking
 PIDFile=/run/openldap/slapd.pid
 ExecStartPre=/usr/sbin/slaptest -Q -u $SLAPD_OPTIONS
 ExecStart=/usr/lib/openldap/slapd -u ldap -h ${SLAPD_URLS} $SLAPD_OPTIONS
+NotifyAccess=all
 
 [Install]
 WantedBy=multi-user.target

diff --git a/net-nds/openldap/openldap-2.6.3-r4.ebuild 
b/net-nds/openldap/openldap-2.6.3-r5.ebuild
similarity index 99%
rename from net-nds/openldap/openldap-2.6.3-r4.ebuild
rename to net-nds/openldap/openldap-2.6.3-r5.ebuild
index 14a589aac4b0..32a69aa7ee54 100644
--- a/net-nds/openldap/openldap-2.6.3-r4.ebuild
+++ b/net-nds/openldap/openldap-2.6.3-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7

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

[Sam James]

commit: d4d1d9ed527058cf86b22407cc492944f9b1e6e5
Author: Sam James  gentoo  org>
AuthorDate: Thu Nov 24 11:17:03 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Nov 24 11:25:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4d1d9ed

net-nds/openldap: fix configure+build w/ clang 16

This affects the macro which ntp bundles too.

Closes: https://bugs.gentoo.org/871288
Bug: https://bugs.gentoo.org/871372
Bug: https://bugs.gentoo.org/882183
Signed-off-by: Sam James  gentoo.org>

 .../openldap/files/openldap-2.6.3-clang16.patch| 139 
 net-nds/openldap/openldap-2.6.3-r1.ebuild  | 797 +
 2 files changed, 936 insertions(+)

diff --git a/net-nds/openldap/files/openldap-2.6.3-clang16.patch 
b/net-nds/openldap/files/openldap-2.6.3-clang16.patch
new file mode 100644
index ..4d9210b1f0fe
--- /dev/null
+++ b/net-nds/openldap/files/openldap-2.6.3-clang16.patch
@@ -0,0 +1,139 @@
+https://bugs.gentoo.org/871288
+https://bugs.gentoo.org/871372
+
+From ee4983302d6f052e77ab0332d2a128d169c2eacb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= 
+Date: Tue, 15 Nov 2022 21:45:27 +0100
+Subject: [PATCH] Remove default-int/k declarations from the configure macros
+
+Recently, Clang tried to switch to having K prototypes and other
+non-strictly-conforming prototypes error out, as a result of C2x changes
+to the standard.  These have been located across many packages, and
+range in severity from mild compile errors to runtime misconfiguration
+as a result of broken configure scripts.
+
+This covers all the instances I could find by grepping around the
+codebase, and gets OpenLDAP building on my system.
+
+Bug: https://bugs.gentoo.org/871288
+--- a/build/openldap.m4
 b/build/openldap.m4
+@@ -360,9 +360,7 @@ AC_DEFUN([OL_PTHREAD_TEST_FUNCTION],[[
+ AC_DEFUN([OL_PTHREAD_TEST_PROGRAM],
+ [AC_LANG_SOURCE([OL_PTHREAD_TEST_INCLUDES
+ 
+-int main(argc, argv)
+-  int argc;
+-  char **argv;
++int main(int argc, char **argv)
+ {
+ OL_PTHREAD_TEST_FUNCTION
+ }
+@@ -484,7 +482,7 @@ AC_CACHE_CHECK([for compatible POSIX 
regex],ol_cv_c_posix_regex,[
+ #include 
+ #include 
+ static char *pattern, *string;
+-main()
++int main(void)
+ {
+   int rc;
+   regex_t re;
+@@ -511,7 +509,7 @@ AC_DEFUN([OL_C_UPPER_LOWER],
+ [AC_CACHE_CHECK([if toupper() requires islower()],ol_cv_c_upper_lower,[
+   AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include 
+-main()
++int main(void)
+ {
+   if ('C' == toupper('C'))
+   exit(0);
+@@ -569,7 +567,7 @@ AC_DEFUN([OL_NONPOSIX_STRERROR_R],
+   
]])],[ol_cv_nonposix_strerror_r=yes],[ol_cv_nonposix_strerror_r=no])
+   else
+   AC_RUN_IFELSE([AC_LANG_SOURCE([[
+-  main() {
++  int main(void) {
+   char buf[100];
+   buf[0] = 0;
+   strerror_r( 1, buf, sizeof buf );
+--- a/configure.ac
 b/configure.ac
+@@ -1547,8 +1547,7 @@ dnl  esac
+ 
+ static int fildes[2];
+ 
+-static void *task(p)
+-  void *p;
++static void *task(void *p)
+ {
+   int i;
+   struct timeval tv;
+@@ -1572,9 +1571,7 @@ static void *task(p)
+   exit(0); /* if we exit here, the select blocked the whole process */
+ }
+ 
+-int main(argc, argv)
+-  int argc;
+-  char **argv;
++int main(int argc, char **argv)
+ {
+   pthread_t t;
+ 
+--- a/contrib/ldaptcl/tclAppInit.c
 b/contrib/ldaptcl/tclAppInit.c
+@@ -45,9 +45,7 @@ EXTERN int   Tcltest_Init _ANSI_ARGS_((Tcl_Interp 
*interp));
+  */
+ 
+ int
+-main(argc, argv)
+-int argc; /* Number of command-line arguments. */
+-char **argv;  /* Values of command-line arguments. */
++main(int argc, char **argv)
+ {
+ #ifdef USE_TCLX
+ TclX_Main(argc, argv, Tcl_AppInit);
+--- a/contrib/ldaptcl/tkAppInit.c
 b/contrib/ldaptcl/tkAppInit.c
+@@ -37,16 +37,9 @@ int (*tclDummyMathPtr)() = matherr;
+  * This is the main program for the application.
+  
*-
+  */
+-#ifdef __cplusplus
+ int
+ main (intargc,
+   char **argv)
+-#else
+-int
+-main (argc, argv)
+-intargc;
+-char **argv;
+-#endif
+ {
+ #ifdef USE_TCLX
+ TkX_Main(argc, argv, Tcl_AppInit);
+@@ -68,14 +61,8 @@ main (argc, argv)
+  * interp->result if an error occurs.
+  
*-
+  */
+-#ifdef __cplusplus
+ int
+ Tcl_AppInit (Tcl_Interp *interp)
+-#else
+-int
+-Tcl_AppInit (interp)
+-Tcl_Interp *interp;
+-#endif
+ {
+ if (Tcl_Init (interp) == TCL_ERROR) {
+ return TCL_ERROR;
+--- a/servers/slapd/syslog.c
 b/servers/slapd/syslog.c
+@@ -209,7 +209,7 @@ openlog(const char *ident, int logstat, int logfac)
+ }
+ 
+ void
+-closelog()
++closelog(void)
+ {
+   (void)close(LogFile);
+  

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

[Sam James]

commit: 524491b7848c723edf7707f1a21bc80a3b7ab3c0
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar 20 20:26:48 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 20 21:04:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=524491b7

net-nds/openldap: drop sys-libs/db (BDB) remnants from 2.6.1

We already dropped the dependency in 2.6.1 so let's
clean up some remnants.

Signed-off-by: Sam James  gentoo.org>

 .../files/openldap-2.6.1-fix-bashism-configure.patch |  2 --
 net-nds/openldap/openldap-2.6.1.ebuild   | 12 +---
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/net-nds/openldap/files/openldap-2.6.1-fix-bashism-configure.patch 
b/net-nds/openldap/files/openldap-2.6.1-fix-bashism-configure.patch
index 93b104198ba6..c2acb679e3ba 100644
--- a/net-nds/openldap/files/openldap-2.6.1-fix-bashism-configure.patch
+++ b/net-nds/openldap/files/openldap-2.6.1-fix-bashism-configure.patch
@@ -1,5 +1,3 @@
-diff --git a/configure.ac b/configure.ac
-index a5075be..b78f2ad 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -2055,7 +2055,7 @@ dnl

diff --git a/net-nds/openldap/openldap-2.6.1.ebuild 
b/net-nds/openldap/openldap-2.6.1.ebuild
index 252fe1d5b198..0edc6a14276a 100644
--- a/net-nds/openldap/openldap-2.6.1.ebuild
+++ b/net-nds/openldap/openldap-2.6.1.ebuild
@@ -38,14 +38,6 @@ REQUIRED_USE="cxx? ( sasl )
 
 S=${WORKDIR}/${PN}-OPENLDAP_REL_ENG_${MY_PV}
 
-# always list newer first
-# Do not add any AGPL-3 BDB here!
-# See bug 525110, comment 15.
-# Advanced usage: OPENLDAP_BDB_SLOTS in the environment can be used to force a 
slot during build.
-BDB_SLOTS="${OPENLDAP_BDB_SLOTS:=5.3 4.8}"
-BDB_PKGS=''
-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? (
@@ -230,6 +222,7 @@ openldap_find_versiontags() {
[[ "${have_files}" == "1" ]] && einfo "DB files present" || einfo "No 
DB files present"
 
# Now we must check for the major version of sys-libs/db linked against.
+   # TODO: remove this as we dropped bdb support (gone upstream) in 2.6.1?
SLAPD_PATH="${EROOT}/usr/$(get_libdir)/openldap/slapd"
if [[ "${have_files}" == "1" ]] && [[ -f "${SLAPD_PATH}" ]]; then
OLDVER="$(/usr/bin/ldd ${SLAPD_PATH} \
@@ -787,9 +780,6 @@ pkg_postinst() {
elog "Getting started using OpenLDAP? There is some 
documentation available:"
elog "Gentoo Guide to OpenLDAP Authentication"
elog 
"(https://wiki.gentoo.org/wiki/Centralized_authentication_using_OpenLDAP)"
-   elog "---"
-   elog "An example file for tuning BDB backends with openldap is"
-   elog "DB_CONFIG.fast.example in /usr/share/doc/${PF}/"
fi
 
preserve_old_lib_notify 
/usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.4$(get_libname 0)

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

[Sam James]

commit: b7da48a7fce92735b1cb9353ea9a85afe8acc139
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar 19 22:34:14 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 19 22:39:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7da48a7

net-nds/openldap: add upstream MAKEOPTS patch

Signed-off-by: Sam James  gentoo.org>

 .../openldap/files/openldap-2.6.1-make-flags.patch | 59 ++
 net-nds/openldap/openldap-2.6.1.ebuild |  1 +
 2 files changed, 60 insertions(+)

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
new file mode 100644
index ..bf94f9958d3a
--- /dev/null
+++ b/net-nds/openldap/files/openldap-2.6.1-make-flags.patch
@@ -0,0 +1,59 @@
+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) $(INSTALLDIRS); do \
+   echo "  Entering subdirectory $$i"; \
+-  ( cd $$i && $(MAKE) $(MFLAGS) install );\
++  ( cd $$i && $(MAKE) install );  \
+   if test $$? != 0 ; then exit 1; fi ;\
+   echo " ";   
\
+   done
+@@ -39,7 +39,7 @@ clean-common: FORCE
+   @echo "Making clean in `$(PWD)`"
+   @for i in $(SUBDIRS) $(CLEANDIRS); do   \
+   echo "  Entering subdirectory $$i"; \
+-  ( cd $$i && $(MAKE) $(MFLAGS) clean );  \
++  ( cd $$i && $(MAKE) clean );\
+   if test $$? != 0 ; then exit 1; fi ;\
+   echo " ";   
\
+   done
+@@ -48,7 +48,7 @@ veryclean-common: FORCE
+   @echo "Making veryclean in `$(PWD)`"
+   @for i in $(SUBDIRS) $(CLEANDIRS); do   \
+   echo "  Entering subdirectory $$i"; \
+-  ( cd $$i && $(MAKE) $(MFLAGS) veryclean );  \
++  ( cd $$i && $(MAKE) veryclean );\
+   if test $$? != 0 ; then exit 1; fi ;\
+   echo " ";   
\
+   done
+@@ -57,7 +57,7 @@ depend-common: FORCE
+   @echo "Making depend in `$(PWD)`"
+   @for i in $(SUBDIRS) $(DEPENDDIRS); do  \
+   echo "  Entering subdirectory $$i"; \
+-  ( cd $$i && $(MAKE) $(MFLAGS) depend ); \
++  ( cd $$i && $(MAKE) depend );   \
+   if test $$? != 0 ; then exit 1; fi ;\
+   echo " ";   
\
+   done

diff --git a/net-nds/openldap/openldap-2.6.1.ebuild 
b/net-nds/openldap/openldap-2.6.1.ebuild
index 7ca516cae4d6..0e0449e3885e 100644
--- a/net-nds/openldap/openldap-2.6.1.ebuild
+++ b/net-nds/openldap/openldap-2.6.1.ebuild
@@ -144,6 +144,7 @@ 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.1-make-flags.patch
 )
 
 openldap_filecount() {

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

[Sam James]

commit: 2f022ebed59863e745ac87005a956b0736266dfe
Author: Sam James  gentoo  org>
AuthorDate: Thu Mar 25 12:39:20 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar 25 13:02:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f022ebe

net-nds/openldap: fix build with slibtool

Thanks-to: orbea  riseup.net>
Closes: https://bugs.gentoo.org/777804
Signed-off-by: Sam James  gentoo.org>

 .../openldap/files/openldap-2.4.58-slibtool.patch  |  33 +
 net-nds/openldap/openldap-2.4.58-r1.ebuild | 915 +
 2 files changed, 948 insertions(+)

diff --git a/net-nds/openldap/files/openldap-2.4.58-slibtool.patch 
b/net-nds/openldap/files/openldap-2.4.58-slibtool.patch
new file mode 100644
index 000..3467248a2a7
--- /dev/null
+++ b/net-nds/openldap/files/openldap-2.4.58-slibtool.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/777804
+
+commit 236b3a0d91774d7032c6aaf483e8a25075f31af3
+Author: orbea 
+Date:   Wed Mar 24 21:38:55 2021 -0700
+
+Fix build with --disable-static and slibtool.
+
+diff --git a/build/top.mk b/build/top.mk
+index f542ded..f07ff77 100644
+--- a/build/top.mk
 b/build/top.mk
+@@ -86,6 +86,11 @@ LTONLY_yes = --tag=disable-shared
+ LTONLY_mod = --tag=disable-static
+ LTONLY_MOD = $(LTONLY_$(BUILD_MOD))
+ 
++# static flag for modules
++STATIC_yes = -static
++STATIC_mod =
++STATIC_MOD = $(STATIC_$(BUILD_MOD))
++
+ # platform-specific libtool flags
+ NT_LTFLAGS_LIB = -no-undefined -avoid-version -rpath $(libdir)
+ NT_LTFLAGS_MOD = -no-undefined -avoid-version -rpath $(moduledir)
+@@ -116,7 +121,7 @@ LTLINK_LIB = $(LIBTOOL) $(LTONLY_LIB) --mode=link \
+   $(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_LIB)
+ 
+ LTCOMPILE_MOD = $(LIBTOOL) $(LTONLY_MOD) --mode=compile \
+-  $(CC) $(LT_CFLAGS) $(LT_CPPFLAGS) $(MOD_DEFS) -c
++  $(CC) $(STATIC_MOD) $(LT_CFLAGS) $(LT_CPPFLAGS) $(MOD_DEFS) -c
+ 
+ LTLINK_MOD = $(LIBTOOL) $(LTONLY_MOD) --mode=link \
+   $(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_MOD)

diff --git a/net-nds/openldap/openldap-2.4.58-r1.ebuild 
b/net-nds/openldap/openldap-2.4.58-r1.ebuild
new file mode 100644
index 000..5b0c6ed7f43
--- /dev/null
+++ b/net-nds/openldap/openldap-2.4.58-r1.ebuild
@@ -0,0 +1,915 @@
+# 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 preserve-libs ssl-cert 
toolchain-funcs systemd tmpfiles
+
+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/;
+
+# upstream mirrors are mostly not working, using canonical URI
+SRC_URI="
+   
https://openldap.org/software/download/OpenLDAP/openldap-release/${P}.tgz
+   
http://gpl.savoirfairelinux.net/pub/mirrors/openldap/openldap-release/${P}.tgz
+   http://repository.linagora.org/OpenLDAP/openldap-release/${P}.tgz
+   
http://mirror.eu.oneandone.net/software/openldap/openldap-release/${P}.tgz
+   mirror://gentoo/${BIS_P}"
+
+LICENSE="OPENLDAP GPL-2"
+SLOT="0"
+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"
+IUSE_OVERLAY="overlays perl"
+IUSE_OPTIONAL="gnutls iodbc sasl ssl odbc debug ipv6 libressl +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}"
+
+RESTRICT="!test? ( test )"
+REQUIRED_USE="cxx? ( sasl )
+   pbkdf2? ( ssl )
+   test? ( berkdb )
+   ?? ( test minimal )"
+
+# always list newer first
+# Do not add any AGPL-3 BDB here!
+# See bug 525110, comment 15.
+# Advanced usage: OPENLDAP_BDB_SLOTS in the environment can be used to force a 
slot during build.
+BDB_SLOTS="${OPENLDAP_BDB_SLOTS:=5.3 5.1 4.8 4.7 4.6 4.5 4.4}"
+BDB_PKGS=''
+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? (
+   >=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-libs/e2fsprogs-libs
+   >=dev-db/lmdb-0.9.18:=
+   tcpd? ( sys-apps/tcp-wrappers )
+   odbc? ( !iodbc? ( dev-db/unixODBC )
+   iodbc? ( dev-db/libiodbc ) 

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

[Patrick McLean]

commit: d8579d0f043e8eefe774b8aec6a21316e0a6c527
Author: Patrick McLean  gentoo  org>
AuthorDate: Thu Jun 29 20:50:02 2017 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Thu Jun 29 20:50:27 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8579d0f

net-nds/openldap: Add patch to build with libressl-2.5.4 and call to epatch_user

Patch pulled from https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=219781

Gentoo-Bug: 622464
Package-Manager: Portage-2.3.6, Repoman-2.3.2

 .../openldap/files/openldap-2.4.45-libressl.patch  | 65 ++
 net-nds/openldap/openldap-2.4.45.ebuild|  5 ++
 2 files changed, 70 insertions(+)

diff --git a/net-nds/openldap/files/openldap-2.4.45-libressl.patch 
b/net-nds/openldap/files/openldap-2.4.45-libressl.patch
new file mode 100644
index 000..20a65a4e0fd
--- /dev/null
+++ b/net-nds/openldap/files/openldap-2.4.45-libressl.patch
@@ -0,0 +1,65 @@
+--- libraries/libldap/tls_o.c.orig 2017-06-04 16:31:28 UTC
 libraries/libldap/tls_o.c
+@@ -47,7 +47,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
+ 
+@@ -157,7 +157,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();
+@@ -205,7 +205,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 );
+@@ -464,7 +464,7 @@ tlso_session_my_dn( tls_session *sess, struct berval *
+   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
+@@ -500,7 +500,7 @@ tlso_session_peer_dn( tls_session *sess, struct berval
+   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
+@@ -721,7 +721,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)
+@@ -822,7 +822,7 @@ tlso_bio_puts( BIO *b, const char *str )
+   return tlso_bio_write( b, str, strlen( str ) );
+ }
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x1010
++#if OPENSSL_VERSION_NUMBER >= 0x1010 && !defined(LIBRESSL_VERSION_NUMBER)
+ struct bio_method_st {
+ int type;
+ const char *name;

diff --git a/net-nds/openldap/openldap-2.4.45.ebuild 
b/net-nds/openldap/openldap-2.4.45.ebuild
index e81d3543054..0ead191e540 100644
--- a/net-nds/openldap/openldap-2.4.45.ebuild
+++ b/net-nds/openldap/openldap-2.4.45.ebuild
@@ -344,10 +344,15 @@ src_prepare() {
# bug #420959
epatch "${FILESDIR}"/${PN}-2.4.31-gcc47.patch
 
+   # bug #622464
+   epatch "${FILESDIR}"/${PN}-2.4.45-libressl.patch
+
# unbundle lmdb
epatch "${FILESDIR}"/${PN}-2.4.42-mdb-unbundle.patch
rm -rf "${S}"/libraries/liblmdb
 
+   epatch_user
+
cd "${S}"/build || die
einfo "Making sure upstream build strip does not do stripping too early"
sed -i.orig \

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

[Matt Thode]

commit: 5edbe19fbef9511ab5de32a435209c6ec0b53bf4
Author: Matthew Thode  gentoo  org>
AuthorDate: Fri Jun 23 16:07:38 2017 +
Commit: Matt Thode  gentoo  org>
CommitDate: Fri Jun 23 16:14:33 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5edbe19f

net-nds/openldap: fix gnutls support in openldap-2.4.45 bug 622460

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 ...enldap-2.4.45-fix-lmpasswd-gnutls-symbols.patch | 109 +
 net-nds/openldap/openldap-2.4.45.ebuild|   2 +-
 2 files changed, 110 insertions(+), 1 deletion(-)

diff --git 
a/net-nds/openldap/files/openldap-2.4.45-fix-lmpasswd-gnutls-symbols.patch 
b/net-nds/openldap/files/openldap-2.4.45-fix-lmpasswd-gnutls-symbols.patch
new file mode 100644
index 000..0859d53caef
--- /dev/null
+++ b/net-nds/openldap/files/openldap-2.4.45-fix-lmpasswd-gnutls-symbols.patch
@@ -0,0 +1,109 @@
+If GnuTLS is used, the lmpasswd module for USE=samba does not compile.
+Forward-port an old Debian patch that upstream never applied.
+
+Signed-off-by: Robin H. Johnson 
+Signed-off-by: Steffen Hau 
+X-Gentoo-Bug: http://bugs.gentoo.org/show_bug.cgi?id=233633
+X-Upstream-Bug: 
http://www.openldap.org/its/index.cgi/Software%20Enhancements?id=4997
+X-Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=245341
+
+--- openldap-2.4.17.orig/libraries/liblutil/passwd.c   2009-07-27 
18:59:19.635995474 -0700
 openldap-2.4.17/libraries/liblutil/passwd.c2009-07-27 
19:01:13.588069010 -0700
+@@ -51,6 +51,26 @@ typedef unsigned char des_data_block[8];
+ typedef PK11Context *des_context[1];
+ #define DES_ENCRYPT CKA_ENCRYPT
+ 
++#elif defined(HAVE_GNUTLS_GNUTLS_H) && !defined(DES_ENCRYPT)
++# include 
++static int gcrypt_init = 0;
++
++typedef const void* des_key;
++typedef unsigned char DES_cblock[8];
++typedef des_cblock des_data_block;
++typedef int DES_key_schedule; /* unused */
++typedef DES_key_schedule des_context; /* unused */
++#define des_failed(encrypted) 0
++#define des_finish(key, schedule) 
++
++#define DES_set_key_unchecked( key, key_sched ) \
++  gcry_cipher_setkey( hd, key, 8 )
++
++#define DES_ecb_encrypt( input, output, key_sched, enc ) \
++  gcry_cipher_encrypt( hd, *output, 8, *input, 8 )
++
++#define DES_set_odd_parity( key ) do {} while(0)
++
+ #endif
+ 
+ #endif /* SLAPD_LMHASH */
+@@ -651,7 +671,7 @@ static int chk_md5(
+ 
+ #ifdef SLAPD_LMHASH
+ 
+-#if defined(HAVE_OPENSSL)
++#if defined(HAVE_OPENSSL) || defined(HAVE_GNUTLS_GNUTLS_H)
+ 
+ /*
+  * abstract away setting the parity.
+@@ -841,6 +861,19 @@ static int chk_lanman(
+   des_data_block StdText = "KGS!@#$%";
+   des_data_block PasswordHash1, PasswordHash2;
+   char PasswordHash[33], storedPasswordHash[33];
++
++#if defined(HAVE_GNUTLS_GNUTLS_H) && !defined(DES_ENCRYPT)
++  gcry_cipher_hd_t hd;
++
++  if ( !gcrypt_init ) {
++gcry_check_version( GCRYPT_VERSION );
++gcrypt_init = 1;
++  }
++
++  schedule = schedule; /* unused - avoid warning */
++
++  gcry_cipher_open( , GCRY_CIPHER_DES, GCRY_CIPHER_MODE_ECB, 0 );
++#endif /* HAVE_GNUTLS_GNUTLS_H && !DES_ENCRYPT */
+   
+   for( i=0; ibv_len; i++) {
+   if(cred->bv_val[i] == '\0') {
+@@ -883,6 +916,10 @@ static int chk_lanman(
+   strncpy( storedPasswordHash, passwd->bv_val, 32 );
+   storedPasswordHash[32] = '\0';
+   ldap_pvt_str2lower( storedPasswordHash );
++
++#if defined(HAVE_GNUTLS_GNUTLS_H) && !defined(DES_ENCRYPT)
++  gcry_cipher_close( hd );
++#endif /* HAVE_GNUTLS_GNUTLS_H && !DES_ENCRYPT */
+   
+   return memcmp( PasswordHash, storedPasswordHash, 32) ? LUTIL_PASSWD_ERR 
: LUTIL_PASSWD_OK;
+ }
+@@ -1138,6 +1175,19 @@ static int hash_lanman(
+   des_data_block PasswordHash1, PasswordHash2;
+   char PasswordHash[33];
+   
++#if defined(HAVE_GNUTLS_GNUTLS_H) && !defined(DES_ENCRYPT)
++  gcry_cipher_hd_t hd;
++
++  if ( !gcrypt_init ) {
++gcry_check_version( GCRYPT_VERSION );
++gcrypt_init = 1;
++  }
++
++  schedule = schedule; /* unused - avoid warning */
++
++  gcry_cipher_open( , GCRY_CIPHER_DES, GCRY_CIPHER_MODE_ECB, 0 );
++#endif /* HAVE_GNUTLS_GNUTLS_H && !DES_ENCRYPT */
++
+   for( i=0; ibv_len; i++) {
+   if(passwd->bv_val[i] == '\0') {
+   return LUTIL_PASSWD_ERR;/* NUL character in 
password */
+@@ -1168,6 +1218,10 @@ static int hash_lanman(
+   
+   hash->bv_val = PasswordHash;
+   hash->bv_len = 32;
++
++#if defined(HAVE_GNUTLS_GNUTLS_H) && !defined(DES_ENCRYPT)
++  gcry_cipher_close( hd );
++#endif /* HAVE_GNUTLS_GNUTLS_H && !DES_ENCRYPT */
+   
+   return pw_string( scheme, hash );
+ }

diff --git a/net-nds/openldap/openldap-2.4.45.ebuild 
b/net-nds/openldap/openldap-2.4.45.ebuild
index 23c66c3db53..b2493271ba4 100644
--- a/net-nds/openldap/openldap-2.4.45.ebuild
+++ 

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

[Matt Thode]

commit: 35b5e4a0bd2ca82f81da2a2aabe9d233a308cd43
Author: Matthew Thode  mthode  org>
AuthorDate: Thu Sep  3 19:33:41 2015 +
Commit: Matt Thode  gentoo  org>
CommitDate: Thu Sep  3 19:34:05 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35b5e4a0

net-nds/openldap: bumping for release, also fixes bug 549614

Package-Manager: portage-2.2.20.1

 net-nds/openldap/Manifest  |   1 +
 .../files/openldap-2.4.42-mdb-unbundle.patch   | 136 
 net-nds/openldap/openldap-2.4.42.ebuild| 809 +
 3 files changed, 946 insertions(+)

diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 501255d..f19bc7d 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -2,4 +2,5 @@ DIST openldap-2.3.43.tgz 3803011 SHA256 
d7d2dea05362c8ac7e11bb7bf1da4cdeb07225ba
 DIST openldap-2.4.38.tgz 5506085 SHA256 
88209a3599ec5d9354fc09bbe29b99db1ffa1b612127c06bad0c5265d0b31fd1 SHA512 
df7b6b2b84102ba996f84575396c7505ada851b5f09841fd821d34fd8d62580f85ecc655e2cd3965730b44d6919d64864f56b23791f38b411d142d345f250666
 WHIRLPOOL 
bb6a19b353f9dcde07afe78052ce9d5db5a2aaa09236b69d22da0879e74c4de8587312bad66939702db30af779f7ee9720ad792b73d225f004a1a90d80a6fed1
 DIST openldap-2.4.39.tgz 5509060 SHA256 
8267c87347103fef56b783b24877c0feda1063d3cb85d070e503d076584bf8a7 SHA512 
7b5ef2a69f79f0901a06f8be4ab50afc3b3e98ab1ea74a421569443d32cb43d3cf773d3f028fb5fb39908c09ee172cb4770ecc5882754877a59d29bf8f8cc059
 WHIRLPOOL 
90ac4cff185855d569a8033a3e35a251d75e4a2805bcfa5ba5b3605ec88b2fc244b0e95aabd33c47c9846f29c95a17e1be43650442987f6abc043667e06f15cd
 DIST openldap-2.4.40.tgz 5641865 SHA256 
d12611a5c25b6499293c2bb7b435dc2b174db73e83f5a8cb7e34f2ce5fa6dadb SHA512 
c803c4a82878891d60414d64dcb54a7c3f08675106ba13f50cba06034a97b3eee1c238761dd5ddad97d8c3f6675d9bbbec176d0340eb4a3bcd808f940baabab5
 WHIRLPOOL 
82cb6033798ac69faf4a0d1f5d7716316f5fbfc67e0f3a013b5bae461a01e3029aa6fb7d510bc14eed4f40ef83632561a3fa39aebf2be2785e3d0e0038db048c
+DIST openldap-2.4.42.tgz 5645925 SHA256 
eeb7b0e2c5852bfd2650e83909bb6152835c0b862fab10b63954dc1bcbba8e63 SHA512 
52d6af7610c4fdc8f965ebea04d09c38f73773a02c2e484dc00f3d472f8b2f766ca32d9c80f5815a57745095cc7c33ad62d9165eec5b9e252ae172e7782c
 WHIRLPOOL 
e151c63bfd10f5e96c60f216925315ed788d426ba2c15ee2793a4de4bb25d01717e7bb5144814a0e6a053a5d5a0aab75213a495aa47aa13f7c3e70716c01633e
 DIST rfc2307bis.schema-20140524 12262 SHA256 
6cd8154ad86be1d6bb88a79c303dc10a49bce4ce7d21bb417a951d6496df30b1 SHA512 
83b89a1deeefc8566b97e7e865b9b6d04541099cbdf719e24538a7d27d61b6209e87ab9003a9f140bd9afd018ec569e71721e3a24090e1902c8b6659d2ba103e
 WHIRLPOOL 
40cef24529fb4bfc1661d03088eccdb17d9056d696b2bf0e698fa248d03f508ba776784bf8abbaffb5f4c2c59b59b29525b4be2babc978fed681e5e3c88073de

diff --git a/net-nds/openldap/files/openldap-2.4.42-mdb-unbundle.patch 
b/net-nds/openldap/files/openldap-2.4.42-mdb-unbundle.patch
new file mode 100644
index 000..9265a01
--- /dev/null
+++ b/net-nds/openldap/files/openldap-2.4.42-mdb-unbundle.patch
@@ -0,0 +1,136 @@
+--- ./build/top.mk.orig2014-10-24 14:34:59.260827298 +0200
 ./build/top.mk 2014-10-24 14:35:25.281168893 +0200
+@@ -160,6 +160,7 @@
+ LTHREAD_LIBS = @LTHREAD_LIBS@
+ 
+ BDB_LIBS = @BDB_LIBS@
++MDB_LIBS = @MDB_LIBS@
+ SLAPD_NDB_LIBS = @SLAPD_NDB_LIBS@
+ 
+ LDAP_LIBLBER_LA = $(LDAP_LIBDIR)/liblber/liblber.la
+--- ./build/openldap.m4.orig   2014-10-24 10:52:02.837221734 +0200
 ./build/openldap.m42014-10-24 11:31:02.748087966 +0200
+@@ -563,6 +563,38 @@
+   ], [ol_cv_bdb_compat=yes], [ol_cv_bdb_compat=no])])
+ ])
+ 
++dnl 
++dnl Check for version compatility with back-mdb
++AC_DEFUN([OL_MDB_COMPAT],
++[AC_CACHE_CHECK([if LMDB version supported by MDB backends], 
[ol_cv_mdb_compat],[
++  AC_EGREP_CPP(__mdb_version_compat,[
++#include 
++
++/* require 0.9.14 or later */
++#if MDB_VERSION_FULL >= 0x0009000E
++  __mdb_version_compat
++#endif
++  ], [ol_cv_mdb_compat=yes], [ol_cv_mdb_compat=no])])
++])
++
++dnl
++dnl 
++dnl Find any MDB
++AC_DEFUN([OL_MDB],
++[ol_cv_mdb=no
++AC_CHECK_HEADERS(lmdb.h)
++if test $ac_cv_header_lmdb_h = yes; then
++  OL_MDB_COMPAT
++
++  if test $ol_cv_mdb_compat != yes ; then
++  AC_MSG_ERROR([LMDB version incompatible with MDB backends])
++  fi
++
++  ol_cv_lib_mdb=-llmdb
++  ol_cv_mdb=yes
++fi
++])
++
+ dnl
+ dnl 
+ dnl Check POSIX Thread version 
+--- ./servers/slapd/back-mdb/Makefile.in.orig  2014-10-24 10:31:30.860931076 
+0200
 ./servers/slapd/back-mdb/Makefile.in   2014-10-24 14:33:33.803705424 
+0200
+@@ -25,11 +25,10 @@
+   extended.lo operational.lo \
+   attr.lo index.lo key.lo filterindex.lo \
+   dn2entry.lo dn2id.lo id2entry.lo idl.lo \
+-