6 changed files with 64 additions and 140 deletions
--- 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
--- 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
--- 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
--- a/SOURCES/ldb-2.5.2.tar.asc
+++ b/SOURCES/ldb-2.5.2.tar.asc
@ -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-----
--- a/SOURCES/ldb-2.6.1.tar.asc
+++ 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-----
--- a/SPECS/libldb.spec
+++ b/SPECS/libldb.spec
@ -19,12 +19,12 @@
 %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
+Version: 2.6.1
 Release: 1%{?dist}
 Summary: A schema-less, ldap like, API and database
 Requires: libtalloc%{?_isa} >= %{talloc_version}
@ -222,136 +222,73 @@ 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
+
 * Wed Jul 27 2022 Andreas Schneider <asn@redhat.com> - 2.5.2-1
 - Rebase to version 2.5.2
- resolves: rhbz#2109017 - Fix CVE-2022-32746
+- resolves: rhbz#2109016 - Fix CVE-2022-32746

 * Mon Jun 13 2022 Pavel Filipenský <pfilipen@redhat.com> - 2.5.1-1
- related: rhbz#2077490 - Rebase to version 2.5.1
+- related: rhbz#2077484 - Rebase to version 2.5.1

-* Tue May 03 2022 Pavel Filipenský <pfilipen@redhat.com> - 2.5.0-1
- resolves: rhbz#2077490 - Rebase to version 2.5.0
+* Mon May 02 2022 Pavel Filipenský <pfilipen@redhat.com> - 2.5.0-1
+- resolves: rhbz#2077484 - Rebase to version 2.5.0

-* Mon Nov 29 2021 Pavel Filipenský <pfilipen@redhat.com> - 2.4.1-1
- resolves: rhbz#2013588 - Rebase to version 2.4.1
+* Thu Nov 25 2021 Pavel Filipenský <pfilipen@redhat.com> - 2.4.1-1
+- resolves: rhbz#2013605 - 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
+* Tue May 25 2021 Andreas Schneider <asn@redhat.com> - 2.3.0-2
+- related: rhbz#1897082 - Fix libldb tests on ppc64le

-* Tue May 25 2021 Andreas Schneider <asn@redhat.com> - 2.4.0-5
- resolves rhbz#1962812 - Added gating tests
+* Tue May 11 2021 Andreas Schneider <asn@redhat.com> - 2.3.0-1
+- resolves: rhbz#1945021 - Update to version 2.3.0
+- resolves: rhbz#1897082 - Fix libldb tests on aarch64

-* Thu May 20 2021 Andreas Schneider <asn@redhat.com> - 2.3.0-4
- related: #1951285 - Enable lmdb support on ppc64le again
+* Wed Mar 24 2021 Andreas Schneider <asn@redhat.com> - 2.2.0-2
+* resolves: rhbz#1941516 - Fixed CVE-2021-20277

-* Wed Apr 21 2021 Andreas Schneider <asn@redhat.com> - 2.3.0-3
- resolves: #1951285 - Fix ldb tests on aarch64
+* Mon Nov 9 2020 Isaac Boukris <iboukris@redhat.com> - 2.2.0-1
+- Resolves: rhbz#1878114 - Rebase libldb to the version required by Samba
+- Resolves: rhbz#1794349 - Build libldb with lmdb support

-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.3.0-2
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Wed Jun 24 2020 Isaac Boukris <iboukris@redhat.com> - 2.1.3-2
+- Resolves: rhbz#1849615 - Fix CVE-2020-10730 use-after-free

-* Wed Mar 24 2021 Lukas Slebodnik <lslebodn@fedoraproject.org> - 2.3.0-1
- libldb-2.3.0 is required for new samba
+* Tue Jun 2 2020 Isaac Boukris <iboukris@redhat.com> - 2.1.3-1
+- Resolves: rhbz#1817567 - Rebase libldb to 2.1.3 for 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
+* Tue Nov 26 2019 Isaac Boukris <iboukris@redhat.com> - 2.0.7-3
+- Resolves: rhbz#1754423 - Rebase libldb to 2.0.7 version for samba
+- Related: rhbz#1754423 - Fix sssd tests (ldb)

-* Thu Oct 29 2020 Andreas Schneider <asn@redhat.com> - 2.2.0-7
- Fix FTBFS / Increase the over-estimation for sparse files in tests
+* Tue May  7 2019 Jakub Hrozek <jhrozek@redhat.com> - 1.5.4-2
+- Fix some python2-related upgrade issues
+- Related: rhbz#1567115 - libldb: Drop Python 2 subpackages from RHEL 8

-* Tue Oct 27 2020 Andreas Schneider <asn@redhat.com> - 2.2.0-6
- Spec file cleanup and improvements
+* Wed Apr 24 2019 Jakub Hrozek <jhrozek@redhat.com> - 1.5.4-1
+- Resolves: rhbz#1684582 - Rebase libldb to version 1.5.4 for Samba
+- Resolves: rhbz#1567115 - libldb: Drop Python 2 subpackages from RHEL 8
+- Resolves: rhbz#1597243 - libldb uses Python 2 to build.

