projects
/
openwrt
/
staging
/
florian.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
0180abd
)
dropbear: update to 0.52 (#4635)
author
Jo-Philipp Wich
<jow@openwrt.org>
Sun, 29 Mar 2009 21:04:05 +0000
(21:04 +0000)
committer
Jo-Philipp Wich
<jow@openwrt.org>
Sun, 29 Mar 2009 21:04:05 +0000
(21:04 +0000)
SVN-Revision: 15074
package/dropbear/Makefile
patch
|
blob
|
history
package/dropbear/patches/100-pubkey_path.patch
patch
|
blob
|
history
package/dropbear/patches/110-change_user.patch
patch
|
blob
|
history
package/dropbear/patches/130-ssh_ignore_o_and_x_args.patch
patch
|
blob
|
history
package/dropbear/patches/150-dbconvert_standalone.patch
patch
|
blob
|
history
diff --git
a/package/dropbear/Makefile
b/package/dropbear/Makefile
index 69432be659b321773acb5c8c8ab82ec949d6e82f..de4df22d75a005a9a0f28d4c8644c2c25703fbc1 100644
(file)
--- a/
package/dropbear/Makefile
+++ b/
package/dropbear/Makefile
@@
-1,5
+1,5
@@
#
#
-# Copyright (C) 2006-200
8
OpenWrt.org
+# Copyright (C) 2006-200
9
OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@
-9,14
+9,14
@@
include $(TOPDIR)/rules.mk
PKG_NAME:=dropbear
include $(TOPDIR)/rules.mk
PKG_NAME:=dropbear
-PKG_VERSION:=0.5
1
-PKG_RELEASE:=
2
+PKG_VERSION:=0.5
2
+PKG_RELEASE:=
1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:= \
http://matt.ucc.asn.au/dropbear/releases/ \
http://www.mirrors.wiretapped.net/security/cryptography/apps/ssh/dropbear/
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:= \
http://matt.ucc.asn.au/dropbear/releases/ \
http://www.mirrors.wiretapped.net/security/cryptography/apps/ssh/dropbear/
-PKG_MD5SUM:=1
045df60c2bdbd39c707238305a1e9e5
+PKG_MD5SUM:=1
c69ec674481d7745452f68f2ea5597e
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/package.mk
diff --git
a/package/dropbear/patches/100-pubkey_path.patch
b/package/dropbear/patches/100-pubkey_path.patch
index ff6673488b3f3e1a7d8ea9231426764fa8505a66..9346cc60f45d7d462e6026a21f2285df33f4d999 100644
(file)
--- a/
package/dropbear/patches/100-pubkey_path.patch
+++ b/
package/dropbear/patches/100-pubkey_path.patch
@@
-1,8
+1,8
@@
-Index: dropbear-0.5
1
/svr-authpubkey.c
+Index: dropbear-0.5
2
/svr-authpubkey.c
===================================================================
===================================================================
---- dropbear-0.5
1
.orig/svr-authpubkey.c 2008-04-22 17:29:49.000000000 -0700
-+++ dropbear-0.5
1
/svr-authpubkey.c 2008-04-22 17:29:49.000000000 -0700
-@@ -
176,6 +176
,8 @@
+--- dropbear-0.5
2
.orig/svr-authpubkey.c 2008-04-22 17:29:49.000000000 -0700
++++ dropbear-0.5
2
/svr-authpubkey.c 2008-04-22 17:29:49.000000000 -0700
+@@ -
209,6 +209
,8 @@
goto out;
}
goto out;
}
@@
-11,7
+11,7
@@
Index: dropbear-0.51/svr-authpubkey.c
/* we don't need to check pw and pw_dir for validity, since
* its been done in checkpubkeyperms. */
len = strlen(ses.authstate.pw_dir);
/* we don't need to check pw and pw_dir for validity, since
* its been done in checkpubkeyperms. */
len = strlen(ses.authstate.pw_dir);
-@@ -
187,6 +189
,9 @@
+@@ -
220,6 +222
,9 @@
/* open the file */
authfile = fopen(filename, "r");
/* open the file */
authfile = fopen(filename, "r");
@@
-21,7
+21,7
@@
Index: dropbear-0.51/svr-authpubkey.c
if (authfile == NULL) {
goto out;
}
if (authfile == NULL) {
goto out;
}
-@@ -
274,6 +279
,8 @@
+@@ -
372,6 +377
,8 @@
goto out;
}
goto out;
}
@@
-30,7
+30,7
@@
Index: dropbear-0.51/svr-authpubkey.c
/* allocate max required pathname storage,
* = path + "/.ssh/authorized_keys" + '\0' = pathlen + 22 */
filename = m_malloc(len + 22);
/* allocate max required pathname storage,
* = path + "/.ssh/authorized_keys" + '\0' = pathlen + 22 */
filename = m_malloc(len + 22);
-@@ -
295,6 +302
,14 @@
+@@ -
381,6 +388
,14 @@
if (checkfileperm(filename) != DROPBEAR_SUCCESS) {
goto out;
}
if (checkfileperm(filename) != DROPBEAR_SUCCESS) {
goto out;
}
@@
-43,5
+43,5
@@
Index: dropbear-0.51/svr-authpubkey.c
+ }
+ }
+ }
+ }
- /*
file looks ok, return success
*/
- ret = DROPBEAR_SUCCESS;
+ /*
check ~/.ssh
*/
+ strncat(filename, "/.ssh", 5); /* strlen("/.ssh") == 5 */
diff --git
a/package/dropbear/patches/110-change_user.patch
b/package/dropbear/patches/110-change_user.patch
index 4a0cdc5e7559b489e3bbaf4b11751eec082e3873..eb1db52db07240f9204f8fc94b120b7608622377 100644
(file)
--- a/
package/dropbear/patches/110-change_user.patch
+++ b/
package/dropbear/patches/110-change_user.patch
@@
-1,8
+1,8
@@
-Index: dropbear-0.5
1
/svr-chansession.c
+Index: dropbear-0.5
2
/svr-chansession.c
===================================================================
===================================================================
---- dropbear-0.5
1
.orig/svr-chansession.c 2008-04-22 17:29:49.000000000 -0700
-+++ dropbear-0.5
1
/svr-chansession.c 2008-04-22 17:29:49.000000000 -0700
-@@ -
912,12 +91
2,12 @@
+--- dropbear-0.5
2
.orig/svr-chansession.c 2008-04-22 17:29:49.000000000 -0700
++++ dropbear-0.5
2
/svr-chansession.c 2008-04-22 17:29:49.000000000 -0700
+@@ -
852,12 +85
2,12 @@
/* We can only change uid/gid as root ... */
if (getuid() == 0) {
/* We can only change uid/gid as root ... */
if (getuid() == 0) {
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
index 7f8b1816e939663eb1971a23f76b3d6d792cc8ce..17ea4e75589fe13e21d4a4b2eb520ae3b05274bb 100644
(file)
--- a/
package/dropbear/patches/130-ssh_ignore_o_and_x_args.patch
+++ b/
package/dropbear/patches/130-ssh_ignore_o_and_x_args.patch
@@
-1,8
+1,8
@@
-Index: dropbear-0.5
1
/cli-runopts.c
+Index: dropbear-0.5
2
/cli-runopts.c
===================================================================
===================================================================
---- dropbear-0.5
1
.orig/cli-runopts.c 2008-04-22 17:29:49.000000000 -0700
-+++ dropbear-0.5
1
/cli-runopts.c 2008-04-22 17:29:50.000000000 -0700
-@@ -2
20,6 +220
,10 @@
+--- dropbear-0.5
2
.orig/cli-runopts.c 2008-04-22 17:29:49.000000000 -0700
++++ dropbear-0.5
2
/cli-runopts.c 2008-04-22 17:29:50.000000000 -0700
+@@ -2
71,6 +271
,10 @@
debug_trace = 1;
break;
#endif
debug_trace = 1;
break;
#endif
@@
-13,7
+13,7
@@
Index: dropbear-0.51/cli-runopts.c
case 'F':
case 'e':
case 'c':
case 'F':
case 'e':
case 'c':
-@@ -2
31,7 +235
,6 @@
+@@ -2
82,7 +286
,6 @@
#ifndef ENABLE_CLI_LOCALTCPFWD
case 'L':
#endif
#ifndef ENABLE_CLI_LOCALTCPFWD
case 'L':
#endif
diff --git
a/package/dropbear/patches/150-dbconvert_standalone.patch
b/package/dropbear/patches/150-dbconvert_standalone.patch
index 543902ef5aa17978fb146f8bb18ed8669f536079..4b46ddfdbc195e83d8e33076773efc71790c6a83 100644
(file)
--- a/
package/dropbear/patches/150-dbconvert_standalone.patch
+++ b/
package/dropbear/patches/150-dbconvert_standalone.patch
@@
-1,7
+1,7
@@
-Index: dropbear-0.5
1
/options.h
+Index: dropbear-0.5
2
/options.h
===================================================================
===================================================================
---- dropbear-0.5
1
.orig/options.h 2008-04-22 17:29:49.000000000 -0700
-+++ dropbear-0.5
1
/options.h 2008-04-22 17:29:50.000000000 -0700
+--- dropbear-0.5
2
.orig/options.h 2008-04-22 17:29:49.000000000 -0700
++++ dropbear-0.5
2
/options.h 2008-04-22 17:29:50.000000000 -0700
@@ -5,6 +5,11 @@
#ifndef _OPTIONS_H_
#define _OPTIONS_H_
@@ -5,6 +5,11 @@
#ifndef _OPTIONS_H_
#define _OPTIONS_H_