aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openwrt.org>2006-03-27 19:20:22 +0000
committerWaldemar Brodkorb <wbx@openwrt.org>2006-03-27 19:20:22 +0000
commitbcd73c9863119d084db0cb07688303bd007206b4 (patch)
treed240d48f050b3400f2b4b30f4aa4f8052695c16a /package
parent5211b60afcbb05e362ae8ea347f776b77a698e16 (diff)
downloadupstream-bcd73c9863119d084db0cb07688303bd007206b4.tar.gz
upstream-bcd73c9863119d084db0cb07688303bd007206b4.tar.bz2
upstream-bcd73c9863119d084db0cb07688303bd007206b4.zip
sync dropbear with wr, remove zlib dependency
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3508 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r--package/Makefile1
-rw-r--r--package/dropbear/Makefile8
-rw-r--r--package/dropbear/ipkg/dropbear.control1
-rw-r--r--package/dropbear/patches/130-scp_argument.patch16
-rw-r--r--package/dropbear/patches/130-ssh_ignore_o_and_x_args.patch22
-rw-r--r--package/dropbear/patches/160-writechannel.patch12
6 files changed, 26 insertions, 34 deletions
diff --git a/package/Makefile b/package/Makefile
index 0f733580b4..298eaff2f2 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -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
diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile
index d43e70cfce..75eaf6e44c 100644
--- a/package/dropbear/Makefile
+++ b/package/dropbear/Makefile
@@ -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)
diff --git a/package/dropbear/ipkg/dropbear.control b/package/dropbear/ipkg/dropbear.control
index 800a0ebc31..0aa8cc5b82 100644
--- a/package/dropbear/ipkg/dropbear.control
+++ b/package/dropbear/ipkg/dropbear.control
@@ -1,5 +1,4 @@
Package: dropbear
Priority: optional
-Depends: zlib
Section: net
Description: a small SSH 2 server/client designed for small memory environments.
diff --git a/package/dropbear/patches/130-scp_argument.patch b/package/dropbear/patches/130-scp_argument.patch
deleted file mode 100644
index befba5d395..0000000000
--- a/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/package/dropbear/patches/130-ssh_ignore_o_and_x_args.patch b/package/dropbear/patches/130-ssh_ignore_o_and_x_args.patch
new file mode 100644
index 0000000000..9b79e4864e
--- /dev/null
+++ b/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/package/dropbear/patches/160-writechannel.patch b/package/dropbear/patches/160-writechannel.patch
deleted file mode 100644
index 0e84a9953e..0000000000
--- a/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"))