Skip to content

GitLab

O
openldap
Commit 63b85e41 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev
Browse files
Options

Updated openldap to 2.4.50

parent de9df6ec
Hide whitespace changes
Inline Side-by-side
Showing with 72 additions and 4374 deletions
openldap-2.4.47-arm64.patch deleted 100644 → 0
View file @ de9df6ec
This source diff could not be displayed because it is too large. You can view the blob instead.
openldap-2.4.47-consolidated-1.patch → openldap-2.4.50-consolidated-1.patch
View file @ 63b85e41
Submitted by: Bruce Dubbs <bdubbs at linuxfromscratch.org>
Date: 2012-03-26
Initial Package Version: 2.4.40
Upstream Status: BLFS Specific
Origin: Armin K. <krejzi at email dot com> and Debian
Comment: Rediffed by Fernando de Oliveira <famobr at yahoo dot
com dot br> for version 2.4.44 - 2016.02.06
Rediffed by Pierre Labastie <pierre dot labastie at
neuf dot fr> to add mdb backend and slapd.ldif. See
ticket #7394 - 2016.02.24
Description: Consolidate earlier patches to:
1. Update various installation options, such as ldap database path,
configuration file options, slapd install location, etc.
2. Remove reference to bdb module
3. Enables symbol versioning in ldap libraries. Without these changes
some applications might generate a warning about missing symbol versions.
diff -Naur openldap-2.4.40.orig/build/openldap.m4 openldap-2.4.40/build/openldap.m4
--- openldap-2.4.40.orig/build/openldap.m4 2014-09-18 20:48:49.000000000 -0500
+++ openldap-2.4.40/build/openldap.m4 2015-03-26 15:37:39.801077750 -0500
@@ -1142,3 +1142,54 @@
diff -uNr openldap-2.4.50/build/openldap.m4 openldap-2.4.50-consolidated-1/build/openldap.m4
--- openldap-2.4.50/build/openldap.m4 2020-04-28 23:35:54.000000000 +0930
+++ openldap-2.4.50-consolidated-1/build/openldap.m4 2021-07-27 09:50:38.788688432 +0930
@@ -1115,3 +1115,54 @@
#endif
], [ol_cv_ssl_crl_compat=yes], [ol_cv_ssl_crl_compat=no])])
])
......@@ -73,9 +56,9 @@ diff -Naur openldap-2.4.40.orig/build/openldap.m4 openldap-2.4.40/build/openldap
+ ol_cv_ld_version_script_option=no
+fi
+rm -f conftest*])])
diff -Naur openldap-2.4.40.orig/build/top.mk openldap-2.4.40/build/top.mk
--- openldap-2.4.40.orig/build/top.mk 2014-09-18 20:48:49.000000000 -0500
+++ openldap-2.4.40/build/top.mk 2015-03-26 15:37:39.801077750 -0500
diff -uNr openldap-2.4.50/build/top.mk openldap-2.4.50-consolidated-1/build/top.mk
--- openldap-2.4.50/build/top.mk 2020-04-28 23:35:54.000000000 +0930
+++ openldap-2.4.50-consolidated-1/build/top.mk 2021-07-27 09:50:38.788688432 +0930
@@ -104,6 +104,9 @@
# LINK_LIBS referenced in library and module link commands.
LINK_LIBS = $(MOD_LIBS) $(@PLAT@_LINK_LIBS)
......@@ -95,10 +78,10 @@ diff -Naur openldap-2.4.40.orig/build/top.mk openldap-2.4.40/build/top.mk
LTCOMPILE_MOD = $(LIBTOOL) $(LTONLY_MOD) --mode=compile \
$(CC) $(LT_CFLAGS) $(LT_CPPFLAGS) $(MOD_DEFS) -c
diff -Naur openldap-2.4.40.orig/configure.in openldap-2.4.40/configure.in
--- openldap-2.4.40.orig/configure.in 2014-09-18 20:48:49.000000000 -0500
+++ openldap-2.4.40/configure.in 2015-03-26 15:37:39.801077750 -0500
@@ -1916,6 +1916,13 @@
diff -uNr openldap-2.4.50/configure.in openldap-2.4.50-consolidated-1/configure.in
--- openldap-2.4.50/configure.in 2020-04-28 23:35:54.000000000 +0930
+++ openldap-2.4.50-consolidated-1/configure.in 2021-07-27 09:50:38.789688435 +0930
@@ -1921,6 +1921,13 @@
fi
AC_SUBST(LTSTATIC)dnl
......@@ -112,9 +95,9 @@ diff -Naur openldap-2.4.40.orig/configure.in openldap-2.4.40/configure.in
dnl ----------------------------------------------------------------
if test $ol_enable_wrappers != no ; then
AC_CHECK_HEADERS(tcpd.h,[
diff -Naur openldap-2.4.40.orig/doc/man/man5/slapd-bdb.5 openldap-2.4.40/doc/man/man5/slapd-bdb.5
--- openldap-2.4.40.orig/doc/man/man5/slapd-bdb.5 2014-09-18 20:48:49.000000000 -0500
+++ openldap-2.4.40/doc/man/man5/slapd-bdb.5 2015-03-26 15:36:59.637464038 -0500
diff -uNr openldap-2.4.50/doc/man/man5/slapd-bdb.5 openldap-2.4.50-consolidated-1/doc/man/man5/slapd-bdb.5
--- openldap-2.4.50/doc/man/man5/slapd-bdb.5 2020-04-28 23:35:54.000000000 +0930
+++ openldap-2.4.50-consolidated-1/doc/man/man5/slapd-bdb.5 2021-07-27 09:50:38.789688435 +0930
@@ -135,7 +135,7 @@
associated indexes live.
A separate directory must be specified for each database.
......@@ -124,22 +107,10 @@ diff -Naur openldap-2.4.40.orig/doc/man/man5/slapd-bdb.5 openldap-2.4.40/doc/man
.TP
.B dirtyread
Allow reads of modified but not yet committed data.
diff -Naur openldap-2.4.40.orig/doc/man/man5/slapd-config.5 openldap-2.4.40/doc/man/man5/slapd-config.5
--- openldap-2.4.40.orig/doc/man/man5/slapd-config.5 2014-09-18 20:48:49.000000000 -0500
+++ openldap-2.4.40/doc/man/man5/slapd-config.5 2015-03-26 15:36:59.638464004 -0500
@@ -2051,7 +2051,7 @@
# The database directory MUST exist prior to
# running slapd AND should only be accessible
# by the slapd/tools. Mode 0700 recommended.
-olcDbDirectory: LOCALSTATEDIR/openldap\-data
+olcDbDirectory: LOCALSTATEDIR/lib/openldap
# Indices to maintain
olcDbIndex: objectClass eq
olcDbIndex: cn,sn,mail pres,eq,approx,sub
diff -Naur openldap-2.4.40.orig/doc/man/man5/slapd.conf.5 openldap-2.4.40/doc/man/man5/slapd.conf.5
--- openldap-2.4.40.orig/doc/man/man5/slapd.conf.5 2014-09-18 20:48:49.000000000 -0500
+++ openldap-2.4.40/doc/man/man5/slapd.conf.5 2015-03-26 15:36:59.638464004 -0500
@@ -2021,7 +2021,7 @@
diff -uNr openldap-2.4.50/doc/man/man5/slapd.conf.5 openldap-2.4.50-consolidated-1/doc/man/man5/slapd.conf.5
--- openldap-2.4.50/doc/man/man5/slapd.conf.5 2020-04-28 23:35:54.000000000 +0930
+++ openldap-2.4.50-consolidated-1/doc/man/man5/slapd.conf.5 2021-07-27 09:50:38.789688435 +0930
@@ -2037,7 +2037,7 @@
# The database directory MUST exist prior to
# running slapd AND should only be accessible
# by the slapd/tools. Mode 0700 recommended.
......@@ -148,9 +119,21 @@ diff -Naur openldap-2.4.40.orig/doc/man/man5/slapd.conf.5 openldap-2.4.40/doc/ma
# Indices to maintain
index objectClass eq
index cn,sn,mail pres,eq,approx,sub
diff -Naur openldap-2.4.40.orig/include/ldap_defaults.h openldap-2.4.40/include/ldap_defaults.h
--- openldap-2.4.40.orig/include/ldap_defaults.h 2014-09-18 20:48:49.000000000 -0500
+++ openldap-2.4.40/include/ldap_defaults.h 2015-03-26 15:36:59.638464004 -0500
diff -uNr openldap-2.4.50/doc/man/man5/slapd-config.5 openldap-2.4.50-consolidated-1/doc/man/man5/slapd-config.5
--- openldap-2.4.50/doc/man/man5/slapd-config.5 2020-04-28 23:35:54.000000000 +0930
+++ openldap-2.4.50-consolidated-1/doc/man/man5/slapd-config.5 2021-07-27 09:50:38.789688435 +0930
@@ -2067,7 +2067,7 @@
# The database directory MUST exist prior to
# running slapd AND should only be accessible
# by the slapd/tools. Mode 0700 recommended.
-olcDbDirectory: LOCALSTATEDIR/openldap\-data
+olcDbDirectory: LOCALSTATEDIR/lib/openldap
# Indices to maintain
olcDbIndex: objectClass eq
olcDbIndex: cn,sn,mail pres,eq,approx,sub
diff -uNr openldap-2.4.50/include/ldap_defaults.h openldap-2.4.50-consolidated-1/include/ldap_defaults.h
--- openldap-2.4.50/include/ldap_defaults.h 2020-04-28 23:35:54.000000000 +0930
+++ openldap-2.4.50-consolidated-1/include/ldap_defaults.h 2021-07-27 09:50:38.789688435 +0930
@@ -39,7 +39,7 @@
#define LDAP_ENV_PREFIX "LDAP"
......@@ -169,9 +152,21 @@ diff -Naur openldap-2.4.40.orig/include/ldap_defaults.h openldap-2.4.40/include/
#define SLAPD_DEFAULT_DB_MODE 0600
#define SLAPD_DEFAULT_UCDATA LDAP_DATADIR LDAP_DIRSEP "ucdata"
/* default max deref depth for aliases */
diff -Naur openldap-2.4.40.orig/libraries/liblber/Makefile.in openldap-2.4.40/libraries/liblber/Makefile.in
--- openldap-2.4.40.orig/libraries/liblber/Makefile.in 2014-09-18 20:48:49.000000000 -0500
+++ openldap-2.4.40/libraries/liblber/Makefile.in 2015-03-26 15:37:39.801077750 -0500
diff -uNr openldap-2.4.50/libraries/liblber/liblber.map openldap-2.4.50-consolidated-1/libraries/liblber/liblber.map
--- openldap-2.4.50/libraries/liblber/liblber.map 1970-01-01 09:30:00.000000000 +0930
+++ openldap-2.4.50-consolidated-1/libraries/liblber/liblber.map 2021-07-27 09:50:38.790688438 +0930
@@ -0,0 +1,8 @@
+OPENLDAP_2.4_2 {
+ global:
+ ber_*;
+ der_alloc;
+ lutil_*;
+ local:
+ *;
+};
diff -uNr openldap-2.4.50/libraries/liblber/Makefile.in openldap-2.4.50-consolidated-1/libraries/liblber/Makefile.in
--- openldap-2.4.50/libraries/liblber/Makefile.in 2020-04-28 23:35:54.000000000 +0930
+++ openldap-2.4.50-consolidated-1/libraries/liblber/Makefile.in 2021-07-27 09:50:38.790688438 +0930
@@ -38,6 +38,9 @@
XXLIBS =
NT_LINK_LIBS = $(AC_LIBS)
......@@ -190,21 +185,20 @@ diff -Naur openldap-2.4.40.orig/libraries/liblber/Makefile.in openldap-2.4.40/li
+ $(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir)
$(LTFINISH) $(DESTDIR)$(libdir)
diff -Naur openldap-2.4.40.orig/libraries/liblber/liblber.map openldap-2.4.40/libraries/liblber/liblber.map
--- openldap-2.4.40.orig/libraries/liblber/liblber.map 1969-12-31 18:00:00.000000000 -0600
+++ openldap-2.4.40/libraries/liblber/liblber.map 2015-03-26 15:37:39.801077750 -0500
@@ -0,0 +1,8 @@
diff -uNr openldap-2.4.50/libraries/libldap/libldap.map openldap-2.4.50-consolidated-1/libraries/libldap/libldap.map
--- openldap-2.4.50/libraries/libldap/libldap.map 1970-01-01 09:30:00.000000000 +0930
+++ openldap-2.4.50-consolidated-1/libraries/libldap/libldap.map 2021-07-27 09:50:38.790688438 +0930
@@ -0,0 +1,7 @@
+OPENLDAP_2.4_2 {
+ global:
+ ber_*;
+ der_alloc;
+ lutil_*;
+ ldap_*;
+ ldif_*;
+ local:
+ *;
+};
diff -Naur openldap-2.4.40.orig/libraries/libldap/Makefile.in openldap-2.4.40/libraries/libldap/Makefile.in
--- openldap-2.4.40.orig/libraries/libldap/Makefile.in 2014-09-18 20:48:49.000000000 -0500
+++ openldap-2.4.40/libraries/libldap/Makefile.in 2015-03-26 15:37:39.802077716 -0500
diff -uNr openldap-2.4.50/libraries/libldap/Makefile.in openldap-2.4.50-consolidated-1/libraries/libldap/Makefile.in
--- openldap-2.4.50/libraries/libldap/Makefile.in 2020-04-28 23:35:54.000000000 +0930
+++ openldap-2.4.50-consolidated-1/libraries/libldap/Makefile.in 2021-07-27 09:50:38.790688438 +0930
@@ -52,6 +52,9 @@
XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS)
NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
......@@ -224,20 +218,9 @@ diff -Naur openldap-2.4.40.orig/libraries/libldap/Makefile.in openldap-2.4.40/li
$(LTFINISH) $(DESTDIR)$(libdir)
-$(MKDIR) $(DESTDIR)$(sysconfdir)
@for i in $(CFFILES); do \
diff -Naur openldap-2.4.40.orig/libraries/libldap/libldap.map openldap-2.4.40/libraries/libldap/libldap.map
--- openldap-2.4.40.orig/libraries/libldap/libldap.map 1969-12-31 18:00:00.000000000 -0600
+++ openldap-2.4.40/libraries/libldap/libldap.map 2015-03-26 15:37:39.802077716 -0500
@@ -0,0 +1,7 @@
+OPENLDAP_2.4_2 {
+ global:
+ ldap_*;
+ ldif_*;
+ local:
+ *;
+};
diff -Naur openldap-2.4.40.orig/libraries/libldap_r/Makefile.in openldap-2.4.40/libraries/libldap_r/Makefile.in
--- openldap-2.4.40.orig/libraries/libldap_r/Makefile.in 2014-09-18 20:48:49.000000000 -0500
+++ openldap-2.4.40/libraries/libldap_r/Makefile.in 2015-03-26 15:37:39.802077716 -0500
diff -uNr openldap-2.4.50/libraries/libldap_r/Makefile.in openldap-2.4.50-consolidated-1/libraries/libldap_r/Makefile.in
--- openldap-2.4.50/libraries/libldap_r/Makefile.in 2020-04-28 23:35:54.000000000 +0930
+++ openldap-2.4.50-consolidated-1/libraries/libldap_r/Makefile.in 2021-07-27 09:50:38.790688438 +0930
@@ -61,6 +61,9 @@
XXXLIBS = $(LTHREAD_LIBS)
NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
......@@ -256,9 +239,9 @@ diff -Naur openldap-2.4.40.orig/libraries/libldap_r/Makefile.in openldap-2.4.40/
+ $(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir)
$(LTFINISH) $(DESTDIR)$(libdir)
diff -Naur openldap-2.4.40.orig/servers/slapd/Makefile.in openldap-2.4.40/servers/slapd/Makefile.in
--- openldap-2.4.40.orig/servers/slapd/Makefile.in 2014-09-18 20:48:49.000000000 -0500
+++ openldap-2.4.40/servers/slapd/Makefile.in 2015-03-26 15:36:59.639463969 -0500
diff -uNr openldap-2.4.50/servers/slapd/Makefile.in openldap-2.4.50-consolidated-1/servers/slapd/Makefile.in
--- openldap-2.4.50/servers/slapd/Makefile.in 2020-04-28 23:35:54.000000000 +0930
+++ openldap-2.4.50-consolidated-1/servers/slapd/Makefile.in 2021-07-27 09:50:38.790688438 +0930
@@ -376,10 +376,10 @@
install-conf install-dbc-maybe install-schema install-tools
......@@ -292,9 +275,9 @@ diff -Naur openldap-2.4.40.orig/servers/slapd/Makefile.in openldap-2.4.40/server
+ $(LN_S) -f $(DESTDIR)$(sbindir)/slapd$(EXEEXT) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \
done
diff -Naur openldap-2.4.44.orig/servers/slapd/slapd.conf openldap-2.4.44/servers/slapd/slapd.conf
--- openldap-2.4.44.orig/servers/slapd/slapd.conf 2016-02-06 00:57:45.000000000 +0100
+++ openldap-2.4.44/servers/slapd/slapd.conf 2016-02-22 23:01:47.681372594 +0100
diff -uNr openldap-2.4.50/servers/slapd/slapd.conf openldap-2.4.50-consolidated-1/servers/slapd/slapd.conf
--- openldap-2.4.50/servers/slapd/slapd.conf 2020-04-28 23:35:54.000000000 +0930
+++ openldap-2.4.50-consolidated-1/servers/slapd/slapd.conf 2021-07-27 09:50:38.790688438 +0930
@@ -10,12 +10,12 @@
# service AND an understanding of referrals.
#referral ldap://root.openldap.org
......@@ -320,9 +303,9 @@ diff -Naur openldap-2.4.44.orig/servers/slapd/slapd.conf openldap-2.4.44/servers
+directory %LOCALSTATEDIR%/lib/openldap
# Indices to maintain
index objectClass eq
diff -Naur openldap-2.4.44.orig/servers/slapd/slapd.ldif openldap-2.4.44/servers/slapd/slapd.ldif
--- openldap-2.4.44.orig/servers/slapd/slapd.ldif 2016-02-06 00:57:45.000000000 +0100
+++ openldap-2.4.44/servers/slapd/slapd.ldif 2016-02-22 22:59:57.824364446 +0100
diff -uNr openldap-2.4.50/servers/slapd/slapd.ldif openldap-2.4.50-consolidated-1/servers/slapd/slapd.ldif
--- openldap-2.4.50/servers/slapd/slapd.ldif 2020-04-28 23:35:54.000000000 +0930
+++ openldap-2.4.50-consolidated-1/servers/slapd/slapd.ldif 2021-07-27 09:50:38.790688438 +0930
@@ -9,8 +9,8 @@
#
# Define global ACLs to disable default read access.
......@@ -358,9 +341,9 @@ diff -Naur openldap-2.4.44.orig/servers/slapd/slapd.ldif openldap-2.4.44/servers
+olcDbDirectory: %LOCALSTATEDIR%/lib/openldap
# Indices to maintain
olcDbIndex: objectClass eq
diff -Naur openldap-2.4.40.orig/servers/slapd/slapi/Makefile.in openldap-2.4.40/servers/slapd/slapi/Makefile.in
--- openldap-2.4.40.orig/servers/slapd/slapi/Makefile.in 2014-09-18 20:48:49.000000000 -0500
+++ openldap-2.4.40/servers/slapd/slapi/Makefile.in 2015-03-26 15:36:59.639463969 -0500
diff -uNr openldap-2.4.50/servers/slapd/slapi/Makefile.in openldap-2.4.50-consolidated-1/servers/slapd/slapi/Makefile.in
--- openldap-2.4.50/servers/slapd/slapi/Makefile.in 2020-04-28 23:35:54.000000000 +0930
+++ openldap-2.4.50-consolidated-1/servers/slapd/slapi/Makefile.in 2021-07-27 09:50:38.790688438 +0930
@@ -46,6 +46,6 @@
install-local: FORCE
if test "$(BUILD_MOD)" = "yes"; then \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment