From: Sergey Matveev Date: Fri, 10 Oct 2025 19:12:52 +0000 (+0300) Subject: Update OpenSSH X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;ds=inline;p=bass.git Update OpenSSH --- diff --git a/build/distfiles/.gitignore b/build/distfiles/.gitignore index 02ae767..0e0ca3c 100644 --- a/build/distfiles/.gitignore +++ b/build/distfiles/.gitignore @@ -199,7 +199,7 @@ /oniguruma-v6.9.9.tar.zst /oniguruma.git/ /openjpeg-2.5.2.tar.gz -/openssh-10.1p1.tar.gz +/openssh-10.2p1.tar.gz /openssl-1.1.1w.tar.gz /openvpn-2.6.13.tar.gz /opus-1.5.2.tar.gz diff --git a/build/distfiles/openssh-10.2p1.tar.gz.meta4 b/build/distfiles/openssh-10.2p1.tar.gz.meta4 new file mode 100644 index 0000000..dde6ea7 --- /dev/null +++ b/build/distfiles/openssh-10.2p1.tar.gz.meta4 @@ -0,0 +1,34 @@ + + + + 33f19bcecf5641fd65b9d76050e70a57eeee644ea8ca60b0a84508c6aa994550 + 8c031b10b1642e21b46f7d1db84ba42692e378a54af3d8e5b5c8706c3a0a06d442a02ed8803063121e7ff325ea275cad4432b9eaa6a7f47a4d7cfad504953ab6 + 8b94f139a04170e8919d96f981e932e66aae4edfe0995a9600308b562aa578de + 6f3362378a796d88c906b2e8831e3bee2556dbd678a739e1c91096d1f2b8bf24479f9017e5802830ce7cd204f0968cda53376a8345641f4deb85d9610eaef2f5 + 66f3dd646179e71aaf41c33b6f14a207dc873d71d24f11c130a89dee317ee45398b818e5b94887b5913240964a38630d7bca3e481e0f1eff2e41d9e1cfdbdfc5 + ccc42c0419937959263fa1dbd16dafc18c56b984c03562d2937ce56a60f798b2 + 5811d81c46358aa902564fa90d86247dda4ef8bbc2a72bec2651fddd32466ba7ea9618a33fa754f9a857cebde0a96fcdce0c313201b035c976491d3ca5660e56 + 425a818f5dfd0b3d104ea799509f2e3e5db8b98e2788d8346027d7748ce9a524 + e53270ae9ad3128f50ef43fd7d2eec51 + + 1974519 + https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-10.2p1.tar.gz + + diff --git a/build/skel/security/openssh-10.1p1-tty-fix.patch b/build/skel/security/openssh-10.1p1-tty-fix.patch deleted file mode 100644 index 21deb85..0000000 --- a/build/skel/security/openssh-10.1p1-tty-fix.patch +++ /dev/null @@ -1,69 +0,0 @@ -commit beae06f56e0d0a66ca535896149d5fb0b2e8a1b4 -Author: djm@openbsd.org -Date: Tue Oct 7 08:02:32 2025 +0000 - - 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 - -diff --git a/channels.c b/channels.c -index f1d7bcf34..80014ff34 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 - * Copyright (c) 1995 Tatu Ylonen , 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 df7c7f364..7456541f8 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 -@@ -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 */ diff --git a/build/skel/security/openssh-10.1p1.do b/build/skel/security/openssh-10.2p1.do similarity index 91% rename from build/skel/security/openssh-10.1p1.do rename to build/skel/security/openssh-10.2p1.do index fd356ee..52b7461 100644 --- a/build/skel/security/openssh-10.1p1.do +++ b/build/skel/security/openssh-10.2p1.do @@ -12,7 +12,6 @@ $TAR xf "$DISTFILES"/$NAME.tar.gz "$BASS_ROOT"/bin/rm-r "$SKELBINS"/$ARCH/$NAME-$hsh cd $NAME -patch <"$BASS_ROOT"/build/skel/security/openssh-10.1p1-tty-fix.patch >&2 ./configure --prefix="$SKELBINS"/$ARCH/$NAME-$hsh \ --disable-security-key \ --disable-pkcs11 \