* [PR PATCH] openssh: update to 9.2p1.
@ 2023-02-02 15:58 leahneukirchen
2023-02-02 16:14 ` leahneukirchen
` (5 more replies)
0 siblings, 6 replies; 7+ messages in thread
From: leahneukirchen @ 2023-02-02 15:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 495 bytes --]
There is a new pull request by leahneukirchen against master on the void-packages repository
https://github.com/leahneukirchen/void-packages openssh92
https://github.com/void-linux/void-packages/pull/42036
openssh: update to 9.2p1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
Please test!
A patch file from https://github.com/void-linux/void-packages/pull/42036.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openssh92-42036.patch --]
[-- Type: text/x-diff, Size: 2367 bytes --]
From f555a0c87d19413e61422e814b361f80b3912dca Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 2 Feb 2023 16:57:27 +0100
Subject: [PATCH 1/2] openssh: update to 9.2p1.
---
srcpkgs/openssh/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 2eb9f32405e6..3adadcdbac33 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
# Template file for 'openssh'
pkgname=openssh
-version=9.1p1
-revision=2
+version=9.2p1
+revision=1
build_style=gnu-configure
configure_args="--datadir=/usr/share/openssh
--sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
@@ -23,7 +23,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=19f85009c7e3e23787f0236fbb1578392ab4d4bf9f8ec5fe6bc1cd7e8bfdd288
+checksum=3f66dbf1655fb45f50e1c56da62ab01218c228807b21338d634ebcdf9d71cf46
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 3dd7bad8f8c21c795e7083a2f20281f685d4719f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 2 Feb 2023 16:57:38 +0100
Subject: [PATCH 2/2] gnome-ssh-askpass: update to 9.2p1.
---
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 8b47bd4ca8cb..389516822702 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.1p1
+version=9.2p1
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=19f85009c7e3e23787f0236fbb1578392ab4d4bf9f8ec5fe6bc1cd7e8bfdd288
+checksum=3f66dbf1655fb45f50e1c56da62ab01218c228807b21338d634ebcdf9d71cf46
alternatives="
ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/gnome-ssh-askpass
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: openssh: update to 9.2p1.
2023-02-02 15:58 [PR PATCH] openssh: update to 9.2p1 leahneukirchen
@ 2023-02-02 16:14 ` leahneukirchen
2023-02-03 1:48 ` [PR PATCH] [Updated] " sgn
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: leahneukirchen @ 2023-02-02 16:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 177 bytes --]
New comment by leahneukirchen on void-packages repository
https://github.com/void-linux/void-packages/pull/42036#issuecomment-1414000426
Comment:
Will need a patch for 32bit.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] openssh: update to 9.2p1.
2023-02-02 15:58 [PR PATCH] openssh: update to 9.2p1 leahneukirchen
2023-02-02 16:14 ` leahneukirchen
@ 2023-02-03 1:48 ` sgn
2023-02-03 2:08 ` sgn
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: sgn @ 2023-02-03 1:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 489 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/leahneukirchen/void-packages openssh92
https://github.com/void-linux/void-packages/pull/42036
openssh: update to 9.2p1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
Please test!
A patch file from https://github.com/void-linux/void-packages/pull/42036.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openssh92-42036.patch --]
[-- Type: text/x-diff, Size: 3544 bytes --]
From f555a0c87d19413e61422e814b361f80b3912dca Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 2 Feb 2023 16:57:27 +0100
Subject: [PATCH 1/3] openssh: update to 9.2p1.
---
srcpkgs/openssh/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 2eb9f32405e6..3adadcdbac33 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
# Template file for 'openssh'
pkgname=openssh
-version=9.1p1
-revision=2
+version=9.2p1
+revision=1
build_style=gnu-configure
configure_args="--datadir=/usr/share/openssh
--sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
@@ -23,7 +23,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=19f85009c7e3e23787f0236fbb1578392ab4d4bf9f8ec5fe6bc1cd7e8bfdd288
+checksum=3f66dbf1655fb45f50e1c56da62ab01218c228807b21338d634ebcdf9d71cf46
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 3dd7bad8f8c21c795e7083a2f20281f685d4719f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 2 Feb 2023 16:57:38 +0100
Subject: [PATCH 2/3] gnome-ssh-askpass: update to 9.2p1.
---
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 8b47bd4ca8cb..389516822702 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.1p1
+version=9.2p1
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=19f85009c7e3e23787f0236fbb1578392ab4d4bf9f8ec5fe6bc1cd7e8bfdd288
+checksum=3f66dbf1655fb45f50e1c56da62ab01218c228807b21338d634ebcdf9d71cf46
alternatives="
ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/gnome-ssh-askpass
From 9bca329e2c69a31463decc5c7a3f52c7b97e195b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 3 Feb 2023 08:47:33 +0700
Subject: [PATCH 3/3] openssh: patch for 32 bit time_t
---
srcpkgs/openssh/patches/time_t-32-bit.patch | 11 +++++++++++
1 file changed, 11 insertions(+)
create 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
new file mode 100644
index 000000000000..31efce4ce1be
--- /dev/null
+++ b/srcpkgs/openssh/patches/time_t-32-bit.patch
@@ -0,0 +1,11 @@
+--- openssh-9.2p1.orig/channels.c
++++ openssh-9.2p1/channels.c
+@@ -2558,7 +2558,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) {
++ ((long long unsigned)now) >= c->lastused + c->inactive_deadline) {
+ /* channel closed for inactivity */
+ verbose("channel %d: closing after %u seconds "
+ "of inactivity", c->self,
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] openssh: update to 9.2p1.
2023-02-02 15:58 [PR PATCH] openssh: update to 9.2p1 leahneukirchen
2023-02-02 16:14 ` leahneukirchen
2023-02-03 1:48 ` [PR PATCH] [Updated] " sgn
@ 2023-02-03 2:08 ` sgn
2023-02-05 1:31 ` sgn
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: sgn @ 2023-02-03 2:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 489 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/leahneukirchen/void-packages openssh92
https://github.com/void-linux/void-packages/pull/42036
openssh: update to 9.2p1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
Please test!
A patch file from https://github.com/void-linux/void-packages/pull/42036.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openssh92-42036.patch --]
[-- Type: text/x-diff, Size: 4593 bytes --]
From f555a0c87d19413e61422e814b361f80b3912dca Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 2 Feb 2023 16:57:27 +0100
Subject: [PATCH 1/4] openssh: update to 9.2p1.
---
srcpkgs/openssh/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 2eb9f32405e6..3adadcdbac33 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
# Template file for 'openssh'
pkgname=openssh
-version=9.1p1
-revision=2
+version=9.2p1
+revision=1
build_style=gnu-configure
configure_args="--datadir=/usr/share/openssh
--sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
@@ -23,7 +23,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=19f85009c7e3e23787f0236fbb1578392ab4d4bf9f8ec5fe6bc1cd7e8bfdd288
+checksum=3f66dbf1655fb45f50e1c56da62ab01218c228807b21338d634ebcdf9d71cf46
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 3dd7bad8f8c21c795e7083a2f20281f685d4719f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 2 Feb 2023 16:57:38 +0100
Subject: [PATCH 2/4] gnome-ssh-askpass: update to 9.2p1.
---
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 8b47bd4ca8cb..389516822702 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.1p1
+version=9.2p1
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=19f85009c7e3e23787f0236fbb1578392ab4d4bf9f8ec5fe6bc1cd7e8bfdd288
+checksum=3f66dbf1655fb45f50e1c56da62ab01218c228807b21338d634ebcdf9d71cf46
alternatives="
ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/gnome-ssh-askpass
From 9bca329e2c69a31463decc5c7a3f52c7b97e195b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 3 Feb 2023 08:47:33 +0700
Subject: [PATCH 3/4] openssh: patch for 32 bit time_t
---
srcpkgs/openssh/patches/time_t-32-bit.patch | 11 +++++++++++
1 file changed, 11 insertions(+)
create 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
new file mode 100644
index 000000000000..31efce4ce1be
--- /dev/null
+++ b/srcpkgs/openssh/patches/time_t-32-bit.patch
@@ -0,0 +1,11 @@
+--- openssh-9.2p1.orig/channels.c
++++ openssh-9.2p1/channels.c
+@@ -2558,7 +2558,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) {
++ ((long long unsigned)now) >= c->lastused + c->inactive_deadline) {
+ /* channel closed for inactivity */
+ verbose("channel %d: closing after %u seconds "
+ "of inactivity", c->self,
From 8bdbf529849b99b93e7e61d71a17ab305b4249c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 3 Feb 2023 09:07:18 +0700
Subject: [PATCH 4/4] openssh: patch for 64-bit
---
srcpkgs/openssh/patches/time_t-32-bit.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openssh/patches/time_t-32-bit.patch b/srcpkgs/openssh/patches/time_t-32-bit.patch
index 31efce4ce1be..55138108b31e 100644
--- a/srcpkgs/openssh/patches/time_t-32-bit.patch
+++ b/srcpkgs/openssh/patches/time_t-32-bit.patch
@@ -5,7 +5,7 @@
c->type == SSH_CHANNEL_OPEN &&
c->inactive_deadline != 0 && c->lastused != 0 &&
- now >= c->lastused + c->inactive_deadline) {
-+ ((long long unsigned)now) >= c->lastused + c->inactive_deadline) {
++ ((u_int64_t)now) >= (u_int64_t)c->lastused + c->inactive_deadline) {
/* channel closed for inactivity */
verbose("channel %d: closing after %u seconds "
"of inactivity", c->self,
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] openssh: update to 9.2p1.
2023-02-02 15:58 [PR PATCH] openssh: update to 9.2p1 leahneukirchen
` (2 preceding siblings ...)
2023-02-03 2:08 ` sgn
@ 2023-02-05 1:31 ` sgn
2023-02-05 3:59 ` sgn
2023-02-07 13:44 ` [PR PATCH] [Merged]: " leahneukirchen
5 siblings, 0 replies; 7+ messages in thread
From: sgn @ 2023-02-05 1:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 489 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/leahneukirchen/void-packages openssh92
https://github.com/void-linux/void-packages/pull/42036
openssh: update to 9.2p1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
Please test!
A patch file from https://github.com/void-linux/void-packages/pull/42036.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openssh92-42036.patch --]
[-- Type: text/x-diff, Size: 3274 bytes --]
From adf1c6da71b96757ea80d9eea7daf1dbd2be3830 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 2 Feb 2023 16:57:27 +0100
Subject: [PATCH 1/2] openssh: update to 9.2p1.
---
srcpkgs/openssh/patches/time_t-32-bit.patch | 11 +++++++++++
srcpkgs/openssh/template | 6 +++---
2 files changed, 14 insertions(+), 3 deletions(-)
create 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
new file mode 100644
index 000000000000..55138108b31e
--- /dev/null
+++ b/srcpkgs/openssh/patches/time_t-32-bit.patch
@@ -0,0 +1,11 @@
+--- openssh-9.2p1.orig/channels.c
++++ openssh-9.2p1/channels.c
+@@ -2558,7 +2558,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) {
++ ((u_int64_t)now) >= (u_int64_t)c->lastused + 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 2eb9f32405e6..3adadcdbac33 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
# Template file for 'openssh'
pkgname=openssh
-version=9.1p1
-revision=2
+version=9.2p1
+revision=1
build_style=gnu-configure
configure_args="--datadir=/usr/share/openssh
--sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
@@ -23,7 +23,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=19f85009c7e3e23787f0236fbb1578392ab4d4bf9f8ec5fe6bc1cd7e8bfdd288
+checksum=3f66dbf1655fb45f50e1c56da62ab01218c228807b21338d634ebcdf9d71cf46
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 6bc5f7e13647671ab3ba7006267290630d867a71 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 2 Feb 2023 16:57:38 +0100
Subject: [PATCH 2/2] gnome-ssh-askpass: update to 9.2p1.
---
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 8b47bd4ca8cb..389516822702 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.1p1
+version=9.2p1
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=19f85009c7e3e23787f0236fbb1578392ab4d4bf9f8ec5fe6bc1cd7e8bfdd288
+checksum=3f66dbf1655fb45f50e1c56da62ab01218c228807b21338d634ebcdf9d71cf46
alternatives="
ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/gnome-ssh-askpass
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] openssh: update to 9.2p1.
2023-02-02 15:58 [PR PATCH] openssh: update to 9.2p1 leahneukirchen
` (3 preceding siblings ...)
2023-02-05 1:31 ` sgn
@ 2023-02-05 3:59 ` sgn
2023-02-07 13:44 ` [PR PATCH] [Merged]: " leahneukirchen
5 siblings, 0 replies; 7+ messages in thread
From: sgn @ 2023-02-05 3:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 489 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/leahneukirchen/void-packages openssh92
https://github.com/void-linux/void-packages/pull/42036
openssh: update to 9.2p1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
Please test!
A patch file from https://github.com/void-linux/void-packages/pull/42036.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openssh92-42036.patch --]
[-- Type: text/x-diff, Size: 3258 bytes --]
From faf234f71178bdd24fcce6dd4a6f6ee03579c4a3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 2 Feb 2023 16:57:27 +0100
Subject: [PATCH 1/2] openssh: update to 9.2p1.
---
srcpkgs/openssh/patches/time_t-32-bit.patch | 11 +++++++++++
srcpkgs/openssh/template | 6 +++---
2 files changed, 14 insertions(+), 3 deletions(-)
create 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
new file mode 100644
index 000000000000..8c11f3714ec6
--- /dev/null
+++ b/srcpkgs/openssh/patches/time_t-32-bit.patch
@@ -0,0 +1,11 @@
+--- openssh-9.2p1.orig/channels.c
++++ openssh-9.2p1/channels.c
+@@ -2558,7 +2558,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 2eb9f32405e6..3adadcdbac33 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
# Template file for 'openssh'
pkgname=openssh
-version=9.1p1
-revision=2
+version=9.2p1
+revision=1
build_style=gnu-configure
configure_args="--datadir=/usr/share/openssh
--sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
@@ -23,7 +23,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=19f85009c7e3e23787f0236fbb1578392ab4d4bf9f8ec5fe6bc1cd7e8bfdd288
+checksum=3f66dbf1655fb45f50e1c56da62ab01218c228807b21338d634ebcdf9d71cf46
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 d4da0780c4eb68b65696196747f03b7d34f22c66 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 2 Feb 2023 16:57:38 +0100
Subject: [PATCH 2/2] gnome-ssh-askpass: update to 9.2p1.
---
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 8b47bd4ca8cb..389516822702 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.1p1
+version=9.2p1
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=19f85009c7e3e23787f0236fbb1578392ab4d4bf9f8ec5fe6bc1cd7e8bfdd288
+checksum=3f66dbf1655fb45f50e1c56da62ab01218c228807b21338d634ebcdf9d71cf46
alternatives="
ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/gnome-ssh-askpass
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Merged]: openssh: update to 9.2p1.
2023-02-02 15:58 [PR PATCH] openssh: update to 9.2p1 leahneukirchen
` (4 preceding siblings ...)
2023-02-05 3:59 ` sgn
@ 2023-02-07 13:44 ` leahneukirchen
5 siblings, 0 replies; 7+ messages in thread
From: leahneukirchen @ 2023-02-07 13:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 335 bytes --]
There's a merged pull request on the void-packages repository
openssh: update to 9.2p1.
https://github.com/void-linux/void-packages/pull/42036
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **on x86_64**
Please test!
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2023-02-07 13:44 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-02 15:58 [PR PATCH] openssh: update to 9.2p1 leahneukirchen
2023-02-02 16:14 ` leahneukirchen
2023-02-03 1:48 ` [PR PATCH] [Updated] " sgn
2023-02-03 2:08 ` sgn
2023-02-05 1:31 ` sgn
2023-02-05 3:59 ` sgn
2023-02-07 13:44 ` [PR PATCH] [Merged]: " leahneukirchen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).