From 5ae427afb51b32646150721a6a871ef723bafac7 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 16 May 2023 06:14:13 +0000
Subject: [PATCH] import libldb-2.6.1-1.el8

---
 .gitignore                                          |  2 +-
 .libldb.metadata                                    |  2 +-
 ...amba-Fix-few-SyntaxWarnings-caused-by-regu.patch | 13 -------------
 SOURCES/ldb-2.5.2.tar.asc                           | 11 -----------
 SOURCES/ldb-2.6.1.tar.asc                           | 11 +++++++++++
 SPECS/libldb.spec                                   | 13 ++++++++-----
 6 files changed, 21 insertions(+), 31 deletions(-)
 delete mode 100644 SOURCES/ldb-2.5.2.tar.asc
 create mode 100644 SOURCES/ldb-2.6.1.tar.asc

diff --git a/.gitignore b/.gitignore
index ba83069..a984a4b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/ldb-2.5.2.tar.gz
+SOURCES/ldb-2.6.1.tar.gz
 SOURCES/ldb.keyring
diff --git a/.libldb.metadata b/.libldb.metadata
index 57850ad..ef0a922 100644
--- a/.libldb.metadata
+++ b/.libldb.metadata
@@ -1,2 +1,2 @@
-aa0142892a2cbb3a98d41b33d116a6a7132f9a13 SOURCES/ldb-2.5.2.tar.gz
+eb01bccdd90980a34a6036c7f2e6826eee59a643 SOURCES/ldb-2.6.1.tar.gz
 8ac6d09878c4218fb8e365fcf5a877a621dd40f9 SOURCES/ldb.keyring
diff --git a/SOURCES/0001-PATCH-wafsamba-Fix-few-SyntaxWarnings-caused-by-regu.patch b/SOURCES/0001-PATCH-wafsamba-Fix-few-SyntaxWarnings-caused-by-regu.patch
index 3b81899..7742479 100644
--- a/SOURCES/0001-PATCH-wafsamba-Fix-few-SyntaxWarnings-caused-by-regu.patch
+++ b/SOURCES/0001-PATCH-wafsamba-Fix-few-SyntaxWarnings-caused-by-regu.patch
@@ -131,19 +131,6 @@ index ef632ba903369e4211991f17a3b204bcd96c3a2f..63e50567860ff890b00b0ce6c7607c91
          if not m:
              conf.end_msg('not found', color='YELLOW')
              return
-diff --git a/buildtools/wafsamba/samba_cross.py b/buildtools/wafsamba/samba_cross.py
-index 8863c2c53e7d7dd9317c9233f0085ffd0eea6b2f..34793902fba884cf2d8358bf4315dc98027266b6 100644
---- a/buildtools/wafsamba/samba_cross.py
-+++ b/buildtools/wafsamba/samba_cross.py
-@@ -77,7 +77,7 @@ def cross_answer(ca_file, msg):
-                 f.close()
-                 return (0, ans.strip("'"))
-             else:
--                m = re.match('\(\s*(-?\d+)\s*,\s*\"(.*)\"\s*\)', ans)
-+                m = re.match(r'\(\s*(-?\d+)\s*,\s*\"(.*)\"\s*\)', ans)
-                 if m:
-                     f.close()
-                     return (int(m.group(1)), m.group(2))
 diff --git a/buildtools/wafsamba/samba_headers.py b/buildtools/wafsamba/samba_headers.py
 index a268c011c5d8e406e0d763554c55668cfb5388bc..c8bee19010978a04460b0637fcc8fd484a699ea8 100644
 --- a/buildtools/wafsamba/samba_headers.py
diff --git a/SOURCES/ldb-2.5.2.tar.asc b/SOURCES/ldb-2.5.2.tar.asc
deleted file mode 100644
index 32f0908..0000000
--- a/SOURCES/ldb-2.5.2.tar.asc
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQEzBAABCgAdFiEEkUejOXGVGO6QEby1R5ORYRMIQCUFAmLg8t4ACgkQR5ORYRMI
-QCWc+wgAhIBbkZjFDoHkQGQusV0c8GYx9K8zI2g9GuzcOTeE0DkkQ5FrYoPhwr9T
-eq6kQxpvUuEJ2QmQ0kvuVjqHC0eJwFFZZ+XYk92HeaniBX6EbaeA6z7ZcyJBdFRL
-4kXaWzbmkTfjTVq8zq4lgPeGnTOomsgdX/cg9PBeumZwfg822uVLbKb/Nn+K9kfY
-RWUSgeR4Hl8y1I+u0eKK6mvhXgXqjUSvDZ5+T8/uJ44WziVrHK4dJq2YQpKzyakr
-zEe3x5O+mClPq6Xj+KIcqT/In6ZyJVjE3PgMr2Hvw6P39XFbWdxCNBtt2PqTFSrx
-jngCNJY0TsokCa1+yDVe4Lif4jm9gA==
-=XSUQ
------END PGP SIGNATURE-----
diff --git a/SOURCES/ldb-2.6.1.tar.asc b/SOURCES/ldb-2.6.1.tar.asc
new file mode 100644
index 0000000..4fd13fd
--- /dev/null
+++ b/SOURCES/ldb-2.6.1.tar.asc
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCgAdFiEEkUejOXGVGO6QEby1R5ORYRMIQCUFAmLhN68ACgkQR5ORYRMI
+QCWqKAgAswqnQft1oEc4c2DIJIF9jcXfLeOz4czUndBu5st6h3KVqZDCWjUAdPdX
+BrYV+6cLTtDSjH0nQocnvtwm3AbVPxwukBglVtEuq0DU4fk8DptzRJvyLy2vU5VP
+sKQQ+uwgYSWnKeds0PjPNMxpompeurDbQ1n4XgW4BzRQpK4Gvg6ZXBGg+q5nKht2
++PfQTVuaPi4O6gUWfxDbLBBPNDf97gz21Sa8pS1K3sspcPQJzMNumXs/d9LBhU1G
+BaDanganpN1Ru724J18jvZ8NEogldHuSk29DljreHiiWY2hEVlp5rZDTgrlYOP50
+b9kfHAnpBcHhQZlLf2/hponIccDo6A==
+=ccfS
+-----END PGP SIGNATURE-----
diff --git a/SPECS/libldb.spec b/SPECS/libldb.spec
index 8998492..667fe38 100644
--- a/SPECS/libldb.spec
+++ b/SPECS/libldb.spec
@@ -19,13 +19,13 @@
 %bcond_with python3
 %endif
 
-%global talloc_version 2.3.3
-%global tdb_version 1.4.6
-%global tevent_version 0.11.0
+%global talloc_version 2.3.4
+%global tdb_version 1.4.7
+%global tevent_version 0.13.0
 
 Name: libldb
-Version: 2.5.2
-Release: 2%{?dist}
+Version: 2.6.1
+Release: 1%{?dist}
 Summary: A schema-less, ldap like, API and database
 Requires: libtalloc%{?_isa} >= %{talloc_version}
 Requires: libtdb%{?_isa} >= %{tdb_version}
@@ -222,6 +222,9 @@ rm -f $RPM_BUILD_ROOT/%{_mandir}/man3/_*
 %endif
 
 %changelog
+* Mon Oct 24 2022 Andreas Schneider <asn@redhat.com> - 2.6.1-1
+- resolves: rhbz#2132052 - Update to version 2.6.1
+
 * Thu Aug 11 2022 Andreas Schneider <asn@redhat.com> - 2.5.2-2
 - resolves: rhbz#2108998 - Rebuild to include python3-ldb-devel in CRB