From 3ca0ffc76f5077b8c11e80ddd846f87ca61e6ebe Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 18 May 2008 03:33:37 +0000 Subject: Apply scp-argument-fix.patch only to dropbear 0.49 recipe. --- .../dropbear/dropbear-0.49/scp-argument-fix.patch | 21 +++++++++++++++++++++ packages/dropbear/dropbear.inc | 1 - packages/dropbear/dropbear/scp-argument-fix.patch | 21 --------------------- packages/dropbear/dropbear_0.49.bb | 4 +++- 4 files changed, 24 insertions(+), 23 deletions(-) create mode 100644 packages/dropbear/dropbear-0.49/scp-argument-fix.patch delete mode 100644 packages/dropbear/dropbear/scp-argument-fix.patch diff --git a/packages/dropbear/dropbear-0.49/scp-argument-fix.patch b/packages/dropbear/dropbear-0.49/scp-argument-fix.patch new file mode 100644 index 0000000000..716a9670fe --- /dev/null +++ b/packages/dropbear/dropbear-0.49/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) diff --git a/packages/dropbear/dropbear.inc b/packages/dropbear/dropbear.inc index 00e5eec2ce..ebe0c1ea9c 100644 --- a/packages/dropbear/dropbear.inc +++ b/packages/dropbear/dropbear.inc @@ -10,7 +10,6 @@ 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 deleted file mode 100644 index 716a9670fe..0000000000 --- a/packages/dropbear/dropbear/scp-argument-fix.patch +++ /dev/null @@ -1,21 +0,0 @@ -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) diff --git a/packages/dropbear/dropbear_0.49.bb b/packages/dropbear/dropbear_0.49.bb index 0ed386ca0c..3245cffe5d 100644 --- a/packages/dropbear/dropbear_0.49.bb +++ b/packages/dropbear/dropbear_0.49.bb @@ -1,3 +1,5 @@ -PR = "r1" +PR = "r2" require dropbear.inc +SRC_URI += "file://scp-argument-fix.patch;patch=1 \ + " -- cgit v1.2.3