From f6675cfe5e9042537b3934e0135b661f113a5dac Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Fri, 26 Mar 2021 23:00:28 +0000
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/libldb.git#defb53fad2181e1b7e2a434ff6f2c415a76cc54c
---
 .gitignore  |  2 ++
 1420.patch  | 44 --------------------------------------------
 libldb.spec |  9 +++++----
 sources     |  4 ++--
 4 files changed, 9 insertions(+), 50 deletions(-)
 delete mode 100644 1420.patch

diff --git a/.gitignore b/.gitignore
index e4b6d5d..05726b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,3 +60,5 @@
 /ldb-2.1.4.tar.gz
 /ldb-2.2.0.tar.asc
 /ldb-2.2.0.tar.gz
+/ldb-2.3.0.tar.asc
+/ldb-2.3.0.tar.gz
diff --git a/1420.patch b/1420.patch
deleted file mode 100644
index c2199ef..0000000
--- a/1420.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 0e4fd77c1e03fe6351d129f2161b0b3313f5fa3d Mon Sep 17 00:00:00 2001
-From: Mathieu Parent <math.parent@gmail.com>
-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 <math.parent@gmail.com>
----
- 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/libldb.spec b/libldb.spec
index 285c5ce..f9e4380 100644
--- a/libldb.spec
+++ b/libldb.spec
@@ -24,8 +24,8 @@
 %global tevent_version 0.10.2
 
 Name: libldb
-Version: 2.2.0
-Release: 8%{?dist}
+Version: 2.3.0
+Release: 1%{?dist}
 Summary: A schema-less, ldap like, API and database
 Requires: libtalloc%{?_isa} >= %{talloc_version}
 Requires: libtdb%{?_isa} >= %{tdb_version}
@@ -39,8 +39,6 @@ Source2: ldb.keyring
 
 # Patches
 Patch0001: 0001-PATCH-wafsamba-Fix-few-SyntaxWarnings-caused-by-regu.patch
-# Fix FTBFS / Increase the over-estimation for sparse files
-Patch0002: https://gitlab.com/samba-team/samba/-/merge_requests/1420.patch
 
 BuildRequires: gcc
 BuildRequires: libtalloc-devel >= %{talloc_version}
@@ -225,6 +223,9 @@ rm -f $RPM_BUILD_ROOT/%{_mandir}/man3/_*
 %endif
 
 %changelog
+* Wed Mar 24 2021 Lukas Slebodnik <lslebodn@fedoraproject.org> - 2.3.0-1
+- libldb-2.3.0 is required for new samba
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/sources b/sources
index d79da12..94892ef 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (ldb.keyring) = dab8c56fad6555885ee05f26f1e6da8d4c95c0cd7bdba114422b31d33b95ce46e763946a4be17c651e2626c0511f087bc223773f74b4d43ffc3010528b270093
-SHA512 (ldb-2.2.0.tar.asc) = 13ee8827446c7fa3dc7d2459fbbd6c08667738e5d46a7411c317193134c01f1a394541bd483e5d924fe7bf0d6164c9a93e75f73427b3f36e1f87488591d5a8ec
-SHA512 (ldb-2.2.0.tar.gz) = 3814078a51d2110eeda291ac859c0027df88475812bd6b5f2ce8f8f50aba9c84faced97c37aa1f45e406783a8df97c60ae778df897bb0e89ba3ac8568acced69
+SHA512 (ldb-2.3.0.tar.asc) = c903363bcc58c1c192a88588aa2a510374864c3c1bc7e96a82663028ee00de9379122012ad05a141dc892454b797f007aca855a02b0ad3e99f6d353a612605bc
+SHA512 (ldb-2.3.0.tar.gz) = 7e389c0b4700a809893276d69216436ebd6d30e1f52407e4a08a1113cf14e151aed74300d8c36765c91c8f3195d8054b13a28cbdfcab031f88fd1d353e415348