From 1804020514f122a3b3825c627e8eb51017425bbb Mon Sep 17 00:00:00 2001 From: Shane Wang Date: Wed, 14 Mar 2012 17:08:46 +0800 Subject: dropbear: upgrade to 2012.55 Signed-off-by: Shane Wang --- .../dropbear/dropbear-2011.54/configure.patch | 29 ---------------------- .../dropbear/dropbear-2012.55/configure.patch | 29 ++++++++++++++++++++++ meta/recipes-core/dropbear/dropbear_2011.54.bb | 6 ----- meta/recipes-core/dropbear/dropbear_2012.55.bb | 6 +++++ 4 files changed, 35 insertions(+), 35 deletions(-) delete mode 100644 meta/recipes-core/dropbear/dropbear-2011.54/configure.patch create mode 100644 meta/recipes-core/dropbear/dropbear-2012.55/configure.patch delete mode 100644 meta/recipes-core/dropbear/dropbear_2011.54.bb create mode 100644 meta/recipes-core/dropbear/dropbear_2012.55.bb (limited to 'meta/recipes-core/dropbear') diff --git a/meta/recipes-core/dropbear/dropbear-2011.54/configure.patch b/meta/recipes-core/dropbear/dropbear-2011.54/configure.patch deleted file mode 100644 index aeb7c0a4a..000000000 --- a/meta/recipes-core/dropbear/dropbear-2011.54/configure.patch +++ /dev/null @@ -1,29 +0,0 @@ -Upstream-Status: Pending - -Index: dropbear-0.49/configure.in -=================================================================== ---- dropbear-0.49.orig/configure.in -+++ dropbear-0.49/configure.in -@@ -164,14 +164,20 @@ AC_ARG_ENABLE(openpty, - AC_MSG_NOTICE(Not using openpty) - else - AC_MSG_NOTICE(Using openpty if available) -- AC_SEARCH_LIBS(openpty, util, [AC_DEFINE(HAVE_OPENPTY,,Have openpty() function)]) -+ AC_SEARCH_LIBS(openpty, util, [dropbear_cv_func_have_openpty=yes]) - fi - ], - [ - AC_MSG_NOTICE(Using openpty if available) -- AC_SEARCH_LIBS(openpty, util, [AC_DEFINE(HAVE_OPENPTY)]) -+ AC_SEARCH_LIBS(openpty, util, [dropbear_cv_func_have_openpty=yes]) - ] - ) -+ -+if test "x$dropbear_cv_func_have_openpty" = "xyes"; then -+ AC_DEFINE(HAVE_OPENPTY,,Have openpty() function) -+ no_ptc_check=yes -+ no_ptmx_check=yes -+fi - - - AC_ARG_ENABLE(syslog, diff --git a/meta/recipes-core/dropbear/dropbear-2012.55/configure.patch b/meta/recipes-core/dropbear/dropbear-2012.55/configure.patch new file mode 100644 index 000000000..aeb7c0a4a --- /dev/null +++ b/meta/recipes-core/dropbear/dropbear-2012.55/configure.patch @@ -0,0 +1,29 @@ +Upstream-Status: Pending + +Index: dropbear-0.49/configure.in +=================================================================== +--- dropbear-0.49.orig/configure.in ++++ dropbear-0.49/configure.in +@@ -164,14 +164,20 @@ AC_ARG_ENABLE(openpty, + AC_MSG_NOTICE(Not using openpty) + else + AC_MSG_NOTICE(Using openpty if available) +- AC_SEARCH_LIBS(openpty, util, [AC_DEFINE(HAVE_OPENPTY,,Have openpty() function)]) ++ AC_SEARCH_LIBS(openpty, util, [dropbear_cv_func_have_openpty=yes]) + fi + ], + [ + AC_MSG_NOTICE(Using openpty if available) +- AC_SEARCH_LIBS(openpty, util, [AC_DEFINE(HAVE_OPENPTY)]) ++ AC_SEARCH_LIBS(openpty, util, [dropbear_cv_func_have_openpty=yes]) + ] + ) ++ ++if test "x$dropbear_cv_func_have_openpty" = "xyes"; then ++ AC_DEFINE(HAVE_OPENPTY,,Have openpty() function) ++ no_ptc_check=yes ++ no_ptmx_check=yes ++fi + + + AC_ARG_ENABLE(syslog, diff --git a/meta/recipes-core/dropbear/dropbear_2011.54.bb b/meta/recipes-core/dropbear/dropbear_2011.54.bb deleted file mode 100644 index 1bd8bda35..000000000 --- a/meta/recipes-core/dropbear/dropbear_2011.54.bb +++ /dev/null @@ -1,6 +0,0 @@ -require dropbear.inc - -SRC_URI[md5sum] = "ce1e236c4a8df0cb95253defee6716b5" -SRC_URI[sha256sum] = "a5fe60fa9c11e7b0f6a21ef6e86a53ce3d55236548901905070ff1c1716fbf47" - -PR = "r1" diff --git a/meta/recipes-core/dropbear/dropbear_2012.55.bb b/meta/recipes-core/dropbear/dropbear_2012.55.bb new file mode 100644 index 000000000..4f0ef8054 --- /dev/null +++ b/meta/recipes-core/dropbear/dropbear_2012.55.bb @@ -0,0 +1,6 @@ +require dropbear.inc + +SRC_URI[md5sum] = "44836e5a0419ba12557f9ea46880077e" +SRC_URI[sha256sum] = "808df243c61bb60f2f18fa64bca628cbba0918b2a14139f10e6d59d4ac5a17ce" + +PR = "r0" -- cgit v1.2.3