Attachment 1458475 Details for Bug 1599441 – A patch for samba

[patch] A patch for samba

0001-Don-t-use-gold-to-build-samba.patch (text/plain), 4.58 KB, created by H.J. Lu on 2018-07-12 17:03:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: H.J. Lu

Created: 2018-07-12 17:03:10 UTC

Size: 4.58 KB

patch

obsolete

>From 77ae245377eee8036f21f78eab8ca82cc17b48bb Mon Sep 17 00:00:00 2001
>From: "H.J. Lu" <hjl.tools@gmail.com>
>Date: Thu, 12 Jul 2018 09:57:25 -0700
>Subject: [PATCH] Don't use gold to build samba
>
>Without samba-4.8.3-vscript.local.patch, gold generates:
>
>$ objdump -TC /usr/lib64/libsamba-util.so | grep " _end"
>000000000007a2f0 g    D  .data.rel.ro.local     0000000000000000  SAMBA_UTIL_0.0.1 _end
>000000000007a2f0 g    D  .data.rel.ro.local     0000000000000000 (SAMBA_UTIL_0.0.1) _end
>
>ld generates:
>
>$ objdump -TC /usr/lib64/libsamba-util.so | grep " _end"
>00000000000792f0 g    D  .bss	0000000000000000  SAMBA_UTIL_0.0.1 _end
>
>Don't use gold to build samba since it doesn't handle symbol versioning
>properly.
>---
> samba-4.8.3-vscript.local.patch | 96 ---------------------------------
> samba.spec                      |  4 --
> 2 files changed, 100 deletions(-)
> delete mode 100644 samba-4.8.3-vscript.local.patch
>
>diff --git a/samba-4.8.3-vscript.local.patch b/samba-4.8.3-vscript.local.patch
>deleted file mode 100644
>index a615f05..0000000
>--- a/samba-4.8.3-vscript.local.patch
>+++ /dev/null
>@@ -1,96 +0,0 @@
>-From dd9da7bc9306b95496d502589f95be0efc097fc0 Mon Sep 17 00:00:00 2001
>-From: Alexander Bokovoy <ab@samba.org>
>-Date: Thu, 12 Jul 2018 10:19:41 +0300
>-Subject: [PATCH] wafsamba/samba_abi: always hide ABI symbols which must be
>- local
>-
>-binutils 2.31 is going to change how shared libraries are linked, such
>-that they always provide their own local definitions of the _end, _edata
>-and _bss_start symbols.  This would all be fine, except for shared
>-libraries that export all symbols be default.  (Rather than just
>-exporting those symbols that form part of their API).
>-
>-According to binutils developers, we should only export the symbols we
>-explicitly want to be used. We don't use this principle for all our
>-libraries and deliberately don't want to have ABI versioning control for
>-all of them, so the change I introduce here is to explicitly mark those
>-symbols that will always be added by default linker configuration with
>-binutils 2.31 as local. Right now these are '_end', '_edata', and
>-'__bss_start' symbols.
>-
>-Signed-off-by: Alexander Bokovoy <ab@samba.org>
>----
>- buildtools/wafsamba/samba_abi.py      | 10 ++++++----
>- buildtools/wafsamba/tests/test_abi.py | 14 ++++++++++++++
>- 2 files changed, 20 insertions(+), 4 deletions(-)
>-
>-diff --git a/buildtools/wafsamba/samba_abi.py b/buildtools/wafsamba/samba_abi.py
>-index 196b468f5b3..4603e764fea 100644
>---- a/buildtools/wafsamba/samba_abi.py
>-+++ b/buildtools/wafsamba/samba_abi.py
>-@@ -192,10 +192,12 @@ def abi_write_vscript(f, libname, current_version, versions, symmap, abi_match):
>-             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")
>-diff --git a/buildtools/wafsamba/tests/test_abi.py b/buildtools/wafsamba/tests/test_abi.py
>-index bba78c1ba07..74892146990 100644
>---- a/buildtools/wafsamba/tests/test_abi.py
>-+++ b/buildtools/wafsamba/tests/test_abi.py
>-@@ -66,6 +66,10 @@ class WriteVscriptTests(TestCase):
>- 1.0 {
>- \tglobal:
>- \t\t*;
>-+\tlocal:
>-+\t\t_end;
>-+\t\t__bss_start;
>-+\t\t_edata;
>- };
>- """)
>- 
>-@@ -84,6 +88,10 @@ MYLIB_0.1 {
>- 1.0 {
>- \tglobal:
>- \t\t*;
>-+\tlocal:
>-+\t\t_end;
>-+\t\t__bss_start;
>-+\t\t_edata;
>- };
>- """)
>- 
>-@@ -99,6 +107,9 @@ MYLIB_0.1 {
>- \t\t*;
>- \tlocal:
>- \t\texc_*;
>-+\t\t_end;
>-+\t\t__bss_start;
>-+\t\t_edata;
>- };
>- """)
>- 
>-@@ -115,6 +126,9 @@ MYLIB_0.1 {
>- \t\tpub_*;
>- \tlocal:
>- \t\texc_*;
>-+\t\t_end;
>-+\t\t__bss_start;
>-+\t\t_edata;
>- \t\t*;
>- };
>- """)
>--- 
>-2.17.1
>-
>diff --git a/samba.spec b/samba.spec
>index 05962dd..8100865 100644
>--- a/samba.spec
>+++ b/samba.spec
>@@ -123,7 +123,6 @@ Source200:      README.dc
> Source201:      README.downgrade
> 
> Patch0:         samba-4.8.3-fix_krb5_plugins.patch
>-Patch1:         samba-4.8.3-vscript.local.patch
> 
> Requires(pre): /usr/sbin/groupadd
> Requires(post): systemd
>@@ -826,9 +825,6 @@ xzcat %{SOURCE0} | gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} -
> # TODO: resolve underlinked python modules
> export python_LDFLAGS="$(echo %{__global_ldflags} | sed -e 's/-Wl,-z,defs//g')"
> 
>-# Use the gold linker
>-export LDFLAGS="%{__global_ldflags} -fuse-ld=gold"
>-
> export PYTHON=%{__python2}
> 
> %configure \
>-- 
>2.17.1
>

Actions: View | Diff

Attachments on bug 1599441: 1458475