update dropbear to new upstream release (v0.46)

SVN-Revision: 2195

diff --git a/openwrt/package/dropbear/Makefile b/openwrt/package/dropbear/Makefile
index 72697be19bb28080c2dc50ad2eb60467d4d3cc87..e7144a60dfa75795d34ea314405569e37d9acde1 100644 (file)
--- a/openwrt/package/dropbear/Makefile
+++ b/openwrt/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/openwrt/package/dropbear/patches/change-user.patch b/openwrt/package/dropbear/patches/change-user.patch
index 3b4a341f7e31bc32b2a549b2376c03f36c0149e6..5ab4a5689905427f6ab3eea03565d70f434e1464 100644 (file)
--- a/openwrt/package/dropbear/patches/change-user.patch
+++ b/openwrt/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 {