From a3dee6b29dde0b85ac25422e8a8257856560b4ce Mon Sep 17 00:00:00 2001 From: "Jan F. Chadima" Date: Fri, 25 Jun 2010 12:08:42 +0000 Subject: [PATCH] - improved the x11 patch (#598671) --- openssh-5.5p1-x11.patch | 31 ++++++++++++++++++++----------- openssh.spec | 9 ++++++--- 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/openssh-5.5p1-x11.patch b/openssh-5.5p1-x11.patch index 8d367d5..b6b1aa3 100644 --- a/openssh-5.5p1-x11.patch +++ b/openssh-5.5p1-x11.patch @@ -1,12 +1,21 @@ -diff -up openssh-5.5p1/pathnames.h.x11 openssh-5.5p1/pathnames.h ---- openssh-5.5p1/pathnames.h.x11 2010-06-23 18:07:59.000000000 +0200 -+++ openssh-5.5p1/pathnames.h 2010-06-23 18:10:20.000000000 +0200 -@@ -137,7 +137,7 @@ +diff -up openssh-5.5p1/channels.c.x11 openssh-5.5p1/channels.c +--- openssh-5.5p1/channels.c.x11 2010-06-25 13:35:44.000000000 +0200 ++++ openssh-5.5p1/channels.c 2010-06-25 13:40:40.000000000 +0200 +@@ -3354,7 +3354,17 @@ static int + connect_local_xsocket(u_int dnr) + { + char buf[1024]; ++#ifdef linux ++ int ret; ++#endif + snprintf(buf, sizeof buf, _PATH_UNIX_X, dnr); ++#ifdef linux ++ /* try abstract socket first */ ++ buf[0] = '\0'; ++ if ((ret = connect_local_xsocket_path(buf)) >= 0) ++ return ret; ++ buf[0] = '/'; ++#endif + return connect_local_xsocket_path(buf); + } - /* UNIX domain socket for X11 server; displaynum will replace %u */ - #ifndef _PATH_UNIX_X --#define _PATH_UNIX_X "/tmp/.X11-unix/X%u" -+#define _PATH_UNIX_X "/var/spool/sockets/X11/%u" - #endif - - /* for scp */ diff --git a/openssh.spec b/openssh.spec index 3d1c983..591c25d 100644 --- a/openssh.spec +++ b/openssh.spec @@ -70,7 +70,7 @@ %endif # Do not forget to bump pam_ssh_agent_auth release if you rewind the main package release to 1 -%define openssh_rel 15 +%define openssh_rel 16 %define openssh_ver 5.5p1 %define pam_ssh_agent_rel 26 %define pam_ssh_agent_ver 0.9.2 @@ -94,7 +94,6 @@ Source4: http://prdownloads.sourceforge.net/pamsshagentauth/pam_ssh_agent_auth/p Source5: pam_ssh_agent-rmheaders Patch0: openssh-5.4p1-redhat.patch -Patch1: openssh-5.5p1-x11.patch #https://bugzilla.mindrot.org/show_bug.cgi?id=1638 Patch2: openssh-5.3p1-skip-initial.patch #https://bugzilla.mindrot.org/show_bug.cgi?id=1640 @@ -132,6 +131,7 @@ Patch76: openssh-5.5p1-staterr.patch #https://bugzilla.mindrot.org/show_bug.cgi?id=1750 Patch77: openssh-5.5p1-stderr.patch Patch78: openssh-5.5p1-kuserok.patch +Patch79: openssh-5.5p1-x11.patch License: BSD Group: Applications/Internet @@ -267,7 +267,6 @@ The module is most useful for su and sudo service stacks. %prep %setup -q -a 4 %patch0 -p1 -b .redhat -%patch1 -p1 -b .x11 %patch2 -p1 -b .skip-initial %patch4 -p1 -b .vendor @@ -305,6 +304,7 @@ popd %patch76 -p1 -b .staterr %patch77 -p1 -b .stderr %patch78 -p1 -b .kuserok +%patch79 -p1 -b .x11 autoreconf pushd pam_ssh_agent_auth-%{pam_ssh_agent_ver} @@ -586,6 +586,9 @@ fi %endif %changelog +* Thu Jun 25 2010 Jan F. Chadima - 5.5p1-16 + 0.9.2-26 +- improved the x11 patch (#598671) + * Thu Jun 24 2010 Jan F. Chadima - 5.5p1-15 + 0.9.2-26 - changed _PATH_UNIX_X to unexistent file name (#598671)