rpms/openssh/devel openssh-5.5p1-x11.patch, NONE, 1.1 openssh.spec, 1.217, 1.218

[Jan F. Chadima]

Author: jfch2222

Update of /cvs/pkgs/rpms/openssh/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30448

Modified Files:
	openssh.spec 
Added Files:
	openssh-5.5p1-x11.patch 
Log Message:
* Thu Jun 24 2010 Jan F. Chadima <jchadima at redhat.com> - 5.5p1-15 + 0.9.2-26
- changed _PATH_UNIX_X to unexistent file name (#598671)


openssh-5.5p1-x11.patch:
 pathnames.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openssh-5.5p1-x11.patch ---
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 @@
 
 /* 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 */


Index: openssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -p -r1.217 -r1.218
--- openssh.spec	23 Jun 2010 13:53:38 -0000	1.217
+++ openssh.spec	24 Jun 2010 07:02:37 -0000	1.218
@@ -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 14
+%define openssh_rel 15
 %define openssh_ver 5.5p1
 %define pam_ssh_agent_rel 26
 %define pam_ssh_agent_ver 0.9.2
@@ -94,6 +94,7 @@ Source4: http://prdownloads.sourceforge.
 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
@@ -266,6 +267,7 @@ The module is most useful for su and sud
 %prep
 %setup -q -a 4
 %patch0 -p1 -b .redhat
+%patch1 -p1 -b .x11
 %patch2 -p1 -b .skip-initial
 %patch4 -p1 -b .vendor
 
@@ -584,6 +586,9 @@ fi
 %endif
 
 %changelog
+* Thu Jun 24 2010 Jan F. Chadima <jchadima at redhat.com> - 5.5p1-15 + 0.9.2-26
+- changed _PATH_UNIX_X to unexistent file name (#598671)
+
 * Wed Jun 23 2010 Jan F. Chadima <jchadima at redhat.com> - 5.5p1-14 + 0.9.2-26
 - sftp works in deviceless chroot again (broken from 5.5p1-3)