diff options
author | Sam James <sam@gentoo.org> | 2022-03-20 20:35:33 +0000 |
---|---|---|
committer | Sam James <sam@gentoo.org> | 2022-03-20 21:04:31 +0000 |
commit | 0bc178c7a0c13e2fa1926eafd9129ab4dbb99ab1 (patch) | |
tree | 678c669e54acdb041d1c907613179ec729f22eee /net-nds | |
parent | net-nds/openldap: drop sys-libs/db (BDB) remnants from 2.6.1 (diff) | |
download | gentoo-0bc178c7a0c13e2fa1926eafd9129ab4dbb99ab1.tar.gz gentoo-0bc178c7a0c13e2fa1926eafd9129ab4dbb99ab1.tar.bz2 gentoo-0bc178c7a0c13e2fa1926eafd9129ab4dbb99ab1.zip |
net-nds/openldap: cleanup patches
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'net-nds')
18 files changed, 35 insertions, 133 deletions
diff --git a/net-nds/openldap/files/openldap-2.2.14-perlthreadsfix.patch b/net-nds/openldap/files/openldap-2.2.14-perlthreadsfix.patch index ddb6672a5fa7..2a8c4bc569c8 100644 --- a/net-nds/openldap/files/openldap-2.2.14-perlthreadsfix.patch +++ b/net-nds/openldap/files/openldap-2.2.14-perlthreadsfix.patch @@ -1,6 +1,5 @@ -diff -ur openldap-2.2.14.orig/servers/slapd/back-perl/Makefile.in openldap-2.2.14/servers/slapd/back-perl/Makefile.in ---- openldap-2.2.14.orig/servers/slapd/back-perl/Makefile.in 2004-04-12 11:20:14.000000000 -0700 -+++ openldap-2.2.14/servers/slapd/back-perl/Makefile.in 2004-06-20 18:43:41.000000000 -0700 +--- a/servers/slapd/back-perl/Makefile.in ++++ b/servers/slapd/back-perl/Makefile.in @@ -31,7 +31,7 @@ shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) diff --git a/net-nds/openldap/files/openldap-2.4.11-libldap_r.patch b/net-nds/openldap/files/openldap-2.4.11-libldap_r.patch index 448249a3b583..f63ad3cc8dff 100644 --- a/net-nds/openldap/files/openldap-2.4.11-libldap_r.patch +++ b/net-nds/openldap/files/openldap-2.4.11-libldap_r.patch @@ -1,6 +1,5 @@ -diff -Nuar openldap-2.4.11.orig/servers/slapd/slapi/Makefile.in openldap-2.4.11/servers/slapd/slapi/Makefile.in ---- openldap-2.4.11.orig/servers/slapd/slapi/Makefile.in 2008-02-11 15:26:49.000000000 -0800 -+++ openldap-2.4.11/servers/slapd/slapi/Makefile.in 2008-10-14 02:10:18.402799262 -0700 +--- a/servers/slapd/slapi/Makefile.in ++++ b/servers/slapd/slapi/Makefile.in @@ -37,6 +37,7 @@ XLIBS = $(LIBRARY) XXLIBS = diff --git a/net-nds/openldap/files/openldap-2.4.15-ppolicy.patch b/net-nds/openldap/files/openldap-2.4.15-ppolicy.patch index 3195ee550f68..1196f1b936e8 100644 --- a/net-nds/openldap/files/openldap-2.4.15-ppolicy.patch +++ b/net-nds/openldap/files/openldap-2.4.15-ppolicy.patch @@ -1,5 +1,5 @@ ---- openldap-2.4.15/clients/tools/common.c.orig 2009-02-05 15:05:03.000000000 -0800 -+++ openldap-2.4.15/clients/tools/common.c 2009-03-21 01:45:14.000000000 -0700 +--- a/clients/tools/common.c ++++ b/clients/tools/common.c @@ -1315,8 +1315,8 @@ int nsctrls = 0; diff --git a/net-nds/openldap/files/openldap-2.4.17-gcc44.patch b/net-nds/openldap/files/openldap-2.4.17-gcc44.patch index aa7fe7ac35f6..a782da46f3af 100644 --- a/net-nds/openldap/files/openldap-2.4.17-gcc44.patch +++ b/net-nds/openldap/files/openldap-2.4.17-gcc44.patch @@ -1,6 +1,5 @@ -diff -ur openldap-2.4.17.orig/contrib/ldapc++/src/SaslInteractionHandler.cpp openldap-2.4.17/contrib/ldapc++/src/SaslInteractionHandler.cpp ---- openldap-2.4.17.orig/contrib/ldapc++/src/SaslInteractionHandler.cpp 2008-04-15 02:09:26.000000000 +0300 -+++ openldap-2.4.17/contrib/ldapc++/src/SaslInteractionHandler.cpp 2009-08-10 13:21:24.000000000 +0300 +--- a/contrib/ldapc++/src/SaslInteractionHandler.cpp ++++ b/contrib/ldapc++/src/SaslInteractionHandler.cpp @@ -13,6 +13,7 @@ #include <termios.h> #endif diff --git a/net-nds/openldap/files/openldap-2.4.28-fix-dash.patch b/net-nds/openldap/files/openldap-2.4.28-fix-dash.patch index d15c3d2231f4..bca213dbc6ce 100644 --- a/net-nds/openldap/files/openldap-2.4.28-fix-dash.patch +++ b/net-nds/openldap/files/openldap-2.4.28-fix-dash.patch @@ -11,8 +11,6 @@ Patch unbreaks build when /bin/sh points to dash: eval: 1: base_compile+= x86_64-pc-linux-gnu-gcc: not found ... make[2]: *** [decode.lo] Error 1 -diff --git a/build/top.mk b/build/top.mk -index 6fea488..ea324e3 100644 --- a/build/top.mk +++ b/build/top.mk @@ -20,7 +20,7 @@ VERSION= @VERSION@ diff --git a/net-nds/openldap/files/openldap-2.4.28-gnutls-gcrypt.patch b/net-nds/openldap/files/openldap-2.4.28-gnutls-gcrypt.patch index aeecb0f40132..0d9b88f47627 100644 --- a/net-nds/openldap/files/openldap-2.4.28-gnutls-gcrypt.patch +++ b/net-nds/openldap/files/openldap-2.4.28-gnutls-gcrypt.patch @@ -1,5 +1,5 @@ ---- openldap-2.4.28/configure.in.orig 2012-02-11 22:40:36.004360795 +0000 -+++ openldap-2.4.28/configure.in 2012-02-11 22:40:13.410986851 +0000 +--- a/configure.in ++++ b/configure.in @@ -1214,7 +1214,7 @@ ol_with_tls=gnutls ol_link_tls=yes diff --git a/net-nds/openldap/files/openldap-2.4.35-contrib-samba4.patch b/net-nds/openldap/files/openldap-2.4.35-contrib-samba4.patch index 4312dc7c55ea..8ee3891f3cb6 100644 --- a/net-nds/openldap/files/openldap-2.4.35-contrib-samba4.patch +++ b/net-nds/openldap/files/openldap-2.4.35-contrib-samba4.patch @@ -1,6 +1,5 @@ -diff -Nuar openldap-2.4.35.orig/contrib/slapd-modules/samba4/Makefile openldap-2.4.35/contrib/slapd-modules/samba4/Makefile ---- openldap-2.4.35.orig/contrib/slapd-modules/samba4/Makefile 2013-03-28 15:41:51.000000000 +0000 -+++ openldap-2.4.35/contrib/slapd-modules/samba4/Makefile 2013-04-16 02:16:40.651868432 +0000 +--- a/contrib/slapd-modules/samba4/Makefile ++++ b/contrib/slapd-modules/samba4/Makefile @@ -20,7 +20,8 @@ LIBTOOL = $(LDAP_BUILD)/libtool diff --git a/net-nds/openldap/files/openldap-2.4.35-contrib-smbk5pwd.patch b/net-nds/openldap/files/openldap-2.4.35-contrib-smbk5pwd.patch index 4383802a0ead..ca02404c8812 100644 --- a/net-nds/openldap/files/openldap-2.4.35-contrib-smbk5pwd.patch +++ b/net-nds/openldap/files/openldap-2.4.35-contrib-smbk5pwd.patch @@ -1,6 +1,5 @@ -diff -Nuar openldap-2.4.35.orig/contrib/slapd-modules/smbk5pwd/Makefile openldap-2.4.35/contrib/slapd-modules/smbk5pwd/Makefile ---- openldap-2.4.35.orig/contrib/slapd-modules/smbk5pwd/Makefile 2013-03-28 15:41:51.000000000 +0000 -+++ openldap-2.4.35/contrib/slapd-modules/smbk5pwd/Makefile 2013-04-16 02:13:38.939913119 +0000 +--- a/contrib/slapd-modules/smbk5pwd/Makefile ++++ b/contrib/slapd-modules/smbk5pwd/Makefile @@ -21,16 +21,23 @@ SSL_INC = SSL_LIB = -lcrypto diff --git a/net-nds/openldap/files/openldap-2.4.42-mdb-unbundle.patch b/net-nds/openldap/files/openldap-2.4.42-mdb-unbundle.patch index 9265a01701ab..6ec68885b5e7 100644 --- a/net-nds/openldap/files/openldap-2.4.42-mdb-unbundle.patch +++ b/net-nds/openldap/files/openldap-2.4.42-mdb-unbundle.patch @@ -1,5 +1,5 @@ ---- ./build/top.mk.orig 2014-10-24 14:34:59.260827298 +0200 -+++ ./build/top.mk 2014-10-24 14:35:25.281168893 +0200 +--- a/build/top.mk ++++ b/build/top.mk @@ -160,6 +160,7 @@ LTHREAD_LIBS = @LTHREAD_LIBS@ @@ -8,8 +8,8 @@ SLAPD_NDB_LIBS = @SLAPD_NDB_LIBS@ LDAP_LIBLBER_LA = $(LDAP_LIBDIR)/liblber/liblber.la ---- ./build/openldap.m4.orig 2014-10-24 10:52:02.837221734 +0200 -+++ ./build/openldap.m4 2014-10-24 11:31:02.748087966 +0200 +--- ./build/openldap.m4.orig ++++ ./build/openldap.m4 @@ -563,6 +563,38 @@ ], [ol_cv_bdb_compat=yes], [ol_cv_bdb_compat=no])]) ]) @@ -49,8 +49,8 @@ dnl dnl ==================================================================== dnl Check POSIX Thread version ---- ./servers/slapd/back-mdb/Makefile.in.orig 2014-10-24 10:31:30.860931076 +0200 -+++ ./servers/slapd/back-mdb/Makefile.in 2014-10-24 14:33:33.803705424 +0200 +--- a/servers/slapd/back-mdb/Makefile.in ++++ b/servers/slapd/back-mdb/Makefile.in @@ -25,11 +25,10 @@ extended.lo operational.lo \ attr.lo index.lo key.lo filterindex.lo \ @@ -85,8 +85,8 @@ - veryclean-local-lib: FORCE $(RM) $(XXHEADERS) $(XXSRCS) .links ---- ./configure.in.orig 2014-10-24 10:46:53.289139847 +0200 -+++ ./configure.in 2014-10-24 10:51:34.372846374 +0200 +--- a/configure.in ++++ b/configure.in @@ -519,6 +519,7 @@ dnl Initialize vars LDAP_LIBS= diff --git a/net-nds/openldap/files/openldap-2.4.45-fix-lmpasswd-gnutls-symbols.patch b/net-nds/openldap/files/openldap-2.4.45-fix-lmpasswd-gnutls-symbols.patch index 29688fcb14c8..05e515cd47d1 100644 --- a/net-nds/openldap/files/openldap-2.4.45-fix-lmpasswd-gnutls-symbols.patch +++ b/net-nds/openldap/files/openldap-2.4.45-fix-lmpasswd-gnutls-symbols.patch @@ -7,8 +7,8 @@ X-Gentoo-Bug: http://bugs.gentoo.org/show_bug.cgi?id=233633 X-Upstream-Bug: http://www.openldap.org/its/index.cgi/Software%20Enhancements?id=4997 X-Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=245341 ---- openldap-2.4.17.orig/libraries/liblutil/passwd.c 2009-07-27 18:59:19.635995474 -0700 -+++ openldap-2.4.17/libraries/liblutil/passwd.c 2009-07-27 19:01:13.588069010 -0700 +--- a/libraries/liblutil/passwd.c ++++ b/libraries/liblutil/passwd.c @@ -51,6 +51,26 @@ typedef unsigned char des_data_block[8]; typedef PK11Context *des_context[1]; #define DES_ENCRYPT CKA_ENCRYPT diff --git a/net-nds/openldap/files/openldap-2.4.47-warnings.patch b/net-nds/openldap/files/openldap-2.4.47-warnings.patch index d75bd0d3c5d7..10f21114954e 100644 --- a/net-nds/openldap/files/openldap-2.4.47-warnings.patch +++ b/net-nds/openldap/files/openldap-2.4.47-warnings.patch @@ -1,5 +1,3 @@ -diff --git a/include/ldap.h b/include/ldap.h -index c245651c2..7f14f1051 100644 --- a/include/ldap.h +++ b/include/ldap.h @@ -2041,6 +2041,10 @@ LDAP_F( int ) @@ -13,8 +11,6 @@ index c245651c2..7f14f1051 100644 LDAP_F( int ) ldap_url_parse LDAP_P(( LDAP_CONST char *url, -diff --git a/include/ldap_int_thread.h b/include/ldap_int_thread.h -index e2dd8a942..bbc07c845 100644 --- a/include/ldap_int_thread.h +++ b/include/ldap_int_thread.h @@ -33,7 +33,7 @@ LDAP_END_DECL @@ -26,8 +22,6 @@ index e2dd8a942..bbc07c845 100644 #include <pthread.h> #ifdef HAVE_SCHED_H #include <sched.h> -diff --git a/libraries/libldap/tls2.c b/libraries/libldap/tls2.c -index d25c190ea..639f598e7 100644 --- a/libraries/libldap/tls2.c +++ b/libraries/libldap/tls2.c @@ -76,6 +76,8 @@ static oid_name oids[] = { diff --git a/net-nds/openldap/files/openldap-2.4.6-evolution-ntlm.patch b/net-nds/openldap/files/openldap-2.4.6-evolution-ntlm.patch index 33ff29e0aed2..e8bcc50502c9 100644 --- a/net-nds/openldap/files/openldap-2.4.6-evolution-ntlm.patch +++ b/net-nds/openldap/files/openldap-2.4.6-evolution-ntlm.patch @@ -1,6 +1,5 @@ -diff -up evo-openldap-2.4.14/include/ldap.h.evolution-ntlm evo-openldap-2.4.14/include/ldap.h ---- evo-openldap-2.4.14/include/ldap.h.evolution-ntlm 2009-01-27 00:29:53.000000000 +0100 -+++ evo-openldap-2.4.14/include/ldap.h 2009-02-17 10:10:00.000000000 +0100 +--- a/include/ldap.h ++++ b/include/ldap.h @@ -2461,5 +2461,26 @@ ldap_parse_deref_control LDAP_P(( LDAPControl **ctrls, LDAPDerefRes **drp )); @@ -28,9 +27,8 @@ diff -up evo-openldap-2.4.14/include/ldap.h.evolution-ntlm evo-openldap-2.4.14/i + LDAP_END_DECL #endif /* _LDAP_H */ -diff -up evo-openldap-2.4.14/libraries/libldap/Makefile.in.evolution-ntlm evo-openldap-2.4.14/libraries/libldap/Makefile.in ---- evo-openldap-2.4.14/libraries/libldap/Makefile.in.evolution-ntlm 2009-01-27 00:29:53.000000000 +0100 -+++ evo-openldap-2.4.14/libraries/libldap/Makefile.in 2009-02-17 10:10:00.000000000 +0100 +--- a/libraries/libldap/Makefile.in ++++ b/libraries/libldap/Makefile.in @@ -20,7 +20,7 @@ PROGRAMS = apitest dntest ftest ltest ur SRCS = bind.c open.c result.c error.c compare.c search.c \ controls.c messages.c references.c extended.c cyrus.c \ @@ -49,9 +47,8 @@ diff -up evo-openldap-2.4.14/libraries/libldap/Makefile.in.evolution-ntlm evo-op filter.lo free.lo sort.lo passwd.lo whoami.lo \ getdn.lo getentry.lo getattr.lo getvalues.lo addentry.lo \ request.lo os-ip.lo url.lo pagectrl.lo sortctrl.lo vlvctrl.lo \ -diff -up /dev/null evo-openldap-2.4.14/libraries/libldap/ntlm.c ---- /dev/null 2009-02-17 09:19:52.829004420 +0100 -+++ evo-openldap-2.4.14/libraries/libldap/ntlm.c 2009-02-17 10:10:00.000000000 +0100 +--- /dev/null ++++ b/libraries/libldap/ntlm.c @@ -0,0 +1,137 @@ +/* $OpenLDAP: pkg/ldap/libraries/libldap/ntlm.c,v 1.1.4.10 2002/01/04 20:38:21 kurt Exp $ */ +/* diff --git a/net-nds/openldap/files/openldap-2.6.1-cloak.patch b/net-nds/openldap/files/openldap-2.6.1-cloak.patch index 8fab052d4db1..e023a14e4940 100644 --- a/net-nds/openldap/files/openldap-2.6.1-cloak.patch +++ b/net-nds/openldap/files/openldap-2.6.1-cloak.patch @@ -1,5 +1,3 @@ -diff --git a/contrib/slapd-modules/cloak/cloak.c b/contrib/slapd-modules/cloak/cloak.c -index ced7a8024..dffce3614 100644 --- a/contrib/slapd-modules/cloak/cloak.c +++ b/contrib/slapd-modules/cloak/cloak.c @@ -29,6 +29,7 @@ @@ -10,8 +8,6 @@ index ced7a8024..dffce3614 100644 #include "slap.h" #include "slap-config.h" -diff --git a/servers/slapd/attr.h b/servers/slapd/attr.h -index e69de29bb..73949f60c 100644 --- a/servers/slapd/attr.h +++ b/servers/slapd/attr.h @@ -0,0 +1,8 @@ diff --git a/net-nds/openldap/files/openldap-2.6.1-fix-missing-mapping.patch b/net-nds/openldap/files/openldap-2.6.1-fix-missing-mapping.patch index be7fbf3e528d..1d6595566c73 100644 --- a/net-nds/openldap/files/openldap-2.6.1-fix-missing-mapping.patch +++ b/net-nds/openldap/files/openldap-2.6.1-fix-missing-mapping.patch @@ -3,12 +3,6 @@ From: Simon Pichugin <spichugi@redhat.com> Date: Wed, 3 Nov 2021 19:03:40 -0700 Subject: [PATCH] Fix missing mapping ---- - libraries/liblber/lber.map | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libraries/liblber/lber.map b/libraries/liblber/lber.map -index 9a4094b0f..083cd1f32 100644 --- a/libraries/liblber/lber.map +++ b/libraries/liblber/lber.map @@ -121,6 +121,7 @@ OPENLDAP_2.200 diff --git a/net-nds/openldap/files/openldap-2.6.1-flags.patch b/net-nds/openldap/files/openldap-2.6.1-flags.patch index 019bd9f6fd33..39ceeecb1742 100644 --- a/net-nds/openldap/files/openldap-2.6.1-flags.patch +++ b/net-nds/openldap/files/openldap-2.6.1-flags.patch @@ -1,5 +1,3 @@ -diff --git a/contrib/slapd-modules/acl/Makefile b/contrib/slapd-modules/acl/Makefile -index 2195e2d72..3efaaad72 100644 --- a/contrib/slapd-modules/acl/Makefile +++ b/contrib/slapd-modules/acl/Makefile @@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -11,8 +9,6 @@ index 2195e2d72..3efaaad72 100644 DEFS = INCS = $(LDAP_INC) LIBS = $(LDAP_LIB) -diff --git a/contrib/slapd-modules/addpartial/Makefile b/contrib/slapd-modules/addpartial/Makefile -index ecb7cd0a3..e278dc080 100644 --- a/contrib/slapd-modules/addpartial/Makefile +++ b/contrib/slapd-modules/addpartial/Makefile @@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -24,8 +20,6 @@ index ecb7cd0a3..e278dc080 100644 DEFS = INCS = $(LDAP_INC) LIBS = $(LDAP_LIB) -diff --git a/contrib/slapd-modules/adremap/Makefile b/contrib/slapd-modules/adremap/Makefile -index b008eabd6..23d3658c3 100644 --- a/contrib/slapd-modules/adremap/Makefile +++ b/contrib/slapd-modules/adremap/Makefile @@ -19,7 +19,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -37,8 +31,6 @@ index b008eabd6..23d3658c3 100644 DEFS = -DSLAPD_OVER_ADREMAP=SLAPD_MOD_DYNAMIC INCS = $(LDAP_INC) LIBS = $(LDAP_LIB) -diff --git a/contrib/slapd-modules/allop/Makefile b/contrib/slapd-modules/allop/Makefile -index 053f3774a..11998ce87 100644 --- a/contrib/slapd-modules/allop/Makefile +++ b/contrib/slapd-modules/allop/Makefile @@ -9,7 +9,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -50,8 +42,6 @@ index 053f3774a..11998ce87 100644 DEFS = INCS = $(LDAP_INC) LIBS = $(LDAP_LIB) -diff --git a/contrib/slapd-modules/allowed/Makefile b/contrib/slapd-modules/allowed/Makefile -index 32cb43241..674d6cafd 100644 --- a/contrib/slapd-modules/allowed/Makefile +++ b/contrib/slapd-modules/allowed/Makefile @@ -20,7 +20,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -63,8 +53,6 @@ index 32cb43241..674d6cafd 100644 DEFS = -DSLAPD_OVER_ALLOWED=SLAPD_MOD_DYNAMIC INCS = $(LDAP_INC) LIBS = $(LDAP_LIB) -diff --git a/contrib/slapd-modules/authzid/Makefile b/contrib/slapd-modules/authzid/Makefile -index ef9c4bc4f..49a756c35 100644 --- a/contrib/slapd-modules/authzid/Makefile +++ b/contrib/slapd-modules/authzid/Makefile @@ -20,7 +20,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -76,8 +64,6 @@ index ef9c4bc4f..49a756c35 100644 DEFS = INCS = $(LDAP_INC) LIBS = $(LDAP_LIB) -diff --git a/contrib/slapd-modules/autogroup/Makefile b/contrib/slapd-modules/autogroup/Makefile -index 7dd6613cf..f19acae6c 100644 --- a/contrib/slapd-modules/autogroup/Makefile +++ b/contrib/slapd-modules/autogroup/Makefile @@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -89,8 +75,6 @@ index 7dd6613cf..f19acae6c 100644 DEFS = INCS = $(LDAP_INC) LIBS = $(LDAP_LIB) -diff --git a/contrib/slapd-modules/cloak/Makefile b/contrib/slapd-modules/cloak/Makefile -index c54e6b134..9360ef2dc 100644 --- a/contrib/slapd-modules/cloak/Makefile +++ b/contrib/slapd-modules/cloak/Makefile @@ -9,7 +9,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -102,8 +86,6 @@ index c54e6b134..9360ef2dc 100644 DEFS = -DSLAPD_OVER_CLOAK=SLAPD_MOD_DYNAMIC INCS = $(LDAP_INC) LIBS = $(LDAP_LIB) -diff --git a/contrib/slapd-modules/comp_match/Makefile b/contrib/slapd-modules/comp_match/Makefile -index 9b78c5c12..e1cb8fe3c 100644 --- a/contrib/slapd-modules/comp_match/Makefile +++ b/contrib/slapd-modules/comp_match/Makefile @@ -31,7 +31,7 @@ SSL_LIB = -lcrypto -L$(SSL_DIR)/lib @@ -115,8 +97,6 @@ index 9b78c5c12..e1cb8fe3c 100644 DEFS = -DLDAP_COMPONENT INCS = $(LDAP_INC) $(SNACC_INC) $(SSL_INC) LIBS = $(LDAP_LIB) $(SNACC_LIB) $(SSL_LIB) -diff --git a/contrib/slapd-modules/datamorph/Makefile b/contrib/slapd-modules/datamorph/Makefile -index 82bce493c..19231c71d 100644 --- a/contrib/slapd-modules/datamorph/Makefile +++ b/contrib/slapd-modules/datamorph/Makefile @@ -22,7 +22,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -128,8 +108,6 @@ index 82bce493c..19231c71d 100644 DEFS = -DSLAPD_OVER_DATAMORPH=SLAPD_MOD_DYNAMIC INCS = $(LDAP_INC) LIBS = $(LDAP_LIB) -diff --git a/contrib/slapd-modules/denyop/Makefile b/contrib/slapd-modules/denyop/Makefile -index 2cea18b06..d11dd8d4a 100644 --- a/contrib/slapd-modules/denyop/Makefile +++ b/contrib/slapd-modules/denyop/Makefile @@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -141,8 +119,6 @@ index 2cea18b06..d11dd8d4a 100644 DEFS = -DSLAPD_OVER_DENYOP=SLAPD_MOD_DYNAMIC INCS = $(LDAP_INC) LIBS = $(LDAP_LIB) -diff --git a/contrib/slapd-modules/dsaschema/Makefile b/contrib/slapd-modules/dsaschema/Makefile -index 3a88fc01f..97e0642f3 100644 --- a/contrib/slapd-modules/dsaschema/Makefile +++ b/contrib/slapd-modules/dsaschema/Makefile @@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -154,8 +130,6 @@ index 3a88fc01f..97e0642f3 100644 DEFS = INCS = $(LDAP_INC) LIBS = $(LDAP_LIB) -diff --git a/contrib/slapd-modules/dupent/Makefile b/contrib/slapd-modules/dupent/Makefile -index 6b3543862..1cc09a8b4 100644 --- a/contrib/slapd-modules/dupent/Makefile +++ b/contrib/slapd-modules/dupent/Makefile @@ -20,7 +20,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -167,8 +141,6 @@ index 6b3543862..1cc09a8b4 100644 DEFS = -DSLAPD_OVER_DUPENT=SLAPD_MOD_DYNAMIC INCS = $(LDAP_INC) LIBS = $(LDAP_LIB) -diff --git a/contrib/slapd-modules/kinit/Makefile b/contrib/slapd-modules/kinit/Makefile -index 7b25ced76..9f339e810 100644 --- a/contrib/slapd-modules/kinit/Makefile +++ b/contrib/slapd-modules/kinit/Makefile @@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -180,8 +152,6 @@ index 7b25ced76..9f339e810 100644 DEFS = INCS = $(LDAP_INC) LIBS = $(LDAP_LIB) -lkrb5 -diff --git a/contrib/slapd-modules/lastbind/Makefile b/contrib/slapd-modules/lastbind/Makefile -index c273cd3a0..da9fa172f 100644 --- a/contrib/slapd-modules/lastbind/Makefile +++ b/contrib/slapd-modules/lastbind/Makefile @@ -19,7 +19,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -193,8 +163,6 @@ index c273cd3a0..da9fa172f 100644 DEFS = -DSLAPD_OVER_LASTBIND=SLAPD_MOD_DYNAMIC INCS = $(LDAP_INC) LIBS = $(LDAP_LIB) -diff --git a/contrib/slapd-modules/lastmod/Makefile b/contrib/slapd-modules/lastmod/Makefile -index 9b06c28fb..be583722b 100644 --- a/contrib/slapd-modules/lastmod/Makefile +++ b/contrib/slapd-modules/lastmod/Makefile @@ -9,7 +9,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -206,8 +174,6 @@ index 9b06c28fb..be583722b 100644 DEFS = -DSLAPD_OVER_LASTMOD=SLAPD_MOD_DYNAMIC INCS = $(LDAP_INC) LIBS = $(LDAP_LIB) -diff --git a/contrib/slapd-modules/noopsrch/Makefile b/contrib/slapd-modules/noopsrch/Makefile -index 2934a3214..22a3db04b 100644 --- a/contrib/slapd-modules/noopsrch/Makefile +++ b/contrib/slapd-modules/noopsrch/Makefile @@ -20,7 +20,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -219,8 +185,6 @@ index 2934a3214..22a3db04b 100644 DEFS = -DSLAPD_OVER_NOOPSRCH=SLAPD_MOD_DYNAMIC INCS = $(LDAP_INC) LIBS = $(LDAP_LIB) -diff --git a/contrib/slapd-modules/nops/Makefile b/contrib/slapd-modules/nops/Makefile -index 94a5bcd23..86dcdfd76 100644 --- a/contrib/slapd-modules/nops/Makefile +++ b/contrib/slapd-modules/nops/Makefile @@ -9,7 +9,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -232,8 +196,6 @@ index 94a5bcd23..86dcdfd76 100644 DEFS = -DSLAPD_OVER_NOPS=SLAPD_MOD_DYNAMIC INCS = $(LDAP_INC) LIBS = $(LDAP_LIB) -diff --git a/contrib/slapd-modules/nssov/Makefile b/contrib/slapd-modules/nssov/Makefile -index 13987c250..c2c26d473 100644 --- a/contrib/slapd-modules/nssov/Makefile +++ b/contrib/slapd-modules/nssov/Makefile @@ -27,7 +27,7 @@ NLDAPD_INC=-Inss-pam-ldapd @@ -245,8 +207,6 @@ index 13987c250..c2c26d473 100644 CC = gcc DEFS = INCS = $(LDAP_INC) $(NLDAPD_INC) -diff --git a/contrib/slapd-modules/passwd/Makefile b/contrib/slapd-modules/passwd/Makefile -index 634649603..4b6be2617 100644 --- a/contrib/slapd-modules/passwd/Makefile +++ b/contrib/slapd-modules/passwd/Makefile @@ -9,7 +9,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -258,8 +218,6 @@ index 634649603..4b6be2617 100644 DEFS = INCS = $(LDAP_INC) LIBS = $(LDAP_LIB) -diff --git a/contrib/slapd-modules/passwd/pbkdf2/Makefile b/contrib/slapd-modules/passwd/pbkdf2/Makefile -index 6279f50c1..20769028e 100644 --- a/contrib/slapd-modules/passwd/pbkdf2/Makefile +++ b/contrib/slapd-modules/passwd/pbkdf2/Makefile @@ -9,7 +9,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -271,8 +229,6 @@ index 6279f50c1..20769028e 100644 #DEFS = -DSLAPD_PBKDF2_DEBUG SSL_INC = -diff --git a/contrib/slapd-modules/passwd/sha2/Makefile b/contrib/slapd-modules/passwd/sha2/Makefile -index 2d2075688..f8a77d24d 100644 --- a/contrib/slapd-modules/passwd/sha2/Makefile +++ b/contrib/slapd-modules/passwd/sha2/Makefile @@ -9,7 +9,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -284,8 +240,6 @@ index 2d2075688..f8a77d24d 100644 DEFS = #DEFS = -DSLAPD_SHA2_DEBUG INCS = $(LDAP_INC) -diff --git a/contrib/slapd-modules/passwd/totp/Makefile b/contrib/slapd-modules/passwd/totp/Makefile -index f7dff4bd7..463a45248 100644 --- a/contrib/slapd-modules/passwd/totp/Makefile +++ b/contrib/slapd-modules/passwd/totp/Makefile @@ -9,7 +9,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -297,8 +251,6 @@ index f7dff4bd7..463a45248 100644 DEFS = INCS = $(LDAP_INC) LIBS = $(LDAP_LIB) -diff --git a/contrib/slapd-modules/ppm/Makefile b/contrib/slapd-modules/ppm/Makefile -index 7b6efaddd..f26faca2b 100644 --- a/contrib/slapd-modules/ppm/Makefile +++ b/contrib/slapd-modules/ppm/Makefile @@ -18,7 +18,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/liblber/liblber.la $(LDAP_BUILD)/libraries/li @@ -310,8 +262,6 @@ index 7b6efaddd..f26faca2b 100644 # To skip linking against CRACKLIB make CRACK=no CRACK=yes -diff --git a/contrib/slapd-modules/proxyOld/Makefile b/contrib/slapd-modules/proxyOld/Makefile -index d92967c39..f2e7524a9 100644 --- a/contrib/slapd-modules/proxyOld/Makefile +++ b/contrib/slapd-modules/proxyOld/Makefile @@ -20,7 +20,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -323,8 +273,6 @@ index d92967c39..f2e7524a9 100644 DEFS = INCS = $(LDAP_INC) LIBS = $(LDAP_LIB) -diff --git a/contrib/slapd-modules/rbac/Makefile b/contrib/slapd-modules/rbac/Makefile -index 1180bd6a1..59b614ade 100755 --- a/contrib/slapd-modules/rbac/Makefile +++ b/contrib/slapd-modules/rbac/Makefile @@ -9,7 +9,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -336,8 +284,6 @@ index 1180bd6a1..59b614ade 100755 DEFS = -DSLAPD_OVER_RBAC=SLAPD_MOD_DYNAMIC INCS = $(LDAP_INC) LIBS = $(LDAP_LIB) -diff --git a/contrib/slapd-modules/samba4/Makefile b/contrib/slapd-modules/samba4/Makefile -index f53d130d2..a4b6600ca 100644 --- a/contrib/slapd-modules/samba4/Makefile +++ b/contrib/slapd-modules/samba4/Makefile @@ -20,7 +20,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -349,8 +295,6 @@ index f53d130d2..a4b6600ca 100644 DEFS = -DSLAPD_OVER_RDNVAL=SLAPD_MOD_DYNAMIC \ -DSLAPD_OVER_PGUID=SLAPD_MOD_DYNAMIC \ -DSLAPD_OVER_VERNUM=SLAPD_MOD_DYNAMIC -diff --git a/contrib/slapd-modules/smbk5pwd/Makefile b/contrib/slapd-modules/smbk5pwd/Makefile -index a1c2c8eef..c2b1c16bb 100644 --- a/contrib/slapd-modules/smbk5pwd/Makefile +++ b/contrib/slapd-modules/smbk5pwd/Makefile @@ -27,7 +27,7 @@ HEIMDAL_LIB = -L/usr/heimdal/lib -lkrb5 -lkadm5srv @@ -362,8 +306,6 @@ index a1c2c8eef..c2b1c16bb 100644 # Omit DO_KRB5, DO_SAMBA or DO_SHADOW if you don't want to support it. DEFS = -DDO_KRB5 -DDO_SAMBA -DDO_SHADOW INCS = $(LDAP_INC) $(HEIMDAL_INC) $(SSL_INC) -diff --git a/contrib/slapd-modules/trace/Makefile b/contrib/slapd-modules/trace/Makefile -index 1bf8a5541..9026c2c93 100644 --- a/contrib/slapd-modules/trace/Makefile +++ b/contrib/slapd-modules/trace/Makefile @@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -375,8 +317,6 @@ index 1bf8a5541..9026c2c93 100644 DEFS = -DSLAPD_OVER_TRACE=SLAPD_MOD_DYNAMIC INCS = $(LDAP_INC) LIBS = $(LDAP_LIB) -diff --git a/contrib/slapd-modules/usn/Makefile b/contrib/slapd-modules/usn/Makefile -index d7af04b10..eae938a3e 100644 --- a/contrib/slapd-modules/usn/Makefile +++ b/contrib/slapd-modules/usn/Makefile @@ -8,7 +8,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -388,8 +328,6 @@ index d7af04b10..eae938a3e 100644 DEFS = -DSLAPD_OVER_USN=SLAPD_MOD_DYNAMIC INCS = $(LDAP_INC) LIBS = $(LDAP_LIB) -diff --git a/contrib/slapd-modules/variant/Makefile b/contrib/slapd-modules/variant/Makefile -index 07effed6c..a83373b48 100644 --- a/contrib/slapd-modules/variant/Makefile +++ b/contrib/slapd-modules/variant/Makefile @@ -22,7 +22,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ @@ -401,8 +339,6 @@ index 07effed6c..a83373b48 100644 DEFS = -DSLAPD_OVER_VARIANT=SLAPD_MOD_DYNAMIC INCS = $(LDAP_INC) LIBS = $(LDAP_LIB) -diff --git a/contrib/slapd-modules/vc/Makefile b/contrib/slapd-modules/vc/Makefile -index 9fe67ab27..526037e50 100644 --- a/contrib/slapd-modules/vc/Makefile +++ b/contrib/slapd-modules/vc/Makefile @@ -20,7 +20,7 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \ diff --git a/net-nds/openldap/files/openldap-2.6.1-system-mdb.patch b/net-nds/openldap/files/openldap-2.6.1-system-mdb.patch index ad8aaba0157a..e29ba0be964a 100644 --- a/net-nds/openldap/files/openldap-2.6.1-system-mdb.patch +++ b/net-nds/openldap/files/openldap-2.6.1-system-mdb.patch @@ -1,5 +1,3 @@ -diff --git a/build/openldap.m4 b/build/openldap.m4 -index 91e2608b8..493f85ae8 100644 --- a/build/openldap.m4 +++ b/build/openldap.m4 @@ -243,6 +243,40 @@ OL_RESOLVER_TRY(ol_cv_resolver_none) @@ -43,8 +41,6 @@ index 91e2608b8..493f85ae8 100644 dnl dnl ==================================================================== dnl Check POSIX Thread version -diff --git a/build/top.mk b/build/top.mk -index 67873d9f3..8d8787ecb 100644 --- a/build/top.mk +++ b/build/top.mk @@ -164,6 +164,7 @@ CLIENT_LIBS = @CLIENT_LIBS@ @@ -55,8 +51,6 @@ index 67873d9f3..8d8787ecb 100644 SLAPD_NDB_LIBS = @SLAPD_NDB_LIBS@ WT_LIBS = @WT_LIBS@ -diff --git a/configure.ac b/configure.ac -index 9012d0b28..52dd72eb6 100644 --- a/configure.ac +++ b/configure.ac @@ -547,6 +547,7 @@ AC_MSG_RESULT(done) @@ -108,8 +102,6 @@ index 9012d0b28..52dd72eb6 100644 AC_SUBST(BALANCER_LIBS) AC_SUBST(SLAPD_NDB_LIBS) AC_SUBST(SLAPD_NDB_INCS) -diff --git a/servers/slapd/back-mdb/Makefile.in b/servers/slapd/back-mdb/Makefile.in -index ad3804898..f9319e227 100644 --- a/servers/slapd/back-mdb/Makefile.in +++ b/servers/slapd/back-mdb/Makefile.in @@ -25,11 +25,10 @@ OBJS = init.lo tools.lo config.lo \ diff --git a/net-nds/openldap/files/slapd-initd b/net-nds/openldap/files/slapd-initd index ecd8f650a217..a8e98646569a 100644 --- a/net-nds/openldap/files/slapd-initd +++ b/net-nds/openldap/files/slapd-initd @@ -8,7 +8,7 @@ depend() { } start() { - checkpath -q -d /var/run/openldap/ -o ldap:ldap + checkpath -q -d /var/run/openldap/ -o ldap:ldap if ! checkconfig ; then eerror "There is a problem with your slapd.conf!" return 1 @@ -20,10 +20,10 @@ start() { stop() { ebegin "Stopping ldap-server" - start-stop-daemon --stop --signal 2 --quiet --pidfile /var/run/openldap/slapd.pid + start-stop-daemon --stop --signal 2 --quiet --pidfile /var/run/openldap/slapd.pid eend $? } -checkconfig() { - /usr/sbin/slaptest -u "$@" ${OPTS_CONF} +checkconfig() { + /usr/sbin/slaptest -u "$@" ${OPTS_CONF} } diff --git a/net-nds/openldap/files/slapd-initd-2.4.40-r2 b/net-nds/openldap/files/slapd-initd-2.4.40-r2 index 722b6c20de79..bf408e3d6ecd 100644 --- a/net-nds/openldap/files/slapd-initd-2.4.40-r2 +++ b/net-nds/openldap/files/slapd-initd-2.4.40-r2 @@ -57,7 +57,7 @@ checkconfig() { if [ $? -ne 0 ]; then ewarn "You have files in $d not owned by the ldap user, you must ensure they are accessible to the slapd instance!" fi - [ ! -e $d/DB_CONFIG ] && ewarn "$d/DB_CONFIG does not exist, slapd performance may be sub-optimal" + [ ! -e $d/DB_CONFIG ] && ewarn "$d/DB_CONFIG does not exist, slapd performance may be sub-optimal" done # now test the config fully /usr/sbin/slaptest -u "$@" ${OPTS_CONF} |