diff options
author | Joe MacDonald <joe_macdonald@mentor.com> | 2016-04-18 17:00:53 -0400 |
---|---|---|
committer | Joe MacDonald <joe_macdonald@mentor.com> | 2016-04-20 08:55:27 -0400 |
commit | 70bde9accebb072b42ec5b9557411caef7e9ee54 (patch) | |
tree | 17cb72358a4547ef1f2594967d1e68014a7bcfad /meta-networking/recipes-connectivity/samba/samba-4.1.12/0003-waf-improve-readability-of-cross-answers-generated-b.patch | |
parent | ab62c7437ff28d045ecff3f82621990ff94662e6 (diff) | |
download | meta-openembedded-contrib-70bde9accebb072b42ec5b9557411caef7e9ee54.tar.gz |
samba: Update to latest stable
The previous version of Samba had many critical security updates that
would've required significant backporting effort. Update to the latest
stable release instead.
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-networking/recipes-connectivity/samba/samba-4.1.12/0003-waf-improve-readability-of-cross-answers-generated-b.patch')
-rw-r--r-- | meta-networking/recipes-connectivity/samba/samba-4.1.12/0003-waf-improve-readability-of-cross-answers-generated-b.patch | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/meta-networking/recipes-connectivity/samba/samba-4.1.12/0003-waf-improve-readability-of-cross-answers-generated-b.patch b/meta-networking/recipes-connectivity/samba/samba-4.1.12/0003-waf-improve-readability-of-cross-answers-generated-b.patch deleted file mode 100644 index ec17d9d216..0000000000 --- a/meta-networking/recipes-connectivity/samba/samba-4.1.12/0003-waf-improve-readability-of-cross-answers-generated-b.patch +++ /dev/null @@ -1,66 +0,0 @@ -From f7052d633396005563e44509428503f42c9faa97 Mon Sep 17 00:00:00 2001 -From: Jackie Huang <jackie.huang@windriver.com> -Date: Thu, 12 Nov 2015 01:00:11 -0500 -Subject: [PATCH 3/7] waf: improve readability of cross-answers generated by cross-execute - -When generating a result for cross-answers from the (retcode, retstring) tuple: -- (0, "output") indicated as "output" -- 1 is interpreted as generic fail code, instead of 255, because most - if not all tests fail with 1 as exit code rather than 255 -- For failing test, use NO instead of FAIL, because that's not - necessarily a failure (it could mean that something is NOT - broken) - -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 | 13 ++++++++----- - 1 file changed, 8 insertions(+), 5 deletions(-) - -diff --git a/buildtools/wafsamba/samba_cross.py b/buildtools/wafsamba/samba_cross.py -index 3f1ef12..d1e7006 100644 ---- a/buildtools/wafsamba/samba_cross.py -+++ b/buildtools/wafsamba/samba_cross.py -@@ -6,7 +6,7 @@ from Configure import conf - real_Popen = None - - ANSWER_UNKNOWN = (254, "") --ANSWER_FAIL = (255, "") -+ANSWER_NO = (1, "") - ANSWER_OK = (0, "") - - cross_answers_incomplete = False -@@ -33,10 +33,13 @@ def add_answer(ca_file, msg, answer): - f.write('%s: OK\n' % msg) - elif answer == ANSWER_UNKNOWN: - f.write('%s: UNKNOWN\n' % msg) -- elif answer == ANSWER_FAIL: -- f.write('%s: FAIL\n' % msg) -+ elif answer == ANSWER_NO: -+ f.write('%s: NO\n' % msg) - else: -- f.write('%s: (%d, "%s")\n' % (msg, retcode, retstring)) -+ if retcode == 0: -+ f.write('%s: "%s"\n' % (msg, retstring)) -+ else: -+ f.write('%s: (%d, "%s")\n' % (msg, retcode, retstring)) - f.close() - - -@@ -64,7 +67,7 @@ def cross_answer(ca_file, msg): - return ANSWER_UNKNOWN - elif ans == "FAIL" or ans == "NO": - f.close() -- return ANSWER_FAIL -+ return ANSWER_NO - elif ans[0] == '"': - return (0, ans.strip('"')) - elif ans[0] == "'": --- -1.9.1 - |