diff --git a/Fix-FTBFS-Increase-the-over-estimation-for-sparse-files.patch b/Fix-FTBFS-Increase-the-over-estimation-for-sparse-files.patch deleted file mode 100644 index 5e5ed3d83c443af2f824492ac1d4b1a50928552a..0000000000000000000000000000000000000000 --- a/Fix-FTBFS-Increase-the-over-estimation-for-sparse-files.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 9d935795ea5a3294f82fe65cca17c79a7b6589f0 Mon Sep 17 00:00:00 2001 -From: Mathieu Parent -Date: Thu, 25 Jun 2020 09:48:04 +0200 -Subject: [PATCH] Fix FTBFS / Increase the over-estimation for sparse files - -BUG: https://bugzilla.samba.org/show_bug.cgi?id=14418 -Signed-off-by: Mathieu Parent -Reviewed-by: Andrew Bartlett -Reviewed-by: Douglas Bagnall - -Autobuild-User(master): Andrew Bartlett -Autobuild-Date(master): Tue Aug 25 04:23:19 UTC 2020 on sn-devel-184 ---- - lib/ldb/tests/ldb_kv_ops_test.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/lib/ldb/tests/ldb_kv_ops_test.c b/lib/ldb/tests/ldb_kv_ops_test.c -index 30adebf1952..9db2212895f 100644 ---- a/tests/ldb_kv_ops_test.c -+++ b/tests/ldb_kv_ops_test.c -@@ -1717,8 +1717,11 @@ static void test_get_size(void **state) - /* - * The tdb implementation of get_size over estimates for sparse files - * which is perfectly acceptable for it's intended use. -+ * mipsel, ia64: 9994 -+ * ppc64el, powerpc, ppc64: 13369 -+ * sparc64: 5046 - */ -- assert_in_range(size, 2500, 5000); -+ assert_in_range(size, 2500, 15000); - #endif - - /* -@@ -1746,8 +1749,11 @@ static void test_get_size(void **state) - /* - * The tdb implementation of get_size over estimates for sparse files - * which is perfectly acceptable for it's intended use. -+ * mipsel, ia64: 9994 -+ * ppc64el, powerpc, ppc64: 13369 -+ * sparc64: 5046 - */ -- assert_in_range(size, 2500, 5000); -+ assert_in_range(size, 2500, 15000); - #endif - talloc_free(tmp_ctx); - } --- -GitLab diff --git a/Skip-ldb_lmdb_free_list_test-on-ppc64el-ppc64-and-sp.patch b/backport-Skip-ldb_lmdb_free_list_test-on-ppc64el-ppc64-and-sp.patch similarity index 53% rename from Skip-ldb_lmdb_free_list_test-on-ppc64el-ppc64-and-sp.patch rename to backport-Skip-ldb_lmdb_free_list_test-on-ppc64el-ppc64-and-sp.patch index a608299ebe7124397bb55538c2a8a61560c7d94e..cc566b9023df5b21df14e5056c261e03d3bf8ba8 100644 --- a/Skip-ldb_lmdb_free_list_test-on-ppc64el-ppc64-and-sp.patch +++ b/backport-Skip-ldb_lmdb_free_list_test-on-ppc64el-ppc64-and-sp.patch @@ -8,20 +8,22 @@ Workaround: https://bugzilla.samba.org/show_bug.cgi?id=14404 wscript | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -diff -ruNa ldb-2.1.4/wscript ldb-2.1.4-org/wscript ---- ldb-2.1.4/wscript 2021-03-23 11:14:55.530512420 +0800 -+++ ldb-2.1.4-org/wscript 2020-06-25 16:43:52.000000000 +0800 -@@ -635,8 +635,9 @@ - # fit > 4G of data into the DB), it would fill up the disk on - # many of our test instances - 'ldb_mdb_kv_ops_test', -+ 'ldb_key_value_sub_txn_mdb_test'] +diff --git a/wscript b/wscript +index 9866901..17a9f14 100644 +--- a/wscript ++++ b/wscript +@@ -651,8 +651,9 @@ def test(ctx): + # we can fit > 4G of data into the DB), it would fill up + # the disk on many of our test instances + 'ldb_mdb_kv_ops_test', +- 'ldb_key_value_sub_txn_mdb_test', +- 'ldb_lmdb_free_list_test'] ++ 'ldb_key_value_sub_txn_mdb_test'] + if os.environ.get('DEB_HOST_ARCH', 'unknown') not in ['alpha', 'ia64', 'mips64el', 'ppc64el', 'ppc64', 'sparc64', 'unknown']: + test_exes += ['ldb_lmdb_free_list_test'] -- 'ldb_key_value_sub_txn_mdb_test', -- 'ldb_lmdb_free_list_test'] else: test_exes += ['ldb_no_lmdb_test'] + +-- +2.27.0 --- -2.26.2 diff --git a/ldb-2.1.4.tar.asc b/ldb-2.1.4.tar.asc deleted file mode 100644 index fbbfca2c0cb67571875f0e965464f2dc3dd104fe..0000000000000000000000000000000000000000 --- a/ldb-2.1.4.tar.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQFJBAABCgAzFiEEkUejOXGVGO6QEby1R5ORYRMIQCUFAl79kUYVHHNhbWJhLWJ1 -Z3NAc2FtYmEub3JnAAoJEEeTkWETCEAlkj0H/3lSR4OY+c0VuIH96kA81qNsXTU/ -N9t+sItsMGlOStRerBOW2kQrerXndDSNPMsdiPzTgL4Kl983C00KPDTjvZLeeTAn -OvjX6OZx9BSRIjtr+y/AE41mMIZNt3obSLe8XBWz8vYWszhNKfJE+lSrGG+wlVck -sBGsZiGX1Wb6ps0RwQ1SDdtdjKAQnloDLl2V/ivUrAQzbp6xV0H4emPz6RmKVu9R -QpPUHuuRix+cKzuZLJbYf/tJK5FoOV+2GVBQGhLfhSPlX32hiplYXBQw1uxXA0XM -xsQqQn/oOFv89IAqw4Qb4RFG2vxVxFYGqIhCpRPm9sZccxdDSuPsMu5Eme8= -=FbtO ------END PGP SIGNATURE----- diff --git a/ldb-2.1.4.tar.gz b/ldb-2.1.4.tar.gz deleted file mode 100644 index 4ad12403e4eafc170e3848f394fdb2dcde7de06c..0000000000000000000000000000000000000000 Binary files a/ldb-2.1.4.tar.gz and /dev/null differ diff --git a/ldb-2.4.1.tar.asc b/ldb-2.4.1.tar.asc new file mode 100644 index 0000000000000000000000000000000000000000..ddb5750ac5dabc2ace69698bdeb123616769a343 --- /dev/null +++ b/ldb-2.4.1.tar.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEEkUejOXGVGO6QEby1R5ORYRMIQCUFAmF5NesACgkQR5ORYRMI +QCW4Mwf9F08o0VWPyvCrYdqnpOT6D5HFsrJwwuisMptoflDLfH4a+MRBPlcRBhMT +Ss6DSFb36bmjcNlSJeLdHtqp9LxaoQA4xOw4mWhxnrzQimrIass1h24FOwv5RpCu +EXmNCbRwp22e/e8ntFeKd7wiYBcoOHqM39jMjGbfhksbglemhMpyL92zjyzuHXPD +QeHibpPIZYlCy89LHQgHcUyyLzYN06lRQ5MKKojrerQ7LlsyvGM+EHS0X81683CM +lW2CkQKjFCKRS6tjXCEX1NEj3Xw4gltI3MiaH96ZnecftlINp8vIloqi1NkOK7hl +QylusnpzRqOXL2hr514wJr9F21Mslg== +=RW3H +-----END PGP SIGNATURE----- diff --git a/ldb-2.4.1.tar.gz b/ldb-2.4.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..0e422b76ea2cb1f12bd36d43b135ed9a09e16255 Binary files /dev/null and b/ldb-2.4.1.tar.gz differ diff --git a/libldb.spec b/libldb.spec index 43124fccbe267d1ab23ace3e23a48ebd6d5c4871..b28b9a63b34a7d272776ad5278a92760029c8562 100644 --- a/libldb.spec +++ b/libldb.spec @@ -1,12 +1,12 @@ %global with_lmdb 1 %global with_python3 1 -%global talloc_version 2.3.1 -%global tdb_version 1.4.3 -%global tevent_version 0.10.2 +%global talloc_version 2.3.3 +%global tdb_version 1.4.4 +%global tevent_version 0.11.0 Name: libldb -Version: 2.1.4 -Release: 4 +Version: 2.4.1 +Release: 1 Summary: A schema-less, ldap like, API and database Requires: libtalloc%{?_isa} >= %{talloc_version} Requires: libtdb%{?_isa} >= %{tdb_version} @@ -16,8 +16,7 @@ URL: http://ldb.samba.org/ Source0: http://samba.org/ftp/ldb/ldb-%{version}.tar.gz Source1: http://samba.org/ftp/ldb/ldb-%{version}.tar.asc -Patch0: Fix-FTBFS-Increase-the-over-estimation-for-sparse-files.patch -Patch1: Skip-ldb_lmdb_free_list_test-on-ppc64el-ppc64-and-sp.patch +Patch0: backport-Skip-ldb_lmdb_free_list_test-on-ppc64el-ppc64-and-sp.patch BuildRequires: gcc libtalloc-devel >= %{talloc_version} libtdb-devel >= %{tdb_version} BuildRequires: libtevent-devel >= %{tevent_version} lmdb-devel >= 0.9.16 popt-devel @@ -86,16 +85,14 @@ export python_LDFLAGS="" %{?without_lmdb_flags} \ --with-privatelibdir=%{_libdir}/ldb -make %{?_smp_mflags} V=1 +%make_build V=1 doxygen Doxyfile %check -echo disabling one assertion in tests/python/repack.py -sed -e '/test_guid_indexed_v1_db/,+18{/toggle_guidindex_check_pack/d}' -i tests/python/repack.py make %{?_smp_mflags} check %install -make install DESTDIR=$RPM_BUILD_ROOT +%make_install cp -a apidocs/man/* $RPM_BUILD_ROOT/%{_mandir} rm -f $RPM_BUILD_ROOT/%{_mandir}/man3/_* @@ -173,6 +170,12 @@ echo "%{_libdir}/ldb" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf %{_mandir}/man1/ldbsearch.1.* %changelog +* Wed Dec 15 2021 yanglu - 2.4.1-1 +- Type:update +- ID:NA +- SUG:NA +- DESC:update to 2.4.1 + * Tue Sep 07 2021 gaihuiying - 2.1.4-4 - Type:requirement - ID:NA