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/0007-mptcp-headers.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/0007-mptcp-headers.patch')
| -rw-r--r-- | debian/patches/progress-linux/0007-mptcp-headers.patch | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/debian/patches/progress-linux/0007-mptcp-headers.patch b/debian/patches/progress-linux/0007-mptcp-headers.patch index 2d2512b..e114aff 100644 --- a/debian/patches/progress-linux/0007-mptcp-headers.patch +++ b/debian/patches/progress-linux/0007-mptcp-headers.patch @@ -2,11 +2,10 @@ Author: mpostaire <maxime_postaire@hotmail.fr> Description: Code cleanup + IPPROTO_MPTCP in defines header. https://github.com/openssh/openssh-portable/pull/335 -diff --git a/defines.h b/defines.h -index 279e509a..d73550a9 100644 ---- a/defines.h -+++ b/defines.h -@@ -892,6 +892,10 @@ struct winsize { +diff -Naurp openssh.orig/defines.h openssh/defines.h +--- openssh.orig/defines.h ++++ openssh/defines.h +@@ -898,6 +898,10 @@ struct winsize { # define SSH_IOBUFSZ 8192 #endif @@ -17,11 +16,10 @@ index 279e509a..d73550a9 100644 /* * We want functions in openbsd-compat, if enabled, to override system ones. * We no-op out the weak symbol definition rather than remove it to reduce -diff --git a/sshconnect.c b/sshconnect.c -index 308bd755..63035a9d 100644 ---- a/sshconnect.c -+++ b/sshconnect.c -@@ -359,10 +359,8 @@ ssh_create_socket(struct addrinfo *ai) +diff -Naurp openssh.orig/sshconnect.c openssh/sshconnect.c +--- openssh.orig/sshconnect.c ++++ openssh/sshconnect.c +@@ -358,10 +358,8 @@ ssh_create_socket(struct addrinfo *ai) #endif char ntop[NI_MAXHOST]; @@ -34,11 +32,10 @@ index 308bd755..63035a9d 100644 if (sock == -1) { error("socket: %s", strerror(errno)); return -1; -diff --git a/sshd.c b/sshd.c -index 3f12299b..102079ac 100644 ---- a/sshd.c -+++ b/sshd.c -@@ -1046,13 +1046,8 @@ listen_on_addrs(struct listenaddr *la) +diff -Naurp openssh.orig/sshd.c openssh/sshd.c +--- openssh.orig/sshd.c ++++ openssh/sshd.c +@@ -1092,13 +1092,8 @@ listen_on_addrs(struct listenaddr *la) continue; } /* Create socket for listening. */ |