summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorDengke Du <dengke.du@windriver.com>2017-07-12 22:19:17 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-17 14:01:39 +0100
commitff576d1071a07573338593c34fd7f6d33cfb7607 (patch)
treec61bb7a4e2c807f46b6c125473cb1903503b7761 /meta
parentb066632e2ee0e65b80b6c436072bedba820f2604 (diff)
downloadpoky-ff576d1071a07573338593c34fd7f6d33cfb7607.tar.gz
dropbear: reduce local pending patches
(From OE-Core rev: 9b2e3b8235ee545b0eb666266c5db2ec7cb9e21f) Signed-off-by: Dengke Du <dengke.du@windriver.com> 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-core/dropbear/dropbear/0003-configure.patch13
-rw-r--r--meta/recipes-core/dropbear/dropbear/fix-libtomcrypt-libtommath-ordering.patch11
2 files changed, 13 insertions, 11 deletions
diff --git a/meta/recipes-core/dropbear/dropbear/0003-configure.patch b/meta/recipes-core/dropbear/dropbear/0003-configure.patch
index c53ab01ddd..8469a50eff 100644
--- a/meta/recipes-core/dropbear/dropbear/0003-configure.patch
+++ b/meta/recipes-core/dropbear/dropbear/0003-configure.patch
@@ -1,19 +1,20 @@
1From c5f5c5054c1b15539dccf866e2c3faba7ed68456 Mon Sep 17 00:00:00 2001 1From 58dd24a80ca0f400d0761afd9ce2b7f684fc9125 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com> 2From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com>
3Date: Thu, 25 Apr 2013 00:27:25 +0200 3Date: Thu, 25 Apr 2013 00:27:25 +0200
4Subject: [PATCH 3/6] configure: add a variable to allow openpty check to be cached 4Subject: [PATCH] configure: add a variable to allow openpty check to be cached
5 5
6Upstream-Status: Pending 6Upstream-Status: Submitted [ https://github.com/mkj/dropbear/pull/48 ]
7 7
8Signed-off-by: Dengke Du <dengke.du@windriver.com>
8--- 9---
9 configure.ac | 11 ++++++++--- 10 configure.ac | 11 ++++++++---
10 1 file changed, 8 insertions(+), 3 deletions(-) 11 1 file changed, 8 insertions(+), 3 deletions(-)
11 12
12diff --git a/configure.ac b/configure.ac 13diff --git a/configure.ac b/configure.ac
13index 05461f3..9c16d90 100644 14index 893b904..245408d 100644
14--- a/configure.ac 15--- a/configure.ac
15+++ b/configure.ac 16+++ b/configure.ac
16@@ -166,15 +166,20 @@ AC_ARG_ENABLE(openpty, 17@@ -177,15 +177,20 @@ AC_ARG_ENABLE(openpty,
17 AC_MSG_NOTICE(Not using openpty) 18 AC_MSG_NOTICE(Not using openpty)
18 else 19 else
19 AC_MSG_NOTICE(Using openpty if available) 20 AC_MSG_NOTICE(Using openpty if available)
@@ -38,5 +39,5 @@ index 05461f3..9c16d90 100644
38 AC_ARG_ENABLE(syslog, 39 AC_ARG_ENABLE(syslog,
39 [ --disable-syslog Don't include syslog support], 40 [ --disable-syslog Don't include syslog support],
40-- 41--
411.7.11.7 422.8.1
42 43
diff --git a/meta/recipes-core/dropbear/dropbear/fix-libtomcrypt-libtommath-ordering.patch b/meta/recipes-core/dropbear/dropbear/fix-libtomcrypt-libtommath-ordering.patch
index de930f29d1..2b05e1893d 100644
--- a/meta/recipes-core/dropbear/dropbear/fix-libtomcrypt-libtommath-ordering.patch
+++ b/meta/recipes-core/dropbear/dropbear/fix-libtomcrypt-libtommath-ordering.patch
@@ -1,4 +1,4 @@
1From 2fd8d2aedad0c50cdf1e43edd2387874b720ad4c Mon Sep 17 00:00:00 2001 1From f37fa9a41f248fa41dd74a41c66cb41a291c03d2 Mon Sep 17 00:00:00 2001
2From: Andre McCurdy <armccurdy@gmail.com> 2From: Andre McCurdy <armccurdy@gmail.com>
3Date: Fri, 16 Sep 2016 12:18:23 -0700 3Date: Fri, 16 Sep 2016 12:18:23 -0700
4Subject: [PATCH] fix libtomcrypt/libtommath ordering 4Subject: [PATCH] fix libtomcrypt/libtommath ordering
@@ -11,18 +11,19 @@ prepended to LIBTOM_LIBS as they are found, not appended.
11Note that LIBTOM_LIBS is not used when linking with the bundled 11Note that LIBTOM_LIBS is not used when linking with the bundled
12libtom libs. 12libtom libs.
13 13
14Upstream-Status: Pending 14Upstream-Status: Backport [ https://github.com/mkj/dropbear/commit/f9e6bc2aecab0f4b5b529e07a92cc63c8a66cd4b ]
15 15
16Signed-off-by: Andre McCurdy <armccurdy@gmail.com> 16Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
17Signed-off-by: Dengke Du <dengke.du@windriver.com>
17--- 18---
18 configure.ac | 8 ++++---- 19 configure.ac | 8 ++++----
19 1 file changed, 4 insertions(+), 4 deletions(-) 20 1 file changed, 4 insertions(+), 4 deletions(-)
20 21
21diff --git a/configure.ac b/configure.ac 22diff --git a/configure.ac b/configure.ac
22index b6abe4c..85bb8bc 100644 23index 245408d..d624853 100644
23--- a/configure.ac 24--- a/configure.ac
24+++ b/configure.ac 25+++ b/configure.ac
25@@ -390,16 +390,16 @@ AC_ARG_ENABLE(bundled-libtom, 26@@ -393,16 +393,16 @@ AC_ARG_ENABLE(bundled-libtom,
26 AC_MSG_NOTICE(Forcing bundled libtom*) 27 AC_MSG_NOTICE(Forcing bundled libtom*)
27 else 28 else
28 BUNDLED_LIBTOM=0 29 BUNDLED_LIBTOM=0
@@ -44,5 +45,5 @@ index b6abe4c..85bb8bc 100644
44 ) 45 )
45 46
46-- 47--
471.9.1 482.8.1
48 49