diff --git a/fix_ldb_mod_op_test.patch b/fix_ldb_mod_op_test.patch deleted file mode 100644 index 4fc421f..0000000 --- a/fix_ldb_mod_op_test.patch +++ /dev/null @@ -1,31 +0,0 @@ -commit f8b368c9f0c2a34b6d15303a9d6facd762e1a517 -Author: Andrew Bartlett -Date: Thu Mar 8 14:01:50 2018 +1300 - - ldb: Fix missing NULL terminator in ldb_mod_op_test testsuite - - Signed-off-by: Andrew Bartlett - Reviewed-by: Gary Lockyer - -diff --git a/lib/ldb/tests/ldb_mod_op_test.c b/lib/ldb/tests/ldb_mod_op_test.c -index d024ab66e3e..59fc766e918 100644 ---- a/tests/ldb_mod_op_test.c -+++ b/tests/ldb_mod_op_test.c -@@ -3099,7 +3099,7 @@ static int ldb_unique_index_test_setup(void **state) - "dn: @INDEXLIST\n" - "@IDXATTR: cn\n" - "\n"; -- const char *options[] = {"modules:unique_index_test"}; -+ const char *options[] = {"modules:unique_index_test", NULL}; - - - ret = ldb_register_module(&ldb_unique_index_test_module_ops); -@@ -3201,7 +3201,7 @@ static int ldb_non_unique_index_test_setup(void **state) - "dn: @INDEXLIST\n" - "@IDXATTR: cn\n" - "\n"; -- const char *options[] = {"modules:unique_index_test"}; -+ const char *options[] = {"modules:unique_index_test", NULL}; - - - ret = ldb_register_module(&ldb_unique_index_test_module_ops); diff --git a/ldb-1.3.5.tar.asc b/ldb-1.3.5.tar.asc deleted file mode 100644 index cc17826..0000000 --- a/ldb-1.3.5.tar.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQFJBAABCgAzFiEEkUejOXGVGO6QEby1R5ORYRMIQCUFAltymLkVHHNhbWJhLWJ1 -Z3NAc2FtYmEub3JnAAoJEEeTkWETCEAlkpYIAK+8BqdhMKah1mIebqFahqqqSYVj -piAViKtkeu7/wn7S/D/lJ+XwTGT/VdWOgwMQGCrmDqH0YWyNR8KUAum57kdtfMbA -18pHesusufAVvAGlDRgEtyKI/Pt6ma7DeBWrYt4PgYBmVBWhbZBmEkWz2bysAtnT -cPrMROaiMoMno86yEISXFbjC+pO2xx4dL7sXuINn9CWnJ3ErMVyzBg3gsahL3cYN -yJ9Rykc57Ns0HAOhuyjp1vR4F2yWkk7OeHMZJAVkXmqfBFq64p6ZWhBLslPNyhMs -vUijQuLX8dW5Qq0kNWgVWrqVJtGTbdHLsW9vGN+9a1JFf6xgzXH+AtHdcWc= -=VZ1L ------END PGP SIGNATURE----- diff --git a/ldb-1.3.5.tar.gz b/ldb-1.3.5.tar.gz deleted file mode 100644 index 03da688..0000000 --- a/ldb-1.3.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4c26efac83efea0b467a4afab413ed91557f0c299428114bf92f72fb7d03b4f6 -size 1374214 diff --git a/ldb-1.4.2.tar.asc b/ldb-1.4.2.tar.asc new file mode 100644 index 0000000..32586e0 --- /dev/null +++ b/ldb-1.4.2.tar.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQFJBAABCgAzFiEEkUejOXGVGO6QEby1R5ORYRMIQCUFAltzLJsVHHNhbWJhLWJ1 +Z3NAc2FtYmEub3JnAAoJEEeTkWETCEAlxHEIALWnq9F6T+7zTV9ONZ3vA0NAjuYv +RsZRC7qxDLAESViE7FDBN2w0HOX3IXA3jisBAUlvcZuMUvkC3v5KNOvtDRuuz+gW +ZTQfSrgiTAOJrYJyH6+Jzk04gehPsi05rbK+STq0JjaFF5T124DdXyHjYPInzFeJ +CEmflAqcnCUsy0fLylBQb1YGvhG0TNB5uzHbD4d/7jnvkJ58agjNNkygecTclIjb +HmBThkLWp433Wm1Dtp7K6nz8bvnZU1a+eQHjO7q6HCADtE8RhdHC3hw0ieHQoiY4 +ZIJgNbfTdAnHEOD+YpKdYEuUDNN8EKTNJBxhgTUurAIxoNxJIYA39tyBIKM= +=Mqnb +-----END PGP SIGNATURE----- diff --git a/ldb-1.4.2.tar.gz b/ldb-1.4.2.tar.gz new file mode 100644 index 0000000..6301318 --- /dev/null +++ b/ldb-1.4.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:07b0a39c833f0ce2b635dc8dd97f9aca872e91b185247073d4b404acad40365c +size 1427857 diff --git a/ldb.changes b/ldb.changes index 26d3c47..8713052 100644 --- a/ldb.changes +++ b/ldb.changes @@ -1,3 +1,38 @@ +------------------------------------------------------------------- +Tue Sep 25 07:35:57 UTC 2018 - Samuel Cabrero + +- Update license to LGPL-3.0 + +------------------------------------------------------------------- +Fri Aug 17 15:21:40 UTC 2018 - dmulder@suse.com + ++- 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) + ------------------------------------------------------------------- Wed Aug 15 21:52:13 UTC 2018 - dmulder@suse.com diff --git a/ldb.spec b/ldb.spec index e395c98..f27b765 100644 --- a/ldb.spec +++ b/ldb.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -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,18 +62,20 @@ 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 +License: LGPL-3.0-or-later Group: Development/Libraries/C and C++ Source: https://download.samba.org/pub/ldb/ldb-%{version}.tar.gz 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 @@ -146,7 +156,6 @@ LDB library. %prep %setup -n ldb-%{version} -q %patch0 -p1 -%patch1 -p1 %build %if 0%{?suse_version} > 1110 @@ -173,6 +182,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 +194,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 +240,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)