# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1328872192 -28800
# Node ID 234cf769bcb3352e466ed84d7975a9233e98ef65
# Parent  452bcf810e44e21970c7764de097d15da8a2c21c# Parent  4222a1039b065920882d7d55fb39b3ebd3374c0d
Merge

diff -r 4222a1039b06 -r 234cf769bcb3 .hgsigs
--- a/.hgsigs	Fri Feb 10 18:32:18 2012 +0800
+++ b/.hgsigs	Fri Feb 10 19:09:52 2012 +0800
@@ -1,1 +1,2 @@
 aa2f51a6b81d33de5e9898a7f27c792a173d9b26 0 iD8DBQBOuADmjPn4sExkf7wRAv/fAJ9FJFvjDoF+wd1ipDx1wkzdeBQNqgCgykUrSbXv76FBbxKntVbk9oS3GjI=
+3f12086c2ef2b9ffe36a822fdb3ff647fcec1831 0 iD8DBQBOuSlQjPn4sExkf7wRAvkbAKCgE1e8xEMQ16CGeoywhIQ0QR4eNgCfZdYYlzjb/+521Uvh5/7FRYEmrho=
diff -r 4222a1039b06 -r 234cf769bcb3 .hgtags
--- a/.hgtags	Fri Feb 10 18:32:18 2012 +0800
+++ b/.hgtags	Fri Feb 10 19:09:52 2012 +0800
@@ -29,3 +29,4 @@
 e37b160c414cab6466622f63b0c4dcbf6ebc47a9 DROPBEAR_0.47
 e430a26064ee86ab79aef372118d6d03b2441996 DROPBEAR_0.50
 e5d119ea4c63656bc54ecfd865d04591ac2ed225 LTC_DB_0.47
+3f12086c2ef2b9ffe36a822fdb3ff647fcec1831 DROPBEAR_2011.54
diff -r 4222a1039b06 -r 234cf769bcb3 CHANGES
--- a/CHANGES	Fri Feb 10 18:32:18 2012 +0800
+++ b/CHANGES	Fri Feb 10 19:09:52 2012 +0800
@@ -1,3 +1,37 @@
+2011.54 - Tuesday 8 November 2011
+
+- Building statically works again, broke in 0.53 and 0.53.1
+
+- Fix crash when forwarding with -R
+
+- Fixed various leaks found by Klocwork analysis software, thanks to them for
+  running it
+
+- Set IPTOS_LOWDELAY for IPv6, thanks to Dave Taht
+
+- Bind to sockets with IPV6_V6ONLY so that it works properly on systems
+  regardless of the system-wide setting
+
+- Added ALLOW_BLANK_PASSWORD option. Dropbear also now allows public key logins
+  to accounts with a blank password. Thanks to Rob Landley
+
+- Fixed case where "-K 1" keepalive for dbclient would cause a SSH_MSG_IGNORE
+  packet to be sent
+
+- Avoid some memory allocations in big number maths routines, improves
+  performance slightly
+
+- Fix symlink target for installdropbearmulti with DESTDIR set, thanks to
+  Scottie Shore
+
+- When requesting server allocated remote ports (-R 0:host:port) print a
+  message informing what the port is, thanks to Ali Onur Uyar.
+
+- New version numbering scheme.
+
+Source repository has now migrated to Mercurial at 
+https://secure.ucc.asn.au/hg/dropbear/graph/default
+
 0.53.1 - Wednesday 2 March 2011
 
 - -lcrypt needs to be before object files for static linking
diff -r 4222a1039b06 -r 234cf769bcb3 Makefile.in
--- a/Makefile.in	Fri Feb 10 18:32:18 2012 +0800
+++ b/Makefile.in	Fri Feb 10 19:09:52 2012 +0800
@@ -129,12 +129,14 @@
 	-chgrp 0 $(DESTDIR)$(bindir)/dropbearmulti$(EXEEXT)
 
 insmultidropbear: dropbearmulti
+	$(INSTALL) -d -m 755 $(DESTDIR)$(sbindir)
 	-rm -f $(DESTDIR)$(sbindir)/dropbear$(EXEEXT)
-	-ln -s $(DESTDIR)$(bindir)/dropbearmulti$(EXEEXT) $(DESTDIR)$(sbindir)/dropbear$(EXEEXT) 
+	-ln -s $(bindir)/dropbearmulti$(EXEEXT) $(DESTDIR)$(sbindir)/dropbear$(EXEEXT) 
 
 insmulti%: dropbearmulti
+	$(INSTALL) -d -m 755 $(DESTDIR)$(bindir)
 	-rm -f $(DESTDIR)$(bindir)/$*$(EXEEXT) 
-	-ln -s $(DESTDIR)$(bindir)/dropbearmulti$(EXEEXT) $(DESTDIR)$(bindir)/$*$(EXEEXT) 
+	-ln -s $(bindir)/dropbearmulti$(EXEEXT) $(DESTDIR)$(bindir)/$*$(EXEEXT) 
 
 # dropbear should go in sbin, so it needs a seperate rule
 inst_dropbear: dropbear
diff -r 4222a1039b06 -r 234cf769bcb3 dbutil.c
--- a/dbutil.c	Fri Feb 10 18:32:18 2012 +0800
+++ b/dbutil.c	Fri Feb 10 19:09:52 2012 +0800
@@ -164,7 +164,7 @@
 	/* set the TOS bit for either ipv4 or ipv6 */
 #ifdef IPTOS_LOWDELAY
 	val = IPTOS_LOWDELAY;
-#ifdef IPPROTO_IPV6
+#if defined(IPPROTO_IPV6) && defined(IPV6_TCLASS)
 	setsockopt(sock, IPPROTO_IPV6, IPV6_TCLASS, (void*)&val, sizeof(val));
 #endif
 	setsockopt(sock, IPPROTO_IP, IP_TOS, (void*)&val, sizeof(val));
@@ -256,7 +256,7 @@
 		linger.l_linger = 5;
 		setsockopt(sock, SOL_SOCKET, SO_LINGER, (void*)&linger, sizeof(linger));
 
-#ifdef IPV6_V6ONLY
+#if defined(IPPROTO_IPV6) && defined(IPV6_V6ONLY)
 		if (res->ai_family == AF_INET6) {
 			int on = 1;
 			if (setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, 
diff -r 4222a1039b06 -r 234cf769bcb3 debian/changelog
--- a/debian/changelog	Fri Feb 10 18:32:18 2012 +0800
+++ b/debian/changelog	Fri Feb 10 19:09:52 2012 +0800
@@ -1,3 +1,9 @@
+dropbear (2011.54-0.1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matt Johnston <matt@ucc.asn.au>  Tues, 8 Nov 2011 22:54:00 +0800
+
 dropbear (0.53.1-0.1) unstable; urgency=low
 
   * New upstream release.
diff -r 4222a1039b06 -r 234cf769bcb3 sysoptions.h
--- a/sysoptions.h	Fri Feb 10 18:32:18 2012 +0800
+++ b/sysoptions.h	Fri Feb 10 19:09:52 2012 +0800
@@ -4,7 +4,7 @@
  *******************************************************************/
 
 #ifndef DROPBEAR_VERSION
-#define DROPBEAR_VERSION "0.53.1"
+#define DROPBEAR_VERSION "2011.54"
 #endif
 
 #define LOCAL_IDENT "SSH-2.0-dropbear_" DROPBEAR_VERSION