rpms/openssh
6
0
Fork 2
Code Issues Pull Requests Releases Activity

bring back openssh-5.5p1-x11.patch

Browse Source
This commit is contained in:
Petr Lautrbach 2014-07-03 16:42:56 +02:00
parent 5fcfcac428
commit 86f29c353e
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openssh-5.5p1-x11.patch
View File

@ -28,16 +28,13 @@ diff -up openssh-5.3p1/channels.c.bz595935 openssh-5.3p1/channels.c
return -1; return -1;
} }
@@ -3207,8 +3210,21 @@ static int @@ -3207,8 +3210,18 @@ static int
connect_local_xsocket(u_int dnr) connect_local_xsocket(u_int dnr)
{ {
char buf[1024]; char buf[1024];
- snprintf(buf, sizeof buf, _PATH_UNIX_X, dnr); - snprintf(buf, sizeof buf, _PATH_UNIX_X, dnr);
- return connect_local_xsocket_path(buf); - return connect_local_xsocket_path(buf);
+ int len; + int len, ret;
+#ifdef linux
+ int ret;
+#endif
+ len = snprintf(buf + 1, sizeof (buf) - 1, _PATH_UNIX_X, dnr); + len = snprintf(buf + 1, sizeof (buf) - 1, _PATH_UNIX_X, dnr);
+#ifdef linux +#ifdef linux
+ /* try abstract socket first */ + /* try abstract socket first */

4
openssh.spec
View File

@ -139,7 +139,7 @@ Patch607: openssh-5.8p2-sigpipe.patch
#? #?
Patch608: openssh-6.1p1-askpass-ld.patch Patch608: openssh-6.1p1-askpass-ld.patch
#https://bugzilla.mindrot.org/show_bug.cgi?id=1789 #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 Patch700: openssh-6.3p1-fips.patch
@ -373,7 +373,7 @@ popd
%patch606 -p1 -b .ipv6man %patch606 -p1 -b .ipv6man
%patch607 -p1 -b .sigpipe %patch607 -p1 -b .sigpipe
%patch608 -p1 -b .askpass-ld %patch608 -p1 -b .askpass-ld
# drop? %patch609 -p1 -b .x11 %patch609 -p1 -b .x11
# #
# move to the end %patch700 -p1 -b .fips # move to the end %patch700 -p1 -b .fips
# drop? %patch701 -p1 -b .exit-deadlock # drop? %patch701 -p1 -b .exit-deadlock