import libtevent-0.13.0-1.el8
This commit is contained in:
CentOS Sources
root
parent
46b203ed8b
commit
e23439768f
|
|
@ -1,2 +1,2 @@
|
|||
SOURCES/tevent-0.12.0.tar.gz
|
||||
SOURCES/tevent-0.13.0.tar.gz
|
||||
SOURCES/tevent.keyring
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
b1926eb99a2e9b9d754bfd6b67c97d4a0363b556 SOURCES/tevent-0.12.0.tar.gz
|
||||
4df2101af66972e5216b544b0f9a62c69007a65b SOURCES/tevent-0.13.0.tar.gz
|
||||
5d2957f5d63a72a6fc196af3e45242f3d321f6cf SOURCES/tevent.keyring
|
||||
|
|
|
|||
|
|
@ -0,0 +1,182 @@
|
|||
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(-)
|
||||
|
||||
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.22.0
|
||||
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQEzBAABCgAdFiEEkUejOXGVGO6QEby1R5ORYRMIQCUFAmJUwNIACgkQR5ORYRMI
|
||||
QCU8Lwf/akEtP0Ed0lBvxKEdpAZ41lEYtTHc5n/P7g5b1ynyXVzyNEQY6HaLfFwB
|
||||
L+kFq6bPFlKOKpm4CU+5xAEpvYlpNZ0+I6hivXknBrNuqw4F8WaH55dEEgzdOolp
|
||||
NFf9bExvGceIOsY+9/ku5mYWBCYHqyYCF2+Z9ZdoHpf/eCYoWIKuAdMP25q8el4w
|
||||
f8d3VxoZtq2wwhtgFSbQi/+bsORVuWE9ArfHwZ4i5/GLcLPCPDmDHBWH+tuaKoZ1
|
||||
zZUKwixA8dUupvGRSvCGnX0zhQ6QsYa8Bty0P29KDanULTbwxvwyovIxlUIfWsKB
|
||||
yJbsydQtWO7QPGKbEtfcrB2HM+dLOQ==
|
||||
=01HW
|
||||
-----END PGP SIGNATURE-----
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQEzBAABCgAdFiEEkUejOXGVGO6QEby1R5ORYRMIQCUFAmLgAnsACgkQR5ORYRMI
|
||||
QCXT+Qf/Sw3PKIDVsTwQ2Rk6tUNL1Ji+qPnjDHOJeS2E7wpjZd1JPbaPGfxB6N3+
|
||||
ahMWrXbJhUNYf849c80i5sq2sivzvXZG79MDYlIzQb6nGVl3fD15D0vp8xU8ot7p
|
||||
bijYJTd+8v9uQitGGqbWncQ2+5GG/Wlq82S7asI0Dm5yrB5N6Q8ozVejBqlAm6To
|
||||
jC1bp2BK3bQUA5zpORfVuK8s8EpgcY9PmGx7HqvPb/NMFl7StpnruvSh/05TSB5L
|
||||
yOXEYpiAkpW/kqxfofZiRsZVRJWNPJvo+g5HFNE5DQUSuRw3jKtWmfJ1cn05DVIQ
|
||||
l62907jEVxyaFwZORbrvDChn6e7c8w==
|
||||
=d2iL
|
||||
-----END PGP SIGNATURE-----
|
||||
|
|
@ -1,8 +1,14 @@
|
|||
%global talloc_version 2.3.1
|
||||
%if 0%{?fedora} || 0%{?rhel} > 7
|
||||
%bcond_without python3
|
||||
%else
|
||||
%bcond_with python3
|
||||
%endif
|
||||
|
||||
%global talloc_version 2.3.4
|
||||
|
||||
Name: libtevent
|
||||
Version: 0.12.0
|
||||
Release: 0%{?dist}
|
||||
Version: 0.13.0
|
||||
Release: 1%{?dist}
|
||||
Summary: The tevent library
|
||||
License: LGPLv3+
|
||||
URL: http://tevent.samba.org/
|
||||
|
|
@ -11,23 +17,25 @@ Source1: http://samba.org/ftp/tevent/tevent-%{version}.tar.asc
|
|||
# gpg2 --no-default-keyring --keyring ./tevent.keyring --recv-keys 9147A339719518EE9011BCB54793916113084025
|
||||
Source2: tevent.keyring
|
||||
|
||||
BuildRequires: gcc
|
||||
BuildRequires: libtalloc-devel >= %{talloc_version}
|
||||
BuildRequires: libcmocka-devel >= 1.1.3
|
||||
BuildRequires: doxygen
|
||||
# Patches
|
||||
Patch0001: 0003-wafsamba-Fix-few-SyntaxWarnings-caused-by-regular-ex.patch
|
||||
|
||||
BuildRequires: docbook-style-xsl
|
||||
BuildRequires: libxslt
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gnupg2
|
||||
|
||||
Provides: bundled(libreplace)
|
||||
|
||||
BuildRequires: libcmocka-devel >= 1.1.3
|
||||
BuildRequires: libtalloc-devel >= %{talloc_version}
|
||||
BuildRequires: libxslt
|
||||
BuildRequires: make
|
||||
%if %{with python3}
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-talloc-devel >= %{talloc_version}
|
||||
#endif with python
|
||||
%endif
|
||||
|
||||
Obsoletes: python2-tevent < %{version}-%{release}
|
||||
Obsoletes: python2-tevent-debuginfo < %{version}-%{release}
|
||||
|
||||
# Patches
|
||||
Provides: bundled(libreplace)
|
||||
Obsoletes: python2-tevent < 0.10.0-1
|
||||
|
||||
%description
|
||||
Tevent is an event system based on the talloc memory management library.
|
||||
|
|
@ -39,13 +47,13 @@ tevent_req (Tevent Request) functions.
|
|||
%package devel
|
||||
Summary: Developer tools for the Tevent library
|
||||
Requires: libtevent%{?_isa} = %{version}-%{release}
|
||||
Requires: libtalloc-devel%{?_isa} >= 2.0.7
|
||||
Requires: pkgconfig
|
||||
Requires: libtalloc-devel%{?_isa} >= %{talloc_version}
|
||||
|
||||
%description devel
|
||||
Header files needed to develop programs that link against the Tevent library.
|
||||
|
||||
|
||||
%if %{with python3}
|
||||
%package -n python3-tevent
|
||||
Summary: Python 3 bindings for the Tevent library
|
||||
Requires: libtevent%{?_isa} = %{version}-%{release}
|
||||
|
|
@ -54,23 +62,10 @@ Requires: libtevent%{?_isa} = %{version}-%{release}
|
|||
|
||||
%description -n python3-tevent
|
||||
Python 3 bindings for libtevent
|
||||
#endif with python
|
||||
%endif
|
||||
|
||||
%prep
|
||||
# Update timestamps on the files touched by a patch, to avoid non-equal
|
||||
# .pyc/.pyo files across the multilib peers within a build, where "Level"
|
||||
# is the patch prefix option (e.g. -p1)
|
||||
# Taken from specfile for python-simplejson
|
||||
UpdateTimestamps() {
|
||||
Level=$1
|
||||
PatchFile=$2
|
||||
|
||||
# Locate the affected files:
|
||||
for f in $(diffstat $Level -l $PatchFile); do
|
||||
# Set the files to have the same timestamp as that of the patch:
|
||||
touch -r $PatchFile $f
|
||||
done
|
||||
}
|
||||
|
||||
zcat %{SOURCE0} | gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} -
|
||||
%autosetup -n tevent-%{version} -p1
|
||||
|
||||
|
|
@ -79,20 +74,20 @@ zcat %{SOURCE0} | gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} -
|
|||
--bundled-libraries=NONE \
|
||||
--builtin-libraries=replace
|
||||
|
||||
make %{?_smp_mflags} V=1
|
||||
%make_build
|
||||
|
||||
doxygen doxy.config
|
||||
|
||||
%check
|
||||
make %{?_smp_mflags} check
|
||||
%make_build check
|
||||
|
||||
%install
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
%make_install
|
||||
|
||||
# Install API docs
|
||||
rm -f doc/man/man3/todo*
|
||||
install -d -m 0755 %{buildroot}%{_mandir}
|
||||
cp -a doc/man/* %{buildroot}%{_mandir}
|
||||
install -d -m0755 %{buildroot}%{_mandir}
|
||||
cp -a doc/man/man3 %{buildroot}%{_mandir}
|
||||
|
||||
%files
|
||||
%{_libdir}/libtevent.so.*
|
||||
|
|
@ -111,6 +106,9 @@ cp -a doc/man/* %{buildroot}%{_mandir}
|
|||
%{python3_sitearch}/_tevent.cpython*.so
|
||||
|
||||
%changelog
|
||||
* Mon Oct 24 2022 Andreas Schneider <asn@redhat.com> - 0.13.0-1
|
||||
- resolves: rhbz#2132055 - Update to version 0.13.0
|
||||
|
||||
* Mon May 02 2022 Pavel Filipenský <pfilipen@redhat.com> - 0.12.0-0
|
||||
- resolves: rhbz#2077485 - Update to version 0.12.0
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue