Accepting request 635588 from home:dmulder:branches:network:samba:STABLE:4.9

- Update to 1.4.2
  + Security fix for CVE-2018-1140 (NULL pointer de-reference, bug 13374)
  + Fix memory leaks and missing error checks (bug 13459, 13471, 13475)
- 1.4.1
  + add some missing return value checks
  + Fix several mem leaks in ldb_index ldb_search ldb_tdb (bug#13475)
  + ldb_tdb: Use mem_ctx and so avoid leak onto long-term memory
    on duplicated add. (bug#13471)
  + ldb: Fix memory leak on module context (bug#13459)
  + Refused build of Samba 4.8 with ldb 1.4 (bug #13519)
  + Prevent similar issues in the future at configure time (bug #13519)
- 1.4.0
  + New LMDB backend (experimental)
  + Comprehensive tests for index behaviour
  + Enforce transactions for writes
  + Enforce read lock use for all reads
  + Fix memory leak in paged_results module.
    We hold at most 10 outstanding paged result cookies
    (bug #13362)
  + Fix compiler warnings
  + Python3 improvements
  + Restore --disable-python build
  + Fix for performance regression on one-level searches
    (bug #13448)
  + Samba's subtree_rename could fail to rename some entries
    (bug #13452)

OBS-URL: https://build.opensuse.org/request/show/635588
OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/ldb?expand=0&rev=127

ldb.spec

@@ -25,7 +25,15 @@
 %define with_python3 0
 %endif
 
-%define talloc_version 2.1.11
+%global with_lmdb 0
+%if 0%{?suse_version} > 1320
+%ifarch x86_64
+%global with_lmdb 1
+%endif
+%endif
+
+%define lmdb_version 0.9.16
+%define talloc_version 2.1.14
 %define tdb_version 1.3.15
 %define tevent_version 0.9.36
 
@@ -54,8 +62,11 @@ BuildRequires:  python-talloc-devel >= %{talloc_version}
 %if 0%{?suse_version} >= 1330
 BuildRequires:  libtirpc-devel
 %endif
+%if %{with_lmdb}
+BuildRequires:  lmdb-devel >= %{lmdb_version}
+%endif
 Url:            https://ldb.samba.org/
-Version:        1.3.5
+Version:        1.4.2
 Release:        0
 Summary:        An LDAP-like embedded database
 License:        GPL-3.0-or-later
@@ -65,7 +76,6 @@ Source1:        https://download.samba.org/pub/ldb/ldb-%{version}.tar.asc
 Source2:        ldb.keyring
 Source4:        baselibs.conf
 Patch0:         ldb-python3.5-fix-soabi_name.patch
-Patch1:         fix_ldb_mod_op_test.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -75,6 +85,9 @@ LDB is an LDAP-like embedded database.
 %package -n libldb1
 Summary:        An LDAP-like embedded database
 Group:          System/Libraries
+%if %{with_lmdb}
+Requires:       lmdb >= %{lmdb_version}
+%endif
 
 %description -n libldb1
 LDB is an LDAP-like embedded database.
@@ -146,7 +159,6 @@ LDB library.
 %prep
 %setup -n ldb-%{version} -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %if 0%{?suse_version} > 1110
@@ -173,6 +185,9 @@ CONFIGURE_OPTIONS="\
 %if %{with_python3}
 	--extra-python=/usr/bin/python3 \
 %endif
+%if !%{with_lmdb}
+	--without-ldb-lmdb \
+%endif
 "
 ./configure ${CONFIGURE_OPTIONS}
 make %{?_smp_mflags} \
@@ -182,7 +197,7 @@ doxygen Doxyfile
 rm -f apidocs/man/man3/_*_ldb-%{version}_include_.3
 
 %check
-%ifnarch ppc64 s390x
+%if %{with_lmdb}
 LD_LIBRARY_PATH="bin/shared:bin/shared/private" \
 LDB_MODULES_PATH="bin/modules" \
 make test
@@ -228,6 +243,12 @@ sed -i 's;-lpyldb-util.%{py3_soflags_dash};-lpyldb-util.%{py3_soflags};g' %{buil
 %ifarch ppc
 %{_libdir}/ldb/libcmocka-ldb.so
 %endif
+%{_libdir}/ldb/ldb.so
+%{_libdir}/ldb/libldb-key-value.so
+%if %{with_lmdb}
+%{_libdir}/ldb/libldb-mdb-int.so
+%{_libdir}/ldb/mdb.so
+%endif
 
 %files -n libldb-devel
 %defattr(-,root,root)