From f2868287aa479ad82340bad35259c00e61367927 Mon Sep 17 00:00:00 2001
From: Jakub Jelen <jjelen@redhat.com>
Date: Fri, 3 Jun 2016 10:44:32 +0200
Subject: [PATCH] rebase x11 patch to clean up coverity patch

---
 openssh-6.7p1-coverity.patch                  | 27 -------------------
 ...5.5p1-x11.patch => openssh-7.2p2-x11.patch | 18 +++++++------
 openssh.spec                                  |  2 +-
 3 files changed, 11 insertions(+), 36 deletions(-)
 rename openssh-5.5p1-x11.patch => openssh-7.2p2-x11.patch (77%)

diff --git a/openssh-6.7p1-coverity.patch b/openssh-6.7p1-coverity.patch
index 8834903..51aa0bf 100644
--- a/openssh-6.7p1-coverity.patch
+++ b/openssh-6.7p1-coverity.patch
@@ -48,33 +48,6 @@ diff -up openssh-6.8p1/channels.c.coverity openssh-6.8p1/channels.c
  			set_nonblock(efd);
  	}
  }
-@@ -3972,13 +3972,13 @@ connect_local_xsocket_path(const char *p
- 	int sock;
- 	struct sockaddr_un addr;
- 
-+	if (len <= 0)
-+		return -1;
- 	sock = socket(AF_UNIX, SOCK_STREAM, 0);
- 	if (sock < 0)
- 		error("socket: %.100s", strerror(errno));
- 	memset(&addr, 0, sizeof(addr));
- 	addr.sun_family = AF_UNIX;
--	if (len <= 0)
--		return -1;
- 	if (len > sizeof addr.sun_path)
- 		len = sizeof addr.sun_path;
- 	memcpy(addr.sun_path, pathname, len);
-diff -up openssh-6.8p1/entropy.c.coverity openssh-6.8p1/entropy.c
---- openssh-6.8p1/entropy.c.coverity	2015-03-18 17:21:51.891264843 +0100
-+++ openssh-6.8p1/entropy.c	2015-03-18 17:21:51.897264831 +0100
-@@ -46,6 +46,7 @@
- #include <openssl/err.h>
- 
- #include "openbsd-compat/openssl-compat.h"
-+#include "openbsd-compat/port-linux.h"
- 
- #include "ssh.h"
- #include "misc.h"
 diff -up openssh-6.8p1/monitor.c.coverity openssh-6.8p1/monitor.c
 --- openssh-6.8p1/monitor.c.coverity	2015-03-18 17:21:51.887264852 +0100
 +++ openssh-6.8p1/monitor.c	2015-03-18 17:21:51.897264831 +0100
diff --git a/openssh-5.5p1-x11.patch b/openssh-7.2p2-x11.patch
similarity index 77%
rename from openssh-5.5p1-x11.patch
rename to openssh-7.2p2-x11.patch
index 70a3c85..09e56e9 100644
--- a/openssh-5.5p1-x11.patch
+++ b/openssh-7.2p2-x11.patch
@@ -1,7 +1,7 @@
-diff -up openssh-5.3p1/channels.c.bz595935 openssh-5.3p1/channels.c
---- openssh-5.3p1/channels.c.bz595935	2010-08-12 14:19:28.000000000 +0200
-+++ openssh-5.3p1/channels.c	2010-08-12 14:33:51.000000000 +0200
-@@ -3185,7 +3185,7 @@ x11_create_display_inet(int x11_display_
+diff -up openssh-7.2p2/channels.c.x11 openssh-7.2p2/channels.c
+--- openssh-7.2p2/channels.c.x11	2016-03-09 19:04:48.000000000 +0100
++++ openssh-7.2p2/channels.c	2016-06-03 10:42:04.775164520 +0200
+@@ -3990,21 +3990,24 @@ x11_create_display_inet(int x11_display_
  }
  
  static int
@@ -10,14 +10,16 @@ diff -up openssh-5.3p1/channels.c.bz595935 openssh-5.3p1/channels.c
  {
  	int sock;
  	struct sockaddr_un addr;
-@@ -3195,11 +3195,14 @@ connect_local_xsocket_path(const char *p
+ 
++	if (len <= 0)
++		return -1;
+ 	sock = socket(AF_UNIX, SOCK_STREAM, 0);
+ 	if (sock < 0)
  		error("socket: %.100s", strerror(errno));
  	memset(&addr, 0, sizeof(addr));
  	addr.sun_family = AF_UNIX;
 -	strlcpy(addr.sun_path, pathname, sizeof addr.sun_path);
 -	if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) == 0)
-+	if (len <= 0)
-+		return -1;
 +	if (len > sizeof addr.sun_path)
 +		len = sizeof addr.sun_path;
 +	memcpy(addr.sun_path, pathname, len);
@@ -28,7 +30,7 @@ diff -up openssh-5.3p1/channels.c.bz595935 openssh-5.3p1/channels.c
  	return -1;
  }
  
-@@ -3207,8 +3210,18 @@ static int
+@@ -4012,8 +4015,18 @@ static int
  connect_local_xsocket(u_int dnr)
  {
  	char buf[1024];
diff --git a/openssh.spec b/openssh.spec
index 439906e..1dcbbd2 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -144,7 +144,7 @@ Patch606: openssh-5.9p1-ipv6man.patch
 #?
 Patch607: openssh-5.8p2-sigpipe.patch
 #https://bugzilla.mindrot.org/show_bug.cgi?id=1789
-Patch609: openssh-5.5p1-x11.patch
+Patch609: openssh-7.2p2-x11.patch
 
 #?
 Patch700: openssh-7.2p1-fips.patch