[PR PATCH] openssh: update to 9.9p1.

[PR PATCH] openssh: update to 9.9p1.

[leahneukirchen]

[-- Attachment #1: Type: text/plain, Size: 1285 bytes --]

There is a new pull request by leahneukirchen against master on the void-packages repository

https://github.com/leahneukirchen/void-packages openssh99
https://github.com/void-linux/void-packages/pull/52309

openssh: update to 9.9p1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES** on x86_64

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Supercedes #52297 


A patch file from https://github.com/void-linux/void-packages/pull/52309.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openssh99-52309.patch --]
[-- Type: text/x-diff, Size: 3704 bytes --]

From 6b2052ab6ee32cf8e4987ac9b0e9eceab28d9fb6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 22 Sep 2024 16:26:23 +0200
Subject: [PATCH 1/2] openssh: update to 9.9p1.

---
 srcpkgs/openssh/patches/musl-btmp.patch    | 11 +++++++++++
 srcpkgs/openssh/patches/musl-connect.patch | 11 -----------
 srcpkgs/openssh/template                   |  4 ++--
 3 files changed, 13 insertions(+), 13 deletions(-)
 create mode 100644 srcpkgs/openssh/patches/musl-btmp.patch
 delete mode 100644 srcpkgs/openssh/patches/musl-connect.patch

diff --git a/srcpkgs/openssh/patches/musl-btmp.patch b/srcpkgs/openssh/patches/musl-btmp.patch
new file mode 100644
index 00000000000000..ab3d2ef13413df
--- /dev/null
+++ b/srcpkgs/openssh/patches/musl-btmp.patch
@@ -0,0 +1,11 @@
+--- a/loginrec.c
++++ b/loginrec.c
+@@ -614,7 +614,7 @@
+  ** 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
diff --git a/srcpkgs/openssh/patches/musl-connect.patch b/srcpkgs/openssh/patches/musl-connect.patch
deleted file mode 100644
index cde7bc8cb1f45b..00000000000000
--- a/srcpkgs/openssh/patches/musl-connect.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/openbsd-compat/port-linux.c
-+++ b/openbsd-compat/port-linux.c
-@@ -366,7 +366,7 @@
- 		error_f("socket \"%s\": %s", path, strerror(errno));
- 		goto out;
- 	}
--	if (connect(fd, &addr, sizeof(addr)) != 0) {
-+	if (connect(fd, (const struct sockaddr *)&addr, sizeof(addr)) != 0) {
- 		error_f("socket \"%s\" connect: %s", path, strerror(errno));
- 		goto out;
- 	}
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 5bd67e87037497..5b31b5f9142afd 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,6 +1,6 @@
 # Template file for 'openssh'
 pkgname=openssh
-version=9.8p1
+version=9.9p1
 revision=1
 build_style=gnu-configure
 configure_args="--datadir=/usr/share/openssh
@@ -26,7 +26,7 @@ license="BSD-2-Clause, ISC"
 homepage="https://www.openssh.com"
 changelog="https://www.openssh.com/releasenotes.html"
 distfiles="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${version}.tar.gz"
-checksum=dd8bd002a379b5d499dfb050dd1fa9af8029e80461f4bb6c523c49973f5a39f3
+checksum=b343fbcdbff87f15b1986e6e15d6d4fc9a7d36066be6b7fb507087ba8f966c02
 conf_files="/etc/ssh/moduli /etc/ssh/ssh_config /etc/ssh/sshd_config /etc/pam.d/sshd"
 make_dirs="
  /var/chroot/ssh 0755 root root

From a5fef1f5e4a32b046ff25d5cfa2e38001b807e03 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 22 Sep 2024 16:26:29 +0200
Subject: [PATCH 2/2] gnome-ssh-askpass: update to 9.9p1.

---
 srcpkgs/gnome-ssh-askpass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-ssh-askpass/template b/srcpkgs/gnome-ssh-askpass/template
index 6a21344101708c..8d9ab362e20c53 100644
--- a/srcpkgs/gnome-ssh-askpass/template
+++ b/srcpkgs/gnome-ssh-askpass/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-ssh-askpass'
 pkgname=gnome-ssh-askpass
-version=9.8p1
+version=9.9p1
 revision=1
 build_wrksrc="contrib"
 build_style=gnu-makefile
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause, BSD-2-Clause"
 homepage="http://www.openssh.org"
 distfiles="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${version}.tar.gz"
-checksum=dd8bd002a379b5d499dfb050dd1fa9af8029e80461f4bb6c523c49973f5a39f3
+checksum=b343fbcdbff87f15b1986e6e15d6d4fc9a7d36066be6b7fb507087ba8f966c02
 
 alternatives="
  ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/gnome-ssh-askpass

Re: [PR PATCH] [Merged]: openssh: update to 9.9p1.

[leahneukirchen]

[-- Attachment #1: Type: text/plain, Size: 1118 bytes --]

There's a merged pull request on the void-packages repository

openssh: update to 9.9p1.
https://github.com/void-linux/void-packages/pull/52309

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES** on x86_64

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Supercedes #52297