From dc0f0a5b71d7f781cb33d768279ba315e64ffec7 Mon Sep 17 00:00:00 2001
From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 20 Oct 2005 13:55:42 +0000
Subject: [PATCH] update dropbear to new upstream release (v0.46)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2195 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/dropbear/Makefile                  |  6 +++---
 package/dropbear/patches/change-user.patch | 18 +++++++++++-------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile
index 72697be19..e7144a60d 100644
--- a/package/dropbear/Makefile
+++ b/package/dropbear/Makefile
@@ -3,9 +3,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dropbear
-PKG_VERSION:=0.45
-PKG_RELEASE:=4
-PKG_MD5SUM:=2bcc46e4c239aec982bf36a723dd0b0e
+PKG_VERSION:=0.46
+PKG_RELEASE:=1
+PKG_MD5SUM:=f0e535a62b57e5bde9ecba4a11402178
 
 PKG_SOURCE_URL:=http://matt.ucc.asn.au/dropbear/releases/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/package/dropbear/patches/change-user.patch b/package/dropbear/patches/change-user.patch
index 3b4a341f7..5ab4a5689 100644
--- a/package/dropbear/patches/change-user.patch
+++ b/package/dropbear/patches/change-user.patch
@@ -1,15 +1,19 @@
---- dropbear-0.44.old/svr-chansession.c	2005-02-03 02:29:44.000000000 +0100
-+++ dropbear-0.44/svr-chansession.c	2005-02-03 02:31:05.000000000 +0100
-@@ -860,10 +860,10 @@
+diff -ruN dropbear-0.46-old/svr-chansession.c dropbear-0.46-new/svr-chansession.c
+--- dropbear-0.46-old/svr-chansession.c	2005-07-08 21:20:59.000000000 +0200
++++ dropbear-0.46-new/svr-chansession.c	2005-07-12 01:39:12.000000000 +0200
+@@ -860,12 +860,12 @@
  	/* We can only change uid/gid as root ... */
  	if (getuid() == 0) {
  
 -		if ((setgid(ses.authstate.pw->pw_gid) < 0) ||
-+		if ((ses.authstate.pw->pw_uid != 0) && ((setgid(ses.authstate.pw->pw_gid) < 0) ||
++		if ((ses.authstate.pw->pw_gid != 0) && ((setgid(ses.authstate.pw->pw_gid) < 0) ||
  			(initgroups(ses.authstate.pw->pw_name, 
- 						ses.authstate.pw->pw_gid) < 0) ||
--			(setuid(ses.authstate.pw->pw_uid) < 0)) {
-+			(setuid(ses.authstate.pw->pw_uid) < 0))) {
+-						ses.authstate.pw->pw_gid) < 0)) {
++						ses.authstate.pw->pw_gid) < 0))) {
+ 			dropbear_exit("error changing user group");
+ 		}
+-		if (setuid(ses.authstate.pw->pw_uid) < 0) {
++		if ((ses.authstate.pw->pw_uid != 0) && (setuid(ses.authstate.pw->pw_uid) < 0)) {
  			dropbear_exit("error changing user");
  		}
  	} else {