* [gentoo-commits] repo/gentoo:master commit in: net-nds/openldap/files/
@ 2017-01-27 22:10 Robin H. Johnson
0 siblings, 0 replies; 11+ messages in thread
From: Robin H. Johnson @ 2017-01-27 22:10 UTC (permalink / raw
To: gentoo-commits
commit: 3a1597caab1049dc69604cc778f43e650b474641
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Jan 27 15:27:40 2017 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Jan 27 22:10:16 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a1597ca
net-nds/openldap: remove unused init file
(cherry picked from commit d25ef0203245831250003ab14b6465b621e58ab0)
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
Fixes: https://github.com/gentoo/gentoo/pull/3678
net-nds/openldap/files/slapd-initd2 | 22 ----------------------
1 file changed, 22 deletions(-)
diff --git a/net-nds/openldap/files/slapd-initd2 b/net-nds/openldap/files/slapd-initd2
deleted file mode 100644
index 8016677..00000000
--- a/net-nds/openldap/files/slapd-initd2
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
- need net
- before dbus hald avahi-daemon
- provide ldap
-}
-
-start() {
- ebegin "Starting ldap-server"
- eval start-stop-daemon --start --pidfile /var/run/openldap/slapd.pid --exec /usr/lib/openldap/slapd -- -u ldap -g ldap "${OPTS}"
- eend $?
-}
-
-stop() {
- ebegin "Stopping ldap-server"
- start-stop-daemon --stop --signal 2 --quiet --pidfile /var/run/openldap/slapd.pid
- eend $?
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-nds/openldap/files/
@ 2017-07-25 17:42 Matt Thode
0 siblings, 0 replies; 11+ messages in thread
From: Matt Thode @ 2017-07-25 17:42 UTC (permalink / raw
To: gentoo-commits
commit: 5e6d4dbf947c0fa2ca5a597dcf86dffc34ea2631
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 25 17:42:04 2017 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Jul 25 17:42:23 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e6d4dbf
net-nds/openldap: fix bug 622460 in place, build error
Package-Manager: Portage-2.3.6, Repoman-2.3.3
.../openldap/files/openldap-2.4.45-fix-lmpasswd-gnutls-symbols.patch | 2 +-
1 file changed, 1 insertion(+), 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
index 0859d53caef..29688fcb14c 100644
--- 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
@@ -19,7 +19,7 @@ X-Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=245341
+
+typedef const void* des_key;
+typedef unsigned char DES_cblock[8];
-+typedef des_cblock des_data_block;
++typedef DES_cblock des_data_block;
+typedef int DES_key_schedule; /* unused */
+typedef DES_key_schedule des_context; /* unused */
+#define des_failed(encrypted) 0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-nds/openldap/files/
@ 2017-12-14 22:08 Robin H. Johnson
0 siblings, 0 replies; 11+ messages in thread
From: Robin H. Johnson @ 2017-12-14 22:08 UTC (permalink / raw
To: gentoo-commits
commit: d7121810c25649a3cc754fcfedff00775c1667df
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Dec 2 08:30:35 2017 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Dec 14 22:06:00 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7121810
net-nds/openldap: remove unused patches/file
Closes: https://github.com/gentoo/gentoo/pull/6394
(cherry picked from commit 4e478aadc251ed749a110c490fee30db294d0fba)
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
net-nds/openldap/files/openldap-2.2.6-ntlm.patch | 199 ---------------------
.../openldap/files/openldap-2.3.21-ppolicy.patch | 13 --
.../files/openldap-2.3.24-contrib-smbk5pwd.patch | 53 ------
net-nds/openldap/files/openldap-2.3.34-slapd-conf | 64 -------
.../openldap/files/openldap-2.3.37-libldap_r.patch | 21 ---
.../openldap/files/openldap-2.3.43-fix-hang.patch | 19 --
net-nds/openldap/files/openldap-2.3.XY-gcc44.patch | 30 ----
net-nds/openldap/files/slurpd-initd | 21 ---
8 files changed, 420 deletions(-)
diff --git a/net-nds/openldap/files/openldap-2.2.6-ntlm.patch b/net-nds/openldap/files/openldap-2.2.6-ntlm.patch
deleted file mode 100644
index 1e52f99f198..00000000000
--- a/net-nds/openldap/files/openldap-2.2.6-ntlm.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-(Note that this patch is not useful on its own... it just adds some
-hooks to work with the LDAP authentication process at a lower level
-than the API otherwise allows. The code that calls these hooks and
-actually drives the NTLM authentication process is in
-lib/e2k-global-catalog.c, and the code that actually implements the
-NTLM algorithms is in xntlm/.)
-
-This is a patch against OpenLDAP 2.2.6. Apply with -p0
-
-
---- include/ldap.h.orig 2004-01-01 13:16:28.000000000 -0500
-+++ include/ldap.h 2004-07-14 11:58:49.000000000 -0400
-@@ -1753,5 +1753,26 @@
- LDAPControl **cctrls ));
-
-
-+/*
-+ * hacks for NTLM
-+ */
-+#define LDAP_AUTH_NTLM_REQUEST ((ber_tag_t) 0x8aU)
-+#define LDAP_AUTH_NTLM_RESPONSE ((ber_tag_t) 0x8bU)
-+LDAP_F( int )
-+ldap_ntlm_bind LDAP_P((
-+ LDAP *ld,
-+ LDAP_CONST char *dn,
-+ ber_tag_t tag,
-+ struct berval *cred,
-+ LDAPControl **sctrls,
-+ LDAPControl **cctrls,
-+ int *msgidp ));
-+LDAP_F( int )
-+ldap_parse_ntlm_bind_result LDAP_P((
-+ LDAP *ld,
-+ LDAPMessage *res,
-+ struct berval *challenge));
-+
-+
- LDAP_END_DECL
- #endif /* _LDAP_H */
---- libraries/libldap/Makefile.in.orig 2004-01-01 13:16:29.000000000 -0500
-+++ libraries/libldap/Makefile.in 2004-07-14 13:37:23.000000000 -0400
-@@ -20,7 +20,7 @@
- SRCS = bind.c open.c result.c error.c compare.c search.c \
- controls.c messages.c references.c extended.c cyrus.c \
- modify.c add.c modrdn.c delete.c abandon.c \
-- sasl.c sbind.c kbind.c unbind.c cancel.c \
-+ sasl.c ntlm.c sbind.c kbind.c unbind.c cancel.c \
- filter.c free.c sort.c passwd.c whoami.c \
- getdn.c getentry.c getattr.c getvalues.c addentry.c \
- request.c os-ip.c url.c sortctrl.c vlvctrl.c \
-@@ -29,7 +29,7 @@
- OBJS = bind.lo open.lo result.lo error.lo compare.lo search.lo \
- controls.lo messages.lo references.lo extended.lo cyrus.lo \
- modify.lo add.lo modrdn.lo delete.lo abandon.lo \
-- sasl.lo sbind.lo kbind.lo unbind.lo cancel.lo \
-+ sasl.lo ntlm.lo sbind.lo kbind.lo unbind.lo cancel.lo \
- filter.lo free.lo sort.lo passwd.lo whoami.lo \
- getdn.lo getentry.lo getattr.lo getvalues.lo addentry.lo \
- request.lo os-ip.lo url.lo sortctrl.lo vlvctrl.lo \
---- /dev/null 2004-06-30 15:04:37.000000000 -0400
-+++ libraries/libldap/ntlm.c 2004-07-14 13:44:18.000000000 -0400
-@@ -0,0 +1,137 @@
-+/* $OpenLDAP: pkg/ldap/libraries/libldap/ntlm.c,v 1.1.4.10 2002/01/04 20:38:21 kurt Exp $ */
-+/*
-+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
-+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
-+ */
-+
-+/* Mostly copied from sasl.c */
-+
-+#include "portable.h"
-+
-+#include <stdlib.h>
-+#include <stdio.h>
-+
-+#include <ac/socket.h>
-+#include <ac/string.h>
-+#include <ac/time.h>
-+#include <ac/errno.h>
-+
-+#include "ldap-int.h"
-+
-+int
-+ldap_ntlm_bind(
-+ LDAP *ld,
-+ LDAP_CONST char *dn,
-+ ber_tag_t tag,
-+ struct berval *cred,
-+ LDAPControl **sctrls,
-+ LDAPControl **cctrls,
-+ int *msgidp )
-+{
-+ BerElement *ber;
-+ int rc;
-+ ber_int_t id;
-+
-+ Debug( LDAP_DEBUG_TRACE, "ldap_ntlm_bind\n", 0, 0, 0 );
-+
-+ assert( ld != NULL );
-+ assert( LDAP_VALID( ld ) );
-+ assert( msgidp != NULL );
-+
-+ if( msgidp == NULL ) {
-+ ld->ld_errno = LDAP_PARAM_ERROR;
-+ return ld->ld_errno;
-+ }
-+
-+ /* create a message to send */
-+ if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) {
-+ ld->ld_errno = LDAP_NO_MEMORY;
-+ return ld->ld_errno;
-+ }
-+
-+ assert( LBER_VALID( ber ) );
-+
-+ LDAP_NEXT_MSGID( ld, id );
-+ rc = ber_printf( ber, "{it{istON}" /*}*/,
-+ id, LDAP_REQ_BIND,
-+ ld->ld_version, dn, tag,
-+ cred );
-+
-+ /* Put Server Controls */
-+ if( ldap_int_put_controls( ld, sctrls, ber ) != LDAP_SUCCESS ) {
-+ ber_free( ber, 1 );
-+ return ld->ld_errno;
-+ }
-+
-+ if ( ber_printf( ber, /*{*/ "N}" ) == -1 ) {
-+ ld->ld_errno = LDAP_ENCODING_ERROR;
-+ ber_free( ber, 1 );
-+ return ld->ld_errno;
-+ }
-+
-+ /* send the message */
-+ *msgidp = ldap_send_initial_request( ld, LDAP_REQ_BIND, dn, ber, id );
-+
-+ if(*msgidp < 0)
-+ return ld->ld_errno;
-+
-+ return LDAP_SUCCESS;
-+}
-+
-+int
-+ldap_parse_ntlm_bind_result(
-+ LDAP *ld,
-+ LDAPMessage *res,
-+ struct berval *challenge)
-+{
-+ ber_int_t errcode;
-+ ber_tag_t tag;
-+ BerElement *ber;
-+ ber_len_t len;
-+
-+ Debug( LDAP_DEBUG_TRACE, "ldap_parse_ntlm_bind_result\n", 0, 0, 0 );
-+
-+ assert( ld != NULL );
-+ assert( LDAP_VALID( ld ) );
-+ assert( res != NULL );
-+
-+ if ( ld == NULL || res == NULL ) {
-+ return LDAP_PARAM_ERROR;
-+ }
-+
-+ if( res->lm_msgtype != LDAP_RES_BIND ) {
-+ ld->ld_errno = LDAP_PARAM_ERROR;
-+ return ld->ld_errno;
-+ }
-+
-+ if ( ld->ld_error ) {
-+ LDAP_FREE( ld->ld_error );
-+ ld->ld_error = NULL;
-+ }
-+ if ( ld->ld_matched ) {
-+ LDAP_FREE( ld->ld_matched );
-+ ld->ld_matched = NULL;
-+ }
-+
-+ /* parse results */
-+
-+ ber = ber_dup( res->lm_ber );
-+
-+ if( ber == NULL ) {
-+ ld->ld_errno = LDAP_NO_MEMORY;
-+ return ld->ld_errno;
-+ }
-+
-+ tag = ber_scanf( ber, "{ioa" /*}*/,
-+ &errcode, challenge, &ld->ld_error );
-+ ber_free( ber, 0 );
-+
-+ if( tag == LBER_ERROR ) {
-+ ld->ld_errno = LDAP_DECODING_ERROR;
-+ return ld->ld_errno;
-+ }
-+
-+ ld->ld_errno = errcode;
-+
-+ return( ld->ld_errno );
-+}
diff --git a/net-nds/openldap/files/openldap-2.3.21-ppolicy.patch b/net-nds/openldap/files/openldap-2.3.21-ppolicy.patch
deleted file mode 100644
index 06bbee86f1c..00000000000
--- a/net-nds/openldap/files/openldap-2.3.21-ppolicy.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- clients.orig/tools/common.c 2006-05-05 00:24:01.000000000 -0700
-+++ clients/tools/common.c 2006-05-05 00:24:13.000000000 -0700
-@@ -904,8 +904,8 @@
- tool_bind( LDAP *ld )
- {
- #ifdef LDAP_CONTROL_PASSWORDPOLICYREQUEST
-- if ( ppolicy ) {
- LDAPControl *ctrls[2], c;
-+ if ( ppolicy ) {
- c.ldctl_oid = LDAP_CONTROL_PASSWORDPOLICYREQUEST;
- c.ldctl_value.bv_val = NULL;
- c.ldctl_value.bv_len = 0;
-
diff --git a/net-nds/openldap/files/openldap-2.3.24-contrib-smbk5pwd.patch b/net-nds/openldap/files/openldap-2.3.24-contrib-smbk5pwd.patch
deleted file mode 100644
index 091ff26a17b..00000000000
--- a/net-nds/openldap/files/openldap-2.3.24-contrib-smbk5pwd.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- contrib/slapd-modules/smbk5pwd/Makefile.ORIG 2006-05-17 13:11:57.194660019 +0300
-+++ contrib/slapd-modules/smbk5pwd/Makefile 2006-05-17 13:11:14.503082288 +0300
-@@ -9,29 +9,39 @@
- # top-level directory of the distribution or, alternatively, at
- # <http://www.OpenLDAP.org/license.html>.
-
-+#libexecdir=/usr/lib/openldap
-+moduledir=$(libexecdir)/openldap
- LIBTOOL=../../../libtool
--OPT=-g -O2
-+#OPT=
- CC=gcc
-
- # Omit DO_KRB5 or DO_SAMBA if you don't want to support it.
--DEFS=-DDO_KRB5 -DDO_SAMBA
-+#DEFS=
-
--HEIMDAL_INC=-I/usr/heimdal/include
-+#KRB5_INC=
- SSL_INC=
- LDAP_INC=-I../../../include -I../../../servers/slapd
--INCS=$(LDAP_INC) $(HEIMDAL_INC) $(SSL_INC)
-+INCS=$(LDAP_INC) $(SSL_INC) $(KRB5_INC)
-
--HEIMDAL_LIB=-L/usr/heimdal/lib -lkrb5 -lkadm5srv
-+KRB5_LIB=-lkrb5 -lkadm5srv
- SSL_LIB=-lcrypto
--LDAP_LIB=-lldap_r -llber
--LIBS=$(LDAP_LIB) $(HEIMDAL_LIB) $(SSL_LIB)
--
-+LDAP_LIB=-L../../../libraries/libldap_r -lldap_r -llber
-+ifneq (DDO_KRB5,$(findstring DDO_KRB5,$(DEFS)))
-+ LIBS=$(LDAP_LIB) $(SSL_LIB)
-+else
-+ LIBS=$(LDAP_LIB) $(KRB5_LIB) $(SSL_LIB)
-+endif
-+
- all: smbk5pwd.la
-
-
- smbk5pwd.lo: smbk5pwd.c
-- $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $?
-+ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(DEFS) $(INCS) -c $?
-
- smbk5pwd.la: smbk5pwd.lo
-- $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info 0:0:0 \
-- -rpath /usr/local/libexec/openldap -module -o $@ $? $(LIBS)
-+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -version-info 0:0:0 \
-+ -rpath $(moduledir) -module -o $@ $? $(LIBS)
-+
-+install-mod:
-+ $(LIBTOOL) --mode=install ../../../build/shtool install -c \
-+ -m 755 smbk5pwd.la $(DESTDIR)$(moduledir)
diff --git a/net-nds/openldap/files/openldap-2.3.34-slapd-conf b/net-nds/openldap/files/openldap-2.3.34-slapd-conf
deleted file mode 100644
index ad767cfdeb7..00000000000
--- a/net-nds/openldap/files/openldap-2.3.34-slapd-conf
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-# See slapd.conf(5) for details on configuration options.
-# This file should NOT be world readable.
-#
-include /etc/openldap/schema/core.schema
-
-# Define global ACLs to disable default read access.
-
-# Do not enable referrals until AFTER you have a working directory
-# service AND an understanding of referrals.
-#referral ldap://root.openldap.org
-
-pidfile /var/run/openldap/slapd.pid
-argsfile /var/run/openldap/slapd.args
-
-# Load dynamic backend modules:
-###INSERTDYNAMICMODULESHERE###
-
-# Sample security restrictions
-# Require integrity protection (prevent hijacking)
-# Require 112-bit (3DES or better) encryption for updates
-# Require 63-bit encryption for simple bind
-# security ssf=1 update_ssf=112 simple_bind=64
-
-# Sample access control policy:
-# Root DSE: allow anyone to read it
-# Subschema (sub)entry DSE: allow anyone to read it
-# Other DSEs:
-# Allow self write access
-# Allow authenticated users read access
-# Allow anonymous users to authenticate
-# Directives needed to implement policy:
-# access to dn.base="" by * read
-# access to dn.base="cn=Subschema" by * read
-# access to *
-# by self write
-# by users read
-# by anonymous auth
-#
-# if no access controls are present, the default policy
-# allows anyone and everyone to read anything but restricts
-# updates to rootdn. (e.g., "access to * by * read")
-#
-# rootdn can always read and write EVERYTHING!
-
-#######################################################################
-# BDB database definitions
-#######################################################################
-
-database hdb
-suffix "dc=my-domain,dc=com"
-# <kbyte> <min>
-checkpoint 32 30
-rootdn "cn=Manager,dc=my-domain,dc=com"
-# Cleartext passwords, especially for the rootdn, should
-# be avoid. See slappasswd(8) and slapd.conf(5) for details.
-# Use of strong authentication encouraged.
-rootpw secret
-# The database directory MUST exist prior to running slapd AND
-# should only be accessible by the slapd and slap tools.
-# Mode 700 recommended.
-directory /var/lib/openldap-data
-# Indices to maintain
-index objectClass eq
diff --git a/net-nds/openldap/files/openldap-2.3.37-libldap_r.patch b/net-nds/openldap/files/openldap-2.3.37-libldap_r.patch
deleted file mode 100644
index d015bda2abb..00000000000
--- a/net-nds/openldap/files/openldap-2.3.37-libldap_r.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- libraries/libldap_r/Makefile.in.old 2007-01-02 22:43:50.000000000 +0100
-+++ libraries/libldap_r/Makefile.in 2007-08-22 13:32:20.000000000 +0200
-@@ -56,7 +56,7 @@
- XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS)
- XXXLIBS = $(LTHREAD_LIBS)
- NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
--UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
-+UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) $(LTHREAD_LIBS)
-
- .links : Makefile
- @for i in $(XXSRCS); do \
---- servers/slapd/slapi/Makefile.in.old 2007-01-02 22:44:10.000000000 +0100
-+++ servers/slapd/slapi/Makefile.in 2007-08-22 14:58:51.000000000 +0200
-@@ -37,6 +37,7 @@
- XLIBS = $(LIBRARY)
- XXLIBS =
- NT_LINK_LIBS = $(AC_LIBS)
-+UNIX_LINK_LIBS = ../../../libraries/libldap_r/libldap_r.la $(LTHREAD_LIBS)
-
- XINCPATH = -I$(srcdir)/.. -I$(srcdir)
- XDEFS = $(MODULES_CPPFLAGS)
diff --git a/net-nds/openldap/files/openldap-2.3.43-fix-hang.patch b/net-nds/openldap/files/openldap-2.3.43-fix-hang.patch
deleted file mode 100644
index 7e1f4457bd9..00000000000
--- a/net-nds/openldap/files/openldap-2.3.43-fix-hang.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit a3f40e5601c0c522f2bda418374fb415bdcbd75c
-Author: Quanah Gibson-Mount <quanah@openldap.org>
-Date: Thu Mar 24 02:25:49 2011 +0000
-
- sl_busy is used as a boolean so just set it, don't increment it
-
-diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
-index 2a7a48e..df6d096 100644
---- a/servers/slapd/daemon.c
-+++ b/servers/slapd/daemon.c
-@@ -2098,7 +2098,7 @@ slap_listener_activate(
- Debug( LDAP_DEBUG_TRACE, "slap_listener_activate(%d): %s\n",
- sl->sl_sd, sl->sl_busy ? "busy" : "", 0 );
-
-- sl->sl_busy++;
-+ sl->sl_busy = 1;
-
- rc = ldap_pvt_thread_pool_submit( &connection_pool,
- slap_listener_thread, (void *) sl );
diff --git a/net-nds/openldap/files/openldap-2.3.XY-gcc44.patch b/net-nds/openldap/files/openldap-2.3.XY-gcc44.patch
deleted file mode 100644
index 0213d81dc85..00000000000
--- a/net-nds/openldap/files/openldap-2.3.XY-gcc44.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- include/ldap_pvt_thread.h 2009-04-03 08:51:30.000000000 -0400
-+++ include/ldap_pvt_thread.h 2009-04-03 08:56:36.000000000 -0400
-@@ -57,12 +57,12 @@
-
- #ifndef LDAP_PVT_THREAD_H_DONE
- #define LDAP_PVT_THREAD_SET_STACK_SIZE
--#ifndef LDAP_PVT_THREAD_STACK_SIZE
-- /* LARGE stack. Will be twice as large on 64 bit machine. */
--#define LDAP_PVT_THREAD_STACK_SIZE ( 1 * 1024 * 1024 * sizeof(void *) )
- /* May be explicitly defined to zero to disable it */
--#elif LDAP_PVT_THREAD_STACK_SIZE == 0
-+#if defined( LDAP_PVT_THREAD_STACK_SIZE ) && LDAP_PVT_THREAD_STACK_SIZE == 0
- #undef LDAP_PVT_THREAD_SET_STACK_SIZE
-+#elif !defined(LDAP_PVT_THREAD_STACK_SIZE)
-+ /* LARGE stack. Will be twice as large on 64 bit machine. */
-+#define LDAP_PVT_THREAD_STACK_SIZE ( 1 * 1024 * 1024 * sizeof(void *) )
- #endif
- #endif /* !LDAP_PVT_THREAD_H_DONE */
-
---- libraries/libldap/os-ip.c 2009-04-03 08:51:30.000000000 -0400
-+++ libraries/libldap/os-ip.c 2009-04-03 08:54:47.000000000 -0400
-@@ -652,7 +652,7 @@
- char *herr;
- #ifdef NI_MAXHOST
- char hbuf[NI_MAXHOST];
--#elif defined( MAXHOSTNAMELEN
-+#elif defined( MAXHOSTNAMELEN )
- char hbuf[MAXHOSTNAMELEN];
- #else
- char hbuf[256];
diff --git a/net-nds/openldap/files/slurpd-initd b/net-nds/openldap/files/slurpd-initd
deleted file mode 100644
index bb1b50dbb12..00000000000
--- a/net-nds/openldap/files/slurpd-initd
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- need net
-}
-
-start() {
- ebegin "Starting slurpd"
- start-stop-daemon --start --quiet \
- --exec /usr/lib/openldap/slurpd
- eend $?
-}
-
-stop() {
- ebegin "Stopping slurpd"
- start-stop-daemon --stop --quiet \
- --exec /usr/lib/openldap/slurpd
- eend $?
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-nds/openldap/files/
@ 2019-03-03 19:12 Lars Wendler
0 siblings, 0 replies; 11+ messages in thread
From: Lars Wendler @ 2019-03-03 19:12 UTC (permalink / raw
To: gentoo-commits
commit: 3a16dc27c42366275e3b45e3876d45d1fdd3bd36
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Mar 3 16:03:47 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Mar 3 19:12:04 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a16dc27
net-nds/openldap: remove unused patch
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11239
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
...enldap-2.4.17-fix-lmpasswd-gnutls-symbols.patch | 109 ---------------------
1 file changed, 109 deletions(-)
diff --git a/net-nds/openldap/files/openldap-2.4.17-fix-lmpasswd-gnutls-symbols.patch b/net-nds/openldap/files/openldap-2.4.17-fix-lmpasswd-gnutls-symbols.patch
deleted file mode 100644
index e5117468f80..00000000000
--- a/net-nds/openldap/files/openldap-2.4.17-fix-lmpasswd-gnutls-symbols.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-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 <robbat2@gentoo.org>
-Signed-off-by: Steffen Hau <steffen@hauihau.de>
-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.c 2009-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 <gcrypt.h>
-+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( &hd, GCRY_CIPHER_DES, GCRY_CIPHER_MODE_ECB, 0 );
-+#endif /* HAVE_GNUTLS_GNUTLS_H && !DES_ENCRYPT */
-
- for( i=0; i<cred->bv_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( &hd, GCRY_CIPHER_DES, GCRY_CIPHER_MODE_ECB, 0 );
-+#endif /* HAVE_GNUTLS_GNUTLS_H && !DES_ENCRYPT */
-+
- for( i=0; i<passwd->bv_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 );
- }
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-nds/openldap/files/
@ 2020-06-19 22:48 Conrad Kostecki
0 siblings, 0 replies; 11+ messages in thread
From: Conrad Kostecki @ 2020-06-19 22:48 UTC (permalink / raw
To: gentoo-commits
commit: 3ab90102257ea7e41a780e8880da91f75f55d61e
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Thu Jun 18 18:26:30 2020 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Jun 19 22:48:09 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ab90102
net-nds/openldap: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/16315
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../openldap/files/openldap-2.4.45-libressl.patch | 65 ----------------------
1 file changed, 65 deletions(-)
diff --git a/net-nds/openldap/files/openldap-2.4.45-libressl.patch b/net-nds/openldap/files/openldap-2.4.45-libressl.patch
deleted file mode 100644
index 20a65a4e0fd..00000000000
--- a/net-nds/openldap/files/openldap-2.4.45-libressl.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- libraries/libldap/tls_o.c.orig 2017-06-04 16:31:28 UTC
-+++ libraries/libldap/tls_o.c
-@@ -47,7 +47,7 @@
- #include <ssl.h>
- #endif
-
--#if OPENSSL_VERSION_NUMBER >= 0x10100000
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !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 < 0x10100000
-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || 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 < 0x10100000
-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || 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 < 0x10100000
-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || 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 < 0x10100000
-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || 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 < 0x10100000
-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || 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 >= 0x10100000
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
- struct bio_method_st {
- int type;
- const char *name;
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-nds/openldap/files/
@ 2022-03-19 22:39 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2022-03-19 22:39 UTC (permalink / raw
To: gentoo-commits
commit: 51bf3e80b543fcfbbc7894463b8ce72a459d0b32
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 19 22:33:29 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 19 22:39:00 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51bf3e80
net-nds/openldap: fix hang in configure
Issue was in the system mdb patch.
Closes: https://bugs.gentoo.org/835639
Signed-off-by: David Seifert <soap <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-nds/openldap/files/openldap-2.6.1-system-mdb.patch | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-nds/openldap/files/openldap-2.6.1-system-mdb.patch b/net-nds/openldap/files/openldap-2.6.1-system-mdb.patch
index 55a2253a8fa0..ad8aaba0157a 100644
--- a/net-nds/openldap/files/openldap-2.6.1-system-mdb.patch
+++ b/net-nds/openldap/files/openldap-2.6.1-system-mdb.patch
@@ -74,7 +74,7 @@ index 9012d0b28..52dd72eb6 100644
+dnl ----------------------------------------------------------------
+ol_link_mdb=no
+
-+if test $ol_enable_mdb != no; then
++AS_IF([test x$ol_enable_mdb != xno], [
+ OL_MDB
+
+ if test $ol_cv_mdb = no ; then
@@ -93,7 +93,7 @@ index 9012d0b28..52dd72eb6 100644
+ SLAPD_LIBS="$SLAPD_LIBS \$(MDB_LIBS)"
+
+ ol_link_mdb=yes
-+fi
++])
+
+dnl ----------------------------------------------------------------
+
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-nds/openldap/files/
@ 2022-03-20 21:04 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2022-03-20 21:04 UTC (permalink / raw
To: gentoo-commits
commit: 0bc178c7a0c13e2fa1926eafd9129ab4dbb99ab1
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 20 20:35:33 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 20 21:04:31 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bc178c7
net-nds/openldap: cleanup patches
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../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 | 4 --
.../files/openldap-2.6.1-fix-missing-mapping.patch | 6 --
net-nds/openldap/files/openldap-2.6.1-flags.patch | 64 ----------------------
.../openldap/files/openldap-2.6.1-system-mdb.patch | 8 ---
net-nds/openldap/files/slapd-initd | 8 +--
net-nds/openldap/files/slapd-initd-2.4.40-r2 | 2 +-
18 files changed, 35 insertions(+), 133 deletions(-)
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 ddb6672a5fa7..2a8c4bc569c8 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.000000000 -0700
-+++ openldap-2.2.14/servers/slapd/back-perl/Makefile.in 2004-06-20 18:43:41.000000000 -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 448249a3b583..f63ad3cc8dff 100644
--- a/net-nds/openldap/files/openldap-2.4.11-libldap_r.patch
+++ b/net-nds/openldap/files/openldap-2.4.11-libldap_r.patch
@@ -1,6 +1,5 @@
-diff -Nuar openldap-2.4.11.orig/servers/slapd/slapi/Makefile.in openldap-2.4.11/servers/slapd/slapi/Makefile.in
---- openldap-2.4.11.orig/servers/slapd/slapi/Makefile.in 2008-02-11 15:26:49.000000000 -0800
-+++ openldap-2.4.11/servers/slapd/slapi/Makefile.in 2008-10-14 02:10:18.402799262 -0700
+--- a/servers/slapd/slapi/Makefile.in
++++ b/servers/slapd/slapi/Makefile.in
@@ -37,6 +37,7 @@
XLIBS = $(LIBRARY)
XXLIBS =
diff --git a/net-nds/openldap/files/openldap-2.4.15-ppolicy.patch b/net-nds/openldap/files/openldap-2.4.15-ppolicy.patch
index 3195ee550f68..1196f1b936e8 100644
--- a/net-nds/openldap/files/openldap-2.4.15-ppolicy.patch
+++ b/net-nds/openldap/files/openldap-2.4.15-ppolicy.patch
@@ -1,5 +1,5 @@
---- openldap-2.4.15/clients/tools/common.c.orig 2009-02-05 15:05:03.000000000 -0800
-+++ openldap-2.4.15/clients/tools/common.c 2009-03-21 01:45:14.000000000 -0700
+--- a/clients/tools/common.c
++++ b/clients/tools/common.c
@@ -1315,8 +1315,8 @@
int nsctrls = 0;
diff --git a/net-nds/openldap/files/openldap-2.4.17-gcc44.patch b/net-nds/openldap/files/openldap-2.4.17-gcc44.patch
index aa7fe7ac35f6..a782da46f3af 100644
--- a/net-nds/openldap/files/openldap-2.4.17-gcc44.patch
+++ b/net-nds/openldap/files/openldap-2.4.17-gcc44.patch
@@ -1,6 +1,5 @@
-diff -ur openldap-2.4.17.orig/contrib/ldapc++/src/SaslInteractionHandler.cpp openldap-2.4.17/contrib/ldapc++/src/SaslInteractionHandler.cpp
---- openldap-2.4.17.orig/contrib/ldapc++/src/SaslInteractionHandler.cpp 2008-04-15 02:09:26.000000000 +0300
-+++ openldap-2.4.17/contrib/ldapc++/src/SaslInteractionHandler.cpp 2009-08-10 13:21:24.000000000 +0300
+--- a/contrib/ldapc++/src/SaslInteractionHandler.cpp
++++ b/contrib/ldapc++/src/SaslInteractionHandler.cpp
@@ -13,6 +13,7 @@
#include <termios.h>
#endif
diff --git a/net-nds/openldap/files/openldap-2.4.28-fix-dash.patch b/net-nds/openldap/files/openldap-2.4.28-fix-dash.patch
index d15c3d2231f4..bca213dbc6ce 100644
--- a/net-nds/openldap/files/openldap-2.4.28-fix-dash.patch
+++ b/net-nds/openldap/files/openldap-2.4.28-fix-dash.patch
@@ -11,8 +11,6 @@ Patch unbreaks build when /bin/sh points to dash:
eval: 1: base_compile+= x86_64-pc-linux-gnu-gcc: not found
...
make[2]: *** [decode.lo] Error 1
-diff --git a/build/top.mk b/build/top.mk
-index 6fea488..ea324e3 100644
--- a/build/top.mk
+++ b/build/top.mk
@@ -20,7 +20,7 @@ VERSION= @VERSION@
diff --git a/net-nds/openldap/files/openldap-2.4.28-gnutls-gcrypt.patch b/net-nds/openldap/files/openldap-2.4.28-gnutls-gcrypt.patch
index aeecb0f40132..0d9b88f47627 100644
--- a/net-nds/openldap/files/openldap-2.4.28-gnutls-gcrypt.patch
+++ b/net-nds/openldap/files/openldap-2.4.28-gnutls-gcrypt.patch
@@ -1,5 +1,5 @@
---- openldap-2.4.28/configure.in.orig 2012-02-11 22:40:36.004360795 +0000
-+++ openldap-2.4.28/configure.in 2012-02-11 22:40:13.410986851 +0000
+--- a/configure.in
++++ b/configure.in
@@ -1214,7 +1214,7 @@
ol_with_tls=gnutls
ol_link_tls=yes
diff --git a/net-nds/openldap/files/openldap-2.4.35-contrib-samba4.patch b/net-nds/openldap/files/openldap-2.4.35-contrib-samba4.patch
index 4312dc7c55ea..8ee3891f3cb6 100644
--- a/net-nds/openldap/files/openldap-2.4.35-contrib-samba4.patch
+++ b/net-nds/openldap/files/openldap-2.4.35-contrib-samba4.patch
@@ -1,6 +1,5 @@
-diff -Nuar openldap-2.4.35.orig/contrib/slapd-modules/samba4/Makefile openldap-2.4.35/contrib/slapd-modules/samba4/Makefile
---- openldap-2.4.35.orig/contrib/slapd-modules/samba4/Makefile 2013-03-28 15:41:51.000000000 +0000
-+++ openldap-2.4.35/contrib/slapd-modules/samba4/Makefile 2013-04-16 02:16:40.651868432 +0000
+--- a/contrib/slapd-modules/samba4/Makefile
++++ b/contrib/slapd-modules/samba4/Makefile
@@ -20,7 +20,8 @@
LIBTOOL = $(LDAP_BUILD)/libtool
diff --git a/net-nds/openldap/files/openldap-2.4.35-contrib-smbk5pwd.patch b/net-nds/openldap/files/openldap-2.4.35-contrib-smbk5pwd.patch
index 4383802a0ead..ca02404c8812 100644
--- a/net-nds/openldap/files/openldap-2.4.35-contrib-smbk5pwd.patch
+++ b/net-nds/openldap/files/openldap-2.4.35-contrib-smbk5pwd.patch
@@ -1,6 +1,5 @@
-diff -Nuar openldap-2.4.35.orig/contrib/slapd-modules/smbk5pwd/Makefile openldap-2.4.35/contrib/slapd-modules/smbk5pwd/Makefile
---- openldap-2.4.35.orig/contrib/slapd-modules/smbk5pwd/Makefile 2013-03-28 15:41:51.000000000 +0000
-+++ openldap-2.4.35/contrib/slapd-modules/smbk5pwd/Makefile 2013-04-16 02:13:38.939913119 +0000
+--- a/contrib/slapd-modules/smbk5pwd/Makefile
++++ b/contrib/slapd-modules/smbk5pwd/Makefile
@@ -21,16 +21,23 @@
SSL_INC =
SSL_LIB = -lcrypto
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
index 9265a01701ab..6ec68885b5e7 100644
--- a/net-nds/openldap/files/openldap-2.4.42-mdb-unbundle.patch
+++ b/net-nds/openldap/files/openldap-2.4.42-mdb-unbundle.patch
@@ -1,5 +1,5 @@
---- ./build/top.mk.orig 2014-10-24 14:34:59.260827298 +0200
-+++ ./build/top.mk 2014-10-24 14:35:25.281168893 +0200
+--- a/build/top.mk
++++ b/build/top.mk
@@ -160,6 +160,7 @@
LTHREAD_LIBS = @LTHREAD_LIBS@
@@ -8,8 +8,8 @@
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.m4 2014-10-24 11:31:02.748087966 +0200
+--- ./build/openldap.m4.orig
++++ ./build/openldap.m4
@@ -563,6 +563,38 @@
], [ol_cv_bdb_compat=yes], [ol_cv_bdb_compat=no])])
])
@@ -49,8 +49,8 @@
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
+--- a/servers/slapd/back-mdb/Makefile.in
++++ b/servers/slapd/back-mdb/Makefile.in
@@ -25,11 +25,10 @@
extended.lo operational.lo \
attr.lo index.lo key.lo filterindex.lo \
@@ -85,8 +85,8 @@
-
veryclean-local-lib: FORCE
$(RM) $(XXHEADERS) $(XXSRCS) .links
---- ./configure.in.orig 2014-10-24 10:46:53.289139847 +0200
-+++ ./configure.in 2014-10-24 10:51:34.372846374 +0200
+--- a/configure.in
++++ b/configure.in
@@ -519,6 +519,7 @@
dnl Initialize vars
LDAP_LIBS=
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
index 29688fcb14c8..05e515cd47d1 100644
--- 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
@@ -7,8 +7,8 @@ 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.c 2009-07-27 19:01:13.588069010 -0700
+--- a/libraries/liblutil/passwd.c
++++ b/libraries/liblutil/passwd.c
@@ -51,6 +51,26 @@ typedef unsigned char des_data_block[8];
typedef PK11Context *des_context[1];
#define DES_ENCRYPT CKA_ENCRYPT
diff --git a/net-nds/openldap/files/openldap-2.4.47-warnings.patch b/net-nds/openldap/files/openldap-2.4.47-warnings.patch
index d75bd0d3c5d7..10f21114954e 100644
--- a/net-nds/openldap/files/openldap-2.4.47-warnings.patch
+++ b/net-nds/openldap/files/openldap-2.4.47-warnings.patch
@@ -1,5 +1,3 @@
-diff --git a/include/ldap.h b/include/ldap.h
-index c245651c2..7f14f1051 100644
--- a/include/ldap.h
+++ b/include/ldap.h
@@ -2041,6 +2041,10 @@ LDAP_F( int )
@@ -13,8 +11,6 @@ index c245651c2..7f14f1051 100644
LDAP_F( int )
ldap_url_parse LDAP_P((
LDAP_CONST char *url,
-diff --git a/include/ldap_int_thread.h b/include/ldap_int_thread.h
-index e2dd8a942..bbc07c845 100644
--- a/include/ldap_int_thread.h
+++ b/include/ldap_int_thread.h
@@ -33,7 +33,7 @@ LDAP_END_DECL
@@ -26,8 +22,6 @@ index e2dd8a942..bbc07c845 100644
#include <pthread.h>
#ifdef HAVE_SCHED_H
#include <sched.h>
-diff --git a/libraries/libldap/tls2.c b/libraries/libldap/tls2.c
-index d25c190ea..639f598e7 100644
--- a/libraries/libldap/tls2.c
+++ b/libraries/libldap/tls2.c
@@ -76,6 +76,8 @@ static oid_name oids[] = {
diff --git a/net-nds/openldap/files/openldap-2.4.6-evolution-ntlm.patch b/net-nds/openldap/files/openldap-2.4.6-evolution-ntlm.patch
index 33ff29e0aed2..e8bcc50502c9 100644
--- a/net-nds/openldap/files/openldap-2.4.6-evolution-ntlm.patch
+++ b/net-nds/openldap/files/openldap-2.4.6-evolution-ntlm.patch
@@ -1,6 +1,5 @@
-diff -up evo-openldap-2.4.14/include/ldap.h.evolution-ntlm evo-openldap-2.4.14/include/ldap.h
---- evo-openldap-2.4.14/include/ldap.h.evolution-ntlm 2009-01-27 00:29:53.000000000 +0100
-+++ evo-openldap-2.4.14/include/ldap.h 2009-02-17 10:10:00.000000000 +0100
+--- a/include/ldap.h
++++ b/include/ldap.h
@@ -2461,5 +2461,26 @@ ldap_parse_deref_control LDAP_P((
LDAPControl **ctrls,
LDAPDerefRes **drp ));
@@ -28,9 +27,8 @@ diff -up evo-openldap-2.4.14/include/ldap.h.evolution-ntlm evo-openldap-2.4.14/i
+
LDAP_END_DECL
#endif /* _LDAP_H */
-diff -up evo-openldap-2.4.14/libraries/libldap/Makefile.in.evolution-ntlm evo-openldap-2.4.14/libraries/libldap/Makefile.in
---- evo-openldap-2.4.14/libraries/libldap/Makefile.in.evolution-ntlm 2009-01-27 00:29:53.000000000 +0100
-+++ evo-openldap-2.4.14/libraries/libldap/Makefile.in 2009-02-17 10:10:00.000000000 +0100
+--- a/libraries/libldap/Makefile.in
++++ b/libraries/libldap/Makefile.in
@@ -20,7 +20,7 @@ PROGRAMS = apitest dntest ftest ltest ur
SRCS = bind.c open.c result.c error.c compare.c search.c \
controls.c messages.c references.c extended.c cyrus.c \
@@ -49,9 +47,8 @@ diff -up evo-openldap-2.4.14/libraries/libldap/Makefile.in.evolution-ntlm evo-op
filter.lo free.lo sort.lo passwd.lo whoami.lo \
getdn.lo getentry.lo getattr.lo getvalues.lo addentry.lo \
request.lo os-ip.lo url.lo pagectrl.lo sortctrl.lo vlvctrl.lo \
-diff -up /dev/null evo-openldap-2.4.14/libraries/libldap/ntlm.c
---- /dev/null 2009-02-17 09:19:52.829004420 +0100
-+++ evo-openldap-2.4.14/libraries/libldap/ntlm.c 2009-02-17 10:10:00.000000000 +0100
+--- /dev/null
++++ b/libraries/libldap/ntlm.c
@@ -0,0 +1,137 @@
+/* $OpenLDAP: pkg/ldap/libraries/libldap/ntlm.c,v 1.1.4.10 2002/01/04 20:38:21 kurt Exp $ */
+/*
diff --git a/net-nds/openldap/files/openldap-2.6.1-cloak.patch b/net-nds/openldap/files/openldap-2.6.1-cloak.patch
index 8fab052d4db1..e023a14e4940 100644
--- a/net-nds/openldap/files/openldap-2.6.1-cloak.patch
+++ b/net-nds/openldap/files/openldap-2.6.1-cloak.patch
@@ -1,5 +1,3 @@
-diff --git a/contrib/slapd-modules/cloak/cloak.c b/contrib/slapd-modules/cloak/cloak.c
-index ced7a8024..dffce3614 100644
--- a/contrib/slapd-modules/cloak/cloak.c
+++ b/contrib/slapd-modules/cloak/cloak.c
@@ -29,6 +29,7 @@
@@ -10,8 +8,6 @@ index ced7a8024..dffce3614 100644
#include "slap.h"
#include "slap-config.h"
-diff --git a/servers/slapd/attr.h b/servers/slapd/attr.h
-index e69de29bb..73949f60c 100644
--- a/servers/slapd/attr.h
+++ b/servers/slapd/attr.h
@@ -0,0 +1,8 @@
diff --git a/net-nds/openldap/files/openldap-2.6.1-fix-missing-mapping.patch b/net-nds/openldap/files/openldap-2.6.1-fix-missing-mapping.patch
index be7fbf3e528d..1d6595566c73 100644
--- a/net-nds/openldap/files/openldap-2.6.1-fix-missing-mapping.patch
+++ b/net-nds/openldap/files/openldap-2.6.1-fix-missing-mapping.patch
@@ -3,12 +3,6 @@ From: Simon Pichugin <spichugi@redhat.com>
Date: Wed, 3 Nov 2021 19:03:40 -0700
Subject: [PATCH] Fix missing mapping
----
- libraries/liblber/lber.map | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libraries/liblber/lber.map b/libraries/liblber/lber.map
-index 9a4094b0f..083cd1f32 100644
--- a/libraries/liblber/lber.map
+++ b/libraries/liblber/lber.map
@@ -121,6 +121,7 @@ OPENLDAP_2.200
diff --git a/net-nds/openldap/files/openldap-2.6.1-flags.patch b/net-nds/openldap/files/openldap-2.6.1-flags.patch
index 019bd9f6fd33..39ceeecb1742 100644
--- a/net-nds/openldap/files/openldap-2.6.1-flags.patch
+++ b/net-nds/openldap/files/openldap-2.6.1-flags.patch
@@ -1,5 +1,3 @@
-diff --git a/contrib/slapd-modules/acl/Makefile b/contrib/slapd-modules/acl/Makefile
-index 2195e2d72..3efaaad72 100644
--- a/contrib/slapd-modules/acl/Makefile
+++ b/contrib/slapd-modules/acl/Makefile
@@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
@@ -11,8 +9,6 @@ index 2195e2d72..3efaaad72 100644
DEFS =
INCS = $(LDAP_INC)
LIBS = $(LDAP_LIB)
-diff --git a/contrib/slapd-modules/addpartial/Makefile b/contrib/slapd-modules/addpartial/Makefile
-index ecb7cd0a3..e278dc080 100644
--- a/contrib/slapd-modules/addpartial/Makefile
+++ b/contrib/slapd-modules/addpartial/Makefile
@@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
@@ -24,8 +20,6 @@ index ecb7cd0a3..e278dc080 100644
DEFS =
INCS = $(LDAP_INC)
LIBS = $(LDAP_LIB)
-diff --git a/contrib/slapd-modules/adremap/Makefile b/contrib/slapd-modules/adremap/Makefile
-index b008eabd6..23d3658c3 100644
--- a/contrib/slapd-modules/adremap/Makefile
+++ b/contrib/slapd-modules/adremap/Makefile
@@ -19,7 +19,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
@@ -37,8 +31,6 @@ index b008eabd6..23d3658c3 100644
DEFS = -DSLAPD_OVER_ADREMAP=SLAPD_MOD_DYNAMIC
INCS = $(LDAP_INC)
LIBS = $(LDAP_LIB)
-diff --git a/contrib/slapd-modules/allop/Makefile b/contrib/slapd-modules/allop/Makefile
-index 053f3774a..11998ce87 100644
--- a/contrib/slapd-modules/allop/Makefile
+++ b/contrib/slapd-modules/allop/Makefile
@@ -9,7 +9,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
@@ -50,8 +42,6 @@ index 053f3774a..11998ce87 100644
DEFS =
INCS = $(LDAP_INC)
LIBS = $(LDAP_LIB)
-diff --git a/contrib/slapd-modules/allowed/Makefile b/contrib/slapd-modules/allowed/Makefile
-index 32cb43241..674d6cafd 100644
--- a/contrib/slapd-modules/allowed/Makefile
+++ b/contrib/slapd-modules/allowed/Makefile
@@ -20,7 +20,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
@@ -63,8 +53,6 @@ index 32cb43241..674d6cafd 100644
DEFS = -DSLAPD_OVER_ALLOWED=SLAPD_MOD_DYNAMIC
INCS = $(LDAP_INC)
LIBS = $(LDAP_LIB)
-diff --git a/contrib/slapd-modules/authzid/Makefile b/contrib/slapd-modules/authzid/Makefile
-index ef9c4bc4f..49a756c35 100644
--- a/contrib/slapd-modules/authzid/Makefile
+++ b/contrib/slapd-modules/authzid/Makefile
@@ -20,7 +20,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
@@ -76,8 +64,6 @@ index ef9c4bc4f..49a756c35 100644
DEFS =
INCS = $(LDAP_INC)
LIBS = $(LDAP_LIB)
-diff --git a/contrib/slapd-modules/autogroup/Makefile b/contrib/slapd-modules/autogroup/Makefile
-index 7dd6613cf..f19acae6c 100644
--- a/contrib/slapd-modules/autogroup/Makefile
+++ b/contrib/slapd-modules/autogroup/Makefile
@@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
@@ -89,8 +75,6 @@ index 7dd6613cf..f19acae6c 100644
DEFS =
INCS = $(LDAP_INC)
LIBS = $(LDAP_LIB)
-diff --git a/contrib/slapd-modules/cloak/Makefile b/contrib/slapd-modules/cloak/Makefile
-index c54e6b134..9360ef2dc 100644
--- a/contrib/slapd-modules/cloak/Makefile
+++ b/contrib/slapd-modules/cloak/Makefile
@@ -9,7 +9,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
@@ -102,8 +86,6 @@ index c54e6b134..9360ef2dc 100644
DEFS = -DSLAPD_OVER_CLOAK=SLAPD_MOD_DYNAMIC
INCS = $(LDAP_INC)
LIBS = $(LDAP_LIB)
-diff --git a/contrib/slapd-modules/comp_match/Makefile b/contrib/slapd-modules/comp_match/Makefile
-index 9b78c5c12..e1cb8fe3c 100644
--- a/contrib/slapd-modules/comp_match/Makefile
+++ b/contrib/slapd-modules/comp_match/Makefile
@@ -31,7 +31,7 @@ SSL_LIB = -lcrypto -L$(SSL_DIR)/lib
@@ -115,8 +97,6 @@ index 9b78c5c12..e1cb8fe3c 100644
DEFS = -DLDAP_COMPONENT
INCS = $(LDAP_INC) $(SNACC_INC) $(SSL_INC)
LIBS = $(LDAP_LIB) $(SNACC_LIB) $(SSL_LIB)
-diff --git a/contrib/slapd-modules/datamorph/Makefile b/contrib/slapd-modules/datamorph/Makefile
-index 82bce493c..19231c71d 100644
--- a/contrib/slapd-modules/datamorph/Makefile
+++ b/contrib/slapd-modules/datamorph/Makefile
@@ -22,7 +22,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
@@ -128,8 +108,6 @@ index 82bce493c..19231c71d 100644
DEFS = -DSLAPD_OVER_DATAMORPH=SLAPD_MOD_DYNAMIC
INCS = $(LDAP_INC)
LIBS = $(LDAP_LIB)
-diff --git a/contrib/slapd-modules/denyop/Makefile b/contrib/slapd-modules/denyop/Makefile
-index 2cea18b06..d11dd8d4a 100644
--- a/contrib/slapd-modules/denyop/Makefile
+++ b/contrib/slapd-modules/denyop/Makefile
@@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
@@ -141,8 +119,6 @@ index 2cea18b06..d11dd8d4a 100644
DEFS = -DSLAPD_OVER_DENYOP=SLAPD_MOD_DYNAMIC
INCS = $(LDAP_INC)
LIBS = $(LDAP_LIB)
-diff --git a/contrib/slapd-modules/dsaschema/Makefile b/contrib/slapd-modules/dsaschema/Makefile
-index 3a88fc01f..97e0642f3 100644
--- a/contrib/slapd-modules/dsaschema/Makefile
+++ b/contrib/slapd-modules/dsaschema/Makefile
@@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
@@ -154,8 +130,6 @@ index 3a88fc01f..97e0642f3 100644
DEFS =
INCS = $(LDAP_INC)
LIBS = $(LDAP_LIB)
-diff --git a/contrib/slapd-modules/dupent/Makefile b/contrib/slapd-modules/dupent/Makefile
-index 6b3543862..1cc09a8b4 100644
--- a/contrib/slapd-modules/dupent/Makefile
+++ b/contrib/slapd-modules/dupent/Makefile
@@ -20,7 +20,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
@@ -167,8 +141,6 @@ index 6b3543862..1cc09a8b4 100644
DEFS = -DSLAPD_OVER_DUPENT=SLAPD_MOD_DYNAMIC
INCS = $(LDAP_INC)
LIBS = $(LDAP_LIB)
-diff --git a/contrib/slapd-modules/kinit/Makefile b/contrib/slapd-modules/kinit/Makefile
-index 7b25ced76..9f339e810 100644
--- a/contrib/slapd-modules/kinit/Makefile
+++ b/contrib/slapd-modules/kinit/Makefile
@@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
@@ -180,8 +152,6 @@ index 7b25ced76..9f339e810 100644
DEFS =
INCS = $(LDAP_INC)
LIBS = $(LDAP_LIB) -lkrb5
-diff --git a/contrib/slapd-modules/lastbind/Makefile b/contrib/slapd-modules/lastbind/Makefile
-index c273cd3a0..da9fa172f 100644
--- a/contrib/slapd-modules/lastbind/Makefile
+++ b/contrib/slapd-modules/lastbind/Makefile
@@ -19,7 +19,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
@@ -193,8 +163,6 @@ index c273cd3a0..da9fa172f 100644
DEFS = -DSLAPD_OVER_LASTBIND=SLAPD_MOD_DYNAMIC
INCS = $(LDAP_INC)
LIBS = $(LDAP_LIB)
-diff --git a/contrib/slapd-modules/lastmod/Makefile b/contrib/slapd-modules/lastmod/Makefile
-index 9b06c28fb..be583722b 100644
--- a/contrib/slapd-modules/lastmod/Makefile
+++ b/contrib/slapd-modules/lastmod/Makefile
@@ -9,7 +9,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
@@ -206,8 +174,6 @@ index 9b06c28fb..be583722b 100644
DEFS = -DSLAPD_OVER_LASTMOD=SLAPD_MOD_DYNAMIC
INCS = $(LDAP_INC)
LIBS = $(LDAP_LIB)
-diff --git a/contrib/slapd-modules/noopsrch/Makefile b/contrib/slapd-modules/noopsrch/Makefile
-index 2934a3214..22a3db04b 100644
--- a/contrib/slapd-modules/noopsrch/Makefile
+++ b/contrib/slapd-modules/noopsrch/Makefile
@@ -20,7 +20,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
@@ -219,8 +185,6 @@ index 2934a3214..22a3db04b 100644
DEFS = -DSLAPD_OVER_NOOPSRCH=SLAPD_MOD_DYNAMIC
INCS = $(LDAP_INC)
LIBS = $(LDAP_LIB)
-diff --git a/contrib/slapd-modules/nops/Makefile b/contrib/slapd-modules/nops/Makefile
-index 94a5bcd23..86dcdfd76 100644
--- a/contrib/slapd-modules/nops/Makefile
+++ b/contrib/slapd-modules/nops/Makefile
@@ -9,7 +9,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
@@ -232,8 +196,6 @@ index 94a5bcd23..86dcdfd76 100644
DEFS = -DSLAPD_OVER_NOPS=SLAPD_MOD_DYNAMIC
INCS = $(LDAP_INC)
LIBS = $(LDAP_LIB)
-diff --git a/contrib/slapd-modules/nssov/Makefile b/contrib/slapd-modules/nssov/Makefile
-index 13987c250..c2c26d473 100644
--- a/contrib/slapd-modules/nssov/Makefile
+++ b/contrib/slapd-modules/nssov/Makefile
@@ -27,7 +27,7 @@ NLDAPD_INC=-Inss-pam-ldapd
@@ -245,8 +207,6 @@ index 13987c250..c2c26d473 100644
CC = gcc
DEFS =
INCS = $(LDAP_INC) $(NLDAPD_INC)
-diff --git a/contrib/slapd-modules/passwd/Makefile b/contrib/slapd-modules/passwd/Makefile
-index 634649603..4b6be2617 100644
--- a/contrib/slapd-modules/passwd/Makefile
+++ b/contrib/slapd-modules/passwd/Makefile
@@ -9,7 +9,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
@@ -258,8 +218,6 @@ index 634649603..4b6be2617 100644
DEFS =
INCS = $(LDAP_INC)
LIBS = $(LDAP_LIB)
-diff --git a/contrib/slapd-modules/passwd/pbkdf2/Makefile b/contrib/slapd-modules/passwd/pbkdf2/Makefile
-index 6279f50c1..20769028e 100644
--- a/contrib/slapd-modules/passwd/pbkdf2/Makefile
+++ b/contrib/slapd-modules/passwd/pbkdf2/Makefile
@@ -9,7 +9,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
@@ -271,8 +229,6 @@ index 6279f50c1..20769028e 100644
#DEFS = -DSLAPD_PBKDF2_DEBUG
SSL_INC =
-diff --git a/contrib/slapd-modules/passwd/sha2/Makefile b/contrib/slapd-modules/passwd/sha2/Makefile
-index 2d2075688..f8a77d24d 100644
--- a/contrib/slapd-modules/passwd/sha2/Makefile
+++ b/contrib/slapd-modules/passwd/sha2/Makefile
@@ -9,7 +9,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
@@ -284,8 +240,6 @@ index 2d2075688..f8a77d24d 100644
DEFS =
#DEFS = -DSLAPD_SHA2_DEBUG
INCS = $(LDAP_INC)
-diff --git a/contrib/slapd-modules/passwd/totp/Makefile b/contrib/slapd-modules/passwd/totp/Makefile
-index f7dff4bd7..463a45248 100644
--- a/contrib/slapd-modules/passwd/totp/Makefile
+++ b/contrib/slapd-modules/passwd/totp/Makefile
@@ -9,7 +9,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
@@ -297,8 +251,6 @@ index f7dff4bd7..463a45248 100644
DEFS =
INCS = $(LDAP_INC)
LIBS = $(LDAP_LIB)
-diff --git a/contrib/slapd-modules/ppm/Makefile b/contrib/slapd-modules/ppm/Makefile
-index 7b6efaddd..f26faca2b 100644
--- a/contrib/slapd-modules/ppm/Makefile
+++ b/contrib/slapd-modules/ppm/Makefile
@@ -18,7 +18,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/liblber/liblber.la $(LDAP_BUILD)/libraries/li
@@ -310,8 +262,6 @@ index 7b6efaddd..f26faca2b 100644
# To skip linking against CRACKLIB make CRACK=no
CRACK=yes
-diff --git a/contrib/slapd-modules/proxyOld/Makefile b/contrib/slapd-modules/proxyOld/Makefile
-index d92967c39..f2e7524a9 100644
--- a/contrib/slapd-modules/proxyOld/Makefile
+++ b/contrib/slapd-modules/proxyOld/Makefile
@@ -20,7 +20,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
@@ -323,8 +273,6 @@ index d92967c39..f2e7524a9 100644
DEFS =
INCS = $(LDAP_INC)
LIBS = $(LDAP_LIB)
-diff --git a/contrib/slapd-modules/rbac/Makefile b/contrib/slapd-modules/rbac/Makefile
-index 1180bd6a1..59b614ade 100755
--- a/contrib/slapd-modules/rbac/Makefile
+++ b/contrib/slapd-modules/rbac/Makefile
@@ -9,7 +9,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
@@ -336,8 +284,6 @@ index 1180bd6a1..59b614ade 100755
DEFS = -DSLAPD_OVER_RBAC=SLAPD_MOD_DYNAMIC
INCS = $(LDAP_INC)
LIBS = $(LDAP_LIB)
-diff --git a/contrib/slapd-modules/samba4/Makefile b/contrib/slapd-modules/samba4/Makefile
-index f53d130d2..a4b6600ca 100644
--- a/contrib/slapd-modules/samba4/Makefile
+++ b/contrib/slapd-modules/samba4/Makefile
@@ -20,7 +20,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
@@ -349,8 +295,6 @@ index f53d130d2..a4b6600ca 100644
DEFS = -DSLAPD_OVER_RDNVAL=SLAPD_MOD_DYNAMIC \
-DSLAPD_OVER_PGUID=SLAPD_MOD_DYNAMIC \
-DSLAPD_OVER_VERNUM=SLAPD_MOD_DYNAMIC
-diff --git a/contrib/slapd-modules/smbk5pwd/Makefile b/contrib/slapd-modules/smbk5pwd/Makefile
-index a1c2c8eef..c2b1c16bb 100644
--- a/contrib/slapd-modules/smbk5pwd/Makefile
+++ b/contrib/slapd-modules/smbk5pwd/Makefile
@@ -27,7 +27,7 @@ HEIMDAL_LIB = -L/usr/heimdal/lib -lkrb5 -lkadm5srv
@@ -362,8 +306,6 @@ index a1c2c8eef..c2b1c16bb 100644
# Omit DO_KRB5, DO_SAMBA or DO_SHADOW if you don't want to support it.
DEFS = -DDO_KRB5 -DDO_SAMBA -DDO_SHADOW
INCS = $(LDAP_INC) $(HEIMDAL_INC) $(SSL_INC)
-diff --git a/contrib/slapd-modules/trace/Makefile b/contrib/slapd-modules/trace/Makefile
-index 1bf8a5541..9026c2c93 100644
--- a/contrib/slapd-modules/trace/Makefile
+++ b/contrib/slapd-modules/trace/Makefile
@@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
@@ -375,8 +317,6 @@ index 1bf8a5541..9026c2c93 100644
DEFS = -DSLAPD_OVER_TRACE=SLAPD_MOD_DYNAMIC
INCS = $(LDAP_INC)
LIBS = $(LDAP_LIB)
-diff --git a/contrib/slapd-modules/usn/Makefile b/contrib/slapd-modules/usn/Makefile
-index d7af04b10..eae938a3e 100644
--- a/contrib/slapd-modules/usn/Makefile
+++ b/contrib/slapd-modules/usn/Makefile
@@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
@@ -388,8 +328,6 @@ index d7af04b10..eae938a3e 100644
DEFS = -DSLAPD_OVER_USN=SLAPD_MOD_DYNAMIC
INCS = $(LDAP_INC)
LIBS = $(LDAP_LIB)
-diff --git a/contrib/slapd-modules/variant/Makefile b/contrib/slapd-modules/variant/Makefile
-index 07effed6c..a83373b48 100644
--- a/contrib/slapd-modules/variant/Makefile
+++ b/contrib/slapd-modules/variant/Makefile
@@ -22,7 +22,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
@@ -401,8 +339,6 @@ index 07effed6c..a83373b48 100644
DEFS = -DSLAPD_OVER_VARIANT=SLAPD_MOD_DYNAMIC
INCS = $(LDAP_INC)
LIBS = $(LDAP_LIB)
-diff --git a/contrib/slapd-modules/vc/Makefile b/contrib/slapd-modules/vc/Makefile
-index 9fe67ab27..526037e50 100644
--- a/contrib/slapd-modules/vc/Makefile
+++ b/contrib/slapd-modules/vc/Makefile
@@ -20,7 +20,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
diff --git a/net-nds/openldap/files/openldap-2.6.1-system-mdb.patch b/net-nds/openldap/files/openldap-2.6.1-system-mdb.patch
index ad8aaba0157a..e29ba0be964a 100644
--- a/net-nds/openldap/files/openldap-2.6.1-system-mdb.patch
+++ b/net-nds/openldap/files/openldap-2.6.1-system-mdb.patch
@@ -1,5 +1,3 @@
-diff --git a/build/openldap.m4 b/build/openldap.m4
-index 91e2608b8..493f85ae8 100644
--- a/build/openldap.m4
+++ b/build/openldap.m4
@@ -243,6 +243,40 @@ OL_RESOLVER_TRY(ol_cv_resolver_none)
@@ -43,8 +41,6 @@ index 91e2608b8..493f85ae8 100644
dnl
dnl ====================================================================
dnl Check POSIX Thread version
-diff --git a/build/top.mk b/build/top.mk
-index 67873d9f3..8d8787ecb 100644
--- a/build/top.mk
+++ b/build/top.mk
@@ -164,6 +164,7 @@ CLIENT_LIBS = @CLIENT_LIBS@
@@ -55,8 +51,6 @@ index 67873d9f3..8d8787ecb 100644
SLAPD_NDB_LIBS = @SLAPD_NDB_LIBS@
WT_LIBS = @WT_LIBS@
-diff --git a/configure.ac b/configure.ac
-index 9012d0b28..52dd72eb6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -547,6 +547,7 @@ AC_MSG_RESULT(done)
@@ -108,8 +102,6 @@ index 9012d0b28..52dd72eb6 100644
AC_SUBST(BALANCER_LIBS)
AC_SUBST(SLAPD_NDB_LIBS)
AC_SUBST(SLAPD_NDB_INCS)
-diff --git a/servers/slapd/back-mdb/Makefile.in b/servers/slapd/back-mdb/Makefile.in
-index ad3804898..f9319e227 100644
--- a/servers/slapd/back-mdb/Makefile.in
+++ b/servers/slapd/back-mdb/Makefile.in
@@ -25,11 +25,10 @@ OBJS = init.lo tools.lo config.lo \
diff --git a/net-nds/openldap/files/slapd-initd b/net-nds/openldap/files/slapd-initd
index ecd8f650a217..a8e98646569a 100644
--- a/net-nds/openldap/files/slapd-initd
+++ b/net-nds/openldap/files/slapd-initd
@@ -8,7 +8,7 @@ depend() {
}
start() {
- checkpath -q -d /var/run/openldap/ -o ldap:ldap
+ checkpath -q -d /var/run/openldap/ -o ldap:ldap
if ! checkconfig ; then
eerror "There is a problem with your slapd.conf!"
return 1
@@ -20,10 +20,10 @@ start() {
stop() {
ebegin "Stopping ldap-server"
- start-stop-daemon --stop --signal 2 --quiet --pidfile /var/run/openldap/slapd.pid
+ start-stop-daemon --stop --signal 2 --quiet --pidfile /var/run/openldap/slapd.pid
eend $?
}
-checkconfig() {
- /usr/sbin/slaptest -u "$@" ${OPTS_CONF}
+checkconfig() {
+ /usr/sbin/slaptest -u "$@" ${OPTS_CONF}
}
diff --git a/net-nds/openldap/files/slapd-initd-2.4.40-r2 b/net-nds/openldap/files/slapd-initd-2.4.40-r2
index 722b6c20de79..bf408e3d6ecd 100644
--- a/net-nds/openldap/files/slapd-initd-2.4.40-r2
+++ b/net-nds/openldap/files/slapd-initd-2.4.40-r2
@@ -57,7 +57,7 @@ checkconfig() {
if [ $? -ne 0 ]; then
ewarn "You have files in $d not owned by the ldap user, you must ensure they are accessible to the slapd instance!"
fi
- [ ! -e $d/DB_CONFIG ] && ewarn "$d/DB_CONFIG does not exist, slapd performance may be sub-optimal"
+ [ ! -e $d/DB_CONFIG ] && ewarn "$d/DB_CONFIG does not exist, slapd performance may be sub-optimal"
done
# now test the config fully
/usr/sbin/slaptest -u "$@" ${OPTS_CONF}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-nds/openldap/files/
@ 2022-07-15 1:56 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2022-07-15 1:56 UTC (permalink / raw
To: gentoo-commits
commit: 4e3dccde1c610f6f9f03334d612556ebd3f606ee
Author: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 14 19:43:26 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 15 01:52:28 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e3dccde
net-nds/openldap: removed unused files
Closes: https://bugs.gentoo.org/672378
Signed-off-by: Dennis Lamm <expeditioneer <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/26409
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-nds/openldap/files/slapd-confd | 14 --------------
net-nds/openldap/files/slapd-initd | 29 -----------------------------
2 files changed, 43 deletions(-)
diff --git a/net-nds/openldap/files/slapd-confd b/net-nds/openldap/files/slapd-confd
deleted file mode 100644
index 28e9d23520b7..000000000000
--- a/net-nds/openldap/files/slapd-confd
+++ /dev/null
@@ -1,14 +0,0 @@
-# conf.d file for openldap
-#
-# To enable both the standard unciphered server and the ssl encrypted
-# one uncomment this line or set any other server starting options
-# you may desire.
-#
-# OPTS="-h 'ldaps:// ldap:// ldapi://%2fvar%2frun%2fopenldap%2fslapd.sock'"
-# Uncomment the below to use the new slapd configuration for openldap 2.3
-#OPTS="-F /etc/openldap/slapd.d -h 'ldaps:// ldap:// ldapi://%2fvar%2frun%2fopenldap%2fslapd.sock'"
-#
-# If you change the above listen statement to bind on a specific IP for
-# listening, you should ensure that interface is up here (change eth0 as
-# needed).
-#rc_need="net.eth0"
diff --git a/net-nds/openldap/files/slapd-initd b/net-nds/openldap/files/slapd-initd
deleted file mode 100644
index a8e98646569a..000000000000
--- a/net-nds/openldap/files/slapd-initd
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- need net.lo
- before hald avahi-daemon
-}
-
-start() {
- checkpath -q -d /var/run/openldap/ -o ldap:ldap
- if ! checkconfig ; then
- eerror "There is a problem with your slapd.conf!"
- return 1
- fi
- ebegin "Starting ldap-server"
- eval start-stop-daemon --start --pidfile /var/run/openldap/slapd.pid --exec /usr/lib/openldap/slapd -- -u ldap -g ldap "${OPTS}"
- eend $?
-}
-
-stop() {
- ebegin "Stopping ldap-server"
- start-stop-daemon --stop --signal 2 --quiet --pidfile /var/run/openldap/slapd.pid
- eend $?
-}
-
-checkconfig() {
- /usr/sbin/slaptest -u "$@" ${OPTS_CONF}
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-nds/openldap/files/
@ 2022-07-19 17:10 Conrad Kostecki
0 siblings, 0 replies; 11+ messages in thread
From: Conrad Kostecki @ 2022-07-19 17:10 UTC (permalink / raw
To: gentoo-commits
commit: cfcc38ada04999d71dfbd1f91f4af7fdbe8f4f0c
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Jul 19 15:28:46 2022 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Jul 19 17:09:06 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfcc38ad
net-nds/openldap: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Portage 3.0.32 / pkgdev 0.2.1 / pkgcheck 0.10.11
Closes: https://github.com/gentoo/gentoo/pull/26479
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../openldap/files/openldap-2.6.1-make-flags.patch | 59 ----------------------
1 file changed, 59 deletions(-)
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 bf94f9958d3a..000000000000
--- 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 <orgad.shaneh@audiocodes.com>
-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
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-nds/openldap/files/
@ 2022-11-23 1:45 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2022-11-23 1:45 UTC (permalink / raw
To: gentoo-commits
commit: e8c188e1ab97263d7d803f2634bd0d72988ddeeb
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Nov 21 18:18:42 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 23 01:42:14 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8c188e1
net-nds/openldap: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/28373
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/openldap-2.6.1-parallel-build.patch | 46 ----------------------
1 file changed, 46 deletions(-)
diff --git a/net-nds/openldap/files/openldap-2.6.1-parallel-build.patch b/net-nds/openldap/files/openldap-2.6.1-parallel-build.patch
deleted file mode 100644
index 757a33c602b2..000000000000
--- a/net-nds/openldap/files/openldap-2.6.1-parallel-build.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-https://github.com/openldap/openldap/commit/d7c0417bcfba5400c0be2ce83eaf43ec97c97edd.patch
-https://github.com/openldap/openldap/commit/d75de4d6e98e9501ada2b6a1d527669bd7eb2fa3.patch
-https://bugs.gentoo.org/836557
-
-From: Yi Zhao <yi.zhao@windriver.com>
-Date: Thu, 2 Dec 2021 11:38:15 +0800
-Subject: [PATCH] ITS#9840 - ldif-filter: fix parallel build failure
-
-Add slapd-common.o as dependency for ldif-filter to fix the parallel
-build failure:
- ld: cannot find slapd-common.o: No such file or directory
-
-Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---- a/tests/progs/Makefile.in
-+++ b/tests/progs/Makefile.in
-@@ -56,7 +56,7 @@ slapd-modify: slapd-modify.o $(OBJS) $(XLIBS)
- slapd-bind: slapd-bind.o $(OBJS) $(XLIBS)
- $(LTLINK) -o $@ slapd-bind.o $(OBJS) $(LIBS)
-
--ldif-filter: ldif-filter.o $(XLIBS)
-+ldif-filter: ldif-filter.o $(OBJS) $(XLIBS)
- $(LTLINK) -o $@ ldif-filter.o $(OBJS) $(LIBS)
-
- slapd-mtread: slapd-mtread.o $(OBJS) $(XLIBS)
-
-From: Yi Zhao <yi.zhao@windriver.com>
-Date: Mon, 10 Jan 2022 10:13:51 +0800
-Subject: [PATCH] ITS#9840 - libraries/Makefile.in: ignore the mkdir errors
-
-Ignore the mkdir errors to fix the parallel build failure:
-
-../../build/shtool mkdir -p TOPDIR/tmp-glibc/work/cortexa15t2hf-neon-wrs-linux-gnueabi/openldap/2.5.9-r0/image/usr/lib
-mkdir: cannot create directory 'TOPDIR/tmp-glibc/work/cortexa15t2hf-neon-wrs-linux-gnueabi/openldap/2.5.9-r0/image/usr/lib': File exists
-
-Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---- a/libraries/Makefile.in
-+++ b/libraries/Makefile.in
-@@ -24,7 +24,7 @@ PKGCONFIG_DIR=$(DESTDIR)$(libdir)/pkgconfig
- PKGCONFIG_SRCDIRS=liblber libldap
-
- install-local:
-- @$(MKDIR) $(PKGCONFIG_DIR)
-+ @-$(MKDIR) $(PKGCONFIG_DIR)
- @for i in $(PKGCONFIG_SRCDIRS); do \
- $(INSTALL_DATA) $$i/*.pc $(PKGCONFIG_DIR); \
- done
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-nds/openldap/files/
@ 2024-08-28 7:25 Joonas Niilola
0 siblings, 0 replies; 11+ messages in thread
From: Joonas Niilola @ 2024-08-28 7:25 UTC (permalink / raw
To: gentoo-commits
commit: 0b77155c881ac15218ae486ee63b188cf8892a36
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Aug 28 07:17:19 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Aug 28 07:25:48 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b77155c
net-nds/openldap: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../openldap/files/openldap-2.6.3-clang16.patch | 185 ---------------------
1 file changed, 185 deletions(-)
diff --git a/net-nds/openldap/files/openldap-2.6.3-clang16.patch b/net-nds/openldap/files/openldap-2.6.3-clang16.patch
deleted file mode 100644
index 7027197281b2..000000000000
--- a/net-nds/openldap/files/openldap-2.6.3-clang16.patch
+++ /dev/null
@@ -1,185 +0,0 @@
-From ee4983302d6f052e77ab0332d2a128d169c2eacb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
-Date: Tue, 15 Nov 2022 21:45:27 +0100
-Subject: [PATCH] Remove default-int/k&r declarations from the configure macros
-
-Recently, Clang tried to switch to having K&R 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
-Bug: https://bugs.gentoo.org/871372
---- 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 <ctype.h>
-+#include <stdlib.h>
- #ifndef HAVE_EBCDIC
- # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
- # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -394,9 +395,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
- }
-@@ -518,7 +517,7 @@ AC_CACHE_CHECK([for compatible POSIX regex],ol_cv_c_posix_regex,[
- #include <sys/types.h>
- #include <regex.h>
- static char *pattern, *string;
--main()
-+int main(void)
- {
- int rc;
- regex_t re;
-@@ -545,7 +544,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 <ctype.h>
--main()
-+#include <stdlib.h>
-+int main(void)
- {
- if ('C' == toupper('C'))
- exit(0);
-@@ -603,7 +603,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
-@@ -1031,7 +1031,11 @@ dnl ----------------------------------------------------------------
- AC_CHECK_HEADERS( sys/epoll.h )
- if test "${ac_cv_header_sys_epoll_h}" = yes; then
- AC_MSG_CHECKING(for epoll system call)
-- AC_RUN_IFELSE([AC_LANG_SOURCE([[int main(int argc, char **argv)
-+ AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdlib.h>
-+#ifdef HAVE_SYS_POLL_H
-+#include <sys/epoll.h>
-+#endif
-+int main(int argc, char **argv)
- {
- int epfd = epoll_create(256);
- exit (epfd == -1 ? 1 : 0);
-@@ -1493,10 +1497,8 @@ pthread_rwlock_t rwlock;
- dnl save the flags
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[
- #include <pthread.h>
--#ifndef NULL
--#define NULL (void*)0
--#endif
--]], [[pthread_detach(NULL);]])],[ol_cv_func_pthread_detach=yes],[ol_cv_func_pthread_detach=no])
-+pthread_t thread;
-+]], [[pthread_detach(thread);]])],[ol_cv_func_pthread_detach=yes],[ol_cv_func_pthread_detach=no])
- ])
-
- if test $ol_cv_func_pthread_detach = no ; then
-@@ -1551,6 +1553,9 @@ dnl esac
- AC_CACHE_CHECK([if select yields when using pthreads],
- ol_cv_pthread_select_yields,[
- AC_RUN_IFELSE([AC_LANG_SOURCE([[
-+#define _XOPEN_SOURCE 500 /* For pthread_setconcurrency() on glibc */
-+#include <stdlib.h>
-+#include <stdio.h>
- #include <sys/types.h>
- #include <sys/time.h>
- #include <unistd.h>
-@@ -1561,8 +1566,7 @@ dnl esac
-
- static int fildes[2];
-
--static void *task(p)
-- void *p;
-+static void *task(void *p)
- {
- int i;
- struct timeval tv;
-@@ -1586,9 +1590,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 (int argc,
- char **argv)
--#else
--int
--main (argc, argv)
-- int argc;
-- 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);
- LogFile = -1;
---
-2.38.1
-
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2024-08-28 7:25 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-03-20 21:04 [gentoo-commits] repo/gentoo:master commit in: net-nds/openldap/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-08-28 7:25 Joonas Niilola
2022-11-23 1:45 Sam James
2022-07-19 17:10 Conrad Kostecki
2022-07-15 1:56 Sam James
2022-03-19 22:39 Sam James
2020-06-19 22:48 Conrad Kostecki
2019-03-03 19:12 Lars Wendler
2017-12-14 22:08 Robin H. Johnson
2017-07-25 17:42 Matt Thode
2017-01-27 22:10 Robin H. Johnson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox