From 44569d1d66dcf3b5c6527d1fc64404f08b3666ea Mon Sep 17 00:00:00 2001
From: psykose <alice@ayaya.dev>
Date: Wed, 25 Sep 2024 20:28:15 +0200
Subject: [PATCH] main/openssh: update to 9.9_p1

---
 main/openssh/patches/btmp.patch | 34 +++++++++++++++++++++++++++++++++
 main/openssh/template.py        |  6 +++---
 2 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 main/openssh/patches/btmp.patch

diff --git a/main/openssh/patches/btmp.patch b/main/openssh/patches/btmp.patch
new file mode 100644
index 0000000000..51dbd863c6
--- /dev/null
+++ b/main/openssh/patches/btmp.patch
@@ -0,0 +1,34 @@
+Patch-Source: https://github.com/openssh/openssh-portable/commit/76a618d2842c34c16cd21a4efc7230e2f459008d
+--
+From 76a618d2842c34c16cd21a4efc7230e2f459008d Mon Sep 17 00:00:00 2001
+From: Damien Miller <djm@mindrot.org>
+Date: Wed, 25 Sep 2024 11:13:05 +1000
+Subject: [PATCH] build construct_utmp() when USE_BTMP is set
+
+Fixes compile error on Void Linux/Musl
+---
+ loginrec.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/loginrec.c b/loginrec.c
+index 45f13dee8b1..7b1818b8675 100644
+--- a/loginrec.c
++++ b/loginrec.c
+@@ -614,7 +614,7 @@ line_abbrevname(char *dst, const char *src, int dstsize)
+  ** into account.
+  **/
+ 
+-#if defined(USE_UTMP) || defined (USE_WTMP) || defined (USE_LOGIN)
++#if defined(USE_BTMP) || defined(USE_UTMP) || defined (USE_WTMP) || defined (USE_LOGIN)
+ 
+ /* build the utmp structure */
+ void
+@@ -698,7 +698,7 @@ construct_utmp(struct logininfo *li,
+ 	}
+ # endif
+ }
+-#endif /* USE_UTMP || USE_WTMP || USE_LOGIN */
++#endif /* USE_BTMP || USE_UTMP || USE_WTMP || USE_LOGIN */
+ 
+ /**
+  ** utmpx utility functions
diff --git a/main/openssh/template.py b/main/openssh/template.py
index 522e49da65..8c50687b9c 100644
--- a/main/openssh/template.py
+++ b/main/openssh/template.py
@@ -1,6 +1,6 @@
 pkgname = "openssh"
-pkgver = "9.8_p1"
-pkgrel = 1
+pkgver = "9.9_p1"
+pkgrel = 0
 build_style = "gnu_configure"
 configure_args = [
     "--datadir=/usr/share/openssh",
@@ -43,7 +43,7 @@
 license = "SSH-OpenSSH"
 url = "https://www.openssh.com"
 source = f"https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-{pkgver.replace('_', '')}.tar.gz"
-sha256 = "dd8bd002a379b5d499dfb050dd1fa9af8029e80461f4bb6c523c49973f5a39f3"
+sha256 = "b343fbcdbff87f15b1986e6e15d6d4fc9a7d36066be6b7fb507087ba8f966c02"
 file_modes = {"usr/libexec/ssh-keysign": ("root", "root", 0o4755)}
 # CFI: does not work; maybe make testsuite work first
 hardening = ["vis", "!cfi"]