[packages/openssh] up to 10.5p1
atler
atler at pld-linux.org
Sun Aug 16 19:03:55 CEST 2026
commit 4efa501b56761c04ba2c5d2bc5634bba16fe00d7
Author: Jan Palus <atler at pld-linux.org>
Date: Sun Aug 16 19:00:57 2026 +0200
up to 10.5p1
dropped sigpipe patch. if you need it feel free to bring it back in a
way that does not conflict with any current or future upstream toggle
(upstream added -Z in this version with completely different semantics:
https://github.com/openssh/openssh-portable/commit/29f1b46e0f6fb4aba9ae34e4b46532b5748f395e)
gss-opts.patch | 98 --------------------------------------------------
openssh-chroot.patch | 2 +-
openssh-sigpipe.patch | 99 ---------------------------------------------------
openssh.spec | 10 ++----
4 files changed, 4 insertions(+), 205 deletions(-)
---
diff --git a/openssh.spec b/openssh.spec
index b9cdefe..cbbb567 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -36,13 +36,13 @@ Summary(pt_BR.UTF-8): Implementação livre do SSH
Summary(ru.UTF-8): OpenSSH - свободная реализация протокола Secure Shell (SSH)
Summary(uk.UTF-8): OpenSSH - вільна реалізація протоколу Secure Shell (SSH)
Name: openssh
-Version: 10.4p1
-Release: 2
+Version: 10.5p1
+Release: 1
Epoch: 2
License: BSD
Group: Applications/Networking
Source0: https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/%{name}-%{version}.tar.gz
-# Source0-md5: c5fb91ded926b38e8956074cac2cd44f
+# Source0-md5: a95119f402dfa0166c9dd1237239085c
Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
# Source1-md5: 66943d481cc422512b537bcc2c7400d1
Source2: %{name}d.init
@@ -60,7 +60,6 @@ Source14: pld-sshd_config
Patch0: %{name}-no-pty-tests.patch
Patch1: %{name}-tests-reuseport.patch
Patch2: %{name}-pam_misc.patch
-Patch3: %{name}-sigpipe.patch
# http://pkgs.fedoraproject.org/gitweb/?p=openssh.git;a=tree
Patch4: %{name}-ldap.patch
Patch5: %{name}-ldap-fixes.patch
@@ -70,7 +69,6 @@ Patch8: ldap-helper-sigpipe.patch
# High Performance SSH/SCP - HPN-SSH - http://www.psc.edu/networking/projects/hpn-ssh/
# http://www.psc.edu/networking/projects/hpn-ssh/openssh-5.2p1-hpn13v6.diff.gz
Patch9: %{name}-5.2p1-hpn13v6.diff
-Patch10: gss-opts.patch
Patch11: %{name}-chroot.patch
Patch13: %{name}-skip-interop-tests.patch
@@ -544,7 +542,6 @@ openldap-a.
%patch -P0 -p1
%patch -P1 -p1
%patch -P2 -p1
-%patch -P3 -p1
%patch -P4 -p1
%patch -P5 -p1
%patch -P6 -p1
@@ -553,7 +550,6 @@ openldap-a.
%{?with_hpn:%patch -P9 -p1}
-%patch -P10 -p1
%patch -P11 -p1
%patch -P13 -p1
diff --git a/gss-opts.patch b/gss-opts.patch
deleted file mode 100644
index b948599..0000000
--- a/gss-opts.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From c147093565634eae9f91e4df99e04a6b3513f9c6 Mon Sep 17 00:00:00 2001
-From: "djm at openbsd.org" <djm at openbsd.org>
-Date: Tue, 7 Jul 2026 01:00:22 +0000
-Subject: [PATCH] upstream: fix GSSAPI option names, that I somehow screwed up
- while
-
-refactoring servconf.c bz3974 patch from Colin Watson
-
-OpenBSD-Commit-ID: be39ad3dbe36d9ecdb86f3811da5dfbdc9bcb1e6
----
- servconf.c | 18 +++++++++---------
- servconf.h | 18 +++++++++---------
- 2 files changed, 18 insertions(+), 18 deletions(-)
-
-diff --git a/servconf.c b/servconf.c
-index ce388f1dd93f..9b443bea0673 100644
---- a/servconf.c
-+++ b/servconf.c
-@@ -1,4 +1,4 @@
--/* $OpenBSD: servconf.c,v 1.450 2026/06/29 08:59:31 djm Exp $ */
-+/* $OpenBSD: servconf.c,v 1.451 2026/07/07 01:00:22 djm Exp $ */
- /*
- * Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
- * All rights reserved
-@@ -1433,19 +1433,19 @@ process_server_config_line_depth(ServerOptions *options, char *line,
- #endif /* KRB5 */
-
- #ifdef GSSAPI
-- case sGssAuthentication:
-+ case sGSSAPIAuthentication:
- intptr = &options->gss_authentication;
- goto parse_flag;
-
-- case sGssCleanupCreds:
-+ case sGSSAPICleanupCredentials:
- intptr = &options->gss_cleanup_creds;
- goto parse_flag;
-
-- case sGssDelegateCreds:
-+ case sGSSAPIDelegateCredentials:
- intptr = &options->gss_deleg_creds;
- goto parse_flag;
-
-- case sGssStrictAcceptor:
-+ case sGSSAPIStrictAcceptorCheck:
- intptr = &options->gss_strict_acceptor;
- goto parse_flag;
- #endif /* GSSAPI */
-@@ -4215,10 +4215,10 @@ dump_config(ServerOptions *o)
- # endif
- #endif
- #ifdef GSSAPI
-- dump_cfg_fmtint(sGssAuthentication, o->gss_authentication);
-- dump_cfg_fmtint(sGssCleanupCreds, o->gss_cleanup_creds);
-- dump_cfg_fmtint(sGssDelegateCreds, o->gss_deleg_creds);
-- dump_cfg_fmtint(sGssStrictAcceptor, o->gss_strict_acceptor);
-+ dump_cfg_fmtint(sGSSAPIAuthentication, o->gss_authentication);
-+ dump_cfg_fmtint(sGSSAPICleanupCredentials, o->gss_cleanup_creds);
-+ dump_cfg_fmtint(sGSSAPIDelegateCredentials, o->gss_deleg_creds);
-+ dump_cfg_fmtint(sGSSAPIStrictAcceptorCheck, o->gss_strict_acceptor);
- #endif
- dump_cfg_fmtint(sPasswordAuthentication, o->password_authentication);
- dump_cfg_fmtint(sKbdInteractiveAuthentication,
-diff --git a/servconf.h b/servconf.h
-index 9e64e4673743..a2345e88a461 100644
---- a/servconf.h
-+++ b/servconf.h
-@@ -1,4 +1,4 @@
--/* $OpenBSD: servconf.h,v 1.177 2026/05/31 11:30:50 djm Exp $ */
-+/* $OpenBSD: servconf.h,v 1.179 2026/07/07 01:00:22 djm Exp $ */
-
- /*
- * Author: Tatu Ylonen <ylo at cs.hut.fi>
-@@ -314,16 +314,16 @@ SSHCONF_UNSUPPORTED_INT(kerberos_get_afs_token, KerberosGetAFSToken, SSHCFG_GLOB
-
- #ifdef GSSAPI
- #define SSHD_CONFIG_ENTRIES_GSS \
--SSHCONF_INTFLAG(gss_authentication, GssAuthentication, SSHCFG_ALL, 0, SSHCFG_COPY_MATCH) \
--SSHCONF_INTFLAG(gss_cleanup_creds, GssCleanupCreds, SSHCFG_GLOBAL, 1, SSHCFG_COPY_NONE) \
--SSHCONF_INTFLAG(gss_deleg_creds, GssDelegateCreds, SSHCFG_GLOBAL, 1, SSHCFG_COPY_NONE) \
--SSHCONF_INTFLAG(gss_strict_acceptor, GssStrictAcceptor, SSHCFG_GLOBAL, 1, SSHCFG_COPY_NONE)
-+SSHCONF_INTFLAG(gss_authentication, GSSAPIAuthentication, SSHCFG_ALL, 0, SSHCFG_COPY_MATCH) \
-+SSHCONF_INTFLAG(gss_cleanup_creds, GSSAPICleanupCredentials, SSHCFG_GLOBAL, 1, SSHCFG_COPY_NONE) \
-+SSHCONF_INTFLAG(gss_deleg_creds, GSSAPIDelegateCredentials, SSHCFG_GLOBAL, 1, SSHCFG_COPY_NONE) \
-+SSHCONF_INTFLAG(gss_strict_acceptor, GSSAPIStrictAcceptorCheck, SSHCFG_GLOBAL, 1, SSHCFG_COPY_NONE)
- #else /* GSSAPI */
- #define SSHD_CONFIG_ENTRIES_GSS \
--SSHCONF_UNSUPPORTED_INT(gss_authentication, GssAuthentication, SSHCFG_ALL) \
--SSHCONF_UNSUPPORTED_INT(gss_cleanup_creds, GssCleanupCreds, SSHCFG_GLOBAL) \
--SSHCONF_UNSUPPORTED_INT(gss_deleg_creds, GssDelegateCreds, SSHCFG_GLOBAL) \
--SSHCONF_UNSUPPORTED_INT(gss_strict_acceptor, GssStrictAcceptor, SSHCFG_GLOBAL)
-+SSHCONF_UNSUPPORTED_INT(gss_authentication, GSSAPIAuthentication, SSHCFG_ALL) \
-+SSHCONF_UNSUPPORTED_INT(gss_cleanup_creds, GSSAPICleanupCredentials, SSHCFG_GLOBAL) \
-+SSHCONF_UNSUPPORTED_INT(gss_deleg_creds, GSSAPIDelegateCredentials, SSHCFG_GLOBAL) \
-+SSHCONF_UNSUPPORTED_INT(gss_strict_acceptor, GSSAPIStrictAcceptorCheck, SSHCFG_GLOBAL)
- #endif /* GSSAPI */
-
- #define SSHD_CONFIG_ENTRIES \
diff --git a/openssh-chroot.patch b/openssh-chroot.patch
index 3c29e2a..e94e0dc 100644
--- a/openssh-chroot.patch
+++ b/openssh-chroot.patch
@@ -23,7 +23,7 @@
#ifdef USE_PAM
@@ -280,6 +281,14 @@ SSHCONF_UNSUPPORTED_INT(use_pam, UsePAM,
- SSHCONF_UNSUPPORTED_STRING(pam_service_name, PAMServiceName, SSHCFG_GLOBAL)
+ SSHCONF_UNSUPPORTED_STRING(pam_service_name, PAMServiceName, SSHCFG_ALL)
#endif
+#ifdef CHROOT
diff --git a/openssh-sigpipe.patch b/openssh-sigpipe.patch
deleted file mode 100644
index 8991ecc..0000000
--- a/openssh-sigpipe.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff -urNp -x '*.orig' openssh-8.4p1.org/clientloop.c openssh-8.4p1/clientloop.c
---- openssh-8.4p1.org/clientloop.c 2020-09-27 09:25:01.000000000 +0200
-+++ openssh-8.4p1/clientloop.c 2021-03-01 11:29:10.909905265 +0100
-@@ -127,6 +127,9 @@ extern int fork_after_authentication_fla
- /* Control socket */
- extern int muxserver_sock; /* XXX use mux_client_cleanup() instead */
-
-+/* if we process SIGPIPE */
-+extern int enable_sigpipe;
-+
- /*
- * Name of the host we are connecting to. This is the name given on the
- * command line, or the Hostname specified for the user-supplied name in a
-@@ -1518,6 +1518,8 @@ client_loop(struct ssh *ssh, int have_pt
- ssh_signal(SIGQUIT, signal_handler);
- if (ssh_signal(SIGTERM, SIG_IGN) != SIG_IGN)
- ssh_signal(SIGTERM, signal_handler);
-+ if (enable_sigpipe)
-+ ssh_signal(SIGPIPE, signal_handler);
- ssh_signal(SIGWINCH, window_change_handler);
- #ifdef SIGINFO
- ssh_signal(SIGINFO, siginfo_handler);
-diff -urNp -x '*.orig' openssh-8.4p1.org/ssh.0 openssh-8.4p1/ssh.0
---- openssh-8.4p1.org/ssh.0 2020-09-27 09:42:10.000000000 +0200
-+++ openssh-8.4p1/ssh.0 2021-03-01 11:29:10.909905265 +0100
-@@ -446,6 +446,8 @@ DESCRIPTION
- -y Send log information using the syslog(3) system module. By
- default this information is sent to stderr.
-
-+ -Z Enable SIGPIPE processing.
-+
- ssh may additionally obtain configuration data from a per-user
- configuration file and a system-wide configuration file. The file format
- and configuration options are described in ssh_config(5).
-diff -urNp -x '*.orig' openssh-8.4p1.org/ssh.1 openssh-8.4p1/ssh.1
---- openssh-8.4p1.org/ssh.1 2020-09-27 09:25:01.000000000 +0200
-+++ openssh-8.4p1/ssh.1 2021-03-01 11:29:10.909905265 +0100
-@@ -42,7 +42,7 @@
- .Nd OpenSSH remote login client
- .Sh SYNOPSIS
- .Nm ssh
--.Op Fl 46AaCfGgKkMNnqsTtVvXxYy
-+.Op Fl 46AaCfGgKkMNnqsTtVvXxYyZ
- .Op Fl B Ar bind_interface
- .Op Fl b Ar bind_address
- .Op Fl c Ar cipher_spec
-@@ -142,6 +142,11 @@ on the local machine as the source addre
- of the connection.
- Only useful on systems with more than one address.
- .Pp
-+.It Fl Z
-+Enables processing of SIGPIPE. Useful when using ssh output as input for
-+another process, for example in a shell script. Be careful - it may break
-+port/X11 forwarding when used.
-+.Pp
- .It Fl C
- Requests compression of all data (including stdin, stdout, stderr, and
- data for forwarded X11, TCP and
-diff -urNp -x '*.orig' openssh-8.4p1.org/ssh.c openssh-8.4p1/ssh.c
---- openssh-8.4p1.org/ssh.c 2020-09-27 09:25:01.000000000 +0200
-+++ openssh-8.4p1/ssh.c 2021-03-01 11:29:10.909905265 +0100
-@@ -190,6 +190,9 @@ struct sshbuf *command;
- /* command to be executed */
- struct sshbuf *command;
-
-+/* Enable sigpipe */
-+int enable_sigpipe = 0;
-+
- /* # of replies received for global requests */
- static int forward_confirms_pending = -1;
-
-@@ -203,7 +206,7 @@ static void
- usage(void)
- {
- fprintf(stderr,
--"usage: ssh [-46AaCfGgKkMNnqsTtVvXxYy] [-B bind_interface] [-b bind_address]\n"
-+"usage: ssh [-46AaCfGgKkMNnqsTtVvXxYyZ] [-B bind_interface] [-b bind_address]\n"
- " [-c cipher_spec] [-D [bind_address:]port] [-E log_file]\n"
- " [-e escape_char] [-F configfile] [-I pkcs11] [-i identity_file]\n"
- " [-J destination] [-L address] [-l login_name] [-m mac_spec]\n"
-@@ -699,7 +699,7 @@ main(int ac, char **av)
-
- again:
- while ((opt = getopt(ac, av, "1246ab:c:e:fgi:kl:m:no:p:qstvx"
-- "AB:CD:E:F:GI:J:KL:MNO:P:Q:R:S:TVw:W:XYy")) != -1) { /* HUZdhjruz */
-+ "AB:CD:E:F:GI:J:KL:MNO:P:Q:R:S:TVw:W:XYyZ")) != -1) { /* HUZdhjruz */
- switch (opt) {
- case '1':
- fatal("SSH protocol v.1 is no longer supported");
-@@ -1066,6 +1069,9 @@ main(int ac, char **av)
- case 'F':
- config = optarg;
- break;
-+ case 'Z':
-+ enable_sigpipe = 1;
-+ break;
- default:
- usage();
- }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/openssh.git/commitdiff/4efa501b56761c04ba2c5d2bc5634bba16fe00d7
More information about the pld-cvs-commit
mailing list