[PR PATCH] openssh: update to 9.7p1.

[PR PATCH] openssh: update to 9.7p1.

[leahneukirchen]

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

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

https://github.com/leahneukirchen/void-packages openssh97
https://github.com/void-linux/void-packages/pull/49238

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

#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### 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
-->


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

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

From 3cb3bf95e16310610f9af5e1441b620a5d6256b3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 11 Mar 2024 18:42:20 +0100
Subject: [PATCH 1/2] openssh: update to 9.7p1.

---
 srcpkgs/openssh/patches/time_t-32-bit.patch | 11 -----------
 srcpkgs/openssh/template                    |  6 +++---
 2 files changed, 3 insertions(+), 14 deletions(-)
 delete mode 100644 srcpkgs/openssh/patches/time_t-32-bit.patch

diff --git a/srcpkgs/openssh/patches/time_t-32-bit.patch b/srcpkgs/openssh/patches/time_t-32-bit.patch
deleted file mode 100644
index f70e260ac98ff5..00000000000000
--- a/srcpkgs/openssh/patches/time_t-32-bit.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/channels.c
-+++ b/channels.c
-@@ -2566,7 +2566,7 @@ channel_handler(struct ssh *ssh, int tab
- 			if (table == CHAN_PRE &&
- 			    c->type == SSH_CHANNEL_OPEN &&
- 			    c->inactive_deadline != 0 && c->lastused != 0 &&
--			    now >= c->lastused + c->inactive_deadline) {
-+			    now >= c->lastused + (time_t)c->inactive_deadline) {
- 				/* channel closed for inactivity */
- 				verbose("channel %d: closing after %u seconds "
- 				    "of inactivity", c->self,
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 14ba71c28ad391..0a7dcaa5ba079a 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
 # Template file for 'openssh'
 pkgname=openssh
-version=9.6p1
-revision=2
+version=9.7p1
+revision=1
 build_style=gnu-configure
 configure_args="--datadir=/usr/share/openssh
  --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
@@ -25,7 +25,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause, ISC"
 homepage="https://www.openssh.com"
 distfiles="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${version}.tar.gz"
-checksum=910211c07255a8c5ad654391b40ee59800710dd8119dd5362de09385aa7a777c
+checksum=490426f766d82a2763fcacd8d83ea3d70798750c7bd2aff2e57dc5660f773ffd
 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 240789ea4474300768e4a830cecd2cd4bed81505 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 11 Mar 2024 18:42:40 +0100
Subject: [PATCH 2/2] gnome-ssh-askpass: update to 9.7p1.

---
 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 1e1ec8d341baa7..7f7525b1d162dc 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.6p1
+version=9.7p1
 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=910211c07255a8c5ad654391b40ee59800710dd8119dd5362de09385aa7a777c
+checksum=490426f766d82a2763fcacd8d83ea3d70798750c7bd2aff2e57dc5660f773ffd
 
 alternatives="
  ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/gnome-ssh-askpass

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

[leahneukirchen]

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

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

openssh: update to 9.7p1.
https://github.com/void-linux/void-packages/pull/49238

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

#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### 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
-->