Rebase version to 2.9.0

resolves: RHEL-16482

.gitignore

@@ -74,3 +74,7 @@
 /ldb-2.6.1.tar.asc
 /ldb-2.7.2.tar.asc
 /ldb-2.7.2.tar.gz
+/ldb-2.8.0.tar.gz
+/ldb-2.8.0.tar.asc
+/ldb-2.9.0.tar.asc
+/ldb-2.9.0.tar.gz

.libldb.metadata

@@ -0,0 +1,2 @@
+c15b278b8750bb1f8ce62c9d0d8d9956d865602e ldb-2.9.0.tar.asc
+b0e4b80d4e9db72ba21b9526f77083c7636468da ldb-2.9.0.tar.gz

0001-PATCH-wafsamba-Fix-few-SyntaxWarnings-caused-by-regu.patch

@@ -1,182 +0,0 @@
-From d4e0a07a24c16b38de58c14a38b418c63106ad09 Mon Sep 17 00:00:00 2001
-From: Lukas Slebodnik <lslebodn@fedoraproject.org>
-Date: Sat, 24 Aug 2019 16:46:30 +0200
-Subject: [PATCH] [PATCH] wafsamba: Fix few SyntaxWarnings caused by regular 
- expressions
-
-./buildtools/wafsamba/samba_utils.py:258: SyntaxWarning: invalid escape sequence \$
-  lst = re.split('(\$\{\w+\})', string)
-./buildtools/wafsamba/samba_utils.py:261: SyntaxWarning: invalid escape sequence \$
-  if re.match('\$\{\w+\}', v):
-./buildtools/wafsamba/samba_cross.py:80: SyntaxWarning: invalid escape sequence \(
-  m = re.match('\(\s*(-?\d+)\s*,\s*\"(.*)\"\s*\)', ans)
-./buildtools/wafsamba/samba_conftests.py:400: SyntaxWarning: invalid escape sequence \s
-  m = re.search('MAN%sEXT\s+=\s+(\w+)' % section, man)
-./buildtools/wafsamba/samba_abi.py:24: SyntaxWarning: invalid escape sequence \$
-  sig = re.sub('^\$[0-9]+\s=\s\{(.+)\}$', r'\1', sig)
-./buildtools/wafsamba/samba_abi.py:25: SyntaxWarning: invalid escape sequence \$
-  sig = re.sub('^\$[0-9]+\s=\s\{(.+)\}(\s0x[0-9a-f]+\s<\w+>)+$', r'\1', sig)
-./buildtools/wafsamba/samba_abi.py:26: SyntaxWarning: invalid escape sequence \$
-  sig = re.sub('^\$[0-9]+\s=\s(0x[0-9a-f]+)\s?(<\w+>)?$', r'\1', sig)
-./buildtools/wafsamba/samba_abi.py:33: SyntaxWarning: invalid escape sequence \*
-  m = m.replace('*', '\*')
-./buildtools/wafsamba/samba_abi.py:44: SyntaxWarning: invalid escape sequence \s
-  sig = re.sub(',\s\.\.\.', '', sig)
-./buildtools/wafsamba/samba_headers.py:22: SyntaxWarning: invalid escape sequence \s
-  re_header = re.compile('^\s*#\s*include[ \t]*"([^"]+)"', re.I | re.M)
-./buildtools/wafsamba/symbols.py:122: SyntaxWarning: invalid escape sequence \[
-  re_sharedlib = re.compile(b'Shared library: \[(.*)\]')
-./buildtools/wafsamba/symbols.py:124: SyntaxWarning: invalid escape sequence \[
-  re_rpath     = re.compile(b'Library (rpath|runpath): \[(.*)\]')
-./buildtools/wafsamba/pkgconfig.py:12: SyntaxWarning: invalid escape sequence \w
-  a = re.split('(@\w+@)', s)
-./buildtools/wafsamba/pkgconfig.py:17: SyntaxWarning: invalid escape sequence \w
-  if re.match('@\w+@', v):
-./buildtools/wafsamba/configure_file.py:16: SyntaxWarning: invalid escape sequence \w
-  a = re.split('(@\w+@)', s)
-./buildtools/wafsamba/configure_file.py:19: SyntaxWarning: invalid escape sequence \w
-  if re.match('@\w+@', v):
----
- buildtools/wafsamba/configure_file.py  |  4 ++--
- buildtools/wafsamba/pkgconfig.py       |  4 ++--
- buildtools/wafsamba/samba_abi.py       | 12 ++++++------
- buildtools/wafsamba/samba_conftests.py |  2 +-
- buildtools/wafsamba/samba_cross.py     |  2 +-
- buildtools/wafsamba/samba_headers.py   |  2 +-
- buildtools/wafsamba/samba_utils.py     |  4 ++--
- buildtools/wafsamba/symbols.py         |  4 ++--
- 8 files changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/buildtools/wafsamba/configure_file.py b/buildtools/wafsamba/configure_file.py
-index 6ad43546249fba7b4c0a037035e8574e7a9d2753..98a58a4604513e3633317e73299c1c9280c250d2 100644
---- a/buildtools/wafsamba/configure_file.py
-+++ b/buildtools/wafsamba/configure_file.py
-@@ -13,10 +13,10 @@ def subst_at_vars(task):
-     s = task.inputs[0].read()
- 
-     # split on the vars
--    a = re.split('(@\w+@)', s)
-+    a = re.split(r'(@\w+@)', s)
-     out = []
-     for v in a:
--        if re.match('@\w+@', v):
-+        if re.match(r'@\w+@', v):
-             vname = v[1:-1]
-             if not vname in task.env and vname.upper() in task.env:
-                 vname = vname.upper()
-diff --git a/buildtools/wafsamba/pkgconfig.py b/buildtools/wafsamba/pkgconfig.py
-index b83d5f382a58352bb3318b594aa2b45fc02d87d5..b77bd618c8903789c7ba9e64a6972a4e080f1821 100644
---- a/buildtools/wafsamba/pkgconfig.py
-+++ b/buildtools/wafsamba/pkgconfig.py
-@@ -9,12 +9,12 @@ def subst_at_vars(task):
- 
-     s = task.inputs[0].read()
-     # split on the vars
--    a = re.split('(@\w+@)', s)
-+    a = re.split(r'(@\w+@)', s)
-     out = []
-     done_var = {}
-     back_sub = [ ('PREFIX', '${prefix}'), ('EXEC_PREFIX', '${exec_prefix}')]
-     for v in a:
--        if re.match('@\w+@', v):
-+        if re.match(r'@\w+@', v):
-             vname = v[1:-1]
-             if not vname in task.env and vname.upper() in task.env:
-                 vname = vname.upper()
-diff --git a/buildtools/wafsamba/samba_abi.py b/buildtools/wafsamba/samba_abi.py
-index 5e7686da3d68b1ebcd842b8a319a5997fa9cf600..761667fcfe1f3937be22c8261b45dcb3979ae4cd 100644
---- a/buildtools/wafsamba/samba_abi.py
-+++ b/buildtools/wafsamba/samba_abi.py
-@@ -21,16 +21,16 @@ version_key = lambda x: list(map(int, x.split(".")))
- def normalise_signature(sig):
-     '''normalise a signature from gdb'''
-     sig = sig.strip()
--    sig = re.sub('^\$[0-9]+\s=\s\{(.+)\}$', r'\1', sig)
--    sig = re.sub('^\$[0-9]+\s=\s\{(.+)\}(\s0x[0-9a-f]+\s<\w+>)+$', r'\1', sig)
--    sig = re.sub('^\$[0-9]+\s=\s(0x[0-9a-f]+)\s?(<\w+>)?$', r'\1', sig)
--    sig = re.sub('0x[0-9a-f]+', '0xXXXX', sig)
-+    sig = re.sub(r'^\$[0-9]+\s=\s\{(.+)\}$', r'\1', sig)
-+    sig = re.sub(r'^\$[0-9]+\s=\s\{(.+)\}(\s0x[0-9a-f]+\s<\w+>)+$', r'\1', sig)
-+    sig = re.sub(r'^\$[0-9]+\s=\s(0x[0-9a-f]+)\s?(<\w+>)?$', r'\1', sig)
-+    sig = re.sub(r'0x[0-9a-f]+', '0xXXXX', sig)
-     sig = re.sub('", <incomplete sequence (\\\\[a-z0-9]+)>', r'\1"', sig)
- 
-     for t in abi_type_maps:
-         # we need to cope with non-word characters in mapped types
-         m = t
--        m = m.replace('*', '\*')
-+        m = m.replace('*', r'\*')
-         if m[-1].isalnum() or m[-1] == '_':
-             m += '\\b'
-         if m[0].isalnum() or m[0] == '_':
-@@ -41,7 +41,7 @@ def normalise_signature(sig):
- 
- def normalise_varargs(sig):
-     '''cope with older versions of gdb'''
--    sig = re.sub(',\s\.\.\.', '', sig)
-+    sig = re.sub(r',\s\.\.\.', '', sig)
-     return sig
- 
- 
-diff --git a/buildtools/wafsamba/samba_conftests.py b/buildtools/wafsamba/samba_conftests.py
-index ef632ba903369e4211991f17a3b204bcd96c3a2f..63e50567860ff890b00b0ce6c7607c917b7329d1 100644
---- a/buildtools/wafsamba/samba_conftests.py
-+++ b/buildtools/wafsamba/samba_conftests.py
-@@ -397,7 +397,7 @@ WriteMakefile(
- 
-     if section:
-         man = Utils.readf(os.path.join(bdir,'Makefile'))
--        m = re.search('MAN%sEXT\s+=\s+(\w+)' % section, man)
-+        m = re.search(r'MAN%sEXT\s+=\s+(\w+)' % section, man)
-         if not m:
-             conf.end_msg('not found', color='YELLOW')
-             return
-diff --git a/buildtools/wafsamba/samba_headers.py b/buildtools/wafsamba/samba_headers.py
-index a268c011c5d8e406e0d763554c55668cfb5388bc..c8bee19010978a04460b0637fcc8fd484a699ea8 100644
---- a/buildtools/wafsamba/samba_headers.py
-+++ b/buildtools/wafsamba/samba_headers.py
-@@ -19,7 +19,7 @@ def header_install_path(header, header_path):
-     return ''
- 
- 
--re_header = re.compile('^\s*#\s*include[ \t]*"([^"]+)"', re.I | re.M)
-+re_header = re.compile(r'^\s*#\s*include[ \t]*"([^"]+)"', re.I | re.M)
- 
- # a dictionary mapping source header paths to public header paths
- header_map = {}
-diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py
-index ad97de1859ba24c4afd5106b4f9694b0dc855643..75c9794ec40f327ef8ccf9aa33fafd6ed6181e3b 100644
---- a/buildtools/wafsamba/samba_utils.py
-+++ b/buildtools/wafsamba/samba_utils.py
-@@ -255,10 +255,10 @@ def TO_LIST(str, delimiter=None):
- 
- def subst_vars_error(string, env):
-     '''substitute vars, throw an error if a variable is not defined'''
--    lst = re.split('(\$\{\w+\})', string)
-+    lst = re.split(r'(\$\{\w+\})', string)
-     out = []
-     for v in lst:
--        if re.match('\$\{\w+\}', v):
-+        if re.match(r'\$\{\w+\}', v):
-             vname = v[2:-1]
-             if not vname in env:
-                 raise KeyError("Failed to find variable %s in %s in env %s <%s>" % (vname, string, env.__class__, str(env)))
-diff --git a/buildtools/wafsamba/symbols.py b/buildtools/wafsamba/symbols.py
-index 3eca3d46bd71cf0780b3c8e36a26b96bd3aa3b83..73e8ca8ce53ef5d956ac58e14a2403dd49f01109 100644
---- a/buildtools/wafsamba/symbols.py
-+++ b/buildtools/wafsamba/symbols.py
-@@ -119,9 +119,9 @@ def find_ldd_path(bld, libname, binary):
- 
- 
- # some regular expressions for parsing readelf output
--re_sharedlib = re.compile(b'Shared library: \[(.*)\]')
-+re_sharedlib = re.compile(r'Shared library: \[(.*)\]')
- # output from readelf could be `Library rpath` or `Libray runpath`
--re_rpath     = re.compile(b'Library (rpath|runpath): \[(.*)\]')
-+re_rpath     = re.compile(r'Library (rpath|runpath): \[(.*)\]')
- 
- def get_libs(bld, binname):
-     '''find the list of linked libraries for any binary or library
--- 
-2.23.0.rc2
-

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.0
-%global tdb_version 1.4.8
-%global tevent_version 0.14.1
+%global talloc_version 2.4.2
+%global tdb_version 1.4.10
+%global tevent_version 0.16.1
 
 Name: libldb
-Version: 2.7.2
-Release: 2%{?dist}
+Version: 2.9.0
+Release: 1%{?dist}
 Summary: A schema-less, ldap like, API and database
 Requires: libtalloc%{?_isa} >= %{talloc_version}
 Requires: libtdb%{?_isa} >= %{tdb_version}
@@ -37,31 +24,25 @@ Source1: https://www.samba.org/ftp/ldb/ldb-%{version}.tar.asc
 # gpg2 --no-default-keyring --keyring ./ldb.keyring --recv-keys 9147A339719518EE9011BCB54793916113084025
 Source2: ldb.keyring
 
-# Patches
-Patch0001: 0001-PATCH-wafsamba-Fix-few-SyntaxWarnings-caused-by-regu.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 +81,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 +100,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} -p1
 
 %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 +129,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 +179,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,11 +189,16 @@ 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
+* Thu Apr 25 2024 Pavel Filipenský <pfilipen@redhat.com> - 2.9.0-1
+- resolves: RHEL-33757 - Rebase version to 2.9.0
+
+* 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
 

sources

@@ -1,2 +1,2 @@
-SHA512 (ldb-2.7.2.tar.asc) = 0903ead21d1eb08003f6cdf47099e113fea2a60d3c3db1950d60532ecdef27e7363f4b77c03602a8a78ef6c7d7bbaf98b7a4e172e4cb263ea2942ef1b5452432
-SHA512 (ldb-2.7.2.tar.gz) = beb2cd83a8f128713e0b43ec6e80d0f87ab0883c6c8f0cefbbf5bf49e29dfa327b245b78467d1906917cb5f3f11e01cb76cc6bcca58a47c5deac4f05c2e9dfbd
+SHA512 (ldb-2.9.0.tar.asc) = b3dd7a38968fbd57b997931fb075b86a7d9b82c5192b106d14ee78769d5941c9ec591e9a195896db54b9b2fe0942b33d12524bc9c90d16f475a417073cdcd671
+SHA512 (ldb-2.9.0.tar.gz) = b5cfbbcb2c35d6830bf1a7c85e1d4363728ae474504441add54c4c8569316b26aedbf6fb9f561ec4f187eb5a847ac76af07396e38d00e6f7632b63e02d7b64a1