[Pkg-samba-maint] [samba] 01/02: Use socket_wrapper only with selftest

[Mathieu Parent]

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

sathieu pushed a commit to branch local-diffs
in repository samba.

commit 870543b3178aa6002de0750576aac138e70a0432
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Mon Jul 27 06:20:16 2015 +0200

    Use socket_wrapper only with selftest
---
 ctdb/wscript                                       |  6 ++--
 .../Use-socket_wrapper-only-with-selftest.patch    | 36 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/ctdb/wscript b/ctdb/wscript
index 06f86a3..07b6b77 100755
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -94,7 +94,8 @@ def configure(conf):
     conf.RECURSE('lib/talloc')
     conf.RECURSE('lib/tevent')
     conf.RECURSE('lib/tdb')
-    conf.RECURSE('lib/socket_wrapper')
+    if conf.CONFIG_GET('ENABLE_SELFTEST'):
+        conf.RECURSE('lib/socket_wrapper')
 
     conf.CHECK_HEADERS('sched.h')
     conf.CHECK_HEADERS('procinfo.h')
@@ -256,7 +257,8 @@ def build(bld):
     bld.RECURSE('lib/talloc')
     bld.RECURSE('lib/tevent')
     bld.RECURSE('lib/tdb')
-    bld.RECURSE('lib/socket_wrapper')
+    if bld.CONFIG_GET('SOCKET_WRAPPER'):
+        bld.RECURSE('lib/socket_wrapper')
 
     if bld.env.standalone_ctdb:
         # In a combined build is implemented, CTDB will wanted to
diff --git a/debian/patches/Use-socket_wrapper-only-with-selftest.patch b/debian/patches/Use-socket_wrapper-only-with-selftest.patch
new file mode 100644
index 0000000..932271d
--- /dev/null
+++ b/debian/patches/Use-socket_wrapper-only-with-selftest.patch
@@ -0,0 +1,36 @@
+From f789ea69aea6dcdee5e68749c3155d2b5a39ba8e Mon Sep 17 00:00:00 2001
+From: Mathieu Parent <math.parent at gmail.com>
+Date: Mon, 27 Jul 2015 06:20:16 +0200
+Subject: [PATCH] Use socket_wrapper only with selftest
+
+---
+ ctdb/wscript | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/ctdb/wscript b/ctdb/wscript
+index f95dcfa..9a037aa 100755
+--- a/ctdb/wscript
++++ b/ctdb/wscript
+@@ -94,7 +94,8 @@ def configure(conf):
+     conf.RECURSE('lib/talloc')
+     conf.RECURSE('lib/tevent')
+     conf.RECURSE('lib/tdb')
+-    conf.RECURSE('lib/socket_wrapper')
++    if conf.CONFIG_GET('ENABLE_SELFTEST'):
++        conf.RECURSE('lib/socket_wrapper')
+ 
+     conf.CHECK_HEADERS('sched.h')
+     conf.CHECK_HEADERS('procinfo.h')
+@@ -257,7 +258,8 @@ def build(bld):
+     bld.RECURSE('lib/talloc')
+     bld.RECURSE('lib/tevent')
+     bld.RECURSE('lib/tdb')
+-    bld.RECURSE('lib/socket_wrapper')
++    if bld.CONFIG_GET('SOCKET_WRAPPER'):
++        bld.RECURSE('lib/socket_wrapper')
+ 
+     if bld.env.standalone_ctdb:
+         # In a combined build is implemented, CTDB will wanted to
+-- 
+2.1.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 16bb934..e5c0940 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@ add-so-version-to-private-libraries
 xsltproc_dont_build_smb.conf.5.patch
 heimdal-rfc3454.txt
 Fix-privacy-breach-on-google.com.patch
+Use-socket_wrapper-only-with-selftest.patch

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