Rebase to version 2.4.3

- resolves: RHEL-89882

.gitignore

@@ -35,3 +35,5 @@
 /talloc-2.4.1.tar.asc
 /talloc-2.4.2.tar.asc
 /talloc-2.4.2.tar.gz
+/talloc-2.4.3.tar.asc
+/talloc-2.4.3.tar.gz

0003-wafsamba-Fix-few-SyntaxWarnings-caused-by-regular-ex.patch

@@ -1,179 +0,0 @@
-From 87dfb0ce329447625050771fd83dae1841ece1b8 Mon Sep 17 00:00:00 2001
-From: Lukas Slebodnik <lslebodn@fedoraproject.org>
-Date: Wed, 12 Jun 2019 13:38:17 +0200
-Subject: [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(-)
-
-Index: talloc-2.4.0/buildtools/wafsamba/configure_file.py
-===================================================================
---- talloc-2.4.0.orig/buildtools/wafsamba/configure_file.py	2023-01-19 08:26:14.036738067 +0100
-+++ talloc-2.4.0/buildtools/wafsamba/configure_file.py	2023-01-19 08:26:20.706716759 +0100
-@@ -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()
-Index: talloc-2.4.0/buildtools/wafsamba/pkgconfig.py
-===================================================================
---- talloc-2.4.0.orig/buildtools/wafsamba/pkgconfig.py	2023-01-19 08:26:14.037738063 +0100
-+++ talloc-2.4.0/buildtools/wafsamba/pkgconfig.py	2023-01-19 08:26:20.706716759 +0100
-@@ -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()
-Index: talloc-2.4.0/buildtools/wafsamba/samba_abi.py
-===================================================================
---- talloc-2.4.0.orig/buildtools/wafsamba/samba_abi.py	2023-01-19 08:26:14.037738063 +0100
-+++ talloc-2.4.0/buildtools/wafsamba/samba_abi.py	2023-01-19 08:26:20.706716759 +0100
-@@ -21,16 +21,16 @@ version_key = lambda x: list(map(int, x.
- 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
- 
- 
-Index: talloc-2.4.0/buildtools/wafsamba/samba_conftests.py
-===================================================================
---- talloc-2.4.0.orig/buildtools/wafsamba/samba_conftests.py	2023-01-19 08:26:14.038738060 +0100
-+++ talloc-2.4.0/buildtools/wafsamba/samba_conftests.py	2023-01-19 08:26:20.706716759 +0100
-@@ -398,7 +398,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
-Index: talloc-2.4.0/buildtools/wafsamba/samba_headers.py
-===================================================================
---- talloc-2.4.0.orig/buildtools/wafsamba/samba_headers.py	2023-01-19 08:26:14.039738057 +0100
-+++ talloc-2.4.0/buildtools/wafsamba/samba_headers.py	2023-01-19 08:26:20.707716756 +0100
-@@ -19,7 +19,7 @@ def header_install_path(header, header_p
-     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 = {}
-Index: talloc-2.4.0/buildtools/wafsamba/samba_utils.py
-===================================================================
---- talloc-2.4.0.orig/buildtools/wafsamba/samba_utils.py	2023-01-19 08:26:14.040738054 +0100
-+++ talloc-2.4.0/buildtools/wafsamba/samba_utils.py	2023-01-19 08:26:20.707716756 +0100
-@@ -237,10 +237,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)))
-Index: talloc-2.4.0/buildtools/wafsamba/symbols.py
-===================================================================
---- talloc-2.4.0.orig/buildtools/wafsamba/symbols.py	2023-01-19 08:26:14.041738051 +0100
-+++ talloc-2.4.0/buildtools/wafsamba/symbols.py	2023-01-19 08:26:20.707716756 +0100
-@@ -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

libtalloc.spec

@@ -1,13 +1,13 @@
-Name: libtalloc
+Name:            libtalloc
-Version: 2.4.2
+Version:         2.4.3
 Release:         %autorelease
-Summary: The talloc library
+Summary:         The talloc library
-License: LGPL-3.0-or-later
+License:         LGPL-3.0-or-later
-URL: https://talloc.samba.org/
+URL:             https://talloc.samba.org/
 
-Source0: https://www.samba.org/ftp/talloc/talloc-%{version}.tar.gz
+Source0:         https://www.samba.org/ftp/talloc/talloc-%{version}.tar.gz
-Source1: https://www.samba.org/ftp/talloc/talloc-%{version}.tar.asc
+Source1:         https://www.samba.org/ftp/talloc/talloc-%{version}.tar.asc
-Source2: https://download.samba.org/pub/samba/samba-pubkey.asc#/talloc.keyring
+Source2:         https://download.samba.org/pub/samba/samba-pubkey.asc#/talloc.keyring
 
 BuildRequires: make
 BuildRequires: gcc
@@ -25,14 +25,16 @@ Obsoletes: python2-talloc-devel < 2.2.0-1
 A library that implements a hierarchical allocator with destructors.
 
 %package devel
-Summary: Developer tools for the Talloc library
+Summary:         Developer tools for the Talloc library
+
 Requires: libtalloc = %{version}-%{release}
 
 %description devel
 Header files needed to develop programs that link against the Talloc library.
 
 %package -n python3-talloc
-Summary: Python bindings for the Talloc library
+Summary:         Python bindings for the Talloc library
+
 Requires: libtalloc = %{version}-%{release}
 %{?python_provide:%python_provide python3-talloc}
 
@@ -40,7 +42,8 @@ Requires: libtalloc = %{version}-%{release}
 Python 3 libraries for creating bindings using talloc
 
 %package -n python3-talloc-devel
-Summary: Development libraries for python3-talloc
+Summary:         Development libraries for python3-talloc
+
 Requires: python3-talloc = %{version}-%{release}
 %{?python_provide:%python_provide python3-talloc-devel}
 
@@ -72,6 +75,7 @@ doxygen doxy.config
 cp -a doc/man/man3 %{buildroot}%{_mandir}
 
 %files
+%license LICENSE
 %{_libdir}/libtalloc.so.*
 
 %files devel

sources

@@ -1,2 +1,2 @@
-SHA512 (talloc-2.4.2.tar.asc) = ab3cf2c1770a2d77bcbe950d20cf1509f5827cd773bc0153ffa301dc96de9bcec2c10ec57d7dfdf4ca0bdd4e41eed0dd896faecbcf15527e5b2ab5a50b27e4b3
+SHA512 (talloc-2.4.3.tar.asc) = 621c551a38057e351fdcc83c773aea78b0343dabfd6206f74b8ff8798eef330c9514477ad7086da6279f517eb9e5c01d7dbac3ba1f3c7040cdddf15d41a0a51c
-SHA512 (talloc-2.4.2.tar.gz) = fb91665ffbe0cce96b1359940ff3ed21330c81c5331140788a26aa94f82b50492176e6000ff54b31d1a434bb1cb53a6a2c7894153545252a1fd91bda7c05a213
+SHA512 (talloc-2.4.3.tar.gz) = 7174a069dd3d4ebf8c04fee3434fd50269015bb8f039839e7e7723f431d089b66fb0167e8893bff2d1c392de1ac33665e5b278168246da30d528d522b0e1d5bd