Skip to content
This repository was archived by the owner on Dec 10, 2025. It is now read-only.

Commit 916663b

Browse files
erthinkerthink
committed
reopenldap: Merge branch 'master' into stable/1.1
Change-Id: Id0d496ee6f927088631e9563c47efb72f62af6eb
2 parents d47f530 + 01b7afd commit 916663b

33 files changed

+953
-615
lines changed

‎CHANGES.OpenLDAP‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ OpenLDAP 2.4 Change Log
22
WFE = Was Fixed Earlier in ReOpenLDAP.
33
NA = Not Applicable for ReOpenLDAP.
44

5-
OpenLDAP 2.4.46 Engineering
5+
OpenLDAP 2.4.47 Engineering
6+
7+
OpenLDAP 2.4.46 Release (2018/03/22)
68
Fixed libldap connection delete callbacks when TLS fails to start (ITS#8717)
79
Fixed libldap to not reuse tls_session if TLS hostname check fails (ITS#7373)
810
Fixed libldap cross-compiling with OpenSSL 1.1 (ITS#8687)
@@ -39,6 +41,7 @@ OpenLDAP 2.4.46 Engineering
3941
Documentation
4042
Delete stub manpage for back-ldbm (ITS#8713)
4143
Fixed ldap_bind(3) to mention the LDAP_SASL_SIMPLE mechanism (ITS#8121)
44+
Fixed ldap.conf(5) to note SASL_MECH/SASL_REALM are no longer user-only (ITS#8818)
4245
Fixed slapd-config(5) typo for olcTLSCipherSuite (ITS#8715)
4346
Fixed slapo-syncprov(5) indexing requirements (ITS#5048)
4447

‎ChangeLog‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
New features and Compatibility breaking
22
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3+
2018-06-04 v1.1.8
34
2018-02-23 v1.1.7
45
2018-01-30 libreldap: import - Public key pinning support (ITS#8753).
56
2018-01-28 libunicode: import - Allow to recognize title-case characters even if they do not have lower-case equivalents (ITS#8508).
@@ -93,6 +94,9 @@ New features and Compatibility breaking
9394

9495
Documentation
9596
~~~~~~~~~~~~~
97+
2018-06-04 v1.1.8
98+
2018-03-20 man: SASL_MECH/SASL_REALM are not user-only (ITS#8818).
99+
2018-02-27 man: fix SIGHUB typo.
96100
2018-02-23 v1.1.7
97101
2018-02-11 man, contrib: fix one more typo.
98102
2018-02-11 automake: add Russian man-pages.
@@ -164,6 +168,10 @@ Documentation
164168

165169
Major and Security Bugs
166170
~~~~~~~~~~~~~~~~~~~~~~~
171+
2018-06-04 v1.1.8
172+
2018-05-04 mdbx: fix wrong freeDB search.
173+
2018-04-03 slapd: fix memory corruption in connection-handling code.
174+
2018-03-28 syncprov: fix op_response() segfault.
167175
2018-02-23 v1.1.7
168176
2018-02-05 back-ldap: fix search double-free and/or memory corruption.
169177
2018-01-22 overlay-sss: fix server-side-sort overlay segfault.
@@ -268,6 +276,12 @@ Major and Security Bugs
268276

269277
Minor Bugs
270278
~~~~~~~~~~
279+
2018-06-04 v1.1.8
280+
2018-05-24 syncprov: import - don't check for existing value when deleting values (ITS#8616).
281+
2018-05-05 slapd: import - fix domainScope control to ensure the control value is absent (ITS#8840).
282+
2018-05-04 mdbx: backport - can't use fakepage mp_ptrs directly (ITS#8819).
283+
2018-05-04 mdbx: backport - fix regression in 0.9.19 (ITS#8760).
284+
2018-05-04 mdbx: backport - fix FIRST_DUP/LAST_DUP cursor bounds check (ITS#8722).
271285
2018-02-23 v1.1.7
272286
2018-02-14 libmdbx: legacy - fix cursor ops (squashed ITS#8722).
273287
2018-02-13 overlay-dds: fix callbacks (invalid results or bug-check).
@@ -694,6 +708,9 @@ Minor Bugs
694708

695709
Performance
696710
~~~~~~~~~~~
711+
2018-06-04 v1.1.8
712+
2018-05-04 mdbx: backport - XCURSOR_REFRESH() fixups/cleanup.
713+
2018-03-12 syncprov, syncrepl, accesslog: reduce unnecessary writes of contextCSN entry (ITS#8789).
697714
2018-02-23 v1.1.7
698715
2018-02-15 slapd: isolate tsan-mutexes under #ifdef __SANITIZE_THREAD__.
699716
2018-02-13 accesslog: fix CSNs for purge logs.
@@ -750,6 +767,16 @@ Performance
750767

751768
Build
752769
~~~~~
770+
2018-06-04 v1.1.8
771+
2018-05-04 mdbx: fix check make target (minor).
772+
2018-04-04 reopenldap: refine bootstrap.sh
773+
2018-03-29 automake: fix -fno-lto for ".symver memcpy_compat, memcpy@@@GLIBC_2.2.5"
774+
2018-03-12 liblutil: fix warning variable 'hex' set but not used (minor).
775+
2018-03-12 libreldap, slapd: avoid trigraphs in comments (minor).
776+
2018-03-12 ldapmodify: fix 'uninit' warnigs form lcc (minor).
777+
2018-03-12 libreldap: fix callbacks for NSPR.
778+
2018-03-12 libreldap: #ifdef for SSL_LIBRARY_VERSION_TLS_1_3.
779+
2018-03-12 liblutil: fix 'uninit' warnig from lcc (minor).
753780
2018-02-23 v1.1.7
754781
2018-02-14 contrib-smbk5pwd: fix RELDAP_TLS/RELDAP_TLS_FALLBACK.
755782
2018-02-14 contrib-passwd-totp: fix RELDAP_TLS/RELDAP_TLS_FALLBACK.
@@ -882,6 +909,9 @@ Build
882909

883910
Cosmetics
884911
~~~~~~~~~
912+
2018-06-04 v1.1.8
913+
2018-05-04 mdbx: minor fixup comments and warnings.
914+
2018-03-23 reopenldap: sync CHANGES.OpenLDAP.
885915
2018-02-23 v1.1.7
886916
2018-02-14 tests: update its8800 to be less different from openldap.
887917
2018-02-14 tests: enumerate its-ignore messages.
@@ -944,6 +974,15 @@ Cosmetics
944974

945975
Other
946976
~~~~~
977+
2018-06-04 v1.1.8
978+
2018-05-24 tests: import - fix copypasta in its8444 regression script.
979+
2018-03-29 ci: add 'bootstrap' step info ps-build.sh
980+
2018-03-29 ci: drop support for old/legacy versions.
981+
2018-03-29 ci: rename CFLAGS to EXTRA_CFLAGS.
982+
2018-03-12 slapd: add backtrace support for Elbrus.
983+
2018-03-12 reopenldap: update reldap.h and ldap_cdefs.h for Elbrus.
984+
2018-03-12 libmdbx: update defs.h for Elbrus.
985+
2018-03-11 tests: import - Ensure there are no differences due to different checkpoints (ITS#8800).
947986
2018-02-23 v1.1.7
948987
2018-02-14 tests: skip its4336 regression for ldap-backend.
949988
2018-02-14 tests: skip its4326 regression for ldap-backend.

‎NEWS.md‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,60 @@
1+
v1.1.8 2018-06-04
2+
=================
3+
4+
## Briefly:
5+
1. Fixed MDBX major bug (DB corruption).
6+
2. Fixed slapd memory corruption and other segfaults.
7+
3. Fixed build for Elbrus architecture.
8+
9+
### New features and Compatibility breaking: _none_
10+
11+
### Documentation:
12+
2018-03-20 man: SASL_MECH/SASL_REALM are not user-only (ITS#8818).
13+
2018-02-27 man: fix SIGHUB typo.
14+
15+
### Major and Security bugs:
16+
2018-05-04 mdbx: fix wrong freeDB search.
17+
2018-04-03 slapd: fix memory corruption in connection-handling code.
18+
2018-03-28 syncprov: fix op_response() segfault.
19+
20+
### Minor bugs:
21+
2018-05-24 syncprov: import - don't check for existing value when deleting values (ITS#8616).
22+
2018-05-05 slapd: import - fix domainScope control to ensure the control value is absent (ITS#8840).
23+
2018-05-04 mdbx: backport - can't use fakepage mp_ptrs directly (ITS#8819).
24+
2018-05-04 mdbx: backport - fix regression in 0.9.19 (ITS#8760).
25+
2018-05-04 mdbx: backport - fix FIRST_DUP/LAST_DUP cursor bounds check (ITS#8722).
26+
27+
### Performance:
28+
2018-05-04 mdbx: backport - XCURSOR_REFRESH() fixups/cleanup.
29+
2018-03-12 syncprov, syncrepl, accesslog: reduce unnecessary writes of contextCSN entry (ITS#8789).
30+
31+
### Build:
32+
2018-05-04 mdbx: fix check make target (minor).
33+
2018-04-04 reopenldap: refine bootstrap.sh
34+
2018-03-29 automake: fix -fno-lto for ".symver memcpy_compat, memcpy@@@GLIBC_2.2.5"
35+
2018-03-12 liblutil: fix warning variable 'hex' set but not used (minor).
36+
2018-03-12 libreldap, slapd: avoid trigraphs in comments (minor).
37+
2018-03-12 ldapmodify: fix 'uninit' warnigs form lcc (minor).
38+
2018-03-12 libreldap: fix callbacks for NSPR.
39+
2018-03-12 libreldap: #ifdef for SSL_LIBRARY_VERSION_TLS_1_3.
40+
2018-03-12 liblutil: fix 'uninit' warnig from lcc (minor).
41+
42+
### Cosmetics:
43+
2018-05-04 mdbx: minor fixup comments and warnings.
44+
2018-03-23 reopenldap: sync CHANGES.OpenLDAP.
45+
46+
### Other:
47+
2018-05-24 tests: import - fix copypasta in its8444 regression script.
48+
2018-03-29 ci: add 'bootstrap' step info ps-build.sh
49+
2018-03-29 ci: drop support for old/legacy versions.
50+
2018-03-29 ci: rename CFLAGS to EXTRA_CFLAGS.
51+
2018-03-12 slapd: add backtrace support for Elbrus.
52+
2018-03-12 reopenldap: update reldap.h and ldap_cdefs.h for Elbrus.
53+
2018-03-12 libmdbx: update defs.h for Elbrus.
54+
2018-03-11 tests: import - Ensure there are no differences due to different checkpoints (ITS#8800).
55+
56+
--------------------------------------------------------------------------------
57+
158
v1.1.7 2018-02-23, Red Army Soldier
259
===================================
360

‎bootstrap.sh‎

Lines changed: 37 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,30 @@
1313
## top-level directory of the distribution or, alternatively, at
1414
## <http://www.OpenLDAP.org/license.html>.
1515

16+
function failure() {
17+
echo "Oops, $* failed ;(" >&2
18+
exit 2
19+
}
20+
21+
function patch_apply() {
22+
patch -t -l -N -p1 -i $1
23+
}
24+
25+
function patch_probe() {
26+
patch --dry-run -t -s -l -N -p1 -i $1 &>/dev/null
27+
}
28+
29+
function patch_apply_optional() {
30+
if patch_probe $1; then patch_apply $1; else true; fi
31+
}
32+
33+
###############################################################################
34+
1635
if [ "$1" = "--dont-cleanup" ]; then
1736
shift
1837
else
1938
rm -rf tests/testrun/*
20-
if ! git clean -x -f -d -e tests/testrun; then
21-
echo "cleanup failed" >&2; exit 2
22-
fi
39+
git clean -x -f -d -e tests/testrun -e releasenotes.txt || failure "cleanup"
2340
fi
2441

2542
if [ -z "$AUTORECONF" ]; then
@@ -34,10 +51,21 @@ if [ -z "$AUTORECONF" ]; then
3451
fi
3552
fi
3653

37-
if $AUTORECONF --force --install --include=build \
38-
&& (patch -p1 -i build/ltmain.sh.patch || patch -p1 -i build/ltmain-old.sh.patch) \
39-
&& (patch -p1 -i build/libltdl.patch || echo "Ignore build/libltdl patching errors"); then
40-
echo "done"; exit 0
41-
else
42-
echo "failed" >&2; exit 1
54+
$AUTORECONF --force --install --include=build || failure "autoreconf"
55+
56+
###############################################################################
57+
58+
patch_apply build/libltdl-clang-diagnostic.patch || failure "patch libltdl (clang-diagnostic)"
59+
patch_apply_optional build/libltdl-preopen-OPTIONAL.patch || failure "patch libltdl (preopen type-casting)"
60+
if grep -q 'suppress_opt=yes' build/ltmain.sh; then
61+
(patch_probe build/ltmain-sh-A-libtool-suppress-opt.patch \
62+
&& patch_apply build/ltmain-sh-A-libtool-suppress-opt.patch) \
63+
|| (patch_probe build/ltmain-sh-B-libtool-suppress-opt.patch \
64+
&& patch_apply build/ltmain-sh-B-libtool-suppress-opt.patch) \
65+
|| failure "patch libtool (suppess-opt default value)"
4366
fi
67+
68+
###############################################################################
69+
70+
echo "done"
71+
exit 0

‎build/BRANDING‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ PACKAGE=ReOpenLDAP
2222
PACKAGE_URL="https://github.com/leo-yuriev/ReOpenLDAP/wiki"
2323
PACKAGE_BUGREPORT="https://github.com/leo-yuriev/ReOpenLDAP/issues"
2424

25-
RELEASE_TYPE=Release
25+
RELEASE_TYPE=ReleaseEngineering
2626

2727
VERSION_MAJOR=1
2828
VERSION_MINOR=1
29-
VERSION_PATCH_LEVEL=7
29+
VERSION_PATCH_LEVEL=8
3030

3131
API_CURRENT=12
3232
API_REVISON=7

0 commit comments

Comments
 (0)