The Samba-Bugzilla – Attachment 10548 Details for
Bug 9299
nsswitch modules under Linux need a symbolic to their so version library.
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Patches for master
tmp.diff.txt (text/plain), 3.89 KB, created by
Stefan Metzmacher
on 2014-12-18 10:44:12 UTC
(
hide
)
Description:
Patches for master
Filename:
MIME Type:
Creator:
Stefan Metzmacher
Created:
2014-12-18 10:44:12 UTC
Size:
3.89 KB
patch
obsolete
>From 18c2e7a8f13ecb2d00dedc95e6fa280e7aca54de Mon Sep 17 00:00:00 2001 >From: Stefan Metzmacher <metze@samba.org> >Date: Thu, 18 Dec 2014 10:21:30 +0100 >Subject: [PATCH 1/2] wafsamba: add optional keep_underscore=True to > SAMBA_LIBRARY() > >Bug: https://bugzilla.samba.org/show_bug.cgi?id=9299 > >Signed-off-by: Stefan Metzmacher <metze@samba.org> >--- > buildtools/wafsamba/wafsamba.py | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > >diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py >index 020516b..bd2ca89 100644 >--- a/buildtools/wafsamba/wafsamba.py >+++ b/buildtools/wafsamba/wafsamba.py >@@ -110,6 +110,7 @@ def SAMBA_LIBRARY(bld, libname, source, > ldflags='', > external_library=False, > realname=None, >+ keep_underscore=False, > autoproto=None, > autoproto_extra_source='', > group='main', >@@ -212,7 +213,10 @@ def SAMBA_LIBRARY(bld, libname, source, > libname) > > if target_type == 'PYTHON' or realname or not private_library: >- bundled_name = libname.replace('_', '-') >+ if keep_underscore: >+ bundled_name = libname >+ else: >+ bundled_name = libname.replace('_', '-') > else: > bundled_name = PRIVATE_NAME(bld, libname, bundled_extension, > private_library) >-- >1.9.1 > > >From 91bab85e0f0ea2bb6ce32f09713e1ff49201f88d Mon Sep 17 00:00:00 2001 >From: Stefan Metzmacher <metze@samba.org> >Date: Thu, 18 Dec 2014 10:33:34 +0100 >Subject: [PATCH 2/2] nsswitch: fix soname of linux nss_*.so.2 modules > >Bug: https://bugzilla.samba.org/show_bug.cgi?id=9299 > >Signed-off-by: Stefan Metzmacher <metze@samba.org> >--- > nsswitch/wscript_build | 24 ++++++++++++++++++------ > source3/wscript_build | 7 ------- > 2 files changed, 18 insertions(+), 13 deletions(-) > >diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build >index 8ceb9ad..914b500 100644 >--- a/nsswitch/wscript_build >+++ b/nsswitch/wscript_build >@@ -30,12 +30,24 @@ bld.SAMBA_LIBRARY('nss_wrapper_winbind', > # the search for .rfind('gnu') covers gnu* and *-gnu is that too broad? > > if (Utils.unversioned_sys_platform() == 'linux' or (host_os.rfind('gnu') > -1)): >- bld.SAMBA_LIBRARY('nss_winbind', >- source='winbind_nss_linux.c', >- deps='winbind-client', >- realname='libnss_winbind.so.2', >- soname='libnss_winbind.so', >- vnum='2') >+ bld.SAMBA_LIBRARY('nss_winbind', >+ keep_underscore=True, >+ source='winbind_nss_linux.c', >+ deps='winbind-client', >+ public_headers=[], >+ public_headers_install=False, >+ pc_files=[], >+ vnum='2') >+ >+ # for nss_wins is linux only >+ bld.SAMBA3_LIBRARY('nss_wins', >+ keep_underscore=True, >+ source='../nsswitch/wins.c', >+ deps='''param libsmb LIBTSOCKET''', >+ public_headers=[], >+ public_headers_install=False, >+ pc_files=[], >+ vnum='2') > elif (host_os.rfind('freebsd') > -1): > # FreeBSD winbind client is implemented as a wrapper around > # the Linux version. >diff --git a/source3/wscript_build b/source3/wscript_build >index a57fcf0..dc6b196 100755 >--- a/source3/wscript_build >+++ b/source3/wscript_build >@@ -55,13 +55,6 @@ bld.SAMBA3_LIBRARY('netapi', > pc_files='libnet/netapi.pc', > vnum='0') > >-bld.SAMBA3_LIBRARY('nss_wins', >- source='../nsswitch/wins.c', >- deps='''param libsmb LIBTSOCKET''', >- realname='libnss_wins.so.2', >- soname='libnss_wins.so', >- vnum='2') >- > bld.SAMBA3_LIBRARY('gse', > source='librpc/crypto/gse_krb5.c librpc/crypto/gse.c', > deps='krb5samba gensec param KRBCLIENT secrets3', >-- >1.9.1 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 9299
:
8086
|
8112
|
8113
| 10548 |
10560
|
10561
|
10562
|
10588
|
10589