summaryrefslogtreecommitdiff
path: root/net-misc/dropbear/files
diff options
context:
space:
mode:
Diffstat (limited to 'net-misc/dropbear/files')
-rw-r--r--net-misc/dropbear/files/dropbear-2024.84-dbscp.patch20
-rw-r--r--net-misc/dropbear/files/dropbear-2024.84-non-interactive-tests.patch13
2 files changed, 33 insertions, 0 deletions
diff --git a/net-misc/dropbear/files/dropbear-2024.84-dbscp.patch b/net-misc/dropbear/files/dropbear-2024.84-dbscp.patch
new file mode 100644
index 000000000000..52095e1427de
--- /dev/null
+++ b/net-misc/dropbear/files/dropbear-2024.84-dbscp.patch
@@ -0,0 +1,20 @@
+--- a/src/dbmulti.c
++++ b/src/dbmulti.c
+@@ -60,7 +60,7 @@
+ }
+ #endif
+ #ifdef DBMULTI_scp
+- if (strcmp(progname, "scp") == 0) {
++ if ((strcmp(progname, "scp") == 0) || (strcmp(progname, "dbscp") == 0)) {
+ return scp_main(argc, argv);
+ }
+ #endif
+@@ -81,7 +81,7 @@
+ "'dropbearconvert' - the key converter\n"
+ #endif
+ #ifdef DBMULTI_scp
+- "'scp' - secure copy\n"
++ "'dbscp' - secure copy\n"
+ #endif
+ ,
+ DROPBEAR_VERSION);
diff --git a/net-misc/dropbear/files/dropbear-2024.84-non-interactive-tests.patch b/net-misc/dropbear/files/dropbear-2024.84-non-interactive-tests.patch
new file mode 100644
index 000000000000..84314f5fd7fa
--- /dev/null
+++ b/net-misc/dropbear/files/dropbear-2024.84-non-interactive-tests.patch
@@ -0,0 +1,13 @@
+Force tests to be non-interactive
+
+--- a/test/test_dropbear.py
++++ b/test/test_dropbear.py
+@@ -23,7 +23,7 @@
+ args = opt.dropbear.split() + [
+ "-p", LOCALADDR + ":" + opt.port, # bind locally only
+ "-r", opt.hostkey,
+- "-F", "-E",
++ "-F", "-E", "-s",
+ ]
+ print("subprocess args: ", args)
+