Upstream bug #2477 applied
This commit is contained in:
parent
4bd77fcccc
commit
38e1dfa80d
@ -1,31 +0,0 @@
|
||||
diff --git a/PROTOCOL b/PROTOCOL
|
||||
index 131adfe..c828087 100644
|
||||
--- a/PROTOCOL
|
||||
+++ b/PROTOCOL
|
||||
@@ -328,6 +328,11 @@ a server may offer multiple keys of the same type for a period (to
|
||||
give clients an opportunity to learn them using this extension) before
|
||||
removing the deprecated key from those offered.
|
||||
|
||||
+2.6. connection: add IUTF8 terminal mode flag
|
||||
+
|
||||
+OpenSSH supports the IUTF8 terminal mode flag and encodes it in "pty-req"
|
||||
+messages as opcode value 42.
|
||||
+
|
||||
3. SFTP protocol changes
|
||||
|
||||
3.1. sftp: Reversal of arguments to SSH_FXP_SYMLINK
|
||||
diff --git a/ttymodes.h b/ttymodes.h
|
||||
index 4d848fe..396ae88 100644
|
||||
--- a/ttymodes.h
|
||||
+++ b/ttymodes.h
|
||||
@@ -127,6 +127,9 @@ TTYMODE(IXOFF, c_iflag, 40)
|
||||
#ifdef IMAXBEL
|
||||
TTYMODE(IMAXBEL,c_iflag, 41)
|
||||
#endif /* IMAXBEL */
|
||||
+#ifdef IUTF8
|
||||
+TTYMODE(IUTF8, c_iflag, 42)
|
||||
+#endif /* IUTF8 */
|
||||
|
||||
TTYMODE(ISIG, c_lflag, 50)
|
||||
TTYMODE(ICANON, c_lflag, 51)
|
||||
|
@ -216,9 +216,6 @@ Patch931: openssh-6.9p1-scp-progressmeter.patch
|
||||
Patch932: openssh-7.0p1-gssKexAlgorithms.patch
|
||||
# Possibility to validate legacy systems by more fingerprints (#1249626)(#2439)
|
||||
Patch933: openssh-7.0p1-show-more-fingerprints.patch
|
||||
# Preserve IUTF8 tty mode flag over ssh connections (#1270248)
|
||||
# https://bugzilla.mindrot.org/show_bug.cgi?id=2477
|
||||
Patch936: openssh-7.1p1-iutf8.patch
|
||||
# CVE-2015-8325: ignore PAM environment vars when UseLogin=yes
|
||||
Patch937: openssh-7.2p2-CVE-2015-8325.patch
|
||||
# Regression in certificate based authentication (#1333498)
|
||||
@ -465,7 +462,6 @@ popd
|
||||
%patch931 -p1 -b .progressmeter
|
||||
%patch932 -p1 -b .gsskexalg
|
||||
%patch933 -p1 -b .fingerprint
|
||||
%patch936 -p1 -b .iutf8
|
||||
%patch937 -p1 -b .pam_uselogin_cve
|
||||
%patch938 -p1 -b .certificates
|
||||
%patch939 -p1 -b .s390-dev
|
||||
|
Loading…
Reference in New Issue
Block a user