5 changed files with 159 additions and 118 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,2 @@
-SOURCES/ldb-2.8.0.tar.gz
+SOURCES/ldb-2.9.1.tar.gz
 SOURCES/ldb.keyring
--- a/.libldb.metadata
+++ b/.libldb.metadata
@ -1,2 +1,2 @@
-cf5c3d8a15c0666cc980a8cf7227ae711664f5a3 SOURCES/ldb-2.8.0.tar.gz
-5d2957f5d63a72a6fc196af3e45242f3d321f6cf SOURCES/ldb.keyring
+0a82c6f41d3ada818bf1e258038979ca76def986 SOURCES/ldb-2.9.1.tar.gz
+8ac6d09878c4218fb8e365fcf5a877a621dd40f9 SOURCES/ldb.keyring
--- a/SOURCES/ldb-2.8.0.tar.asc
+++ b/SOURCES/ldb-2.8.0.tar.asc
@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQEzBAABCgAdFiEEkUejOXGVGO6QEby1R5ORYRMIQCUFAmTDr+oACgkQR5ORYRMI
-QCXfwgf/cAqWCgnnKIT3hvUdL2i2F9edDXTOkBDZ1vxQ8hLO+T8JtWO9F40hEZjH
-F5R5B2pxBP6T2Nd9NHVbHUqlIpjqqesweTXtabuW60oz5PZ13owpGDWWQKortH5/
-j49v/ZKHD0NBjVN09AylRgoKQ4kRDtd0rMOAS951aRUcRTFRjK86hnaHPgvQeexy
-SizGRtHlifnwM/lbgJlLkTDUDNA+7RwXRAv0pvLwYReGFoS8vyUbMOYt1lnoiNas
-6cz+6yTKknGO7KSE6bjviDahv7Xg04Qy02eI/HYEZ8NG3aJqNsOqPchP4y/JgVv+
-90FZR2cdZNpTdlZ5TPfihL2/zldXKQ==
-=H6+4
-----END PGP SIGNATURE-----
--- a/SOURCES/ldb-2.9.1.tar.asc
+++ b/SOURCES/ldb-2.9.1.tar.asc
@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCgAdFiEEkUejOXGVGO6QEby1R5ORYRMIQCUFAmZy6sMACgkQR5ORYRMI
+QCViOQf/Wo1d05OXbX0hVC1L79cpCCQ6WDui27POHwx0clHhg6rChXtxqNscBsR+
+rvKX2qnnKtrByQdTlORK2/K3ynM/3CV4pCNwoKCxgpfLumrPkTEtyHP9sTVQ37PC
+Pm85uIoqedcleahuVLM1w2+Ns1aTrKKrdqjv9eIuGfzU4U7nt5hitUejRiJWis7a
+5OurMd1gvUDv5QAgvcQWqgfqZ8lGmDc0QFOMj2aSepU1n9MBSjYrtqBGwB9/DkT8
+OTR0MY4JUe2RKYjK1OhUiJtEhB1PEj3uiLiS1UwZ9jSwUfEhjDFMwUD2KWiZROaF
+GFZsqp8zeJaEgYk2soYDqrQMcV/wiw==
+=FzI6
+-----END PGP SIGNATURE-----
--- a/SPECS/libldb.spec
+++ b/SPECS/libldb.spec
@ -1,5 +1,3 @@
-%if ((0%{?fedora} || 0%{?rhel} > 7 || 0%{?epel} > 6))
-
 # lmdb is not supported on 32 bit architectures
 %ifarch aarch64 ppc64le s390x x86_64
 %bcond_without lmdb
@ -8,24 +6,13 @@
 #endif arch
 %endif

-%else
-%bcond_with lmdb
-#endif fedora || rhel || epel
-%endif
-
-%if 0%{?fedora} || 0%{?rhel} > 7
-%bcond_without python3
-%else
-%bcond_with python3
-%endif
-
-%global talloc_version 2.4.1
-%global tdb_version 1.4.9
-%global tevent_version 0.15.0
+%global talloc_version 2.4.2
+%global tdb_version 1.4.10
+%global tevent_version 0.16.1

 Name: libldb
-Version: 2.8.0
-Release: 1%{?dist}
+Version: 2.9.1
+Release: 2%{?dist}
 Summary: A schema-less, ldap like, API and database
 Requires: libtalloc%{?_isa} >= %{talloc_version}
 Requires: libtdb%{?_isa} >= %{tdb_version}
