summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/openssh
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-08 10:38:23 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-08 12:15:17 +0100
commited5198463f61274f6f78bc5b1e2cded63d750c4c (patch)
tree8a923d492a8b59c0606437f76fede1598ad0fe6c /meta/recipes-connectivity/openssh
parent0f2270cd40971da1f0b66478ed54511e0ed4e0ae (diff)
downloadpoky-ed5198463f61274f6f78bc5b1e2cded63d750c4c.tar.gz
openssh/systemd/python/qemu: Fix patch Upstream-Status
Fix some missing or corrupted patch Upstream-Status values. (From OE-Core rev: 07bc5a5367e0dec45253fd849e0157094152fd31) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssh')
-rw-r--r--meta/recipes-connectivity/openssh/openssh/0001-upstream-Have-progressmeter-force-an-update-at-the-b.patch2
-rw-r--r--meta/recipes-connectivity/openssh/openssh/CVE-2018-20685.patch2
-rw-r--r--meta/recipes-connectivity/openssh/openssh/CVE-2019-6111.patch2
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh/0001-upstream-Have-progressmeter-force-an-update-at-the-b.patch b/meta/recipes-connectivity/openssh/openssh/0001-upstream-Have-progressmeter-force-an-update-at-the-b.patch
index 2fb57da635..4c9d574421 100644
--- a/meta/recipes-connectivity/openssh/openssh/0001-upstream-Have-progressmeter-force-an-update-at-the-b.patch
+++ b/meta/recipes-connectivity/openssh/openssh/0001-upstream-Have-progressmeter-force-an-update-at-the-b.patch
@@ -8,7 +8,7 @@ end of each transfer. Fixes the problem recently introduces where very quick
8transfers do not display the progressmeter at all. Spotted by naddy@ 8transfers do not display the progressmeter at all. Spotted by naddy@
9 9
10OpenBSD-Commit-ID: 68dc46c259e8fdd4f5db3ec2a130f8e4590a7a9a 10OpenBSD-Commit-ID: 68dc46c259e8fdd4f5db3ec2a130f8e4590a7a9a
11Ustream-Status: Backport 11Upstream-Status: Backport
12Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> 12Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
13--- 13---
14 progressmeter.c | 13 +++++-------- 14 progressmeter.c | 13 +++++--------
diff --git a/meta/recipes-connectivity/openssh/openssh/CVE-2018-20685.patch b/meta/recipes-connectivity/openssh/openssh/CVE-2018-20685.patch
index e2fc607ff8..c5b3baece9 100644
--- a/meta/recipes-connectivity/openssh/openssh/CVE-2018-20685.patch
+++ b/meta/recipes-connectivity/openssh/openssh/CVE-2018-20685.patch
@@ -9,7 +9,7 @@ current directory; based on report/patch from Harry Sintonen
9OpenBSD-Commit-ID: f27651b30eaee2df49540ab68d030865c04f6de9 9OpenBSD-Commit-ID: f27651b30eaee2df49540ab68d030865c04f6de9
10 10
11CVE: CVE-2018-20685 11CVE: CVE-2018-20685
12Ustream-Status: Backport 12Upstream-Status: Backport
13Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> 13Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
14--- 14---
15 scp.c | 5 +++-- 15 scp.c | 5 +++--
diff --git a/meta/recipes-connectivity/openssh/openssh/CVE-2019-6111.patch b/meta/recipes-connectivity/openssh/openssh/CVE-2019-6111.patch
index 80cf39b923..e498da3819 100644
--- a/meta/recipes-connectivity/openssh/openssh/CVE-2019-6111.patch
+++ b/meta/recipes-connectivity/openssh/openssh/CVE-2019-6111.patch
@@ -18,7 +18,7 @@ has been in snaps for ~1wk courtesy deraadt@
18OpenBSD-Commit-ID: 00f44b50d2be8e321973f3c6d014260f8f7a8eda 18OpenBSD-Commit-ID: 00f44b50d2be8e321973f3c6d014260f8f7a8eda
19 19
20CVE: CVE-2019-6111 20CVE: CVE-2019-6111
21Ustream-Status: Backport 21Upstream-Status: Backport
22Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> 22Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
23--- 23---
24 scp.1 | 12 +++++++++++- 24 scp.1 | 12 +++++++++++-