From 155639d40113a8ffc61aff3078e49f6e20090481 Mon Sep 17 00:00:00 2001
From: Matt Johnston <matt@ucc.asn.au>
Date: Tue, 22 Oct 2024 22:31:59 +0800
Subject: [PATCH] Dropbear 2024.86

---
 CHANGES          | 36 ++++++++++++++++++++++++++++++++++++
 debian/changelog |  6 ++++++
 src/sysoptions.h |  2 +-
 3 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 888658f7..df4f3d65 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,39 @@
+2024.86 - 22 October 2024
+
+- Fix failure on concurrent channel open/close.
+  This was a regression in 2022.82, reported by rsflo in Github #321.
+    failed assertion in common-channel.c:705: !channel->sent_close
+
+- Print remote host after "Login attempt for nonexistent user" log entry to
+  assist fail2ban. Fix from MichaIng, the format changed in 2020.79
+
+- Dropbear now exits with exit status 0 on SIGINT/SIGTERM. This is a more
+  graceful behaviour for "systemctl stop dropbear".
+  Reported by Ninad Palsule
+
+- New IDENT_VERSION_PART config allows customising some of the SSH version
+  string. From Marius Dinu
+
+- Fix building SK_KEYS with just one of ECDSA or ED25519
+  From Marius Dinu
+
+- Fix dbclient "-m help" and "-c help" without a hostname.
+  Patch from Darren Tucker
+
+- Remove fprintf/gettimeofday from sigchld handler when running with
+  verbose trace enabled.
+
+- Improved configure help output, from Mikel Olasagasti Uranga
+
+- Compile fix for GNU Hurd, from Guilhem Moulin
+
+- Support running test_aslr without venv, from Guilhem Moulin
+
+- Compilation fixes for older compilers, and better build tests
+
+- Update some test infrastructure versions of python packages,
+  github actions, and github runner OSes
+
 2024.85 - 25 April 2024
 
   This release fixes build regressions in 2024.84
diff --git a/debian/changelog b/debian/changelog
index 9aa79bc9..6d43e32c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dropbear (2024.86-0.1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matt Johnston <matt@ucc.asn.au>  Tue, 22 Oct 2024 22:51:57 +0800
+
 dropbear (2024.85-0.1) unstable; urgency=low
 
   * New upstream release.
diff --git a/src/sysoptions.h b/src/sysoptions.h
index 0533c6e9..9b325d5b 100644
--- a/src/sysoptions.h
+++ b/src/sysoptions.h
@@ -4,7 +4,7 @@
  *******************************************************************/
 
 #ifndef DROPBEAR_VERSION
-#define DROPBEAR_VERSION "2024.85"
+#define DROPBEAR_VERSION "2024.86"
 #endif
 
 /* IDENT_VERSION_PART is the optional part after "SSH-2.0-dropbear". Refer to RFC4253 for requirements. */