From f6bd29aaca4851afb0be848845a96accb71469fe Mon Sep 17 00:00:00 2001
From: Jakub Jelen <jjelen@redhat.com>
Date: Fri, 18 Dec 2015 12:02:14 +0100
Subject: [PATCH] Preserve IUTF8 tty mode flag over ssh connections (#1270248)

---
 openssh-7.1p1-iutf8.patch | 31 +++++++++++++++++++++++++++++++
 openssh.spec              |  4 ++++
 2 files changed, 35 insertions(+)
 create mode 100644 openssh-7.1p1-iutf8.patch

diff --git a/openssh-7.1p1-iutf8.patch b/openssh-7.1p1-iutf8.patch
new file mode 100644
index 0000000..89de5c7
--- /dev/null
+++ b/openssh-7.1p1-iutf8.patch
@@ -0,0 +1,31 @@
+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)
+
diff --git a/openssh.spec b/openssh.spec
index 7ba184e..0b4f484 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -233,6 +233,9 @@ Patch934: openssh-7.1p1-hostkeyalgorithms.patch
 # Updated version of ssh-copy-id
 # http://git.hands.com/ssh-copy-id
 Patch935: openssh-7.1p1-ssh-copy-id.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
 
 
 License: BSD
@@ -470,6 +473,7 @@ popd
 %patch933 -p1 -b .fingerprint
 %patch934 -p1 -b .hostkey
 %patch935 -p1 -b .ssh-copy-id
+%patch936 -p1 -b .iutf8
 
 %patch200 -p1 -b .audit
 %patch700 -p1 -b .fips