Ticket #4635: dropbear-0.52.patch

File dropbear-0.52.patch, 5.0 KB (added by florida, 8 years ago)

dropbear 0.52 update patch

  • dropbear-0.

    diff -ruN dropbear-0.51/Makefile dropbear-0.52/Makefile
    old new  
    11# 
    2 # Copyright (C) 2006-2008 OpenWrt.org 
     2# Copyright (C) 2006-2009 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
    55# See /LICENSE for more information. 
     
    99include $(TOPDIR)/rules.mk 
    1010 
    1111PKG_NAME:=dropbear 
    12 PKG_VERSION:=0.51 
    13 PKG_RELEASE:=2 
     12PKG_VERSION:=0.52 
     13PKG_RELEASE:=1 
    1414 
    1515PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    1616PKG_SOURCE_URL:= \ 
    1717        http://matt.ucc.asn.au/dropbear/releases/ \ 
    1818        http://www.mirrors.wiretapped.net/security/cryptography/apps/ssh/dropbear/ 
    19 PKG_MD5SUM:=1045df60c2bdbd39c707238305a1e9e5 
     19PKG_MD5SUM:=1c69ec674481d7745452f68f2ea5597e 
    2020 
    2121include $(INCLUDE_DIR)/package.mk 
    2222 
  • patches/100-pubkey_path.patch

    diff -ruN dropbear-0.51/patches/100-pubkey_path.patch dropbear-0.52/patches/100-pubkey_path.patch
    old new  
    1 Index: dropbear-0.51/svr-authpubkey.c 
     1Index: dropbear-0.52/svr-authpubkey.c 
    22=================================================================== 
    3 --- dropbear-0.51.orig/svr-authpubkey.c 2008-04-22 17:29:49.000000000 -0700 
    4 +++ dropbear-0.51/svr-authpubkey.c      2008-04-22 17:29:49.000000000 -0700 
    5 @@ -176,6 +176,8 @@ 
     3--- dropbear-0.52.orig/svr-authpubkey.c 2008-04-22 17:29:49.000000000 -0700 
     4+++ dropbear-0.52/svr-authpubkey.c      2008-04-22 17:29:49.000000000 -0700 
     5@@ -209,6 +209,8 @@ 
    66                goto out; 
    77        } 
    88  
     
    1111        /* we don't need to check pw and pw_dir for validity, since 
    1212         * its been done in checkpubkeyperms. */ 
    1313        len = strlen(ses.authstate.pw_dir); 
    14 @@ -187,6 +189,9 @@ 
     14@@ -220,6 +222,9 @@ 
    1515  
    1616        /* open the file */ 
    1717        authfile = fopen(filename, "r"); 
     
    2121        if (authfile == NULL) { 
    2222                goto out; 
    2323        } 
    24 @@ -274,6 +279,8 @@ 
     24@@ -372,6 +377,8 @@ 
    2525                goto out; 
    2626        } 
    2727  
     
    3030        /* allocate max required pathname storage, 
    3131         * = path + "/.ssh/authorized_keys" + '\0' = pathlen + 22 */ 
    3232        filename = m_malloc(len + 22); 
    33 @@ -295,6 +302,14 @@ 
     33@@ -381,6 +388,14 @@ 
    3434        if (checkfileperm(filename) != DROPBEAR_SUCCESS) { 
    3535                goto out; 
    3636        } 
     
    4343+               } 
    4444+       } 
    4545  
    46         /* file looks ok, return success */ 
    47         ret = DROPBEAR_SUCCESS; 
     46        /* check ~/.ssh */ 
     47        strncat(filename, "/.ssh", 5); /* strlen("/.ssh") == 5 */ 
  • patches/110-change_user.patch

    diff -ruN dropbear-0.51/patches/110-change_user.patch dropbear-0.52/patches/110-change_user.patch
    old new  
    1 Index: dropbear-0.51/svr-chansession.c 
     1Index: dropbear-0.52/svr-chansession.c 
    22=================================================================== 
    3 --- dropbear-0.51.orig/svr-chansession.c        2008-04-22 17:29:49.000000000 -0700 
    4 +++ dropbear-0.51/svr-chansession.c     2008-04-22 17:29:49.000000000 -0700 
    5 @@ -912,12 +912,12 @@ 
     3--- dropbear-0.52.orig/svr-chansession.c        2008-04-22 17:29:49.000000000 -0700 
     4+++ dropbear-0.52/svr-chansession.c     2008-04-22 17:29:49.000000000 -0700 
     5@@ -852,12 +852,12 @@ 
    66        /* We can only change uid/gid as root ... */ 
    77        if (getuid() == 0) { 
    88  
  • patches/130-ssh_ignore_o_and_x_args.patch

    diff -ruN dropbear-0.51/patches/130-ssh_ignore_o_and_x_args.patch dropbear-0.52/patches/130-ssh_ignore_o_and_x_args.patch
    old new  
    1 Index: dropbear-0.51/cli-runopts.c 
     1Index: dropbear-0.52/cli-runopts.c 
    22=================================================================== 
    3 --- dropbear-0.51.orig/cli-runopts.c    2008-04-22 17:29:49.000000000 -0700 
    4 +++ dropbear-0.51/cli-runopts.c 2008-04-22 17:29:50.000000000 -0700 
    5 @@ -220,6 +220,10 @@ 
     3--- dropbear-0.52.orig/cli-runopts.c    2008-04-22 17:29:49.000000000 -0700 
     4+++ dropbear-0.52/cli-runopts.c 2008-04-22 17:29:50.000000000 -0700 
     5@@ -271,6 +271,10 @@ 
    66                                        debug_trace = 1; 
    77                                        break; 
    88 #endif 
     
    1313                                case 'F': 
    1414                                case 'e': 
    1515                                case 'c': 
    16 @@ -231,7 +235,6 @@ 
     16@@ -282,7 +286,6 @@ 
    1717 #ifndef ENABLE_CLI_LOCALTCPFWD 
    1818                                case 'L': 
    1919 #endif 
  • patches/150-dbconvert_standalone.patch

    diff -ruN dropbear-0.51/patches/150-dbconvert_standalone.patch dropbear-0.52/patches/150-dbconvert_standalone.patch
    old new  
    1 Index: dropbear-0.51/options.h 
     1Index: dropbear-0.52/options.h 
    22=================================================================== 
    3 --- dropbear-0.51.orig/options.h        2008-04-22 17:29:49.000000000 -0700 
    4 +++ dropbear-0.51/options.h     2008-04-22 17:29:50.000000000 -0700 
     3--- dropbear-0.52.orig/options.h        2008-04-22 17:29:49.000000000 -0700 
     4+++ dropbear-0.52/options.h     2008-04-22 17:29:50.000000000 -0700 
    55@@ -5,6 +5,11 @@ 
    66 #ifndef _OPTIONS_H_ 
    77 #define _OPTIONS_H_