From c6e22cf1d338d0344771712a80d999ae453df0c9 Mon Sep 17 00:00:00 2001
From: Alejandro Mery <amery@geeks.cl>
Date: Fri, 29 Apr 2011 17:21:03 +0200
Subject: [PATCH] dropbear: Updated (0.52 -> 0.53.1)

---
 security/dropbear/dropbear.desc    |  6 +++---
 security/dropbear/legacy_sus.patch | 19 ++++++++++++-------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/security/dropbear/dropbear.desc b/security/dropbear/dropbear.desc
index aa22dbbc9..a5d6a6a56 100644
--- a/security/dropbear/dropbear.desc
+++ b/security/dropbear/dropbear.desc
@@ -2,7 +2,7 @@
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY]
 [COPY] Filename: package/.../dropbear/dropbear.desc
-[COPY] Copyright (C) 2006 - 2009 The OpenSDE Project
+[COPY] Copyright (C) 2006 - 2011 The OpenSDE Project
 [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
 [COPY]
 [COPY] More information can be found in the files COPYING and README.
@@ -29,8 +29,8 @@
 
 [L] MIT
 [S] Stable
-[V] 0.52
+[V] 0.53.1
 [P] X -?---5---9 191.100
 
-[D] 1727358443 dropbear-0.52.tar.gz http://matt.ucc.asn.au/dropbear/releases/
+[D] 240943820 dropbear-0.53.1.tar.gz http://matt.ucc.asn.au/dropbear/releases/
 
diff --git a/security/dropbear/legacy_sus.patch b/security/dropbear/legacy_sus.patch
index 76288fdc4..cce9bdbee 100644
--- a/security/dropbear/legacy_sus.patch
+++ b/security/dropbear/legacy_sus.patch
@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../dropbear/legacy_sus.patch
-# Copyright (C) 2010 The OpenSDE Project
+# Copyright (C) 2010 - 2011 The OpenSDE Project
 #
 # More information can be found in the files COPYING and README.
 #
@@ -17,15 +17,20 @@
 usleep() was deprecated by SUSv3 and newer LIBCs are starting to enforce that
 deprecation.
 
---- ./svr-auth.c.orig	2010-09-20 16:12:52.000000000 -0400
-+++ ./svr-auth.c	2010-09-20 16:15:08.000000000 -0400
-@@ -337,7 +337,8 @@
+--- ./svr-auth.c.orig	2011-04-29 16:58:36.000000000 +0200
++++ ./svr-auth.c	2011-04-29 17:01:48.000000000 +0200
+@@ -338,11 +338,12 @@
  	encrypt_packet();
  
  	if (incrfail) {
--		usleep(300000); /* XXX improve this */
-+		const struct timespec ts = { 0, 300000000L };
-+		nanosleep(&ts, NULL); /* XXX improve this */
++		struct timespec ts = {0, 250000000L};
+ 		unsigned int delay;
+ 		genrandom((unsigned char*)&delay, sizeof(delay));
+ 		/* We delay for 300ms +- 50ms, 0.1ms granularity */
+-		delay = 250000 + (delay % 1000)*100;
+-		usleep(delay);
++		ts.tv_nsec += (delay % 1000)*100000L;
++		nanosleep(&ts, NULL);
  		ses.authstate.failcount++;
  	}