@ -36,32 +23,27 @@ 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
+Patch0:  libldb-fix-indexes-performance.patch

-# Patches
-Patch0:         libldb-fix-indexes-performance.patch
-
+BuildRequires: docbook-style-xsl
+BuildRequires: doxygen
 BuildRequires: gcc
+BuildRequires: gnupg2
+BuildRequires: libcmocka-devel
 BuildRequires: libtalloc-devel >= %{talloc_version}
 BuildRequires: libtdb-devel >= %{tdb_version}
 BuildRequires: libtevent-devel >= %{tevent_version}
+BuildRequires: libxslt
+BuildRequires: make
+BuildRequires: openldap-devel
+BuildRequires: popt-devel
+BuildRequires: python3-devel
+BuildRequires: python3-talloc-devel
+BuildRequires: python3-tdb
+BuildRequires: python3-tevent
 %if %{with lmdb}
 BuildRequires: lmdb-devel >= 0.9.16
 %endif
-BuildRequires: popt-devel
-BuildRequires: libxslt
-BuildRequires: docbook-style-xsl
-%if %{with python3}
-BuildRequires: python3-devel
-BuildRequires: python3-tdb
-BuildRequires: python3-talloc-devel
-BuildRequires: python3-tevent
-#endif with python
-%endif
-BuildRequires: doxygen
-BuildRequires: openldap-devel
-BuildRequires: libcmocka-devel
-BuildRequires: gnupg2
-BuildRequires: make

 Provides: bundled(libreplace)
 Obsoletes: python2-ldb < 2.0.5-1
@ -100,7 +82,6 @@ Provides: pyldb-devel%{?_isa} = %{version}-%{release}
 Development files for the Python bindings for the LDB library.
 This package includes files that aren't specific to a Python version.

-%if %{with python3}
 %package -n python3-ldb
 Summary: Python bindings for the LDB library
 Requires: libldb%{?_isa} = %{version}-%{release}
@ -120,17 +101,12 @@ Requires: python-ldb-devel-common%{?_isa} = %{version}-%{release}

 %description -n python3-ldb-devel
 Development files for the Python bindings for the LDB library
-#endif with python
-%endif

 %prep
 zcat %{SOURCE0} | gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} -
 %autosetup -n ldb-%{version} -p3

 %build
-# workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1217376
-export python_LDFLAGS=""
-
 %configure --disable-rpath \
           --disable-rpath-install \
           --bundled-libraries=NONE \
@ -154,13 +130,11 @@ make %{?_smp_mflags} check
 %make_install

 # Install API docs
-cp -a apidocs/man/* $RPM_BUILD_ROOT/%{_mandir}
+cp -a apidocs/man/* %{buildroot}%{_mandir}

 # bug: remove manpage named after full file path
 # not needed with el8+ and fc28+
-rm -f $RPM_BUILD_ROOT/%{_mandir}/man3/_*
-
-%ldconfig_scriptlets
+rm -f %{buildroot}%{_mandir}/man3/_*

 %files
 %dir %{_libdir}/ldb
@ -206,7 +180,6 @@ rm -f $RPM_BUILD_ROOT/%{_mandir}/man3/_*
 %{_includedir}/pyldb.h
 %{_mandir}/man*/Py*.gz

-%if %{with python3}
 %files -n python3-ldb
 %{python3_sitearch}/ldb.cpython-*.so
 %{_libdir}/libpyldb-util.cpython-*.so.2*
@ -217,93 +190,161 @@ rm -f $RPM_BUILD_ROOT/%{_mandir}/man3/_*
 %{_libdir}/libpyldb-util.cpython-*.so
 %{_libdir}/pkgconfig/pyldb-util.cpython-*.pc

+%ldconfig_scriptlets
 %ldconfig_scriptlets -n python3-ldb
-#endif with python
-%endif

 %changelog
-* Tue Aug 13 2024 Andreas Schneider <asn@redhat.com> - 2.8.0-1
- resolves: RHEL-12109 - Fix performance regression with indexes
+* Mon Aug 12 2024 Andreas Schneider <asn@redhat.com> - 2.9.1-2
+* resolves: RHEL-53994 - Fix performance regression with indexes

