summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-08-01 16:43:48 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-04 15:22:22 +0100
commit43a39336243464e73db64cc66d29bb3d14663e7e (patch)
tree4bf1a6f0ed69bb1f113c629b7a8ba37161d61e33 /meta
parent6d59c5cd61412ac0245f28635558f5344b153cf2 (diff)
downloadpoky-43a39336243464e73db64cc66d29bb3d14663e7e.tar.gz
meta: add more missing patch tags
(From OE-Core rev: 5e5a6145d844c2f6daa3258429a870c42475adff) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/openssh/openssh/openssh-7.1p1-conditional-compile-des-in-cipher.patch2
-rw-r--r--meta/recipes-connectivity/openssh/openssh/openssh-7.1p1-conditional-compile-des-in-pkcs11.patch2
-rw-r--r--meta/recipes-devtools/perl/perl/perl-fix-CVE-2016-2381.patch1
-rw-r--r--meta/recipes-devtools/rpm/rpm/0001-system.h-query.c-support-nosignature.patch3
-rw-r--r--meta/recipes-support/boost/boost/boost-CVE-2012-2677.patch2
5 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh/openssh-7.1p1-conditional-compile-des-in-cipher.patch b/meta/recipes-connectivity/openssh/openssh/openssh-7.1p1-conditional-compile-des-in-cipher.patch
index 26193c2e53..2e59589479 100644
--- a/meta/recipes-connectivity/openssh/openssh/openssh-7.1p1-conditional-compile-des-in-cipher.patch
+++ b/meta/recipes-connectivity/openssh/openssh/openssh-7.1p1-conditional-compile-des-in-cipher.patch
@@ -3,7 +3,7 @@ From: Haiqing Bai <Haiqing.Bai@windriver.com>
3Date: Fri, 18 Mar 2016 15:49:31 +0800 3Date: Fri, 18 Mar 2016 15:49:31 +0800
4Subject: [PATCH 2/3] remove des in cipher. 4Subject: [PATCH 2/3] remove des in cipher.
5 5
6Upstream-status: Pending 6Upstream-Status: Pending
7 7
8Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com> 8Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com>
9 9
diff --git a/meta/recipes-connectivity/openssh/openssh/openssh-7.1p1-conditional-compile-des-in-pkcs11.patch b/meta/recipes-connectivity/openssh/openssh/openssh-7.1p1-conditional-compile-des-in-pkcs11.patch
index bd02028816..815af422ff 100644
--- a/meta/recipes-connectivity/openssh/openssh/openssh-7.1p1-conditional-compile-des-in-pkcs11.patch
+++ b/meta/recipes-connectivity/openssh/openssh/openssh-7.1p1-conditional-compile-des-in-pkcs11.patch
@@ -3,7 +3,7 @@ From: Haiqing Bai <Haiqing.Bai@windriver.com>
3Date: Fri, 18 Mar 2016 15:59:21 +0800 3Date: Fri, 18 Mar 2016 15:59:21 +0800
4Subject: [PATCH 3/3] remove des in pkcs11. 4Subject: [PATCH 3/3] remove des in pkcs11.
5 5
6Upstream-status: Pending 6Upstream-Status: Pending
7 7
8Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com> 8Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com>
9 9
diff --git a/meta/recipes-devtools/perl/perl/perl-fix-CVE-2016-2381.patch b/meta/recipes-devtools/perl/perl/perl-fix-CVE-2016-2381.patch
index 0033ae0f63..99fa8d9a6a 100644
--- a/meta/recipes-devtools/perl/perl/perl-fix-CVE-2016-2381.patch
+++ b/meta/recipes-devtools/perl/perl/perl-fix-CVE-2016-2381.patch
@@ -1,3 +1,4 @@
1CVE: CVE-2016-2381
1Upstream-Status: Backport 2Upstream-Status: Backport
2 3
3Backport patch to fix CVE-2016-2381 from 4Backport patch to fix CVE-2016-2381 from
diff --git a/meta/recipes-devtools/rpm/rpm/0001-system.h-query.c-support-nosignature.patch b/meta/recipes-devtools/rpm/rpm/0001-system.h-query.c-support-nosignature.patch
index 410ae78c1b..77dc5b67d2 100644
--- a/meta/recipes-devtools/rpm/rpm/0001-system.h-query.c-support-nosignature.patch
+++ b/meta/recipes-devtools/rpm/rpm/0001-system.h-query.c-support-nosignature.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] system.h/query.c: support nosignature
8 otherwise, when use --nosignature would read database and verify 8 otherwise, when use --nosignature would read database and verify
9 signature, this is not expected. 9 signature, this is not expected.
10 10
11Upstream-Status: Submitting [Sent email to rpm-devel@rpm5.org] 11Upstream-Status: Submitted [Sent email to rpm-devel@rpm5.org]
12 12
13Signed-off-by: Robert Yang <liezhi.yang@windriver.com> 13Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
14--- 14---
@@ -61,4 +61,3 @@ index 2ff8906..ad4619a 100644
61 * Permit ar(1) payloads. Disabled while rpmio/iosm.c is under development. 61 * Permit ar(1) payloads. Disabled while rpmio/iosm.c is under development.
62-- 62--
632.9.0 632.9.0
64
diff --git a/meta/recipes-support/boost/boost/boost-CVE-2012-2677.patch b/meta/recipes-support/boost/boost/boost-CVE-2012-2677.patch
index 859f4aaeea..0cd97ccb97 100644
--- a/meta/recipes-support/boost/boost/boost-CVE-2012-2677.patch
+++ b/meta/recipes-support/boost/boost/boost-CVE-2012-2677.patch
@@ -3,7 +3,7 @@ Reference
3https://svn.boost.org/trac/boost/changeset/78326 3https://svn.boost.org/trac/boost/changeset/78326
4 4
5Upstream-Status: Backport 5Upstream-Status: Backport
6 6CVE: CVE-2012-2677
7Signed-off-by: Yue Tao <yue.tao@windriver.com> 7Signed-off-by: Yue Tao <yue.tao@windriver.com>
8 8
9diff --git a/boost/pool/pool.hpp.old b/boost/pool/pool.hpp 9diff --git a/boost/pool/pool.hpp.old b/boost/pool/pool.hpp