The branch, master has been updated via bd099c4 waf: Create a libnss_wins.so symlink. via 1f017ef waf: Create a libnss_winbind.so symlink. via 8490c1a wafsamba: If we define a realname and a soname create a symlink. from 13bbd3b pyglue: Make all_interfaces argumen to interface_ips() optional.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit bd099c49f816f8f7faad7da34370bcec2d59a0aa Author: Andreas Schneider <a...@samba.org> Date: Wed Oct 17 18:17:27 2012 +0200 waf: Create a libnss_wins.so symlink. The last 3 patches fixe bug #9299 - nsswitch modules under Linux need a symbolic to their so version library. https://bugzilla.samba.org/show_bug.cgi?id=9299 Reviewed-by: David Disseldorp <dd...@samba.org> Autobuild-User(master): Karolin Seeger <ksee...@samba.org> Autobuild-Date(master): Mon Oct 22 10:48:16 CEST 2012 on sn-devel-104 commit 1f017efeedffed84b872bd17ebefee7dfff0d11a Author: Andreas Schneider <a...@samba.org> Date: Wed Oct 17 18:16:15 2012 +0200 waf: Create a libnss_winbind.so symlink. This fixes bug #9299. commit 8490c1a503cba909b429cc3cb9c972d51dfa5ea8 Author: Andreas Schneider <a...@samba.org> Date: Wed Oct 17 18:03:55 2012 +0200 wafsamba: If we define a realname and a soname create a symlink. This is needed that libnss_winbind.so.2 and libnss_wins.so.2 will get a corresponding symlinks. ----------------------------------------------------------------------- Summary of changes: buildtools/wafsamba/samba_install.py | 2 ++ nsswitch/wscript_build | 1 + source3/wscript_build | 1 + 3 files changed, 4 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/buildtools/wafsamba/samba_install.py b/buildtools/wafsamba/samba_install.py index 5e53989..aa7f143 100644 --- a/buildtools/wafsamba/samba_install.py +++ b/buildtools/wafsamba/samba_install.py @@ -103,6 +103,8 @@ def install_library(self): if getattr(self, 'samba_realname', None): install_name = self.samba_realname install_link = None + if getattr(self, 'soname', ''): + install_link = self.soname if getattr(self, 'samba_type', None) == 'PYTHON': inst_name = bld.make_libname(t.target, nolibprefix=True, python=True) else: diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build index 8499c62..a94c02c 100644 --- a/nsswitch/wscript_build +++ b/nsswitch/wscript_build @@ -33,6 +33,7 @@ if (Utils.unversioned_sys_platform() == 'linux' or (host_os.rfind('gnu') > -1)): source='winbind_nss_linux.c', deps='winbind-client', realname='libnss_winbind.so.2', + soname='libnss_winbind.so', vnum='2') elif (host_os.rfind('freebsd') > -1): # FreeBSD winbind client is implemented as a wrapper around diff --git a/source3/wscript_build b/source3/wscript_build index 4b9c3ec..0634b8d 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -659,6 +659,7 @@ bld.SAMBA3_LIBRARY('nss_wins', source=WINBIND_WINS_NSS_SRC, deps='''param libsmb LIBTSOCKET''', realname='libnss_wins.so.2', + soname='libnss_wins.so', vnum='2') bld.SAMBA3_LIBRARY('gse', -- Samba Shared Repository