1 files changed, 36 insertions, 0 deletions

diff --git a/meta-networking/recipes-connectivity/samba/samba-4.1.12/0007-waf-Fix-parsing-of-cross-answers-file-in-case-answer.patch b/meta-networking/recipes-connectivity/samba/samba-4.1.12/0007-waf-Fix-parsing-of-cross-answers-file-in-case-answer.patch
new file mode 100644
index 0000000000..de0d32c780
--- /dev/null
+++ b/meta-networking/recipes-connectivity/samba/samba-4.1.12/0007-waf-Fix-parsing-of-cross-answers-file-in-case-answer.patch
@@ -0,0 +1,36 @@
+From 649c731526dc1473bd1804d2903d7559e63616da Mon Sep 17 00:00:00 2001
+From: Uri Simchoni <urisimchoni@gmail.com>
+Date: Mon, 4 May 2015 09:12:45 +0300
+Subject: [PATCH 7/7] waf: Fix parsing of cross-answers file in case answer includes a colon
+
+The answer provided in the cross-answers file may include a colon,
+as in:
+Checking uname version type: "#57-Ubuntu SMP Tue Jul 15 03:51:08 UTC 2014"
+
+Signed-off-by: Uri Simchoni <urisimchoni@gmail.com>
+Reviewed-by: Andrew Bartlett <abartlet@samba.org>
+Reviewed-by: Alexander Bokovoy <ab@samba.org>
+
+Upstream-Status: Backport
+
+Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
+---
+ buildtools/wafsamba/samba_cross.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/buildtools/wafsamba/samba_cross.py b/buildtools/wafsamba/samba_cross.py
+index d1e7006..7961212 100644
+--- a/buildtools/wafsamba/samba_cross.py
++++ b/buildtools/wafsamba/samba_cross.py
+@@ -54,7 +54,7 @@ def cross_answer(ca_file, msg):
+         if line == '' or line[0] == '#':
+             continue
+         if line.find(':') != -1:
+-            a = line.split(':')
++            a = line.split(':', 1)
+             thismsg = a[0].strip()
+             if thismsg != msg:
+                 continue
+-- 
+1.9.1
+