Refreshing mptcp-support.patch.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 18 insertions, 18 deletions

diff --git a/debian/patches/progress-linux/0004-mptcp-support.patch b/debian/patches/progress-linux/0004-mptcp-support.patch
index d033727..13241e5 100644
--- a/debian/patches/progress-linux/0004-mptcp-support.patch
+++ b/debian/patches/progress-linux/0004-mptcp-support.patch
@@ -22,7 +22,7 @@ diff -Naurp openssh.orig/readconf.c openssh/readconf.c
  
  	{ NULL, oBadOption }
  };
-@@ -2410,6 +2411,10 @@ parse_pubkey_algos:
+@@ -2445,6 +2446,10 @@ parse_pubkey_algos:
  		}
  		break;
  
@@ -33,7 +33,7 @@ diff -Naurp openssh.orig/readconf.c openssh/readconf.c
  	case oDeprecated:
  		debug("%s line %d: Deprecated option \"%s\"",
  		    filename, linenum, keyword);
-@@ -2669,6 +2674,7 @@ initialize_options(Options * options)
+@@ -2706,6 +2711,7 @@ initialize_options(Options * options)
  	options->tag = NULL;
  	options->channel_timeouts = NULL;
  	options->num_channel_timeouts = 0;
@@ -41,7 +41,7 @@ diff -Naurp openssh.orig/readconf.c openssh/readconf.c
  }
  
  /*
-@@ -2873,6 +2879,8 @@ fill_default_options(Options * options)
+@@ -2912,6 +2918,8 @@ fill_default_options(Options * options)
  		options->canonicalize_hostname = SSH_CANONICALISE_NO;
  	if (options->fingerprint_hash == -1)
  		options->fingerprint_hash = SSH_FP_HASH_DEFAULT;
@@ -50,7 +50,7 @@ diff -Naurp openssh.orig/readconf.c openssh/readconf.c
  #ifdef ENABLE_SK_INTERNAL
  	if (options->sk_provider == NULL)
  		options->sk_provider = xstrdup("internal");
-@@ -3601,6 +3609,7 @@ dump_client_config(Options *o, const cha
+@@ -3640,6 +3648,7 @@ dump_client_config(Options *o, const cha
  	dump_cfg_fmtint(oVisualHostKey, o->visual_host_key);
  	dump_cfg_fmtint(oUpdateHostkeys, o->update_hostkeys);
  	dump_cfg_fmtint(oEnableEscapeCommandline, o->enable_escape_commandline);
@@ -72,16 +72,16 @@ diff -Naurp openssh.orig/readconf.h openssh/readconf.h
 diff -Naurp openssh.orig/servconf.c openssh/servconf.c
 --- openssh.orig/servconf.c
 +++ openssh/servconf.c
-@@ -202,6 +202,7 @@ initialize_server_options(ServerOptions
- 	options->num_channel_timeouts = 0;
+@@ -218,6 +218,7 @@ initialize_server_options(ServerOptions
  	options->unused_connection_timeout = -1;
+ 	options->sshd_session_path = NULL;
  	options->debian_banner = -1;
 +	options->use_mptcp = -1;
  }
  
  /* Returns 1 if a string option is unset or set to "none" or 0 otherwise. */
-@@ -462,6 +463,8 @@ fill_default_server_options(ServerOption
- 		options->unused_connection_timeout = 0;
+@@ -504,6 +505,8 @@ fill_default_server_options(ServerOption
+ 		options->sshd_session_path = xstrdup(_PATH_SSHD_SESSION);
  	if (options->debian_banner == -1)
  		options->debian_banner = 1;
 +	if (options->use_mptcp == -1)
@@ -89,24 +89,24 @@ diff -Naurp openssh.orig/servconf.c openssh/servconf.c
  
  	assemble_algorithms(options);
  
-@@ -548,7 +551,7 @@ typedef enum {
- 	sExposeAuthInfo, sRDomain, sPubkeyAuthOptions, sSecurityKeyProvider,
+@@ -589,7 +592,7 @@ typedef enum {
  	sRequiredRSASize, sChannelTimeout, sUnusedConnectionTimeout,
+ 	sSshdSessionPath,
  	sDebianBanner,
 -	sDeprecated, sIgnore, sUnsupported
 +	sDeprecated, sIgnore, sUnsupported, sUseMPTCP
  } ServerOpCodes;
  
  #define SSHCFG_GLOBAL		0x01	/* allowed in main section of config */
-@@ -722,6 +725,7 @@ static struct {
- 	{ "channeltimeout", sChannelTimeout, SSHCFG_ALL },
+@@ -768,6 +771,7 @@ static struct {
  	{ "unusedconnectiontimeout", sUnusedConnectionTimeout, SSHCFG_ALL },
+ 	{ "sshdsessionpath", sSshdSessionPath, SSHCFG_GLOBAL },
  	{ "debianbanner", sDebianBanner, SSHCFG_GLOBAL },
 +	{ "usemptcp", sUseMPTCP, SSHCFG_GLOBAL},
  	{ NULL, sBadOption, 0 }
  };
  
-@@ -2593,6 +2597,10 @@ process_server_config_line_depth(ServerO
+@@ -2711,6 +2715,10 @@ process_server_config_line_depth(ServerO
  		intptr = &options->debian_banner;
  		goto parse_flag;
  
@@ -117,7 +117,7 @@ diff -Naurp openssh.orig/servconf.c openssh/servconf.c
  	case sDeprecated:
  	case sIgnore:
  	case sUnsupported:
-@@ -3141,6 +3149,7 @@ dump_config(ServerOptions *o)
+@@ -3261,6 +3269,7 @@ dump_config(ServerOptions *o)
  	dump_cfg_fmtint(sFingerprintHash, o->fingerprint_hash);
  	dump_cfg_fmtint(sExposeAuthInfo, o->expose_userauth_info);
  	dump_cfg_fmtint(sDebianBanner, o->debian_banner);
@@ -128,8 +128,8 @@ diff -Naurp openssh.orig/servconf.c openssh/servconf.c
 diff -Naurp openssh.orig/servconf.h openssh/servconf.h
 --- openssh.orig/servconf.h
 +++ openssh/servconf.h
-@@ -238,6 +238,7 @@ typedef struct {
- 	int	unused_connection_timeout;
+@@ -253,6 +253,7 @@ typedef struct {
+ 	char   *sshd_session_path;
  
  	int	debian_banner;
 +	int	use_mptcp;
@@ -149,7 +149,7 @@ diff -Naurp openssh.orig/ssh_config openssh/ssh_config
 diff -Naurp openssh.orig/sshconnect.c openssh/sshconnect.c
 --- openssh.orig/sshconnect.c
 +++ openssh/sshconnect.c
-@@ -358,7 +358,10 @@ ssh_create_socket(struct addrinfo *ai)
+@@ -359,7 +359,10 @@ ssh_create_socket(struct addrinfo *ai)
  #endif
  	char ntop[NI_MAXHOST];
  
@@ -164,7 +164,7 @@ diff -Naurp openssh.orig/sshconnect.c openssh/sshconnect.c
 diff -Naurp openssh.orig/sshd.c openssh/sshd.c
 --- openssh.orig/sshd.c
 +++ openssh/sshd.c
-@@ -1092,8 +1092,13 @@ listen_on_addrs(struct listenaddr *la)
+@@ -847,8 +847,13 @@ listen_on_addrs(struct listenaddr *la)
  			continue;
  		}
  		/* Create socket for listening. */