[openssh] bring back openssh-5.5p1-x11.patch

[plautrba]

commit 86f29c353ed2ce8d93adcdd92123d33f8306a18a
Author: Petr Lautrbach <plautrba at redhat.com>
Date:   Thu Jul 3 16:42:56 2014 +0200

    bring back openssh-5.5p1-x11.patch

 openssh-5.5p1-x11.patch |    7 ++-----
 openssh.spec            |    4 ++--
 2 files changed, 4 insertions(+), 7 deletions(-)
---
diff --git a/openssh-5.5p1-x11.patch b/openssh-5.5p1-x11.patch
index cac5d5e..70a3c85 100644
--- a/openssh-5.5p1-x11.patch
+++ b/openssh-5.5p1-x11.patch
@@ -28,16 +28,13 @@ diff -up openssh-5.3p1/channels.c.bz595935 openssh-5.3p1/channels.c
  	return -1;
  }
  
-@@ -3207,8 +3210,21 @@ static int
+@@ -3207,8 +3210,18 @@ static int
  connect_local_xsocket(u_int dnr)
  {
  	char buf[1024];
 -	snprintf(buf, sizeof buf, _PATH_UNIX_X, dnr);
 -	return connect_local_xsocket_path(buf);
-+	int len;
-+#ifdef linux
-+	int ret;
-+#endif
++	int len, ret;
 +	len = snprintf(buf + 1, sizeof (buf) - 1, _PATH_UNIX_X, dnr);
 +#ifdef linux
 +	/* try abstract socket first */
diff --git a/openssh.spec b/openssh.spec
index e7ae1c2..87cdd6d 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -139,7 +139,7 @@ Patch607: openssh-5.8p2-sigpipe.patch
 #?
 Patch608: openssh-6.1p1-askpass-ld.patch
 #https://bugzilla.mindrot.org/show_bug.cgi?id=1789
-# drop? Patch609: openssh-5.5p1-x11.patch
+Patch609: openssh-5.5p1-x11.patch
 
 #?
 Patch700: openssh-6.3p1-fips.patch
@@ -373,7 +373,7 @@ popd
 %patch606 -p1 -b .ipv6man
 %patch607 -p1 -b .sigpipe
 %patch608 -p1 -b .askpass-ld
-# drop? %patch609 -p1 -b .x11
+%patch609 -p1 -b .x11
 # 
 # move to the end %patch700 -p1 -b .fips
 # drop? %patch701 -p1 -b .exit-deadlock