From 9b2e3b8235ee545b0eb666266c5db2ec7cb9e21f Mon Sep 17 00:00:00 2001 From: Dengke Du Date: Wed, 12 Jul 2017 22:19:17 -0400 Subject: dropbear: reduce local pending patches Signed-off-by: Dengke Du Signed-off-by: Ross Burton --- meta/recipes-core/dropbear/dropbear/0003-configure.patch | 13 +++++++------ .../dropbear/fix-libtomcrypt-libtommath-ordering.patch | 11 ++++++----- 2 files changed, 13 insertions(+), 11 deletions(-) (limited to 'meta/recipes-core/dropbear') 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 @@ -From c5f5c5054c1b15539dccf866e2c3faba7ed68456 Mon Sep 17 00:00:00 2001 +From 58dd24a80ca0f400d0761afd9ce2b7f684fc9125 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= Date: Thu, 25 Apr 2013 00:27:25 +0200 -Subject: [PATCH 3/6] configure: add a variable to allow openpty check to be cached +Subject: [PATCH] configure: add a variable to allow openpty check to be cached -Upstream-Status: Pending +Upstream-Status: Submitted [ https://github.com/mkj/dropbear/pull/48 ] +Signed-off-by: Dengke Du --- configure.ac | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index 05461f3..9c16d90 100644 +index 893b904..245408d 100644 --- a/configure.ac +++ b/configure.ac -@@ -166,15 +166,20 @@ AC_ARG_ENABLE(openpty, +@@ -177,15 +177,20 @@ AC_ARG_ENABLE(openpty, AC_MSG_NOTICE(Not using openpty) else AC_MSG_NOTICE(Using openpty if available) @@ -38,5 +39,5 @@ index 05461f3..9c16d90 100644 AC_ARG_ENABLE(syslog, [ --disable-syslog Don't include syslog support], -- -1.7.11.7 +2.8.1 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 @@ -From 2fd8d2aedad0c50cdf1e43edd2387874b720ad4c Mon Sep 17 00:00:00 2001 +From f37fa9a41f248fa41dd74a41c66cb41a291c03d2 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Fri, 16 Sep 2016 12:18:23 -0700 Subject: [PATCH] fix libtomcrypt/libtommath ordering @@ -11,18 +11,19 @@ prepended to LIBTOM_LIBS as they are found, not appended. Note that LIBTOM_LIBS is not used when linking with the bundled libtom libs. -Upstream-Status: Pending +Upstream-Status: Backport [ https://github.com/mkj/dropbear/commit/f9e6bc2aecab0f4b5b529e07a92cc63c8a66cd4b ] Signed-off-by: Andre McCurdy +Signed-off-by: Dengke Du --- configure.ac | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac -index b6abe4c..85bb8bc 100644 +index 245408d..d624853 100644 --- a/configure.ac +++ b/configure.ac -@@ -390,16 +390,16 @@ AC_ARG_ENABLE(bundled-libtom, +@@ -393,16 +393,16 @@ AC_ARG_ENABLE(bundled-libtom, AC_MSG_NOTICE(Forcing bundled libtom*) else BUNDLED_LIBTOM=0 @@ -44,5 +45,5 @@ index b6abe4c..85bb8bc 100644 ) -- -1.9.1 +2.8.1 -- cgit 1.2.3-korg