From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3241513835A for ; Tue, 22 Dec 2020 21:05:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7171BE097B; Tue, 22 Dec 2020 21:05:20 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6E6AAE097B for ; Tue, 22 Dec 2020 21:05:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6BA8B341012 for ; Tue, 22 Dec 2020 21:05:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2E886431 for ; Tue, 22 Dec 2020 21:05:16 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1608670212.321e440ace13a58be3ee92ad2b57a64a82664835.grobian@gentoo> Subject: [gentoo-commits] repo/proj/prefix:master commit in: net-nds/openldap/, net-nds/openldap/files/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: net-nds/openldap/Manifest net-nds/openldap/files/DB_CONFIG.fast.example net-nds/openldap/files/openldap-2.2.14-perlthreadsfix.patch net-nds/openldap/files/openldap-2.4.11-libldap_r.patch net-nds/openldap/files/openldap-2.4.15-ppolicy.patch net-nds/openldap/files/openldap-2.4.17-gcc44.patch net-nds/openldap/files/openldap-2.4.28-fix-dash.patch net-nds/openldap/files/openldap-2.4.28-gnutls-gcrypt.patch net-nds/openldap/files/openldap-2.4.31-gcc47.patch net-nds/openldap/files/openldap-2.4.35-contrib-samba4.patch net-nds/openldap/files/openldap-2.4.35-contrib-smbk5pwd.patch net-nds/openldap/files/openldap-2.4.40-slapd-conf net-nds/openldap/files/openldap-2.4.42-mdb-unbundle.patch net-nds/openldap/files/openldap-2.4.45-fix-lmpasswd-gnutls-symbols.patch net-nds/openldap/files/openldap-2.4.45-libressl.patch net-nds/openldap/files/openldap-2.4.45-winnt.patch net-nds/openldap/files/openldap-2.4.6-evolution-ntlm.patch net-nds/openldap/files/slapd-confd-2.4.28-r1 net-nds/openldap/f iles/slapd-initd-2.4.40-r2 net-nds/openldap/files/slapd.service net-nds/openldap/files/slapd.service.conf net-nds/openldap/files/slapd.tmpfilesd net-nds/openldap/metadata.xml net-nds/openldap/openldap-2.4.45.ebuild X-VCS-Directories: net-nds/openldap/ net-nds/openldap/files/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 321e440ace13a58be3ee92ad2b57a64a82664835 X-VCS-Branch: master Date: Tue, 22 Dec 2020 21:05:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 363d252a-7e55-430e-9889-25867c8d85a5 X-Archives-Hash: f54ffceaa60388de8c28bda79cd95e7a commit: 321e440ace13a58be3ee92ad2b57a64a82664835 Author: Fabian Groffen gentoo org> AuthorDate: Tue Dec 22 20:50:12 2020 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Tue Dec 22 20:50:12 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=321e440a net-nds/openldap: drop package from Prefix Signed-off-by: Fabian Groffen gentoo.org> net-nds/openldap/Manifest | 2 - net-nds/openldap/files/DB_CONFIG.fast.example | 25 - .../files/openldap-2.2.14-perlthreadsfix.patch | 12 - .../openldap/files/openldap-2.4.11-libldap_r.patch | 11 - .../openldap/files/openldap-2.4.15-ppolicy.patch | 12 - net-nds/openldap/files/openldap-2.4.17-gcc44.patch | 11 - .../openldap/files/openldap-2.4.28-fix-dash.patch | 26 - .../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 | 38 - .../files/openldap-2.4.35-contrib-smbk5pwd.patch | 48 -- 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.45-libressl.patch | 65 -- net-nds/openldap/files/openldap-2.4.45-winnt.patch | 80 -- .../files/openldap-2.4.6-evolution-ntlm.patch | 192 ----- net-nds/openldap/files/slapd-confd-2.4.28-r1 | 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 | 20 - net-nds/openldap/openldap-2.4.45.ebuild | 889 --------------------- 24 files changed, 1883 deletions(-) diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest deleted file mode 100644 index d0a81c6ed5..0000000000 --- a/net-nds/openldap/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST openldap-2.4.45.tgz 5672845 BLAKE2B e1f97553482a2e8630b62bc0f439af2484f1a2349a1a077382a124354424fe510ab55f32c073565b142d0c9318870fe31a2652268ebabd97d3afd8c833bc7aab SHA512 1c9fc84efed8998f107ce6e1c6be3f5466388241afdca0cb3847720c9def0bc263a2dbc15bf0f9112d1b4c391fd01e8531a4fb08c5532c30fb86924c08daedab -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 8b52062c9c..0000000000 --- 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 -# -# for detail description of DB_CONFIG syntax and semantics. -# -# Hints can also be found in the OpenLDAP Software FAQ -# - -# 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 ddb6672a5f..0000000000 --- a/net-nds/openldap/files/openldap-2.2.14-perlthreadsfix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur openldap-2.2.14.orig/servers/slapd/back-perl/Makefile.in openldap-2.2.14/servers/slapd/back-perl/Makefile.in ---- openldap-2.2.14.orig/servers/slapd/back-perl/Makefile.in 2004-04-12 11:20:14.000000000 -0700 -+++ openldap-2.2.14/servers/slapd/back-perl/Makefile.in 2004-06-20 18:43:41.000000000 -0700 -@@ -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 448249a3b5..0000000000 --- a/net-nds/openldap/files/openldap-2.4.11-libldap_r.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nuar openldap-2.4.11.orig/servers/slapd/slapi/Makefile.in openldap-2.4.11/servers/slapd/slapi/Makefile.in ---- openldap-2.4.11.orig/servers/slapd/slapi/Makefile.in 2008-02-11 15:26:49.000000000 -0800 -+++ openldap-2.4.11/servers/slapd/slapi/Makefile.in 2008-10-14 02:10:18.402799262 -0700 -@@ -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 3195ee550f..0000000000 --- a/net-nds/openldap/files/openldap-2.4.15-ppolicy.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- openldap-2.4.15/clients/tools/common.c.orig 2009-02-05 15:05:03.000000000 -0800 -+++ openldap-2.4.15/clients/tools/common.c 2009-03-21 01:45:14.000000000 -0700 -@@ -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 aa7fe7ac35..0000000000 --- a/net-nds/openldap/files/openldap-2.4.17-gcc44.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ur openldap-2.4.17.orig/contrib/ldapc++/src/SaslInteractionHandler.cpp openldap-2.4.17/contrib/ldapc++/src/SaslInteractionHandler.cpp ---- openldap-2.4.17.orig/contrib/ldapc++/src/SaslInteractionHandler.cpp 2008-04-15 02:09:26.000000000 +0300 -+++ openldap-2.4.17/contrib/ldapc++/src/SaslInteractionHandler.cpp 2009-08-10 13:21:24.000000000 +0300 -@@ -13,6 +13,7 @@ - #include - #endif - -+#include - #include - #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 d15c3d2231..0000000000 --- a/net-nds/openldap/files/openldap-2.4.28-fix-dash.patch +++ /dev/null @@ -1,26 +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 -diff --git a/build/top.mk b/build/top.mk -index 6fea488..ea324e3 100644 ---- a/build/top.mk -+++ b/build/top.mk -@@ -20,7 +20,7 @@ VERSION= @VERSION@ - 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 aeecb0f401..0000000000 --- a/net-nds/openldap/files/openldap-2.4.28-gnutls-gcrypt.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- openldap-2.4.28/configure.in.orig 2012-02-11 22:40:36.004360795 +0000 -+++ openldap-2.4.28/configure.in 2012-02-11 22:40:13.410986851 +0000 -@@ -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 5b6af4b295..0000000000 --- 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 ---- a/contrib/ldapc++/src/SaslInteractionHandler.cpp -+++ b/contrib/ldapc++/src/SaslInteractionHandler.cpp -@@ -16,6 +16,7 @@ - - #include - #include -+#include - #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 4312dc7c55..0000000000 --- a/net-nds/openldap/files/openldap-2.4.35-contrib-samba4.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -Nuar openldap-2.4.35.orig/contrib/slapd-modules/samba4/Makefile openldap-2.4.35/contrib/slapd-modules/samba4/Makefile ---- openldap-2.4.35.orig/contrib/slapd-modules/samba4/Makefile 2013-03-28 15:41:51.000000000 +0000 -+++ openldap-2.4.35/contrib/slapd-modules/samba4/Makefile 2013-04-16 02:16:40.651868432 +0000 -@@ -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 4383802a0e..0000000000 --- a/net-nds/openldap/files/openldap-2.4.35-contrib-smbk5pwd.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -Nuar openldap-2.4.35.orig/contrib/slapd-modules/smbk5pwd/Makefile openldap-2.4.35/contrib/slapd-modules/smbk5pwd/Makefile ---- openldap-2.4.35.orig/contrib/slapd-modules/smbk5pwd/Makefile 2013-03-28 15:41:51.000000000 +0000 -+++ openldap-2.4.35/contrib/slapd-modules/smbk5pwd/Makefile 2013-04-16 02:13:38.939913119 +0000 -@@ -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 8ecc732b96..0000000000 --- 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" -# -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 9265a01701..0000000000 --- a/net-nds/openldap/files/openldap-2.4.42-mdb-unbundle.patch +++ /dev/null @@ -1,136 +0,0 @@ ---- ./build/top.mk.orig 2014-10-24 14:34:59.260827298 +0200 -+++ ./build/top.mk 2014-10-24 14:35:25.281168893 +0200 -@@ -160,6 +160,7 @@ - LTHREAD_LIBS = @LTHREAD_LIBS@ - - BDB_LIBS = @BDB_LIBS@ -+MDB_LIBS = @MDB_LIBS@ - SLAPD_NDB_LIBS = @SLAPD_NDB_LIBS@ - - LDAP_LIBLBER_LA = $(LDAP_LIBDIR)/liblber/liblber.la ---- ./build/openldap.m4.orig 2014-10-24 10:52:02.837221734 +0200 -+++ ./build/openldap.m4 2014-10-24 11:31:02.748087966 +0200 -@@ -563,6 +563,38 @@ - ], [ol_cv_bdb_compat=yes], [ol_cv_bdb_compat=no])]) - ]) - -+dnl -------------------------------------------------------------------- -+dnl Check for version compatility with back-mdb -+AC_DEFUN([OL_MDB_COMPAT], -+[AC_CACHE_CHECK([if LMDB version supported by MDB backends], [ol_cv_mdb_compat],[ -+ AC_EGREP_CPP(__mdb_version_compat,[ -+#include -+ -+/* require 0.9.14 or later */ -+#if MDB_VERSION_FULL >= 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 ---- ./servers/slapd/back-mdb/Makefile.in.orig 2014-10-24 10:31:30.860931076 +0200 -+++ ./servers/slapd/back-mdb/Makefile.in 2014-10-24 14:33:33.803705424 +0200 -@@ -25,11 +25,10 @@ - extended.lo operational.lo \ - attr.lo index.lo key.lo filterindex.lo \ - dn2entry.lo dn2id.lo id2entry.lo idl.lo \ -- 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 ---- ./configure.in.orig 2014-10-24 10:46:53.289139847 +0200 -+++ ./configure.in 2014-10-24 10:51:34.372846374 +0200 -@@ -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 29688fcb14..0000000000 --- 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 -Signed-off-by: Steffen Hau -X-Gentoo-Bug: http://bugs.gentoo.org/show_bug.cgi?id=233633 -X-Upstream-Bug: http://www.openldap.org/its/index.cgi/Software%20Enhancements?id=4997 -X-Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=245341 - ---- openldap-2.4.17.orig/libraries/liblutil/passwd.c 2009-07-27 18:59:19.635995474 -0700 -+++ openldap-2.4.17/libraries/liblutil/passwd.c 2009-07-27 19:01:13.588069010 -0700 -@@ -51,6 +51,26 @@ typedef unsigned char des_data_block[8]; - typedef PK11Context *des_context[1]; - #define DES_ENCRYPT CKA_ENCRYPT - -+#elif defined(HAVE_GNUTLS_GNUTLS_H) && !defined(DES_ENCRYPT) -+# include -+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; ibv_len; i++) { - if(cred->bv_val[i] == '\0') { -@@ -883,6 +916,10 @@ static int chk_lanman( - strncpy( storedPasswordHash, passwd->bv_val, 32 ); - storedPasswordHash[32] = '\0'; - ldap_pvt_str2lower( storedPasswordHash ); -+ -+#if defined(HAVE_GNUTLS_GNUTLS_H) && !defined(DES_ENCRYPT) -+ gcry_cipher_close( hd ); -+#endif /* HAVE_GNUTLS_GNUTLS_H && !DES_ENCRYPT */ - - return memcmp( PasswordHash, storedPasswordHash, 32) ? LUTIL_PASSWD_ERR : LUTIL_PASSWD_OK; - } -@@ -1138,6 +1175,19 @@ static int hash_lanman( - des_data_block PasswordHash1, PasswordHash2; - char PasswordHash[33]; - -+#if defined(HAVE_GNUTLS_GNUTLS_H) && !defined(DES_ENCRYPT) -+ gcry_cipher_hd_t hd; -+ -+ if ( !gcrypt_init ) { -+ gcry_check_version( GCRYPT_VERSION ); -+ gcrypt_init = 1; -+ } -+ -+ schedule = schedule; /* unused - avoid warning */ -+ -+ gcry_cipher_open( &hd, GCRY_CIPHER_DES, GCRY_CIPHER_MODE_ECB, 0 ); -+#endif /* HAVE_GNUTLS_GNUTLS_H && !DES_ENCRYPT */ -+ - for( i=0; ibv_len; i++) { - if(passwd->bv_val[i] == '\0') { - return LUTIL_PASSWD_ERR; /* NUL character in password */ -@@ -1168,6 +1218,10 @@ static int hash_lanman( - - hash->bv_val = PasswordHash; - hash->bv_len = 32; -+ -+#if defined(HAVE_GNUTLS_GNUTLS_H) && !defined(DES_ENCRYPT) -+ gcry_cipher_close( hd ); -+#endif /* HAVE_GNUTLS_GNUTLS_H && !DES_ENCRYPT */ - - return pw_string( scheme, hash ); - } diff --git a/net-nds/openldap/files/openldap-2.4.45-libressl.patch b/net-nds/openldap/files/openldap-2.4.45-libressl.patch deleted file mode 100644 index 20a65a4e0f..0000000000 --- a/net-nds/openldap/files/openldap-2.4.45-libressl.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- libraries/libldap/tls_o.c.orig 2017-06-04 16:31:28 UTC -+++ libraries/libldap/tls_o.c -@@ -47,7 +47,7 @@ - #include - #endif - --#if OPENSSL_VERSION_NUMBER >= 0x10100000 -+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER) - #define ASN1_STRING_data(x) ASN1_STRING_get0_data(x) - #endif - -@@ -157,7 +157,7 @@ tlso_init( void ) - (void) tlso_seed_PRNG( lo->ldo_tls_randfile ); - #endif - --#if OPENSSL_VERSION_NUMBER < 0x10100000 -+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER) - SSL_load_error_strings(); - SSL_library_init(); - OpenSSL_add_all_digests(); -@@ -205,7 +205,7 @@ static void - tlso_ctx_ref( tls_ctx *ctx ) - { - tlso_ctx *c = (tlso_ctx *)ctx; --#if OPENSSL_VERSION_NUMBER < 0x10100000 -+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER) - #define SSL_CTX_up_ref(ctx) CRYPTO_add( &(ctx->references), 1, CRYPTO_LOCK_SSL_CTX ) - #endif - SSL_CTX_up_ref( c ); -@@ -464,7 +464,7 @@ tlso_session_my_dn( tls_session *sess, struct berval * - if (!x) return LDAP_INVALID_CREDENTIALS; - - xn = X509_get_subject_name(x); --#if OPENSSL_VERSION_NUMBER < 0x10100000 -+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER) - der_dn->bv_len = i2d_X509_NAME( xn, NULL ); - der_dn->bv_val = xn->bytes->data; - #else -@@ -500,7 +500,7 @@ tlso_session_peer_dn( tls_session *sess, struct berval - return LDAP_INVALID_CREDENTIALS; - - xn = X509_get_subject_name(x); --#if OPENSSL_VERSION_NUMBER < 0x10100000 -+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER) - der_dn->bv_len = i2d_X509_NAME( xn, NULL ); - der_dn->bv_val = xn->bytes->data; - #else -@@ -721,7 +721,7 @@ struct tls_data { - Sockbuf_IO_Desc *sbiod; - }; - --#if OPENSSL_VERSION_NUMBER < 0x10100000 -+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER) - #define BIO_set_init(b, x) b->init = x - #define BIO_set_data(b, x) b->ptr = x - #define BIO_clear_flags(b, x) b->flags &= ~(x) -@@ -822,7 +822,7 @@ tlso_bio_puts( BIO *b, const char *str ) - return tlso_bio_write( b, str, strlen( str ) ); - } - --#if OPENSSL_VERSION_NUMBER >= 0x10100000 -+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER) - struct bio_method_st { - int type; - const char *name; diff --git a/net-nds/openldap/files/openldap-2.4.45-winnt.patch b/net-nds/openldap/files/openldap-2.4.45-winnt.patch deleted file mode 100644 index e4af03e5fc..0000000000 --- a/net-nds/openldap/files/openldap-2.4.45-winnt.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff -ru openldap-2.4.45.gentoo/configure.in openldap-2.4.45/configure.in ---- openldap-2.4.45.gentoo/configure.in 2019-06-14 09:59:09.295425100 +0200 -+++ openldap-2.4.45/configure.in 2019-06-14 10:02:08.279864200 +0200 -@@ -821,6 +821,7 @@ - locale.h \ - malloc.h \ - memory.h \ -+ netinet/in.h \ - psap.h \ - pwd.h \ - process.h \ -@@ -862,12 +863,16 @@ - - AC_CHECK_HEADERS( resolv.h, [], [], - [$ac_includes_default -+#ifdef HAVE_NETINET_IN_H - #include -+#endif - ]) - - AC_CHECK_HEADERS( netinet/tcp.h, [], [], - [$ac_includes_default -+#ifdef HAVE_NETINET_IN_H - #include -+#endif - ]) - - AC_CHECK_HEADERS( sys/ucred.h, [], [], -@@ -2429,9 +2434,11 @@ - dnl Check for NT specific routines - AC_CHECK_FUNC(_spawnlp, AC_DEFINE(HAVE_SPAWNLP,1,[if you have spawnlp()])) - --AC_CHECK_FUNC(_snprintf, [ac_cv_func_snprintf=yes -+AC_CHECK_FUNCS(snprintf) -+ -+AC_CHECK_FUNC(_snprintf, [if test $ac_cv_func_snprintf = no ; then - AC_DEFINE(snprintf, _snprintf, [define to snprintf routine]) --]) -+fi]) - - AC_CHECK_FUNCS(vsnprintf _vsnprintf) - -@@ -2444,7 +2451,7 @@ - - if test $ac_cv_func_vprintf = yes ; then - dnl check for vsnprintf -- AC_CHECK_FUNCS(snprintf vsnprintf) -+ AC_CHECK_FUNCS(vsnprintf) - fi - - AC_CHECK_FUNCS( \ -diff -ru openldap-2.4.45.gentoo/include/ac/socket.h openldap-2.4.45/include/ac/socket.h ---- openldap-2.4.45.gentoo/include/ac/socket.h 2017-06-01 22:01:07.000000000 +0200 -+++ openldap-2.4.45/include/ac/socket.h 2019-06-14 10:02:08.279864200 +0200 -@@ -38,7 +38,9 @@ - #include - #endif - -+#ifdef HAVE_NETINET_IN_H - #include -+#endif - - #ifdef HAVE_NETINET_TCP_H - #include -@@ -98,9 +100,15 @@ - # define tcp_close( s ) closesocket( s ) - # endif - -+#ifndef EWOULDBLOCK - #define EWOULDBLOCK WSAEWOULDBLOCK -+#endif -+#ifndef EINPROGRESS - #define EINPROGRESS WSAEINPROGRESS -+#endif -+#ifndef ETIMEDOUT - #define ETIMEDOUT WSAETIMEDOUT -+#endif - - #undef sock_errno - #undef sock_errstr 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 33ff29e0ae..0000000000 --- a/net-nds/openldap/files/openldap-2.4.6-evolution-ntlm.patch +++ /dev/null @@ -1,192 +0,0 @@ -diff -up evo-openldap-2.4.14/include/ldap.h.evolution-ntlm evo-openldap-2.4.14/include/ldap.h ---- evo-openldap-2.4.14/include/ldap.h.evolution-ntlm 2009-01-27 00:29:53.000000000 +0100 -+++ evo-openldap-2.4.14/include/ldap.h 2009-02-17 10:10:00.000000000 +0100 -@@ -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 */ -diff -up evo-openldap-2.4.14/libraries/libldap/Makefile.in.evolution-ntlm evo-openldap-2.4.14/libraries/libldap/Makefile.in ---- evo-openldap-2.4.14/libraries/libldap/Makefile.in.evolution-ntlm 2009-01-27 00:29:53.000000000 +0100 -+++ evo-openldap-2.4.14/libraries/libldap/Makefile.in 2009-02-17 10:10:00.000000000 +0100 -@@ -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 \ -diff -up /dev/null evo-openldap-2.4.14/libraries/libldap/ntlm.c ---- /dev/null 2009-02-17 09:19:52.829004420 +0100 -+++ evo-openldap-2.4.14/libraries/libldap/ntlm.c 2009-02-17 10:10:00.000000000 +0100 -@@ -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 -+#include -+ -+#include -+#include -+#include -+#include -+ -+#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/slapd-confd-2.4.28-r1 b/net-nds/openldap/files/slapd-confd-2.4.28-r1 deleted file mode 100644 index ef19899a37..0000000000 --- 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-initd-2.4.40-r2 b/net-nds/openldap/files/slapd-initd-2.4.40-r2 deleted file mode 100644 index 9c4e6818da..0000000000 --- a/net-nds/openldap/files/slapd-initd-2.4.40-r2 +++ /dev/null @@ -1,64 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2018 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 3427b87e93..0000000000 --- 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 812ea68ed4..0000000000 --- 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 634cea1642..0000000000 --- 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 6cea2f2e32..0000000000 --- a/net-nds/openldap/metadata.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - ldap-bugs@gentoo.org - - - Enable experimental backend options - Enable support for kerberos init - Enable ODBC and SQL backend options - Enable contributed OpenLDAP overlays - Enable overlay for syncing ldap, unix and lanman passwords - Build libraries & userspace tools only. Does not install any server code - Enable support for pbkdf2 passwords - Enable support for pw-sha2 password hashes - - - cpe:/a:openldap:openldap - - diff --git a/net-nds/openldap/openldap-2.4.45.ebuild b/net-nds/openldap/openldap-2.4.45.ebuild deleted file mode 100644 index 383d7ba2f1..0000000000 --- a/net-nds/openldap/openldap-2.4.45.ebuild +++ /dev/null @@ -1,889 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit db-use eutils flag-o-matic multilib multilib-minimal ssl-cert versionator toolchain-funcs autotools user systemd - -BIS_PN=rfc2307bis.schema -BIS_PV=20140524 -BIS_P="${BIS_PN}-${BIS_PV}" - -DESCRIPTION="LDAP suite of application and development tools" -HOMEPAGE="http://www.OpenLDAP.org/" - -# mirrors are mostly not working, using canonical URI -SRC_URI="ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${P}.tgz - mirror://gentoo/${BIS_P}" - -LICENSE="OPENLDAP GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~x86-solaris ~x86-winnt" - -IUSE_DAEMON="crypt samba slp tcpd experimental minimal" -IUSE_BACKEND="+berkdb" -IUSE_OVERLAY="overlays perl" -IUSE_OPTIONAL="gnutls iodbc sasl ssl odbc debug ipv6 libressl +syslog selinux static-libs" -IUSE_CONTRIB="smbkrb5passwd kerberos kinit pbkdf2 sha2" -IUSE_CONTRIB="${IUSE_CONTRIB} -cxx" -IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}" - -REQUIRED_USE="cxx? ( sasl ) - ?? ( gnutls libressl ) - pbkdf2? ( ssl )" - -# always list newer first -# Do not add any AGPL-3 BDB here! -# See bug 525110, comment 15. -# Advanced usage: OPENLDAP_BDB_SLOTS in the environment can be used to force a slot during build. -BDB_SLOTS="${OPENLDAP_BDB_SLOTS:=5.3 5.1 4.8 4.7 4.6 4.5 4.4}" -BDB_PKGS='' -for _slot in $BDB_SLOTS; do BDB_PKGS="${BDB_PKGS} sys-libs/db:${_slot}" ; done - -# openssl is needed to generate lanman-passwords required by samba -CDEPEND=" - ssl? ( - !gnutls? ( - !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) - ) - gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] - libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] ) - >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] ) ) - sasl? ( dev-libs/cyrus-sasl:= ) - !minimal? ( - sys-devel/libtool - sys-libs/e2fsprogs-libs - >=dev-db/lmdb-0.9.18:= - tcpd? ( sys-apps/tcp-wrappers ) - odbc? ( !iodbc? ( dev-db/unixODBC ) - iodbc? ( dev-db/libiodbc ) ) - slp? ( net-libs/openslp ) - perl? ( dev-lang/perl:=[-build(-)] ) - samba? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl ) - ) - berkdb? ( - ${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 - - # The user/group are only used for running daemons which are - # disabled in minimal builds, so elide the accounts too. - if ! use minimal ; then - enewgroup ldap 439 - enewuser ldap 439 -1 /usr/$(get_libdir)/openldap ldap - fi -} - -src_prepare() { - # ensure correct SLAPI path by default - sed -i -e 's,\(#define LDAPI_SOCK\).*,\1 "'"${EPREFIX}"'/var/run/openldap/slapd.sock",' \ - "${S}"/include/ldap_defaults.h - - epatch "${FILESDIR}"/${PN}-2.4.17-gcc44.patch - - epatch \ - "${FILESDIR}"/${PN}-2.2.14-perlthreadsfix.patch \ - "${FILESDIR}"/${PN}-2.4.15-ppolicy.patch - - # bug #116045 - still present in 2.4.28 - epatch "${FILESDIR}"/${PN}-2.4.35-contrib-smbk5pwd.patch - # bug #408077 - samba4 - epatch "${FILESDIR}"/${PN}-2.4.35-contrib-samba4.patch - - # bug #189817 - epatch "${FILESDIR}"/${PN}-2.4.11-libldap_r.patch - - # bug #233633 - epatch "${FILESDIR}"/${PN}-2.4.45-fix-lmpasswd-gnutls-symbols.patch - - # bug #281495 - epatch "${FILESDIR}"/${PN}-2.4.28-gnutls-gcrypt.patch - - # bug #294350 - epatch "${FILESDIR}"/${PN}-2.4.6-evolution-ntlm.patch - - # unbreak /bin/sh -> dash - epatch "${FILESDIR}"/${PN}-2.4.28-fix-dash.patch - - # bug #420959 - epatch "${FILESDIR}"/${PN}-2.4.31-gcc47.patch - - # bug #622464 - epatch "${FILESDIR}"/${PN}-2.4.45-libressl.patch - - # winnt (using parity) - epatch "${FILESDIR}"/${PN}-2.4.45-winnt.patch - - # unbundle lmdb - epatch "${FILESDIR}"/${PN}-2.4.42-mdb-unbundle.patch - rm -rf "${S}"/libraries/liblmdb - - epatch_user - - cd "${S}"/build || die - einfo "Making sure upstream build strip does not do stripping too early" - sed -i.orig \ - -e '/^STRIP/s,-s,,g' \ - top.mk || die "Failed to block stripping" - - # wrong assumption that /bin/sh is /bin/bash - sed -i \ - -e 's|/bin/sh|/bin/bash|g' \ - "${S}"/tests/scripts/* || die "sed failed" - - sed -i \ - -e 's/^\twindres/\t$(RC)/' \ - "${S}"/libraries/liblutil/Makefile.in || die - - cd "${S}" || die - - AT_NOEAUTOMAKE=yes eautoreconf -} - -build_contrib_module() { - # - cd "${S}/contrib/slapd-modules/$1" || die - einfo "Compiling contrib-module: $3" - # Make sure it's uppercase - local define_name="$(echo "SLAPD_OVER_${1}" | LC_ALL=C tr '[:lower:]' '[:upper:]')" - "${lt}" --mode=compile --tag=CC \ - "${CC}" \ - -D${define_name}=SLAPD_MOD_DYNAMIC \ - -I"${BUILD_DIR}"/include \ - -I../../../include -I../../../servers/slapd ${CFLAGS} \ - -o ${2%.c}.lo -c $2 || die "compiling $3 failed" - einfo "Linking contrib-module: $3" - "${lt}" --mode=link --tag=CC \ - "${CC}" -module \ - ${CFLAGS} \ - ${LDFLAGS} \ - -rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \ - -o $3.la ${2%.c}.lo || die "linking $3 failed" -} - -src_configure() { - # Bug 408001 - use elibc_FreeBSD && append-cppflags -DMDB_DSYNC=O_SYNC -DMDB_FDATASYNC=fsync - - # connectionless ldap per bug #342439 - append-cppflags -DLDAP_CONNECTIONLESS - - multilib-minimal_src_configure -} - -multilib_src_configure() { - local myconf=() - - use debug && myconf+=( $(use_enable debug) ) - - # ICU exists only in the configure, nowhere in the codebase, bug #510858 - export ac_cv_header_unicode_utypes_h=no ol_cv_lib_icu=no - - if ! use minimal && multilib_is_native_abi; then - local CPPFLAGS=${CPPFLAGS} - - # re-enable serverside overlay chains per bug #296567 - # see ldap docs chaper 12.3.1 for details - myconf+=( --enable-ldap ) - - # backends - myconf+=( --enable-slapd ) - if use berkdb ; then - einfo "Using Berkeley DB for local backend" - myconf+=( --enable-bdb --enable-hdb ) - DBINCLUDE=$(db_includedir $BDB_SLOTS) - einfo "Using $DBINCLUDE for sys-libs/db version" - # We need to include the slotted db.h dir for FreeBSD - append-cppflags -I${DBINCLUDE} - else - myconf+=( --disable-bdb --disable-hdb ) - fi - for backend in dnssrv ldap mdb meta monitor null passwd relay shell sock; do - myconf+=( --enable-${backend}=mod ) - done - - myconf+=( $(use_enable perl perl mod) ) - - myconf+=( $(use_enable odbc sql mod) ) - if use odbc ; then - local odbc_lib="unixodbc" - if use iodbc ; then - odbc_lib="iodbc" - append-cppflags -I"${EPREFIX}"/usr/include/iodbc - fi - myconf+=( --with-odbc=${odbc_lib} ) - fi - - # slapd options - myconf+=( - $(use_enable crypt) - $(use_enable slp) - $(use_enable samba lmpasswd) - $(use_enable syslog) - ) - if use experimental ; then - myconf+=( - --enable-dynacl - --enable-aci=mod - ) - fi - for option in aci cleartext modules rewrite rlookups slapi; do - myconf+=( --enable-${option} ) - done - - # slapd overlay options - # Compile-in the syncprov, the others as module - myconf+=( --enable-syncprov=yes ) - use overlays && myconf+=( --enable-overlays=mod ) - - else - myconf+=( - --disable-backends - --disable-slapd - --disable-bdb - --disable-hdb - --disable-mdb - --disable-overlays - --disable-syslog - ) - fi - - # basic functionality stuff - myconf+=( - $(use_enable ipv6) - $(multilib_native_use_with sasl cyrus-sasl) - $(multilib_native_use_enable sasl spasswd) - $(use_enable tcpd wrappers) - # kernel_Winnt: Cygwin provides AF_LOCAL, Winnt&Mingw do not - --enable-local=$(usex kernel_Winnt auto yes) - ) - - # 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 - ssl_lib="openssl" - use gnutls && ssl_lib="gnutls" - fi - - myconf+=( --with-tls=${ssl_lib} ) - - for basicflag in dynamic proctitle shared; do - myconf+=( --enable-${basicflag} ) - done - - tc-export AR CC CXX RC - ECONF_SOURCE=${S} \ - STRIP=/bin/true \ - econf \ - --libexecdir="${EPREFIX}"/usr/$(get_libdir)/openldap \ - $(use_enable static-libs static) \ - "${myconf[@]}" - emake depend -} - -src_configure_cxx() { - # This needs the libraries built by the first build run. - # So we have to run it AFTER the main build, not just after the main - # configure. - local myconf_ldapcpp=( - --with-ldap-includes="${S}"/include - ) - - mkdir -p "${BUILD_DIR}"/contrib/ldapc++ || die - cd "${BUILD_DIR}/contrib/ldapc++" || die - - local LDFLAGS=${LDFLAGS} 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[@]}" \ - CC="${CC}" \ - CXX="${CXX}" -} - -multilib_src_compile() { - tc-export AR CC CXX RC - emake CC="${CC}" AR="${AR}" SHELL="${BASH}" - local lt="${BUILD_DIR}/libtool" - export echo="echo" - - if ! use minimal && multilib_is_native_abi ; then - if use cxx ; then - einfo "Building contrib library: ldapc++" - src_configure_cxx - cd "${BUILD_DIR}/contrib/ldapc++" || die - emake \ - CC="${CC}" CXX="${CXX}" - fi - - if use smbkrb5passwd ; then - einfo "Building contrib-module: smbk5pwd" - cd "${S}/contrib/slapd-modules/smbk5pwd" || die - - 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}" \ - CC="${CC}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" - fi - - if use overlays ; then - einfo "Building contrib-module: samba4" - cd "${S}/contrib/slapd-modules/samba4" || die - - emake \ - LDAP_BUILD="${BUILD_DIR}" \ - CC="${CC}" libexecdir="/usr/$(get_libdir)/openldap" - fi - - if use kerberos ; then - if use kinit ; then - build_contrib_module "kinit" "kinit.c" "kinit" - fi - cd "${S}/contrib/slapd-modules/passwd" || die - einfo "Compiling contrib-module: pw-kerberos" - "${lt}" --mode=compile --tag=CC \ - "${CC}" \ - -I"${BUILD_DIR}"/include \ - -I../../../include \ - ${CFLAGS} \ - $(krb5-config --cflags) \ - -DHAVE_KRB5 \ - -o kerberos.lo \ - -c kerberos.c || die "compiling pw-kerberos failed" - einfo "Linking contrib-module: pw-kerberos" - "${lt}" --mode=link --tag=CC \ - "${CC}" -module \ - ${CFLAGS} \ - ${LDFLAGS} \ - -rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \ - -o pw-kerberos.la \ - kerberos.lo || die "linking pw-kerberos failed" - fi - - if use pbkdf2; then - cd "${S}/contrib/slapd-modules/passwd/pbkdf2" || die - einfo "Compiling contrib-module: pw-pbkdf2" - "${lt}" --mode=compile --tag=CC \ - "${CC}" \ - -I"${BUILD_DIR}"/include \ - -I../../../../include \ - ${CFLAGS} \ - -o pbkdf2.lo \ - -c pw-pbkdf2.c || die "compiling pw-pbkdf2 failed" - einfo "Linking contrib-module: pw-pbkdf2" - "${lt}" --mode=link --tag=CC \ - "${CC}" -module \ - ${CFLAGS} \ - ${LDFLAGS} \ - -rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \ - -o pw-pbkdf2.la \ - pbkdf2.lo || die "linking pw-pbkdf2 failed" - fi - - if use sha2 ; then - cd "${S}/contrib/slapd-modules/passwd/sha2" || die - einfo "Compiling contrib-module: pw-sha2" - "${lt}" --mode=compile --tag=CC \ - "${CC}" \ - -I"${BUILD_DIR}"/include \ - -I../../../../include \ - ${CFLAGS} \ - -o sha2.lo \ - -c sha2.c || die "compiling pw-sha2 failed" - "${lt}" --mode=compile --tag=CC \ - "${CC}" \ - -I"${BUILD_DIR}"/include \ - -I../../../../include \ - ${CFLAGS} \ - -o slapd-sha2.lo \ - -c slapd-sha2.c || die "compiling pw-sha2 failed" - einfo "Linking contrib-module: pw-sha2" - "${lt}" --mode=link --tag=CC \ - "${CC}" -module \ - ${CFLAGS} \ - ${LDFLAGS} \ - -rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \ - -o pw-sha2.la \ - sha2.lo slapd-sha2.lo || die "linking pw-sha2 failed" - fi - - # We could build pw-radius if GNURadius would install radlib.h - cd "${S}/contrib/slapd-modules/passwd" || die - einfo "Compiling contrib-module: pw-netscape" - "${lt}" --mode=compile --tag=CC \ - "${CC}" \ - -I"${BUILD_DIR}"/include \ - -I../../../include \ - ${CFLAGS} \ - -o netscape.lo \ - -c netscape.c || die "compiling pw-netscape failed" - einfo "Linking contrib-module: pw-netscape" - "${lt}" --mode=link --tag=CC \ - "${CC}" -module \ - ${CFLAGS} \ - ${LDFLAGS} \ - -rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \ - -o pw-netscape.la \ - netscape.lo || die "linking pw-netscape failed" - - #build_contrib_module "acl" "posixgroup.c" "posixGroup" # example code only - #build_contrib_module "acl" "gssacl.c" "gss" # example code only, also needs kerberos - build_contrib_module "addpartial" "addpartial-overlay.c" "addpartial-overlay" - build_contrib_module "allop" "allop.c" "overlay-allop" - build_contrib_module "allowed" "allowed.c" "allowed" - build_contrib_module "autogroup" "autogroup.c" "autogroup" - build_contrib_module "cloak" "cloak.c" "cloak" - # build_contrib_module "comp_match" "comp_match.c" "comp_match" # really complex, adds new external deps, questionable demand - build_contrib_module "denyop" "denyop.c" "denyop-overlay" - build_contrib_module "dsaschema" "dsaschema.c" "dsaschema-plugin" - build_contrib_module "dupent" "dupent.c" "dupent" - build_contrib_module "lastbind" "lastbind.c" "lastbind" - # lastmod may not play well with other overlays - build_contrib_module "lastmod" "lastmod.c" "lastmod" - build_contrib_module "noopsrch" "noopsrch.c" "noopsrch" - build_contrib_module "nops" "nops.c" "nops-overlay" - #build_contrib_module "nssov" "nssov.c" "nssov-overlay" RESO:LATER - build_contrib_module "trace" "trace.c" "trace" - # build slapi-plugins - cd "${S}/contrib/slapi-plugins/addrdnvalues" || die - einfo "Building contrib-module: addrdnvalues plugin" - "${CC}" -shared \ - -I"${BUILD_DIR}"/include \ - -I../../../include \ - ${CFLAGS} \ - -fPIC \ - ${LDFLAGS} \ - -o libaddrdnvalues-plugin.so \ - addrdnvalues.c || die "Building libaddrdnvalues-plugin.so failed" - - fi -} - -multilib_src_test() { - if multilib_is_native_abi; then - cd tests || die - emake tests || die "make tests failed" - fi -} - -multilib_src_install() { - local lt="${BUILD_DIR}/libtool" - emake DESTDIR="${D}" SHELL="${BASH}" 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.4.40-slapd-conf slapd.conf - configfile="${ED}"etc/openldap/slapd.conf - - # populate with built backends - ebegin "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}" - 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 - eend - - # 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.4.28-r1 slapd - - einfo "Install systemd service" - sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd.service > "${T}"/slapd.service || die - systemd_dounit "${T}"/slapd.service - systemd_install_serviced "${FILESDIR}"/slapd.service.conf - systemd_newtmpfilesd "${FILESDIR}"/slapd.tmpfilesd slapd.conf - - # If built without SLP, we don't need to be before avahi - use slp \ - || sed -i \ - -e '/before/{s/avahi-daemon//g}' \ - "${ED}"etc/init.d/slapd - - 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="/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 - "${lt}" --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-shell ; dodoc "${S}"/servers/slapd/back-shell/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 - - use static-libs || prune_libtool_files --all -} - -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_r,liblber}-2.3$(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 - # 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 - use prefix || chown ldap:ldap "${EROOT}"var/run/openldap - chmod 0755 "${EROOT}"var/run/openldap - use prefix || chown root:ldap "${EROOT}"etc/openldap/slapd.conf{,.default} - chmod 0640 "${EROOT}"etc/openldap/slapd.conf{,.default} - 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)" - elog "---" - elog "An example file for tuning BDB backends with openldap is" - elog "DB_CONFIG.fast.example in /usr/share/doc/${PF}/" - fi - - preserve_old_lib_notify /usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.3$(get_libname 0) -}