Changeset 11913


Ignore:
Timestamp:
2008-07-24T07:24:52+02:00 (10 years ago)
Author:
agb
Message:

dropbear: upgrade to 0.51

  • 160-tty_close merged upstream
  • patches refreshed
Location:
trunk/package/dropbear
Files:
1 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/dropbear/Makefile

    r8659 r11913  
    1 #  
    2 # Copyright (C) 2006 OpenWrt.org 
     1# 
     2# Copyright (C) 2006-2008 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    1010 
    1111PKG_NAME:=dropbear 
    12 PKG_VERSION:=0.50 
    13 PKG_RELEASE:=3 
     12PKG_VERSION:=0.51 
     13PKG_RELEASE:=1 
    1414 
    1515PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    16 PKG_SOURCE_URL:=http://matt.ucc.asn.au/dropbear/releases/ \ 
    17         http://www.mirrors.wiretapped.net/security/cryptography/apps/ssh/dropbear/ 
    18 PKG_MD5SUM:=5c0f7405b915799c3d952d3a93a5df69 
     16PKG_SOURCE_URL:= \ 
     17        http://www.mirrors.wiretapped.net/security/cryptography/apps/ssh/dropbear/ \ 
     18        http://matt.ucc.asn.au/dropbear/releases/ 
     19PKG_MD5SUM:=1045df60c2bdbd39c707238305a1e9e5 
    1920 
    2021include $(INCLUDE_DIR)/package.mk 
     
    7576                PROGRAMS="dropbearconvert" 
    7677endef 
    77          
     78 
    7879define Package/dropbear/install 
    7980        $(INSTALL_DIR) $(1)/usr/sbin 
  • trunk/package/dropbear/patches/100-pubkey_path.patch

    r8400 r11913  
    1 Index: dropbear-0.50/svr-authpubkey.c 
     1Index: dropbear-0.51/svr-authpubkey.c 
    22=================================================================== 
    3 --- dropbear-0.50.orig/svr-authpubkey.c 2007-08-10 23:47:48.000000000 +0200 
    4 +++ dropbear-0.50/svr-authpubkey.c      2007-08-10 23:47:48.000000000 +0200 
     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 
    55@@ -176,6 +176,8 @@ 
    66                goto out; 
    77        } 
    88  
    9 +       if (ses.authstate.pw->pw_uid != 0) { 
     9+       if (ses.authstate.pw_uid != 0) { 
    1010+ 
    1111        /* we don't need to check pw and pw_dir for validity, since 
    1212         * its been done in checkpubkeyperms. */ 
    13         len = strlen(ses.authstate.pw->pw_dir); 
     13        len = strlen(ses.authstate.pw_dir); 
    1414@@ -187,6 +189,9 @@ 
    1515  
     
    2626        } 
    2727  
    28 +       if (ses.authstate.pw->pw_uid != 0) { 
     28+       if (ses.authstate.pw_uid != 0) { 
    2929+ 
    3030        /* allocate max required pathname storage, 
  • trunk/package/dropbear/patches/110-change_user.patch

    r8400 r11913  
    1 Index: dropbear-0.50/svr-chansession.c 
     1Index: dropbear-0.51/svr-chansession.c 
    22=================================================================== 
    3 --- dropbear-0.50.orig/svr-chansession.c        2007-08-10 23:47:48.000000000 +0200 
    4 +++ dropbear-0.50/svr-chansession.c     2007-08-10 23:47:48.000000000 +0200 
    5 @@ -908,12 +908,12 @@ 
     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 @@ 
    66        /* We can only change uid/gid as root ... */ 
    77        if (getuid() == 0) { 
    88  
    9 -               if ((setgid(ses.authstate.pw->pw_gid) < 0) || 
    10 +               if ((ses.authstate.pw->pw_gid != 0) && ((setgid(ses.authstate.pw->pw_gid) < 0) || 
    11                         (initgroups(ses.authstate.pw->pw_name,  
    12 -                                               ses.authstate.pw->pw_gid) < 0)) { 
    13 +                                               ses.authstate.pw->pw_gid) < 0))) { 
     9-               if ((setgid(ses.authstate.pw_gid) < 0) || 
     10+               if ((ses.authstate.pw_gid != 0) && ((setgid(ses.authstate.pw_gid) < 0) || 
     11                        (initgroups(ses.authstate.pw_name,  
     12-                                               ses.authstate.pw_gid) < 0)) { 
     13+                                               ses.authstate.pw_gid) < 0))) { 
    1414                        dropbear_exit("error changing user group"); 
    1515                } 
    16 -               if (setuid(ses.authstate.pw->pw_uid) < 0) { 
    17 +               if ((ses.authstate.pw->pw_uid != 0) && (setuid(ses.authstate.pw->pw_uid) < 0)) { 
     16-               if (setuid(ses.authstate.pw_uid) < 0) { 
     17+               if ((ses.authstate.pw_uid != 0) && (setuid(ses.authstate.pw_uid) < 0)) { 
    1818                        dropbear_exit("error changing user"); 
    1919                } 
  • trunk/package/dropbear/patches/130-ssh_ignore_o_and_x_args.patch

    r8400 r11913  
    1 Index: dropbear-0.50/cli-runopts.c 
     1Index: dropbear-0.51/cli-runopts.c 
    22=================================================================== 
    3 --- dropbear-0.50.orig/cli-runopts.c    2007-08-10 23:47:47.000000000 +0200 
    4 +++ dropbear-0.50/cli-runopts.c 2007-08-10 23:47:49.000000000 +0200 
    5 @@ -219,6 +219,10 @@ 
     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 @@ 
    66                                        debug_trace = 1; 
    77                                        break; 
     
    1414                                case 'e': 
    1515                                case 'c': 
    16 @@ -230,7 +234,6 @@ 
     16@@ -231,7 +235,6 @@ 
    1717 #ifndef ENABLE_CLI_LOCALTCPFWD 
    1818                                case 'L': 
  • trunk/package/dropbear/patches/150-dbconvert_standalone.patch

    r8400 r11913  
    1 Index: dropbear-0.50/options.h 
     1Index: dropbear-0.51/options.h 
    22=================================================================== 
    3 --- dropbear-0.50.orig/options.h        2007-08-10 23:47:47.000000000 +0200 
    4 +++ dropbear-0.50/options.h     2007-08-10 23:47:49.000000000 +0200 
     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 
    55@@ -5,6 +5,11 @@ 
    66 #ifndef _OPTIONS_H_ 
Note: See TracChangeset for help on using the changeset viewer.