]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
openssh/systemd/python/qemu: Fix patch Upstream-Status
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 8 May 2019 09:38:23 +0000 (10:38 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 8 May 2019 11:15:17 +0000 (12:15 +0100)
Fix some missing or corrupted patch Upstream-Status values.

(From OE-Core rev: 07bc5a5367e0dec45253fd849e0157094152fd31)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-connectivity/openssh/openssh/0001-upstream-Have-progressmeter-force-an-update-at-the-b.patch
meta/recipes-connectivity/openssh/openssh/CVE-2018-20685.patch
meta/recipes-connectivity/openssh/openssh/CVE-2019-6111.patch
meta/recipes-core/systemd/systemd/0025-fs-utilh-add-missing-sys-stat-include.patch
meta/recipes-devtools/python/python3/0001-main.c-if-OEPYTHON3HOME-is-set-use-instead-of-PYTHON.patch
meta/recipes-devtools/qemu/qemu/0013-Revert-target-arm-Use-vector-operations-for-saturati.patch

index 2fb57da635a7979eeae3eeb00a4b063848f2f19f..4c9d574421d9843e7a9697ecdc88b8ed2bf1ef8c 100644 (file)
@@ -8,7 +8,7 @@ end of each transfer.  Fixes the problem recently introduces where very quick
 transfers do not display the progressmeter at all.  Spotted by naddy@
 
 OpenBSD-Commit-ID: 68dc46c259e8fdd4f5db3ec2a130f8e4590a7a9a
-Ustream-Status: Backport
+Upstream-Status: Backport
 Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
 ---
  progressmeter.c | 13 +++++--------
index e2fc607ff82eb77a69d862fcc1cf5b6feac36798..c5b3baece9933219b6bd0db9c2eb33b1709abaff 100644 (file)
@@ -9,7 +9,7 @@ current directory; based on report/patch from Harry Sintonen
 OpenBSD-Commit-ID: f27651b30eaee2df49540ab68d030865c04f6de9
 
 CVE: CVE-2018-20685
-Ustream-Status: Backport
+Upstream-Status: Backport
 Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
 ---
  scp.c | 5 +++--
index 80cf39b923033f021918d8ee5d7a851827bb9bc1..e498da381941414dadfa82218120da27b8fc4375 100644 (file)
@@ -18,7 +18,7 @@ has been in snaps for ~1wk courtesy deraadt@
 OpenBSD-Commit-ID: 00f44b50d2be8e321973f3c6d014260f8f7a8eda
 
 CVE: CVE-2019-6111
-Ustream-Status: Backport
+Upstream-Status: Backport
 Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
 ---
  scp.1 | 12 +++++++++++-
index 1c6a6f50de3dfa16ecf80e26559e7d67ab262df3..bae9d3eaad4179d0c39c7b4e92ad2e1de40ae16b 100644 (file)
@@ -7,6 +7,8 @@ fix error:
 | error: passing argument 5 of 'chase_symlinks_and_stat' from incompatible pointer type [-Werror=incompatible-pointer-types]
 
 Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
+
+Upstream-Status: Pending
 ---
  src/basic/fs-util.h | 1 +
  1 file changed, 1 insertion(+)
index 06eb2bd35bd8daa354ae5c40d61dd97deafcda0f..a0ed7cc830e7d48aa88626f970d26b5c5a734344 100644 (file)
@@ -10,6 +10,8 @@ PYTHONHOME. Creating another variable OEPYTHON3HOME to allow for a way
 to set a different path for python3
 
 Signed-off-by: Jaewon Lee <jaewon.lee@xilinx.com>
+
+Upstream-Status: Inappropriate [OE specific configuration]
 ---
  Modules/main.c | 17 +++++++++++++----
  1 file changed, 13 insertions(+), 4 deletions(-)
index c38b547e2c30346efd104f9adfa6ea4210d64f16..3d018a74d9cf190ecc27f6e315ed09a658d97155 100644 (file)
@@ -8,7 +8,7 @@ This reverts commit 89e68b575e138d0af1435f11a8ffcd8779c237bd.
 This fixes QEMU aborts when running the qemuarm machine.
 
 Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
-Upstream-status: Pending
+Upstream-Status: Pending
 ---
  target/arm/helper.h        |  33 -------
  target/arm/translate-a64.c |  36 ++++----