Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

openssh ver. bump

Browse Source
This commit is contained in:
Rmys
2025-10-10 11:36:01 +03:00
parent 6b99c09778
commit f0a98f15ae
2 changed files with 82 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/openssh/files/beae06f.patch
+73
View File
@@ -0,0 +1,73 @@
From beae06f56e0d0a66ca535896149d5fb0b2e8a1b4 Mon Sep 17 00:00:00 2001
From: "djm@openbsd.org" <djm@openbsd.org>
Date: Tue, 7 Oct 2025 08:02:32 +0000
Subject: [PATCH] upstream: don't reuse c->isatty for signalling that the
remote channel
has a tty attached as this causes side effects, e.g. in channel_handle_rfd().
bz3872
ok markus@
OpenBSD-Commit-ID: 4cd8a9f641498ca6089442e59bad0fd3dcbe85f8
---
channels.c | 9 +++++----
channels.h | 3 ++-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/channels.c b/channels.c
index f1d7bcf345b..80014ff341f 100644
--- a/channels.c
+++ b/channels.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.c,v 1.451 2025/09/25 06:33:19 djm Exp $ */
+/* $OpenBSD: channels.c,v 1.452 2025/10/07 08:02:32 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -362,7 +362,7 @@ channel_classify(struct ssh *ssh, Channel *c)
{
struct ssh_channels *sc = ssh->chanctxt;
const char *type = c->xctype == NULL ? c->ctype : c->xctype;
- const char *classifier = c->isatty ?
+ const char *classifier = (c->isatty || c->remote_has_tty) ?
sc->bulk_classifier_tty : sc->bulk_classifier_notty;
c->bulk = type != NULL && match_pattern_list(type, classifier, 0) == 1;
@@ -566,7 +566,7 @@ channel_new(struct ssh *ssh, char *ctype, int type, int rfd, int wfd, int efd,
void
channel_set_tty(struct ssh *ssh, Channel *c)
{
- c->isatty = 1;
+ c->remote_has_tty = 1;
channel_classify(ssh, c);
}
@@ -1078,7 +1078,8 @@ channel_format_status(const Channel *c)
c->rfd, c->wfd, c->efd, c->sock, c->ctl_chan,
c->have_ctl_child_id ? "c" : "nc", c->ctl_child_id,
c->io_want, c->io_ready,
- c->isatty ? "T" : "", c->bulk ? "B" : "I");
+ c->isatty ? "T" : (c->remote_has_tty ? "RT" : ""),
+ c->bulk ? "B" : "I");
return ret;
}
diff --git a/channels.h b/channels.h
index df7c7f364d2..7456541f8ce 100644
--- a/channels.h
+++ b/channels.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.h,v 1.161 2025/09/25 06:33:19 djm Exp $ */
+/* $OpenBSD: channels.h,v 1.162 2025/10/07 08:02:32 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -145,6 +145,7 @@ struct Channel {
int ctl_chan; /* control channel (multiplexed connections) */
uint32_t ctl_child_id; /* child session for mux controllers */
int have_ctl_child_id;/* non-zero if ctl_child_id is valid */
+ int remote_has_tty; /* remote side has a tty */
int isatty; /* rfd is a tty */
#ifdef _AIX
int wfd_isatty; /* wfd is a tty */
server/openssh/pspec.xml
+9 -2
View File
@@ -13,7 +13,7 @@
<IsA>service</IsA>
<Summary>Port of OpenBSD's free SSH release</Summary>
<Description>OpenSSH is a FREE version of the SSH connectivity tools that technical users of the Internet rely on. Users of telnet, rlogin, and ftp may not realize that their password is transmitted across the Internet unencrypted, but it is. OpenSSH encrypts all traffic (including passwords) to effectively eliminate eavesdropping, connection hijacking, and other attacks.</Description>
<Archive sha1sum="ac4205e827aea383bf316a33a0e2d5b66b85fcf8" type="targz">https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-10.0p1.tar.gz</Archive>
<Archive sha1sum="7fd17b99d1beffb47cd380d64079e920bb0bd91f" type="targz">https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-10.1p1.tar.gz</Archive>
<BuildDependencies>
<Dependency>libedit-devel</Dependency>
<Dependency>zlib-devel</Dependency>
@@ -24,7 +24,7 @@
<Dependency>e2fsprogs-devel</Dependency>
</BuildDependencies>
<Patches>
<!-- <Patch>curve25519pad.patch</Patch> -->
<Patch level="1">beae06f.patch</Patch>
</Patches>
</Source>
@@ -58,6 +58,13 @@
</Package>
<History>
<Update release="20">
<Date>2025-10-10</Date>
<Version>10.1.1</Version>
<Comment>Version bump.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="19">
<Date>2025-07-19</Date>
<Version>10.0.1</Version>