[OpenWrt-Devel] [PATCH] [package] dropbear: updated to version 2014.64

[Alive4Ever]

Some included patch series are broken and cannot be applied 
automatically for version 2014.64. Manual work is needed for 
these patches to apply cleanly.
 110-change_user.patch
 130-ssh_ignore_o_and_x_args.patch
 140-disable_assert.patch
This patch will fix them all to apply cleanly to version 
2014.64

diff --git a/package/network/services/dropbear/Makefile 
b/package/network/services/dropbear/Makefile
index b2bd8cc..d1f0cff 100644
--- a/package/network/services/dropbear/Makefile
+++ b/package/network/services/dropbear/Makefile
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dropbear
-PKG_VERSION:=2014.63
+PKG_VERSION:=2014.64
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:= \
 	http://matt.ucc.asn.au/dropbear/releases/ \
 	https://dropbear.nl/mirror/releases/
-PKG_MD5SUM:=7066bb9a2da708f3ed06314fdc9c47fd
+PKG_MD5SUM:=c9c92f0bf622e6395462a906727d830f
 
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE libtomcrypt/LICENSE 
libtommath/LICENSE
diff --git a/package/network/services/dropbear/patches/110-
change_user.patch 
b/package/network/services/dropbear/patches/110-
change_user.patch
index 48228ea..15cf6bc 100644
--- a/package/network/services/dropbear/patches/110-
change_user.patch
+++ b/package/network/services/dropbear/patches/110-
change_user.patch
@@ -1,6 +1,6 @@
 --- a/svr-chansession.c
 +++ b/svr-chansession.c
-@@ -889,12 +889,12 @@ static void execchild(void *user_data) 
{
+@@ -899,12 +899,12 @@ static void execchild(void *user_data) 
{
  	/* We can only change uid/gid as root ... */
  	if (getuid() == 0) {
  
diff --git a/package/network/services/dropbear/patches/130-
ssh_ignore_o_and_x_args.patch 
b/package/network/services/dropbear/patches/130-
ssh_ignore_o_and_x_args.patch
index 6de652b..0a5e8ba 100644
--- a/package/network/services/dropbear/patches/130-
ssh_ignore_o_and_x_args.patch
+++ b/package/network/services/dropbear/patches/130-
ssh_ignore_o_and_x_args.patch
@@ -1,6 +1,6 @@
 --- a/cli-runopts.c
 +++ b/cli-runopts.c
-@@ -309,6 +309,10 @@ void cli_getopts(int argc, char ** argv)
+@@ -312,6 +312,10 @@ void cli_getopts(int argc, char ** argv)
  					debug_trace = 1;
  					break;
  #endif
@@ -11,10 +11,10 @@
  				case 'F':
  				case 'e':
  #ifndef ENABLE_USER_ALGO_LIST
-@@ -322,7 +326,6 @@ void cli_getopts(int argc, char ** argv)
- #ifndef ENABLE_CLI_LOCALTCPFWD
- 				case 'L':
- #endif
+@@ -329,7 +333,6 @@ void cli_getopts(int argc, char ** argv)
+ 					print_version();
+ 					exit(EXIT_SUCCESS);
+ 					break;
 -				case 'o':
  				case 'b':
  					next = &dummy;
diff --git a/package/network/services/dropbear/patches/140-
disable_assert.patch 
b/package/network/services/dropbear/patches/140-
disable_assert.patch
index edc7547..0717228 100644
--- a/package/network/services/dropbear/patches/140-
disable_assert.patch
+++ b/package/network/services/dropbear/patches/140-
disable_assert.patch
@@ -1,6 +1,6 @@
 --- a/dbutil.h
 +++ b/dbutil.h
-@@ -92,7 +92,11 @@ int m_str_to_uint(const char* str, unsig
+@@ -101,7 +101,11 @@ int m_str_to_uint(const char* str, unsig
  #define DEF_MP_INT(X) mp_int X = {0, 0, 0, NULL}
  
  /* Dropbear assertion */



Signed-off-by: Alif Ahmad <alive4ever at live.com>
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel