From c2560589a44ef995d80ae789d9db3554a79be1da Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 15 May 2024 07:40:15 +0000 Subject: [PATCH] Import from AlmaLinux stable repository --- .gitignore | 2 +- .libldb.metadata | 2 +- ...ix-few-SyntaxWarnings-caused-by-regu.patch | 182 ------------------ SOURCES/ldb-2.6.1.tar.asc | 11 -- SOURCES/ldb-2.8.0.tar.asc | 11 ++ SPECS/libldb.spec | 20 +- 6 files changed, 27 insertions(+), 201 deletions(-) delete mode 100644 SOURCES/0001-PATCH-wafsamba-Fix-few-SyntaxWarnings-caused-by-regu.patch delete mode 100644 SOURCES/ldb-2.6.1.tar.asc create mode 100644 SOURCES/ldb-2.8.0.tar.asc diff --git a/.gitignore b/.gitignore index a984a4b..b6308ae 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/ldb-2.6.1.tar.gz +SOURCES/ldb-2.8.0.tar.gz SOURCES/ldb.keyring diff --git a/.libldb.metadata b/.libldb.metadata index ef0a922..4bae07e 100644 --- a/.libldb.metadata +++ b/.libldb.metadata @@ -1,2 +1,2 @@ -eb01bccdd90980a34a6036c7f2e6826eee59a643 SOURCES/ldb-2.6.1.tar.gz +cf5c3d8a15c0666cc980a8cf7227ae711664f5a3 SOURCES/ldb-2.8.0.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 deleted file mode 100644 index 7742479..0000000 --- a/SOURCES/0001-PATCH-wafsamba-Fix-few-SyntaxWarnings-caused-by-regu.patch +++ /dev/null @@ -1,182 +0,0 @@ -From d4e0a07a24c16b38de58c14a38b418c63106ad09 Mon Sep 17 00:00:00 2001 -From: Lukas Slebodnik -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('", ', 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 - diff --git a/SOURCES/ldb-2.6.1.tar.asc b/SOURCES/ldb-2.6.1.tar.asc deleted file mode 100644 index 4fd13fd..0000000 --- a/SOURCES/ldb-2.6.1.tar.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEEkUejOXGVGO6QEby1R5ORYRMIQCUFAmLhN68ACgkQR5ORYRMI -QCWqKAgAswqnQft1oEc4c2DIJIF9jcXfLeOz4czUndBu5st6h3KVqZDCWjUAdPdX -BrYV+6cLTtDSjH0nQocnvtwm3AbVPxwukBglVtEuq0DU4fk8DptzRJvyLy2vU5VP -sKQQ+uwgYSWnKeds0PjPNMxpompeurDbQ1n4XgW4BzRQpK4Gvg6ZXBGg+q5nKht2 -+PfQTVuaPi4O6gUWfxDbLBBPNDf97gz21Sa8pS1K3sspcPQJzMNumXs/d9LBhU1G -BaDanganpN1Ru724J18jvZ8NEogldHuSk29DljreHiiWY2hEVlp5rZDTgrlYOP50 -b9kfHAnpBcHhQZlLf2/hponIccDo6A== -=ccfS ------END PGP SIGNATURE----- diff --git a/SOURCES/ldb-2.8.0.tar.asc b/SOURCES/ldb-2.8.0.tar.asc new file mode 100644 index 0000000..25d706f --- /dev/null +++ b/SOURCES/ldb-2.8.0.tar.asc @@ -0,0 +1,11 @@ +-----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----- diff --git a/SPECS/libldb.spec b/SPECS/libldb.spec index 15eaca9..4663444 100644 --- a/SPECS/libldb.spec +++ b/SPECS/libldb.spec @@ -19,18 +19,18 @@ %bcond_with python3 %endif -%global talloc_version 2.3.4 -%global tdb_version 1.4.7 -%global tevent_version 0.13.0 +%global talloc_version 2.4.1 +%global tdb_version 1.4.9 +%global tevent_version 0.15.0 Name: libldb -Version: 2.6.1 +Version: 2.8.0 Release: 1%{?dist} Summary: A schema-less, ldap like, API and database Requires: libtalloc%{?_isa} >= %{talloc_version} Requires: libtdb%{?_isa} >= %{tdb_version} Requires: libtevent%{?_isa} >= %{tevent_version} -License: LGPLv3+ +License: LGPL-3.0-or-later URL: http://ldb.samba.org/ Source0: https://www.samba.org/ftp/ldb/ldb-%{version}.tar.gz Source1: https://www.samba.org/ftp/ldb/ldb-%{version}.tar.asc @@ -38,7 +38,6 @@ Source1: https://www.samba.org/ftp/ldb/ldb-%{version}.tar.asc Source2: ldb.keyring # Patches -Patch0001: 0001-PATCH-wafsamba-Fix-few-SyntaxWarnings-caused-by-regu.patch BuildRequires: gcc BuildRequires: libtalloc-devel >= %{talloc_version} @@ -222,6 +221,15 @@ rm -f $RPM_BUILD_ROOT/%{_mandir}/man3/_* %endif %changelog +* Mon Dec 04 2023 Andreas Schneider - 2.8.0-1 +- resolves: RHEL-16482 - Rebase version to 2.8.0 + +* Mon Jun 05 2023 Pavel Filipenský - 2.7.2-2 +- resolves: rhbz#2190426 - Rebuilt to retrigger brew build + +* Thu May 18 2023 Pavel Filipenský - 2.7.2-1 +- resolves: rhbz#2190426 - Rebase to version 2.7.2 + * Fri Oct 21 2022 Andreas Schneider - 2.6.1-1 - resolves: rhbz#2131995 - Rebase to version 2.6.1