mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-29 12:17:11 +02:00
sync dropbear with wr, remove zlib dependency
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@3508 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
304d91c1df
commit
bd08843b08
@ -308,7 +308,6 @@ curl-compile: openssl-compile zlib-compile
|
||||
cyrus-sasl-compile: openssl-compile
|
||||
deco-compile: ncurses-compile
|
||||
dhcp6-compile: ncurses-compile
|
||||
dropbear-compile: zlib-compile
|
||||
dsniff-compile: libnids-compile openssl-compile libgdbm-compile
|
||||
freetype-compile: zlib-compile
|
||||
fprobe-compile: libpcap-compile
|
||||
|
@ -3,13 +3,13 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=dropbear
|
||||
PKG_VERSION:=0.47
|
||||
PKG_VERSION:=0.48.1
|
||||
PKG_RELEASE:=1
|
||||
PKG_MD5SUM:=cf634614d52278d44dfd9c224a438bf2
|
||||
PKG_MD5SUM:=ca8e53a766faec831882831364568421
|
||||
|
||||
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)
|
||||
|
||||
|
@ -1,5 +1,4 @@
|
||||
Package: dropbear
|
||||
Priority: optional
|
||||
Depends: zlib
|
||||
Section: net
|
||||
Description: a small SSH 2 server/client designed for small memory environments.
|
||||
|
@ -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)
|
@ -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:
|
@ -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"))
|
Loading…
Reference in New Issue
Block a user