diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 14:43:04 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 14:43:04 +0000 |
commit | 29ad7111f49ff23e3c7e82f5de5f8a764826067e (patch) | |
tree | 7d4c6311b73e75cdc4d11731849cffe30555ef1b /debian/patches/progress-linux/0006-mptcp-manpages.patch | |
parent | Adding patches from Colin Evrard <colin.evrard.134@gmail.com> for optional Mu... (diff) | |
download | openssh-29ad7111f49ff23e3c7e82f5de5f8a764826067e.tar.xz openssh-29ad7111f49ff23e3c7e82f5de5f8a764826067e.zip |
Refreshing mptcp patches.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/progress-linux/0006-mptcp-manpages.patch')
-rw-r--r-- | debian/patches/progress-linux/0006-mptcp-manpages.patch | 45 |
1 files changed, 20 insertions, 25 deletions
diff --git a/debian/patches/progress-linux/0006-mptcp-manpages.patch b/debian/patches/progress-linux/0006-mptcp-manpages.patch index 7c3bc69..1d0203e 100644 --- a/debian/patches/progress-linux/0006-mptcp-manpages.patch +++ b/debian/patches/progress-linux/0006-mptcp-manpages.patch @@ -2,11 +2,10 @@ Author: mpostaire <maxime_postaire@hotmail.fr> Description: Add the UseMPTCP config option to the manpages. https://github.com/openssh/openssh-portable/pull/335 -diff --git a/scp.1 b/scp.1 -index 2e96e201..4e941a37 100644 ---- a/scp.1 -+++ b/scp.1 -@@ -219,6 +219,7 @@ For full details of the options listed below, and their possible values, see +diff -Naurp openssh.orig/scp.1 openssh/scp.1 +--- openssh.orig/scp.1 ++++ openssh/scp.1 +@@ -220,6 +220,7 @@ For full details of the options listed b .It StrictHostKeyChecking .It TCPKeepAlive .It UpdateHostKeys @@ -14,11 +13,10 @@ index 2e96e201..4e941a37 100644 .It User .It UserKnownHostsFile .It VerifyHostKeyDNS -diff --git a/sftp.1 b/sftp.1 -index 39e7d6ed..291dbf60 100644 ---- a/sftp.1 -+++ b/sftp.1 -@@ -278,6 +278,7 @@ For full details of the options listed below, and their possible values, see +diff -Naurp openssh.orig/sftp.1 openssh/sftp.1 +--- openssh.orig/sftp.1 ++++ openssh/sftp.1 +@@ -282,6 +282,7 @@ For full details of the options listed b .It StrictHostKeyChecking .It TCPKeepAlive .It UpdateHostKeys @@ -26,11 +24,10 @@ index 39e7d6ed..291dbf60 100644 .It User .It UserKnownHostsFile .It VerifyHostKeyDNS -diff --git a/ssh.1 b/ssh.1 -index b4956aec..a81c3008 100644 ---- a/ssh.1 -+++ b/ssh.1 -@@ -584,6 +584,7 @@ For full details of the options listed below, and their possible values, see +diff -Naurp openssh.orig/ssh.1 openssh/ssh.1 +--- openssh.orig/ssh.1 ++++ openssh/ssh.1 +@@ -593,6 +593,7 @@ For full details of the options listed b .It Tunnel .It TunnelDevice .It UpdateHostKeys @@ -38,11 +35,10 @@ index b4956aec..a81c3008 100644 .It User .It UserKnownHostsFile .It VerifyHostKeyDNS -diff --git a/ssh_config.5 b/ssh_config.5 -index 24a46460..56094449 100644 ---- a/ssh_config.5 -+++ b/ssh_config.5 -@@ -1930,6 +1930,12 @@ Presently, only +diff -Naurp openssh.orig/ssh_config.5 openssh/ssh_config.5 +--- openssh.orig/ssh_config.5 ++++ openssh/ssh_config.5 +@@ -2084,6 +2084,12 @@ Presently, only from OpenSSH 6.8 and greater support the .Qq hostkeys@openssh.com protocol extension used to inform the client of all the server's hostkeys. @@ -55,11 +51,10 @@ index 24a46460..56094449 100644 .It Cm User Specifies the user to log in as. This can be useful when a different user name is used on different machines. -diff --git a/sshd_config.5 b/sshd_config.5 -index 867a747d..6c2dd1f7 100644 ---- a/sshd_config.5 -+++ b/sshd_config.5 -@@ -1752,6 +1752,12 @@ and +diff -Naurp openssh.orig/sshd_config.5 openssh/sshd_config.5 +--- openssh.orig/sshd_config.5 ++++ openssh/sshd_config.5 +@@ -1906,6 +1906,12 @@ and .Cm Match .Cm Host directives. |