From 3f001333709c0e99d2fa4f27a5cd0aaf7423e34d Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 6 Apr 2017 16:12:20 +0200 Subject: [PATCH] Fix nss_wins crash resolves: #1364666 --- samba-4.4.x-fix_nss_wins_crash.patch | 35 ++++++++++++++++++++++++++++ samba.spec | 9 ++++++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 samba-4.4.x-fix_nss_wins_crash.patch diff --git a/samba-4.4.x-fix_nss_wins_crash.patch b/samba-4.4.x-fix_nss_wins_crash.patch new file mode 100644 index 0000000..57329f1 --- /dev/null +++ b/samba-4.4.x-fix_nss_wins_crash.patch @@ -0,0 +1,35 @@ +From 119825e3df9b65ea24f28a7faf39b54861d62f0c Mon Sep 17 00:00:00 2001 +From: Andreas Schneider +Date: Mon, 19 Sep 2016 16:21:31 +0200 +Subject: [PATCH] waf: Explicitly link libreplace against libnss_wins.so + +If we do not specify replace as a depencency here, it will not link to +libreplace using an rpath. + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=12277 + +Signed-off-by: Andreas Schneider +Reviewed-by: Jeremy Allison +Reviewed-by: Jim McDonough + +(cherry picked from commit d8a5565ae647352d11d622bd4e73ff4568678a7c) +--- + nsswitch/wscript_build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build +index f286896..ab8f8ea 100644 +--- a/nsswitch/wscript_build ++++ b/nsswitch/wscript_build +@@ -42,7 +42,7 @@ if (Utils.unversioned_sys_platform() == 'linux' or (host_os.rfind('gnu') > -1)): + bld.SAMBA3_LIBRARY('nss_wins', + keep_underscore=True, + source='wins.c', +- deps='''wbclient''', ++ deps='wbclient replace', + public_headers=[], + public_headers_install=False, + pc_files=[], +-- +2.10.0 + diff --git a/samba.spec b/samba.spec index e1b07e8..17e90b4 100644 --- a/samba.spec +++ b/samba.spec @@ -6,7 +6,7 @@ # ctdb is enabled by default, you can disable it with: --without clustering %bcond_without clustering -%define main_release 0 +%define main_release 1 %define samba_version 4.4.13 %define talloc_version 2.1.6 @@ -107,6 +107,8 @@ Source6: samba.pamd Source200: README.dc Source201: README.downgrade +Patch0: samba-4.4.x-fix_nss_wins_crash.patch + BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Requires(pre): /usr/sbin/groupadd @@ -688,6 +690,8 @@ and use CTDB instead. %prep %setup -q -n samba-%{version}%{pre_release} +%patch0 -p1 -b .samba-4.4.x-fix_nss_wins_crash.patch + %build %global _talloc_lib ,talloc,pytalloc,pytalloc-util %global _tevent_lib ,tevent,pytevent @@ -1992,6 +1996,9 @@ rm -rf %{buildroot} %endif # with_clustering_support %changelog +* Thu Apr 06 2017 Andreas Schneider - 4.4.13-1 +- resolves: #1364666 - Fix nss_wins crash + * Fri Mar 31 2017 Guenther Deschner - 4.4.13-0 - Update to Samba 4.4.13 - related: #1435156 - Security fix for CVE-2017-2619