diff options
Diffstat (limited to 'security/openssh-portable')
| -rw-r--r-- | security/openssh-portable/Makefile | 8 | ||||
| -rw-r--r-- | security/openssh-portable/distinfo | 10 | ||||
| -rw-r--r-- | security/openssh-portable/files/patch-upstream-beae06f56e0d0a66ca535896149d5fb0b2e8a1b4 | 73 |
3 files changed, 9 insertions, 82 deletions
diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile index d8be89255105..f36d91c12c4a 100644 --- a/security/openssh-portable/Makefile +++ b/security/openssh-portable/Makefile @@ -1,6 +1,6 @@ PORTNAME= openssh -DISTVERSION= 10.1p1 -PORTREVISION= 5 +DISTVERSION= 10.2p1 +PORTREVISION= 0 PORTEPOCH= 1 CATEGORIES= security MASTER_SITES= OPENBSD/OpenSSH/portable @@ -116,13 +116,13 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-hpn-gss-glue . endif # - See https://sources.debian.org/data/main/o/openssh/ for which subdir to # pull from. -GSSAPI_DEBIAN_VERSION= 10.1p1 +GSSAPI_DEBIAN_VERSION= 10.2p1 GSSAPI_DEBIAN_SUBDIR= ${GSSAPI_DEBIAN_VERSION:U${DISTVERSION}}-1 # - Debian does not use a versioned filename so we trick fetch to make one for # us with the ?<anything>=/ trick. PATCH_SITES+= https://sources.debian.org/data/main/o/openssh/1:${GSSAPI_DEBIAN_SUBDIR}/debian/patches/gssapi.patch?dummy=/:gsskex # Bump this when updating the patch location -GSSAPI_DISTVERSION= 10.1p1 +GSSAPI_DISTVERSION= 10.2p1 PATCHFILES+= openssh-${GSSAPI_DISTVERSION:U${DISTVERSION}}-gsskex-all-debian-rh-${GSSAPI_DISTVERSION}.patch:-p1:gsskex EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gssapi-kexgssc.c EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gssapi-kexgsss.c diff --git a/security/openssh-portable/distinfo b/security/openssh-portable/distinfo index cef52e80ff85..6aa27b76a8c8 100644 --- a/security/openssh-portable/distinfo +++ b/security/openssh-portable/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1759963002 -SHA256 (openssh-10.1p1.tar.gz) = b9fc7a2b82579467a6f2f43e4a81c8e1dfda614ddb4f9b255aafd7020bbf0758 -SIZE (openssh-10.1p1.tar.gz) = 1972831 -SHA256 (openssh-10.1p1-gsskex-all-debian-rh-10.1p1.patch) = b46e798092ea4e0653ea5e124b10a881f58b2e78a16b3e46475c52c39b725874 -SIZE (openssh-10.1p1-gsskex-all-debian-rh-10.1p1.patch) = 126336 +TIMESTAMP = 1760240447 +SHA256 (openssh-10.2p1.tar.gz) = ccc42c0419937959263fa1dbd16dafc18c56b984c03562d2937ce56a60f798b2 +SIZE (openssh-10.2p1.tar.gz) = 1974519 +SHA256 (openssh-10.2p1-gsskex-all-debian-rh-10.2p1.patch) = a02ab012657477a85dc7e4dca90a568ff5f13199221cda888608e9d0290454a0 +SIZE (openssh-10.2p1-gsskex-all-debian-rh-10.2p1.patch) = 126336 diff --git a/security/openssh-portable/files/patch-upstream-beae06f56e0d0a66ca535896149d5fb0b2e8a1b4 b/security/openssh-portable/files/patch-upstream-beae06f56e0d0a66ca535896149d5fb0b2e8a1b4 deleted file mode 100644 index e9cb994331ab..000000000000 --- a/security/openssh-portable/files/patch-upstream-beae06f56e0d0a66ca535896149d5fb0b2e8a1b4 +++ /dev/null @@ -1,73 +0,0 @@ -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 ---- channels.c -+++ 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 ---- channels.h -+++ 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 */ |