summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/dropbear/dropbear.inc1
-rw-r--r--packages/dropbear/dropbear/scp-argument-fix.patch21
2 files changed, 22 insertions, 0 deletions
diff --git a/packages/dropbear/dropbear.inc b/packages/dropbear/dropbear.inc
index ebe0c1ea9c..00e5eec2ce 100644
--- a/packages/dropbear/dropbear.inc
+++ b/packages/dropbear/dropbear.inc
@@ -10,6 +10,7 @@ SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.gz \
file://urandom-xauth-changes-to-options.h.patch;patch=1 \
file://configure.patch;patch=1 \
file://fix-2kb-keys.patch;patch=1 \
+ file://scp-argument-fix.patch;patch=1 \
file://allow-nopw.patch \
file://init"
diff --git a/packages/dropbear/dropbear/scp-argument-fix.patch b/packages/dropbear/dropbear/scp-argument-fix.patch
new file mode 100644
index 0000000000..716a9670fe
--- /dev/null
+++ b/packages/dropbear/dropbear/scp-argument-fix.patch
@@ -0,0 +1,21 @@
+source: https://dev.openwrt.org/browser/trunk/openwrt/package/dropbear/patches/scp-argument-fix.patch?rev=453
+comment: remove unsupported default arguments in scp. Fixes OE bug 3227.
+
+diff -ur dropbear-0.49-orig/scp.c dropbear-0.49/scp.c
+--- dropbear-0.49-orig/scp.c 2007-02-22 16:51:35.000000000 +0100
++++ dropbear-0.49/scp.c 2007-10-19 14:19:08.000000000 +0200
+@@ -308,10 +308,10 @@
+ memset(&args, '\0', sizeof(args));
+ args.list = NULL;
+ addargs(&args, "%s", ssh_program);
+- addargs(&args, "-x");
+- addargs(&args, "-oForwardAgent no");
+- addargs(&args, "-oPermitLocalCommand no");
+- addargs(&args, "-oClearAllForwardings yes");
++// addargs(&args, "-x");
++// addargs(&args, "-oForwardAgent no");
++// addargs(&args, "-oPermitLocalCommand no");
++// addargs(&args, "-oClearAllForwardings yes");
+
+ fflag = tflag = 0;
+ while ((ch = getopt(argc, argv, "dfl:prtvBCc:i:P:q1246S:o:F:")) != -1)