mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-09 10:35:53 +02:00
openldap: Update to version 2.6.1
- Update from version 2.4.49 to 2.6.1
- Update of rootfile
- Update of consolidated patch to 2.6.1
- Removal of old patches
- Changelog
OpenLDAP 2.6.1 Release (2022/01/20)
Fixed libldap to init client socket port (ITS#9743)
Fixed libldap with referrals (ITS#9781)
Added slapd config keyword for logfile format (ITS#9745)
Fixed slapd to allow objectClass edits with no net change (ITS#9772)
Fixed slapd configtable population (ITS#9576)
Fixed slapd to only set loglevel in server mode (ITS#9715)
Fixed slapd logfile-rotate use of uninitialized variable (ITS#9730)
Fixed slapd passwd scheme handling with slapd.conf (ITS#9750)
Fixed slapd postread support for modrdn (ITS#7080)
Fixed slapd syncrepl recreation of deleted entries (ITS#9282)
Fixed slapd syncrepl replication with ODSEE (ITS#9707)
Fixed slapd syncrepl to properly replicate glue entries (ITS#9647)
Fixed slapd syncrepl to reject REFRESH for precise resync (ITS#9742)
Fixed slapd syncrepl to avoid busy loop during refresh (ITS#9584)
Fixed slapd syncrepl when X-ORDERED is specified (ITS#9761)
Fixed slapd syncrepl to better handle out of order delete ops (ITS#9751)
Fixed slapd syncrepl to correctly close connections when config is deleted (ITS#9776)
Fixed slapd-mdb to update indices correctly on replace ops (ITS#9753)
Fixed slapd-wt to set correct flags (ITS#9760)
Fixed slapo-accesslog to fix assertion due to deprecated code (ITS#9738)
Fixed slapo-accesslog to fix inconsistently normalized minCSN (ITS#9752)
Fixed slapo-accesslog delete handling of multi-valued config attrs (ITS#9493)
Fixed slapo-autogroup to maintain values in insertion order (ITS#9766)
Fixed slapo-constraint to maintain values in insertion order (ITS#9770)
Fixed slapo-dyngroup to maintain values in insertion order (ITS#9762)
Fixed slapo-dynlist compare operation for static groups (ITS#9747)
Fixed slapo-dynlist static group filter with multiple members (ITS#9779)
Fixed slapo-ppolicy when not built modularly (ITS#9733)
Fixed slapo-refint to maintain values in insertion order (ITS#9763)
Fixed slapo-retcode to honor requested insert position (ITS#9759)
Fixed slapo-sock cn=config support (ITS#9758)
Fixed slapo-syncprov memory leak (ITS#8039)
Fixed slapo-syncprov to generate a more accurate accesslog query (ITS#9756)
Fixed slapo-syncprov to allow empty DB to host persistent syncrepl connections (ITS#9691)
Fixed slapo-syncprov to consider all deletes for sycnInfo messages (ITS#5972)
Fixed slapo-translucent to warn on invalid config (ITS#9768)
Fixed slapo-unique to warn on invalid config (ITS#9767)
Fixed slapo-valsort to maintain values in insertion order (ITS#9764)
Build Environment
Fix test022 to preserve DELAY search output (ITS#9718)
Fix slapd-watcher to allow startup when servers are down (ITS#9727)
Contrib
Fixed slapo-lastbind to work with 2.6 lastbind-precision configuration (ITS#9725)
Documentation
Fixed slapd.conf(5)/slapd-config(5) documentation on lastbind-precision (ITS#9728)
Fixed slapo-accesslog(5) to clarify logoldattr usage (ITS#9749)
OpenLDAP 2.6.0 Release (2021/10/25)
Initial release for "general use".
OpenLDAP 2.5.7 Release (2021/08/18)
Fixed lloadd client state tracking (ITS#9624)
Fixed slapd bconfig to canonicalize structuralObjectclass (ITS#9611)
Fixed slapd-ldif duplicate controls response (ITS#9497)
Fixed slapd-mdb multival crash when attribute is missing an equality matchingrule (ITS#9621)
Fixed slapd-mdb compatibility with OpenLDAP 2.4 MDB databases (ITS#8958)
Fixed slapd-mdb idlexp maximum size handling (ITS#9637)
Fixed slapd-monitor number of ops executing with asynchronous backends (ITS#9628)
Fixed slapd-sql to add support for ppolicy attributes (ITS#9629)
Fixed slapd-sql to close transactions after bind and search (ITS#9630)
Fixed slapo-accesslog to make reqMod optional (ITS#9569)
Fixed slapo-ppolicy logging when pwdChangedTime attribute is not present (ITS#9625)
Documentation
slapd-mdb(5) note max idlexp size is 30, not 31 (ITS#9637)
slapo-accesslog(5) note that reqMod is optional (ITS#9569)
Add ldapvc(1) man page (ITS#9549)
Add guide section on load balancer (ITS#9443)
Updated guide to document multiprovider as replacement for mirrormode (ITS#9200)
Updated guide to clarify slapd-mdb upgrade requirements (ITS#9200)
Updated guide to document removal of deprecated options from client tools (ITS#9200)
OpenLDAP 2.5.6 Release (2021/07/27)
Fixed libldap buffer overflow (ITS#9578)
Fixed libldap missing mutex unlock on connection alloc failure (ITS#9590)
Fixed lloadd cn=config olcBkLloadClientMaxPending setting (ITS#8747)
Fixed slapd multiple config defaults (ITS#9363)
Fixed slapd ipv6 addresses to work with tcp wrappers (ITS#9603)
Fixed slapo-syncprov delete of nonexistent sessionlog (ITS#9608)
Build
Fixed library symbol versioning on Solaris (ITS#9591)
Fixed compile warning in libldap/tpool.c (ITS#9601)
Fixed compile warning in libldap/tls_o.c (ITS#9602)
Contrib
Fixed ppm module for sysconfdir (ITS#7832)
Documentation
Updated guide to document multival, idlexp, and maxentrysize (ITS#9613, ITS#9614)
OpenLDAP 2.5.5 Release (2021/06/03)
Added libldap LDAP_OPT_TCP_USER_TIMEOUT support (ITS#9502)
Added lloadd tcp-user-timeout support (ITS#9502)
Added slapd-asyncmeta tcp-user-timeout support (ITS#9502)
Added slapd-ldap tcp-user-timeout support (ITS#9502)
Added slapd-meta tcp-user-timeout support (ITS#9502)
Fixed incorrect control OIDs for AuthZ Identity (ITS#9542)
Fixed libldap typo in util-int.c (ITS#9541)
Fixed libldap double free of LDAP_OPT_DEFBASE (ITS#9530)
Fixed libldap better TLS1.3 cipher suite handling (ITS#9521, ITS#9546)
Fixed lloadd multiple issues (ITS#8747)
Fixed slapd slap_op_time to avoid duplicates across restarts (ITS#9537)
Fixed slapd typo in daemon.c (ITS#9541)
Fixed slapd slapi compilation (ITS#9544)
Fixed slapd to handle empty DN in extended filters (ITS#9551)
Fixed slapd syncrepl searches with empty base (ITS#6467)
Fixed slapd syncrepl refresh on startup (ITS#9324, ITS#9534)
Fixed slapd abort due to typo (ITS#9561)
Fixed slapd-asyncmeta quarantine handling (ITS#8721)
Fixed slapd-asyncmeta to have a default operations timeout (ITS#9555)
Fixed slapd-ldap quarantine handling (ITS#8721)
Fixed slapd-mdb deletion of context entry (ITS#9531)
Fixed slapd-mdb off-by-one affecting search scope (ITS#9557)
Fixed slapd-meta quarantine handling (ITS#8721)
Fixed slapo-accesslog to record reqNewDN for modRDN ops (ITS#9552)
Fixed slapo-pcache locking during expiration (ITS#9529)
Build
Fixed slappw-argon2 module installation (ITS#9548)
Contrib
Update ldapc++/ldaptcl to use configure.ac (ITS#9554)
Documentation
ldap_first_attribute(3) - Document ldap_get_attribute_ber (ITS#8820)
ldap_modify(3) - Delete non-existent mod_next parameter (ITS#9559)
OpenLDAP 2.5.4 Release (2021/04/29)
Initial release for "general use".
OpenLDAP 2.4.57 Release (2021/01/18)
Fixed ldapexop to use correct return code (ITS#9417)
Fixed slapd to remove asserts in UUIDNormalize (ITS#9391)
Fixed slapd to remove assert in csnValidate (ITS#9410)
Fixed slapd validity checks for issuerAndThisUpdateCheck (ITS#9411, ITS#9427)
Fixed slapd validity checks for serialNumberAndIssuerCheck (ITS#9404, ITS#9424)
Fixed slapd AVA sort with invalid RDN (ITS#9412)
Fixed slapd ldap_X509dn2bv to check for invalid BER after RDN count (ITS#9423, ITS#9425)
Fixed slapd saslauthz to remove asserts in validation (ITS#9406, ITS#9407)
Fixed slapd saslauthz to use slap_sl_free on normalized DN (ITS#9409)
Fixed slapd saslauthz SEGV in slap_parse_user (ITS#9413)
Fixed slapd modrdn memory leak (ITS#9420)
Fixed slapd double-free in vrfilter (ITS#9408)
Fixed slapd cancel operation to correctly terminate (ITS#9428)
Fixed slapd-ldap fix binds on retry with closed connection (ITS#9400)
Fixed slapo-syncprov to ignore duplicate sessionlog entries (ITS#9394)
OpenLDAP 2.4.56 Release (2020/11/10)
Fixed slapd to remove assert in certificateListValidate (ITS#9383)
Fixed slapd to remove assert in csnNormalize23 (ITS#9384)
Fixed slapd to better parse ldapi listener URIs (ITS#9379)
OpenLDAP 2.4.55 Release (2020/10/26)
Fixed slapd normalization handling with modrdn (ITS#9370)
Fixed slapd-meta to check ldap_install_tls return code (ITS#9366)
Contrib
Fixed nssov misplaced semicolon (ITS#8731, ITS#9368)
OpenLDAP 2.4.54 Release (2020/10/12)
Fixed slapd delta-syncrepl to ignore delete ops on deleted entry (ITS#9342)
Fixed slapd delta-syncrepl to be fully serialized (ITS#9330)
Fixed slapd delta-syncrepl MOD on zero-length context entry (ITS#9352)
Fixed slapd syncrepl to be fully serialized (ITS#8102)
Fixed slapd syncrepl to call check_syncprov on fresh consumer (ITS#9345)
Fixed slapd syncrepl to propagate errors from overlay_entry_get_ov (ITS#9355)
Fixed slapd syncrepl to not create empty ADD ops (ITS#9359)
Fixed slapd syncrepl replace usage on single valued attrs (ITS#9295)
Fixed slapd-monitor fix monitor_back_register_database for empty suffix DB (ITS#9353)
Fixed slapo-accesslog normalizer for reqStart (ITS#9358)
Fixed slapo-accesslog to not generate new contextCSN on purge (ITS#9361)
Fixed slapo-syncprov contextCSN generation with empty suffix (ITS#9015)
Fixed slapo-syncprov sessionlog to use a TAVL tree (ITS#8486)
OpenLDAP 2.4.53 Release (2020/09/07)
Added slapd syncrepl additional SYNC logging (ITS#9043)
Fixed slapd syncrepl segfault on NULL cookie on REFRESH (ITS#9282)
Fixed slapd syncrepl to use fresh connection on REFRESH fallback (ITS#9338)
Fixed slapo-ppolicy race condition for pwdFailureTime (ITS#9302,ITS#9334)
Build
Require OpenSSL 1.0.2 or later (ITS#9323)
Fixed libldap compilation issue with broken C compilers (ITS#9332)
OpenLDAP 2.4.52 Release (2020/08/28)
Added libldap LDAP_OPT_X_TLS_REQUIRE_SAN option (ITS#9318)
Added libldap OpenSSL support for multiple EECDH curves (ITS#9054)
Added slapd OpenSSL support for multiple EECDH curves (ITS#9054)
Fixed librewrite malloc/free corruption (ITS#9249)
Fixed libldap hang when using UDP and server down (ITS#9328)
Fixed slapd syncrepl rare deadlock due to network issues (ITS#9324)
Fixed slapd syncrepl regression that could trigger an assert (ITS#9329)
Fixed slapd-mdb index error with collapsed range (ITS#9135)
OpenLDAP 2.4.51 Release (2020/08/11)
Added slapo-ppolicy implement Netscape password policy controls (ITS#9279)
Fixed libldap retry loop in ldap_int_tls_connect (ITS#8650)
Fixed libldap to use getaddrinfo in ldap_pvt_get_fqdn (ITS#9287)
Fixed slapd to enforce singular existence of some overlays (ITS#9309)
Fixed slapd syncrepl to not delete non-replicated attrs (ITS#9227)
Fixed slapd syncrepl to correctly delete entries on resync (ITS#9282)
Fixed slapd syncrepl to use replace on single valued attrs (ITS#9294, ITS#9295)
Fixed slapd-perl dynamic config with threaded slapd (ITS#7573)
Fixed slapo-ppolicy to expose the ppolicy control (ITS#9285)
Fixed slapo-ppolicy race condition for pwdFailureTime (ITS#9302)
Fixed slapo-ppolicy so it can only exist once per DB (ITS#9309)
Fixed slapo-chain to check referral (ITS#9262)
Build Environment
Fix test064 so it no longer uses bashisms (ITS#9263)
Contrib
Fix default prefix value for pw-argon2, pw-pbkdf2 modules (ITS#9248)
slapo-allowed - Fix usage of unitialized variable (ITS#9308)
Documentation
ldap_parse_result(3) - Document ldap_parse_intermediate (ITS#9271)
OpenLDAP 2.4.50 Release (2020/04/28)
Fixed client benign typos (ITS#8890)
Fixed libldap type cast (ITS#9175)
Fixed libldap retry loop in ldap_int_tls_connect (ITS#8650)
Fixed libldap_r race on Windows mutex initialization (ITS#9181)
Fixed liblunicode memory leak (ITS#9198)
Fixed slapd benign typos (ITS#8890)
Fixed slapd to limit depth of nested filters (ITS#9202)
Fixed slapd-mdb memory leak in dnSuperiorMatch (ITS#9214)
Fixed slapo-pcache database initialization (ITS#9182)
Fixed slapo-ppolicy callback (ITS#9171)
Build
Fix olcDatabaseDummy initialization for windows (ITS#7074)
Fix detection for ws2tcpip.h for windows (ITS#8383)
Fix back-mdb types for windows (ITS#7878)
Contrib
Update ldapc++ config.guess and config.sub to support newer architectures (ITS#7855)
Added pw-argon2 module (ITS#9233, ITS#8575, ITS#9203, ITS#9206)
Documentation
slapd-ldap(5) - Clarify idassert-authzfrom behavior (ITS#9003)
slapd-meta(5) - Remove client-pr option (ITS#8683)
slapindex(8) - Fix truncate option information for back-mdb (ITS#9230)
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Reviewed-by: Peter Müller <peter.mueller@ipfire.org>
This commit is contained in:
Adolf Belka
committed by
Peter Müller
Peter Müller
parent
174778b202
commit
c4f3bb4b08
@@ -10,6 +10,7 @@
|
||||
#usr/bin/ldappasswd
|
||||
#usr/bin/ldapsearch
|
||||
#usr/bin/ldapurl
|
||||
#usr/bin/ldapvc
|
||||
#usr/bin/ldapwhoami
|
||||
#usr/include/lber.h
|
||||
#usr/include/lber_types.h
|
||||
@@ -21,18 +22,16 @@
|
||||
#usr/include/ldif.h
|
||||
#usr/include/openldap.h
|
||||
#usr/include/slapi-plugin.h
|
||||
usr/lib/liblber-2.4.so.2
|
||||
usr/lib/liblber-2.4.so.2.10.12
|
||||
#usr/lib/liblber.la
|
||||
#usr/lib/liblber.so
|
||||
usr/lib/libldap-2.4.so.2
|
||||
usr/lib/libldap-2.4.so.2.10.12
|
||||
usr/lib/liblber.so.2
|
||||
usr/lib/liblber.so.2.0.200
|
||||
#usr/lib/libldap.la
|
||||
#usr/lib/libldap.so
|
||||
usr/lib/libldap_r-2.4.so.2
|
||||
usr/lib/libldap_r-2.4.so.2.10.12
|
||||
#usr/lib/libldap_r.la
|
||||
#usr/lib/libldap_r.so
|
||||
usr/lib/libldap.so.2
|
||||
usr/lib/libldap.so.2.0.200
|
||||
#usr/lib/pkgconfig/lber.pc
|
||||
#usr/lib/pkgconfig/ldap.pc
|
||||
#usr/share/man/man1/ldapadd.1
|
||||
#usr/share/man/man1/ldapcompare.1
|
||||
#usr/share/man/man1/ldapdelete.1
|
||||
@@ -42,6 +41,7 @@ usr/lib/libldap_r-2.4.so.2.10.12
|
||||
#usr/share/man/man1/ldappasswd.1
|
||||
#usr/share/man/man1/ldapsearch.1
|
||||
#usr/share/man/man1/ldapurl.1
|
||||
#usr/share/man/man1/ldapvc.1
|
||||
#usr/share/man/man1/ldapwhoami.1
|
||||
#usr/share/man/man3/ber_alloc_t.3
|
||||
#usr/share/man/man3/ber_bvarray_add.3
|
||||
@@ -136,6 +136,7 @@ usr/lib/libldap_r-2.4.so.2.10.12
|
||||
#usr/share/man/man3/ldap_first_message.3
|
||||
#usr/share/man/man3/ldap_first_reference.3
|
||||
#usr/share/man/man3/ldap_free_urldesc.3
|
||||
#usr/share/man/man3/ldap_get_attribute_ber.3
|
||||
#usr/share/man/man3/ldap_get_dn.3
|
||||
#usr/share/man/man3/ldap_get_option.3
|
||||
#usr/share/man/man3/ldap_get_values.3
|
||||
@@ -175,6 +176,7 @@ usr/lib/libldap_r-2.4.so.2.10.12
|
||||
#usr/share/man/man3/ldap_objectclass_free.3
|
||||
#usr/share/man/man3/ldap_open.3
|
||||
#usr/share/man/man3/ldap_parse_extended_result.3
|
||||
#usr/share/man/man3/ldap_parse_intermediate.3
|
||||
#usr/share/man/man3/ldap_parse_reference.3
|
||||
#usr/share/man/man3/ldap_parse_result.3
|
||||
#usr/share/man/man3/ldap_parse_sasl_bind_result.3
|
||||
@@ -227,23 +229,22 @@ usr/lib/libldap_r-2.4.so.2.10.12
|
||||
#usr/share/man/man3/ldap_value_free_len.3
|
||||
#usr/share/man/man5/ldap.conf.5
|
||||
#usr/share/man/man5/ldif.5
|
||||
#usr/share/man/man5/slapd-bdb.5
|
||||
#usr/share/man/man5/lloadd.conf.5
|
||||
#usr/share/man/man5/slapd-asyncmeta.5
|
||||
#usr/share/man/man5/slapd-config.5
|
||||
#usr/share/man/man5/slapd-dnssrv.5
|
||||
#usr/share/man/man5/slapd-hdb.5
|
||||
#usr/share/man/man5/slapd-ldap.5
|
||||
#usr/share/man/man5/slapd-ldif.5
|
||||
#usr/share/man/man5/slapd-mdb.5
|
||||
#usr/share/man/man5/slapd-meta.5
|
||||
#usr/share/man/man5/slapd-monitor.5
|
||||
#usr/share/man/man5/slapd-ndb.5
|
||||
#usr/share/man/man5/slapd-null.5
|
||||
#usr/share/man/man5/slapd-passwd.5
|
||||
#usr/share/man/man5/slapd-perl.5
|
||||
#usr/share/man/man5/slapd-relay.5
|
||||
#usr/share/man/man5/slapd-shell.5
|
||||
#usr/share/man/man5/slapd-sock.5
|
||||
#usr/share/man/man5/slapd-sql.5
|
||||
#usr/share/man/man5/slapd-wt.5
|
||||
#usr/share/man/man5/slapd.access.5
|
||||
#usr/share/man/man5/slapd.backends.5
|
||||
#usr/share/man/man5/slapd.conf.5
|
||||
@@ -251,17 +252,22 @@ usr/lib/libldap_r-2.4.so.2.10.12
|
||||
#usr/share/man/man5/slapd.plugin.5
|
||||
#usr/share/man/man5/slapo-accesslog.5
|
||||
#usr/share/man/man5/slapo-auditlog.5
|
||||
#usr/share/man/man5/slapo-autoca.5
|
||||
#usr/share/man/man5/slapo-chain.5
|
||||
#usr/share/man/man5/slapo-collect.5
|
||||
#usr/share/man/man5/slapo-constraint.5
|
||||
#usr/share/man/man5/slapo-dds.5
|
||||
#usr/share/man/man5/slapo-deref.5
|
||||
#usr/share/man/man5/slapo-dyngroup.5
|
||||
#usr/share/man/man5/slapo-dynlist.5
|
||||
#usr/share/man/man5/slapo-homedir.5
|
||||
#usr/share/man/man5/slapo-memberof.5
|
||||
#usr/share/man/man5/slapo-otp.5
|
||||
#usr/share/man/man5/slapo-pbind.5
|
||||
#usr/share/man/man5/slapo-pcache.5
|
||||
#usr/share/man/man5/slapo-ppolicy.5
|
||||
#usr/share/man/man5/slapo-refint.5
|
||||
#usr/share/man/man5/slapo-remoteauth.5
|
||||
#usr/share/man/man5/slapo-retcode.5
|
||||
#usr/share/man/man5/slapo-rwm.5
|
||||
#usr/share/man/man5/slapo-sock.5
|
||||
@@ -270,6 +276,8 @@ usr/lib/libldap_r-2.4.so.2.10.12
|
||||
#usr/share/man/man5/slapo-translucent.5
|
||||
#usr/share/man/man5/slapo-unique.5
|
||||
#usr/share/man/man5/slapo-valsort.5
|
||||
#usr/share/man/man5/slappw-argon2.5
|
||||
#usr/share/man/man8/lloadd.8
|
||||
#usr/share/man/man8/slapacl.8
|
||||
#usr/share/man/man8/slapadd.8
|
||||
#usr/share/man/man8/slapauth.8
|
||||
@@ -277,6 +285,7 @@ usr/lib/libldap_r-2.4.so.2.10.12
|
||||
#usr/share/man/man8/slapd.8
|
||||
#usr/share/man/man8/slapdn.8
|
||||
#usr/share/man/man8/slapindex.8
|
||||
#usr/share/man/man8/slapmodify.8
|
||||
#usr/share/man/man8/slappasswd.8
|
||||
#usr/share/man/man8/slapschema.8
|
||||
#usr/share/man/man8/slaptest.8
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
include Config
|
||||
|
||||
VER = 2.4.49
|
||||
VER = 2.6.1
|
||||
|
||||
THISAPP = openldap-$(VER)
|
||||
DL_FILE = $(THISAPP).tgz
|
||||
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
|
||||
|
||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
|
||||
$(DL_FILE)_BLAKE2 = ee777588d758f6704b0d38b90feb85b27e2307510a05d1d147324e9958a6f6fc5bc7dd521a1462971c3f707429ad38fab734f508d71fd88b447770e112e844a2
|
||||
$(DL_FILE)_BLAKE2 = 08bb7ec0354d689b65673d6c4c05a3299ba4f1655cbcccb710b6c9ca66fd636d6b2d89faa8d32278d253a1647deae8b1e86e8e275b890208bfac4ca663a40523
|
||||
|
||||
install : $(TARGET)
|
||||
|
||||
@@ -72,7 +72,7 @@ $(subst %,%_BLAKE2,$(objects)) :
|
||||
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
@$(PREBUILD)
|
||||
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
|
||||
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openldap-2.4.49-consolidated-1.patch
|
||||
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openldap-2.6.1-consolidated-2.patch
|
||||
cd $(DIR_APP) && autoconf
|
||||
cd $(DIR_APP) && ./configure \
|
||||
--prefix=/usr \
|
||||
|
||||
@@ -1,371 +0,0 @@
|
||||
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 @@
|
||||
#endif
|
||||
], [ol_cv_ssl_crl_compat=yes], [ol_cv_ssl_crl_compat=no])])
|
||||
])
|
||||
+
|
||||
+dnl ====================================================================
|
||||
+dnl check for symbol versioning support
|
||||
+AC_DEFUN([OL_SYMBOL_VERSIONING],
|
||||
+[AC_CACHE_CHECK([for .symver assembler directive],
|
||||
+ [ol_cv_asm_symver_directive],[
|
||||
+cat > conftest.s <<EOF
|
||||
+${libc_cv_dot_text}
|
||||
+_sym:
|
||||
+.symver _sym,sym@VERS
|
||||
+EOF
|
||||
+if ${CC-cc} -c $ASFLAGS conftest.s 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then
|
||||
+ ol_cv_asm_symver_directive=yes
|
||||
+else
|
||||
+ ol_cv_asm_symver_directive=no
|
||||
+fi
|
||||
+rm -f conftest*])
|
||||
+AC_CACHE_CHECK([for ld --version-script],
|
||||
+ [ol_cv_ld_version_script_option],[
|
||||
+if test $ol_cv_asm_symver_directive = yes; then
|
||||
+ cat > conftest.s <<EOF
|
||||
+${libc_cv_dot_text}
|
||||
+_sym:
|
||||
+.symver _sym,sym@VERS
|
||||
+EOF
|
||||
+ cat > conftest.map <<EOF
|
||||
+VERS_1 {
|
||||
+ global: sym;
|
||||
+};
|
||||
+
|
||||
+VERS_2 {
|
||||
+ global: sym;
|
||||
+} VERS_1;
|
||||
+EOF
|
||||
+ if ${CC-cc} -c $ASFLAGS conftest.s 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then
|
||||
+ if AC_TRY_COMMAND([${CC-cc} $CFLAGS $LDFLAGS -shared
|
||||
+ -o conftest.so conftest.o
|
||||
+ -Wl,--version-script,conftest.map
|
||||
+ 1>&AS_MESSAGE_LOG_FD]);
|
||||
+ then
|
||||
+ ol_cv_ld_version_script_option=yes
|
||||
+ else
|
||||
+ ol_cv_ld_version_script_option=no
|
||||
+ fi
|
||||
+ else
|
||||
+ ol_cv_ld_version_script_option=no
|
||||
+ fi
|
||||
+else
|
||||
+ 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
|
||||
@@ -104,6 +104,9 @@
|
||||
# LINK_LIBS referenced in library and module link commands.
|
||||
LINK_LIBS = $(MOD_LIBS) $(@PLAT@_LINK_LIBS)
|
||||
|
||||
+# option to pass to $(CC) to support library symbol versioning, if any
|
||||
+VERSION_OPTION = @VERSION_OPTION@
|
||||
+
|
||||
LTSTATIC = @LTSTATIC@
|
||||
|
||||
LTLINK = $(LIBTOOL) --mode=link \
|
||||
@@ -113,7 +116,7 @@
|
||||
$(CC) $(LT_CFLAGS) $(LT_CPPFLAGS) $(LIB_DEFS) -c
|
||||
|
||||
LTLINK_LIB = $(LIBTOOL) $(LTONLY_LIB) --mode=link \
|
||||
- $(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_LIB)
|
||||
+ $(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_LIB) $(VERSION_FLAGS)
|
||||
|
||||
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 @@
|
||||
fi
|
||||
AC_SUBST(LTSTATIC)dnl
|
||||
|
||||
+VERSION_OPTION=""
|
||||
+OL_SYMBOL_VERSIONING
|
||||
+if test $ol_cv_ld_version_script_option = yes ; then
|
||||
+ VERSION_OPTION="-Wl,--version-script="
|
||||
+fi
|
||||
+AC_SUBST(VERSION_OPTION)
|
||||
+
|
||||
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
|
||||
@@ -135,7 +135,7 @@
|
||||
associated indexes live.
|
||||
A separate directory must be specified for each database.
|
||||
The default is
|
||||
-.BR LOCALSTATEDIR/openldap\-data .
|
||||
+.BR LOCALSTATEDIR/lib/openldap .
|
||||
.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 @@
|
||||
# The database directory MUST exist prior to
|
||||
# running slapd AND should only be accessible
|
||||
# by the slapd/tools. Mode 0700 recommended.
|
||||
-directory LOCALSTATEDIR/openldap\-data
|
||||
+directory LOCALSTATEDIR/lib/openldap
|
||||
# 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
|
||||
@@ -39,7 +39,7 @@
|
||||
#define LDAP_ENV_PREFIX "LDAP"
|
||||
|
||||
/* default ldapi:// socket */
|
||||
-#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi"
|
||||
+#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi"
|
||||
|
||||
/*
|
||||
* SLAPD DEFINITIONS
|
||||
@@ -47,7 +47,7 @@
|
||||
/* location of the default slapd config file */
|
||||
#define SLAPD_DEFAULT_CONFIGFILE LDAP_SYSCONFDIR LDAP_DIRSEP "slapd.conf"
|
||||
#define SLAPD_DEFAULT_CONFIGDIR LDAP_SYSCONFDIR LDAP_DIRSEP "slapd.d"
|
||||
-#define SLAPD_DEFAULT_DB_DIR LDAP_RUNDIR LDAP_DIRSEP "openldap-data"
|
||||
+#define SLAPD_DEFAULT_DB_DIR LDAP_RUNDIR LDAP_DIRSEP "lib" LDAP_DIRSEP "openldap"
|
||||
#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
|
||||
@@ -38,6 +38,9 @@
|
||||
XXLIBS =
|
||||
NT_LINK_LIBS = $(AC_LIBS)
|
||||
UNIX_LINK_LIBS = $(AC_LIBS)
|
||||
+ifneq (,$(VERSION_OPTION))
|
||||
+ VERSION_FLAGS = "$(VERSION_OPTION)$(srcdir)/liblber.map"
|
||||
+endif
|
||||
|
||||
dtest: $(XLIBS) dtest.o
|
||||
$(LTLINK) -o $@ dtest.o $(LIBS)
|
||||
@@ -48,6 +51,6 @@
|
||||
|
||||
install-local: FORCE
|
||||
-$(MKDIR) $(DESTDIR)$(libdir)
|
||||
- $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir)
|
||||
+ $(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 @@
|
||||
+OPENLDAP_2.4_2 {
|
||||
+ global:
|
||||
+ ber_*;
|
||||
+ der_alloc;
|
||||
+ lutil_*;
|
||||
+ 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
|
||||
@@ -52,6 +52,9 @@
|
||||
XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS)
|
||||
NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
|
||||
UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
|
||||
+ifneq (,$(VERSION_OPTION))
|
||||
+ VERSION_FLAGS = $(VERSION_OPTION)$(srcdir)/libldap.map
|
||||
+endif
|
||||
|
||||
apitest: $(XLIBS) apitest.o
|
||||
$(LTLINK) -o $@ apitest.o $(LIBS)
|
||||
@@ -68,7 +71,7 @@
|
||||
|
||||
install-local: $(CFFILES) FORCE
|
||||
-$(MKDIR) $(DESTDIR)$(libdir)
|
||||
- $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir)
|
||||
+ $(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir)
|
||||
$(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
|
||||
@@ -61,6 +61,9 @@
|
||||
XXXLIBS = $(LTHREAD_LIBS)
|
||||
NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
|
||||
UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) $(LTHREAD_LIBS)
|
||||
+ifneq (,$(VERSION_OPTION))
|
||||
+ VERSION_FLAGS = "$(VERSION_OPTION)$(XXDIR)/libldap.map"
|
||||
+endif
|
||||
|
||||
.links : Makefile
|
||||
@for i in $(XXSRCS); do \
|
||||
@@ -83,6 +86,6 @@
|
||||
|
||||
install-local: $(CFFILES) FORCE
|
||||
-$(MKDIR) $(DESTDIR)$(libdir)
|
||||
- $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir)
|
||||
+ $(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
|
||||
@@ -376,10 +376,10 @@
|
||||
install-conf install-dbc-maybe install-schema install-tools
|
||||
|
||||
install-slapd: FORCE
|
||||
- -$(MKDIR) $(DESTDIR)$(libexecdir)
|
||||
+ -$(MKDIR) $(DESTDIR)$(sbindir)
|
||||
-$(MKDIR) $(DESTDIR)$(localstatedir)/run
|
||||
$(LTINSTALL) $(INSTALLFLAGS) $(STRIP) -m 755 \
|
||||
- slapd$(EXEEXT) $(DESTDIR)$(libexecdir)
|
||||
+ slapd$(EXEEXT) $(DESTDIR)$(sbindir)
|
||||
@for i in $(SUBDIRS); do \
|
||||
if test -d $$i && test -f $$i/Makefile ; then \
|
||||
echo; echo " cd $$i; $(MAKE) $(MFLAGS) install"; \
|
||||
@@ -445,9 +445,9 @@
|
||||
|
||||
install-db-config: FORCE
|
||||
@-$(MKDIR) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir)
|
||||
- @-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/openldap-data
|
||||
+ @-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/lib/openldap
|
||||
$(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \
|
||||
- $(DESTDIR)$(localstatedir)/openldap-data/DB_CONFIG.example
|
||||
+ $(DESTDIR)$(localstatedir)/lib/openldap/DB_CONFIG.example
|
||||
$(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \
|
||||
$(DESTDIR)$(sysconfdir)/DB_CONFIG.example
|
||||
|
||||
@@ -455,6 +455,6 @@
|
||||
-$(MKDIR) $(DESTDIR)$(sbindir)
|
||||
for i in $(SLAPTOOLS); do \
|
||||
$(RM) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \
|
||||
- $(LN_S) -f $(DESTDIR)$(libexecdir)/slapd$(EXEEXT) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \
|
||||
+ $(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
|
||||
@@ -10,12 +10,12 @@
|
||||
# service AND an understanding of referrals.
|
||||
#referral ldap://root.openldap.org
|
||||
|
||||
-pidfile %LOCALSTATEDIR%/run/slapd.pid
|
||||
-argsfile %LOCALSTATEDIR%/run/slapd.args
|
||||
+pidfile %LOCALSTATEDIR%/run/openldap/slapd.pid
|
||||
+argsfile %LOCALSTATEDIR%/run/openldap/slapd.args
|
||||
|
||||
# Load dynamic backend modules:
|
||||
-# modulepath %MODULEDIR%
|
||||
-# moduleload back_mdb.la
|
||||
+modulepath %MODULEDIR%
|
||||
+moduleload back_mdb.la
|
||||
# moduleload back_ldap.la
|
||||
|
||||
# Sample security restrictions
|
||||
@@ -60,6 +60,6 @@
|
||||
# The database directory MUST exist prior to running slapd AND
|
||||
# should only be accessible by the slapd and slap tools.
|
||||
# Mode 700 recommended.
|
||||
-directory %LOCALSTATEDIR%/openldap-data
|
||||
+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
|
||||
@@ -9,8 +9,8 @@
|
||||
#
|
||||
# Define global ACLs to disable default read access.
|
||||
#
|
||||
-olcArgsFile: %LOCALSTATEDIR%/run/slapd.args
|
||||
-olcPidFile: %LOCALSTATEDIR%/run/slapd.pid
|
||||
+olcArgsFile: %LOCALSTATEDIR%/run/openldap/slapd.args
|
||||
+olcPidFile: %LOCALSTATEDIR%/run/openldap/slapd.pid
|
||||
#
|
||||
# Do not enable referrals until AFTER you have a working directory
|
||||
# service AND an understanding of referrals.
|
||||
@@ -26,10 +26,11 @@
|
||||
#
|
||||
# Load dynamic backend modules:
|
||||
#
|
||||
-#dn: cn=module,cn=config
|
||||
-#objectClass: olcModuleList
|
||||
-#cn: module
|
||||
-#olcModulepath: %MODULEDIR%
|
||||
+dn: cn=module,cn=config
|
||||
+objectClass: olcModuleList
|
||||
+cn: module
|
||||
+olcModulepath: %MODULEDIR%
|
||||
+olcModuleload: back_mdb.la
|
||||
#olcModuleload: back_bdb.la
|
||||
#olcModuleload: back_hdb.la
|
||||
#olcModuleload: back_ldap.la
|
||||
@@ -90,6 +91,6 @@
|
||||
# The database directory MUST exist prior to running slapd AND
|
||||
# should only be accessible by the slapd and slap tools.
|
||||
# Mode 700 recommended.
|
||||
-olcDbDirectory: %LOCALSTATEDIR%/openldap-data
|
||||
+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
|
||||
@@ -46,6 +46,6 @@
|
||||
install-local: FORCE
|
||||
if test "$(BUILD_MOD)" = "yes"; then \
|
||||
$(MKDIR) $(DESTDIR)$(libdir); \
|
||||
- $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir); \
|
||||
+ $(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir); \
|
||||
fi
|
||||
|
||||
4689
src/patches/openldap-2.6.1-consolidated-2.patch
Normal file
4689
src/patches/openldap-2.6.1-consolidated-2.patch
Normal file
File diff suppressed because it is too large
Load Diff
@@ -1,31 +0,0 @@
|
||||
--- include/ldap_pvt_thread.h~ 2008-11-12 07:37:16.000000000 +0000
|
||||
+++ include/ldap_pvt_thread.h 2008-11-12 08:01:45.000000000 +0000
|
||||
@@ -59,12 +59,12 @@
|
||||
|
||||
#ifndef LDAP_PVT_THREAD_H_DONE
|
||||
#define LDAP_PVT_THREAD_SET_STACK_SIZE
|
||||
-#ifndef LDAP_PVT_THREAD_STACK_SIZE
|
||||
- /* LARGE stack. Will be twice as large on 64 bit machine. */
|
||||
-#define LDAP_PVT_THREAD_STACK_SIZE ( 1 * 1024 * 1024 * sizeof(void *) )
|
||||
/* May be explicitly defined to zero to disable it */
|
||||
-#elif LDAP_PVT_THREAD_STACK_SIZE == 0
|
||||
+#if LDAP_PVT_THREAD_STACK_SIZE == 0
|
||||
#undef LDAP_PVT_THREAD_SET_STACK_SIZE
|
||||
+#elif !defined(LDAP_PVT_THREAD_STACK_SIZE)
|
||||
+ /* LARGE stack. Will be twice as large on 64 bit machine. */
|
||||
+#define LDAP_PVT_THREAD_STACK_SIZE ( 1 * 1024 * 1024 * sizeof(void *) )
|
||||
#endif
|
||||
#endif /* !LDAP_PVT_THREAD_H_DONE */
|
||||
|
||||
--- libraries/libldap/os-ip.c~ 2008-11-12 07:33:10.000000000 +0000
|
||||
+++ libraries/libldap/os-ip.c 2008-11-12 07:33:31.000000000 +0000
|
||||
@@ -690,7 +690,7 @@
|
||||
char *herr;
|
||||
#ifdef NI_MAXHOST
|
||||
char hbuf[NI_MAXHOST];
|
||||
-#elif defined( MAXHOSTNAMELEN
|
||||
+#elif defined( MAXHOSTNAMELEN )
|
||||
char hbuf[MAXHOSTNAMELEN];
|
||||
#else
|
||||
char hbuf[256];
|
||||
|
||||
Reference in New Issue
Block a user