From 7449384320c3341845d5f0b48e38e2437d5b2f07 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Fri, 31 May 2024 16:50:09 +0000 Subject: [PATCH] Import from AlmaLinux stable repository --- .gitignore | 2 +- .libtevent.metadata | 2 - ...-SyntaxWarnings-caused-by-regular-ex.patch | 182 ------------------ SOURCES/tevent-0.13.0.tar.asc | 11 -- SOURCES/tevent-0.16.0.tar.asc | 11 ++ SPECS/libtevent.spec | 27 ++- 6 files changed, 32 insertions(+), 203 deletions(-) delete mode 100644 .libtevent.metadata delete mode 100644 SOURCES/0003-wafsamba-Fix-few-SyntaxWarnings-caused-by-regular-ex.patch delete mode 100644 SOURCES/tevent-0.13.0.tar.asc create mode 100644 SOURCES/tevent-0.16.0.tar.asc diff --git a/.gitignore b/.gitignore index b4b5172..8b1e0a7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/tevent-0.13.0.tar.gz +SOURCES/tevent-0.16.0.tar.gz SOURCES/tevent.keyring diff --git a/.libtevent.metadata b/.libtevent.metadata deleted file mode 100644 index 52db0ee..0000000 --- a/.libtevent.metadata +++ /dev/null @@ -1,2 +0,0 @@ -4df2101af66972e5216b544b0f9a62c69007a65b SOURCES/tevent-0.13.0.tar.gz -5d2957f5d63a72a6fc196af3e45242f3d321f6cf SOURCES/tevent.keyring diff --git a/SOURCES/0003-wafsamba-Fix-few-SyntaxWarnings-caused-by-regular-ex.patch b/SOURCES/0003-wafsamba-Fix-few-SyntaxWarnings-caused-by-regular-ex.patch deleted file mode 100644 index b11d089..0000000 --- a/SOURCES/0003-wafsamba-Fix-few-SyntaxWarnings-caused-by-regular-ex.patch +++ /dev/null @@ -1,182 +0,0 @@ -From 87dfb0ce329447625050771fd83dae1841ece1b8 Mon Sep 17 00:00:00 2001 -From: Lukas Slebodnik -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(-) - -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.22.0 - diff --git a/SOURCES/tevent-0.13.0.tar.asc b/SOURCES/tevent-0.13.0.tar.asc deleted file mode 100644 index 5dd7ff7..0000000 --- a/SOURCES/tevent-0.13.0.tar.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEEkUejOXGVGO6QEby1R5ORYRMIQCUFAmLgAnsACgkQR5ORYRMI -QCXT+Qf/Sw3PKIDVsTwQ2Rk6tUNL1Ji+qPnjDHOJeS2E7wpjZd1JPbaPGfxB6N3+ -ahMWrXbJhUNYf849c80i5sq2sivzvXZG79MDYlIzQb6nGVl3fD15D0vp8xU8ot7p -bijYJTd+8v9uQitGGqbWncQ2+5GG/Wlq82S7asI0Dm5yrB5N6Q8ozVejBqlAm6To -jC1bp2BK3bQUA5zpORfVuK8s8EpgcY9PmGx7HqvPb/NMFl7StpnruvSh/05TSB5L -yOXEYpiAkpW/kqxfofZiRsZVRJWNPJvo+g5HFNE5DQUSuRw3jKtWmfJ1cn05DVIQ -l62907jEVxyaFwZORbrvDChn6e7c8w== -=d2iL ------END PGP SIGNATURE----- diff --git a/SOURCES/tevent-0.16.0.tar.asc b/SOURCES/tevent-0.16.0.tar.asc new file mode 100644 index 0000000..27ddcd8 --- /dev/null +++ b/SOURCES/tevent-0.16.0.tar.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEEkUejOXGVGO6QEby1R5ORYRMIQCUFAmUs8V4ACgkQR5ORYRMI +QCWl4gf+NmjfvovCjcT8chpjSQakKh8TjS5Shb0Z9HN6VFGsFovDtyiChx4CjmrK +iHdVuS7PdeAcXOo6Y0nlpFcYl4Yo0MJWe+xrUIpT7OSq4jQW50pBv77QMEmCPSew +LJY/SMuMDCIlsD6BWfVav3SU2w0CL6iSBT4db1x+HDr8yjmZf40N8SaIu94NjSpE +ayKXlQxHiq8yT11fAg/MFl5RyCXHixgw7Ylzm7zGYxQB5ftUUaqCXgJcefBil1xs +fhChO+t2Rpb81fBhpgofLv1gcdUraBORfFHJLzOE+XSMnS229k88LyBsGOja9gpK +TvrMY9lzEwZXKvTwupFa74mKb7I0ng== +=863s +-----END PGP SIGNATURE----- diff --git a/SPECS/libtevent.spec b/SPECS/libtevent.spec index 22cb90c..8a01d43 100644 --- a/SPECS/libtevent.spec +++ b/SPECS/libtevent.spec @@ -4,13 +4,13 @@ %bcond_with python3 %endif -%global talloc_version 2.3.4 +%global talloc_version 2.4.1 Name: libtevent -Version: 0.13.0 -Release: 1%{?dist} +Version: 0.16.0 +Release: 0%{?dist} Summary: The tevent library -License: LGPLv3+ +License: LGPL-3.0-or-later URL: http://tevent.samba.org/ Source0: http://samba.org/ftp/tevent/tevent-%{version}.tar.gz Source1: http://samba.org/ftp/tevent/tevent-%{version}.tar.asc @@ -18,7 +18,6 @@ Source1: http://samba.org/ftp/tevent/tevent-%{version}.tar.asc Source2: tevent.keyring # Patches -Patch0001: 0003-wafsamba-Fix-few-SyntaxWarnings-caused-by-regular-ex.patch BuildRequires: docbook-style-xsl BuildRequires: doxygen @@ -98,14 +97,28 @@ cp -a doc/man/man3 %{buildroot}%{_mandir} %{_libdir}/pkgconfig/tevent.pc %{_mandir}/man3/tevent*.gz -%ldconfig_scriptlets - +%if %{with python3} %files -n python3-tevent %{python3_sitearch}/tevent.py %{python3_sitearch}/__pycache__/tevent.* %{python3_sitearch}/_tevent.cpython*.so +%endif + +%ldconfig_scriptlets %changelog +* Fri Nov 17 2023 Pavel Filipenský - 0.16.0-0 +- resolves: RHEL-16504 - update to version 0.16.0 + +* Tue Jun 06 2023 Pavel Filipenský - 0.14.1-3 +- resolves: rhbz#2190425 - Rebuild to trigger distrobaker sync + +* Wed May 24 2023 Pavel Filipenský - 0.14.1-2 +- resolves: rhbz#2190425 - Add missing tests to fix osci.brew-build.tier0.functional + +* Thu May 18 2023 Pavel Filipenský - 0.14.1-1 +- resolves: rhbz#2190425 Update to version 0.14.1 + * Mon Oct 24 2022 Andreas Schneider - 0.13.0-1 - resolves: rhbz#2132055 - Update to version 0.13.0