-* Fri Nov 17 2023 Pavel Filipenský <pfilipen@redhat.com> - 2.8.0-0
- resolves: RHEL-16509 - Update to libldb-2.8.0 
+* Tue Jul 02 2024 Pavel Filipenský <pfilipen@redhat.com> - 2.9.1-1
+- related: RHEL-33757 - Rebase version to 2.9.1

-* Tue Jun 06 2023 Pavel Filipenský <pfilipen@redhat.com> - 2.7.2-3
- resolves: rhbz#2190427 - Rebuild to trigger distrobaker sync
+* Thu Apr 25 2024 Pavel Filipenský <pfilipen@redhat.com> - 2.9.0-1
+- resolves: RHEL-33757 - Rebase version to 2.9.0

-* Wed May 24 2023 Pavel Filipenský <pfilipen@redhat.com> - 2.7.2-2
- resolves: rhbz#2190427 - Add missing tests to fix osci.brew-build.tier0.functional
+* Mon Dec 04 2023 Andreas Schneider <asn@redhat.com> - 2.8.0-1
+- resolves: RHEL-16482 - Rebase version to 2.8.0
+
+* Mon Jun 05 2023 Pavel Filipenský <pfilipen@redhat.com> - 2.7.2-2
+- resolves: rhbz#2190426 - Rebuilt to retrigger brew build

 * Thu May 18 2023 Pavel Filipenský <pfilipen@redhat.com> - 2.7.2-1
- resolves: rhbz#2190427 - Update to version 2.7.2
+- resolves: rhbz#2190426 - Rebase to version 2.7.2

-* 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
+* Fri Oct 21 2022 Andreas Schneider <asn@redhat.com> - 2.6.1-1
+- resolves: rhbz#2131995 - Rebase to version 2.6.1

 * Wed Jul 27 2022 Andreas Schneider <asn@redhat.com> - 2.5.2-1
 - Rebase to version 2.5.2
- resolves: rhbz#2109016 - Fix CVE-2022-32746
+- resolves: rhbz#2109017 - Fix CVE-2022-32746

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

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

-* Thu Nov 25 2021 Pavel Filipenský <pfilipen@redhat.com> - 2.4.1-1
- resolves: rhbz#2013605 - Rebase to version 2.4.1
+* Mon Nov 29 2021 Pavel Filipenský <pfilipen@redhat.com> - 2.4.1-1
+- resolves: rhbz#2013588 - Rebase to version 2.4.1

-* Tue May 25 2021 Andreas Schneider <asn@redhat.com> - 2.3.0-2
- related: rhbz#1897082 - Fix libldb tests on ppc64le
+* 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 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
+* Tue May 25 2021 Andreas Schneider <asn@redhat.com> - 2.4.0-5
+- resolves rhbz#1962812 - Added gating tests

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

-* 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
+* Wed Apr 21 2021 Andreas Schneider <asn@redhat.com> - 2.3.0-3
+- resolves: #1951285 - Fix ldb tests on aarch64

-* Wed Jun 24 2020 Isaac Boukris <iboukris@redhat.com> - 2.1.3-2
- Resolves: rhbz#1849615 - Fix CVE-2020-10730 use-after-free
+* 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

-* Tue Jun 2 2020 Isaac Boukris <iboukris@redhat.com> - 2.1.3-1
- Resolves: rhbz#1817567 - Rebase libldb to 2.1.3 for samba
+* Wed Mar 24 2021 Lukas Slebodnik <lslebodn@fedoraproject.org> - 2.3.0-1
+- libldb-2.3.0 is required for new samba

-* 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)
+* 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 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
+* Thu Oct 29 2020 Andreas Schneider <asn@redhat.com> - 2.2.0-7
+- Fix FTBFS / Increase the over-estimation for sparse files in tests

-* 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.
+* Tue Oct 27 2020 Andreas Schneider <asn@redhat.com> - 2.2.0-6
+- Spec file cleanup and improvements

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

-* Fri Aug 17 2018 Alexander Bokovoy <abokovoy@redhat.com> - 1.4.2-1
+* 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
 - New upstream release 1.4.2
- Resolves: rhbz#1615989

-* Fri Jul 13 2018 Jakub Hrozek <jhrozek@redhat.com> - 1.4.1-1
+* 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
 - New upstream release 1.4.1
- 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
+- 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

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