-* Thu Oct 22 2020 Alexander Bokovoy <abokovoy@redhat.com> - 2.2.0-5
- Rebuild for Python 3.9
+* Thu Sep 20 2018 Jakub Hrozek <jhrozek@redhat.com> - 1.4.2-2
+- Resolves: rhbz#1624132 - Review annocheck distro flag failures in libldb

-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Jul 13 2020 Tom Stellard <tstellar@redhat.com> - 2.2.0-3
- Use make macros
- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
-
-* Thu Jul 09 2020 Lukas Slebodnik <lslebodn@fedoraproject.org> - 2.2.0-2
- libldb-2.2.0 is required for samba 4.13rc1
-
-* Thu Jul 02 2020 Lukas Slebodnik <lslebodn@fedoraproject.org> - 2.1.4-1
- rhbz#1837364 - libldb-2.1.4 is available
-
-* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 2.1.3-2
- Rebuilt for Python 3.9
-
-* Wed May 20 2020 Lukas Slebodnik <lslebodn@fedoraproject.org> - 2.1.3-1
- rhbz#1837364 New: libldb-2.1.3 is available
-
-* Tue Apr 28 2020 Lukas Slebodnik <lslebodn@fedoraproject.org> - 2.1.2-1
- rhbz#1828721 New: libldb-2.1.2 is available
-
-* Wed Feb 26 2020 Lukas Slebodnik <lslebodn@fedoraproject.org> - 2.1.1-1
- rhbz#1807066 - libldb-2.1.1 is available
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Wed Jan 22 2020 Lukas Slebodnik <lslebodn@fedoraproject.org> - 2.1.0-1
- rhbz#1748422 - libldb-2.1.0 is available
-
-* Mon Dec 16 2019 Lukas Slebodnik <lslebodn@fedoraproject.org> - 2.0.8-1
- rhbz#1748422 - libldb-2.0.8 is available
-
-* Wed Sep 11 2019 Lukas Slebodnik <lslebodn@fedoraproject.org> - 2.0.7-1
- rhbz#1748422 - libldb-2.0.7 is available
-
-* Tue Sep 03 2019 Lukas Slebodnik <lslebodn@fedoraproject.org> - 2.0.6-1
- rhbz#1748422 - New upstream release 2.0.6
-
-* Mon Aug 26 2019 Guenther Deschner <gdeschner@redhat.com> - 2.0.5-1
- rhbz#1683147 - libldb-2.0.5 is available
- rhbz#1737644 - libldb, libtalloc, libtevent, libtdb: Remove Python 2 subpackages from Fedora 31+
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 1.5.5-3
- Rebuilt for Python 3.8
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sat Jul 13 2019 Guenther Deschner <gdeschner@redhat.com> - 1.5.5-1
- New upstream release 1.5.5
-
-* Fri Jun 14 2019 Lukas Slebodnik <lslebodn@fedoraproject.org> - 1.5.4-3
- rhbz#1718113 - samba fail to build with Python 3.8
-  AttributeError: module 'time' has no attribute 'clock'
-
-* Mon Jun 03 2019 Lukas Slebodnik <lslebodn@fedoraproject.org> - 1.5.4-2
- rhbz#1711638 - fails to build with Python 3.8.0a4
-
-* Wed Mar 06 2019 Lukas Slebodnik <lslebodn@fedoraproject.org> - 1.5.4-1
- New upstream release 1.5.4
-
-* Thu Feb 14 2019 Lukas Slebodnik <lslebodn@fedoraproject.org> - 1.5.3-1
- New upstream release 1.5.3
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Jan 17 2019 Lukas Slebodnik <lslebodn@fedoraproject.org> - 1.5.2-1
- New upstream release 1.5.2
-
-* Thu Nov  8 2018 Lukas Slebodnik <lslebodn@fedoraproject.org> - 1.4.3-1
- New upstream release 1.4.3
-
-* Thu Aug 16 2018 Lukas Slebodnik <lslebodn@fedoraproject.org> - 1.4.2-1
+* Fri Aug 17 2018 Alexander Bokovoy <abokovoy@redhat.com> - 1.4.2-1
 - New upstream release 1.4.2
+- Resolves: rhbz#1615989

-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu Jul 12 2018 Jakub Hrozek <jhrozek@redhat.com> - 1.4.1-1
+* Fri Jul 13 2018 Jakub Hrozek <jhrozek@redhat.com> - 1.4.1-1
 - New upstream release 1.4.1
- Apply a patch to hide local ABI symbols to avoid issues with new binutils
- Patch the waf script to explicitly call python2 as "env python" doesn't
-  yield py2 anymore
+- Obsoletes 0001-ldb-Fix-memory-leak-on-module-context.patch
+
+* Mon Jul 02 2018 Petr Viktorin <pviktori@redhat.com> - 1.4.0-3
+- Use %%{__python2}, not "python", as the Python2 interpreter
+- Add workaround to allow building with Python 2
+- Remove the lmdb dependency in RHEL

 * Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 1.4.0-2
 - Rebuilt for Python 3.7