rpms
/
samba
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change __bss_start scope to local 

There was a typo in the original bug which used _bss_start instead of
__bss_start. As result, __bss_start wasn't scoped locally.
This commit is contained in:
Alexander Bokovoy 2018-07-12 15:24:36 +03:00
parent 58966617d0
commit b49cb5bbcc
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
samba-4.8.3-vscript.local.patch
View File

@ -1,4 +1,4 @@
From dd70ab4d600192336af547c32acd18dcbcb0c8b0 Mon Sep 17 00:00:00 2001 From dd9da7bc9306b95496d502589f95be0efc097fc0 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <ab@samba.org> From: Alexander Bokovoy <ab@samba.org>
Date: Thu, 12 Jul 2018 10:19:41 +0300 Date: Thu, 12 Jul 2018 10:19:41 +0300
Subject: [PATCH] wafsamba/samba_abi: always hide ABI symbols which must be Subject: [PATCH] wafsamba/samba_abi: always hide ABI symbols which must be
@ -16,7 +16,7 @@ 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 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 symbols that will always be added by default linker configuration with
binutils 2.31 as local. Right now these are '_end', '_edata', and binutils 2.31 as local. Right now these are '_end', '_edata', and
'_bss_start' symbols. '__bss_start' symbols.
Signed-off-by: Alexander Bokovoy <ab@samba.org> Signed-off-by: Alexander Bokovoy <ab@samba.org>
--- ---
@ -25,7 +25,7 @@ Signed-off-by: Alexander Bokovoy <ab@samba.org>
2 files changed, 20 insertions(+), 4 deletions(-) 2 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/buildtools/wafsamba/samba_abi.py b/buildtools/wafsamba/samba_abi.py diff --git a/buildtools/wafsamba/samba_abi.py b/buildtools/wafsamba/samba_abi.py
index 196b468f5b3..f3f66dd1d45 100644 index 196b468f5b3..4603e764fea 100644
--- a/buildtools/wafsamba/samba_abi.py --- a/buildtools/wafsamba/samba_abi.py
+++ b/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): @@ -192,10 +192,12 @@ def abi_write_vscript(f, libname, current_version, versions, symmap, abi_match):
@ -37,7 +37,7 @@ index 196b468f5b3..f3f66dd1d45 100644
- for x in local_abi: - for x in local_abi:
- f.write("\t\t%s;\n" % x[1:]) - f.write("\t\t%s;\n" % x[1:])
+ # Always hide symbols that must be local if exist + # Always hide symbols that must be local if exist
+ local_abi.extend(["!_end", "!_bss_start", "!_edata"]) + local_abi.extend(["!_end", "!__bss_start", "!_edata"])
+ f.write("\tlocal:\n") + f.write("\tlocal:\n")
+ for x in local_abi: + for x in local_abi:
+ f.write("\t\t%s;\n" % x[1:]) + f.write("\t\t%s;\n" % x[1:])
@ -46,7 +46,7 @@ index 196b468f5b3..f3f66dd1d45 100644
f.write("\t\t*;\n") f.write("\t\t*;\n")
f.write("};\n") f.write("};\n")
diff --git a/buildtools/wafsamba/tests/test_abi.py b/buildtools/wafsamba/tests/test_abi.py diff --git a/buildtools/wafsamba/tests/test_abi.py b/buildtools/wafsamba/tests/test_abi.py
index bba78c1ba07..30c152417c7 100644 index bba78c1ba07..74892146990 100644
--- a/buildtools/wafsamba/tests/test_abi.py --- a/buildtools/wafsamba/tests/test_abi.py
+++ b/buildtools/wafsamba/tests/test_abi.py +++ b/buildtools/wafsamba/tests/test_abi.py
@@ -66,6 +66,10 @@ class WriteVscriptTests(TestCase): @@ -66,6 +66,10 @@ class WriteVscriptTests(TestCase):
@ -55,7 +55,7 @@ index bba78c1ba07..30c152417c7 100644
\t\t*; \t\t*;
+\tlocal: +\tlocal:
+\t\t_end; +\t\t_end;
+\t\t_bss_start; +\t\t__bss_start;
+\t\t_edata; +\t\t_edata;
}; };
""") """)
@ -66,7 +66,7 @@ index bba78c1ba07..30c152417c7 100644
\t\t*; \t\t*;
+\tlocal: +\tlocal:
+\t\t_end; +\t\t_end;
+\t\t_bss_start; +\t\t__bss_start;
+\t\t_edata; +\t\t_edata;
}; };
""") """)
@ -76,7 +76,7 @@ index bba78c1ba07..30c152417c7 100644
\tlocal: \tlocal:
\t\texc_*; \t\texc_*;
+\t\t_end; +\t\t_end;
+\t\t_bss_start; +\t\t__bss_start;
+\t\t_edata; +\t\t_edata;
}; };
""") """)
@ -86,7 +86,7 @@ index bba78c1ba07..30c152417c7 100644
\tlocal: \tlocal:
\t\texc_*; \t\texc_*;
+\t\t_end; +\t\t_end;
+\t\t_bss_start; +\t\t__bss_start;
+\t\t_edata; +\t\t_edata;
\t\t*; \t\t*;
}; };

6
samba.spec
View File

@ -6,7 +6,7 @@
# ctdb is enabled by default, you can disable it with: --without clustering # ctdb is enabled by default, you can disable it with: --without clustering
%bcond_without clustering %bcond_without clustering
%define main_release 4 %define main_release 4.1
%define samba_version 4.8.3 %define samba_version 4.8.3
%define talloc_version 2.1.11 %define talloc_version 2.1.11
@ -3531,6 +3531,10 @@ fi
%endif # with_clustering_support %endif # with_clustering_support
%changelog %changelog
* Thu Jul 12 2018 Alexander Bokovoy <abokovoy@redhat.com> - 2:4.8.3-4.1
- Scope to local __bss_start symbol (typo in a patch)
- Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1600035
* Thu Jul 12 2018 Alexander Bokovoy <abokovoy@redhat.com> - 2:4.8.3-4 * Thu Jul 12 2018 Alexander Bokovoy <abokovoy@redhat.com> - 2:4.8.3-4
- Change scope to local for symbols automatically added by upcoming binutils 2.31 - Change scope to local for symbols automatically added by upcoming binutils 2.31
- Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1600035 - Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1600035