Changelog:
https://matt.ucc.asn.au/dropbear/CHANGES
This release fixes build regressions in 2024.84:
- Fix build failure when SHA1 is disabled
- Fix build failure when DROPBEAR_CLI_PUBKEY_AUTH disabled
- Update debian/ directory with changed paths
Signed-off-by: Yi Zhao <yi.z...@windriver.com>
---
.../0001-urandom-xauth-changes-to-options.h.patch | 8 ++++----
.../dropbear/0005-dropbear-enable-pam.patch | 13 +++++--------
.../dropbear/0006-dropbear-configuration-file.patch | 11 ++++-------
.../dropbear/dropbear-disable-weak-ciphers.patch | 9 +++------
.../{dropbear_2024.84.bb => dropbear_2024.85.bb} | 2 +-
5 files changed, 17 insertions(+), 26 deletions(-)
rename meta/recipes-core/dropbear/{dropbear_2024.84.bb => dropbear_2024.85.bb}
(98%)
diff --git
a/meta/recipes-core/dropbear/dropbear/0001-urandom-xauth-changes-to-options.h.patch
b/meta/recipes-core/dropbear/dropbear/0001-urandom-xauth-changes-to-options.h.patch
index c74f09e484..9c1dd3f606 100644
---
a/meta/recipes-core/dropbear/dropbear/0001-urandom-xauth-changes-to-options.h.patch
+++
b/meta/recipes-core/dropbear/dropbear/0001-urandom-xauth-changes-to-options.h.patch
@@ -1,4 +1,7 @@
-Subject: [PATCH 1/6] urandom-xauth-changes-to-options.h
+From cdc6a4a57a86d8116a92a5d905993e65cf723556 Mon Sep 17 00:00:00 2001
+From: Richard Purdie <rich...@openedhand.com>
+Date: Wed, 31 Aug 2005 10:45:47 +0000
+Subject: [PATCH] urandom-xauth-changes-to-options.h
Upstream-Status: Inappropriate [configuration]
---
@@ -18,6 +21,3 @@ index 6e970bb..ccc8b47 100644
/* If you want to enable running an sftp server (such as the one included with
---
-2.34.1
-
diff --git a/meta/recipes-core/dropbear/dropbear/0005-dropbear-enable-pam.patch
b/meta/recipes-core/dropbear/dropbear/0005-dropbear-enable-pam.patch
index fe667ddc25..6743f506e9 100644
--- a/meta/recipes-core/dropbear/dropbear/0005-dropbear-enable-pam.patch
+++ b/meta/recipes-core/dropbear/dropbear/0005-dropbear-enable-pam.patch
@@ -1,7 +1,7 @@
-From b8cece92ba19aa77ac013ea161bfe4c7147747c9 Mon Sep 17 00:00:00 2001
+From 253ca01f0fc50dbaeb2ff8bcece0c34256eba94f Mon Sep 17 00:00:00 2001
From: Jussi Kukkonen <jussi.kukko...@intel.com>
Date: Wed, 2 Dec 2015 11:36:02 +0200
-Subject: Enable pam
+Subject: [PATCH] Enable pam
We need modify file default_options.h besides enabling pam in
configure if we want dropbear to support pam.
@@ -15,10 +15,10 @@ Signed-off-by: Jussi Kukkonen <jussi.kukko...@intel.com>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/default_options.h b/src/default_options.h
-index 0e3d027..349338c 100644
+index ccc8b47..12768d1 100644
--- a/src/default_options.h
+++ b/src/default_options.h
-@@ -210,7 +210,7 @@ group1 in Dropbear server too */
+@@ -228,7 +228,7 @@ group1 in Dropbear server too */
/* Authentication Types - at least one required.
RFC Draft requires pubkey auth, and recommends password */
@@ -27,7 +27,7 @@ index 0e3d027..349338c 100644
/* Note: PAM auth is quite simple and only works for PAM modules which just do
* a simple "Login: " "Password: " (you can edit the strings in
svr-authpam.c).
-@@ -218,7 +218,7 @@ group1 in Dropbear server too */
+@@ -236,7 +236,7 @@ group1 in Dropbear server too */
* but there's an interface via a PAM module. It won't work for more complex
* PAM challenge/response.
* You can't enable both PASSWORD and PAM. */
@@ -36,6 +36,3 @@ index 0e3d027..349338c 100644
/* ~/.ssh/authorized_keys authentication.
* You must define DROPBEAR_SVR_PUBKEY_AUTH in order to use plugins. */
---
-2.25.1
-
diff --git
a/meta/recipes-core/dropbear/dropbear/0006-dropbear-configuration-file.patch
b/meta/recipes-core/dropbear/dropbear/0006-dropbear-configuration-file.patch
index f54f634a4e..44861088cc 100644
--- a/meta/recipes-core/dropbear/dropbear/0006-dropbear-configuration-file.patch
+++ b/meta/recipes-core/dropbear/dropbear/0006-dropbear-configuration-file.patch
@@ -1,4 +1,4 @@
-From e3a5db1b6d3f6382a15b2266458c26c645a10f18 Mon Sep 17 00:00:00 2001
+From 16b147f97f0938cddb55ec1c90bc919c13f26fc0 Mon Sep 17 00:00:00 2001
From: Mingli Yu <mingli...@windriver.com>
Date: Thu, 6 Sep 2018 15:54:00 +0800
Subject: [PATCH] dropbear configuration file
@@ -15,11 +15,11 @@ Signed-off-by: Mingli Yu <mingli...@windriver.com>
src/svr-authpam.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/srec/svr-authpam.c b/src/svr-authpam.c
-index d201bc9..165ec5c 100644
+diff --git a/src/svr-authpam.c b/src/svr-authpam.c
+index ec14632..026102f 100644
--- a/src/svr-authpam.c
+++ b/src/svr-authpam.c
-@@ -223,7 +223,7 @@ void svr_auth_pam(int valid_user) {
+@@ -224,7 +224,7 @@ void svr_auth_pam(int valid_user) {
}
/* Init pam */
@@ -28,6 +28,3 @@ index d201bc9..165ec5c 100644
dropbear_log(LOG_WARNING, "pam_start() failed, rc=%d, %s",
rc, pam_strerror(pamHandlep, rc));
goto cleanup;
---
-2.7.4
-
diff --git
a/meta/recipes-core/dropbear/dropbear/dropbear-disable-weak-ciphers.patch
b/meta/recipes-core/dropbear/dropbear/dropbear-disable-weak-ciphers.patch
index f998caa255..a20781d31d 100644
--- a/meta/recipes-core/dropbear/dropbear/dropbear-disable-weak-ciphers.patch
+++ b/meta/recipes-core/dropbear/dropbear/dropbear-disable-weak-ciphers.patch
@@ -1,4 +1,4 @@
-From c347ece05a7fdbf50d76cb136b9ed45caed333f6 Mon Sep 17 00:00:00 2001
+From c8a0c8e87b772576f3a431c3b4cacaf5aa001dcc Mon Sep 17 00:00:00 2001
From: Joseph Reynolds <joseph.reynol...@ibm.com>
Date: Thu, 20 Jun 2019 16:29:15 -0500
Subject: [PATCH] dropbear: new feature: disable-weak-ciphers
@@ -14,10 +14,10 @@ Signed-off-by: Joseph Reynolds <joseph.reynol...@ibm.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/default_options.h b/src/default_options.h
-index d417588..bc5200f 100644
+index 12768d1..2b07497 100644
--- a/src/default_options.h
+++ b/src/default_options.h
-@@ -180,7 +180,7 @@ IMPORTANT: Some options will require "make clean" after
changes */
+@@ -197,7 +197,7 @@ IMPORTANT: Some options will require "make clean" after
changes */
* Small systems should generally include either curve25519 or ecdh for
performance.
* curve25519 is less widely supported but is faster
*/
@@ -26,6 +26,3 @@ index d417588..bc5200f 100644
#define DROPBEAR_DH_GROUP14_SHA256 1
#define DROPBEAR_DH_GROUP16 0
#define DROPBEAR_CURVE25519 1
---
-2.25.1
-
diff --git a/meta/recipes-core/dropbear/dropbear_2024.84.bb
b/meta/recipes-core/dropbear/dropbear_2024.85.bb
similarity index 98%
rename from meta/recipes-core/dropbear/dropbear_2024.84.bb
rename to meta/recipes-core/dropbear/dropbear_2024.85.bb
index 3ea64b13d0..54001414d0 100644
--- a/meta/recipes-core/dropbear/dropbear_2024.84.bb
+++ b/meta/recipes-core/dropbear/dropbear_2024.85.bb
@@ -23,7 +23,7 @@ SRC_URI =
"http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \
${@bb.utils.contains('PACKAGECONFIG', 'disable-weak-ciphers',
'file://dropbear-disable-weak-ciphers.patch', '', d)} \
"
-SRC_URI[sha256sum] =
"16e22b66b333d6b7e504c43679d04ed6ca30f2838db40a21f935c850dfc01009"
+SRC_URI[sha256sum] =
"86b036c433a69d89ce51ebae335d65c47738ccf90d13e5eb0fea832e556da502"
PAM_SRC_URI = "file://0005-dropbear-enable-pam.patch \
file://0006-dropbear-configuration-file.patch \
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199500):
https://lists.openembedded.org/g/openembedded-core/message/199500
Mute This Topic: https://lists.openembedded.org/mt/106146615/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
