[oe-commits] org.oe.dev dropbear: remove unsupported default arguments in scp. Fixes OE bug 3227.

[Laibsch commit]

dropbear: remove unsupported default arguments in scp.  Fixes OE bug 3227.

Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: 7f7ecaeecb75904bd446276f156340f12b4213c7
ViewMTN: http://monotone.openembedded.org/revision/info/7f7ecaeecb75904bd446276f156340f12b4213c7
Files:
1
packages/dropbear/dropbear/scp-argument-fix.patch
packages/dropbear/dropbear.inc
Diffs:

#
# mt diff -raadc789a241e8e91a5a3df7e87ae742646337285 -r7f7ecaeecb75904bd446276f156340f12b4213c7
#
#
#
# add_file "packages/dropbear/dropbear/scp-argument-fix.patch"
#  content [43e25cab4f86cb784071ef1a175b77eb2d69b7fc]
# 
# patch "packages/dropbear/dropbear.inc"
#  from [6d50c1193e4d2fa9a7c6f85db6149b36aee06851]
#    to [4ec56e07501d1a5accce2d4e6240ee349005dd46]
#
============================================================
--- packages/dropbear/dropbear/scp-argument-fix.patch	43e25cab4f86cb784071ef1a175b77eb2d69b7fc
+++ packages/dropbear/dropbear/scp-argument-fix.patch	43e25cab4f86cb784071ef1a175b77eb2d69b7fc
@@ -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)
============================================================
--- packages/dropbear/dropbear.inc	6d50c1193e4d2fa9a7c6f85db6149b36aee06851
+++ packages/dropbear/dropbear.inc	4ec56e07501d1a5accce2d4e6240ee349005dd46
@@ -10,6 +10,7 @@ SRC_URI = "http://matt.ucc.asn.au/dropbe
 	   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"