From 21d7e29d3a00b93f5a003e80f2abeeb95235718f Mon Sep 17 00:00:00 2001 From: Nicolas Thill Date: Sun, 12 Mar 2006 09:56:45 +0000 Subject: [PATCH] update dropbear to latest release (v0.48), patch ssh client to handle -o and -x options quietly and make scp happy SVN-Revision: 3349 --- openwrt/package/dropbear/Makefile | 8 ++--- .../dropbear/patches/130-scp_argument.patch | 16 ---------- .../patches/130-ssh_ignore_o_and_x_args.patch | 22 ++++++++++++++ .../patches/160-scp_missing_macros.patch | 30 +++++++++++++++++++ .../dropbear/patches/160-writechannel.patch | 12 -------- 5 files changed, 56 insertions(+), 32 deletions(-) delete mode 100644 openwrt/package/dropbear/patches/130-scp_argument.patch create mode 100644 openwrt/package/dropbear/patches/130-ssh_ignore_o_and_x_args.patch create mode 100644 openwrt/package/dropbear/patches/160-scp_missing_macros.patch delete mode 100644 openwrt/package/dropbear/patches/160-writechannel.patch diff --git a/openwrt/package/dropbear/Makefile b/openwrt/package/dropbear/Makefile index d43e70cfce..56bc6ddff6 100644 --- a/openwrt/package/dropbear/Makefile +++ b/openwrt/package/dropbear/Makefile @@ -3,13 +3,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dropbear -PKG_VERSION:=0.47 +PKG_VERSION:=0.48 PKG_RELEASE:=1 -PKG_MD5SUM:=cf634614d52278d44dfd9c224a438bf2 +PKG_MD5SUM:=89d08829eb7d47e533c552373fb87554 PKG_SOURCE_URL:=http://matt.ucc.asn.au/dropbear/releases/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_CAT:=bzcat +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) diff --git a/openwrt/package/dropbear/patches/130-scp_argument.patch b/openwrt/package/dropbear/patches/130-scp_argument.patch deleted file mode 100644 index befba5d395..0000000000 --- a/openwrt/package/dropbear/patches/130-scp_argument.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -urN dropbear-0.45.old/scp.c dropbear-0.45/scp.c ---- dropbear-0.45.old/scp.c 2005-03-07 05:27:02.000000000 +0100 -+++ dropbear-0.45/scp.c 2005-03-25 11:28:22.000000000 +0100 -@@ -249,9 +249,9 @@ - - args.list = NULL; - addargs(&args, "ssh"); /* overwritten with ssh_program */ -- addargs(&args, "-x"); -- addargs(&args, "-oForwardAgent no"); -- addargs(&args, "-oClearAllForwardings yes"); -+// addargs(&args, "-x"); -+// addargs(&args, "-oForwardAgent no"); -+// addargs(&args, "-oClearAllForwardings yes"); - - fflag = tflag = 0; - while ((ch = getopt(argc, argv, "dfl:prtvBCc:i:P:q1246S:o:F:")) != -1) diff --git a/openwrt/package/dropbear/patches/130-ssh_ignore_o_and_x_args.patch b/openwrt/package/dropbear/patches/130-ssh_ignore_o_and_x_args.patch new file mode 100644 index 0000000000..9b79e4864e --- /dev/null +++ b/openwrt/package/dropbear/patches/130-ssh_ignore_o_and_x_args.patch @@ -0,0 +1,22 @@ +diff -ruN dropbear-0.48-old/cli-runopts.c dropbear-0.48-new/cli-runopts.c +--- dropbear-0.48-old/cli-runopts.c 2006-03-09 16:06:03.000000000 +0100 ++++ dropbear-0.48-new/cli-runopts.c 2006-03-11 12:28:54.000000000 +0100 +@@ -188,6 +188,10 @@ + debug_trace = 1; + break; + #endif ++ case 'o': ++ next = &dummy; ++ case 'x': ++ break; + case 'F': + case 'e': + case 'c': +@@ -199,7 +203,6 @@ + #ifndef ENABLE_CLI_LOCALTCPFWD + case 'L': + #endif +- case 'o': + case 'b': + next = &dummy; + default: diff --git a/openwrt/package/dropbear/patches/160-scp_missing_macros.patch b/openwrt/package/dropbear/patches/160-scp_missing_macros.patch new file mode 100644 index 0000000000..9d53251f60 --- /dev/null +++ b/openwrt/package/dropbear/patches/160-scp_missing_macros.patch @@ -0,0 +1,30 @@ +diff -ruN dropbear-0.48-old/scp.c dropbear-0.48-new/scp.c +--- dropbear-0.48-old/scp.c 2006-03-09 16:06:03.000000000 +0100 ++++ dropbear-0.48-new/scp.c 2006-03-11 01:19:26.000000000 +0100 +@@ -78,6 +78,26 @@ + #include "scpmisc.h" + #include "progressmeter.h" + ++#ifndef TIMEVAL_TO_TIMESPEC ++#define TIMEVAL_TO_TIMESPEC(tv, ts) { \ ++ (ts)->tv_sec = (tv)->tv_sec; \ ++ (ts)->tv_nsec = (tv)->tv_usec * 1000; \ ++} ++#endif ++ ++#ifndef timersub ++#define timersub(tvp, uvp, vvp) \ ++ do { \ ++ (vvp)->tv_sec = (tvp)->tv_sec - (uvp)->tv_sec; \ ++ (vvp)->tv_usec = (tvp)->tv_usec - (uvp)->tv_usec; \ ++ if ((vvp)->tv_usec < 0) { \ ++ (vvp)->tv_sec--; \ ++ (vvp)->tv_usec += 1000000; \ ++ } \ ++ } while (/* CONSTCOND */ 0) ++#endif /* timersub */ ++ ++ + void bwlimit(int); + + /* Struct for addargs */ diff --git a/openwrt/package/dropbear/patches/160-writechannel.patch b/openwrt/package/dropbear/patches/160-writechannel.patch deleted file mode 100644 index 0e84a9953e..0000000000 --- a/openwrt/package/dropbear/patches/160-writechannel.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN dropbear-0.47.orig/common-channel.c dropbear-0.47/common-channel.c ---- dropbear-0.47.orig/common-channel.c 2005-12-09 06:42:31.000000000 +0100 -+++ dropbear-0.47/common-channel.c 2006-02-05 00:03:37.000000000 +0100 -@@ -377,7 +377,7 @@ - cbuf_incrread(cbuf, len); - channel->recvdonelen += len; - -- if (fd == channel->writefd && len == maxlen && channel->recveof) { -+ if (fd == channel->writefd && len == maxlen && channel->recveof && cbuf_getused(channel->writebuf) == 0) { - /* Check if we're closing up */ - closewritefd(channel); - TRACE(("leave writechannel: recveof set")) -- 2.30.2