import libldb-2.4.1-1.el9

.gitignore

@@ -1,3 +1,2 @@
-SOURCES/fixed-guidindexpackv1.ldb
+SOURCES/ldb-2.4.1.tar.gz
-SOURCES/ldb-2.3.0.tar.gz
 SOURCES/ldb.keyring

.libldb.metadata

@@ -1,3 +1,2 @@
-c3b43fb6d944c7fb78dbfd2d696cbe18d2cb418a SOURCES/fixed-guidindexpackv1.ldb
+420d106ef5422ce91e2115e5733c769f68649edb SOURCES/ldb-2.4.1.tar.gz
-71c12e1c5914172c450c992dae3b90c1f01b2419 SOURCES/ldb-2.3.0.tar.gz
 8ac6d09878c4218fb8e365fcf5a877a621dd40f9 SOURCES/ldb.keyring

SOURCES/ldb-2.3.0-fix-tests-on-aarch64.patch

@@ -1,39 +0,0 @@
-From e90817629f1f7049cc0fe48f1003f5fb1103acc3 Mon Sep 17 00:00:00 2001
-From: Gary Lockyer <gary@catalyst.net.nz>
-Date: Thu, 22 Apr 2021 10:03:53 +0200
-Subject: [PATCH 1/2] lib:ldb: Use a 1MiB lmdb so the test also passes on
- aarch64 CentOS stream
-
-Signed-off-by: Gary Lockyer <gary@catalyst.net.nz>
-Reviewed-by: Andreas Schneider <asn@samba.org>
----
- lib/ldb/tests/ldb_lmdb_free_list_test.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/lib/ldb/tests/ldb_lmdb_free_list_test.c b/lib/ldb/tests/ldb_lmdb_free_list_test.c
-index 9b295460730..c87620e7a87 100644
---- a/tests/ldb_lmdb_free_list_test.c
-+++ b/tests/ldb_lmdb_free_list_test.c
-@@ -77,7 +77,7 @@
- #endif /* TEST_BE */
- 
- const int RECORD_SIZE = 6144;
--const int ITERATIONS = 3;
-+const int ITERATIONS = 192;
- 
- struct test_ctx {
- 	struct tevent_context *ev;
-@@ -155,9 +155,9 @@ static int setup(void **state)
- 				 "@IDX_DN_GUID: GUID\n"
- 				 "\n";
- 	/*
--	 * Use a 64KiB DB for this test
-+	 * Use a 1MiB DB for this test
- 	 */
--	const char *options[] = {"lmdb_env_size:65536", NULL};
-+	const char *options[] = {"lmdb_env_size:1048576", NULL};
- 
- 	noconn_setup((void **)&test_ctx);
- 
--- 
-2.31.1

SOURCES/ldb-2.3.0.tar.asc

@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQEzBAABCgAdFiEEkUejOXGVGO6QEby1R5ORYRMIQCUFAmBbDpgACgkQR5ORYRMI
-QCVgZQf/WyIcMhD9EAzJzMOGjantl0hXloCjnyT/vBpchWYwviU73cu65H/po+AO
-PgYMEvZfw8mLrMjSS+Dyr/76E+4MLjmnU02yISL4dJ+9EZ268xpMVELxHTYb9W+P
-aql8R0fcODqyHmEr3xPV0br+rcqkM6Wqekp2OcwRDgmtl7EN9/nJOThZ4Un4mEL9
-0oJKPllWLfPEBfk5j+UXinPGARBKj3txl1IkNinoXh7LiQ4y7GrEg2BSpsQV8YLe
-EDEBzK4fxPWLwbWWwAUSXgQNJ1GXwxZo6P2Fl9vKNDfxz8+2Xp24zyQBraWX7IqV
-6+aRuYQSmrH6tKX9OZCmCKJtT2qcdQ==
-=qIvP
------END PGP SIGNATURE-----

SOURCES/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-----

SPECS/libldb.spec

@@ -19,13 +19,13 @@
 %bcond_with python3
 %endif
 
-%global talloc_version 2.3.1
+%global talloc_version 2.3.3
-%global tdb_version 1.4.3
+%global tdb_version 1.4.4
-%global tevent_version 0.10.2
+%global tevent_version 0.11.0
 
 Name: libldb
-Version: 2.3.0
+Version: 2.4.1
-Release: 6%{?dist}
+Release: 1%{?dist}
 Summary: A schema-less, ldap like, API and database
 Requires: libtalloc%{?_isa} >= %{talloc_version}
 Requires: libtdb%{?_isa} >= %{tdb_version}
@@ -36,14 +36,9 @@ Source0: https://www.samba.org/ftp/ldb/ldb-%{version}.tar.gz
 Source1: https://www.samba.org/ftp/ldb/ldb-%{version}.tar.asc
 # gpg2 --no-default-keyring --keyring ./ldb.keyring --recv-keys 9147A339719518EE9011BCB54793916113084025
 Source2: ldb.keyring
-# binary diffs are not supported
-# https://gitlab.com/samba-team/samba/-/merge_requests/1920
-Source3: fixed-guidindexpackv1.ldb
 
 # Patches
 Patch0001: 0001-PATCH-wafsamba-Fix-few-SyntaxWarnings-caused-by-regu.patch
-# https://gitlab.com/samba-team/samba/-/merge_requests/1920
-Patch0002: ldb-2.3.0-fix-tests-on-aarch64.patch
 
 BuildRequires: gcc
 BuildRequires: libtalloc-devel >= %{talloc_version}
@@ -132,9 +127,6 @@ Development files for the Python bindings for the LDB library
 zcat %{SOURCE0} | gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} -
 %autosetup -n ldb-%{version} -p1
 
-# binary diffs are not supported
-cp -f %{SOURCE3} tests/guidindexpackv1.ldb
-
 %build
 # workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1217376
 export python_LDFLAGS=""
@@ -230,6 +222,9 @@ rm -f $RPM_BUILD_ROOT/%{_mandir}/man3/_*
 %endif
 
 %changelog
+* Mon Nov 29 2021 Pavel Filipenský <pfilipen@redhat.com> - 2.4.1-1
+- resolves: rhbz#2013588 - Rebase to version 2.4.1
+
 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.3.0-6
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688