From 362e0a0aeb1b9dbf42e3a46eaf5788d90a9c316b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 8 May 2024 16:07:10 +0200 Subject: dropbear: refresh patch for vfork --- package/dropbear/patches/patch-src_svr-main_c | 16 ++++++++++++++++ package/dropbear/patches/patch-svr-main_c | 15 --------------- 2 files changed, 16 insertions(+), 15 deletions(-) create mode 100644 package/dropbear/patches/patch-src_svr-main_c delete mode 100644 package/dropbear/patches/patch-svr-main_c diff --git a/package/dropbear/patches/patch-src_svr-main_c b/package/dropbear/patches/patch-src_svr-main_c new file mode 100644 index 000000000..f6f935004 --- /dev/null +++ b/package/dropbear/patches/patch-src_svr-main_c @@ -0,0 +1,16 @@ +--- dropbear-2024.85.orig/src/svr-main.c 2024-04-25 16:30:00.000000000 +0200 ++++ dropbear-2024.85/src/svr-main.c 2024-05-07 14:35:09.650486568 +0200 +@@ -305,8 +305,13 @@ static void main_noinetd(int argc, char + #if DEBUG_NOFORK + fork_ret = 0; + #else ++#if DROPBEAR_VFORK ++ fork_ret = vfork(); ++#else ++ + fork_ret = fork(); + #endif ++#endif + if (fork_ret < 0) { + dropbear_log(LOG_WARNING, "Error forking: %s", strerror(errno)); + goto out; diff --git a/package/dropbear/patches/patch-svr-main_c b/package/dropbear/patches/patch-svr-main_c deleted file mode 100644 index b2d4007b8..000000000 --- a/package/dropbear/patches/patch-svr-main_c +++ /dev/null @@ -1,15 +0,0 @@ ---- dropbear-2020.81.orig/svr-main.c 2020-10-29 14:35:50.000000000 +0100 -+++ dropbear-2020.81/svr-main.c 2020-11-04 05:04:33.736369225 +0100 -@@ -278,8 +278,12 @@ static void main_noinetd() { - #if DEBUG_NOFORK - fork_ret = 0; - #else -+#if DROPBEAR_VFORK -+ fork_ret = vfork(); -+#else - fork_ret = fork(); - #endif -+#endif - if (fork_ret < 0) { - dropbear_log(LOG_WARNING, "Error forking: %s", strerror(errno)); - goto out; -- cgit v1.2.3