public inbox for openembedded-core@lists.openembedded.org
 help / color / mirror / Atom feed
From: Wang Mingyu < wangmy@fujitsu.com>
To: openembedded-core@lists.openembedded.org
Cc: Wang Mingyu <wangmy@fujitsu.com>
Subject: [OE-core] [PATCH 03/15] dropbear: upgrade 2025.88 -> 2025.89
Date: Wed,  7 Jan 2026 18:30:50 +0800	[thread overview]
Message-ID: <20260107103102.458-3-wangmy@fujitsu.com> (raw)
In-Reply-To: <20260107103102.458-1-wangmy@fujitsu.com>

From: Wang Mingyu <wangmy@fujitsu.com>

0001-Fix-proxycmd-without-netcat.patch
removed since it's included in 2025.89

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 .../0001-Fix-proxycmd-without-netcat.patch    | 74 -------------------
 ...ropbear_2025.88.bb => dropbear_2025.89.bb} |  3 +-
 2 files changed, 1 insertion(+), 76 deletions(-)
 delete mode 100644 meta/recipes-core/dropbear/dropbear/0001-Fix-proxycmd-without-netcat.patch
 rename meta/recipes-core/dropbear/{dropbear_2025.88.bb => dropbear_2025.89.bb} (97%)

diff --git a/meta/recipes-core/dropbear/dropbear/0001-Fix-proxycmd-without-netcat.patch b/meta/recipes-core/dropbear/dropbear/0001-Fix-proxycmd-without-netcat.patch
deleted file mode 100644
index 967b66322f..0000000000
--- a/meta/recipes-core/dropbear/dropbear/0001-Fix-proxycmd-without-netcat.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 5cc0127000db5f7567b54d0495fb91a8e452fe09 Mon Sep 17 00:00:00 2001
-From: Konstantin Demin <rockdrilla@gmail.com>
-Date: Fri, 9 May 2025 22:39:35 +0300
-Subject: [PATCH] Fix proxycmd without netcat
-
-fixes e5a0ef27c2 "Execute multihop commands directly, no shell"
-
-Signed-off-by: Konstantin Demin <rockdrilla@gmail.com>
-
-Upstream-Status: Backport [https://github.com/mkj/dropbear/commit/5cc0127000db5f7567b54d0495fb91a8e452fe09]
-Signed-off-by: Peter Marko <peter.marko@siemens.com>
----
- src/cli-main.c | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/src/cli-main.c b/src/cli-main.c
-index 2fafa88..0a052a3 100644
---- a/src/cli-main.c
-+++ b/src/cli-main.c
-@@ -77,7 +77,11 @@ int main(int argc, char ** argv) {
- 	}
- 
- #if DROPBEAR_CLI_PROXYCMD
--	if (cli_opts.proxycmd || cli_opts.proxyexec) {
-+	if (cli_opts.proxycmd
-+#if DROPBEAR_CLI_MULTIHOP
-+		|| cli_opts.proxyexec
-+#endif
-+	) {
- 		cli_proxy_cmd(&sock_in, &sock_out, &proxy_cmd_pid);
- 		if (signal(SIGINT, kill_proxy_sighandler) == SIG_ERR ||
- 			signal(SIGTERM, kill_proxy_sighandler) == SIG_ERR ||
-@@ -110,11 +114,13 @@ static void shell_proxy_cmd(const void *user_data_cmd) {
- 	dropbear_exit("Failed to run '%s'\n", cmd);
- }
- 
-+#if DROPBEAR_CLI_MULTIHOP
- static void exec_proxy_cmd(const void *unused) {
- 	(void)unused;
- 	run_command(cli_opts.proxyexec[0], cli_opts.proxyexec, ses.maxfd);
- 	dropbear_exit("Failed to run '%s'\n", cli_opts.proxyexec[0]);
- }
-+#endif
- 
- static void cli_proxy_cmd(int *sock_in, int *sock_out, pid_t *pid_out) {
- 	char * cmd_arg = NULL;
-@@ -145,9 +151,11 @@ static void cli_proxy_cmd(int *sock_in, int *sock_out, pid_t *pid_out) {
- 		cmd_arg = m_malloc(shell_cmdlen);
- 		snprintf(cmd_arg, shell_cmdlen, "exec %s", cli_opts.proxycmd);
- 		exec_fn = shell_proxy_cmd;
-+#if DROPBEAR_CLI_MULTIHOP
- 	} else {
- 		/* No shell */
- 		exec_fn = exec_proxy_cmd;
-+#endif
- 	}
- 
- 	ret = spawn_command(exec_fn, cmd_arg, sock_out, sock_in, NULL, pid_out);
-@@ -159,6 +167,7 @@ static void cli_proxy_cmd(int *sock_in, int *sock_out, pid_t *pid_out) {
- cleanup:
- 	m_free(cli_opts.proxycmd);
- 	m_free(cmd_arg);
-+#if DROPBEAR_CLI_MULTIHOP
- 	if (cli_opts.proxyexec) {
- 		char **a = NULL;
- 		for (a = cli_opts.proxyexec; *a; a++) {
-@@ -166,6 +175,7 @@ cleanup:
- 		}
- 		m_free(cli_opts.proxyexec);
- 	}
-+#endif
- }
- 
- static void kill_proxy_sighandler(int UNUSED(signo)) {
diff --git a/meta/recipes-core/dropbear/dropbear_2025.88.bb b/meta/recipes-core/dropbear/dropbear_2025.89.bb
similarity index 97%
rename from meta/recipes-core/dropbear/dropbear_2025.88.bb
rename to meta/recipes-core/dropbear/dropbear_2025.89.bb
index 72a886d907..957a0901fb 100644
--- a/meta/recipes-core/dropbear/dropbear_2025.88.bb
+++ b/meta/recipes-core/dropbear/dropbear_2025.89.bb
@@ -19,11 +19,10 @@ SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \
            file://dropbear@.service \
            file://dropbear.socket \
            file://dropbear.default \
-           file://0001-Fix-proxycmd-without-netcat.patch \
            ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \
            "
 
-SRC_URI[sha256sum] = "783f50ea27b17c16da89578fafdb6decfa44bb8f6590e5698a4e4d3672dc53d4"
+SRC_URI[sha256sum] = "0d1f7ca711cfc336dc8a85e672cab9cfd8223a02fe2da0a4a7aeb58c9e113634"
 MIRRORS += "http://matt.ucc.asn.au/dropbear/releases/ https://dropbear.nl/mirror/releases/"
 
 PAM_SRC_URI = "file://0005-dropbear-enable-pam.patch \
-- 
2.43.0



  parent reply	other threads:[~2026-01-07 10:31 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-01-07 10:30 [OE-core] [PATCH 01/15] at-spi2-core: upgrade 2.58.2 -> 2.58.3 Wang Mingyu
2026-01-07 10:30 ` [OE-core] [PATCH 02/15] barebox-tools: upgrade 2025.11.0 -> 2025.12.0 Wang Mingyu
2026-01-07 10:30 ` Wang Mingyu [this message]
2026-01-07 10:30 ` [OE-core] [PATCH 04/15] ed: upgrade 1.22.3 -> 1.22.4 Wang Mingyu
2026-01-07 10:30 ` [OE-core] [PATCH 05/15] fastfloat: upgrade 8.1.0 -> 8.2.2 Wang Mingyu
2026-01-07 10:30 ` [OE-core] [PATCH 06/15] python3-certifi: upgrade 2025.11.12 -> 2026.1.4 Wang Mingyu
2026-01-07 10:30 ` [OE-core] [PATCH 07/15] python3-cython: upgrade 3.2.3 -> 3.2.4 Wang Mingyu
2026-01-07 10:30 ` [OE-core] [PATCH 08/15] python3-docutils: upgrade 0.22.3 -> 0.22.4 Wang Mingyu
2026-01-07 10:30 ` [OE-core] [PATCH 09/15] python3-hypothesis: upgrade 6.148.7 -> 6.149.0 Wang Mingyu
2026-01-07 10:30 ` [OE-core] [PATCH 10/15] python3-psutil: upgrade 7.1.3 -> 7.2.1 Wang Mingyu
2026-01-07 10:30 ` [OE-core] [PATCH 11/15] python3-pyparsing: upgrade 3.2.5 -> 3.3.1 Wang Mingyu
2026-01-07 10:30 ` [OE-core] [PATCH 12/15] python3-ruamel-yaml: upgrade 0.18.17 -> 0.19.1 Wang Mingyu
2026-01-07 10:31 ` [OE-core] [PATCH 13/15] python3-sphinx: upgrade 9.0.4 -> 9.1.0 Wang Mingyu
2026-01-07 10:31 ` [OE-core] [PATCH 14/15] python3-testtools: upgrade 2.8.1 -> 2.8.2 Wang Mingyu
2026-01-07 10:31 ` [OE-core] [PATCH 15/15] python3-uritools: upgrade 5.0.0 -> 6.0.1 Wang Mingyu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260107103102.458-3-wangmy@fujitsu.com \
    --to=wangmy@fujitsu.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox