From ee0d908d5afd945f144cffef75b39e11fc111d46 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jan 21 2020 15:36:45 +0000 Subject: import libtalloc-2.2.0-7.el8 --- diff --git a/.gitignore b/.gitignore index e27e1c3..0aabaee 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/talloc-2.1.16.tar.gz +SOURCES/talloc-2.2.0.tar.gz diff --git a/.libtalloc.metadata b/.libtalloc.metadata index 5ab9f82..61b7f7e 100644 --- a/.libtalloc.metadata +++ b/.libtalloc.metadata @@ -1 +1 @@ -69fe815888eddcbe2fb6fc3270ff9e977461000d SOURCES/talloc-2.1.16.tar.gz +d806e2e4e9b973e8ab6521d1dd20a03abae32c99 SOURCES/talloc-2.2.0.tar.gz diff --git a/SOURCES/py3_abi.patch b/SOURCES/py3_abi.patch new file mode 100644 index 0000000..857fb9d --- /dev/null +++ b/SOURCES/py3_abi.patch @@ -0,0 +1,35 @@ +From 80be2141ffde6270f71f3f4ed4300762f8765c80 Mon Sep 17 00:00:00 2001 +From: Isaac Boukris +Date: Mon, 25 Nov 2019 13:16:42 +0100 +Subject: [PATCH] ABI: add .PY3 alias to py{talloc,ldb} libs for backward + compatibility + +Signed-off-by: Isaac Boukris +--- + buildtools/wafsamba/samba_abi.py | 8 ++++++++ + 1 file changed, 8 insertions(+) + +Index: talloc-2.2.0/buildtools/wafsamba/samba_abi.py +=================================================================== +--- talloc-2.2.0.orig/buildtools/wafsamba/samba_abi.py ++++ talloc-2.2.0/buildtools/wafsamba/samba_abi.py +@@ -172,6 +172,10 @@ def abi_write_vscript(f, libname, curren + version + """ + ++ alias = None ++ if libname.startswith('PY') and libname.endswith('UTIL'): ++ alias = libname + '.PY3' ++ + invmap = {} + for s in symmap: + invmap.setdefault(symmap[s], []).append(s) +@@ -180,6 +184,8 @@ def abi_write_vscript(f, libname, curren + versions = sorted(versions, key=version_key) + for k in versions: + symver = "%s_%s" % (libname, k) ++ if alias: ++ symver = "%s_%s" % (alias, k) + if symver == current_version: + break + f.write("%s {\n" % symver) diff --git a/SPECS/libtalloc.spec b/SPECS/libtalloc.spec index d5334a2..f1195ed 100644 --- a/SPECS/libtalloc.spec +++ b/SPECS/libtalloc.spec @@ -1,6 +1,6 @@ Name: libtalloc -Version: 2.1.16 -Release: 3%{?dist} +Version: 2.2.0 +Release: 7%{?dist} Group: System Environment/Daemons Summary: The talloc library License: LGPLv3+ @@ -19,6 +19,7 @@ Obsoletes: python2-talloc-devel < %{version}-%{release} Obsoletes: python2-talloc-debuginfo < %{version}-%{release} # Patches +Patch0001: py3_abi.patch %description A library that implements a hierarchical allocator with destructors. @@ -107,6 +108,12 @@ cp -a doc/man/* $RPM_BUILD_ROOT/%{_mandir} %ldconfig_scriptlets -n python3-talloc %changelog +* Mon Nov 25 2019 Isaac Boukris - 2.2.0-7 +- related: rhbz#1754417 - Fix PY3 symbol names + +* Wed Nov 20 2019 Isaac Boukris - 2.2.0-1 +- Resolves: rhbz#1754417 - Rebase talloc to version 2.2.0 for samba + * Tue Apr 30 2019 Jakub Hrozek - 2.1.16-3 - Also obsolete python2-libtalloc-debuginfo - Resolves: rhbz#1567136 - libtalloc: Drop Python 2 subpackage from RHEL 8