diff options
Diffstat (limited to 'net/samba4/files/patch-source3__wscript_build')
-rw-r--r-- | net/samba4/files/patch-source3__wscript_build | 44 |
1 files changed, 15 insertions, 29 deletions
diff --git a/net/samba4/files/patch-source3__wscript_build b/net/samba4/files/patch-source3__wscript_build index 1a22b5590346..b5d6aca6f785 100644 --- a/net/samba4/files/patch-source3__wscript_build +++ b/net/samba4/files/patch-source3__wscript_build @@ -1,34 +1,20 @@ ---- source3/wscript_build.orig 2013-07-01 09:15:40.000000000 +0200 -+++ source3/wscript_build 2013-11-12 10:13:36.004046408 +0100 -@@ -1,7 +1,8 @@ - #!/usr/bin/env python - - from samba_utils import * --import samba_version, samba3 -+import samba_version, samba3, sys -+host_os = sys.platform - - TDB_LIB_SRC = ''' - lib/dbwrap/dbwrap_open.c -@@ -651,7 +652,16 @@ +--- source3/wscript_build.orig 2014-12-08 07:46:38.000000000 +0000 ++++ source3/wscript_build 2015-01-16 00:11:55.966511894 +0000 +@@ -653,13 +653,6 @@ vnum='0', vars=locals()) -bld.SAMBA3_LIBRARY('nss_wins', -+if (host_os.rfind('freebsd') > -1): -+ # FreeBSD winbind client is implemented as a wrapper around -+ # the Linux version. -+ bld.SAMBA3_LIBRARY('nss_wins', -+ source=' '.join([WINBIND_WINS_NSS_SRC, '../nsswitch/wins_freebsd.c']), -+ deps='''param libsmb LIBTSOCKET''', -+ realname='nss_wins.so.1', -+ vnum='1') -+else: -+ bld.SAMBA3_LIBRARY('nss_wins', - source=WINBIND_WINS_NSS_SRC, - deps='''param libsmb LIBTSOCKET''', - realname='libnss_wins.so.2', -@@ -972,10 +982,12 @@ +- source=WINBIND_WINS_NSS_SRC, +- 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', +@@ -975,10 +968,12 @@ LIBAFS_SETTOKEN RPC_SERVER NDR_SMBXSRV @@ -42,7 +28,7 @@ ''' + bld.env['dmapi_lib'], private_library=True, vars=locals()) -@@ -1277,6 +1289,7 @@ +@@ -1284,6 +1279,7 @@ libsmb msrpc3 RPC_NDR_SRVSVC @@ -50,7 +36,7 @@ cli_smb_common''') bld.SAMBA3_BINARY('net', -@@ -1629,7 +1642,7 @@ +@@ -1636,7 +1632,7 @@ bld.SAMBA3_PYTHON('pylibsmb', source='libsmb/pylibsmb.c', |