commit: a738395fb376ba1ce06a110cf123e1499756ea9e Author: orbea <orbea <AT> riseup <DOT> net> AuthorDate: Fri Sep 13 01:30:34 2024 +0000 Commit: orbea <orbea <AT> riseup <DOT> net> CommitDate: Fri Sep 13 01:30:34 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=a738395f
net-nds/openldap: treeclean Signed-off-by: orbea <orbea <AT> riseup.net> net-nds/openldap/Manifest | 2 - net-nds/openldap/files/DB_CONFIG.fast.example | 25 - .../files/openldap-2.2.14-perlthreadsfix.patch | 11 - .../openldap/files/openldap-2.4.11-libldap_r.patch | 10 - .../openldap/files/openldap-2.4.15-ppolicy.patch | 12 - net-nds/openldap/files/openldap-2.4.17-gcc44.patch | 10 - .../openldap/files/openldap-2.4.28-fix-dash.patch | 24 - .../files/openldap-2.4.28-gnutls-gcrypt.patch | 11 - net-nds/openldap/files/openldap-2.4.31-gcc47.patch | 16 - .../files/openldap-2.4.35-contrib-samba4.patch | 37 - .../files/openldap-2.4.35-contrib-smbk5pwd.patch | 47 -- net-nds/openldap/files/openldap-2.4.40-slapd-conf | 64 -- .../files/openldap-2.4.42-mdb-unbundle.patch | 136 ---- ...enldap-2.4.45-fix-lmpasswd-gnutls-symbols.patch | 109 --- .../openldap/files/openldap-2.4.47-warnings.patch | 35 - .../files/openldap-2.4.6-evolution-ntlm.patch | 189 ----- net-nds/openldap/files/openldap-2.6.1-cloak.patch | 21 - .../openldap-2.6.1-fix-bashism-configure.patch | 11 - .../files/openldap-2.6.1-fix-missing-mapping.patch | 15 - net-nds/openldap/files/openldap-2.6.1-flags.patch | 352 --------- .../openldap/files/openldap-2.6.1-system-mdb.patch | 140 ---- .../openldap/files/openldap-2.6.3-clang16.patch | 185 ----- net-nds/openldap/files/openldap-2.6.3-slapd-conf | 64 -- .../openldap/files/openldap-2.6.4-clang16.patch | 234 ------ .../openldap/files/openldap-2.6.4-libressl.patch | 38 - net-nds/openldap/files/slapd-2.6.1.service | 13 - net-nds/openldap/files/slapd-confd-2.4.28-r1 | 26 - net-nds/openldap/files/slapd-confd-2.6.1 | 26 - net-nds/openldap/files/slapd-initd-2.4.40-r2 | 64 -- net-nds/openldap/files/slapd.service | 12 - net-nds/openldap/files/slapd.service.conf | 12 - net-nds/openldap/files/slapd.tmpfilesd | 2 - net-nds/openldap/metadata.xml | 26 - net-nds/openldap/openldap-2.6.3-r7.ebuild | 828 --------------------- 34 files changed, 2807 deletions(-) diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest deleted file mode 100644 index 1e7927c..0000000 --- a/net-nds/openldap/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST openldap-OPENLDAP_REL_ENG_2_6_3.tar.gz 6244895 BLAKE2B 97792a1b368de44867b0ce9eef38601c3e64b7d40e4ca206295bee110097697c919040d2220eea6f0581812e09a2cc3e6afb4a243a5072a8a0a95f24f9fb354b SHA512 1c882a0cd0729b5d0f40b58588d0e36ae3b1cae6d569f0576e940c7c63d03c29ed2c9db87695a87594ba99a927ef4cba491bddba3ce049025fd5883463122ba7 -DIST rfc2307bis.schema-20140524 12262 BLAKE2B 98031f49e9bde1e4821e637af3382364d8344ed7017649686a088070d96a632dffa6c661552352656b1b159c0fd962965580069a64c7f3d5bb6a3ed75f60fd99 SHA512 83b89a1deeefc8566b97e7e865b9b6d04541099cbdf719e24538a7d27d61b6209e87ab9003a9f140bd9afd018ec569e71721e3a24090e1902c8b6659d2ba103e diff --git a/net-nds/openldap/files/DB_CONFIG.fast.example b/net-nds/openldap/files/DB_CONFIG.fast.example deleted file mode 100644 index 8b52062..0000000 --- a/net-nds/openldap/files/DB_CONFIG.fast.example +++ /dev/null @@ -1,25 +0,0 @@ -# $OpenLDAP: pkg/ldap/servers/slapd/DB_CONFIG,v 1.1 2004/06/18 02:49:08 kurt Exp $ -# Example DB_CONFIG file for use with slapd(8) BDB/HDB databases. -# -# See Sleepycat Berkeley DB documentation -# <http://www.sleepycat.com/docs/ref/env/db_config.html> -# for detail description of DB_CONFIG syntax and semantics. -# -# Hints can also be found in the OpenLDAP Software FAQ -# <http://www.openldap.org/faq/index.cgi?file=2> - -# one 0.25 GB cache -set_cachesize 0 16777216 0 - -# Data Directory -#set_data_dir db - -# Transaction Log settings -set_lg_regionmax 262144 -set_lg_bsize 524288 -#set_lg_dir logs - -# When using (and only when using) slapadd(8) or slapindex(8), -# the following flags may be useful: -#set_flags DB_TXN_NOSYNC -#set_flags DB_TXN_NOT_DURABLE diff --git a/net-nds/openldap/files/openldap-2.2.14-perlthreadsfix.patch b/net-nds/openldap/files/openldap-2.2.14-perlthreadsfix.patch deleted file mode 100644 index 2a8c4bc..0000000 --- a/net-nds/openldap/files/openldap-2.2.14-perlthreadsfix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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) - NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) --UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) -+UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) `perl -MExtUtils::Embed -e ldopts` - - LIBBASE = back_perl - 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 deleted file mode 100644 index f63ad3c..0000000 --- a/net-nds/openldap/files/openldap-2.4.11-libldap_r.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/servers/slapd/slapi/Makefile.in -+++ b/servers/slapd/slapi/Makefile.in -@@ -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.4.15-ppolicy.patch b/net-nds/openldap/files/openldap-2.4.15-ppolicy.patch deleted file mode 100644 index 1196f1b..0000000 --- a/net-nds/openldap/files/openldap-2.4.15-ppolicy.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/clients/tools/common.c -+++ b/clients/tools/common.c -@@ -1315,8 +1315,8 @@ - int nsctrls = 0; - - #ifdef LDAP_CONTROL_PASSWORDPOLICYREQUEST -+ LDAPControl c; - if ( ppolicy ) { -- LDAPControl c; - 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.4.17-gcc44.patch b/net-nds/openldap/files/openldap-2.4.17-gcc44.patch deleted file mode 100644 index a782da4..0000000 --- a/net-nds/openldap/files/openldap-2.4.17-gcc44.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/contrib/ldapc++/src/SaslInteractionHandler.cpp -+++ b/contrib/ldapc++/src/SaslInteractionHandler.cpp -@@ -13,6 +13,7 @@ - #include <termios.h> - #endif - -+#include <stdio.h> - #include <string.h> - #include "SaslInteractionHandler.h" - #include "SaslInteraction.h" 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 deleted file mode 100644 index bca213d..0000000 --- a/net-nds/openldap/files/openldap-2.4.28-fix-dash.patch +++ /dev/null @@ -1,24 +0,0 @@ -Our libtool needs bash to work properly. -Patch unbreaks build when /bin/sh points to dash: - - Entering subdirectory liblber - /bin/sh ../../libtool --mode=compile x86_64-pc-linux-gnu-gcc -O0 -D_GNU_SOURCE -I../../include -I../../include -I/usr/include/db4.8 -DLDAP_CONNECTIONLESS -DLBER_LIBRARY -c assert.c - ../../build/mkversion -v "2.4.28" liblber.la > version.c - /bin/sh ../../libtool --mode=compile x86_64-pc-linux-gnu-gcc -O0 -D_GNU_SOURCE -I../../include -I../../include -I/usr/include/db4.8 -DLDAP_CONNECTIONLESS -DLBER_LIBRARY -c decode.c - eval: 1: base_compile+= x86_64-pc-linux-gnu-gcc: not found - eval: 1: base_compile+= -O0: not found - eval: 1: base_compile+= -D_GNU_SOURCE: not found - eval: 1: base_compile+= x86_64-pc-linux-gnu-gcc: not found - ... - make[2]: *** [decode.lo] Error 1 ---- a/build/top.mk -+++ b/build/top.mk -@@ -20,7 +20,7 @@ VERSION= @VERSION@ - RELEASEDATE= @OPENLDAP_RELEASE_DATE@ - - @SET_MAKE@ --SHELL = /bin/sh -+SHELL = @SHELL@ - - top_builddir = @top_builddir@ - 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 deleted file mode 100644 index 0d9b88f..0000000 --- a/net-nds/openldap/files/openldap-2.4.28-gnutls-gcrypt.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -1214,7 +1214,7 @@ - ol_with_tls=gnutls - ol_link_tls=yes - -- TLS_LIBS="-lgnutls" -+ TLS_LIBS="-lgnutls -lgcrypt" - - AC_DEFINE(HAVE_GNUTLS, 1, - [define if you have GNUtls]) diff --git a/net-nds/openldap/files/openldap-2.4.31-gcc47.patch b/net-nds/openldap/files/openldap-2.4.31-gcc47.patch deleted file mode 100644 index 5b6af4b..0000000 --- a/net-nds/openldap/files/openldap-2.4.31-gcc47.patch +++ /dev/null @@ -1,16 +0,0 @@ -Fix building with gcc-4.7 - -https://bugs.gentoo.org/show_bug.cgi?id=420959 -http://www.openldap.org/its/index.cgi/Incoming?id=7304;page=16 #ITS 7304 - -Patch written by Kacper Kowalik <xarthis...@gentoo.org> ---- a/contrib/ldapc++/src/SaslInteractionHandler.cpp -+++ b/contrib/ldapc++/src/SaslInteractionHandler.cpp -@@ -16,6 +16,7 @@ - - #include <stdio.h> - #include <string.h> -+#include <unistd.h> - #include "SaslInteractionHandler.h" - #include "SaslInteraction.h" - #include "debug.h" 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 deleted file mode 100644 index 8ee3891..0000000 --- a/net-nds/openldap/files/openldap-2.4.35-contrib-samba4.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- a/contrib/slapd-modules/samba4/Makefile -+++ b/contrib/slapd-modules/samba4/Makefile -@@ -20,7 +20,8 @@ - - LIBTOOL = $(LDAP_BUILD)/libtool - CC = gcc --OPT = -g -O2 -Wall -+#OPT = -g -O2 -Wall -+OPT = -Wall - DEFS = -DSLAPD_OVER_RDNVAL=SLAPD_MOD_DYNAMIC \ - -DSLAPD_OVER_PGUID=SLAPD_MOD_DYNAMIC \ - -DSLAPD_OVER_VERNUM=SLAPD_MOD_DYNAMIC -@@ -41,20 +42,20 @@ - .SUFFIXES: .c .o .lo - - .c.lo: -- $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $< -+ $(LIBTOOL) --mode=compile $(CC) $(OPT) $(CFLAGS) $(DEFS) $(INCS) -c $< - - all: $(PROGRAMS) - - pguid.la: pguid.lo -- $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \ -+ $(LIBTOOL) --mode=link $(CC) $(OPT) $(CFLAGS) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) - - rdnval.la: rdnval.lo -- $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \ -+ $(LIBTOOL) --mode=link $(CC) $(OPT) $(CFLAGS) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) - - vernum.la: vernum.lo -- $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \ -+ $(LIBTOOL) --mode=link $(CC) $(OPT) $(CFLAGS) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) - - clean: 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 deleted file mode 100644 index ca02404..0000000 --- a/net-nds/openldap/files/openldap-2.4.35-contrib-smbk5pwd.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- a/contrib/slapd-modules/smbk5pwd/Makefile -+++ b/contrib/slapd-modules/smbk5pwd/Makefile -@@ -21,16 +21,23 @@ - SSL_INC = - SSL_LIB = -lcrypto - --HEIMDAL_INC = -I/usr/heimdal/include --HEIMDAL_LIB = -L/usr/heimdal/lib -lkrb5 -lkadm5srv -+#HEIMDAL_INC = -I/usr/heimdal/include -+#HEIMDAL_LIB = -L/usr/heimdal/lib -lkrb5 -lkadm5srv -+KRB5_INC = $(HEIMDAL_INC) -+KRB5_LIB = $(HEIMDAL_LIB) -lkrb5 -lkadm5srv - - LIBTOOL = $(LDAP_BUILD)/libtool - CC = gcc --OPT = -g -O2 -Wall -+#OPT = -g -O2 -Wall -+OPT = -Wall - # 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) --LIBS = $(LDAP_LIB) $(HEIMDAL_LIB) $(SSL_LIB) -+#DEFS = -DDO_KRB5 -DDO_SAMBA -DDO_SHADOW -+INCS = $(LDAP_INC) $(KRB5_INC) $(SSL_INC) -+ifneq (DDO_KRB5,$(findstring DDO_KRB5,$(DEFS))) -+ LIBS=$(LDAP_LIB) $(SSL_LIB) -+else -+ LIBS=$(LDAP_LIB) $(KRB5_LIB) $(SSL_LIB) -+endif - - PROGRAMS = smbk5pwd.la - LTVER = 0:0:0 -@@ -46,12 +53,12 @@ - .SUFFIXES: .c .o .lo - - .c.lo: -- $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $< -+ $(LIBTOOL) --mode=compile $(CC) $(OPT) $(CFLAGS) $(DEFS) $(INCS) -c $< - - all: $(PROGRAMS) - - smbk5pwd.la: smbk5pwd.lo -- $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \ -+ $(LIBTOOL) --mode=link $(CC) $(OPT) $(CFLAGS) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) - - clean: diff --git a/net-nds/openldap/files/openldap-2.4.40-slapd-conf b/net-nds/openldap/files/openldap-2.4.40-slapd-conf deleted file mode 100644 index 8ecc732..0000000 --- a/net-nds/openldap/files/openldap-2.4.40-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 /run/openldap/slapd.pid -argsfile /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.4.42-mdb-unbundle.patch b/net-nds/openldap/files/openldap-2.4.42-mdb-unbundle.patch deleted file mode 100644 index 6ec6888..0000000 --- a/net-nds/openldap/files/openldap-2.4.42-mdb-unbundle.patch +++ /dev/null @@ -1,136 +0,0 @@ ---- a/build/top.mk -+++ b/build/top.mk -@@ -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 -+++ ./build/openldap.m4 -@@ -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 <lmdb.h> -+ -+/* require 0.9.14 or later */ -+#if MDB_VERSION_FULL >= 0x00000009000E -+ __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 ---- 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 \ - dn2entry.lo dn2id.lo id2entry.lo idl.lo \ -- nextid.lo monitor.lo mdb.lo midl.lo -+ nextid.lo monitor.lo - - LDAP_INCDIR= ../../../include - LDAP_LIBDIR= ../../../libraries --MDB_SUBDIR = $(srcdir)/$(LDAP_LIBDIR)/liblmdb - - BUILD_OPT = "--enable-mdb" - BUILD_MOD = @BUILD_MDB@ -@@ -44,7 +43,7 @@ - - LIBBASE = back_mdb - --XINCPATH = -I.. -I$(srcdir)/.. -I$(MDB_SUBDIR) -+XINCPATH = -I.. -I$(srcdir)/.. - XDEFS = $(MODULES_CPPFLAGS) - - all-local-lib: ../.backend -@@ -52,11 +51,5 @@ - ../.backend: lib$(LIBBASE).a - @touch $@ - --mdb.lo: $(MDB_SUBDIR)/mdb.c -- $(LTCOMPILE_MOD) $(MDB_SUBDIR)/mdb.c -- --midl.lo: $(MDB_SUBDIR)/midl.c -- $(LTCOMPILE_MOD) $(MDB_SUBDIR)/midl.c -- - veryclean-local-lib: FORCE - $(RM) $(XXHEADERS) $(XXSRCS) .links ---- a/configure.in -+++ b/configure.in -@@ -519,6 +519,7 @@ - dnl Initialize vars - LDAP_LIBS= - BDB_LIBS= -+MDB_LIBS= - SLAPD_NDB_LIBS= - SLAPD_NDB_INCS= - LTHREAD_LIBS= -@@ -1905,6 +1906,30 @@ - fi - - dnl ---------------------------------------------------------------- -+ol_link_mdb=no -+ -+if test $ol_enable_mdb != no; then -+ OL_MDB -+ -+ if test $ol_cv_mdb = no ; then -+ AC_MSG_ERROR(MDB: LMDB not available) -+ fi -+ -+ AC_DEFINE(HAVE_MDB,1, -+ [define this if LMDB is available]) -+ -+ dnl $ol_cv_lib_mdb should be yes or -llmdb -+ dnl (it could be no, but that would be an error -+ if test $ol_cv_lib_mdb != yes ; then -+ MDB_LIBS="$MDB_LIBS $ol_cv_lib_mdb" -+ fi -+ -+ SLAPD_LIBS="$SLAPD_LIBS \$(MDB_LIBS)" -+ -+ ol_link_mdb=yes -+fi -+ -+dnl ---------------------------------------------------------------- - - if test $ol_enable_dynamic = yes && test $enable_shared = yes ; then - BUILD_LIBS_DYNAMIC=shared -@@ -3133,6 +3158,7 @@ - AC_SUBST(LDAP_LIBS) - AC_SUBST(SLAPD_LIBS) - AC_SUBST(BDB_LIBS) -+AC_SUBST(MDB_LIBS) - AC_SUBST(SLAPD_NDB_LIBS) - AC_SUBST(SLAPD_NDB_INCS) - AC_SUBST(LTHREAD_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 deleted file mode 100644 index 05e515c..0000000 --- a/net-nds/openldap/files/openldap-2.4.45-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 <robb...@gentoo.org> -Signed-off-by: Steffen Hau <stef...@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 - ---- 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 - -+#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 ); - } diff --git a/net-nds/openldap/files/openldap-2.4.47-warnings.patch b/net-nds/openldap/files/openldap-2.4.47-warnings.patch deleted file mode 100644 index 10f2111..0000000 --- a/net-nds/openldap/files/openldap-2.4.47-warnings.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- a/include/ldap.h -+++ b/include/ldap.h -@@ -2041,6 +2041,10 @@ LDAP_F( int ) - ldap_is_ldapi_url LDAP_P(( - LDAP_CONST char *url )); - -+LDAP_F( int ) -+ldap_is_ldapc_url LDAP_P(( -+ LDAP_CONST char *url )); -+ - LDAP_F( int ) - ldap_url_parse LDAP_P(( - LDAP_CONST char *url, ---- a/include/ldap_int_thread.h -+++ b/include/ldap_int_thread.h -@@ -33,7 +33,7 @@ LDAP_END_DECL - * definitions for POSIX Threads * - * * - **********************************/ -- -+#define __USE_UNIX98 - #include <pthread.h> - #ifdef HAVE_SCHED_H - #include <sched.h> ---- a/libraries/libldap/tls2.c -+++ b/libraries/libldap/tls2.c -@@ -76,6 +76,8 @@ static oid_name oids[] = { - - #ifdef HAVE_TLS - -+int ldap_pvt_tls_check_hostname( LDAP *ld, void *s, const char *name_in ); -+ - void - ldap_pvt_tls_ctx_free ( void *c ) - { 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 deleted file mode 100644 index e8bcc50..0000000 --- a/net-nds/openldap/files/openldap-2.4.6-evolution-ntlm.patch +++ /dev/null @@ -1,189 +0,0 @@ ---- a/include/ldap.h -+++ b/include/ldap.h -@@ -2461,5 +2461,26 @@ ldap_parse_deref_control LDAP_P(( - LDAPControl **ctrls, - LDAPDerefRes **drp )); - -+/* -+ * 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 */ ---- 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 \ - modify.c add.c modrdn.c delete.c abandon.c \ -- sasl.c gssapi.c sbind.c unbind.c cancel.c \ -+ sasl.c ntlm.c gssapi.c sbind.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 pagectrl.c sortctrl.c vlvctrl.c \ -@@ -33,7 +33,7 @@ SRCS = bind.c open.c result.c error.c co - 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 gssapi.lo sbind.lo unbind.lo cancel.lo \ -+ sasl.lo ntlm.lo gssapi.lo sbind.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 pagectrl.lo sortctrl.lo vlvctrl.lo \ ---- /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 $ */ -+/* -+ * 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.6.1-cloak.patch b/net-nds/openldap/files/openldap-2.6.1-cloak.patch deleted file mode 100644 index e023a14..0000000 --- a/net-nds/openldap/files/openldap-2.6.1-cloak.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/contrib/slapd-modules/cloak/cloak.c -+++ b/contrib/slapd-modules/cloak/cloak.c -@@ -29,6 +29,7 @@ - #include "ac/socket.h" - - #include "lutil.h" -+#include "attr.h" - #include "slap.h" - #include "slap-config.h" - ---- a/servers/slapd/attr.h -+++ b/servers/slapd/attr.h -@@ -0,0 +1,8 @@ -+#ifndef OPENLDAP_SERVERS_SLAPD_ATTR_H_ -+#define OPENLDAP_SERVERS_SLAPD_ATTR_H_ -+ -+#endif //OPENLDAP_SERVERS_SLAPD_ATTR_H_ -+ -+#include "slap.h" -+ -+void attr_clean( Attribute *a ); 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 deleted file mode 100644 index c2acb67..0000000 --- a/net-nds/openldap/files/openldap-2.6.1-fix-bashism-configure.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -2055,7 +2055,7 @@ dnl - WITH_SYSTEMD=no - systemdsystemunitdir= - ol_link_systemd=no --if test $ol_enable_slapd == no && test $ol_enable_balancer != yes ; then -+if test $ol_enable_slapd = no && test $ol_enable_balancer != yes ; then - if test $ol_with_systemd != no ; then - AC_MSG_WARN([servers disabled, ignoring --with-systemd=$ol_with_systemd argument]) - ol_with_systemd=no 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 deleted file mode 100644 index 1d65955..0000000 --- a/net-nds/openldap/files/openldap-2.6.1-fix-missing-mapping.patch +++ /dev/null @@ -1,15 +0,0 @@ -From 59e013602d7b1aa0d7da79d65367c9ec391b96f8 Mon Sep 17 00:00:00 2001 -From: Simon Pichugin <spich...@redhat.com> -Date: Wed, 3 Nov 2021 19:03:40 -0700 -Subject: [PATCH] Fix missing mapping - ---- a/libraries/liblber/lber.map -+++ b/libraries/liblber/lber.map -@@ -121,6 +121,7 @@ OPENLDAP_2.200 - ber_sockbuf_io_fd; - ber_sockbuf_io_readahead; - ber_sockbuf_io_tcp; -+ ber_sockbuf_io_udp; - ber_sockbuf_remove_io; - ber_sos_dump; - ber_start; diff --git a/net-nds/openldap/files/openldap-2.6.1-flags.patch b/net-nds/openldap/files/openldap-2.6.1-flags.patch deleted file mode 100644 index 39ceeec..0000000 --- a/net-nds/openldap/files/openldap-2.6.1-flags.patch +++ /dev/null @@ -1,352 +0,0 @@ ---- a/contrib/slapd-modules/acl/Makefile -+++ b/contrib/slapd-modules/acl/Makefile -@@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ - - LIBTOOL = $(LDAP_BUILD)/libtool - CC = gcc --OPT = -g -O2 -+OPT = -Wall - DEFS = - INCS = $(LDAP_INC) - LIBS = $(LDAP_LIB) ---- a/contrib/slapd-modules/addpartial/Makefile -+++ b/contrib/slapd-modules/addpartial/Makefile -@@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ - - LIBTOOL = $(LDAP_BUILD)/libtool - CC = gcc --OPT = -g -O2 -+OPT = -Wall - DEFS = - INCS = $(LDAP_INC) - LIBS = $(LDAP_LIB) ---- a/contrib/slapd-modules/adremap/Makefile -+++ b/contrib/slapd-modules/adremap/Makefile -@@ -19,7 +19,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ - LIBTOOL = $(LDAP_BUILD)/libtool - INSTALL = /usr/bin/install - CC = gcc --OPT = -g -O2 -+OPT = -Wall - DEFS = -DSLAPD_OVER_ADREMAP=SLAPD_MOD_DYNAMIC - INCS = $(LDAP_INC) - LIBS = $(LDAP_LIB) ---- a/contrib/slapd-modules/allop/Makefile -+++ b/contrib/slapd-modules/allop/Makefile -@@ -9,7 +9,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ - LIBTOOL = $(LDAP_BUILD)/libtool - INSTALL = /usr/bin/install - CC = gcc --OPT = -g -O2 -+OPT = -Wall - DEFS = - INCS = $(LDAP_INC) - LIBS = $(LDAP_LIB) ---- a/contrib/slapd-modules/allowed/Makefile -+++ b/contrib/slapd-modules/allowed/Makefile -@@ -20,7 +20,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ - - LIBTOOL = $(LDAP_BUILD)/libtool - CC = gcc --OPT = -g -O2 -+OPT = -Wall - DEFS = -DSLAPD_OVER_ALLOWED=SLAPD_MOD_DYNAMIC - INCS = $(LDAP_INC) - LIBS = $(LDAP_LIB) ---- a/contrib/slapd-modules/authzid/Makefile -+++ b/contrib/slapd-modules/authzid/Makefile -@@ -20,7 +20,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ - - LIBTOOL = $(LDAP_BUILD)/libtool - CC = gcc --OPT = -g -O2 -+OPT = -Wall - DEFS = - INCS = $(LDAP_INC) - LIBS = $(LDAP_LIB) ---- a/contrib/slapd-modules/autogroup/Makefile -+++ b/contrib/slapd-modules/autogroup/Makefile -@@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ - - LIBTOOL = $(LDAP_BUILD)/libtool - CC = gcc --OPT = -g -O2 -+OPT = -Wall - DEFS = - INCS = $(LDAP_INC) - LIBS = $(LDAP_LIB) ---- a/contrib/slapd-modules/cloak/Makefile -+++ b/contrib/slapd-modules/cloak/Makefile -@@ -9,7 +9,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ - LIBTOOL = $(LDAP_BUILD)/libtool - INSTALL = /usr/bin/install - CC = gcc --OPT = -g -O2 -+OPT = -Wall - DEFS = -DSLAPD_OVER_CLOAK=SLAPD_MOD_DYNAMIC - INCS = $(LDAP_INC) - LIBS = $(LDAP_LIB) ---- 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 - - LIBTOOL = $(LDAP_BUILD)/libtool - CC = gcc --OPT = -g -O2 -+OPT = -Wall - DEFS = -DLDAP_COMPONENT - INCS = $(LDAP_INC) $(SNACC_INC) $(SSL_INC) - LIBS = $(LDAP_LIB) $(SNACC_LIB) $(SSL_LIB) ---- a/contrib/slapd-modules/datamorph/Makefile -+++ b/contrib/slapd-modules/datamorph/Makefile -@@ -22,7 +22,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ - LIBTOOL = $(LDAP_BUILD)/libtool - INSTALL = /usr/bin/install - CC = gcc --OPT = -g -O2 -+OPT = -Wall - DEFS = -DSLAPD_OVER_DATAMORPH=SLAPD_MOD_DYNAMIC - INCS = $(LDAP_INC) - LIBS = $(LDAP_LIB) ---- a/contrib/slapd-modules/denyop/Makefile -+++ b/contrib/slapd-modules/denyop/Makefile -@@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ - - LIBTOOL = $(LDAP_BUILD)/libtool - CC = gcc --OPT = -g -O2 -+OPT = -Wall - DEFS = -DSLAPD_OVER_DENYOP=SLAPD_MOD_DYNAMIC - INCS = $(LDAP_INC) - LIBS = $(LDAP_LIB) ---- a/contrib/slapd-modules/dsaschema/Makefile -+++ b/contrib/slapd-modules/dsaschema/Makefile -@@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ - - LIBTOOL = $(LDAP_BUILD)/libtool - CC = gcc --OPT = -g -O2 -+OPT = -Wall - DEFS = - INCS = $(LDAP_INC) - LIBS = $(LDAP_LIB) ---- a/contrib/slapd-modules/dupent/Makefile -+++ b/contrib/slapd-modules/dupent/Makefile -@@ -20,7 +20,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ - - LIBTOOL = $(LDAP_BUILD)/libtool - CC = gcc --OPT = -g -O2 -+OPT = -Wall - DEFS = -DSLAPD_OVER_DUPENT=SLAPD_MOD_DYNAMIC - INCS = $(LDAP_INC) - LIBS = $(LDAP_LIB) ---- a/contrib/slapd-modules/kinit/Makefile -+++ b/contrib/slapd-modules/kinit/Makefile -@@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ - - LIBTOOL = $(LDAP_BUILD)/libtool - CC = gcc --OPT = -g -O2 -+OPT = -Wall - DEFS = - INCS = $(LDAP_INC) - LIBS = $(LDAP_LIB) -lkrb5 ---- a/contrib/slapd-modules/lastbind/Makefile -+++ b/contrib/slapd-modules/lastbind/Makefile -@@ -19,7 +19,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ - LIBTOOL = $(LDAP_BUILD)/libtool - INSTALL = /usr/bin/install - CC = gcc --OPT = -g -O2 -+OPT = -Wall - DEFS = -DSLAPD_OVER_LASTBIND=SLAPD_MOD_DYNAMIC - INCS = $(LDAP_INC) - LIBS = $(LDAP_LIB) ---- a/contrib/slapd-modules/lastmod/Makefile -+++ b/contrib/slapd-modules/lastmod/Makefile -@@ -9,7 +9,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ - LIBTOOL = $(LDAP_BUILD)/libtool - INSTALL = /usr/bin/install - CC = gcc --OPT = -g -O2 -+OPT = -Wall - DEFS = -DSLAPD_OVER_LASTMOD=SLAPD_MOD_DYNAMIC - INCS = $(LDAP_INC) - LIBS = $(LDAP_LIB) ---- a/contrib/slapd-modules/noopsrch/Makefile -+++ b/contrib/slapd-modules/noopsrch/Makefile -@@ -20,7 +20,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ - - LIBTOOL = $(LDAP_BUILD)/libtool - CC = gcc --OPT = -g -O2 -Wall -+OPT = -Wall -Wall - DEFS = -DSLAPD_OVER_NOOPSRCH=SLAPD_MOD_DYNAMIC - INCS = $(LDAP_INC) - LIBS = $(LDAP_LIB) ---- a/contrib/slapd-modules/nops/Makefile -+++ b/contrib/slapd-modules/nops/Makefile -@@ -9,7 +9,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ - LIBTOOL = $(LDAP_BUILD)/libtool - INSTALL = /usr/bin/install - CC = gcc --OPT = -g -O2 -+OPT = -Wall - DEFS = -DSLAPD_OVER_NOPS=SLAPD_MOD_DYNAMIC - INCS = $(LDAP_INC) - LIBS = $(LDAP_LIB) ---- a/contrib/slapd-modules/nssov/Makefile -+++ b/contrib/slapd-modules/nssov/Makefile -@@ -27,7 +27,7 @@ NLDAPD_INC=-Inss-pam-ldapd - - LIBTOOL = $(LDAP_BUILD)/libtool - INSTALL = /usr/bin/install --OPT = -g -O2 -+OPT = -Wall - CC = gcc - DEFS = - INCS = $(LDAP_INC) $(NLDAPD_INC) ---- a/contrib/slapd-modules/passwd/Makefile -+++ b/contrib/slapd-modules/passwd/Makefile -@@ -9,7 +9,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ - LIBTOOL = $(LDAP_BUILD)/libtool - INSTALL = /usr/bin/install - CC = gcc --OPT = -g -O2 -+OPT = -Wall - DEFS = - INCS = $(LDAP_INC) - LIBS = $(LDAP_LIB) ---- 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 \ - LIBTOOL = $(LDAP_BUILD)/libtool - INSTALL = /usr/bin/install - CC = gcc --OPT = -g -O2 -+OPT = -Wall - #DEFS = -DSLAPD_PBKDF2_DEBUG - - SSL_INC = ---- 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 \ - LIBTOOL = $(LDAP_BUILD)/libtool - INSTALL = /usr/bin/install - CC = gcc --OPT = -g -O2 -+OPT = -Wall - DEFS = - #DEFS = -DSLAPD_SHA2_DEBUG - INCS = $(LDAP_INC) ---- 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 \ - LIBTOOL = $(LDAP_BUILD)/libtool - INSTALL = /usr/bin/install - CC = gcc --OPT = -g -O2 -+OPT = -Wall - DEFS = - INCS = $(LDAP_INC) - LIBS = $(LDAP_LIB) ---- 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 - LIBTOOL = $(LDAP_BUILD)/libtool - INSTALL = /usr/bin/install - CC = gcc --OPT = -g -O2 -fpic -+OPT = -Wall -fpic - - # To skip linking against CRACKLIB make CRACK=no - CRACK=yes ---- a/contrib/slapd-modules/proxyOld/Makefile -+++ b/contrib/slapd-modules/proxyOld/Makefile -@@ -20,7 +20,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ - - LIBTOOL = $(LDAP_BUILD)/libtool - CC = gcc --OPT = -g -O2 -+OPT = -Wall - DEFS = - INCS = $(LDAP_INC) - LIBS = $(LDAP_LIB) ---- a/contrib/slapd-modules/rbac/Makefile -+++ b/contrib/slapd-modules/rbac/Makefile -@@ -9,7 +9,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ - LIBTOOL = $(LDAP_BUILD)/libtool - INSTALL = /usr/bin/install - CC = gcc --OPT = -g -O2 -+OPT = -Wall - DEFS = -DSLAPD_OVER_RBAC=SLAPD_MOD_DYNAMIC - INCS = $(LDAP_INC) - LIBS = $(LDAP_LIB) ---- a/contrib/slapd-modules/samba4/Makefile -+++ b/contrib/slapd-modules/samba4/Makefile -@@ -20,7 +20,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ - - LIBTOOL = $(LDAP_BUILD)/libtool - CC = gcc --OPT = -g -O2 -+OPT = -Wall - DEFS = -DSLAPD_OVER_RDNVAL=SLAPD_MOD_DYNAMIC \ - -DSLAPD_OVER_PGUID=SLAPD_MOD_DYNAMIC \ - -DSLAPD_OVER_VERNUM=SLAPD_MOD_DYNAMIC ---- a/contrib/slapd-modules/smbk5pwd/Makefile -+++ b/contrib/slapd-modules/smbk5pwd/Makefile -@@ -27,7 +27,7 @@ HEIMDAL_LIB = -L/usr/heimdal/lib -lkrb5 -lkadm5srv - LIBTOOL = $(LDAP_BUILD)/libtool - INSTALL = /usr/bin/install - CC = gcc --OPT = -g -O2 -+OPT = -Wall - # 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) ---- a/contrib/slapd-modules/trace/Makefile -+++ b/contrib/slapd-modules/trace/Makefile -@@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ - - LIBTOOL = $(LDAP_BUILD)/libtool - CC = gcc --OPT = -g -O2 -+OPT = -Wall - DEFS = -DSLAPD_OVER_TRACE=SLAPD_MOD_DYNAMIC - INCS = $(LDAP_INC) - LIBS = $(LDAP_LIB) ---- a/contrib/slapd-modules/usn/Makefile -+++ b/contrib/slapd-modules/usn/Makefile -@@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ - - LIBTOOL = $(LDAP_BUILD)/libtool - CC = gcc --OPT = -g -O2 -+OPT = -Wall - DEFS = -DSLAPD_OVER_USN=SLAPD_MOD_DYNAMIC - INCS = $(LDAP_INC) - LIBS = $(LDAP_LIB) ---- a/contrib/slapd-modules/variant/Makefile -+++ b/contrib/slapd-modules/variant/Makefile -@@ -22,7 +22,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ - LIBTOOL = $(LDAP_BUILD)/libtool - INSTALL = /usr/bin/install - CC = gcc --OPT = -g -O2 -+OPT = -Wall - DEFS = -DSLAPD_OVER_VARIANT=SLAPD_MOD_DYNAMIC - INCS = $(LDAP_INC) - LIBS = $(LDAP_LIB) ---- a/contrib/slapd-modules/vc/Makefile -+++ b/contrib/slapd-modules/vc/Makefile -@@ -20,7 +20,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ - - LIBTOOL = $(LDAP_BUILD)/libtool - CC = gcc --OPT = -g -O2 -+OPT = -Wall - DEFS = - INCS = $(LDAP_INC) - LIBS = $(LDAP_LIB) 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 deleted file mode 100644 index e29ba0b..0000000 --- a/net-nds/openldap/files/openldap-2.6.1-system-mdb.patch +++ /dev/null @@ -1,140 +0,0 @@ ---- a/build/openldap.m4 -+++ b/build/openldap.m4 -@@ -243,6 +243,40 @@ OL_RESOLVER_TRY(ol_cv_resolver_none) - OL_RESOLVER_TRY(ol_cv_resolver_resolv,[-lresolv]) - OL_RESOLVER_TRY(ol_cv_resolver_bind,[-lbind]) - ]) -+ -+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 <lmdb.h> -+ -+/* require 0.9.18 or later */ -+#if MDB_VERSION_FULL >= 0x000000090012 -+ __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 ---- a/build/top.mk -+++ b/build/top.mk -@@ -164,6 +164,7 @@ CLIENT_LIBS = @CLIENT_LIBS@ - LUTIL_LIBS = @LUTIL_LIBS@ - LTHREAD_LIBS = @LTHREAD_LIBS@ - -+MDB_LIBS = @MDB_LIBS@ - SLAPD_NDB_LIBS = @SLAPD_NDB_LIBS@ - WT_LIBS = @WT_LIBS@ - ---- a/configure.ac -+++ b/configure.ac -@@ -547,6 +547,7 @@ AC_MSG_RESULT(done) - dnl ---------------------------------------------------------------- - dnl Initialize vars - LDAP_LIBS= -+MDB_LIBS= - SLAPD_NDB_LIBS= - SLAPD_NDB_INCS= - LTHREAD_LIBS= -@@ -646,6 +647,32 @@ dnl Checks for programs - - AC_DEFINE(HAVE_MKVERSION, 1, [define this if you have mkversion]) - -+dnl ---------------------------------------------------------------- -+ol_link_mdb=no -+ -+AS_IF([test x$ol_enable_mdb != xno], [ -+ OL_MDB -+ -+ if test $ol_cv_mdb = no ; then -+ AC_MSG_ERROR(MDB: LMDB not available) -+ fi -+ -+ AC_DEFINE(HAVE_MDB,1, -+ [define this if LMDB is available]) -+ -+ dnl $ol_cv_lib_mdb should be yes or -llmdb -+ dnl (it could be no, but that would be an error -+ if test $ol_cv_lib_mdb != yes ; then -+ MDB_LIBS="$MDB_LIBS $ol_cv_lib_mdb" -+ fi -+ -+ SLAPD_LIBS="$SLAPD_LIBS \$(MDB_LIBS)" -+ -+ ol_link_mdb=yes -+]) -+ -+dnl ---------------------------------------------------------------- -+ - dnl ---------------------------------------------------------------- - dnl - dnl Determine which C translator to use -@@ -3150,6 +3177,7 @@ dnl pwmods - AC_SUBST(LDAP_LIBS) - AC_SUBST(CLIENT_LIBS) - AC_SUBST(SLAPD_LIBS) -+AC_SUBST(MDB_LIBS) - AC_SUBST(BALANCER_LIBS) - AC_SUBST(SLAPD_NDB_LIBS) - AC_SUBST(SLAPD_NDB_INCS) ---- 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 \ - extended.lo operational.lo \ - attr.lo index.lo key.lo filterindex.lo \ - dn2entry.lo dn2id.lo id2entry.lo idl.lo \ -- nextid.lo monitor.lo mdb.lo midl.lo -+ nextid.lo monitor.lo - - LDAP_INCDIR= ../../../include - LDAP_LIBDIR= ../../../libraries --MDB_SUBDIR = $(srcdir)/$(LDAP_LIBDIR)/liblmdb - - BUILD_OPT = "--enable-mdb" - BUILD_MOD = @BUILD_MDB@ -@@ -44,7 +43,7 @@ UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) - - LIBBASE = back_mdb - --XINCPATH = -I.. -I$(srcdir)/.. -I$(MDB_SUBDIR) -+XINCPATH = -I.. -I$(srcdir)/.. - XDEFS = $(MODULES_CPPFLAGS) - - all-local-lib: ../.backend -@@ -52,11 +51,5 @@ all-local-lib: ../.backend - ../.backend: lib$(LIBBASE).a - @touch $@ - --mdb.lo: $(MDB_SUBDIR)/mdb.c -- $(LTCOMPILE_MOD) $(MDB_SUBDIR)/mdb.c -- --midl.lo: $(MDB_SUBDIR)/midl.c -- $(LTCOMPILE_MOD) $(MDB_SUBDIR)/midl.c -- - veryclean-local-lib: FORCE - $(RM) $(XXHEADERS) $(XXSRCS) .links 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 7027197..0000000 --- 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?= <ar...@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 - diff --git a/net-nds/openldap/files/openldap-2.6.3-slapd-conf b/net-nds/openldap/files/openldap-2.6.3-slapd-conf deleted file mode 100644 index 4555c62..0000000 --- a/net-nds/openldap/files/openldap-2.6.3-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 /run/openldap/slapd.pid -argsfile /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 mdb -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.6.4-clang16.patch b/net-nds/openldap/files/openldap-2.6.4-clang16.patch deleted file mode 100644 index bcbdf0b..0000000 --- a/net-nds/openldap/files/openldap-2.6.4-clang16.patch +++ /dev/null @@ -1,234 +0,0 @@ -https://git.openldap.org/openldap/openldap/-/merge_requests/605 - -From 83e2db9bf9fc2530a0ea6ca538a7732f6ad9de0e Mon Sep 17 00:00:00 2001 -From: Sam James <s...@gentoo.org> -Date: Thu, 9 Feb 2023 23:17:53 +0000 -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&R, 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 <s...@gentoo.org> ---- 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)) -@@ -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 <sys/types.h> - #include <regex.h> - 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 <ctype.h> --main() -+#include <stdlib.h> -+int main(void) - { - if ('C' == toupper('C')) - exit(0); -@@ -569,7 +569,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 -@@ -1017,7 +1017,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); -@@ -1479,10 +1483,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 -@@ -1537,6 +1539,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> -@@ -1547,8 +1552,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 +1576,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; - --- -GitLab - - -From 853d613f39ae9e8d7dad4492076959c2d80e38c1 Mon Sep 17 00:00:00 2001 -From: Sam James <s...@gentoo.org> -Date: Thu, 9 Feb 2023 23:20:32 +0000 -Subject: [PATCH 2/3] contrib: fix old-style K&R declarations - -Removed in C23. - -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. - -Signed-off-by: Sam James <s...@gentoo.org> ---- 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; --- -GitLab - - -From b4b3d026461b16f4f462e70225a5a0493647f0c8 Mon Sep 17 00:00:00 2001 -From: Sam James <s...@gentoo.org> -Date: Thu, 9 Feb 2023 23:20:51 +0000 -Subject: [PATCH 3/3] servers: fix -Wstrict-prototypes - -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. - -Signed-off-by: Sam James <s...@gentoo.org> ---- 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; --- -GitLab diff --git a/net-nds/openldap/files/openldap-2.6.4-libressl.patch b/net-nds/openldap/files/openldap-2.6.4-libressl.patch deleted file mode 100644 index 48a8a43..0000000 --- a/net-nds/openldap/files/openldap-2.6.4-libressl.patch +++ /dev/null @@ -1,38 +0,0 @@ -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 <or...@riseup.net> -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/files/slapd-2.6.1.service b/net-nds/openldap/files/slapd-2.6.1.service deleted file mode 100644 index ff571d2..0000000 --- a/net-nds/openldap/files/slapd-2.6.1.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=OpenLDAP Server Daemon -After=network.target - -[Service] -Type=notify -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/files/slapd-confd-2.4.28-r1 b/net-nds/openldap/files/slapd-confd-2.4.28-r1 deleted file mode 100644 index ef19899..0000000 --- a/net-nds/openldap/files/slapd-confd-2.4.28-r1 +++ /dev/null @@ -1,26 +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. - -# If you have multiple slapd instances per #376699, this will provide a default config -INSTANCE="openldap${SVCNAME#slapd}" - -# If you use the classical configuration file: -OPTS_CONF="-f /etc/${INSTANCE}/slapd.conf" -# Uncomment this instead to use the new slapd.d configuration directory for openldap 2.3 -#OPTS_CONF="-F /etc/${INSTANCE}/slapd.d" -# (the OPTS_CONF variable is also passed to slaptest during startup) - -OPTS="${OPTS_CONF} -h 'ldaps:// ldap:// ldapi://%2fvar%2frun%2fopenldap%2fslapd.sock'" -# Optional connectionless LDAP: -#OPTS="${OPTS_CONF} -h 'ldaps:// ldap:// ldapi://%2fvar%2frun%2fopenldap%2fslapd.sock cldap://'" - -# 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" - -# Specify the kerberos keytab file -#KRB5_KTNAME=/etc/openldap/krb5-ldap.keytab diff --git a/net-nds/openldap/files/slapd-confd-2.6.1 b/net-nds/openldap/files/slapd-confd-2.6.1 deleted file mode 100644 index 9e7babb..0000000 --- a/net-nds/openldap/files/slapd-confd-2.6.1 +++ /dev/null @@ -1,26 +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. - -# If you have multiple slapd instances per #376699, this will provide a default config -INSTANCE="openldap${SVCNAME#slapd}" - -# If you use the classical configuration file: -OPTS_CONF="-f /etc/${INSTANCE}/slapd.conf" -# Uncomment this instead to use the new slapd.d configuration directory for openldap 2.3 -#OPTS_CONF="-F /etc/${INSTANCE}/slapd.d" -# (the OPTS_CONF variable is also passed to slaptest during startup) - -OPTS="${OPTS_CONF} -h 'ldaps:// ldap:// ldapi://%2frun%2fopenldap%2fslapd.sock'" -# Optional connectionless LDAP: -#OPTS="${OPTS_CONF} -h 'ldaps:// ldap:// ldapi://%2frun%2fopenldap%2fslapd.sock cldap://'" - -# 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" - -# Specify the kerberos keytab file -#KRB5_KTNAME=/etc/openldap/krb5-ldap.keytab diff --git a/net-nds/openldap/files/slapd-initd-2.4.40-r2 b/net-nds/openldap/files/slapd-initd-2.4.40-r2 deleted file mode 100644 index bf408e3..0000000 --- a/net-nds/openldap/files/slapd-initd-2.4.40-r2 +++ /dev/null @@ -1,64 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -extra_commands="checkconfig" - -[ -z "$INSTANCE" ] && INSTANCE="openldap${SVCNAME#slapd}" -PIDDIR=/run/openldap -PIDFILE=$PIDDIR/$SVCNAME.pid - -depend() { - need net - before dbus hald avahi-daemon - provide ldap -} - -start() { - checkpath -q -d ${PIDDIR} -o ldap:ldap - if ! checkconfig -Q ; then - eerror "There is a problem with your slapd.conf!" - return 1 - fi - ebegin "Starting ldap-server" - [ -n "$KRB5_KTNAME" ] && export KRB5_KTNAME - eval start-stop-daemon --start --pidfile ${PIDFILE} --exec /usr/lib/openldap/slapd -- -u ldap -g ldap "${OPTS}" - eend $? -} - -stop() { - ebegin "Stopping ldap-server" - start-stop-daemon --stop --signal 2 --quiet --pidfile ${PIDFILE} - eend $? -} - -checkconfig() { - # checks requested by bug #502948 - # Step 1: extract the last valid config file or config dir - set -- $OPTS - while [ -n "$*" ]; do - opt=$1 ; shift - if [ "$opt" = "-f" -o "$opt" = "-F" ] ; then - CONF=$1 - shift - fi - done - set -- - # Fallback - CONF=${CONF-/etc/openldap/slapd.conf} - [ -d $CONF ] && CONF=${CONF}/* - DBDIRS=`eval awk '"/^(directory|olcDbDirectory:)/{print \\$2}"' $CONF` - for d in $DBDIRS; do - if [ ! -d $d ]; then - eerror "Directory $d in config does not exist!" - return 1 - fi - /usr/bin/find $d ! -name DB_CONFIG ! -user ldap -o ! -group ldap |grep -sq . - 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" - done - # now test the config fully - /usr/sbin/slaptest -u "$@" ${OPTS_CONF} -} diff --git a/net-nds/openldap/files/slapd.service b/net-nds/openldap/files/slapd.service deleted file mode 100644 index 3427b87..0000000 --- a/net-nds/openldap/files/slapd.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=OpenLDAP Server Daemon -After=network.target - -[Service] -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 - -[Install] -WantedBy=multi-user.target diff --git a/net-nds/openldap/files/slapd.service.conf b/net-nds/openldap/files/slapd.service.conf deleted file mode 100644 index 812ea68..0000000 --- a/net-nds/openldap/files/slapd.service.conf +++ /dev/null @@ -1,12 +0,0 @@ -[Service] -# Use the classical configuration file: -#Environment="SLAPD_OPTIONS=-f /etc/openldap/slapd.conf" -# Use the slapd configuration directory: -#Environment="SLAPD_OPTIONS=-F /etc/openldap/slapd.d" - -Environment="SLAPD_URLS=ldaps:/// ldap:/// ldapi:///" -# Other examples: -#Environment="SLAPD_URLS=ldap://127.0.0.1/ ldap://10.0.0.1:1389/ cldap:///"; - -# Specify the kerberos keytab file -#Environment=KRB5_KTNAME=/etc/openldap/krb5-ldap.keytab diff --git a/net-nds/openldap/files/slapd.tmpfilesd b/net-nds/openldap/files/slapd.tmpfilesd deleted file mode 100644 index 634cea1..0000000 --- a/net-nds/openldap/files/slapd.tmpfilesd +++ /dev/null @@ -1,2 +0,0 @@ -# openldap runtime directory for slapd.arg and slapd.pid -d /run/openldap 0755 ldap ldap - diff --git a/net-nds/openldap/metadata.xml b/net-nds/openldap/metadata.xml deleted file mode 100644 index 115e7b6..0000000 --- a/net-nds/openldap/metadata.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>ldap-b...@gentoo.org</email> - </maintainer> - <use> - <flag name="argon2">Enable password hashing algorithm from <pkg>app-crypt/argon2</pkg></flag> - <flag name="autoca">Automatic Certificate Authority overlay</flag> - <flag name="cleartext">Enable use of cleartext passwords</flag> - <flag name="experimental">Enable experimental backend options</flag> - <flag name="kinit">Enable support for kerberos init</flag> - <flag name="odbc">Enable ODBC and SQL backend options</flag> - <flag name="overlays">Enable contributed OpenLDAP overlays</flag> - <flag name="smbkrb5passwd">Enable overlay for syncing ldap, unix and lanman passwords</flag> - <flag name="minimal">Build libraries & userspace tools only. Does not install any server code</flag> - <flag name="pbkdf2">Enable support for pbkdf2 passwords</flag> - <flag name="sha2">Enable support for pw-sha2 password hashes</flag> - </use> - <upstream> - <bugs-to>https://bugs.openldap.org/</bugs-to> - <remote-id type="cpe">cpe:/a:openldap:openldap</remote-id> - <remote-id type="github">openldap/openldap</remote-id> - <remote-id type="gitlab">openldap/openldap</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-nds/openldap/openldap-2.6.3-r7.ebuild b/net-nds/openldap/openldap-2.6.3-r7.ebuild deleted file mode 100644 index 493fe72..0000000 --- a/net-nds/openldap/openldap-2.6.3-r7.ebuild +++ /dev/null @@ -1,828 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# Re cleanups: -# 2.5.x is an LTS release so we want to keep it for a while. - -inherit autotools flag-o-matic multilib multilib-minimal preserve-libs ssl-cert toolchain-funcs systemd tmpfiles - -MY_PV="$(ver_rs 1-2 _)" - -BIS_PN=rfc2307bis.schema -BIS_PV=20140524 -BIS_P="${BIS_PN}-${BIS_PV}" - -DESCRIPTION="LDAP suite of application and development tools" -HOMEPAGE="https://www.openldap.org/"; -SRC_URI=" - https://gitlab.com/openldap/${PN}/-/archive/OPENLDAP_REL_ENG_${MY_PV}/${PN}-OPENLDAP_REL_ENG_${MY_PV}.tar.gz - 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 ipv6 odbc sasl ssl selinux static-libs +syslog test" -IUSE_CONTRIB="kerberos kinit pbkdf2 sha2 smbkrb5passwd" -IUSE_CONTRIB="${IUSE_CONTRIB} cxx" -IUSE="systemd ${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}" -REQUIRED_USE="cxx? ( sasl ) - pbkdf2? ( ssl ) - test? ( cleartext sasl ) - autoca? ( !gnutls ) - ?? ( test minimal ) - kerberos? ( ?? ( kinit smbkrb5passwd ) )" -RESTRICT="!test? ( test )" - -# openssl is needed to generate lanman-passwords required by samba -COMMON_DEPEND=" - kernel_linux? ( sys-apps/util-linux ) - ssl? ( - !gnutls? ( - >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] - ) - gnutls? ( - >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] - >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}] - ) - ) - sasl? ( dev-libs/cyrus-sasl:= ) - !minimal? ( - dev-libs/libltdl - sys-fs/e2fsprogs - >=dev-db/lmdb-0.9.18:= - argon2? ( app-crypt/argon2:= ) - crypt? ( virtual/libcrypt:= ) - tcpd? ( sys-apps/tcp-wrappers ) - odbc? ( !iodbc? ( dev-db/unixODBC ) - iodbc? ( dev-db/libiodbc ) ) - perl? ( dev-lang/perl:=[-build(-)] ) - samba? ( - dev-libs/openssl:0= - ) - smbkrb5passwd? ( - dev-libs/openssl:0= - kerberos? ( app-crypt/heimdal ) - ) - kerberos? ( - virtual/krb5 - kinit? ( !app-crypt/heimdal ) - ) - ) -" -DEPEND="${COMMON_DEPEND} - sys-apps/groff -" -RDEPEND="${COMMON_DEPEND} - selinux? ( sec-policy/selinux-ldap ) -" - -# The user/group are only used for running daemons which are -# disabled in minimal builds, so elide the accounts too. -BDEPEND="!minimal? ( - acct-group/ldap - acct-user/ldap -) -" - -# for tracking versions -OPENLDAP_VERSIONTAG=".version-tag" -OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data" - -MULTILIB_WRAPPED_HEADERS=( - # USE=cxx - /usr/include/LDAPAsynConnection.h - /usr/include/LDAPAttrType.h - /usr/include/LDAPAttribute.h - /usr/include/LDAPAttributeList.h - /usr/include/LDAPConnection.h - /usr/include/LDAPConstraints.h - /usr/include/LDAPControl.h - /usr/include/LDAPControlSet.h - /usr/include/LDAPEntry.h - /usr/include/LDAPEntryList.h - /usr/include/LDAPException.h - /usr/include/LDAPExtResult.h - /usr/include/LDAPMessage.h - /usr/include/LDAPMessageQueue.h - /usr/include/LDAPModList.h - /usr/include/LDAPModification.h - /usr/include/LDAPObjClass.h - /usr/include/LDAPRebind.h - /usr/include/LDAPRebindAuth.h - /usr/include/LDAPReferenceList.h - /usr/include/LDAPResult.h - /usr/include/LDAPSaslBindResult.h - /usr/include/LDAPSchema.h - /usr/include/LDAPSearchReference.h - /usr/include/LDAPSearchResult.h - /usr/include/LDAPSearchResults.h - /usr/include/LDAPUrl.h - /usr/include/LDAPUrlList.h - /usr/include/LdifReader.h - /usr/include/LdifWriter.h - /usr/include/SaslInteraction.h - /usr/include/SaslInteractionHandler.h - /usr/include/StringList.h - /usr/include/TlsOptions.h -) - -PATCHES=( - "${FILESDIR}"/${PN}-2.4.28-fix-dash.patch - "${FILESDIR}"/${PN}-2.6.1-system-mdb.patch - "${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-fix-bashism-configure.patch - "${FILESDIR}"/${PN}-2.6.3-clang16.patch - "${FILESDIR}"/${PN}-2.6.4-libressl.patch -) - -openldap_filecount() { - local dir="$1" - find "${dir}" -type f ! -name '.*' ! -name 'DB_CONFIG*' | wc -l -} - -openldap_find_versiontags() { - # scan for all datadirs - local openldap_datadirs=() - if [[ -f "${EROOT}"/etc/openldap/slapd.conf ]]; then - openldap_datadirs=( $(awk '{if($1 == "directory") print $2 }' "${EROOT}"/etc/openldap/slapd.conf) ) - fi - openldap_datadirs+=( ${OPENLDAP_DEFAULTDIR_VERSIONTAG} ) - - einfo - einfo "Scanning datadir(s) from slapd.conf and" - einfo "the default installdir for Versiontags" - einfo "(${OPENLDAP_DEFAULTDIR_VERSIONTAG} may appear twice)" - einfo - - # scan datadirs if we have a version tag - openldap_found_tag=0 - have_files=0 - for each in ${openldap_datadirs[@]} ; do - CURRENT_TAGDIR="${EROOT}$(sed "s:\/::" <<< ${each})" - CURRENT_TAG="${CURRENT_TAGDIR}/${OPENLDAP_VERSIONTAG}" - if [[ -d "${CURRENT_TAGDIR}" ]] && [[ "${openldap_found_tag}" == 0 ]] ; then - einfo "- Checking ${each}..." - if [[ -r "${CURRENT_TAG}" ]] ; then - # yey, we have one :) - einfo " Found Versiontag in ${each}" - source "${CURRENT_TAG}" - if [[ "${OLDPF}" == "" ]] ; then - eerror "Invalid Versiontag found in ${CURRENT_TAGDIR}" - eerror "Please delete it" - eerror - die "Please kill the invalid versiontag in ${CURRENT_TAGDIR}" - fi - - OLD_MAJOR=$(ver_cut 2-3 ${OLDPF}) - - [[ "$(openldap_filecount ${CURRENT_TAGDIR})" -gt 0 ]] && have_files=1 - - # are we on the same branch? - if [[ "${OLD_MAJOR}" != "${PV:0:3}" ]] ; then - ewarn " Versiontag doesn't match current major release!" - if [[ "${have_files}" == "1" ]] ; then - eerror " Versiontag says other major and you (probably) have datafiles!" - echo - openldap_upgrade_howto - else - einfo " No real problem, seems there's no database." - fi - else - einfo " Versiontag is fine here :)" - fi - else - einfo " Non-tagged dir ${each}" - [[ "$(openldap_filecount ${each})" -gt 0 ]] && have_files=1 - if [[ "${have_files}" == "1" ]] ; then - einfo " EEK! Non-empty non-tagged datadir, counting `ls -a ${each} | wc -l` files" - echo - - eerror - eerror "Your OpenLDAP Installation has a non tagged datadir that" - eerror "possibly contains a database at ${CURRENT_TAGDIR}" - eerror - eerror "Please export data if any entered and empty or remove" - eerror "the directory, installation has been stopped so you" - eerror "can take required action" - eerror - eerror "For a HOWTO on exporting the data, see instructions in the ebuild" - eerror - openldap_upgrade_howto - die "Please move the datadir ${CURRENT_TAGDIR} away" - fi - fi - einfo - fi - done - [[ "${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} \ - | awk '/libdb-/{gsub("^libdb-","",$1);gsub(".so$","",$1);print $1}')" - local fail=0 - - # This will not cover detection of cn=Config based configuration, but - # it's hopefully good enough. - if grep -sq '^backend.*shell' "${EROOT}"/etc/openldap/slapd.conf; then - eerror " OpenLDAP >= 2.5.x has dropped support for Shell backend." - eerror " You will need to migrate per upstream's migration notes" - eerror " at https://www.openldap.org/doc/admin25/appendix-upgrading.html."; - eerror " Your existing database will not be accessible until it is" - eerror " converted away from backend shell!" - echo - fail=1 - fi - if has_version "${CATEGORY}/${PN}[berkdb]" || grep -sq '^backend.*(bdb|hdb)' /etc/openldap/slapd.conf; then - eerror " OpenLDAP >= 2.5.x has dropped support for Berkeley DB." - eerror " You will need to migrate per upstream's migration notes" - eerror " at https://www.openldap.org/doc/admin25/appendix-upgrading.html."; - eerror " Your existing database will not be accessible until it is" - eerror " converted to mdb!" - echo - fail=1 - elif [[ -z "${OLDVER}" ]] && [[ -z "${NEWVER}" ]]; then - : - # Nothing wrong here. - elif [[ -z "${OLDVER}" ]] && [[ -n "${NEWVER}" ]]; then - eerror " Your existing version of OpenLDAP was not built against" - eerror " any version of sys-libs/db, but the new one will build" - eerror " against ${NEWVER} and your database may be inaccessible." - echo - fail=1 - elif [[ -n "${OLDVER}" ]] && [[ -z "${NEWVER}" ]]; then - eerror " Your existing version of OpenLDAP was built against" - eerror " sys-libs/db:${OLDVER}, but the new one will not be" - eerror " built against any version and your database may be" - eerror " inaccessible." - echo - fail=1 - elif [[ "${OLDVER}" != "${NEWVER}" ]]; then - eerror " Your existing version of OpenLDAP was built against" - eerror " sys-libs/db:${OLDVER}, but the new one will build against" - eerror " ${NEWVER} and your database would be inaccessible." - echo - fail=1 - fi - [[ "${fail}" == "1" ]] && openldap_upgrade_howto - fi - - echo - einfo - einfo "All datadirs are fine, proceeding with merge now..." - einfo -} - -openldap_upgrade_howto() { - local d l i - eerror - eerror "A (possible old) installation of OpenLDAP was detected," - eerror "installation will not proceed for now." - eerror - eerror "As major version upgrades can corrupt your database," - eerror "you need to dump your database and re-create it afterwards." - eerror - eerror "Additionally, rebuilding against different major versions of the" - eerror "sys-libs/db libraries will cause your database to be inaccessible." - eerror "" - d="$(date -u +%s)" - l="/root/ldapdump.${d}" - i="${l}.raw" - eerror " 1. /etc/init.d/slapd stop" - eerror " 2. slapcat -l ${i}" - eerror " 3. grep -E -v '^(entry|context)CSN:' <${i} >${l}" - eerror " 4. mv /var/lib/openldap-data/ /var/lib/openldap-data-backup/" - eerror " 5. emerge --update \=net-nds/${PF}" - eerror " 6. etc-update, and ensure that you apply the changes" - eerror " 7. slapadd -l ${l}" - eerror " 8. chown ldap:ldap /var/lib/openldap-data/*" - eerror " 9. /etc/init.d/slapd start" - eerror "10. Check that your data is intact." - eerror "11. Set up the new replication system." - eerror - if [[ "${FORCE_UPGRADE}" != "1" ]]; then - die "You need to upgrade your database first" - else - eerror "You have the magical FORCE_UPGRADE=1 in place." - eerror "Don't say you weren't warned about data loss." - fi -} - -pkg_setup() { - if ! use sasl && use cxx ; then - die "To build the ldapc++ library you must emerge openldap with sasl support" - fi - # Bug #322787 - if use minimal && ! has_version "net-nds/openldap" ; then - einfo "No datadir scan needed, openldap not installed" - elif use minimal && has_version 'net-nds/openldap[minimal]' ; then - einfo "Skipping scan for previous datadirs as requested by minimal useflag" - else - openldap_find_versiontags - fi -} - -src_prepare() { - rm -r libraries/liblmdb || die 'could not removed bundled lmdb directory' - - for filename in doc/drafts/draft-ietf-ldapext-acl-model-xx.txt; do - iconv -f iso-8859-1 -t utf-8 "$filename" > "$filename.utf8" - mv "$filename.utf8" "$filename" - done - - default - - sed -i \ - -e "s:\$(localstatedir)/run:${EPREFIX}/run:" \ - -e '/MKDIR.*.(DESTDIR)\/run/d' \ - -e '/MKDIR.*.(DESTDIR).*.(runstatedir)/d' \ - servers/slapd/Makefile.in || die 'adjusting slapd Makefile.in failed' - - pushd build &>/dev/null || die "pushd build" - einfo "Making sure upstream build strip does not do stripping too early" - sed -i.orig \ - -e '/^STRIP/s,-s,,g' \ - top.mk || die "Failed to remove to early stripping" - popd &>/dev/null || die - - eautoreconf - multilib_copy_sources -} - -build_contrib_module() { - # <dir> [<target>] - pushd "${S}/contrib/slapd-modules/$1" &>/dev/null || die "pushd contrib/slapd-modules/$1" - einfo "Compiling contrib-module: $1" - local target="${2:-all}" - emake \ - LDAP_BUILD="${BUILD_DIR}" prefix="${EPREFIX}/usr" \ - CC="${CC}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" \ - "$target" - popd &>/dev/null || die -} - -multilib_src_configure() { - # Optional Features - myconf+=( - --enable-option-checking - $(use_enable debug) - --enable-dynamic - $(use_enable syslog) - $(use_enable ipv6) - --enable-local - ) - - # Optional Packages - myconf+=( - --without-fetch - ) - - if ! use minimal && multilib_is_native_abi; then - # SLAPD (Standalone LDAP Daemon) Options - # overlay chaining requires '--enable-ldap' #296567 - # see https://www.openldap.org/doc/admin26/overlays.html#Chaining - myconf+=( - --enable-ldap=yes - --enable-slapd - $(use_enable cleartext) - $(use_enable crypt) - $(multilib_native_use_enable sasl spasswd) - --disable-slp - $(use_enable tcpd wrappers) - ) - if use experimental ; then - # connectionless ldap per bug #342439 - # connectionless is a unsupported feature according to Howard Chu - # see https://bugs.openldap.org/show_bug.cgi?id=9739 - append-cppflags -DLDAP_CONNECTIONLESS - - myconf+=( - --enable-dynacl - # ACI build as dynamic module not supported (yet) - --enable-aci=yes - ) - fi - - for option in modules rlookups slapi; do - myconf+=( --enable-${option} ) - done - - # static SLAPD backends - for backend in mdb; do - myconf+=( --enable-${backend}=yes ) - done - - # module SLAPD backends - for backend in asyncmeta dnssrv meta null passwd relay sock; do - # missing modules: wiredtiger (not available in portage) - myconf+=( --enable-${backend}=mod ) - done - - use perl && myconf+=( --enable-perl=mod ) - - if use odbc ; then - myconf+=( --enable-sql=mod ) - if use iodbc ; then - myconf+=( --with-odbc="iodbc" ) - append-cflags -I"${EPREFIX}"/usr/include/iodbc - else - myconf+=( --with-odbc="unixodbc" ) - fi - fi - - use overlays && myconf+=( --enable-overlays=mod ) - use autoca && myconf+=( --enable-autoca=mod ) || myconf+=( --enable-autoca=no ) - # compile-in the syncprov - myconf+=( --enable-syncprov=yes ) - - # SLAPD Password Module Options - myconf+=( - $(use_enable argon2) - ) - - # Optional Packages - myconf+=( - $(use_with systemd) - $(multilib_native_use_with sasl cyrus-sasl) - ) - else - myconf+=( - --disable-backends - --disable-slapd - --disable-mdb - --disable-overlays - --disable-autoca - --disable-syslog - --without-systemd - ) - fi - - # Library Generation & Linking Options - myconf+=( - $(use_enable static-libs static) - --enable-shared - --enable-versioning - --with-pic - ) - - # some cross-compiling tests don't pan out well. - tc-is-cross-compiler && myconf+=( - --with-yielding-select=yes - ) - - local ssl_lib="no" - if use ssl || ( ! use minimal && use samba ) ; then - if use gnutls ; then - myconf+=( --with-tls="gnutls" ) - else - # disable MD2 hash function - append-cflags -DOPENSSL_NO_MD2 - myconf+=( --with-tls="openssl" ) - fi - else - myconf+=( --with-tls="no" ) - fi - - tc-export AR CC CXX - - ECONF_SOURCE="${S}" econf \ - --libexecdir="${EPREFIX}"/usr/$(get_libdir)/openldap \ - --localstatedir="${EPREFIX}"/var \ - --runstatedir="${EPREFIX}"/run \ - --sharedstatedir="${EPREFIX}"/var/lib \ - "${myconf[@]}" - - # argument '--runstatedir' seems to have no effect therefore this workaround - sed -i \ - -e 's:^runstatedir=.*:runstatedir=${EPREFIX}/run:' \ - configure contrib/ldapc++/configure contrib/ldaptcl/configure || die 'could not set runstatedir' - - sed -i \ - -e "s:/var/run/sasl2/mux:${EPREFIX}/run/sasl2/mux:" \ - doc/guide/admin/security.sdf || die 'could not fix run path in doc' - - emake depend -} - -src_configure_cxx() { - # This needs the libraries built by the first build run. - # we have to run it AFTER the main build, not just after the main configure - local myconf_ldapcpp=( - --with-libldap="${E}/lib" - --with-ldap-includes="${S}/include" - ) - - mkdir -p "${BUILD_DIR}"/contrib/ldapc++ || die "could not create ${BUILD_DIR}/contrib/ldapc++ directory" - pushd "${BUILD_DIR}/contrib/ldapc++" &>/dev/null || die "pushd contrib/ldapc++" - local LDFLAGS=${LDFLAGS} - local CPPFLAGS=${CPPFLAGS} - append-ldflags -L"${BUILD_DIR}"/libraries/liblber/.libs \ - -L"${BUILD_DIR}"/libraries/libldap/.libs - append-cppflags -I"${BUILD_DIR}"/include - ECONF_SOURCE=${S}/contrib/ldapc++ \ - econf "${myconf_ldapcpp[@]}" - popd &>/dev/null || die "popd contrib/ldapc++" -} - -multilib_src_compile() { - tc-export AR CC CXX - emake CC="$(tc-getCC)" SHELL="${EPREFIX}"/bin/sh - - if ! use minimal && multilib_is_native_abi ; then - if use cxx ; then - einfo "Building contrib library: ldapc++" - src_configure_cxx - pushd "${BUILD_DIR}/contrib/ldapc++" &>/dev/null || die "pushd contrib/ldapc++" - emake - popd &>/dev/null || die - fi - - if use smbkrb5passwd ; then - einfo "Building contrib-module: smbk5pwd" - pushd "${S}/contrib/slapd-modules/smbk5pwd" &>/dev/null || die "pushd contrib/slapd-modules/smbk5pwd" - - MY_DEFS="-DDO_SHADOW" - if use samba ; then - MY_DEFS="${MY_DEFS} -DDO_SAMBA" - MY_KRB5_INC="" - fi - if use kerberos ; then - MY_DEFS="${MY_DEFS} -DDO_KRB5" - MY_KRB5_INC="$(krb5-config --cflags)" - fi - - emake \ - DEFS="${MY_DEFS}" \ - KRB5_INC="${MY_KRB5_INC}" \ - LDAP_BUILD="${BUILD_DIR}" \ - libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" - popd &>/dev/null || die - fi - - if use overlays ; then - einfo "Building contrib-module: samba4" - pushd "${S}/contrib/slapd-modules/samba4" &>/dev/null || die "pushd contrib/slapd-modules/samba4" - - emake \ - LDAP_BUILD="${BUILD_DIR}" \ - CC="$(tc-getCC)" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" - popd &>/dev/null || die - fi - - if use kerberos ; then - if use kinit ; then - build_contrib_module "kinit" "kinit.c" "kinit" - fi - build_contrib_module "passwd" "pw-kerberos.la" - fi - - if use pbkdf2; then - build_contrib_module "passwd/pbkdf2" - fi - - if use sha2 ; then - build_contrib_module "passwd/sha2" - fi - - # We could build pw-radius if GNURadius would install radlib.h - build_contrib_module "passwd" "pw-netscape.la" - - #build_contrib_module "acl" "posixgroup.la" # example code only - #build_contrib_module "acl" "gssacl.la" # example code only, also needs kerberos - build_contrib_module "addpartial" - build_contrib_module "allop" - build_contrib_module "allowed" - build_contrib_module "autogroup" - build_contrib_module "cloak" - # build_contrib_module "comp_match" # really complex, adds new external deps, questionable demand - build_contrib_module "denyop" - build_contrib_module "dsaschema" - build_contrib_module "dupent" - build_contrib_module "lastbind" - # lastmod may not play well with other overlays - build_contrib_module "lastmod" - build_contrib_module "noopsrch" - #build_contrib_module "nops" https://bugs.gentoo.org/641576 - #build_contrib_module "nssov" RESO:LATER - build_contrib_module "trace" - # build slapi-plugins - pushd "${S}/contrib/slapi-plugins/addrdnvalues" &>/dev/null || die "pushd contrib/slapi-plugins/addrdnvalues" - einfo "Building contrib-module: addrdnvalues plugin" - $(tc-getCC) -shared \ - -I"${BUILD_DIR}"/include \ - -I../../../include \ - ${CFLAGS} \ - -fPIC \ - ${LDFLAGS} \ - -o libaddrdnvalues-plugin.so \ - addrdnvalues.c || die "Building libaddrdnvalues-plugin.so failed" - popd &>/dev/null || die - fi -} - -multilib_src_test() { - if multilib_is_native_abi; then - cd "tests" - pwd - # emake test => runs only lloadd & mdb, in serial; skips ldif,sql,wt,regression - # emake partests => runs ALL of the tests in parallel - # wt/WiredTiger is not supported in Gentoo - TESTS=( plloadd pmdb ) - #TESTS+=( pldif ) # not done by default, so also exclude here - #use odbc && TESTS+=( psql ) # not done by default, so also exclude here - emake "${TESTS[@]}" - fi -} - -multilib_src_install() { - emake CC="$(tc-getCC)" \ - DESTDIR="${D}" SHELL="${EPREFIX}"/bin/sh install - - if ! use minimal && multilib_is_native_abi; then - # openldap modules go here - # TODO: write some code to populate slapd.conf with moduleload statements - keepdir /usr/$(get_libdir)/openldap/openldap/ - - # initial data storage dir - keepdir /var/lib/openldap-data - use prefix || fowners ldap:ldap /var/lib/openldap-data - fperms 0700 /var/lib/openldap-data - - echo "OLDPF='${PF}'" > "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}" - echo "# do NOT delete this. it is used" >> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}" - echo "# to track versions for upgrading." >> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}" - - # use our config - rm "${ED}"/etc/openldap/slapd.conf - insinto /etc/openldap - newins "${FILESDIR}"/${PN}-2.6.3-slapd-conf slapd.conf - configfile="${ED}"/etc/openldap/slapd.conf - - # populate with built backends - einfo "populate config with built backends" - for x in "${ED}"/usr/$(get_libdir)/openldap/openldap/back_*.so; do - einfo "Adding $(basename ${x})" - sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}" || die - done - sed -e "s:###INSERTDYNAMICMODULESHERE###$:# modulepath\t${EPREFIX}/usr/$(get_libdir)/openldap/openldap:" -i "${configfile}" - use prefix || fowners root:ldap /etc/openldap/slapd.conf - fperms 0640 /etc/openldap/slapd.conf - cp "${configfile}" "${configfile}".default || die - - # install our own init scripts and systemd unit files - einfo "Install init scripts" - sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd-initd-2.4.40-r2 > "${T}"/slapd || die - doinitd "${T}"/slapd - newconfd "${FILESDIR}"/slapd-confd-2.6.1 slapd - - if use systemd; then - # The systemd unit uses Type=notify, so it is useless without USE=systemd - einfo "Install systemd service" - rm -rf "${ED}"/{,usr/}lib/systemd - sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd-2.6.1.service > "${T}"/slapd.service || die - systemd_dounit "${T}"/slapd.service - systemd_install_serviced "${FILESDIR}"/slapd.service.conf - newtmpfiles "${FILESDIR}"/slapd.tmpfilesd slapd.conf - fi - - # if built without SLP, we don't need to be before avahi - sed -i \ - -e '/before/{s/avahi-daemon//g}' \ - "${ED}"/etc/init.d/slapd \ - || die - - if use cxx ; then - einfo "Install the ldapc++ library" - cd "${BUILD_DIR}/contrib/ldapc++" || die - emake DESTDIR="${D}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install - cd "${S}"/contrib/ldapc++ || die - newdoc README ldapc++-README - fi - - if use smbkrb5passwd ; then - einfo "Install the smbk5pwd module" - cd "${S}/contrib/slapd-modules/smbk5pwd" || die - emake DESTDIR="${D}" \ - LDAP_BUILD="${BUILD_DIR}" \ - libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install - newdoc README smbk5pwd-README - fi - - if use overlays ; then - einfo "Install the samba4 module" - cd "${S}/contrib/slapd-modules/samba4" || die - emake DESTDIR="${D}" \ - LDAP_BUILD="${BUILD_DIR}" \ - libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install - newdoc README samba4-README - fi - - einfo "Installing contrib modules" - cd "${S}/contrib/slapd-modules" || die - for l in */*.la */*/*.la; do - [[ -e ${l} ]] || continue - libtool --mode=install cp ${l} \ - "${ED}"/usr/$(get_libdir)/openldap/openldap || \ - die "installing ${l} failed" - done - - dodoc "${FILESDIR}"/DB_CONFIG.fast.example - docinto contrib - doman */*.5 - #newdoc acl/README* - newdoc addpartial/README addpartial-README - newdoc allop/README allop-README - newdoc allowed/README allowed-README - newdoc autogroup/README autogroup-README - newdoc dsaschema/README dsaschema-README - newdoc passwd/README passwd-README - cd "${S}/contrib/slapi-plugins" || die - insinto /usr/$(get_libdir)/openldap/openldap - doins */*.so - docinto contrib - newdoc addrdnvalues/README addrdnvalues-README - - insinto /etc/openldap/schema - newins "${DISTDIR}"/${BIS_P} ${BIS_PN} - - docinto back-sock ; dodoc "${S}"/servers/slapd/back-sock/searchexample* - docinto back-perl ; dodoc "${S}"/servers/slapd/back-perl/SampleLDAP.pm - - dosbin "${S}"/contrib/slapd-tools/statslog - newdoc "${S}"/contrib/slapd-tools/README README.statslog - fi - - if ! use static-libs ; then - find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die - fi -} - -multilib_src_install_all() { - dodoc ANNOUNCEMENT CHANGES COPYRIGHT README - docinto rfc ; dodoc doc/rfc/*.txt -} - -pkg_preinst() { - # keep old libs if any - preserve_old_lib /usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.4$(get_libname 0) - # bug 440470, only display the getting started help there was no openldap before, - # or we are going to a non-minimal build - ! has_version net-nds/openldap || has_version 'net-nds/openldap[minimal]' - OPENLDAP_PRINT_MESSAGES=$((! $?)) -} - -pkg_postinst() { - if ! use minimal ; then - if use systemd; then - tmpfiles_process slapd.conf - fi - - # You cannot build SSL certificates during src_install that will make - # binary packages containing your SSL key, which is both a security risk - # and a misconfiguration if multiple machines use the same key and cert. - if use ssl; then - install_cert /etc/openldap/ssl/ldap - use prefix || chown ldap:ldap "${EROOT}"/etc/openldap/ssl/ldap.* - ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]" - ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]" - ewarn "add 'TLS_REQCERT allow' if you want to use them." - fi - - if use prefix; then - # Warn about prefix issues with slapd - eerror "slapd might NOT be usable on Prefix systems as it requires root privileges" - eerror "to start up, and requires that certain files directories be owned by" - eerror "ldap:ldap. As Prefix does not support changing ownership of files and" - eerror "directories, you will have to manually fix this yourself." - fi - - # These lines force the permissions of various content to be correct - if [[ -d "${EROOT}"/var/run/openldap ]]; then - use prefix || { chown ldap:ldap "${EROOT}"/var/run/openldap || die; } - chmod 0755 "${EROOT}"/var/run/openldap || die - fi - use prefix || chown root:ldap "${EROOT}"/etc/openldap/slapd.conf{,.default} - chmod 0640 "${EROOT}"/etc/openldap/slapd.conf{,.default} || die - use prefix || chown ldap:ldap "${EROOT}"/var/lib/openldap-data - fi - - if has_version 'net-nds/openldap[-minimal]' && ((${OPENLDAP_PRINT_MESSAGES})); then - 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)" - fi - - preserve_old_lib_notify /usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.4$(get_libname 0) -}
