wok-next annotate 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
rev   line source
al@19741 1 Submitted by: Bruce Dubbs <bdubbs at linuxfromscratch.org>
al@19741 2 Date: 2012-03-26
al@19741 3 Initial Package Version: 2.4.40
al@19741 4 Upstream Status: BLFS Specific
al@19741 5 Origin: Armin K. <krejzi at email dot com> and Debian
al@19741 6 Comment: Rediffed by Fernando de Oliveira <famobr at yahoo dot
al@19741 7 com dot br> for version 2.4.44 - 2016.02.06
al@19741 8 Rediffed by Pierre Labastie <pierre dot labastie at
al@19741 9 neuf dot fr> to add mdb backend and slapd.ldif. See
al@19741 10 ticket #7394 - 2016.02.24
al@19741 11 Description: Consolidate earlier patches to:
al@19741 12 1. Update various installation options, such as ldap database path,
al@19741 13 configuration file options, slapd install location, etc.
al@19741 14 2. Remove reference to bdb module
al@19741 15 3. Enables symbol versioning in ldap libraries. Without these changes
al@19741 16 some applications might generate a warning about missing symbol versions.
al@19741 17
al@19741 18 diff -Naur openldap-2.4.40.orig/build/openldap.m4 openldap-2.4.40/build/openldap.m4
al@19741 19 --- openldap-2.4.40.orig/build/openldap.m4 2014-09-18 20:48:49.000000000 -0500
al@19741 20 +++ openldap-2.4.40/build/openldap.m4 2015-03-26 15:37:39.801077750 -0500
al@19741 21 @@ -1142,3 +1142,54 @@
al@19741 22 #endif
al@19741 23 ], [ol_cv_ssl_crl_compat=yes], [ol_cv_ssl_crl_compat=no])])
al@19741 24 ])
al@19741 25 +
al@19741 26 +dnl ====================================================================
al@19741 27 +dnl check for symbol versioning support
al@19741 28 +AC_DEFUN([OL_SYMBOL_VERSIONING],
al@19741 29 +[AC_CACHE_CHECK([for .symver assembler directive],
al@19741 30 + [ol_cv_asm_symver_directive],[
al@19741 31 +cat > conftest.s <<EOF
al@19741 32 +${libc_cv_dot_text}
al@19741 33 +_sym:
al@19741 34 +.symver _sym,sym@VERS
al@19741 35 +EOF
al@19741 36 +if ${CC-cc} -c $ASFLAGS conftest.s 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then
al@19741 37 + ol_cv_asm_symver_directive=yes
al@19741 38 +else
al@19741 39 + ol_cv_asm_symver_directive=no
al@19741 40 +fi
al@19741 41 +rm -f conftest*])
al@19741 42 +AC_CACHE_CHECK([for ld --version-script],
al@19741 43 + [ol_cv_ld_version_script_option],[
al@19741 44 +if test $ol_cv_asm_symver_directive = yes; then
al@19741 45 + cat > conftest.s <<EOF
al@19741 46 +${libc_cv_dot_text}
al@19741 47 +_sym:
al@19741 48 +.symver _sym,sym@VERS
al@19741 49 +EOF
al@19741 50 + cat > conftest.map <<EOF
al@19741 51 +VERS_1 {
al@19741 52 + global: sym;
al@19741 53 +};
al@19741 54 +
al@19741 55 +VERS_2 {
al@19741 56 + global: sym;
al@19741 57 +} VERS_1;
al@19741 58 +EOF
al@19741 59 + if ${CC-cc} -c $ASFLAGS conftest.s 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then
al@19741 60 + if AC_TRY_COMMAND([${CC-cc} $CFLAGS $LDFLAGS -shared
al@19741 61 + -o conftest.so conftest.o
al@19741 62 + -Wl,--version-script,conftest.map
al@19741 63 + 1>&AS_MESSAGE_LOG_FD]);
al@19741 64 + then
al@19741 65 + ol_cv_ld_version_script_option=yes
al@19741 66 + else
al@19741 67 + ol_cv_ld_version_script_option=no
al@19741 68 + fi
al@19741 69 + else
al@19741 70 + ol_cv_ld_version_script_option=no
al@19741 71 + fi
al@19741 72 +else
al@19741 73 + ol_cv_ld_version_script_option=no
al@19741 74 +fi
al@19741 75 +rm -f conftest*])])
al@19741 76 diff -Naur openldap-2.4.40.orig/build/top.mk openldap-2.4.40/build/top.mk
al@19741 77 --- openldap-2.4.40.orig/build/top.mk 2014-09-18 20:48:49.000000000 -0500
al@19741 78 +++ openldap-2.4.40/build/top.mk 2015-03-26 15:37:39.801077750 -0500
al@19741 79 @@ -104,6 +104,9 @@
al@19741 80 # LINK_LIBS referenced in library and module link commands.
al@19741 81 LINK_LIBS = $(MOD_LIBS) $(@PLAT@_LINK_LIBS)
al@19741 82
al@19741 83 +# option to pass to $(CC) to support library symbol versioning, if any
al@19741 84 +VERSION_OPTION = @VERSION_OPTION@
al@19741 85 +
al@19741 86 LTSTATIC = @LTSTATIC@
al@19741 87
al@19741 88 LTLINK = $(LIBTOOL) --mode=link \
al@19741 89 @@ -113,7 +116,7 @@
al@19741 90 $(CC) $(LT_CFLAGS) $(LT_CPPFLAGS) $(LIB_DEFS) -c
al@19741 91
al@19741 92 LTLINK_LIB = $(LIBTOOL) $(LTONLY_LIB) --mode=link \
al@19741 93 - $(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_LIB)
al@19741 94 + $(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_LIB) $(VERSION_FLAGS)
al@19741 95
al@19741 96 LTCOMPILE_MOD = $(LIBTOOL) $(LTONLY_MOD) --mode=compile \
al@19741 97 $(CC) $(LT_CFLAGS) $(LT_CPPFLAGS) $(MOD_DEFS) -c
al@19741 98 diff -Naur openldap-2.4.40.orig/configure.in openldap-2.4.40/configure.in
al@19741 99 --- openldap-2.4.40.orig/configure.in 2014-09-18 20:48:49.000000000 -0500
al@19741 100 +++ openldap-2.4.40/configure.in 2015-03-26 15:37:39.801077750 -0500
al@19741 101 @@ -1916,6 +1916,13 @@
al@19741 102 fi
al@19741 103 AC_SUBST(LTSTATIC)dnl
al@19741 104
al@19741 105 +VERSION_OPTION=""
al@19741 106 +OL_SYMBOL_VERSIONING
al@19741 107 +if test $ol_cv_ld_version_script_option = yes ; then
al@19741 108 + VERSION_OPTION="-Wl,--version-script="
al@19741 109 +fi
al@19741 110 +AC_SUBST(VERSION_OPTION)
al@19741 111 +
al@19741 112 dnl ----------------------------------------------------------------
al@19741 113 if test $ol_enable_wrappers != no ; then
al@19741 114 AC_CHECK_HEADERS(tcpd.h,[
al@19741 115 diff -Naur openldap-2.4.40.orig/doc/man/man5/slapd-bdb.5 openldap-2.4.40/doc/man/man5/slapd-bdb.5
al@19741 116 --- openldap-2.4.40.orig/doc/man/man5/slapd-bdb.5 2014-09-18 20:48:49.000000000 -0500
al@19741 117 +++ openldap-2.4.40/doc/man/man5/slapd-bdb.5 2015-03-26 15:36:59.637464038 -0500
al@19741 118 @@ -135,7 +135,7 @@
al@19741 119 associated indexes live.
al@19741 120 A separate directory must be specified for each database.
al@19741 121 The default is
al@19741 122 -.BR LOCALSTATEDIR/openldap\-data .
al@19741 123 +.BR LOCALSTATEDIR/lib/openldap .
al@19741 124 .TP
al@19741 125 .B dirtyread
al@19741 126 Allow reads of modified but not yet committed data.
al@19741 127 diff -Naur openldap-2.4.40.orig/doc/man/man5/slapd-config.5 openldap-2.4.40/doc/man/man5/slapd-config.5
al@19741 128 --- openldap-2.4.40.orig/doc/man/man5/slapd-config.5 2014-09-18 20:48:49.000000000 -0500
al@19741 129 +++ openldap-2.4.40/doc/man/man5/slapd-config.5 2015-03-26 15:36:59.638464004 -0500
al@19741 130 @@ -2051,7 +2051,7 @@
al@19741 131 # The database directory MUST exist prior to
al@19741 132 # running slapd AND should only be accessible
al@19741 133 # by the slapd/tools. Mode 0700 recommended.
al@19741 134 -olcDbDirectory: LOCALSTATEDIR/openldap\-data
al@19741 135 +olcDbDirectory: LOCALSTATEDIR/lib/openldap
al@19741 136 # Indices to maintain
al@19741 137 olcDbIndex: objectClass eq
al@19741 138 olcDbIndex: cn,sn,mail pres,eq,approx,sub
al@19741 139 diff -Naur openldap-2.4.40.orig/doc/man/man5/slapd.conf.5 openldap-2.4.40/doc/man/man5/slapd.conf.5
al@19741 140 --- openldap-2.4.40.orig/doc/man/man5/slapd.conf.5 2014-09-18 20:48:49.000000000 -0500
al@19741 141 +++ openldap-2.4.40/doc/man/man5/slapd.conf.5 2015-03-26 15:36:59.638464004 -0500
al@19741 142 @@ -2021,7 +2021,7 @@
al@19741 143 # The database directory MUST exist prior to
al@19741 144 # running slapd AND should only be accessible
al@19741 145 # by the slapd/tools. Mode 0700 recommended.
al@19741 146 -directory LOCALSTATEDIR/openldap\-data
al@19741 147 +directory LOCALSTATEDIR/lib/openldap
al@19741 148 # Indices to maintain
al@19741 149 index objectClass eq
al@19741 150 index cn,sn,mail pres,eq,approx,sub
al@19741 151 diff -Naur openldap-2.4.40.orig/include/ldap_defaults.h openldap-2.4.40/include/ldap_defaults.h
al@19741 152 --- openldap-2.4.40.orig/include/ldap_defaults.h 2014-09-18 20:48:49.000000000 -0500
al@19741 153 +++ openldap-2.4.40/include/ldap_defaults.h 2015-03-26 15:36:59.638464004 -0500
al@19741 154 @@ -39,7 +39,7 @@
al@19741 155 #define LDAP_ENV_PREFIX "LDAP"
al@19741 156
al@19741 157 /* default ldapi:// socket */
al@19741 158 -#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi"
al@19741 159 +#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi"
al@19741 160
al@19741 161 /*
al@19741 162 * SLAPD DEFINITIONS
al@19741 163 @@ -47,7 +47,7 @@
al@19741 164 /* location of the default slapd config file */
al@19741 165 #define SLAPD_DEFAULT_CONFIGFILE LDAP_SYSCONFDIR LDAP_DIRSEP "slapd.conf"
al@19741 166 #define SLAPD_DEFAULT_CONFIGDIR LDAP_SYSCONFDIR LDAP_DIRSEP "slapd.d"
al@19741 167 -#define SLAPD_DEFAULT_DB_DIR LDAP_RUNDIR LDAP_DIRSEP "openldap-data"
al@19741 168 +#define SLAPD_DEFAULT_DB_DIR LDAP_RUNDIR LDAP_DIRSEP "lib" LDAP_DIRSEP "openldap"
al@19741 169 #define SLAPD_DEFAULT_DB_MODE 0600
al@19741 170 #define SLAPD_DEFAULT_UCDATA LDAP_DATADIR LDAP_DIRSEP "ucdata"
al@19741 171 /* default max deref depth for aliases */
al@19741 172 diff -Naur openldap-2.4.40.orig/libraries/liblber/Makefile.in openldap-2.4.40/libraries/liblber/Makefile.in
al@19741 173 --- openldap-2.4.40.orig/libraries/liblber/Makefile.in 2014-09-18 20:48:49.000000000 -0500
al@19741 174 +++ openldap-2.4.40/libraries/liblber/Makefile.in 2015-03-26 15:37:39.801077750 -0500
al@19741 175 @@ -38,6 +38,9 @@
al@19741 176 XXLIBS =
al@19741 177 NT_LINK_LIBS = $(AC_LIBS)
al@19741 178 UNIX_LINK_LIBS = $(AC_LIBS)
al@19741 179 +ifneq (,$(VERSION_OPTION))
al@19741 180 + VERSION_FLAGS = "$(VERSION_OPTION)$(srcdir)/liblber.map"
al@19741 181 +endif
al@19741 182
al@19741 183 dtest: $(XLIBS) dtest.o
al@19741 184 $(LTLINK) -o $@ dtest.o $(LIBS)
al@19741 185 @@ -48,6 +51,6 @@
al@19741 186
al@19741 187 install-local: FORCE
al@19741 188 -$(MKDIR) $(DESTDIR)$(libdir)
al@19741 189 - $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir)
al@19741 190 + $(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir)
al@19741 191 $(LTFINISH) $(DESTDIR)$(libdir)
al@19741 192
al@19741 193 diff -Naur openldap-2.4.40.orig/libraries/liblber/liblber.map openldap-2.4.40/libraries/liblber/liblber.map
al@19741 194 --- openldap-2.4.40.orig/libraries/liblber/liblber.map 1969-12-31 18:00:00.000000000 -0600
al@19741 195 +++ openldap-2.4.40/libraries/liblber/liblber.map 2015-03-26 15:37:39.801077750 -0500
al@19741 196 @@ -0,0 +1,8 @@
al@19741 197 +OPENLDAP_2.4_2 {
al@19741 198 + global:
al@19741 199 + ber_*;
al@19741 200 + der_alloc;
al@19741 201 + lutil_*;
al@19741 202 + local:
al@19741 203 + *;
al@19741 204 +};
al@19741 205 diff -Naur openldap-2.4.40.orig/libraries/libldap/Makefile.in openldap-2.4.40/libraries/libldap/Makefile.in
al@19741 206 --- openldap-2.4.40.orig/libraries/libldap/Makefile.in 2014-09-18 20:48:49.000000000 -0500
al@19741 207 +++ openldap-2.4.40/libraries/libldap/Makefile.in 2015-03-26 15:37:39.802077716 -0500
al@19741 208 @@ -52,6 +52,9 @@
al@19741 209 XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS)
al@19741 210 NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
al@19741 211 UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
al@19741 212 +ifneq (,$(VERSION_OPTION))
al@19741 213 + VERSION_FLAGS = $(VERSION_OPTION)$(srcdir)/libldap.map
al@19741 214 +endif
al@19741 215
al@19741 216 apitest: $(XLIBS) apitest.o
al@19741 217 $(LTLINK) -o $@ apitest.o $(LIBS)
al@19741 218 @@ -68,7 +71,7 @@
al@19741 219
al@19741 220 install-local: $(CFFILES) FORCE
al@19741 221 -$(MKDIR) $(DESTDIR)$(libdir)
al@19741 222 - $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir)
al@19741 223 + $(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir)
al@19741 224 $(LTFINISH) $(DESTDIR)$(libdir)
al@19741 225 -$(MKDIR) $(DESTDIR)$(sysconfdir)
al@19741 226 @for i in $(CFFILES); do \
al@19741 227 diff -Naur openldap-2.4.40.orig/libraries/libldap/libldap.map openldap-2.4.40/libraries/libldap/libldap.map
al@19741 228 --- openldap-2.4.40.orig/libraries/libldap/libldap.map 1969-12-31 18:00:00.000000000 -0600
al@19741 229 +++ openldap-2.4.40/libraries/libldap/libldap.map 2015-03-26 15:37:39.802077716 -0500
al@19741 230 @@ -0,0 +1,7 @@
al@19741 231 +OPENLDAP_2.4_2 {
al@19741 232 + global:
al@19741 233 + ldap_*;
al@19741 234 + ldif_*;
al@19741 235 + local:
al@19741 236 + *;
al@19741 237 +};
al@19741 238 diff -Naur openldap-2.4.40.orig/libraries/libldap_r/Makefile.in openldap-2.4.40/libraries/libldap_r/Makefile.in
al@19741 239 --- openldap-2.4.40.orig/libraries/libldap_r/Makefile.in 2014-09-18 20:48:49.000000000 -0500
al@19741 240 +++ openldap-2.4.40/libraries/libldap_r/Makefile.in 2015-03-26 15:37:39.802077716 -0500
al@19741 241 @@ -61,6 +61,9 @@
al@19741 242 XXXLIBS = $(LTHREAD_LIBS)
al@19741 243 NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
al@19741 244 UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) $(LTHREAD_LIBS)
al@19741 245 +ifneq (,$(VERSION_OPTION))
al@19741 246 + VERSION_FLAGS = "$(VERSION_OPTION)$(XXDIR)/libldap.map"
al@19741 247 +endif
al@19741 248
al@19741 249 .links : Makefile
al@19741 250 @for i in $(XXSRCS); do \
al@19741 251 @@ -83,6 +86,6 @@
al@19741 252
al@19741 253 install-local: $(CFFILES) FORCE
al@19741 254 -$(MKDIR) $(DESTDIR)$(libdir)
al@19741 255 - $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir)
al@19741 256 + $(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir)
al@19741 257 $(LTFINISH) $(DESTDIR)$(libdir)
al@19741 258
al@19741 259 diff -Naur openldap-2.4.40.orig/servers/slapd/Makefile.in openldap-2.4.40/servers/slapd/Makefile.in
al@19741 260 --- openldap-2.4.40.orig/servers/slapd/Makefile.in 2014-09-18 20:48:49.000000000 -0500
al@19741 261 +++ openldap-2.4.40/servers/slapd/Makefile.in 2015-03-26 15:36:59.639463969 -0500
al@19741 262 @@ -376,10 +376,10 @@
al@19741 263 install-conf install-dbc-maybe install-schema install-tools
al@19741 264
al@19741 265 install-slapd: FORCE
al@19741 266 - -$(MKDIR) $(DESTDIR)$(libexecdir)
al@19741 267 + -$(MKDIR) $(DESTDIR)$(sbindir)
al@19741 268 -$(MKDIR) $(DESTDIR)$(localstatedir)/run
al@19741 269 $(LTINSTALL) $(INSTALLFLAGS) $(STRIP) -m 755 \
al@19741 270 - slapd$(EXEEXT) $(DESTDIR)$(libexecdir)
al@19741 271 + slapd$(EXEEXT) $(DESTDIR)$(sbindir)
al@19741 272 @for i in $(SUBDIRS); do \
al@19741 273 if test -d $$i && test -f $$i/Makefile ; then \
al@19741 274 echo; echo " cd $$i; $(MAKE) $(MFLAGS) install"; \
al@19741 275 @@ -445,9 +445,9 @@
al@19741 276
al@19741 277 install-db-config: FORCE
al@19741 278 @-$(MKDIR) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir)
al@19741 279 - @-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/openldap-data
al@19741 280 + @-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/lib/openldap
al@19741 281 $(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \
al@19741 282 - $(DESTDIR)$(localstatedir)/openldap-data/DB_CONFIG.example
al@19741 283 + $(DESTDIR)$(localstatedir)/lib/openldap/DB_CONFIG.example
al@19741 284 $(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \
al@19741 285 $(DESTDIR)$(sysconfdir)/DB_CONFIG.example
al@19741 286
al@19741 287 @@ -455,6 +455,6 @@
al@19741 288 -$(MKDIR) $(DESTDIR)$(sbindir)
al@19741 289 for i in $(SLAPTOOLS); do \
al@19741 290 $(RM) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \
al@19741 291 - $(LN_S) -f $(DESTDIR)$(libexecdir)/slapd$(EXEEXT) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \
al@19741 292 + $(LN_S) -f $(DESTDIR)$(sbindir)/slapd$(EXEEXT) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \
al@19741 293 done
al@19741 294
al@19741 295 diff -Naur openldap-2.4.44.orig/servers/slapd/slapd.conf openldap-2.4.44/servers/slapd/slapd.conf
al@19741 296 --- openldap-2.4.44.orig/servers/slapd/slapd.conf 2016-02-06 00:57:45.000000000 +0100
al@19741 297 +++ openldap-2.4.44/servers/slapd/slapd.conf 2016-02-22 23:01:47.681372594 +0100
al@19741 298 @@ -10,12 +10,12 @@
al@19741 299 # service AND an understanding of referrals.
al@19741 300 #referral ldap://root.openldap.org
al@19741 301
al@19741 302 -pidfile %LOCALSTATEDIR%/run/slapd.pid
al@19741 303 -argsfile %LOCALSTATEDIR%/run/slapd.args
al@19741 304 +pidfile %LOCALSTATEDIR%/run/openldap/slapd.pid
al@19741 305 +argsfile %LOCALSTATEDIR%/run/openldap/slapd.args
al@19741 306
al@19741 307 # Load dynamic backend modules:
al@19741 308 -# modulepath %MODULEDIR%
al@19741 309 -# moduleload back_mdb.la
al@19741 310 +modulepath %MODULEDIR%
al@19741 311 +moduleload back_mdb.la
al@19741 312 # moduleload back_ldap.la
al@19741 313
al@19741 314 # Sample security restrictions
al@19741 315 @@ -60,6 +60,6 @@
al@19741 316 # The database directory MUST exist prior to running slapd AND
al@19741 317 # should only be accessible by the slapd and slap tools.
al@19741 318 # Mode 700 recommended.
al@19741 319 -directory %LOCALSTATEDIR%/openldap-data
al@19741 320 +directory %LOCALSTATEDIR%/lib/openldap
al@19741 321 # Indices to maintain
al@19741 322 index objectClass eq
al@19741 323 diff -Naur openldap-2.4.44.orig/servers/slapd/slapd.ldif openldap-2.4.44/servers/slapd/slapd.ldif
al@19741 324 --- openldap-2.4.44.orig/servers/slapd/slapd.ldif 2016-02-06 00:57:45.000000000 +0100
al@19741 325 +++ openldap-2.4.44/servers/slapd/slapd.ldif 2016-02-22 22:59:57.824364446 +0100
al@19741 326 @@ -9,8 +9,8 @@
al@19741 327 #
al@19741 328 # Define global ACLs to disable default read access.
al@19741 329 #
al@19741 330 -olcArgsFile: %LOCALSTATEDIR%/run/slapd.args
al@19741 331 -olcPidFile: %LOCALSTATEDIR%/run/slapd.pid
al@19741 332 +olcArgsFile: %LOCALSTATEDIR%/run/openldap/slapd.args
al@19741 333 +olcPidFile: %LOCALSTATEDIR%/run/openldap/slapd.pid
al@19741 334 #
al@19741 335 # Do not enable referrals until AFTER you have a working directory
al@19741 336 # service AND an understanding of referrals.
al@19741 337 @@ -26,10 +26,11 @@
al@19741 338 #
al@19741 339 # Load dynamic backend modules:
al@19741 340 #
al@19741 341 -#dn: cn=module,cn=config
al@19741 342 -#objectClass: olcModuleList
al@19741 343 -#cn: module
al@19741 344 -#olcModulepath: %MODULEDIR%
al@19741 345 +dn: cn=module,cn=config
al@19741 346 +objectClass: olcModuleList
al@19741 347 +cn: module
al@19741 348 +olcModulepath: %MODULEDIR%
al@19741 349 +olcModuleload: back_mdb.la
al@19741 350 #olcModuleload: back_bdb.la
al@19741 351 #olcModuleload: back_hdb.la
al@19741 352 #olcModuleload: back_ldap.la
al@19741 353 @@ -90,6 +91,6 @@
al@19741 354 # The database directory MUST exist prior to running slapd AND
al@19741 355 # should only be accessible by the slapd and slap tools.
al@19741 356 # Mode 700 recommended.
al@19741 357 -olcDbDirectory: %LOCALSTATEDIR%/openldap-data
al@19741 358 +olcDbDirectory: %LOCALSTATEDIR%/lib/openldap
al@19741 359 # Indices to maintain
al@19741 360 olcDbIndex: objectClass eq
al@19741 361 diff -Naur openldap-2.4.40.orig/servers/slapd/slapi/Makefile.in openldap-2.4.40/servers/slapd/slapi/Makefile.in
al@19741 362 --- openldap-2.4.40.orig/servers/slapd/slapi/Makefile.in 2014-09-18 20:48:49.000000000 -0500
al@19741 363 +++ openldap-2.4.40/servers/slapd/slapi/Makefile.in 2015-03-26 15:36:59.639463969 -0500
al@19741 364 @@ -46,6 +46,6 @@
al@19741 365 install-local: FORCE
al@19741 366 if test "$(BUILD_MOD)" = "yes"; then \
al@19741 367 $(MKDIR) $(DESTDIR)$(libdir); \
al@19741 368 - $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir); \
al@19741 369 + $(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir); \
al@19741 370 fi
al@19741 371