From 67eb0f7fd53d945cc2eaf963b93726d74ab17e05 Mon Sep 17 00:00:00 2001
From: Juergen Daubert <jue@jue.li>
Date: Fri, 4 Oct 2013 20:04:21 +0200
Subject: [PATCH] [notify] dropbear: upate to 2013.59

includes two security fixes, see
http://article.gmane.org/gmane.network.ssh.dropbear/1394
---
 dropbear/.footprint |  3 ++-
 dropbear/.md5sum    |  2 +-
 dropbear/Pkgfile    | 20 ++++++++++----------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/dropbear/.footprint b/dropbear/.footprint
index ae5106679..2dccda90d 100644
--- a/dropbear/.footprint
+++ b/dropbear/.footprint
@@ -10,8 +10,9 @@ drwxr-xr-x	root/root	usr/bin/
 drwxr-xr-x	root/root	usr/man/
 drwxr-xr-x	root/root	usr/man/man1/
 -rw-r--r--	root/root	usr/man/man1/dbclient.1.gz
+-rw-r--r--	root/root	usr/man/man1/dropbearconvert.1.gz
+-rw-r--r--	root/root	usr/man/man1/dropbearkey.1.gz
 drwxr-xr-x	root/root	usr/man/man8/
 -rw-r--r--	root/root	usr/man/man8/dropbear.8.gz
--rw-r--r--	root/root	usr/man/man8/dropbearkey.8.gz
 drwxr-xr-x	root/root	usr/sbin/
 -rwxr-xr-x	root/root	usr/sbin/dropbear
diff --git a/dropbear/.md5sum b/dropbear/.md5sum
index f5a025db3..a8b18c783 100644
--- a/dropbear/.md5sum
+++ b/dropbear/.md5sum
@@ -1,2 +1,2 @@
 e499ac93e2ce3c14c3806c4f74e74371  dropbear
-8d3579bbbfcea48404a3219643076450  dropbear-2013.58.tar.bz2
+6c1e6c2c297f4034488ffc95e8b7e6e9  dropbear-2013.59.tar.bz2
diff --git a/dropbear/Pkgfile b/dropbear/Pkgfile
index e7903f19f..7d371c1e3 100644
--- a/dropbear/Pkgfile
+++ b/dropbear/Pkgfile
@@ -4,23 +4,23 @@
 # Depends on:  zlib
 
 name=dropbear
-version=2013.58
+version=2013.59
 release=1
 source=(http://matt.ucc.asn.au/$name/releases/$name-$version.tar.bz2 \
         $name)
 
 build () {
     cd $name-$version
-    
-    # /proc/net/rt_cache might be rather big, don't use it to gather entropy
-    sed -i 's/rt_cache/unix/' random.c
 
-    sed -i 's|libexec|lib/ssh|; s|X11R6/bin|bin|; s|bin/X11|bin|' options.h
-    ./configure --prefix=/usr 
+    sed -i 's|libexec|lib/ssh|; s|bin/X11|bin|' options.h
+
+    ./configure --prefix=/usr \
+                --bindir=/usr/bin \
+                --sbindir=/usr/sbin \
+                --mandir=/usr/man
     make
     make DESTDIR=$PKG install
-    install -d $PKG/{etc/{rc.d,dropbear},usr/man/man{1,8}}
-    install -m 644 dbclient.1 $PKG/usr/man/man1
-    install -m 644 dropbear{.8,key.8} $PKG/usr/man/man8
-    install -m 755 $SRC/dropbear $PKG/etc/rc.d
+
+    install -d $PKG/etc/{rc.d,dropbear}/
+    install -D -m 755 $SRC/dropbear $PKG/etc/rc.d/
 }