[PATCH 1/4] gdb: fix patch headers

[PATCH 1/4] gdb: fix patch headers

[Ross Burton]

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 .../gdb/gdb/gdbserver-ctrl-c-handling.patch        | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/meta/recipes-devtools/gdb/gdb/gdbserver-ctrl-c-handling.patch b/meta/recipes-devtools/gdb/gdb/gdbserver-ctrl-c-handling.patch
index dffb0dd81fc..71fe7f83b65 100644
--- a/meta/recipes-devtools/gdb/gdb/gdbserver-ctrl-c-handling.patch
+++ b/meta/recipes-devtools/gdb/gdb/gdbserver-ctrl-c-handling.patch
@@ -1,14 +1,14 @@
-+This problem was created by the upstream commit 78708b7c8c
-+After applying the commit, it will send SIGINT to the process group(-signal_pid).
-+But if we use gdbserver send SIGINT, and the attached process is not a process
-+group leader, then the "kill (-signal_pid, SIGINT)" returns error and fails  to
-+interrupt the attached process.
-+
-+Upstream-Status: Submitted
-+[https://sourceware.org/bugzilla/show_bug.cgi?id=18945]
-+
-+Author: Josh Gao
-+Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
+This problem was created by the upstream commit 78708b7c8c
+After applying the commit, it will send SIGINT to the process group(-signal_pid).
+But if we use gdbserver send SIGINT, and the attached process is not a process
+group leader, then the "kill (-signal_pid, SIGINT)" returns error and fails  to
+interrupt the attached process.
+
+Upstream-Status: Submitted [https://sourceware.org/bugzilla/show_bug.cgi?id=18945]
+
+Author: Josh Gao
+Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
+
 Index: gdb-8.2/gdb/gdbserver/linux-low.c
 ===================================================================
 --- gdb-8.2.orig/gdb/gdbserver/linux-low.c
-- 
2.11.0

[PATCH 2/4] python: fix patch headers

[Ross Burton]

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 .../0001-bpo-33354-Fix-test_ssl-when-a-filename-cannot-be-enc.patch   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/meta/recipes-devtools/python/python/0001-bpo-33354-Fix-test_ssl-when-a-filename-cannot-be-enc.patch b/meta/recipes-devtools/python/python/0001-bpo-33354-Fix-test_ssl-when-a-filename-cannot-be-enc.patch
index 776bbdcf7a4..4c0b3577b24 100644
--- a/meta/recipes-devtools/python/python/0001-bpo-33354-Fix-test_ssl-when-a-filename-cannot-be-enc.patch
+++ b/meta/recipes-devtools/python/python/0001-bpo-33354-Fix-test_ssl-when-a-filename-cannot-be-enc.patch
@@ -7,9 +7,7 @@ Subject: [PATCH] bpo-33354: Fix test_ssl when a filename cannot be encoded
 Skip test_load_dh_params() of test_ssl when Python filesystem encoding
 cannot encode the provided path.
 
-Upstream-Status:
-Backport[https://github.com/python/cpython/commit/19f6bd06af3c7fc0db5f96878aaa68f5589ff13e]
-
+Upstream-Status: Backport [https://github.com/python/cpython/commit/19f6bd06af3c7fc0db5f96878aaa68f5589ff13e]
 Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
 ---
  Lib/test/test_ssl.py                                     | 9 ++++++++-
-- 
2.11.0

[PATCH 3/4] python3: fix patch headers

[Ross Burton]

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-devtools/python/python3/ftplib.patch | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/recipes-devtools/python/python3/ftplib.patch b/meta/recipes-devtools/python/python3/ftplib.patch
index 8bb3cd02196..49c5b2736b9 100644
--- a/meta/recipes-devtools/python/python3/ftplib.patch
+++ b/meta/recipes-devtools/python/python3/ftplib.patch
@@ -1,3 +1,6 @@
+Upstream-Status: Backport
+Signed-off-by: Ross Burton <ross.burton@intel.com>
+
 From cabe916dc694997d4892b58986e73a713d5a2f8d Mon Sep 17 00:00:00 2001
 From: "Miss Islington (bot)"
  <31488909+miss-islington@users.noreply.github.com>
-- 
2.11.0

[PATCH 4/4] lib11: fix patch headers

[Ross Burton]

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.patch          | 3 ++-
 meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.patch   | 3 ++-
 meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.patch b/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.patch
index 4ca2f42d4c7..c4c9396675a 100644
--- a/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.patch
@@ -1,10 +1,11 @@
 From 62005ad019d6afb81da100b3113292a16472d241 Mon Sep 17 00:00:00 2001
 From: Changqing Li <changqing.li@windriver.com>
 Date: Mon, 10 Sep 2018 09:08:27 +0800
-Subject: [PATCH] Upstream-Status: Inappropriate [configuration]
+Subject: [PATCH] 
 
 Update patch to version 1.6.6
 Signed-off-by: Changqing Li <changqing.li@windriver.com>
+Upstream-Status: Inappropriate [configuration]
 ---
  src/Makefile.am    |   5 +-
  src/X18NCMSstubs.c | 426 +++++++++++++++++++++++++++++++++++++++++++++++++++++
diff --git a/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.patch b/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.patch
index 3677fb1c5ca..559250f9576 100644
--- a/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.patch
@@ -1,12 +1,13 @@
 From 5c1693028ef12ab767d7cdbc349c27efa1ada87a Mon Sep 17 00:00:00 2001
 From: Changqing Li <changqing.li@windriver.com>
 Date: Mon, 10 Sep 2018 09:13:38 +0800
-Subject: [PATCH] Upstream-Status: Pending
+Subject: [PATCH]
 
 Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
 
 Update patch to version 1.6.6
 Signed-off-by: Changqing Li <changqing.li@windriver.com>
+Upstream-Status: Pending
 ---
  src/Font.c | 4 ++++
  1 file changed, 4 insertions(+)
diff --git a/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch b/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch
index 1a3069a9ad6..c077639f895 100644
--- a/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch
@@ -1,13 +1,14 @@
 From 046703373055c7029c19d171e415ff3caaa87372 Mon Sep 17 00:00:00 2001
 From: Changqing Li <changqing.li@windriver.com>
 Date: Mon, 10 Sep 2018 09:16:33 +0800
-Subject: [PATCH] Upstream-Status: Pending
+Subject: [PATCH]
 
 Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
 
 Update patch to version 1.6.6
 
 Signed-off-by: Changqing Li <changqing.li@windriver.com>
+Upstream-Status: Pending
 ---
  include/X11/Xlib.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
-- 
2.11.0