aboutsummaryrefslogtreecommitdiffstats
path: root/main/samba/wrappers.patch
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2015-04-04 11:04:48 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2015-04-04 17:12:12 +0000
commitfe0ba101290309b6f8685070054d089d6f0c4b28 (patch)
tree18269f05248cbb8a4181a411e70fa19f4562176c /main/samba/wrappers.patch
parent28c7fb5e58f00e8cc18fbbd351b369343a511657 (diff)
downloadaports-fe0ba101290309b6f8685070054d089d6f0c4b28.tar.bz2
aports-fe0ba101290309b6f8685070054d089d6f0c4b28.tar.xz
main/samba: upgrade to 4.2
Diffstat (limited to 'main/samba/wrappers.patch')
-rw-r--r--main/samba/wrappers.patch51
1 files changed, 51 insertions, 0 deletions
diff --git a/main/samba/wrappers.patch b/main/samba/wrappers.patch
new file mode 100644
index 0000000000..56858738d4
--- /dev/null
+++ b/main/samba/wrappers.patch
@@ -0,0 +1,51 @@
+from upstream:
+https://git.samba.org/?p=samba.git;a=commit;h=c0a463d94abb5c50eaca7b1d402c979684f96a97
+
+--- ./wscript.orig
++++ ./wscript
+@@ -156,15 +156,16 @@
+ conf.RECURSE('lib/ntdb')
+ conf.RECURSE('lib/util/charset')
+ conf.RECURSE('source4/auth')
+- conf.RECURSE('lib/nss_wrapper')
+ conf.RECURSE('nsswitch')
+- conf.RECURSE('lib/socket_wrapper')
+- conf.RECURSE('lib/uid_wrapper')
+ conf.RECURSE('lib/subunit/c')
+ conf.RECURSE('libcli/smbreadline')
+ conf.RECURSE('lib/crypto')
+ conf.RECURSE('pidl')
+ conf.RECURSE('selftest')
++ if conf.CONFIG_GET('ENABLE_SELFTEST'):
++ conf.RECURSE('lib/nss_wrapper')
++ conf.RECURSE('lib/socket_wrapper')
++ conf.RECURSE('lib/uid_wrapper')
+ conf.RECURSE('source3')
+ conf.RECURSE('lib/texpect')
+ if conf.env.with_ctdb:
+--- ./wscript_build.orig
++++ ./wscript_build
+@@ -2,6 +2,7 @@
+
+ # top level waf build script for samba4
+
++import Options
+ import os
+ srcdir = "."
+
+@@ -70,9 +71,12 @@
+ bld.RECURSE('source4/lib/events')
+ bld.RECURSE('source4/lib/cmdline')
+ bld.RECURSE('source4/lib/http')
+-bld.RECURSE('lib/socket_wrapper')
+-bld.RECURSE('lib/nss_wrapper')
+-bld.RECURSE('lib/uid_wrapper')
++if bld.CONFIG_GET('NSS_WRAPPER'):
++ bld.RECURSE('lib/nss_wrapper')
++if bld.CONFIG_GET('SOCKET_WRAPPER'):
++ bld.RECURSE('lib/socket_wrapper')
++if bld.CONFIG_GET('UID_WRAPPER'):
++ bld.RECURSE('lib/uid_wrapper')
+ if bld.CHECK_FOR_THIRD_PARTY():
+ bld.RECURSE('third_party/zlib')
+ bld.RECURSE('third_party/popt')