summaryrefslogtreecommitdiffstats
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:05:46 +0100
commit5e5a6145d844c2f6daa3258429a870c42475adff (patch)
treeca4e29909254941d58df76446faaf04daad1f7c6
parent614d976ee97d6386c37afb54add5b83741ca401e (diff)
downloadopenembedded-core-contrib-5e5a6145d844c2f6daa3258429a870c42475adff.tar.gz
openembedded-core-contrib-5e5a6145d844c2f6daa3258429a870c42475adff.tar.bz2
openembedded-core-contrib-5e5a6145d844c2f6daa3258429a870c42475adff.zip
meta: add more missing patch tags
Signed-off-by: Ross Burton <ross.burton@intel.com>
-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>
Date: Fri, 18 Mar 2016 15:49:31 +0800
Subject: [PATCH 2/3] remove des in cipher.
-Upstream-status: Pending
+Upstream-Status: Pending
Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com>
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>
Date: Fri, 18 Mar 2016 15:59:21 +0800
Subject: [PATCH 3/3] remove des in pkcs11.
-Upstream-status: Pending
+Upstream-Status: Pending
Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com>
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 @@
+CVE: CVE-2016-2381
Upstream-Status: Backport
Backport 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
otherwise, when use --nosignature would read database and verify
signature, this is not expected.
-Upstream-Status: Submitting [Sent email to rpm-devel@rpm5.org]
+Upstream-Status: Submitted [Sent email to rpm-devel@rpm5.org]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
@@ -61,4 +61,3 @@ index 2ff8906..ad4619a 100644
* Permit ar(1) payloads. Disabled while rpmio/iosm.c is under development.
--
2.9.0
-
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
https://svn.boost.org/trac/boost/changeset/78326
Upstream-Status: Backport
-
+CVE: CVE-2012-2677
Signed-off-by: Yue Tao <yue.tao@windriver.com>
diff --git a/boost/pool/pool.hpp.old b/boost/pool/pool.hpp