From 9f1f2af851167b85e461e7694797e91a5c6da557 Mon Sep 17 00:00:00 2001
From: Jakub Hrozek <jakub.hrozek@posteo.se>
Date: Jul 12 2018 11:11:43 +0000
Subject: New upstream release - 2.1.14


- Apply a patch to hide local ABI symbols to avoid issues with new
  binutils
- Patch the waf script to explicitly call python2 as "env python"
  doesn't yield py2 anymore

---

diff --git a/libtalloc.spec b/libtalloc.spec
index 314c33f..c1dad9e 100644
--- a/libtalloc.spec
+++ b/libtalloc.spec
@@ -5,8 +5,8 @@
 %endif
 
 Name: libtalloc
-Version: 2.1.13
-Release: 2%{?dist}
+Version: 2.1.14
+Release: 1%{?dist}
 Group: System Environment/Daemons
 Summary: The talloc library
 License: LGPLv3+
@@ -25,6 +25,8 @@ BuildRequires: doxygen
 Provides: bundled(libreplace)
 
 # Patches
+Patch0001:  talloc-dont-use-usr-bin-env-python.patch
+Patch0002:  talloc-hide-local-ABI-symbols.patch
 
 %description
 A library that implements a hierarchical allocator with destructors.
@@ -134,7 +136,7 @@ cp -a doc/man/* $RPM_BUILD_ROOT/%{_mandir}
 
 %files -n python2-talloc
 %{_libdir}/libpytalloc-util.so.*
-%{python_sitearch}/talloc.so
+%{python2_sitearch}/talloc.so
 
 %files -n python2-talloc-devel
 %{_includedir}/pytalloc.h
@@ -161,6 +163,12 @@ cp -a doc/man/* $RPM_BUILD_ROOT/%{_mandir}
 %endif
 
 %changelog
+* Thu Jul 12 2018 Jakub Hrozek <jhrozek@redhat.com> - 2.1.14-1
+- New upstream release - 2.1.14
+- Apply a patch to hide local ABI symbols to avoid issues with new binutils
+- Patch the waf script to explicitly call python2 as "env python" doesn't
+  yield py2 anymore
+
 * Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 2.1.13-2
 - Rebuilt for Python 3.7
 
diff --git a/talloc-dont-use-usr-bin-env-python.patch b/talloc-dont-use-usr-bin-env-python.patch
new file mode 100644
index 0000000..3bc1909
--- /dev/null
+++ b/talloc-dont-use-usr-bin-env-python.patch
@@ -0,0 +1,9 @@
+diff -up talloc-2.1.14/buildtools/bin/waf.envpy talloc-2.1.14/buildtools/bin/waf
+--- talloc-2.1.14/buildtools/bin/waf.envpy	2018-07-12 11:34:18.844030136 +0200
++++ talloc-2.1.14/buildtools/bin/waf	2018-07-12 11:36:30.471618578 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2
+ # encoding: ISO-8859-1
+ # Thomas Nagy, 2005-2010
+ 
diff --git a/talloc-hide-local-ABI-symbols.patch b/talloc-hide-local-ABI-symbols.patch
new file mode 100644
index 0000000..bf5c8a6
--- /dev/null
+++ b/talloc-hide-local-ABI-symbols.patch
@@ -0,0 +1,20 @@
+diff -up talloc-2.1.14/buildtools/wafsamba/samba_abi.py.sym_hide talloc-2.1.14/buildtools/wafsamba/samba_abi.py
+--- talloc-2.1.14/buildtools/wafsamba/samba_abi.py.sym_hide	2015-12-10 12:01:40.000000000 +0100
++++ talloc-2.1.14/buildtools/wafsamba/samba_abi.py	2018-07-12 11:46:30.024298881 +0200
+@@ -192,10 +192,12 @@ def abi_write_vscript(f, libname, curren
+             f.write("\t\t%s;\n" % x)
+     else:
+         f.write("\t\t*;\n")
+-    if abi_match != ["*"]:
+-        f.write("\tlocal:\n")
+-        for x in local_abi:
+-            f.write("\t\t%s;\n" % x[1:])
++    # Always hide symbols that must be local if exist
++    local_abi.extend(["!_end", "!_bss_start", "!_edata"])
++    f.write("\tlocal:\n")
++    for x in local_abi:
++        f.write("\t\t%s;\n" % x[1:])
++    if global_abi != ["*"]:
+         if len(global_abi) > 0:
+             f.write("\t\t*;\n")
+     f.write("};\n")