Attachment 8086 Details for Bug 9299 – v4-0-test patch

[patch] v4-0-test patch

samba4-fix-nsswitch-modules-symlink.patch (text/plain), 2.56 KB, created by Andreas Schneider on 2012-10-18 12:12:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Schneider

Created: 2012-10-18 12:12:26 UTC

Size: 2.56 KB

patch

obsolete

>From bff8be1c20ac5d33290da623e3dfd0af7cf60037 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Wed, 17 Oct 2012 18:03:55 +0200
>Subject: [PATCH 1/3] 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.
>---
> buildtools/wafsamba/samba_install.py | 2 ++
> 1 file changed, 2 insertions(+)
>
>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:
>-- 
>1.7.12.3
>
>
>From cc0fb76c9075526fe657fc38690f061eb4041bec Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Wed, 17 Oct 2012 18:16:15 +0200
>Subject: [PATCH 2/3] waf: Create a libnss_winbind.so symlink.
>
>This fixes bug #9299.
>---
> nsswitch/wscript_build | 1 +
> 1 file changed, 1 insertion(+)
>
>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
>-- 
>1.7.12.3
>
>
>From 1fb22c7bfe0395f8315fde39fb67b42ff08db544 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Wed, 17 Oct 2012 18:17:27 +0200
>Subject: [PATCH 3/3] waf: Create a libnss_wins.so symlink.
>
>This fixes bug #9299.
>---
> source3/wscript_build | 1 +
> 1 file changed, 1 insertion(+)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index 74cc983..3b86e00 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -657,6 +657,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',
>-- 
>1.7.12.3
>

Flags:

ddiss: review+

Actions: View

Attachments on bug 9299: 8086 | 8112 | 8113 | 10548 | 10560 | 10561 | 10562 | 10588 | 10589