[Pkg-samba-maint] [samba] 01/03: Add patch no_wrapper: avoid dependencies on {nss, uid, socket}_wrapper.

[Jelmer Vernooij]

This is an automated email from the git hooks/post-receive script.

jelmer pushed a commit to branch experimental
in repository samba.

commit 45691adf3911e70580646ba62789875a65f0d09d
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Jun 21 03:07:11 2015 +0000

    Add patch no_wrapper: avoid dependencies on {nss,uid,socket}_wrapper.
---
 debian/changelog          |  2 ++
 debian/patches/no_wrapper | 44 ++++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series     |  1 +
 wscript                   |  8 +++++---
 wscript_build             |  9 ++++++---
 5 files changed, 58 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 18cb36f..d37299f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ samba (2:4.2.1+dfsg-1) UNRELEASED; urgency=medium
     building bundled heimdal.
   * Drop patches 25_heimdal_api_changes and 26_heimdal_compat.
   * Disable cluster support; it breaks the build.
+  * Add patch no_wrapper: avoid dependencies on
+    {nss,uid,socket}_wrapper.
 
  -- Jelmer Vernooij <jelmer at debian.org>  Sun, 07 Dec 2014 15:34:36 +0000
 
diff --git a/debian/patches/no_wrapper b/debian/patches/no_wrapper
new file mode 100644
index 0000000..f6a5c56
--- /dev/null
+++ b/debian/patches/no_wrapper
@@ -0,0 +1,44 @@
+Description: Don't build with wrappers, as selftest is unused
+Author: Jelmer Vernooij <jelmer at samba.org>
+Status: not forwarded upstream (already fixed in master)
+
+diff --git a/wscript b/wscript
+index ad2e2a8..47a83e9 100644
+--- a/wscript
++++ b/wscript
+@@ -156,10 +156,12 @@ def configure(conf):
+     conf.RECURSE('lib/ntdb')
+     conf.RECURSE('lib/util/charset')
+     conf.RECURSE('source4/auth')
+-    conf.RECURSE('lib/nss_wrapper')
++    if conf.CONFIG_GET('ENABLE_SELFTEST'):
++        conf.RECURSE('lib/nss_wrapper')
+     conf.RECURSE('nsswitch')
+-    conf.RECURSE('lib/socket_wrapper')
+-    conf.RECURSE('lib/uid_wrapper')
++    if conf.CONFIG_GET('ENABLE_SELFTEST'):
++        conf.RECURSE('lib/socket_wrapper')
++        conf.RECURSE('lib/uid_wrapper')
+     conf.RECURSE('lib/subunit/c')
+     conf.RECURSE('libcli/smbreadline')
+     conf.RECURSE('lib/crypto')
+diff --git a/wscript_build b/wscript_build
+index d7dea54..a6a6556 100644
+--- a/wscript_build
++++ b/wscript_build
+@@ -70,9 +70,12 @@ bld.RECURSE('source4/lib/messaging')
+ 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('SOCKET_WRAPPER'):
++    bld.RECURSE('lib/socket_wrapper')
++if bld.CONFIG_GET('NSS_WRAPPER'):
++    bld.RECURSE('lib/nss_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')
diff --git a/debian/patches/series b/debian/patches/series
index 4a8eb0e..2c94eed 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ waf_smbpasswd_location
 add-so-version-to-private-libraries
 xsltproc_dont_build_smb.conf.5.patch
 heimdal-rfc3454.txt
+no_wrapper
diff --git a/wscript b/wscript
index ad2e2a8..47a83e9 100644
--- a/wscript
+++ b/wscript
@@ -156,10 +156,12 @@ def configure(conf):
     conf.RECURSE('lib/ntdb')
     conf.RECURSE('lib/util/charset')
     conf.RECURSE('source4/auth')
-    conf.RECURSE('lib/nss_wrapper')
+    if conf.CONFIG_GET('ENABLE_SELFTEST'):
+        conf.RECURSE('lib/nss_wrapper')
     conf.RECURSE('nsswitch')
-    conf.RECURSE('lib/socket_wrapper')
-    conf.RECURSE('lib/uid_wrapper')
+    if conf.CONFIG_GET('ENABLE_SELFTEST'):
+        conf.RECURSE('lib/socket_wrapper')
+        conf.RECURSE('lib/uid_wrapper')
     conf.RECURSE('lib/subunit/c')
     conf.RECURSE('libcli/smbreadline')
     conf.RECURSE('lib/crypto')
diff --git a/wscript_build b/wscript_build
index d7dea54..a6a6556 100644
--- a/wscript_build
+++ b/wscript_build
@@ -70,9 +70,12 @@ bld.RECURSE('source4/lib/messaging')
 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('SOCKET_WRAPPER'):
+    bld.RECURSE('lib/socket_wrapper')
+if bld.CONFIG_GET('NSS_WRAPPER'):
+    bld.RECURSE('lib/nss_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')

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git