wok-next diff openldap/stuff/patches/openldap-2.4.44-consolidated-2.patch @ rev 19741
Many random packages update/upgrade.
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Mon Jun 05 16:48:55 2017 +0300 (2017-06-05) |
| parents | |
| children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/openldap/stuff/patches/openldap-2.4.44-consolidated-2.patch Mon Jun 05 16:48:55 2017 +0300 1.3 @@ -0,0 +1,371 @@ 1.4 +Submitted by: Bruce Dubbs <bdubbs at linuxfromscratch.org> 1.5 +Date: 2012-03-26 1.6 +Initial Package Version: 2.4.40 1.7 +Upstream Status: BLFS Specific 1.8 +Origin: Armin K. <krejzi at email dot com> and Debian 1.9 +Comment: Rediffed by Fernando de Oliveira <famobr at yahoo dot 1.10 + com dot br> for version 2.4.44 - 2016.02.06 1.11 + Rediffed by Pierre Labastie <pierre dot labastie at 1.12 + neuf dot fr> to add mdb backend and slapd.ldif. See 1.13 + ticket #7394 - 2016.02.24 1.14 +Description: Consolidate earlier patches to: 1.15 + 1. Update various installation options, such as ldap database path, 1.16 + configuration file options, slapd install location, etc. 1.17 + 2. Remove reference to bdb module 1.18 + 3. Enables symbol versioning in ldap libraries. Without these changes 1.19 + some applications might generate a warning about missing symbol versions. 1.20 + 1.21 +diff -Naur openldap-2.4.40.orig/build/openldap.m4 openldap-2.4.40/build/openldap.m4 1.22 +--- openldap-2.4.40.orig/build/openldap.m4 2014-09-18 20:48:49.000000000 -0500 1.23 ++++ openldap-2.4.40/build/openldap.m4 2015-03-26 15:37:39.801077750 -0500 1.24 +@@ -1142,3 +1142,54 @@ 1.25 + #endif 1.26 + ], [ol_cv_ssl_crl_compat=yes], [ol_cv_ssl_crl_compat=no])]) 1.27 + ]) 1.28 ++ 1.29 ++dnl ==================================================================== 1.30 ++dnl check for symbol versioning support 1.31 ++AC_DEFUN([OL_SYMBOL_VERSIONING], 1.32 ++[AC_CACHE_CHECK([for .symver assembler directive], 1.33 ++ [ol_cv_asm_symver_directive],[ 1.34 ++cat > conftest.s <<EOF 1.35 ++${libc_cv_dot_text} 1.36 ++_sym: 1.37 ++.symver _sym,sym@VERS 1.38 ++EOF 1.39 ++if ${CC-cc} -c $ASFLAGS conftest.s 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then 1.40 ++ ol_cv_asm_symver_directive=yes 1.41 ++else 1.42 ++ ol_cv_asm_symver_directive=no 1.43 ++fi 1.44 ++rm -f conftest*]) 1.45 ++AC_CACHE_CHECK([for ld --version-script], 1.46 ++ [ol_cv_ld_version_script_option],[ 1.47 ++if test $ol_cv_asm_symver_directive = yes; then 1.48 ++ cat > conftest.s <<EOF 1.49 ++${libc_cv_dot_text} 1.50 ++_sym: 1.51 ++.symver _sym,sym@VERS 1.52 ++EOF 1.53 ++ cat > conftest.map <<EOF 1.54 ++VERS_1 { 1.55 ++ global: sym; 1.56 ++}; 1.57 ++ 1.58 ++VERS_2 { 1.59 ++ global: sym; 1.60 ++} VERS_1; 1.61 ++EOF 1.62 ++ if ${CC-cc} -c $ASFLAGS conftest.s 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then 1.63 ++ if AC_TRY_COMMAND([${CC-cc} $CFLAGS $LDFLAGS -shared 1.64 ++ -o conftest.so conftest.o 1.65 ++ -Wl,--version-script,conftest.map 1.66 ++ 1>&AS_MESSAGE_LOG_FD]); 1.67 ++ then 1.68 ++ ol_cv_ld_version_script_option=yes 1.69 ++ else 1.70 ++ ol_cv_ld_version_script_option=no 1.71 ++ fi 1.72 ++ else 1.73 ++ ol_cv_ld_version_script_option=no 1.74 ++ fi 1.75 ++else 1.76 ++ ol_cv_ld_version_script_option=no 1.77 ++fi 1.78 ++rm -f conftest*])]) 1.79 +diff -Naur openldap-2.4.40.orig/build/top.mk openldap-2.4.40/build/top.mk 1.80 +--- openldap-2.4.40.orig/build/top.mk 2014-09-18 20:48:49.000000000 -0500 1.81 ++++ openldap-2.4.40/build/top.mk 2015-03-26 15:37:39.801077750 -0500 1.82 +@@ -104,6 +104,9 @@ 1.83 + # LINK_LIBS referenced in library and module link commands. 1.84 + LINK_LIBS = $(MOD_LIBS) $(@PLAT@_LINK_LIBS) 1.85 + 1.86 ++# option to pass to $(CC) to support library symbol versioning, if any 1.87 ++VERSION_OPTION = @VERSION_OPTION@ 1.88 ++ 1.89 + LTSTATIC = @LTSTATIC@ 1.90 + 1.91 + LTLINK = $(LIBTOOL) --mode=link \ 1.92 +@@ -113,7 +116,7 @@ 1.93 + $(CC) $(LT_CFLAGS) $(LT_CPPFLAGS) $(LIB_DEFS) -c 1.94 + 1.95 + LTLINK_LIB = $(LIBTOOL) $(LTONLY_LIB) --mode=link \ 1.96 +- $(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_LIB) 1.97 ++ $(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_LIB) $(VERSION_FLAGS) 1.98 + 1.99 + LTCOMPILE_MOD = $(LIBTOOL) $(LTONLY_MOD) --mode=compile \ 1.100 + $(CC) $(LT_CFLAGS) $(LT_CPPFLAGS) $(MOD_DEFS) -c 1.101 +diff -Naur openldap-2.4.40.orig/configure.in openldap-2.4.40/configure.in 1.102 +--- openldap-2.4.40.orig/configure.in 2014-09-18 20:48:49.000000000 -0500 1.103 ++++ openldap-2.4.40/configure.in 2015-03-26 15:37:39.801077750 -0500 1.104 +@@ -1916,6 +1916,13 @@ 1.105 + fi 1.106 + AC_SUBST(LTSTATIC)dnl 1.107 + 1.108 ++VERSION_OPTION="" 1.109 ++OL_SYMBOL_VERSIONING 1.110 ++if test $ol_cv_ld_version_script_option = yes ; then 1.111 ++ VERSION_OPTION="-Wl,--version-script=" 1.112 ++fi 1.113 ++AC_SUBST(VERSION_OPTION) 1.114 ++ 1.115 + dnl ---------------------------------------------------------------- 1.116 + if test $ol_enable_wrappers != no ; then 1.117 + AC_CHECK_HEADERS(tcpd.h,[ 1.118 +diff -Naur openldap-2.4.40.orig/doc/man/man5/slapd-bdb.5 openldap-2.4.40/doc/man/man5/slapd-bdb.5 1.119 +--- openldap-2.4.40.orig/doc/man/man5/slapd-bdb.5 2014-09-18 20:48:49.000000000 -0500 1.120 ++++ openldap-2.4.40/doc/man/man5/slapd-bdb.5 2015-03-26 15:36:59.637464038 -0500 1.121 +@@ -135,7 +135,7 @@ 1.122 + associated indexes live. 1.123 + A separate directory must be specified for each database. 1.124 + The default is 1.125 +-.BR LOCALSTATEDIR/openldap\-data . 1.126 ++.BR LOCALSTATEDIR/lib/openldap . 1.127 + .TP 1.128 + .B dirtyread 1.129 + Allow reads of modified but not yet committed data. 1.130 +diff -Naur openldap-2.4.40.orig/doc/man/man5/slapd-config.5 openldap-2.4.40/doc/man/man5/slapd-config.5 1.131 +--- openldap-2.4.40.orig/doc/man/man5/slapd-config.5 2014-09-18 20:48:49.000000000 -0500 1.132 ++++ openldap-2.4.40/doc/man/man5/slapd-config.5 2015-03-26 15:36:59.638464004 -0500 1.133 +@@ -2051,7 +2051,7 @@ 1.134 + # The database directory MUST exist prior to 1.135 + # running slapd AND should only be accessible 1.136 + # by the slapd/tools. Mode 0700 recommended. 1.137 +-olcDbDirectory: LOCALSTATEDIR/openldap\-data 1.138 ++olcDbDirectory: LOCALSTATEDIR/lib/openldap 1.139 + # Indices to maintain 1.140 + olcDbIndex: objectClass eq 1.141 + olcDbIndex: cn,sn,mail pres,eq,approx,sub 1.142 +diff -Naur openldap-2.4.40.orig/doc/man/man5/slapd.conf.5 openldap-2.4.40/doc/man/man5/slapd.conf.5 1.143 +--- openldap-2.4.40.orig/doc/man/man5/slapd.conf.5 2014-09-18 20:48:49.000000000 -0500 1.144 ++++ openldap-2.4.40/doc/man/man5/slapd.conf.5 2015-03-26 15:36:59.638464004 -0500 1.145 +@@ -2021,7 +2021,7 @@ 1.146 + # The database directory MUST exist prior to 1.147 + # running slapd AND should only be accessible 1.148 + # by the slapd/tools. Mode 0700 recommended. 1.149 +-directory LOCALSTATEDIR/openldap\-data 1.150 ++directory LOCALSTATEDIR/lib/openldap 1.151 + # Indices to maintain 1.152 + index objectClass eq 1.153 + index cn,sn,mail pres,eq,approx,sub 1.154 +diff -Naur openldap-2.4.40.orig/include/ldap_defaults.h openldap-2.4.40/include/ldap_defaults.h 1.155 +--- openldap-2.4.40.orig/include/ldap_defaults.h 2014-09-18 20:48:49.000000000 -0500 1.156 ++++ openldap-2.4.40/include/ldap_defaults.h 2015-03-26 15:36:59.638464004 -0500 1.157 +@@ -39,7 +39,7 @@ 1.158 + #define LDAP_ENV_PREFIX "LDAP" 1.159 + 1.160 + /* default ldapi:// socket */ 1.161 +-#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi" 1.162 ++#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi" 1.163 + 1.164 + /* 1.165 + * SLAPD DEFINITIONS 1.166 +@@ -47,7 +47,7 @@ 1.167 + /* location of the default slapd config file */ 1.168 + #define SLAPD_DEFAULT_CONFIGFILE LDAP_SYSCONFDIR LDAP_DIRSEP "slapd.conf" 1.169 + #define SLAPD_DEFAULT_CONFIGDIR LDAP_SYSCONFDIR LDAP_DIRSEP "slapd.d" 1.170 +-#define SLAPD_DEFAULT_DB_DIR LDAP_RUNDIR LDAP_DIRSEP "openldap-data" 1.171 ++#define SLAPD_DEFAULT_DB_DIR LDAP_RUNDIR LDAP_DIRSEP "lib" LDAP_DIRSEP "openldap" 1.172 + #define SLAPD_DEFAULT_DB_MODE 0600 1.173 + #define SLAPD_DEFAULT_UCDATA LDAP_DATADIR LDAP_DIRSEP "ucdata" 1.174 + /* default max deref depth for aliases */ 1.175 +diff -Naur openldap-2.4.40.orig/libraries/liblber/Makefile.in openldap-2.4.40/libraries/liblber/Makefile.in 1.176 +--- openldap-2.4.40.orig/libraries/liblber/Makefile.in 2014-09-18 20:48:49.000000000 -0500 1.177 ++++ openldap-2.4.40/libraries/liblber/Makefile.in 2015-03-26 15:37:39.801077750 -0500 1.178 +@@ -38,6 +38,9 @@ 1.179 + XXLIBS = 1.180 + NT_LINK_LIBS = $(AC_LIBS) 1.181 + UNIX_LINK_LIBS = $(AC_LIBS) 1.182 ++ifneq (,$(VERSION_OPTION)) 1.183 ++ VERSION_FLAGS = "$(VERSION_OPTION)$(srcdir)/liblber.map" 1.184 ++endif 1.185 + 1.186 + dtest: $(XLIBS) dtest.o 1.187 + $(LTLINK) -o $@ dtest.o $(LIBS) 1.188 +@@ -48,6 +51,6 @@ 1.189 + 1.190 + install-local: FORCE 1.191 + -$(MKDIR) $(DESTDIR)$(libdir) 1.192 +- $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir) 1.193 ++ $(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir) 1.194 + $(LTFINISH) $(DESTDIR)$(libdir) 1.195 + 1.196 +diff -Naur openldap-2.4.40.orig/libraries/liblber/liblber.map openldap-2.4.40/libraries/liblber/liblber.map 1.197 +--- openldap-2.4.40.orig/libraries/liblber/liblber.map 1969-12-31 18:00:00.000000000 -0600 1.198 ++++ openldap-2.4.40/libraries/liblber/liblber.map 2015-03-26 15:37:39.801077750 -0500 1.199 +@@ -0,0 +1,8 @@ 1.200 ++OPENLDAP_2.4_2 { 1.201 ++ global: 1.202 ++ ber_*; 1.203 ++ der_alloc; 1.204 ++ lutil_*; 1.205 ++ local: 1.206 ++ *; 1.207 ++}; 1.208 +diff -Naur openldap-2.4.40.orig/libraries/libldap/Makefile.in openldap-2.4.40/libraries/libldap/Makefile.in 1.209 +--- openldap-2.4.40.orig/libraries/libldap/Makefile.in 2014-09-18 20:48:49.000000000 -0500 1.210 ++++ openldap-2.4.40/libraries/libldap/Makefile.in 2015-03-26 15:37:39.802077716 -0500 1.211 +@@ -52,6 +52,9 @@ 1.212 + XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS) 1.213 + NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) 1.214 + UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) 1.215 ++ifneq (,$(VERSION_OPTION)) 1.216 ++ VERSION_FLAGS = $(VERSION_OPTION)$(srcdir)/libldap.map 1.217 ++endif 1.218 + 1.219 + apitest: $(XLIBS) apitest.o 1.220 + $(LTLINK) -o $@ apitest.o $(LIBS) 1.221 +@@ -68,7 +71,7 @@ 1.222 + 1.223 + install-local: $(CFFILES) FORCE 1.224 + -$(MKDIR) $(DESTDIR)$(libdir) 1.225 +- $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir) 1.226 ++ $(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir) 1.227 + $(LTFINISH) $(DESTDIR)$(libdir) 1.228 + -$(MKDIR) $(DESTDIR)$(sysconfdir) 1.229 + @for i in $(CFFILES); do \ 1.230 +diff -Naur openldap-2.4.40.orig/libraries/libldap/libldap.map openldap-2.4.40/libraries/libldap/libldap.map 1.231 +--- openldap-2.4.40.orig/libraries/libldap/libldap.map 1969-12-31 18:00:00.000000000 -0600 1.232 ++++ openldap-2.4.40/libraries/libldap/libldap.map 2015-03-26 15:37:39.802077716 -0500 1.233 +@@ -0,0 +1,7 @@ 1.234 ++OPENLDAP_2.4_2 { 1.235 ++ global: 1.236 ++ ldap_*; 1.237 ++ ldif_*; 1.238 ++ local: 1.239 ++ *; 1.240 ++}; 1.241 +diff -Naur openldap-2.4.40.orig/libraries/libldap_r/Makefile.in openldap-2.4.40/libraries/libldap_r/Makefile.in 1.242 +--- openldap-2.4.40.orig/libraries/libldap_r/Makefile.in 2014-09-18 20:48:49.000000000 -0500 1.243 ++++ openldap-2.4.40/libraries/libldap_r/Makefile.in 2015-03-26 15:37:39.802077716 -0500 1.244 +@@ -61,6 +61,9 @@ 1.245 + XXXLIBS = $(LTHREAD_LIBS) 1.246 + NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) 1.247 + UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) $(LTHREAD_LIBS) 1.248 ++ifneq (,$(VERSION_OPTION)) 1.249 ++ VERSION_FLAGS = "$(VERSION_OPTION)$(XXDIR)/libldap.map" 1.250 ++endif 1.251 + 1.252 + .links : Makefile 1.253 + @for i in $(XXSRCS); do \ 1.254 +@@ -83,6 +86,6 @@ 1.255 + 1.256 + install-local: $(CFFILES) FORCE 1.257 + -$(MKDIR) $(DESTDIR)$(libdir) 1.258 +- $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir) 1.259 ++ $(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir) 1.260 + $(LTFINISH) $(DESTDIR)$(libdir) 1.261 + 1.262 +diff -Naur openldap-2.4.40.orig/servers/slapd/Makefile.in openldap-2.4.40/servers/slapd/Makefile.in 1.263 +--- openldap-2.4.40.orig/servers/slapd/Makefile.in 2014-09-18 20:48:49.000000000 -0500 1.264 ++++ openldap-2.4.40/servers/slapd/Makefile.in 2015-03-26 15:36:59.639463969 -0500 1.265 +@@ -376,10 +376,10 @@ 1.266 + install-conf install-dbc-maybe install-schema install-tools 1.267 + 1.268 + install-slapd: FORCE 1.269 +- -$(MKDIR) $(DESTDIR)$(libexecdir) 1.270 ++ -$(MKDIR) $(DESTDIR)$(sbindir) 1.271 + -$(MKDIR) $(DESTDIR)$(localstatedir)/run 1.272 + $(LTINSTALL) $(INSTALLFLAGS) $(STRIP) -m 755 \ 1.273 +- slapd$(EXEEXT) $(DESTDIR)$(libexecdir) 1.274 ++ slapd$(EXEEXT) $(DESTDIR)$(sbindir) 1.275 + @for i in $(SUBDIRS); do \ 1.276 + if test -d $$i && test -f $$i/Makefile ; then \ 1.277 + echo; echo " cd $$i; $(MAKE) $(MFLAGS) install"; \ 1.278 +@@ -445,9 +445,9 @@ 1.279 + 1.280 + install-db-config: FORCE 1.281 + @-$(MKDIR) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir) 1.282 +- @-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/openldap-data 1.283 ++ @-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/lib/openldap 1.284 + $(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \ 1.285 +- $(DESTDIR)$(localstatedir)/openldap-data/DB_CONFIG.example 1.286 ++ $(DESTDIR)$(localstatedir)/lib/openldap/DB_CONFIG.example 1.287 + $(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \ 1.288 + $(DESTDIR)$(sysconfdir)/DB_CONFIG.example 1.289 + 1.290 +@@ -455,6 +455,6 @@ 1.291 + -$(MKDIR) $(DESTDIR)$(sbindir) 1.292 + for i in $(SLAPTOOLS); do \ 1.293 + $(RM) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \ 1.294 +- $(LN_S) -f $(DESTDIR)$(libexecdir)/slapd$(EXEEXT) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \ 1.295 ++ $(LN_S) -f $(DESTDIR)$(sbindir)/slapd$(EXEEXT) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \ 1.296 + done 1.297 + 1.298 +diff -Naur openldap-2.4.44.orig/servers/slapd/slapd.conf openldap-2.4.44/servers/slapd/slapd.conf 1.299 +--- openldap-2.4.44.orig/servers/slapd/slapd.conf 2016-02-06 00:57:45.000000000 +0100 1.300 ++++ openldap-2.4.44/servers/slapd/slapd.conf 2016-02-22 23:01:47.681372594 +0100 1.301 +@@ -10,12 +10,12 @@ 1.302 + # service AND an understanding of referrals. 1.303 + #referral ldap://root.openldap.org 1.304 + 1.305 +-pidfile %LOCALSTATEDIR%/run/slapd.pid 1.306 +-argsfile %LOCALSTATEDIR%/run/slapd.args 1.307 ++pidfile %LOCALSTATEDIR%/run/openldap/slapd.pid 1.308 ++argsfile %LOCALSTATEDIR%/run/openldap/slapd.args 1.309 + 1.310 + # Load dynamic backend modules: 1.311 +-# modulepath %MODULEDIR% 1.312 +-# moduleload back_mdb.la 1.313 ++modulepath %MODULEDIR% 1.314 ++moduleload back_mdb.la 1.315 + # moduleload back_ldap.la 1.316 + 1.317 + # Sample security restrictions 1.318 +@@ -60,6 +60,6 @@ 1.319 + # The database directory MUST exist prior to running slapd AND 1.320 + # should only be accessible by the slapd and slap tools. 1.321 + # Mode 700 recommended. 1.322 +-directory %LOCALSTATEDIR%/openldap-data 1.323 ++directory %LOCALSTATEDIR%/lib/openldap 1.324 + # Indices to maintain 1.325 + index objectClass eq 1.326 +diff -Naur openldap-2.4.44.orig/servers/slapd/slapd.ldif openldap-2.4.44/servers/slapd/slapd.ldif 1.327 +--- openldap-2.4.44.orig/servers/slapd/slapd.ldif 2016-02-06 00:57:45.000000000 +0100 1.328 ++++ openldap-2.4.44/servers/slapd/slapd.ldif 2016-02-22 22:59:57.824364446 +0100 1.329 +@@ -9,8 +9,8 @@ 1.330 + # 1.331 + # Define global ACLs to disable default read access. 1.332 + # 1.333 +-olcArgsFile: %LOCALSTATEDIR%/run/slapd.args 1.334 +-olcPidFile: %LOCALSTATEDIR%/run/slapd.pid 1.335 ++olcArgsFile: %LOCALSTATEDIR%/run/openldap/slapd.args 1.336 ++olcPidFile: %LOCALSTATEDIR%/run/openldap/slapd.pid 1.337 + # 1.338 + # Do not enable referrals until AFTER you have a working directory 1.339 + # service AND an understanding of referrals. 1.340 +@@ -26,10 +26,11 @@ 1.341 + # 1.342 + # Load dynamic backend modules: 1.343 + # 1.344 +-#dn: cn=module,cn=config 1.345 +-#objectClass: olcModuleList 1.346 +-#cn: module 1.347 +-#olcModulepath: %MODULEDIR% 1.348 ++dn: cn=module,cn=config 1.349 ++objectClass: olcModuleList 1.350 ++cn: module 1.351 ++olcModulepath: %MODULEDIR% 1.352 ++olcModuleload: back_mdb.la 1.353 + #olcModuleload: back_bdb.la 1.354 + #olcModuleload: back_hdb.la 1.355 + #olcModuleload: back_ldap.la 1.356 +@@ -90,6 +91,6 @@ 1.357 + # The database directory MUST exist prior to running slapd AND 1.358 + # should only be accessible by the slapd and slap tools. 1.359 + # Mode 700 recommended. 1.360 +-olcDbDirectory: %LOCALSTATEDIR%/openldap-data 1.361 ++olcDbDirectory: %LOCALSTATEDIR%/lib/openldap 1.362 + # Indices to maintain 1.363 + olcDbIndex: objectClass eq 1.364 +diff -Naur openldap-2.4.40.orig/servers/slapd/slapi/Makefile.in openldap-2.4.40/servers/slapd/slapi/Makefile.in 1.365 +--- openldap-2.4.40.orig/servers/slapd/slapi/Makefile.in 2014-09-18 20:48:49.000000000 -0500 1.366 ++++ openldap-2.4.40/servers/slapd/slapi/Makefile.in 2015-03-26 15:36:59.639463969 -0500 1.367 +@@ -46,6 +46,6 @@ 1.368 + install-local: FORCE 1.369 + if test "$(BUILD_MOD)" = "yes"; then \ 1.370 + $(MKDIR) $(DESTDIR)$(libdir); \ 1.371 +- $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir); \ 1.372 ++ $(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir); \ 1.373 + fi 1.374 +