Dropbear 0.48.1 - same as 0.48, but scp compiles

[Matt Johnston]

On Fri, Mar 10, 2006 at 10:39:29AM +0100, Marcin Juszkiewicz wrote:

> scp fails on compile phase without adding -D_GNU_SOURCE to CFLAGS.
> 
> scp.o(.text+0x660): In function `bwlimit':
> scp.c: undefined reference to `TIMEVAL_TO_TIMESPEC'
> collect2: ld returned 1 exit status
> make: *** [multibinary] Error 1

Sorry about that - forgot that the Debian package doesn't
build scp when I was testing Linux.

I've packaged up 0.48.1 which is identical except for the
scp compile fix attached.

Cheers,
Matt


--- CHANGES	4de896d8eb9ec752aaad4706a128f98fe199c869
+++ CHANGES	52d8155b7e65c65b47d646fa5f842a13ef25cada
@@ -1,3 +1,7 @@
+0.48.1 - Sat 11 March 2006
+
+- Compile fix for scp
+
 0.48 - Thurs 9 March 2006
 
 - Check that the circular buffer is properly empty before
--- scpmisc.h	14f223b0890febf280796d9cc48b37dbb212d311
+++ scpmisc.h	162472df78978824d5fc0838470aa9bc16f2b7d9
@@ -46,3 +46,24 @@
 char *ssh_get_progname(char *);
 void fatal(char* fmt,...);
 void sanitise_stdfd(void);
+
+/* Required for non-BSD platforms, from OpenSSH's defines.h */
+#ifndef timersub
+#define timersub(a, b, result)                  \
+   do {                             \
+      (result)->tv_sec = (a)->tv_sec - (b)->tv_sec;     \
+      (result)->tv_usec = (a)->tv_usec - (b)->tv_usec;      \
+      if ((result)->tv_usec < 0) {              \
+     --(result)->tv_sec;                    \
+     (result)->tv_usec += 1000000;              \
+      }                             \
+   } while (0)
+#endif
+
+#ifndef TIMEVAL_TO_TIMESPEC
+#define TIMEVAL_TO_TIMESPEC(tv, ts) {                   \
+    (ts)->tv_sec = (tv)->tv_sec;                    \
+    (ts)->tv_nsec = (tv)->tv_usec * 1000;               \
+}
+#endif
+